fix(docs): Make the modifier function examples clearer.

* Ensure the list of available modifier functions is clearly shown as macros, not as basic defines.
2026-03-20 04:55:20 -05:00 · 2021-12-01 16:50:50 -05:00
2791 changed files with 54178 additions and 108614 deletions
--- a/.devcontainer/.bashrc
+++ b/.devcontainer/.bashrc
@@ -6,8 +6,3 @@ fi
 if [ -f "$WORKSPACE_DIR/zephyr/zephyr-env.sh" ]; then
  source "$WORKSPACE_DIR/zephyr/zephyr-env.sh"
 fi
-
-if [ -d "$WORKSPACE_DIR/tools/bsim" ]; then
-  export BSIM_OUT_PATH="$WORKSPACE_DIR/tools/bsim/"
-  export BSIM_COMPONENTS_PATH="$WORKSPACE_DIR/tools/bsim/components/"
-fi
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/zmkfirmware/zmk-dev-arm:4.1-branch
+FROM docker.io/zmkfirmware/zmk-dev-arm:2.5

 COPY .bashrc tmp
 RUN mv /tmp/.bashrc ~/.bashrc
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -9,18 +9,13 @@
  "mounts": [
    "type=volume,source=zmk-root-user,target=/root",
    "type=volume,source=zmk-config,target=/workspaces/zmk-config",
-    "type=volume,source=zmk-modules,target=/workspaces/zmk-modules",
    "type=volume,source=zmk-zephyr,target=${containerWorkspaceFolder}/zephyr",
    "type=volume,source=zmk-zephyr-modules,target=${containerWorkspaceFolder}/modules",
    "type=volume,source=zmk-zephyr-tools,target=${containerWorkspaceFolder}/tools"
  ],
-  "customizations": {
-    "vscode": {
  "extensions": ["ms-vscode.cpptools"],
  "settings": {
    "terminal.integrated.shell.linux": "/bin/bash"
-      }
-    }
  },
  "forwardPorts": [3000]
 }
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -8,50 +8,3 @@ updates:
    directory: "/docs"
    schedule:
      interval: "daily"
-    groups:
-      docusaurus-major:
-        applies-to: "version-updates"
-        dependency-type: "production"
-        patterns:
-          - "@docusaurus/*"
-        update-types:
-          - "major"
-      docusaurus-minor-patch:
-        applies-to: "version-updates"
-        dependency-type: "production"
-        patterns:
-          - "@docusaurus/*"
-        update-types:
-          - "minor"
-          - "patch"
-      tree-sitter:
-        applies-to: "version-updates"
-        dependency-type: "production"
-        patterns:
-          - "tree-sitter-devicetree"
-          - "web-tree-sitter"
-      prod-other-major:
-        applies-to: "version-updates"
-        dependency-type: "production"
-        exclude-patterns:
-          - "@docusaurus/*"
-          - "tree-sitter-devicetree"
-          - "web-tree-sitter"
-        update-types:
-          - "major"
-      prod-other-minor-patch:
-        applies-to: "version-updates"
-        dependency-type: "production"
-        exclude-patterns:
-          - "@docusaurus/*"
-          - "tree-sitter-devicetree"
-          - "web-tree-sitter"
-        update-types:
-          - "minor"
-          - "patch"
-      development:
-        applies-to: "version-updates"
-        dependency-type: "development"
-        update-types:
-          - "minor"
-          - "patch"
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,9 +1,11 @@
-<!-- Note: ZMK is generally not accepting PRs for new keyboards. New generic controller PRs *may* still be accepted, please discuss on the Discord server first. -->
-
-## PR check-list
-
- [ ] Branch has a [clean commit history](https://zmk.dev/docs/development/contributing/pull-requests#clean-commit-history)
- [ ] Additional tests are included, if changing behaviors/core code that is testable.
- [ ] Proper Copyright + License headers added to applicable files (Generally, we stick to "The ZMK Contributors" for copyrights to help avoid churn when files get edited)
- [ ] [Pre-commit](https://zmk.dev/docs/development/local-toolchain/pre-commit) used to check formatting of files, commit messages, etc.
- [ ] Includes any necessary [documentation changes](https://zmk.dev/docs/development/contributing/documentation).
+<!-- If you're adding a board/shield please fill out this check-list, otherwise you can delete it -->
+## Board/Shield Check-list
+ - [ ] This board/shield is tested working on real hardware
+ - [ ] Definitions follow the general style of other shields/boards upstream ([Reference](https://zmk.dev/docs/development/new-shield))
+ - [ ] `.zmk.yml` metadata file added
+ - [ ] Proper Copyright + License headers added to applicable files (Generally, we stick to "The ZMK Contributors" for copyrights to help avoid churn when files get edited)
+ - [ ] General consistent formatting of DeviceTree files
+ - [ ] Keymaps do not use deprecated key defines (Check using the [upgrader tool](https://zmk.dev/docs/codes/keymap-upgrader))
+ - [ ] `&pro_micro` used in favor of `&pro_micro_d/a` if applicable
+ - [ ] If split, no name added for the right/peripheral half
+ - [ ] `.conf` file has optional extra features commented out
--- a/.github/workflows/ble-test.yml
+++ b/.github/workflows/ble-test.yml
@@ -1,78 +0,0 @@
-name: BLE Tests
-
-on:
-  push:
-    paths:
-      - ".github/workflows/ble-test.yml"
-      - "app/tests/ble/**"
-      - "app/src/**"
-      - "app/run-ble-test.sh"
-  pull_request:
-    paths:
-      - ".github/workflows/ble-test.yml"
-      - "app/tests/ble/**"
-      - "app/src/**"
-      - "app/run-ble-test.sh"
-
-jobs:
-  collect-tests:
-    outputs:
-      test-dirs: ${{ steps.test-dirs.outputs.test-dirs }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-      - name: Find test directories
-        id: test-dirs
-        run: |
-          cd app/tests/ble
-          export TESTS=$(ls -d * | grep -v central | jq -R -s -c 'split("\n")[:-1]')
-          echo "test-dirs=${TESTS}" > $GITHUB_OUTPUT
-  run-tests:
-    needs: collect-tests
-    strategy:
-      matrix:
-        test: ${{ fromJSON(needs.collect-tests.outputs.test-dirs) }}
-    runs-on: ubuntu-latest
-    container:
-      image: docker.io/zmkfirmware/zmk-build-arm:4.1
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-      - name: Cache west modules
-        uses: actions/cache@v4
-        env:
-          cache-name: cache-zephyr-modules
-        with:
-          path: |
-            modules/
-            tools/
-            zephyr/
-            bootloader/
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('app/west.yml') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-        timeout-minutes: 2
-        continue-on-error: true
-      - name: Initialize workspace (west init)
-        run: west init -l app
-      - name: Enable babblesim group filter
-        run: west config manifest.group-filter -- +babblesim
-      - name: Update modules (west update)
-        run: west update --fetch-opt=--filter=tree:0
-      - name: Export Zephyr CMake package (west zephyr-export)
-        run: west zephyr-export
-      - name: Build BabbleSim components
-        working-directory: tools/bsim
-        run: make everything
-      - name: Test ${{ matrix.test }}
-        working-directory: app
-        run: BSIM_COMPONENTS_PATH="${GITHUB_WORKSPACE}/tools/bsim/components" BSIM_OUT_PATH="${GITHUB_WORKSPACE}/tools/bsim" ./run-ble-test.sh tests/ble/${{ matrix.test }}
-      - name: Archive artifacts
-        if: ${{ always() }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: "${{ matrix.test }}-log-files"
-          path: app/build/**/*.log
--- a/.github/workflows/build-user-config.yml
+++ b/.github/workflows/build-user-config.yml
@@ -1,236 +0,0 @@
-name: Reusable user config build
-
-on:
-  workflow_call:
-    inputs:
-      build_matrix_path:
-        description: "Path to the build matrix file"
-        default: "build.yaml"
-        required: false
-        type: string
-      config_path:
-        description: "Path to the config directory"
-        default: "config"
-        required: false
-        type: string
-      fallback_binary:
-        description: "Fallback binary format, if no *.uf2 file was built"
-        default: "bin"
-        required: false
-        type: string
-      archive_name:
-        description: "Archive output file name"
-        default: "firmware"
-        required: false
-        type: string
-
-jobs:
-  matrix:
-    runs-on: ubuntu-22.04
-    name: Fetch Build Keyboards
-    outputs:
-      build_matrix: ${{ env.build_matrix }}
-      has_valid_build_matrix: ${{ steps.fetch.outputs.has_valid_build_matrix }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-
-      - name: Fetch Build Matrix
-        id: fetch
-        run: |
-          matrix_content=$(yq -oj -I0 '${{ inputs.build_matrix_path }}')
-
-          if [ -z "$matrix_content" ] || [ "$matrix_content" = "null" ]; then
-            echo "::notice file=${{inputs.build_matrix_path}},title=Empty build matrix file::To add a keyboard to the build, see https://zmk.dev/docs/user-setup#add-a-keyboard."
-            echo "has_valid_build_matrix=false" >> $GITHUB_OUTPUT
-          else
-            echo "build_matrix=$matrix_content" >> $GITHUB_ENV
-            echo "has_valid_build_matrix=true" >> $GITHUB_OUTPUT
-            echo "$matrix_content"
-          fi
-
-  build:
-    runs-on: ubuntu-latest
-    if: needs.matrix.outputs.has_valid_build_matrix == 'true'
-    container:
-      image: zmkfirmware/zmk-build-arm:stable
-    needs: matrix
-    name: Build
-    strategy:
-      fail-fast: false
-      matrix: ${{ fromJson(needs.matrix.outputs.build_matrix) }}
-    steps:
-      - name: Act Workaround # https://github.com/nektos/act/issues/973
-        if: ${{ env.ACT }}
-        run: |
-          apt-get update && apt-get install -y curl unzip
-          curl -fsSL https://deb.nodesource.com/setup_22.x | bash && apt install -y nodejs
-
-      - name: Checkout
-        uses: actions/checkout@v5
-
-      - name: Create build directory
-        run: |
-          echo "build_dir=$(mktemp -d)" >> $GITHUB_ENV
-
-      - name: Prepare variables
-        shell: bash -x {0}
-        env:
-          board: ${{ matrix.board }}
-          shield: ${{ matrix.shield }}
-          artifact_name: ${{ matrix.artifact-name }}
-          snippet: ${{ matrix.snippet }}
-        run: |
-          if [ -e zephyr/module.yml ]; then
-            export zmk_load_arg=" -DZMK_EXTRA_MODULES='${GITHUB_WORKSPACE}'"
-            new_tmp_dir="${TMPDIR:-/tmp}/zmk-config"
-            mkdir -p "${new_tmp_dir}"
-            echo "base_dir=${new_tmp_dir}" >> $GITHUB_ENV
-          else
-            echo "base_dir=${GITHUB_WORKSPACE}" >> $GITHUB_ENV
-          fi
-
-          if [ -n "${snippet}" ]; then
-            extra_west_args="-S \"${snippet}\""
-          fi
-
-          echo "zephyr_version=${ZEPHYR_VERSION}" >> $GITHUB_ENV
-          echo "extra_west_args=${extra_west_args}" >> $GITHUB_ENV
-          echo "extra_cmake_args=${shield:+-DSHIELD=\"$shield\"}${zmk_load_arg}" >> $GITHUB_ENV
-          echo "display_name=${shield:+$shield - }${board}" >> $GITHUB_ENV
-          echo "artifact_name=${artifact_name:-${shield:+$shield-}${board//\//_}-zmk}" >> $GITHUB_ENV
-
-      - name: Copy config files to isolated temporary directory
-        run: |
-          if [ "${{ env.base_dir }}" != "${GITHUB_WORKSPACE}" ]; then
-            mkdir "${{ env.base_dir }}/${{ inputs.config_path }}"
-            cp -R ${{ inputs.config_path }}/* "${{ env.base_dir }}/${{ inputs.config_path }}/"
-          fi
-
-      - name: Cache west modules
-        uses: actions/cache@v4
-        continue-on-error: true
-        env:
-          cache_name: cache-zephyr-${{ env.zephyr_version }}-modules
-        with:
-          path: |
-            ${{ env.base_dir }}/modules/
-            ${{ env.base_dir }}/tools/
-            ${{ env.base_dir }}/zephyr/
-            ${{ env.base_dir }}/bootloader/
-            ${{ env.base_dir }}/zmk/
-          key: ${{ runner.os }}-build-${{ env.cache_name }}-${{ hashFiles('**/west.yml', '**/build.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache_name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-
-      - name: West Init
-        working-directory: ${{ env.base_dir }}
-        run: west init -l "${{ env.base_dir }}/${{ inputs.config_path }}"
-
-      - name: West Update
-        working-directory: ${{ env.base_dir }}
-        run: west update --fetch-opt=--filter=tree:0
-
-      - name: Check ZMK revision
-        working-directory: ${{ env.base_dir }}
-        run: |
-          zmk_revision=$(west list -f "{revision}" zmk)
-          echo "zmk_revision=${zmk_revision}" >> $GITHUB_ENV
-          echo "ZMK revision: ${zmk_revision}"
-
-      - name: West Zephyr export
-        working-directory: ${{ env.base_dir }}
-        run: west zephyr-export
-
-      - name: West Build (${{ env.display_name }})
-        working-directory: ${{ env.base_dir }}
-        shell: sh -x {0}
-        run: west build -s zmk/app -d "${{ env.build_dir }}" -b "${{ matrix.board }}" ${{ env.extra_west_args }} -- -DZMK_CONFIG=${{ env.base_dir }}/${{ inputs.config_path }} ${{ env.extra_cmake_args }} ${{ matrix.cmake-args }}
-
-      - name: Warn about building from main if build fails
-        if: failure() && env.zmk_revision == 'main'
-        run: |
-          echo "# Consider Pinning ZMK" >> $GITHUB_STEP_SUMMARY
-          echo "Your recent build failure might be the result of breaking changes made to ZMK's main branch." >> $GITHUB_STEP_SUMMARY
-          echo "Consider [pinning your ZMK version](https://zmk.dev/blog/2025/06/20/pinned-zmk) to a release for increased stability." >> $GITHUB_STEP_SUMMARY
-          echo "See also the [list of released versions](https://github.com/zmkfirmware/zmk/releases)." >> $GITHUB_STEP_SUMMARY
-          echo "If you wish to stay on main, check the most recent pending release PR for breaking changes. [Our blog](https://zmk.dev/blog) may have upgrade information if breaking changes are significant." >> $GITHUB_STEP_SUMMARY
-
-      - name: Check if building a board without explicit ZMK compat
-        if: always()
-        working-directory: "${{ env.base_dir }}/${{ inputs.config_path }}"
-        run: |
-          if ! (grep "CONFIG_ZMK_BOARD_COMPAT=y" "${{ env.build_dir }}/zephyr/.config" > /dev/null)
-          then
-            original_board=$(echo "${{ matrix.board }}" | sed -e 's$/.*$$')
-            west_board=$(west boards --board-root ${{ env.base_dir }}/zmk/app/module --board-root ${{ env.base_dir }}/zmk/app --board "${original_board}")
-            if [ -z "$west_board" ]; then
-              echo "Not found the board listed with west boards. Skipping further checking."
-              exit 0
-            fi
-
-            west boards --board-root ${{ env.base_dir }}/zmk/app/module --board-root ${{ env.base_dir }}/zmk/app --board "${original_board}" --format "{qualifiers}" | grep "zmk" > /dev/null
-            if [ $? -ne 0 ]
-            then
-              echo "::warning file=build/zephyr/.config,title=Missing ZMK Compat::The selected board does not report explicit ZMK compat. Please verify you've selected the correct board and ZMK variant if one exists"
-            else
-              echo "::error file=build/zephyr/.config,title=Missing ZMK Compat::The selected board is not set up for ZMK and there is a ZMK variant available. See https://zmk.dev/blog/2025/12/09/zephyr-4-1#zmk-board-variant."
-              exit 1
-            fi
-          fi
-
-      - name: ${{ env.display_name }} Kconfig file
-        run: |
-          if [ -f "${{ env.build_dir }}/zephyr/.config" ]
-          then
-            grep -v -e "^#" -e "^$" "${{ env.build_dir }}/zephyr/.config" | sort
-          else
-            echo "No Kconfig output"
-          fi
-        if: ${{ !cancelled() }}
-
-      - name: ${{ env.display_name }} Devicetree file
-        run: |
-          if [ -f "${{ env.build_dir }}/zephyr/zephyr.dts" ]
-          then
-            cat "${{ env.build_dir }}/zephyr/zephyr.dts"
-          elif [ -f "${{ env.build_dir }}/zephyr/zephyr.dts.pre" ]
-          then
-            cat -s "${{ env.build_dir }}/zephyr/zephyr.dts.pre"
-          else
-            echo "No Devicetree output"
-          fi
-        if: ${{ !cancelled() }}
-
-      - name: Rename artifacts
-        shell: sh -x {0}
-        run: |
-          mkdir "${{ env.build_dir }}/artifacts"
-          if [ -f "${{ env.build_dir }}/zephyr/zmk.uf2" ]
-          then
-            cp "${{ env.build_dir }}/zephyr/zmk.uf2" "${{ env.build_dir }}/artifacts/${{ env.artifact_name }}.uf2"
-          elif [ -f "${{ env.build_dir }}/zephyr/zmk.${{ inputs.fallback_binary }}" ]
-          then
-            cp "${{ env.build_dir }}/zephyr/zmk.${{ inputs.fallback_binary }}" "${{ env.build_dir }}/artifacts/${{ env.artifact_name }}.${{ inputs.fallback_binary }}"
-          fi
-
-      - name: Archive (${{ env.display_name }})
-        uses: actions/upload-artifact@v4
-        with:
-          name: artifact-${{ env.artifact_name }}
-          path: ${{ env.build_dir }}/artifacts
-
-  merge:
-    runs-on: ubuntu-latest
-    if: needs.matrix.outputs.has_valid_build_matrix == 'true'
-    needs: build
-    name: Merge Output Artifacts
-    steps:
-      - name: Merge Artifacts
-        uses: actions/upload-artifact/merge@v4
-        with:
-          name: ${{ inputs.archive_name }}
-          pattern: artifact-*
-          delete-merged: true
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,32 +9,80 @@ on:
    paths:
      - ".github/workflows/build.yml"
      - "app/**"
-  schedule:
-    - cron: "22 4 * * *"
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name == 'schedule' }}
-  cancel-in-progress: true
-
-permissions: {}

 jobs:
  build:
-    if: ${{ always() }}
    runs-on: ubuntu-latest
    container:
-      image: docker.io/zmkfirmware/zmk-build-arm:4.1
-    needs: compile-matrix
+      image: docker.io/zmkfirmware/zmk-build-arm:2.5
    strategy:
      matrix:
-        include: ${{ fromJSON(needs.compile-matrix.outputs.include-list) }}
+        board:
+          - bluemicro840_v1
+          - nice_nano
+          - nice_nano_v2
+          - nrfmicro_13
+          - proton_c
+        shield:
+          - bfo9000_left
+          - bfo9000_right
+          - boardsource3x4
+          - corne_left
+          - corne_right
+          - cradio_left
+          - cradio_right
+          - crbn
+          - eek
+          - helix_left
+          - helix_right
+          - iris_left
+          - iris_right
+          - jian_left
+          - jian_right
+          - jorne_left
+          - jorne_right
+          - kyria_left
+          - kyria_right
+          - lily58_left
+          - lily58_right
+          - microdox_left
+          - microdox_right
+          - nibble
+          - qaz
+          - quefrency_left
+          - quefrency_right
+          - reviung41
+          - romac
+          - romac_plus
+          - settings_reset
+          - sofle_left
+          - sofle_right
+          - splitreus62_left
+          - splitreus62_right
+          - tg4x
+          - tidbit
+        cmake-args: [""]
+        include:
+          - board: bdn9_rev2
+          - board: dz60rgb_rev1
+          - board: nrf52840_m2
+            shield: m60
+          - board: planck_rev6
+          - board: proton_c
+            shield: clueboard_california
+          - board: nice_nano_v2
+            shield: kyria_left
+            cmake-args: -DCONFIG_ZMK_DISPLAY=y
+            skip-archive: true
+          - board: nice_nano_v2
+            shield: kyria_right
+            cmake-args: -DCONFIG_ZMK_DISPLAY=y
+            skip-archive: true
    steps:
      - name: Checkout
-        uses: actions/checkout@v5
-        with:
-          persist-credentials: false
+        uses: actions/checkout@v2
      - name: Cache west modules
-        uses: actions/cache@v4
+        uses: actions/cache@v2
        env:
          cache-name: cache-zephyr-modules
        with:
@@ -43,414 +91,42 @@ jobs:
            tools/
            zephyr/
            bootloader/
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('app/west.yml') }}
+          key: 4-${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('app/west.yml') }}
          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
+            4-${{ runner.os }}-build-${{ env.cache-name }}-
+            4-${{ runner.os }}-build-
+            4-${{ runner.os }}-
        timeout-minutes: 2
        continue-on-error: true
      - name: Initialize workspace (west init)
        run: west init -l app
      - name: Update modules (west update)
-        run: west update --fetch-opt=--filter=tree:0
+        run: west update
      - name: Export Zephyr CMake package (west zephyr-export)
        run: west zephyr-export
-      - name: Use Node.js
-        uses: actions/setup-node@v4
+      - name: Prepare variables
+        id: variables
+        run: |
+          SHIELD_ARG=
+          ARTIFACT_NAME="${{ matrix.board }}"
+
+          if [ -n "${{ matrix.shield }}" ]; then
+            SHIELD_ARG="-DSHIELD=${{ matrix.shield }}"
+            ARTIFACT_NAME="${ARTIFACT_NAME}-${{ matrix.shield }}"
+          fi
+
+          ARTIFACT_NAME="${ARTIFACT_NAME}-zmk"
+
+          echo ::set-output name=shield-arg::${SHIELD_ARG}
+          echo ::set-output name=artifact-name::${ARTIFACT_NAME}
+      - name: Build (west build)
+        run: west build -s app -b ${{ matrix.board }} -- ${{ steps.variables.outputs.shield-arg }} ${{ matrix.cmake-args }}
+      - name: Archive artifacts
+        if: ${{ !matrix.skip-archive }}
+        uses: actions/upload-artifact@v2
        with:
-          node-version: "14.x"
-      - name: Install @actions/artifact
-        run: npm install @actions/artifact@5.0.3
-      - name: Build
-        uses: actions/github-script@v7
-        id: boards-list
-        with:
-          script: |
-            const fs = require('fs');
-
-            const execSync = require('child_process').execSync;
-
-            const buildShieldArgs = JSON.parse(`${{ matrix.shieldArgs }}`);
-
-            let error = false;
-
-            for (const shieldArgs of buildShieldArgs) {
-              try {
-                console.log(`::group::${{ matrix.board}} ${shieldArgs.shield} Build`)
-
-                const output = execSync(`west build -s app -p -b ${{ matrix.board }} ${shieldArgs.snippet ? '-S ' + shieldArgs.snippet : ''} -- ${shieldArgs.shield ? '-DSHIELD="' + shieldArgs.shield + '"' : ''} ${shieldArgs['cmake-args'] || ''}`);
-
-                console.log(output.toString());
-              } catch (e) {
-                console.error(`::error::Failed to build ${{ matrix.board }} ${shieldArgs.shield} ${shieldArgs['cmake-args']}`);
-                console.error(e);
-                error = true;
-              } finally {
-                console.log('::endgroup::');
-              }
-            }
-
-            if (error) {
-              throw new Error('Failed to build one or more configurations');
-            }
-      - name: Upload artifacts
-        uses: actions/github-script@v7
-        continue-on-error: ${{ github.event_name == 'pull_request' }}
-        id: boards-upload
-        with:
-          script: |
-            const fs = require('fs');
-            const {default: artifact} = require('@actions/artifact');
-
-            const buildShieldArgs = JSON.parse(`${{ matrix.shieldArgs }}`);
-
-            let error = false;
-
-            for (const shieldArgs of buildShieldArgs) {
-              try {
-                console.log(`::group::${{ matrix.board}} ${shieldArgs.shield} Upload`)
-
-                const fileExtensions = ["hex", "uf2"];
-
-                const files = fileExtensions
-                  .map(extension => "build/zephyr/zmk." + extension)
-                  .filter(path => fs.existsSync(path));
-
-                const rootDirectory = 'build/zephyr';
-                const options = {
-                    continueOnError: true
-                }
-
-                const cmakeName = shieldArgs['cmake-args'] ? '-' + (shieldArgs.nickname || shieldArgs['cmake-args'].split(' ').join('')) : '';
-                const artifactName = `${{ matrix.board }}${shieldArgs.shield ? '-' + shieldArgs.shield : ''}${cmakeName}-zmk`.replaceAll('/', '_');
-
-                await artifact.uploadArtifact(artifactName, files, rootDirectory, options);
-              } catch (e) {
-                console.error(`::error::Failed to upload ${{ matrix.board }} ${shieldArgs.shield} ${shieldArgs['cmake-args']}`);
-                console.error(e);
-                error = true;
-              } finally {
-                console.log('::endgroup::');
-              }
-            }
-
-            if (error) {
-              throw new Error('Failed to build one or more configurations');
-            }
-  compile-matrix:
-    if: ${{ !cancelled() }}
-    runs-on: ubuntu-latest
-    needs: [core-coverage, board-changes, nightly]
-    outputs:
-      include-list: ${{ steps.compile-list.outputs.result }}
-    steps:
-      - name: Join build lists
-        uses: actions/github-script@v7
-        id: compile-list
-        with:
-          script: |
-            const coreCoverage = `${{ needs.core-coverage.outputs.core-include }}` || "[]";
-            const boardChanges = `${{ needs.board-changes.outputs.boards-include }}` || "[]";
-            const nightly = `${{ needs.nightly.outputs.nightly-include }}` || "[]";
-
-            const combined = [
-              ...JSON.parse(coreCoverage),
-              ...JSON.parse(boardChanges),
-              ...JSON.parse(nightly)
-            ];
-            const combinedUnique = [...new Map(combined.map(el => [JSON.stringify(el), el])).values()];
-
-            const perBoard = {};
-
-            for (const configuration of combinedUnique) {
-              if (!perBoard[configuration.board])
-                perBoard[configuration.board] = [];
-
-              perBoard[configuration.board].push({
-                shield: configuration.shield,
-                'cmake-args': configuration['cmake-args'],
-                snippet: configuration.snippet,
-                nickname: configuration.nickname
-              })
-            }
-
-            return Object.entries(perBoard).map(([board, shieldArgs]) => ({
-              board,
-              shieldArgs: JSON.stringify(shieldArgs),
-            }));
-  core-coverage:
-    if: ${{ needs.get-changed-files.outputs.core-changes == 'true' }}
-    runs-on: ubuntu-latest
-    needs: get-changed-files
-    outputs:
-      core-include: ${{ steps.core-list.outputs.result }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-        with:
-          persist-credentials: false
-      - name: Use Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "14.x"
-      - name: Install js-yaml
-        run: npm install js-yaml
-      - uses: actions/github-script@v7
-        id: core-list
-        with:
-          script: |
-            const fs = require('fs');
-            const yaml = require('js-yaml');
-
-            const coreCoverage = yaml.load(fs.readFileSync('app/core-coverage.yml', 'utf8'));
-
-            let include = coreCoverage.board.flatMap(board =>
-              coreCoverage.shield.map(shield => ({ board, shield }))
-            );
-
-            return [...include, ...coreCoverage.include];
-  board-changes:
-    if: ${{ needs.get-changed-files.outputs.board-changes == 'true' }}
-    runs-on: ubuntu-latest
-    needs: [get-grouped-hardware, get-changed-files]
-    outputs:
-      boards-include: ${{ steps.boards-list.outputs.result }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-      - name: Use Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "14.x"
-      - name: Install js-yaml
-        run: npm install js-yaml
-      - uses: actions/github-script@v7
-        id: boards-list
-        with:
-          script: |
-            const fs = require('fs');
-            const yaml = require('js-yaml');
-
-            const changedFiles = JSON.parse(`${{ needs.get-changed-files.outputs.changed-files }}`);
-            const metadata = JSON.parse(`${{ needs.get-grouped-hardware.outputs.organized-metadata }}`);
-            const boardChanges = new Set(changedFiles.filter(f => f.startsWith('app/boards')).map(f => f.split('/').slice(0, 4).join('/')));
-
-            return (await Promise.all([...boardChanges].flatMap(async bc => {
-              const globber = await glob.create(bc + "/*.zmk.yml");
-              const files = await globber.glob();
-
-              const aggregated = files.flatMap((f) =>
-                yaml.loadAll(fs.readFileSync(f, "utf8"))
-              );
-
-              const boardAndShield = (b, s) => {
-                if (s.siblings) {
-                  return s.siblings.map(shield => ({
-                    board: b.id,
-                    shield,
-                  }));
-                } else {
-                  return {
-                    board: b.id,
-                    shield: s.id
-                  };
-                }
-              }
-
-              return aggregated.flatMap(hm => {
-                switch (hm.type) {
-                  case "board":
-                    if (hm.features && hm.features.includes("keys")) {
-                      if (hm.siblings) {
-                        return hm.siblings.map(board => ({
-                          board,
-                        }));
-                      } else {
-                        return {
-                          board: hm.id
-                        };
-                      }
-                    } else if (hm.exposes) {
-                      return hm.exposes.flatMap(i =>
-                        metadata.interconnects[i].shields.flatMap(s => boardAndShield(hm, s))
-                      );
-                    } else {
-                      console.error("Board without keys or interconnect");
-                      return [];
-                    }
-                    break;
-                  case "shield":
-                    if (hm.features && hm.features.includes("keys")) {
-                      return hm.requires.flatMap(i =>
-                        metadata.interconnects[i].boards.flatMap(b => boardAndShield(b, hm))
-                      );
-                    } else {
-                      console.warn("Unhandled shield without keys");
-                      return [];
-                    }
-                    break;
-                  case "interconnect":
-                    return [];
-                }
-              });
-            }))).flat();
-  nightly:
-    if: ${{ github.event_name == 'schedule' && github.repository_owner == 'zmkfirmware' }}
-    runs-on: ubuntu-latest
-    needs: get-grouped-hardware
-    outputs:
-      nightly-include: ${{ steps.nightly-list.outputs.result }}
-    steps:
-      - name: Create nightly list
-        uses: actions/github-script@v7
-        id: nightly-list
-        with:
-          script: |
-            const metadata = JSON.parse(`${{ needs.get-grouped-hardware.outputs.organized-metadata }}`);
-
-            let includeOnboard = metadata.onboard.flatMap(b => {
-              if (b.siblings) {
-                return b.siblings.map(board => ({
-                  board,
-                }));
-              } else {
-                return {
-                  board: b.id,
-                };
-              }
-            });
-
-            let includeInterconnect = Object.values(metadata.interconnects).flatMap(i =>
-              i.boards.flatMap(b =>
-                i.shields.flatMap(s => {
-                  if (s.siblings) {
-                    return s.siblings.map(shield => ({
-                      board: b.id,
-                      shield,
-                    }));
-                  } else {
-                    return {
-                      board: b.id,
-                      shield: s.id,
-                    };
-                  }
-                })
-              )
-            );
-
-            return [...includeOnboard, ...includeInterconnect];
-  get-grouped-hardware:
-    runs-on: ubuntu-latest
-    outputs:
-      organized-metadata: ${{ steps.organize-metadata.outputs.result }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-        with:
-          persist-credentials: false
-      - name: Use Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "14.x"
-      - name: Install js-yaml
-        run: npm install js-yaml
-      - name: Aggregate Metadata
-        uses: actions/github-script@v7
-        id: aggregate-metadata
-        with:
-          script: |
-            const fs = require('fs');
-            const yaml = require('js-yaml');
-
-            const globber = await glob.create("app/boards/**/*.zmk.yml");
-            const files = await globber.glob();
-
-            const aggregated = files.flatMap((f) =>
-              yaml.loadAll(fs.readFileSync(f, "utf8"))
-            );
-
-            return JSON.stringify(aggregated).replace(/\\/g,"\\\\").replace(/`/g,"\\`");
-          result-encoding: string
-
-      - name: Organize Metadata
-        uses: actions/github-script@v7
-        id: organize-metadata
-        with:
-          script: |
-            const hardware = JSON.parse(`${{ steps.aggregate-metadata.outputs.result }}`);
-
-            const grouped = hardware.reduce((agg, hm) => {
-              switch (hm.type) {
-                case "board":
-                  if (hm.features && hm.features.includes("keys")) {
-                    agg.onboard.push(hm);
-                  } else if (hm.exposes) {
-                    hm.exposes.forEach((element) => {
-                      let ic = agg.interconnects[element] || {
-                        boards: [],
-                        shields: [],
-                      };
-                      ic.boards.push(hm);
-                      agg.interconnects[element] = ic;
-                    });
-                  } else {
-                    console.error("Board without keys or interconnect");
-                  }
-                  break;
-                case "shield":
-                  if (hm.features && hm.features.includes("keys")) {
-                    hm.requires.forEach((id) => {
-                      let ic = agg.interconnects[id] || { boards: [], shields: [] };
-                      ic.shields.push(hm);
-                      agg.interconnects[id] = ic;
-                    });
-                  }
-                  break;
-                case "interconnect":
-                  let ic = agg.interconnects[hm.id] || { boards: [], shields: [] };
-                  ic.interconnect = hm;
-                  agg.interconnects[hm.id] = ic;
-                  break;
-              }
-              return agg;
-            },
-            { onboard: [], interconnects: {} });
-
-            return JSON.stringify(grouped).replace(/\\/g,"\\\\").replace(/`/g,"\\`");
-          result-encoding: string
-  get-changed-files:
-    if: ${{ github.event_name != 'schedule' }}
-    runs-on: ubuntu-latest
-    outputs:
-      changed-files: ${{ steps.changed-files.outputs.all_changed_files }}
-      board-changes: ${{ steps.board-changes.outputs.result }}
-      core-changes: ${{ steps.core-changes.outputs.result }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-        with:
-          persist-credentials: false
-      - uses: tj-actions/changed-files@9200e69727eb73eb060652b19946b8a2fdfb654b # pin to v45.0.8 due to https://github.com/tj-actions/changed-files/issues/2463 https://www.stepsecurity.io/blog/harden-runner-detection-tj-actions-changed-files-action-is-compromised
-        id: changed-files
-        with:
-          json: true
-          escape_json: false
-      - uses: actions/github-script@v7
-        id: board-changes
-        with:
-          script: |
-            const changedFiles = JSON.parse(`${{ steps.changed-files.outputs.all_changed_files }}`);
-            const boardChanges = changedFiles.filter(f => f.startsWith('app/boards'));
-            return boardChanges.length ? 'true' : 'false';
-          result-encoding: string
-      - uses: actions/github-script@v7
-        id: core-changes
-        with:
-          script: |
-            const changedFiles = JSON.parse(`${{ steps.changed-files.outputs.all_changed_files }}`);
-            const boardChanges = changedFiles.filter(f => f.startsWith('app/boards'));
-            const appChanges = changedFiles.filter(f => f.startsWith('app'));
-            const ymlChanges = changedFiles.includes('.github/workflows/build.yml');
-            return boardChanges.length < appChanges.length || ymlChanges ? 'true' : 'false';
-          result-encoding: string
+          name: "${{ steps.variables.outputs.artifact-name }}"
+          path: |
+            build/zephyr/zmk.hex
+            build/zephyr/zmk.uf2
+        continue-on-error: true
--- a/.github/workflows/clang-format-lint.yml
+++ b/.github/workflows/clang-format-lint.yml
@@ -0,0 +1,29 @@
+name: Clang Format
+
+on:
+  push:
+    paths:
+      - ".github/workflows/clang-format-lint.yml"
+      - "app/boards/**/*.c"
+      - "app/include/**/*.h"
+      - "app/src/**"
+      - "app/drivers/**/*.c"
+      - "app/drivers/**/*.h"
+  pull_request:
+    paths:
+      - ".github/workflows/clang-format-lint.yml"
+      - "app/boards/**/*.c"
+      - "app/include/**/*.h"
+      - "app/src/**"
+      - "app/drivers/**/*.c"
+      - "app/drivers/**/*.h"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: DoozyX/clang-format-lint-action@v0.13
+        with:
+          source: "./app"
+          extensions: "h,c"
--- a/.github/workflows/doc-checks.yml
+++ b/.github/workflows/doc-checks.yml
@@ -14,17 +14,27 @@ jobs:
  lint:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v2
      - uses: bahmutov/npm-install@v1
        with:
          working-directory: docs
      - name: ESLint
        run: npm run lint
        working-directory: docs
+  prettier:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: bahmutov/npm-install@v1
+        with:
+          working-directory: docs
+      - name: Prettier check
+        run: npm run prettier:check
+        working-directory: docs
  typecheck:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v2
      - uses: bahmutov/npm-install@v1
        with:
          working-directory: docs
--- a/.github/workflows/hardware-metadata-validation.yml
+++ b/.github/workflows/hardware-metadata-validation.yml
@@ -15,14 +15,25 @@ on:
      - "app/scripts/west_commands/metadata.py"

 jobs:
+  check-metadata-format:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2
+      - uses: bahmutov/npm-install@v1
+        with:
+          working-directory: app
+      - name: Prettier Check
+        run: npm run prettier:check
+        working-directory: app
  validate-metadata:
    runs-on: ubuntu-latest
    container:
-      image: docker.io/zmkfirmware/zmk-dev-arm:4.1
+      image: docker.io/zmkfirmware/zmk-dev-arm:2.5
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v2
      - name: Install dependencies
-        run: pip install --break-system-packages -r app/scripts/requirements.txt
+        run: pip install -r app/scripts/requirements.txt
      - name: West init
        run: west init -l app
      - name: Update modules (west update)
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -1,15 +0,0 @@
-name: pre-commit
-
-on:
-  pull_request:
-  push:
-
-jobs:
-  pre-commit:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-python@v5
-        with:
-          python-version: 3.x
-      - uses: pre-commit/action@v3.0.1
--- a/.github/workflows/release-please.yml
+++ b/.github/workflows/release-please.yml
@@ -1,80 +0,0 @@
-on:
-  push:
-    branches:
-      - main
-      - "v*.*-branch"
-
-permissions:
-  contents: write
-  pull-requests: write
-
-name: release-please
-
-jobs:
-  handle-commit:
-    name: Handle new commit
-    runs-on: ubuntu-latest
-    outputs:
-      release_created: ${{ steps.release.outputs.release_created }}
-      major: ${{ steps.release.outputs.major }}
-      minor: ${{ steps.release.outputs.minor }}
-      patch: ${{ steps.release.outputs.patch }}
-    steps:
-      - uses: googleapis/release-please-action@v4
-        id: release
-        with:
-          token: ${{ secrets.ZMK_RELEASE_PLEASE_TOKEN }}
-          target-branch: ${{ github.ref_name }}
-
-  release-new-version:
-    name: Release new version
-    needs: handle-commit
-    runs-on: ubuntu-latest
-    if: ${{ needs.handle-commit.outputs.release_created }}
-    env:
-      ZMK_RELEASE_PLEASE_TOKEN: ${{ secrets.ZMK_RELEASE_PLEASE_TOKEN }}
-      VERSION: v${{ needs.handle-commit.outputs.major }}.${{ needs.handle-commit.outputs.minor }}
-    steps:
-      - uses: actions/checkout@v5
-
-      - name: Create major.minor branch
-        if: ${{ needs.handle-commit.outputs.patch == '0' }}
-        run: |
-          git remote add gh-token-branch "https://x-access-token:$ZMK_RELEASE_PLEASE_TOKEN@github.com/${{ github.repository }}.git"
-          git checkout -b $VERSION-branch
-          git push gh-token-branch $VERSION-branch
-
-      - name: tag major and minor versions
-        run: |
-          git config user.name github-actions[bot]
-          git config user.email 41898282+github-actions[bot]@users.noreply.github.com
-          git remote add gh-token "https://x-access-token:$ZMK_RELEASE_PLEASE_TOKEN@github.com/${{ github.repository }}.git"
-          git tag -d $VERSION || true
-          git tag -a $VERSION -m "Release $VERSION"
-          git push --force gh-token $VERSION
-
-  bump-user-config-template-version:
-    name: Bump user config template version
-    needs: handle-commit
-    runs-on: ubuntu-latest
-    if: ${{ needs.handle-commit.outputs.release_created }}
-    env:
-      ZMK_RELEASE_PLEASE_TOKEN: ${{ secrets.ZMK_RELEASE_PLEASE_TOKEN }}
-      VERSION: v${{ needs.handle-commit.outputs.major }}.${{ needs.handle-commit.outputs.minor }}
-    steps:
-      - name: Bump user config template
-        run: |
-          if [ -z "$VERSION" ]; then
-            echo "VERSION is not set, exiting."
-            exit 1
-          fi
-
-          git clone "https://x-access-token:$ZMK_RELEASE_PLEASE_TOKEN@github.com/zmkfirmware/unified-zmk-config-template.git"
-          cd unified-zmk-config-template
-          git config user.name github-actions[bot]
-          git config user.email 41898282+github-actions[bot]@users.noreply.github.com
-          sed -i 's/^\(\s*\)revision: .*/\1revision: '"$VERSION"'/' config/west.yml
-          sed -i 's|uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@.*|uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@'"$VERSION"'|' .github/workflows/build.yml
-          git add .
-          git commit -m "Version bump to $VERSION"
-          git push origin main
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -1,28 +0,0 @@
-name: "Mark and close stale PRs in the repo"
-on:
-  schedule:
-    - cron: "00 14 * * *" # runs daily at 14:00 https://crontab.guru/#00_14_*_*_*
-
-jobs:
-  stale:
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/stale@v10.2.0
-        with:
-          days-before-pr-stale: 300 # ~10 months
-          stale-pr-label: "stale"
-          stale-pr-message: >
-            This PR has been automatically marked as stale because it has not
-            had activity in 10 months. It will be closed in 14 days if no
-            further activity occurs. Feel free to give a status update or
-            re-open when it has been rebased and is ready for review (again).
-            Thanks!
-          days-before-pr-close: 14
-          close-pr-message: >
-            This PR was closed because it had no activity for over 10 months.
-            Feel free to give a status update or re-open when it has been
-            rebased and is ready for review (again).
-          days-before-issue-stale: 1000 # ~3 years
-          days-before-issue-close: -1
-          ascending: true # Process older PRs first
-          operations-per-run: 30 # Default value, listed here again to make it explicit
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -4,45 +4,24 @@ on:
  push:
    paths:
      - ".github/workflows/test.yml"
-      - "app/run-test.sh"
      - "app/tests/**"
      - "app/src/**"
-      - "app/include/**"
  pull_request:
    paths:
      - ".github/workflows/test.yml"
-      - "app/run-test.sh"
      - "app/tests/**"
      - "app/src/**"
-      - "app/include/**"

 jobs:
-  collect-tests:
-    outputs:
-      test-dirs: ${{ steps.test-dirs.outputs.test-dirs }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-      - name: Find test directories
-        id: test-dirs
-        run: |
-          cd app/tests/
-          export TESTS=$(ls -d * | grep -v ble | jq -R -s -c 'split("\n")[:-1]')
-          echo "test-dirs=${TESTS}" >> $GITHUB_OUTPUT
-  run-tests:
-    needs: collect-tests
-    strategy:
-      matrix:
-        test: ${{ fromJSON(needs.collect-tests.outputs.test-dirs) }}
+  integration_test:
    runs-on: ubuntu-latest
    container:
-      image: docker.io/zmkfirmware/zmk-build-arm:4.1
+      image: docker.io/zmkfirmware/zmk-build-arm:2.5
    steps:
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v2
      - name: Cache west modules
-        uses: actions/cache@v4
+        uses: actions/cache@v2
        env:
          cache-name: cache-zephyr-modules
        with:
@@ -51,25 +30,24 @@ jobs:
            tools/
            zephyr/
            bootloader/
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('app/west.yml') }}
+          key: 4-${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('app/west.yml') }}
          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
+            4-${{ runner.os }}-build-${{ env.cache-name }}-
+            4-${{ runner.os }}-build-
+            4-${{ runner.os }}-
        timeout-minutes: 2
        continue-on-error: true
      - name: Initialize workspace (west init)
        run: west init -l app
      - name: Update modules (west update)
-        run: west update --fetch-opt=--filter=tree:0
+        run: west update
      - name: Export Zephyr CMake package (west zephyr-export)
        run: west zephyr-export
-      - name: Test ${{ matrix.test }}
-        working-directory: app
-        run: ZMK_TESTS_VERBOSE=1 west test tests/${{ matrix.test }}
+      - name: Test all
+        run: west test
      - name: Archive artifacts
        if: ${{ always() }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
        with:
-          name: "${{ matrix.test }}-log-files"
+          name: "log-files"
          path: app/build/**/*.log
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,9 @@
 /.west
 /bootloader
 /modules
-/optional
 /tools
 /zephyr
 /zmk-config
 /build
-
-# macOS
 *.DS_Store
-
-# Python
 __pycache__
-.python-version
-.venv
-
-# clangd
-app/.cache/
--- a/.gitlint
+++ b/.gitlint
@@ -1,138 +0,0 @@
-# Edit this file as you like.
-#
-# All these sections are optional. Each section with the exception of [general] represents
-# one rule and each key in it is an option for that specific rule.
-#
-# Rules and sections can be referenced by their full name or by id. For example
-# section "[body-max-line-length]" could also be written as "[B1]". Full section names are
-# used in here for clarity.
-#
-[general]
-# Ignore certain rules, this example uses both full name and id
-# ignore=title-trailing-punctuation, T3
-
-# verbosity should be a value between 1 and 3, the commandline -v flags take precedence over this
-# verbosity = 2
-
-# By default gitlint will ignore merge, revert, fixup, fixup=amend, and squash commits.
-# ignore-merge-commits=true
-# ignore-revert-commits=true
-# ignore-fixup-commits=true
-# ignore-fixup-amend-commits=true
-# ignore-squash-commits=true
-
-# Ignore any data sent to gitlint via stdin
-# ignore-stdin=true
-
-# Fetch additional meta-data from the local repository when manually passing a
-# commit message to gitlint via stdin or --commit-msg. Disabled by default.
-# staged=true
-
-# Hard fail when the target commit range is empty. Note that gitlint will
-# already fail by default on invalid commit ranges. This option is specifically
-# to tell gitlint to fail on *valid but empty* commit ranges.
-# Disabled by default.
-# fail-without-commits=true
-
-# Whether to use Python `search` instead of `match` semantics in rules that use
-# regexes. Context: https://github.com/jorisroovers/gitlint/issues/254
-# Disabled by default, but will be enabled by default in the future.
-# regex-style-search=true
-
-# Enable debug mode (prints more output). Disabled by default.
-# debug=true
-
-# Enable community contributed rules
-# See http://jorisroovers.github.io/gitlint/contrib_rules for details
-contrib=contrib-title-conventional-commits,CT1,contrib-disallow-cleanup-commits,CC2
-
-# Set the extra-path where gitlint will search for user defined rules
-# See http://jorisroovers.github.io/gitlint/user_defined_rules for details
-# extra-path=examples/
-
-[title-max-length]
-line-length=80
-
-# Conversely, you can also enforce minimal length of a title with the
-# "title-min-length" rule:
-# [title-min-length]
-# min-length=5
-
-# [title-must-not-contain-word]
-# Comma-separated list of words that should not occur in the title. Matching is case
-# insensitive. It's fine if the keyword occurs as part of a larger word (so "WIPING"
-# will not cause a violation, but "WIP: my title" will.
-# words=wip
-
-# [title-match-regex]
-# python-style regex that the commit-msg title must match
-# Note that the regex can contradict with other rules if not used correctly
-# (e.g. title-must-not-contain-word).
-# regex=^US[0-9]*
-
-# [body-max-line-length]
-# line-length=72
-
-# [body-min-length]
-# min-length=5
-
-# [body-is-missing]
-# Whether to ignore this rule on merge commits (which typically only have a title)
-# default = True
-# ignore-merge-commits=false
-
-# [body-changed-file-mention]
-# List of files that need to be explicitly mentioned in the body when they are changed
-# This is useful for when developers often erroneously edit certain files or git submodules.
-# By specifying this rule, developers can only change the file when they explicitly reference
-# it in the commit message.
-# files=gitlint-core/gitlint/rules.py,README.md
-
-# [body-match-regex]
-# python-style regex that the commit-msg body must match.
-# E.g. body must end in My-Commit-Tag: foo
-# regex=My-Commit-Tag: foo$
-
-# [author-valid-email]
-# python-style regex that the commit author email address must match.
-# For example, use the following regex if you only want to allow email addresses from foo.com
-# regex=[^@]+@foo.com
-
-# [ignore-by-title]
-# Ignore certain rules for commits of which the title matches a regex
-# E.g. Match commit titles that start with "Release"
-# regex=^Release(.*)
-
-# Ignore certain rules, you can reference them by their id or by their full name
-# Use 'all' to ignore all rules
-# ignore=T1,body-min-length
-
-# [ignore-by-body]
-# Ignore certain rules for commits of which the body has a line that matches a regex
-# E.g. Match bodies that have a line that that contain "release"
-# regex=(.*)release(.*)
-#
-# Ignore certain rules, you can reference them by their id or by their full name
-# Use 'all' to ignore all rules
-# ignore=T1,body-min-length
-
-# [ignore-body-lines]
-# Ignore certain lines in a commit body that match a regex.
-# E.g. Ignore all lines that start with 'Co-Authored-By'
-# regex=^Co-Authored-By
-
-# [ignore-by-author-name]
-# Ignore certain rules for commits of which the author name matches a regex
-# E.g. Match commits made by dependabot
-# regex=(.*)dependabot(.*)
-#
-# Ignore certain rules, you can reference them by their id or by their full name
-# Use 'all' to ignore all rules
-# ignore=T1,body-min-length
-
-# This is a contrib rule - a community contributed rule. These are disabled by default.
-# You need to explicitly enable them one-by-one by adding them to the "contrib" option
-# under [general] section above.
-# [contrib-title-conventional-commits]
-# Specify allowed commit types. For details see: https://www.conventionalcommits.org/
-# types = bugfix,user-story,epic
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,36 +1,12 @@
 fail_fast: false
 repos:
-  - repo: https://github.com/Lucas-C/pre-commit-hooks
-    rev: v1.5.1
-    hooks:
-      - id: remove-tabs
-        exclude: "vendor-prefixes\\.txt$|.git/COMMIT_EDITMSG"
-  - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v18.1.8
+  - repo: https://github.com/pocc/pre-commit-hooks
+    rev: v1.1.1
    hooks:
      - id: clang-format
-        types_or: [c++, c]
        args:
          - -i
-  - repo: https://github.com/rbubley/mirrors-prettier
-    rev: 787fb9f542b140ba0b2aced38e6a3e68021647a3
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v2.2.1
    hooks:
      - id: prettier
-        exclude: |
-          (?x)^(
-              .git/COMMIT_EDITMSG|
-              CHANGELOG.md|
-              .release-please-manifest.json
-          )$
-  - repo: https://github.com/jorisroovers/gitlint
-    rev: v0.19.1
-    hooks:
-      - id: gitlint
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
-    hooks:
-      - id: trailing-whitespace
-      - id: check-yaml
-      - id: check-added-large-files
-      - id: check-shebang-scripts-are-executable
-        exclude: "\\.mustache$"
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1 +0,0 @@
-{".":"0.3.0"}
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,11 +0,0 @@
-{
-  "recommendations": [
-    "esbenp.prettier-vscode",
-    "ms-python.black-formatter",
-    "ms-python.python",
-    "ms-vscode.cpptools",
-    "plorefice.devicetree",
-    "twxs.cmake",
-    "unifiedjs.vscode-mdx"
-  ]
-}
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -2,21 +2,5 @@
  "files.associations": {
    "*.overlay": "dts",
    "*.keymap": "dts"
-  },
-  "python.analysis.include": ["app/scripts", "zephyr/scripts"],
-  "[c]": {
-    "editor.formatOnSave": true
-  },
-  "[javascript][javascriptreact][typescript][typescriptreact]": {
-    "editor.formatOnSave": true,
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "[python]": {
-    "editor.formatOnSave": true,
-    "editor.defaultFormatter": "ms-python.black-formatter"
-  },
-  "[css][json][jsonc][html][markdown][yaml]": {
-    "editor.formatOnSave": true,
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
  }
 }
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,116 +0,0 @@
-# Changelog
-
-## [0.3.0](https://github.com/zmkfirmware/zmk/compare/v0.2.1...v0.3.0) (2025-08-01)
-
-
-### Features
-
-* **ble:** Add function to get profile address by index ([#2992](https://github.com/zmkfirmware/zmk/issues/2992)) ([9e905d6](https://github.com/zmkfirmware/zmk/commit/9e905d65936348824588dc3f424755353ac61186))
-* **ci:** Add stale GitHub Action to automatically close stale PRs ([#2924](https://github.com/zmkfirmware/zmk/issues/2924)) ([6d7bbc8](https://github.com/zmkfirmware/zmk/commit/6d7bbc8670d175fd63e8c834feb41f80e7b52e74))
-* **display:** nice!view individual profile status ([#2265](https://github.com/zmkfirmware/zmk/issues/2265)) ([d09087f](https://github.com/zmkfirmware/zmk/commit/d09087f4dc280b8fdb1d32d63b03cc10162b89ce))
-* Full-Duplex Wired Split ([#2766](https://github.com/zmkfirmware/zmk/issues/2766)) ([147c340](https://github.com/zmkfirmware/zmk/commit/147c340c6e8d377304acfdd64dc86cf83ebdfef2))
-* **metadata:** Add metadata to the mouse_key_press behavior ([#2950](https://github.com/zmkfirmware/zmk/issues/2950)) ([239baa4](https://github.com/zmkfirmware/zmk/commit/239baa487509ace108d36f0e5c627d61a3d95f53))
-* **pointing:** Allow peripheral input processing to stop propagation ([#2844](https://github.com/zmkfirmware/zmk/issues/2844)) ([462d48b](https://github.com/zmkfirmware/zmk/commit/462d48b78edac8bedb75666699ea4fa446d2152c))
-* **shield:** Add underglow for reviung5 ([#2191](https://github.com/zmkfirmware/zmk/issues/2191)) ([ad6a181](https://github.com/zmkfirmware/zmk/commit/ad6a181d7ec34fb6e31134f6bb991a9b2d0b8f78))
-* **shields:** Add a physical layout for a_dux ([#3000](https://github.com/zmkfirmware/zmk/issues/3000)) ([7292df0](https://github.com/zmkfirmware/zmk/commit/7292df02d4b05d783f432f8658de22d940909fe4))
-* **shields:** Add physical layouts for tester_xiao and tester_pro_micro ([#2852](https://github.com/zmkfirmware/zmk/issues/2852)) ([eb170c9](https://github.com/zmkfirmware/zmk/commit/eb170c930f56e3fb3df0b813d987abfd1dc31b9a))
-* **shields:** Add tester_pro_micro layouts ([eb170c9](https://github.com/zmkfirmware/zmk/commit/eb170c930f56e3fb3df0b813d987abfd1dc31b9a))
-* **shields:** Add tester_xiao layouts ([eb170c9](https://github.com/zmkfirmware/zmk/commit/eb170c930f56e3fb3df0b813d987abfd1dc31b9a))
-* **split:** Add full-duplex wired split support ([147c340](https://github.com/zmkfirmware/zmk/commit/147c340c6e8d377304acfdd64dc86cf83ebdfef2))
-* **split:** Runtime selection of split transport ([6b44d33](https://github.com/zmkfirmware/zmk/commit/6b44d33db2f4bad7d98e475e6f7968493b05af73))
-* **split:** Runtime selection of split transport ([#2886](https://github.com/zmkfirmware/zmk/issues/2886)) ([6b44d33](https://github.com/zmkfirmware/zmk/commit/6b44d33db2f4bad7d98e475e6f7968493b05af73))
-* **split:** Suspend/resume wired UART devices. ([6b44d33](https://github.com/zmkfirmware/zmk/commit/6b44d33db2f4bad7d98e475e6f7968493b05af73))
-
-
-### Bug Fixes
-
-* **behaviors:** Correct macro release state for parametrized ([1bac680](https://github.com/zmkfirmware/zmk/commit/1bac680c4fb4f07e43c01754b6f1e72dab455e50))
-* **behaviors:** Correct macro release state for parametrized macros ([#2942](https://github.com/zmkfirmware/zmk/issues/2942)) ([1bac680](https://github.com/zmkfirmware/zmk/commit/1bac680c4fb4f07e43c01754b6f1e72dab455e50))
-* **ble,hid:** Fix smooth scrolling over BLE ([#2998](https://github.com/zmkfirmware/zmk/issues/2998)) ([342d838](https://github.com/zmkfirmware/zmk/commit/342d83891301b1be53233a12c7723bb99cbe5ff6)), closes [#2957](https://github.com/zmkfirmware/zmk/issues/2957)
-* **boards:** Disable high voltage DC-DC by default ([#2995](https://github.com/zmkfirmware/zmk/issues/2995)) ([8059e67](https://github.com/zmkfirmware/zmk/commit/8059e671b24a261939401afb5a65c4fa756adc2d)), closes [#2990](https://github.com/zmkfirmware/zmk/issues/2990)
-* changed shebang to make scripts more platform independent ([#2893](https://github.com/zmkfirmware/zmk/issues/2893)) ([84772eb](https://github.com/zmkfirmware/zmk/commit/84772ebf14e5a7c67ba573a61f0a50048802c799))
-* **ci:** pin tj-actions/changed-files due to compromise ([#2874](https://github.com/zmkfirmware/zmk/issues/2874)) ([4da89bd](https://github.com/zmkfirmware/zmk/commit/4da89bd99716bf6c1d7d788f3cdaec4cee7403e9))
-* **combos:** Properly clean up all old candidates. ([#2928](https://github.com/zmkfirmware/zmk/issues/2928)) ([e3030bf](https://github.com/zmkfirmware/zmk/commit/e3030bfcc87b7f511b0ebe993fb1f1f06215982e))
-* **combos:** Restore prompts for two deprecated Kconfigs ([#2926](https://github.com/zmkfirmware/zmk/issues/2926)) ([00ff486](https://github.com/zmkfirmware/zmk/commit/00ff48693113ed74a3345aa1ac81fdea302b3a09))
-* **core:** Correctly sync BAS battery level ([#2977](https://github.com/zmkfirmware/zmk/issues/2977)) ([af96766](https://github.com/zmkfirmware/zmk/commit/af967667b0e139a963178e63028c7be341cade9e))
-* **display:** Make stock battery widget depend on the right symbol ([#2953](https://github.com/zmkfirmware/zmk/issues/2953)) ([9da5d3b](https://github.com/zmkfirmware/zmk/commit/9da5d3ba82b38b74ad798a82a838d84c52220bbe))
-* **docs:** Fix soft off waker configuration example ([#2960](https://github.com/zmkfirmware/zmk/issues/2960)) ([eb99b4e](https://github.com/zmkfirmware/zmk/commit/eb99b4ede06bc01674ce16217ebbad40bc11ec50))
-* **docs:** remove title as alt text ([#2922](https://github.com/zmkfirmware/zmk/issues/2922)) ([d9576c5](https://github.com/zmkfirmware/zmk/commit/d9576c55346acfc8eed36709aaae28f91e0d06ad))
-* Fix build with Studio and USB but not UART ([#2996](https://github.com/zmkfirmware/zmk/issues/2996)) ([cef7af4](https://github.com/zmkfirmware/zmk/commit/cef7af4408cc44c20fab93a0b2e20b3429d0a98e))
-* **hid:** Fix scroll value truncation ([#2865](https://github.com/zmkfirmware/zmk/issues/2865)) ([2c0e7da](https://github.com/zmkfirmware/zmk/commit/2c0e7daced1421c34a9d417b7d3e9bccbf0ebd7f)), closes [#2864](https://github.com/zmkfirmware/zmk/issues/2864)
-* **pointing:** Avoids mutex leak for default layer toggle event ([#2934](https://github.com/zmkfirmware/zmk/issues/2934)) ([461f5c8](https://github.com/zmkfirmware/zmk/commit/461f5c832fb8854d87dca54d113d306323697219))
-* Properly override stack size on RP2040 ([147c340](https://github.com/zmkfirmware/zmk/commit/147c340c6e8d377304acfdd64dc86cf83ebdfef2))
-* **split:** add source to battery event ([#2901](https://github.com/zmkfirmware/zmk/issues/2901)) ([6f85f48](https://github.com/zmkfirmware/zmk/commit/6f85f48b19afae04f98e9abacb36ce1425b61f78))
-* **split:** Compile and run properly in wired polling mode. ([#3012](https://github.com/zmkfirmware/zmk/issues/3012)) ([2ae5185](https://github.com/zmkfirmware/zmk/commit/2ae51854192aed92af95536f79547e2928cd1bf5))
-* **split:** Conditionally build all split code ([#2884](https://github.com/zmkfirmware/zmk/issues/2884)) ([5bb39ec](https://github.com/zmkfirmware/zmk/commit/5bb39ec3eae23055593350cb3689a8240028181e))
-* **split:** Enable wired split by default if DTS is set ([#3010](https://github.com/zmkfirmware/zmk/issues/3010)) ([1530ae3](https://github.com/zmkfirmware/zmk/commit/1530ae36c22e3e2285e895737c74de5d960a5ae4))
-* **split:** Minor wired split fixes. ([6b44d33](https://github.com/zmkfirmware/zmk/commit/6b44d33db2f4bad7d98e475e6f7968493b05af73))
-* Unconditionally define HID payloads to avoid error. ([6b44d33](https://github.com/zmkfirmware/zmk/commit/6b44d33db2f4bad7d98e475e6f7968493b05af73))
-
-## [0.2.1](https://github.com/zmkfirmware/zmk/compare/v0.2.0...v0.2.1) (2025-03-02)
-
-
-### Bug Fixes
-
-* **behaviors:** Proper comma separated device list ([#2850](https://github.com/zmkfirmware/zmk/issues/2850)) ([f20e6ea](https://github.com/zmkfirmware/zmk/commit/f20e6ea7594b49eef1e3acc017529073a0409962))
-
-## [0.2.0](https://github.com/zmkfirmware/zmk/compare/v0.1.0...v0.2.0) (2025-03-01)
-
-
-### Features
-
-* Added `toggle-mode`, allowing toggle-on and toggle-off ([#2555](https://github.com/zmkfirmware/zmk/issues/2555)) ([4ef231f](https://github.com/zmkfirmware/zmk/commit/4ef231f4bba87151acfbd1cf3babd83b69813e45))
-* added toggle mode to key and layer toggles ([4ef231f](https://github.com/zmkfirmware/zmk/commit/4ef231f4bba87151acfbd1cf3babd83b69813e45))
-* **boards:** Update for mikoto board definition ([#1946](https://github.com/zmkfirmware/zmk/issues/1946)) ([b26058b](https://github.com/zmkfirmware/zmk/commit/b26058b6c7c83f8d1f095d2f9c6c3998b391a61b))
-* **core:** Make physical layout key rotation optional ([#2770](https://github.com/zmkfirmware/zmk/issues/2770)) ([c367d8f](https://github.com/zmkfirmware/zmk/commit/c367d8f636f0842b414c2b58df6101761cdd676d))
-* **display:** Add ability to set display on/off pin. ([#2814](https://github.com/zmkfirmware/zmk/issues/2814)) ([627e6db](https://github.com/zmkfirmware/zmk/commit/627e6dbec99211b3d7cce55904fb1c824ed87bf3))
-* **display:** Add config for display update period ([#2819](https://github.com/zmkfirmware/zmk/issues/2819)) ([aa3e5dd](https://github.com/zmkfirmware/zmk/commit/aa3e5dd70fdd1b364fa9ad26f14425be613d180c))
-* input processor behavior invocation ([#2714](https://github.com/zmkfirmware/zmk/issues/2714)) ([cb867f9](https://github.com/zmkfirmware/zmk/commit/cb867f92dbe4e32675c2137fc6aa914a44ecc8dc))
-* **Kconfig:** Allow overriding ZMK Kconfig defaults ([#2537](https://github.com/zmkfirmware/zmk/issues/2537)) ([40925d4](https://github.com/zmkfirmware/zmk/commit/40925d48e67b3eeaeb3e848a2287ed628de9f674))
-* **mouse:** Add mouse move and scroll support ([#2477](https://github.com/zmkfirmware/zmk/issues/2477)) ([6b40bfd](https://github.com/zmkfirmware/zmk/commit/6b40bfda53571f7a960ccc448aa87f29da7496ac))
-* **pointing:** Add behavior input processor ([cb867f9](https://github.com/zmkfirmware/zmk/commit/cb867f92dbe4e32675c2137fc6aa914a44ecc8dc))
-* **pointing:** Add pre-defined scroll scaler ([0f7c112](https://github.com/zmkfirmware/zmk/commit/0f7c11248a1ddb7c6559064c2a1e7a3c446d5d55))
-* **pointing:** Add pre-defined scroll scaler and mouse scroll tests ([#2759](https://github.com/zmkfirmware/zmk/issues/2759)) ([0f7c112](https://github.com/zmkfirmware/zmk/commit/0f7c11248a1ddb7c6559064c2a1e7a3c446d5d55))
-* **shields:** Add physical layout for Lotus58 ([#2753](https://github.com/zmkfirmware/zmk/issues/2753)) ([424e532](https://github.com/zmkfirmware/zmk/commit/424e53210ea16c2287abaf770ebf45be432d841a))
-* **studio:** Add ortho_4x10 grid layout ([#2651](https://github.com/zmkfirmware/zmk/issues/2651)) ([7e8c542](https://github.com/zmkfirmware/zmk/commit/7e8c542c94908ac011ec7272a5f8ab10d2102632))
-
-
-### Bug Fixes
-
-* allow kscan-composite to wake up device. ([#2682](https://github.com/zmkfirmware/zmk/issues/2682)) ([a8f5ab6](https://github.com/zmkfirmware/zmk/commit/a8f5ab67b5d449a2624e2de7ddfb264da778ea6c))
-* **behaviors:** Make multiple sticky keys work on same key position ([7186528](https://github.com/zmkfirmware/zmk/commit/7186528f77bf077173927c1c8506b4d434e5c371))
-* **behaviors:** Make multiple sticky keys work on same key position ([#2758](https://github.com/zmkfirmware/zmk/issues/2758)) ([7186528](https://github.com/zmkfirmware/zmk/commit/7186528f77bf077173927c1c8506b4d434e5c371))
-* **ble:** enforce maximum length for dynamic device name ([#2784](https://github.com/zmkfirmware/zmk/issues/2784)) ([ea267b0](https://github.com/zmkfirmware/zmk/commit/ea267b0f35f862b882ac568dde6365c3a0c85099))
-* **combos:** Properly report combos len with emply block ([#2739](https://github.com/zmkfirmware/zmk/issues/2739)) ([f0a77b8](https://github.com/zmkfirmware/zmk/commit/f0a77b888ac482a863386ced08e04660ddacb026))
-* **display:** Only default mono theme when 1bpp ([#2804](https://github.com/zmkfirmware/zmk/issues/2804)) ([425256b](https://github.com/zmkfirmware/zmk/commit/425256bc0de7ed08802533b170abba78ee90f546))
-* **display:** POSIX lvgl fixes ([#2812](https://github.com/zmkfirmware/zmk/issues/2812)) ([4b4a8a3](https://github.com/zmkfirmware/zmk/commit/4b4a8a35f3f90f1af75cdf5d9c26b47d4b8dcabb))
-* **drivers:** Proper static/const for data/config ([#2769](https://github.com/zmkfirmware/zmk/issues/2769)) ([6941abc](https://github.com/zmkfirmware/zmk/commit/6941abc2afab16502cff9c5149d8dc0fcd5112c9))
-* Fix warnings in nanopb encoding code ([#2643](https://github.com/zmkfirmware/zmk/issues/2643)) ([7013158](https://github.com/zmkfirmware/zmk/commit/7013158a6715d94b34e8c471ce25bb5005f3bb49))
-* Kconfig refactor now works correctly with external modules ([#2711](https://github.com/zmkfirmware/zmk/issues/2711)) ([bb48661](https://github.com/zmkfirmware/zmk/commit/bb486619a183f6df7fbb4620c80164555a22da0b))
-* **Kconfig:** Added a name to EC11's trigger mode choice ([40925d4](https://github.com/zmkfirmware/zmk/commit/40925d48e67b3eeaeb3e848a2287ed628de9f674))
-* **kscan:** Remove warning when keyboard is built without CONFIG_PM_DEVICE ([#2808](https://github.com/zmkfirmware/zmk/issues/2808)) ([8e065d5](https://github.com/zmkfirmware/zmk/commit/8e065d55b916481ef06ce37cddedb84cf1d15d99))
-* **pointing:** Complete header rename missed in refactor ([#2702](https://github.com/zmkfirmware/zmk/issues/2702)) ([84baf92](https://github.com/zmkfirmware/zmk/commit/84baf929c9bb95f255d4bafd0e57f2ec47455fca))
-* **pointing:** Temp layer threading protection. ([#2729](https://github.com/zmkfirmware/zmk/issues/2729)) ([1e3e62c](https://github.com/zmkfirmware/zmk/commit/1e3e62c13d0666d98831ee302ae2fb17e68196c9))
-* **studio:** Allow adding layers after a layer move ([#2748](https://github.com/zmkfirmware/zmk/issues/2748)) ([36508c2](https://github.com/zmkfirmware/zmk/commit/36508c27fddfb84d912e0122e313ad3904ceb946))
-* **studio:** Properly return complete keymap from RPC ([#2696](https://github.com/zmkfirmware/zmk/issues/2696)) ([0820991](https://github.com/zmkfirmware/zmk/commit/0820991901a95ab7a0eb1f1cc608a631d514e26c))
-
-## 0.1.0 (2024-11-29)
-
-
-### Features
-
-* **boards:** Add glove80 nexus node for extension GPIO. ([#2594](https://github.com/zmkfirmware/zmk/issues/2594)) ([fb359f5](https://github.com/zmkfirmware/zmk/commit/fb359f576619940164ca2e770b49b7b34f13428e))
-* **boards:** add nrf52833-nosd snippet ([63af296](https://github.com/zmkfirmware/zmk/commit/63af296b6efd8d677d584f372c9da9a4fedaa496))
-* **boards:** add nrf52840-nosd snippet ([4438b7b](https://github.com/zmkfirmware/zmk/commit/4438b7b835bfd1d4e89cdd955a4ab0fd2e2ae3bf))
-* **ci:** Add release-please automation with VERSION ([#2622](https://github.com/zmkfirmware/zmk/issues/2622)) ([ffa485c](https://github.com/zmkfirmware/zmk/commit/ffa485c11b48444acf3adf1e3c1cb3eed16fad94))
-* **drivers:** Support init high/low in 595 driver ([888c0d9](https://github.com/zmkfirmware/zmk/commit/888c0d966cd52f3ab5145992f61b14d6262c1951))
-
-
-### Bug Fixes
-
-* **boards:** Disable uart serial node in Xiao BLE by default ([#2672](https://github.com/zmkfirmware/zmk/issues/2672)) ([230b860](https://github.com/zmkfirmware/zmk/commit/230b860f31063774c3bcc19afb6f92479462de24))
-* **boards:** Fix typo in BT75 metadata ([c9553c3](https://github.com/zmkfirmware/zmk/commit/c9553c31e3a3f39964391b006492995b5bb09c39))
-* Disable display feature for settings_reset ([b0f5789](https://github.com/zmkfirmware/zmk/commit/b0f5789b128f0f5599341398898fdb0e0407b2d3))
-* Fix inconsistent column offset property ([c7473fc](https://github.com/zmkfirmware/zmk/commit/c7473fc32557d2d384ab78d3acf51a05488f0214))
-* include a header file for RC macros ([#2649](https://github.com/zmkfirmware/zmk/issues/2649)) ([f8eff2f](https://github.com/zmkfirmware/zmk/commit/f8eff2fe34609c91211c25113f9d7db09f7d1689))
-* **studio:** Improved error message when keyboard is missing a physical layout. ([fed66a9](https://github.com/zmkfirmware/zmk/commit/fed66a92d000f4c8e0019d9ccdd167271324e8e9))
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -86,12 +86,6 @@ documentation to areas not currently covered are greatly appreciated.
 ZMK uses `prettier` to format documentation files. You can run prettier with `npm run prettier:format`.
 You can setup git to run prettier automatically when you commit by installing the pre-commit hooks: `pip3 install pre-commit`, `pre-commit install`.

-### Linting
-
-This repository utilizes ESLint for code linting to ensure consistent code style and identify potential errors or bugs early in the development process.
-
-You can run ESLint with `npm run lint` to verify your changes.
-
 ## Code Contributions

 ### Development Setup
--- a/README.md
+++ b/README.md
@@ -4,10 +4,10 @@
 [![Build](https://github.com/zmkfirmware/zmk/workflows/Build/badge.svg)](https://github.com/zmkfirmware/zmk/actions)
 [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](CODE_OF_CONDUCT.md)

-[ZMK Firmware](https://zmk.dev/) is an open source ([MIT](LICENSE)) keyboard firmware built on the [Zephyr™ Project](https://www.zephyrproject.org/) Real Time Operating System (RTOS). ZMK's goal is to provide a modern, wireless, and powerful firmware free of licensing issues.
+[ZMK Firmware](https://zmk.dev/) is an open source (MIT) keyboard firmware built on the [Zephyr™ Project](https://www.zephyrproject.org/) Real Time Operating System (RTOS). ZMK's goal is to provide a modern, wireless, and powerful firmware free of licensing issues.

-Check out the website to learn more: https://zmk.dev/.
+Check out the website to learn more: https://zmk.dev/

-You can also come join our [ZMK Discord Server](https://zmk.dev/community/discord/invite).
+You can also come join our [ZMK Discord Server](https://zmk.dev/community/discord/invite)

 To review features, check out the [feature overview](https://zmk.dev/docs/). ZMK is under active development, and new features are listed with the [enhancement label](https://github.com/zmkfirmware/zmk/issues?q=is%3Aissue+is%3Aopen+label%3Aenhancement) in GitHub. Please feel free to add 👍 to the issue description of any requests to upvote the feature.
--- a/app/.prettierrc.js
+++ b/app/.prettierrc.js
@@ -1,4 +1,3 @@
 module.exports = {
    endOfLine: "auto",
-  trailingComma: "es5",
 };
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -1,59 +1,53 @@
 cmake_minimum_required(VERSION 3.13.1)

 set(CONFIG_APPLICATION_DEFINED_SYSCALL true)
+list(APPEND BOARD_ROOT ${CMAKE_SOURCE_DIR})
+list(APPEND DTS_ROOT ${CMAKE_SOURCE_DIR})

-set(ZEPHYR_BOARD_ALIASES "boards/aliases.cmake")
-set(ZEPHYR_EXTRA_MODULES "${ZMK_EXTRA_MODULES};${CMAKE_CURRENT_SOURCE_DIR}/module;${CMAKE_CURRENT_SOURCE_DIR}/keymap-module")
+# Add our custom Zephyr module for drivers w/ syscalls, etc.
+list(APPEND DTS_ROOT ${CMAKE_SOURCE_DIR}/drivers/zephyr)
+
+list(APPEND ZEPHYR_EXTRA_MODULES
+  ${CMAKE_CURRENT_SOURCE_DIR}/drivers
+)
+
+include(cmake/zmk_config.cmake)

 # Find Zephyr. This also loads Zephyr's build system.
 find_package(Zephyr REQUIRED HINTS ../zephyr)
 project(zmk)

-zephyr_linker_sources(SECTIONS include/linker/zmk-behaviors.ld)
 zephyr_linker_sources(RODATA include/linker/zmk-events.ld)

-if(CONFIG_ZMK_BEHAVIOR_LOCAL_IDS)
-  zephyr_linker_sources(DATA_SECTIONS include/linker/zmk-behavior-local-id-map.ld)
-endif()
-
-zephyr_syscall_header(${APPLICATION_SOURCE_DIR}/include/drivers/behavior.h)
-zephyr_syscall_header(${APPLICATION_SOURCE_DIR}/include/drivers/input_processor.h)
-zephyr_syscall_header(${APPLICATION_SOURCE_DIR}/include/drivers/ext_power.h)
-
 # Add your source file to the "app" target. This must come after
 # find_package(Zephyr) which defines the target.
 target_include_directories(app PRIVATE include)
-add_subdirectory(src/boot)
-target_sources(app PRIVATE src/stdlib.c)
+target_sources_ifdef(CONFIG_ZMK_SLEEP app PRIVATE src/power.c)
 target_sources(app PRIVATE src/activity.c)
-target_sources(app PRIVATE src/behavior.c)
-target_sources_ifdef(CONFIG_ZMK_KSCAN_SIDEBAND_BEHAVIORS app PRIVATE src/kscan_sideband_behaviors.c)
+target_sources(app PRIVATE src/kscan.c)
 target_sources(app PRIVATE src/matrix_transform.c)
-target_sources(app PRIVATE src/physical_layouts.c)
+target_sources(app PRIVATE src/hid.c)
 target_sources(app PRIVATE src/sensors.c)
 target_sources_ifdef(CONFIG_ZMK_WPM app PRIVATE src/wpm.c)
 target_sources(app PRIVATE src/event_manager.c)
-target_sources_ifdef(CONFIG_ZMK_PM app PRIVATE src/pm.c)
 target_sources_ifdef(CONFIG_ZMK_EXT_POWER app PRIVATE src/ext_power_generic.c)
-target_sources_ifdef(CONFIG_ZMK_GPIO_KEY_WAKEUP_TRIGGER app PRIVATE src/gpio_key_wakeup_trigger.c)
 target_sources(app PRIVATE src/events/activity_state_changed.c)
 target_sources(app PRIVATE src/events/position_state_changed.c)
+target_sources(app PRIVATE src/events/layer_state_changed.c)
+target_sources(app PRIVATE src/events/keycode_state_changed.c)
+target_sources(app PRIVATE src/events/modifiers_state_changed.c)
+target_sources(app PRIVATE src/events/endpoint_selection_changed.c)
 target_sources(app PRIVATE src/events/sensor_event.c)
 target_sources_ifdef(CONFIG_ZMK_WPM app PRIVATE src/events/wpm_state_changed.c)
-target_sources_ifdef(CONFIG_USB_DEVICE_STACK app PRIVATE src/events/usb_conn_state_changed.c)
-target_sources(app PRIVATE src/behaviors/behavior_reset.c)
-target_sources_ifdef(CONFIG_ZMK_EXT_POWER app PRIVATE src/behaviors/behavior_ext_power.c)
-target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_SOFT_OFF app PRIVATE src/behaviors/behavior_soft_off.c)
-add_subdirectory_ifdef(CONFIG_ZMK_POINTING src/pointing/)
-if ((NOT CONFIG_ZMK_SPLIT) OR CONFIG_ZMK_SPLIT_ROLE_CENTRAL)
-  target_sources(app PRIVATE src/hid.c)
+target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/events/ble_active_profile_changed.c)
+target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/events/battery_state_changed.c)
+target_sources_ifdef(CONFIG_USB app PRIVATE src/events/usb_conn_state_changed.c)
+if ((NOT CONFIG_ZMK_SPLIT) OR CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL)
  target_sources(app PRIVATE src/behaviors/behavior_key_press.c)
-  target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_KEY_TOGGLE app PRIVATE src/behaviors/behavior_key_toggle.c)
-  target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_HOLD_TAP app PRIVATE src/behaviors/behavior_hold_tap.c)
-  target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_STICKY_KEY app PRIVATE src/behaviors/behavior_sticky_key.c)
+  target_sources(app PRIVATE src/behaviors/behavior_reset.c)
+  target_sources(app PRIVATE src/behaviors/behavior_hold_tap.c)
+  target_sources(app PRIVATE src/behaviors/behavior_sticky_key.c)
  target_sources(app PRIVATE src/behaviors/behavior_caps_word.c)
-  target_sources(app PRIVATE src/behaviors/behavior_key_repeat.c)
-  target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_MACRO app PRIVATE src/behaviors/behavior_macro.c)
  target_sources(app PRIVATE src/behaviors/behavior_momentary_layer.c)
  target_sources(app PRIVATE src/behaviors/behavior_mod_morph.c)
  target_sources(app PRIVATE src/behaviors/behavior_outputs.c)
@@ -61,75 +55,30 @@ if ((NOT CONFIG_ZMK_SPLIT) OR CONFIG_ZMK_SPLIT_ROLE_CENTRAL)
  target_sources(app PRIVATE src/behaviors/behavior_to_layer.c)
  target_sources(app PRIVATE src/behaviors/behavior_transparent.c)
  target_sources(app PRIVATE src/behaviors/behavior_none.c)
-  target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_SENSOR_ROTATE app PRIVATE src/behaviors/behavior_sensor_rotate.c)
-  target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_SENSOR_ROTATE_VAR app PRIVATE src/behaviors/behavior_sensor_rotate_var.c)
-  target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_SENSOR_ROTATE_COMMON app PRIVATE src/behaviors/behavior_sensor_rotate_common.c)
-  target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_MOUSE_KEY_PRESS app PRIVATE src/behaviors/behavior_mouse_key_press.c)
-  target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_STUDIO_UNLOCK app PRIVATE src/behaviors/behavior_studio_unlock.c)
-  target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_INPUT_TWO_AXIS app PRIVATE src/behaviors/behavior_input_two_axis.c)
+  target_sources(app PRIVATE src/behaviors/behavior_sensor_rotate_key_press.c)
+  target_sources_ifdef(CONFIG_ZMK_EXT_POWER app PRIVATE src/behaviors/behavior_ext_power.c)
  target_sources(app PRIVATE src/combo.c)
-  target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_TAP_DANCE app PRIVATE src/behaviors/behavior_tap_dance.c)
-  target_sources(app PRIVATE src/behavior_queue.c)
  target_sources(app PRIVATE src/conditional_layer.c)
-  target_sources(app PRIVATE src/endpoints.c)
-  target_sources(app PRIVATE src/events/endpoint_changed.c)
-  target_sources(app PRIVATE src/hid_listener.c)
  target_sources(app PRIVATE src/keymap.c)
-  target_sources(app PRIVATE src/events/layer_state_changed.c)
-  target_sources(app PRIVATE src/events/modifiers_state_changed.c)
-  target_sources(app PRIVATE src/events/keycode_state_changed.c)
-  target_sources_ifdef(CONFIG_ZMK_HID_INDICATORS app PRIVATE src/hid_indicators.c)
-
-  if (CONFIG_ZMK_BLE)
-    target_sources(app PRIVATE src/events/ble_active_profile_changed.c)
-    target_sources(app PRIVATE src/behaviors/behavior_bt.c)
-    target_sources(app PRIVATE src/ble.c)
-    target_sources(app PRIVATE src/hog.c)
-  endif()
 endif()
-
 target_sources_ifdef(CONFIG_ZMK_RGB_UNDERGLOW app PRIVATE src/behaviors/behavior_rgb_underglow.c)
-target_sources_ifdef(CONFIG_ZMK_BACKLIGHT app PRIVATE src/behaviors/behavior_backlight.c)
-
-target_sources_ifdef(CONFIG_ZMK_BATTERY_REPORTING app PRIVATE src/events/battery_state_changed.c)
-target_sources_ifdef(CONFIG_ZMK_BATTERY_REPORTING app PRIVATE src/battery.c)
-
-target_sources_ifdef(CONFIG_ZMK_HID_INDICATORS app PRIVATE src/events/hid_indicators_changed.c)
-
-target_sources_ifdef(CONFIG_ZMK_SPLIT app PRIVATE src/events/split_peripheral_status_changed.c)
-add_subdirectory_ifdef(CONFIG_ZMK_SPLIT src/split)
-
-target_sources_ifdef(CONFIG_USB_DEVICE_STACK app PRIVATE src/usb.c)
-target_sources_ifdef(CONFIG_ZMK_USB app PRIVATE src/usb_hid.c)
+target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/behaviors/behavior_bt.c)
+target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/ble.c)
+target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/battery.c)
+if (CONFIG_ZMK_SPLIT_BLE AND (NOT CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL))
+	target_sources(app PRIVATE src/split_listener.c)
+	target_sources(app PRIVATE src/split/bluetooth/service.c)
+endif()
+if (CONFIG_ZMK_SPLIT_BLE AND CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL)
+	target_sources(app PRIVATE src/split/bluetooth/central.c)
+endif()
+target_sources_ifdef(CONFIG_USB app PRIVATE src/usb.c)
+target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/hog.c)
 target_sources_ifdef(CONFIG_ZMK_RGB_UNDERGLOW app PRIVATE src/rgb_underglow.c)
-target_sources_ifdef(CONFIG_ZMK_BACKLIGHT app PRIVATE src/backlight.c)
-target_sources_ifdef(CONFIG_ZMK_LOW_PRIORITY_WORK_QUEUE app PRIVATE src/workqueue.c)
+target_sources(app PRIVATE src/endpoints.c)
+target_sources(app PRIVATE src/hid_listener.c)
 target_sources(app PRIVATE src/main.c)

 add_subdirectory(src/display/)
-add_subdirectory_ifdef(CONFIG_SETTINGS src/settings/)
-
-if (CONFIG_ZMK_STUDIO_RPC)
-  # For some reason this is failing if run from a different sub-file.
-  list(APPEND CMAKE_MODULE_PATH ${ZEPHYR_BASE}/modules/nanopb)
-
-  include(nanopb)
-
-    # Turn off the default nanopb behavior
-  set(NANOPB_GENERATE_CPP_STANDALONE OFF)
-
-  nanopb_generate_cpp(proto_srcs proto_hdrs RELPATH ${ZEPHYR_ZMK_STUDIO_MESSAGES_MODULE_DIR}
-                        ${ZEPHYR_ZMK_STUDIO_MESSAGES_MODULE_DIR}/proto/zmk/studio.proto
-                        ${ZEPHYR_ZMK_STUDIO_MESSAGES_MODULE_DIR}/proto/zmk/meta.proto
-                        ${ZEPHYR_ZMK_STUDIO_MESSAGES_MODULE_DIR}/proto/zmk/core.proto
-                        ${ZEPHYR_ZMK_STUDIO_MESSAGES_MODULE_DIR}/proto/zmk/behaviors.proto
-                        ${ZEPHYR_ZMK_STUDIO_MESSAGES_MODULE_DIR}/proto/zmk/keymap.proto
-  )
-
-  target_include_directories(app PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
-  target_sources(app PRIVATE ${proto_srcs} ${proto_hdrs})
-
-  add_subdirectory(src/studio)
-endif()

 zephyr_cc_option(-Wfatal-errors)
--- a/app/Kconfig
+++ b/app/Kconfig
@@ -5,17 +5,6 @@ mainmenu "ZMK Firmware"

 menu "ZMK"

-config ZMK_BOARD_COMPAT
-    bool
-    help
-      Hidden symbol used to hint that a board has been specifically
-      set up with various ZMK requirements in mind, e.g. settings
-      storage, bootloader integration, etc.
-
-      Failure to set this will warn users they may want to verify they
-      used a ZMK variant of an upstream board, or are using a board
-      properly migrated to a newer ZMK version.
-
 menu "Basic Keyboard Setup"

 config ZMK_KEYBOARD_NAME
@@ -36,29 +25,6 @@ config USB_DEVICE_PID
 config USB_DEVICE_MANUFACTURER
 	default "ZMK Project"

-config BT_DIS_PNP_VID
-    default 0x1D50
-
-config BT_DIS_PNP_PID
-    default 0x615E
-
-config BT_DIS_MODEL_NUMBER_STR
-    default ZMK_KEYBOARD_NAME
-
-config BT_DIS_MANUF_NAME_STR
-    default "ZMK Project"
-
-# Hardware specific overrides
-
-if SOC_SERIES_NRF52X
-
-# Default on for our usage until boards implement retained bootmode.
-config NRF_STORE_REBOOT_TYPE_GPREGRET
-    bool
-    default y
-
-endif # SOC_SERIES_NRF52X
-
 menu "HID"

 choice ZMK_HID_REPORT_TYPE
@@ -75,28 +41,22 @@ config ZMK_HID_REPORT_TYPE_NKRO
 	help
 	  Enable full N-Key Roll Over for HID output. This selection will prevent the keyboard
 	  from working with some BIOS/UEFI versions that only support "boot keyboard" support.
-      This option also prevents using some infrequently used higher range HID usages (notably F13-F24 and INTL1-9)
-      These usages can be re enabled with ZMK_HID_KEYBOARD_NKRO_EXTENDED_REPORT.
+	  This option also prevents using some infrequently used higher range HID usages.

 endchoice

-config ZMK_HID_KEYBOARD_NKRO_EXTENDED_REPORT
-    bool "Enable extended NKRO reporting"
-    depends on ZMK_HID_REPORT_TYPE_NKRO
-    help
-      Enables higher usage range for NKRO (F13-F24 and INTL1-9).
-      Please note this is not compatible with Android currently and you will get no input
-
-
 if ZMK_HID_REPORT_TYPE_HKRO

 config ZMK_HID_KEYBOARD_REPORT_SIZE
 	int "# Keyboard Keys Reportable"
+	default 6

-endif # ZMK_HID_REPORT_TYPE_HKRO
+endif

 config ZMK_HID_CONSUMER_REPORT_SIZE
 	int "# Consumer Keys Reportable"
+	default 6
+

 choice ZMK_HID_CONSUMER_REPORT_USAGES
 	prompt "HID Report Type"
@@ -115,44 +75,21 @@ config ZMK_HID_CONSUMER_REPORT_USAGES_BASIC

 endchoice

-config ZMK_HID_INDICATORS
-    bool "HID Indicators"
-    help
-      Enable HID indicators, used for detecting state of Caps/Scroll/Num Lock,
-      Kata, and Compose.
-
-config ZMK_HID_SEPARATE_MOD_RELEASE_REPORT
-    bool "Release Modifiers Separately"
-    help
-      Send a separate release event for the modifiers, to make sure the release
-      of the modifier doesn't get recognized before the actual key's release event.
-
 menu "Output Types"

 config ZMK_USB
 	bool "USB"
-    depends on (!ZMK_SPLIT || (ZMK_SPLIT && ZMK_SPLIT_ROLE_CENTRAL))
 	select USB
 	select USB_DEVICE_STACK
 	select USB_DEVICE_HID

-config ZMK_USB_BOOT
-    bool "USB Boot Protocol Support"
-    depends on ZMK_USB
-    select USB_HID_BOOT_PROTOCOL
-
-config USB_DEVICE_INITIALIZE_AT_BOOT
-    default n
-
 if ZMK_USB

 config USB_NUMOF_EP_WRITE_RETRIES
 	default 10

-config USB_HID_POLL_INTERVAL_MS
-    default 1
-
-endif # ZMK_USB
+#ZMK_USB
+endif

 menuconfig ZMK_BLE
 	bool "BLE (HID over GATT)"
@@ -162,45 +99,18 @@ menuconfig ZMK_BLE
 	select BT_SMP_APP_PAIRING_ACCEPT
 	select BT_PERIPHERAL
 	select BT_DIS
-    imply BT_DEVICE_NAME_DYNAMIC
-    imply BT_SETTINGS if !ARCH_POSIX
-    imply SETTINGS if !ARCH_POSIX
-    imply ZMK_BATTERY_REPORTING if !ARCH_POSIX
+	select BT_BAS
+	select BT_SETTINGS
+	select SETTINGS

 if ZMK_BLE

-config ZMK_BLE_EXPERIMENTAL_CONN
-    bool "Experimental BLE connection changes"
-    help
-      Enables settings that are planned to be default in future versions of ZMK
-      to improve connection stability.
-
-config ZMK_BLE_EXPERIMENTAL_SEC
-    bool "Experimental BLE security changes"
-    imply BT_SMP_ALLOW_UNAUTH_OVERWRITE
-    help
-      Enables security settings that are planned to be officially supported in the future.
-
-config ZMK_BLE_EXPERIMENTAL_FEATURES
-    bool "Experimental BLE connection and security settings/features"
-    select ZMK_BLE_EXPERIMENTAL_CONN
-    select ZMK_BLE_EXPERIMENTAL_SEC
-    help
-      Enables experimental connection changes and security features.
-
-config ZMK_BLE_PASSKEY_ENTRY
-    bool "Require passkey entry on the keyboard to complete pairing"
-    select RING_BUFFER
-
-config BT_SMP_ALLOW_UNAUTH_OVERWRITE
-    imply ZMK_BLE_PASSKEY_ENTRY
-
-config BT_CTLR_PHY_2M
-    default n if ZMK_BLE_EXPERIMENTAL_CONN
+config SYSTEM_WORKQUEUE_STACK_SIZE
+	default 2048

 config ZMK_BLE_THREAD_STACK_SIZE
 	int "BLE notify thread stack size"
-    default 768
+	default 512

 config ZMK_BLE_THREAD_PRIORITY
 	int "BLE notify thread priority"
@@ -214,200 +124,221 @@ config ZMK_BLE_CONSUMER_REPORT_QUEUE_SIZE
 	int "Max number of consumer HID reports to queue for sending over BLE"
 	default 5

-config ZMK_BLE_MOUSE_REPORT_QUEUE_SIZE
-    int "Max number of mouse HID reports to queue for sending over BLE"
-    default 20
-
 config ZMK_BLE_CLEAR_BONDS_ON_START
 	bool "Configuration that clears all bond information from the keyboard on startup."
+	default n

 # HID GATT notifications sent this way are *not* picked up by Linux, and possibly others.
 config BT_GATT_NOTIFY_MULTIPLE
 	default n

-config BT_GATT_AUTO_SEC_REQ
-    default (ZMK_SPLIT_BLE && !ZMK_SPLIT_ROLE_CENTRAL)
+config BT_DEVICE_APPEARANCE
+	default 961

-config BT_PERIPHERAL_PREF_MIN_INT
+config ZMK_BLE_PASSKEY_ENTRY
+	bool "Experimental: Requiring typing passkey from host to pair BLE connection"
+	default n
+
+#ZMK_BLE
+endif
+
+#Output Types
+endmenu
+
+# HID
+endmenu
+
+menu "Split Support"
+
+config ZMK_SPLIT
+	bool "Split keyboard support"
+
+if ZMK_SPLIT
+
+menuconfig ZMK_SPLIT_BLE
+	bool "Split keyboard support via BLE transport"
+	depends on ZMK_BLE
+	default y
+	select BT_USER_PHY_UPDATE
+
+if ZMK_SPLIT_BLE
+
+menuconfig ZMK_SPLIT_BLE_ROLE_CENTRAL
+	bool "Central"
+	select BT_CENTRAL
+	select BT_GATT_CLIENT
+	select BT_GATT_AUTO_DISCOVER_CCC
+
+if ZMK_SPLIT_BLE_ROLE_CENTRAL
+
+config ZMK_SPLIT_BLE_CENTRAL_POSITION_QUEUE_SIZE
+	int "Max number of key position state events to queue when received from peripherals"
+	default 5
+
+endif
+
+if !ZMK_SPLIT_BLE_ROLE_CENTRAL
+
+config ZMK_SPLIT_BLE_PERIPHERAL_STACK_SIZE
+	int "BLE split peripheral notify thread stack size"
+	default 512
+
+config ZMK_SPLIT_BLE_PERIPHERAL_PRIORITY
+	int "BLE split peripheral notify thread priority"
+	default 5
+
+config ZMK_SPLIT_BLE_PERIPHERAL_POSITION_QUEUE_SIZE
+	int "Max number of key position state events to queue to send to the central"
+	default 10
+
+config ZMK_USB
+	default n
+
+config BT_MAX_PAIRED
+	default 1
+
+config BT_MAX_CONN
+	default 1
+
+config BT_GAP_AUTO_UPDATE_CONN_PARAMS
+	default n
+
+#!ZMK_SPLIT_BLE_ROLE_CENTRAL
+endif
+
+#ZMK_SPLIT_BLE
+endif
+
+#ZMK_SPLIT
+endif
+
+if ZMK_BLE
+
+if ZMK_SPLIT_BLE && ZMK_SPLIT_BLE_ROLE_CENTRAL
+
+config BT_MAX_CONN
 	default 6

-config BT_PERIPHERAL_PREF_MAX_INT
-    default 12
+config BT_MAX_PAIRED
+	default 6

-config BT_PERIPHERAL_PREF_LATENCY
-    default 30
+#ZMK_SPLIT_BLE && ZMK_SPLIT_BLE_ROLE_CENTRAL
+endif

-config BT_PERIPHERAL_PREF_TIMEOUT
-    default 400
+if !ZMK_SPLIT_BLE

-# The device name should be 16 characters or less so it fits within the
-# advertising data.
-config BT_DEVICE_NAME_MAX
-    default 16
+config BT_MAX_CONN
+	default 5

-endif # ZMK_BLE
+config BT_MAX_PAIRED
+	default 5

-endmenu # Output Types
+#!ZMK_SPLIT_BLE
+endif

-endmenu # HID
+#ZMK_BLE
+endif

-rsource "src/split/Kconfig"
+#Split Support
+endmenu

-endmenu # Basic Keyboard Setup
-
-menu "Keymaps"
-
-config ZMK_KEYMAP_LAYER_REORDERING
-    bool "Layer Reordering Support"
-
-config ZMK_KEYMAP_SETTINGS_STORAGE
-    bool "Settings Save/Load"
-    depends on SETTINGS
-    depends on ZMK_BEHAVIOR_LOCAL_IDS
-
-if ZMK_KEYMAP_SETTINGS_STORAGE
-
-config ZMK_KEYMAP_LAYER_NAME_MAX_LEN
-    int "Max Layer Name Length"
-    default 20
-
-endif # ZMK_KEYMAP_SETTINGS_STORAGE
-
-endmenu # Keymaps
-
-rsource "src/studio/Kconfig"
+#Basic Keyboard Setup
+endmenu

 menu "Display/LED Options"

 rsource "src/display/Kconfig"

-menuconfig ZMK_RGB_UNDERGLOW
-    bool "RGB Addressable LED Underglow"
+config ZMK_RGB_UNDERGLOW
+	bool "RGB Adressable LED Underglow"
 	select LED_STRIP
-    select ZMK_LOW_PRIORITY_WORK_QUEUE

 if ZMK_RGB_UNDERGLOW

+# This default value cuts down on tons of excess .conf files, if you're using GPIO, manually disable this
+config SPI
+	default y
+
 config ZMK_RGB_UNDERGLOW_EXT_POWER
 	bool "RGB underglow toggling also controls external power"
+	default y

 config ZMK_RGB_UNDERGLOW_BRT_MIN
 	int "RGB underglow minimum brightness in percent"
 	range 0 100
+	default 0

 config ZMK_RGB_UNDERGLOW_BRT_MAX
 	int "RGB underglow maximum brightness in percent"
 	range ZMK_RGB_UNDERGLOW_BRT_MIN 100
+	default 100

 config ZMK_RGB_UNDERGLOW_HUE_STEP
 	int "RGB underglow hue step in degrees"
 	range 0 359
+	default 10

 config ZMK_RGB_UNDERGLOW_SAT_STEP
 	int "RGB underglow saturation step in percent"
 	range 0 100
+	default 10

 config ZMK_RGB_UNDERGLOW_BRT_STEP
 	int "RGB underglow brightness step in percent"
 	range 0 100
+	default 10

 config ZMK_RGB_UNDERGLOW_HUE_START
 	int "RGB underglow start hue value in degrees"
 	range 0 359
+	default 0

 config ZMK_RGB_UNDERGLOW_SAT_START
 	int "RGB underglow start saturations value in percent"
 	range 0 100
+	default 100

 config ZMK_RGB_UNDERGLOW_BRT_START
 	int "RGB underglow start brightness value in percent"
 	range ZMK_RGB_UNDERGLOW_BRT_MIN ZMK_RGB_UNDERGLOW_BRT_MAX
+	default ZMK_RGB_UNDERGLOW_BRT_MAX

 config ZMK_RGB_UNDERGLOW_SPD_START
 	int "RGB underglow start animation speed value"
 	range 1 5
+	default 3

 config ZMK_RGB_UNDERGLOW_EFF_START
 	int "RGB underglow start effect int value related to the effect enum list"
 	range 0 3
+	default 0

 config ZMK_RGB_UNDERGLOW_ON_START
 	bool "RGB underglow starts on by default"
+	default y

-config ZMK_RGB_UNDERGLOW_AUTO_OFF_IDLE
-    bool "Turn off RGB underglow when keyboard goes into idle state"
+#ZMK_RGB_UNDERGLOW
+endif

-config ZMK_RGB_UNDERGLOW_AUTO_OFF_USB
-    bool "Turn off RGB underglow when USB is disconnected"
-    depends on USB_DEVICE_STACK
-
-endif # ZMK_RGB_UNDERGLOW
-
-menuconfig ZMK_BACKLIGHT
-    bool "LED backlight"
-    select LED
-
-if ZMK_BACKLIGHT
-
-config ZMK_BACKLIGHT_BRT_STEP
-    int "Brightness step in percent"
-    range 1 100
-
-config ZMK_BACKLIGHT_BRT_START
-    int "Default brightness in percent"
-    range 1 100
-
-config ZMK_BACKLIGHT_ON_START
-    bool "Default backlight state"
-
-config ZMK_BACKLIGHT_AUTO_OFF_IDLE
-    bool "Turn off backlight when keyboard goes into idle state"
-
-config ZMK_BACKLIGHT_AUTO_OFF_USB
-    bool "Turn off backlight when USB is disconnected"
-
-endif # ZMK_BACKLIGHT
-
-endmenu # Display/LED Options
-
-rsource "src/pointing/Kconfig"
+#Display/LED Options
+endmenu

 menu "Power Management"

-config ZMK_BATTERY_REPORTING
-    bool "Battery level detection/reporting"
-    select SENSOR
-    select ZMK_LOW_PRIORITY_WORK_QUEUE
-    imply BT_BAS if ZMK_BLE
-
-if ZMK_BATTERY_REPORTING
-
-choice ZMK_BATTERY_REPORTING_FETCH_MODE
-    prompt "Battery Reporting Fetch Mode"
-
-config ZMK_BATTERY_REPORTING_FETCH_MODE_STATE_OF_CHARGE
-    bool "State of charge"
-
-config ZMK_BATTERY_REPORTING_FETCH_MODE_LITHIUM_VOLTAGE
-    bool "Lithium Voltage"
-
-endchoice
-
-endif # ZMK_BATTERY_REPORTING
-
 config ZMK_IDLE_TIMEOUT
 	int "Milliseconds of inactivity before entering idle state (OLED shutoff, etc)"
 	default 30000

 config ZMK_SLEEP
 	bool "Enable deep sleep support"
-    depends on HAS_POWEROFF
-    select POWEROFF
-    select ZMK_PM_DEVICE_SUSPEND_RESUME
 	imply USB

 if ZMK_SLEEP

+choice SYS_PM_POLICY
+	default PM_POLICY_APP
+endchoice
+
 config PM_DEVICE
 	default y

@@ -415,32 +346,14 @@ config ZMK_IDLE_SLEEP_TIMEOUT
 	int "Milliseconds of inactivity before entering deep sleep"
 	default 900000

-endif # ZMK_SLEEP
+#ZMK_SLEEP
+endif

 config ZMK_EXT_POWER
 	bool "Enable support to control external power output"
-
-config ZMK_PM
-    bool
-
-config ZMK_PM_DEVICE_SUSPEND_RESUME
-    bool
-    select ZMK_PM
-
-config ZMK_PM_SOFT_OFF
-    bool "Soft-off support"
-    depends on HAS_POWEROFF
-    select ZMK_PM
-    select PM_DEVICE
-    select ZMK_PM_DEVICE_SUSPEND_RESUME
-    select POWEROFF
-
-config ZMK_GPIO_KEY_WAKEUP_TRIGGER
-    bool "Hardware supported wakeup (GPIO)"
 	default y
-    depends on DT_HAS_ZMK_GPIO_KEY_WAKEUP_TRIGGER_ENABLED && ZMK_PM_SOFT_OFF

-# Power Management
+#Power Management
 endmenu

 menu "Combo options"
@@ -450,55 +363,28 @@ config ZMK_COMBO_MAX_PRESSED_COMBOS
 	default 4

 config ZMK_COMBO_MAX_COMBOS_PER_KEY
-    int "Deprecated: Max combos per key"
-    default 0
-    help
-      Deprecated: Storage for combos is now determined automatically
+	int "Maximum number of combos per key"
+	default 5

 config ZMK_COMBO_MAX_KEYS_PER_COMBO
-    int "Deprecated: Max keys per combo"
-    default 0
-    help
-       Deprecated: This is now auto-calculated based on `key-positions` in devicetree
-
-# Combo options
-endmenu
-
-menu "Behavior Options"
-
-config ZMK_BEHAVIORS_QUEUE_SIZE
-    int "Maximum number of behaviors to allow queueing from a macro or other complex behavior"
-    default 64
-
-rsource "Kconfig.behaviors"
-
-config ZMK_MACRO_DEFAULT_WAIT_MS
-    int "Default time to wait (in milliseconds) before triggering the next behavior in macros"
-    default 15
-
-config ZMK_MACRO_DEFAULT_TAP_MS
-    int "Default time to wait (in milliseconds) between the press and release events of a tapped behavior in macros"
-    default 30
+	int "Maximum number of keys per combo"
+	default 4

+#Display/LED Options
 endmenu

 menu "Advanced"

-rsource "src/boot/Kconfig"
-
 menu "Initialization Priorities"

-if USB_DEVICE_STACK
+if USB

 config ZMK_USB_INIT_PRIORITY
 	int "USB Init Priority"
-    default 96
+	default 50

-config ZMK_USB_HID_INIT_PRIORITY
-    int "USB HID Init Priority"
-    default 95
-
-endif # USB
+#USB
+endif

 if ZMK_BLE || ZMK_SPLIT_BLE

@@ -506,54 +392,28 @@ config ZMK_BLE_INIT_PRIORITY
 	int "BLE Init Priority"
 	default 50

-endif # ZMK_BLE || ZMK_SPLIT_BLE
+#ZMK_BLE || ZMK_SPLIT_BLE
+endif

-endmenu # Initialization Priorities
+#Initialization Priorities
+endmenu

-config ZMK_PHYSICAL_LAYOUT_KEY_ROTATION
-    bool "Support rotation of keys in physical layouts"
-    default y
-
-menuconfig ZMK_KSCAN
-    bool "ZMK KScan Integration"
-    default y
-    select KSCAN
-
-if ZMK_KSCAN
+menu "KSCAN Settings"

 config ZMK_KSCAN_EVENT_QUEUE_SIZE
 	int "Size of the event queue for KSCAN events to buffer events"
 	default 4

-endif # ZMK_KSCAN
+config ZMK_KSCAN_MOCK_DRIVER
+	bool "Enable mock kscan driver to simulate key presses"

-config ZMK_KSCAN_SIDEBAND_BEHAVIORS
-    bool
-    default y
-    depends on DT_HAS_ZMK_KSCAN_SIDEBAND_BEHAVIORS_ENABLED
-    select KSCAN
+config ZMK_KSCAN_COMPOSITE_DRIVER
+	bool "Enable composite kscan driver to combine kscan devices"

-if ZMK_KSCAN_SIDEBAND_BEHAVIORS
+#KSCAN Settings
+endmenu

-config ZMK_KSCAN_SIDEBAND_BEHAVIORS_INIT_PRIORITY
-    int "Keyboard scan sideband behaviors driver init priority"
-    # The default kscan init priority is 90, so be sure we are initialized later.
-    default 95
-
-endif # ZMK_KSCAN_SIDEBAND_BEHAVIORS
-
-menu "Logging"
-
-config ZMK_LOGGING_MINIMAL
-    bool "Suppress all ZMK debug log messages"
-    default false
-
-if !ZMK_LOGGING_MINIMAL
-
-config ZMK_LOG_LEVEL
-    default 4
-
-endif
+menu "USB Logging"

 config ZMK_USB_LOGGING
 	bool "Enable USB CDC ACM logging to help debug"
@@ -570,156 +430,83 @@ config ZMK_USB_LOGGING

 if ZMK_USB_LOGGING

-choice USB_CDC_ACM_LOG_LEVEL_CHOICE
-    default USB_CDC_ACM_LOG_LEVEL_OFF
-endchoice
-
-choice USB_DRIVER_LOG_LEVEL_CHOICE
-    default USB_DRIVER_LOG_LEVEL_OFF
-endchoice
-
-# We do this to avoid log loop where logging to USB generates more log messages.
+config ZMK_LOG_LEVEL
+	default 4

 config USB_CDC_ACM_RINGBUF_SIZE
 	default 1024

-config LOG_PROCESS_THREAD_STARTUP_DELAY_MS
-    default 1000
+config USB_CDC_ACM_DEVICE_NAME
+	default "CDC_ACM"

-endif # ZMK_USB_LOGGING
+config USB_CDC_ACM_DEVICE_COUNT
+	default 1

-config ZMK_RTT_LOGGING
-    bool "Enable RTT logging to help debug"
-    select LOG
-    select DEBUG
-    select ASSERT
-    select USE_SEGGER_RTT
-    select CONSOLE
-    select RTT_CONSOLE
-
-if ZMK_RTT_LOGGING
-
-config SEGGER_RTT_BUFFER_SIZE_UP
-    default 8192
-
-endif # ZMK_RTT_LOGGING
-
-if ZMK_USB_LOGGING || ZMK_RTT_LOGGING
+config UART_CONSOLE_ON_DEV_NAME
+	default "CDC_ACM_0"

 config LOG_BUFFER_SIZE
 	default 8192

-config LOG_PROCESS_THREAD_SLEEP_MS
-    default 100
+config LOG_STRDUP_BUF_COUNT
+	default 16

-endif # ZMK_USB_LOGGING || ZMK_RTT_LOGGING
+#ZMK_USB_LOGGING
+endif

-endmenu # Logging
+#USB Logging
+endmenu

 if SETTINGS

-config ZMK_SETTINGS_RESET_ON_START
-    bool "Delete all persistent settings when the keyboard boots"
-
-if ZMK_SETTINGS_RESET_ON_START
-
-config ZMK_SETTINGS_RESET_ON_START_INIT_PRIORITY
-    int "Settings Reset ON Start Initialization Priority"
-    default 60
-    help
-      Initialization priority for the settings reset on start. Must be lower priority/
-      higher value than FLASH_INIT_PRIORITY if using the NVS/Flash settings backend.
-
-endif # ZMK_SETTINGS_RESET_ON_START
-
 config ZMK_SETTINGS_SAVE_DEBOUNCE
 	int "Milliseconds to debounce settings saves"
 	default 60000

-endif # SETTINGS
-
-config ZMK_BATTERY_REPORT_INTERVAL
-    depends on ZMK_BATTERY_REPORTING
-    int "Battery level report interval in seconds"
-
-config ZMK_LOW_PRIORITY_WORK_QUEUE
-    bool "Work queue for low priority items"
-
-if ZMK_LOW_PRIORITY_WORK_QUEUE
-
-config ZMK_LOW_PRIORITY_THREAD_STACK_SIZE
-    int "Low priority thread stack size"
-    default 768
-
-config ZMK_LOW_PRIORITY_THREAD_PRIORITY
-    int "Low priority thread priority"
-    default 10
-
-endif # ZMK_LOW_PRIORITY_WORK_QUEUE
-
-endmenu # Advanced
-
-endmenu # ZMK
-
-if SOC_FAMILY_NORDIC_NRF
-
-config NRF_SOC_VALIDATE_HEADERS_DISABLED
-    default y
-
+#SETTINGS
 endif

+#Advanced
+endmenu
+
+#ZMK
+endmenu
+
+config HEAP_MEM_POOL_SIZE
+	default 8192
+
 config KERNEL_BIN_NAME
 	default "zmk"

 config REBOOT
 	default y

-config USB_DEVICE_STACK
+config USB
 	default y if HAS_HW_NRF_USBD

-config FPU
-    default CPU_HAS_FPU
-
 config ZMK_WPM
 	bool "Calculate WPM"
+	default n

-config ZMK_KEYMAP_SENSORS
-    bool "Enable Keymap Sensors support"
+config SENSOR
 	default y
-    depends on DT_HAS_ZMK_KEYMAP_SENSORS_ENABLED
-    select SENSOR

-if ZMK_KEYMAP_SENSORS
+choice CBPRINTF_IMPLEMENTATION
+	default CBPRINTF_NANO

-config ZMK_KEYMAP_SENSORS_DEFAULT_TRIGGERS_PER_ROTATION
-    int "Default triggers per rotation"
-    help
-      Unless overridden for a sensor in the board/shield/devicetree, this value
-      determines how many times to trigger the bound behavior per full rotation.
-      For tactile encoders with detents, this usually should match the number of
-      detents per rotation of the encoder.
-    default 20
-
-endif # ZMK_KEYMAP_SENSORS
+endchoice

 module = ZMK
 module-str = zmk
 source "subsys/logging/Kconfig.template.log_config"

-# This loads ZMK's internal board and shield Kconfigs
 rsource "boards/Kconfig"
 rsource "boards/shields/*/Kconfig.defconfig"
 rsource "boards/shields/*/Kconfig.shield"

-# This loads custom shields defconfigs (from BOARD_ROOT)
-# Duplicated from Kconfig.zephyr
-osource "$(KCONFIG_BINARY_DIR)/Kconfig.shield.defconfig"
-
-# This loads board and shield Kconfigs found under zmk-config/config/
 osource "$(ZMK_CONFIG)/boards/shields/*/Kconfig.defconfig"
 osource "$(ZMK_CONFIG)/boards/shields/*/Kconfig.shield"

-# This loads ZMK's sensible defaults
-rsource "Kconfig.defaults"

 source "Kconfig.zephyr"
+
--- a/app/Kconfig.behaviors
+++ b/app/Kconfig.behaviors
@@ -1,136 +0,0 @@
-# Copyright (c) 2023 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-config ZMK_BEHAVIOR_METADATA
-    bool "Metadata"
-    help
-      Enabling this option adds APIs for documenting and fetching
-      metadata describing a behaviors name, and supported parameters.
-
-config ZMK_BEHAVIOR_LOCAL_IDS
-    bool "Local IDs"
-
-if ZMK_BEHAVIOR_LOCAL_IDS
-
-config ZMK_BEHAVIOR_LOCAL_IDS_IN_BINDINGS
-    bool "Track in behavior bindings"
-
-choice ZMK_BEHAVIOR_LOCAL_ID_TYPE
-    prompt "Local ID Type"
-
-config ZMK_BEHAVIOR_LOCAL_ID_TYPE_SETTINGS_TABLE
-    bool "Settings Table"
-    depends on SETTINGS
-    select ZMK_BEHAVIOR_LOCAL_IDS_IN_BINDINGS
-    help
-      Use persistent entries in the settings subsystem to identify
-      behaviors by local ID, which uses the device name to generate
-      a new settings entry tying a presistant local ID to that name.
-      This guarantees stable, colllision-free local IDs at the expense
-      of settings storage used.
-
-config ZMK_BEHAVIOR_LOCAL_ID_TYPE_CRC16
-    bool "CRC16 Hash"
-    select CRC
-    help
-      Use the CRC16-ANSI hash of behavior device names to generate
-      stable behavior local IDs. This saves on settings storage at
-      the expense of (highly unlikely) risk of collisions.
-
-endchoice
-
-endif
-
-
-config ZMK_BEHAVIOR_HOLD_TAP
-    bool
-    default y
-    depends on DT_HAS_ZMK_BEHAVIOR_HOLD_TAP_ENABLED
-
-if ZMK_BEHAVIOR_HOLD_TAP
-
-config ZMK_BEHAVIOR_HOLD_TAP_MAX_HELD
-    int "Hold Tap Max Held"
-    help
-      Max number of simultaneously held hold-taps
-
-config ZMK_BEHAVIOR_HOLD_TAP_MAX_CAPTURED_EVENTS
-    int "Hold Tap Max Captured Events"
-    help
-      Max number of captured system events while waiting to resolve hold taps
-
-endif
-
-config ZMK_BEHAVIOR_KEY_TOGGLE
-    bool
-    default y
-    depends on DT_HAS_ZMK_BEHAVIOR_KEY_TOGGLE_ENABLED
-
-config ZMK_BEHAVIOR_MOUSE_KEY_PRESS
-    bool
-    default y
-    depends on DT_HAS_ZMK_BEHAVIOR_MOUSE_KEY_PRESS_ENABLED && ZMK_POINTING
-
-config ZMK_BEHAVIOR_STICKY_KEY
-    bool
-    default y
-    depends on DT_HAS_ZMK_BEHAVIOR_STICKY_KEY_ENABLED
-
-if ZMK_BEHAVIOR_STICKY_KEY
-
-config ZMK_BEHAVIOR_STICKY_KEY_MAX_HELD
-    int "Sticky Key Max Held"
-    help
-      Max number of simultaneously held sticky keys
-
-endif
-
-config ZMK_BEHAVIOR_SOFT_OFF
-    bool
-    default y
-    depends on DT_HAS_ZMK_BEHAVIOR_SOFT_OFF_ENABLED && ZMK_PM_SOFT_OFF
-
-
-config ZMK_BEHAVIOR_TAP_DANCE
-    bool
-    default y
-    depends on DT_HAS_ZMK_BEHAVIOR_TAP_DANCE_ENABLED
-
-if ZMK_BEHAVIOR_TAP_DANCE
-
-config ZMK_BEHAVIOR_TAP_DANCE_MAX_HELD
-    int "Tap-Dance Max Held"
-    help
-      Max number of simultaneously held taps-dances
-
-endif
-
-config ZMK_BEHAVIOR_INPUT_TWO_AXIS
-    bool
-    default y
-    depends on DT_HAS_ZMK_BEHAVIOR_INPUT_TWO_AXIS_ENABLED && ZMK_POINTING
-
-config ZMK_BEHAVIOR_SENSOR_ROTATE_COMMON
-    bool
-
-config ZMK_BEHAVIOR_SENSOR_ROTATE
-    bool
-    default y
-    depends on DT_HAS_ZMK_BEHAVIOR_SENSOR_ROTATE_ENABLED
-    select ZMK_BEHAVIOR_SENSOR_ROTATE_COMMON
-
-config ZMK_BEHAVIOR_SENSOR_ROTATE_VAR
-    bool
-    default y
-    depends on DT_HAS_ZMK_BEHAVIOR_SENSOR_ROTATE_VAR_ENABLED
-    select ZMK_BEHAVIOR_SENSOR_ROTATE_COMMON
-
-config ZMK_BEHAVIOR_STUDIO_UNLOCK
-    bool
-    default y
-    depends on DT_HAS_ZMK_BEHAVIOR_STUDIO_UNLOCK_ENABLED && ZMK_STUDIO
-
-config ZMK_BEHAVIOR_MACRO
-    bool
-    default y
-    depends on DT_HAS_ZMK_BEHAVIOR_MACRO_ENABLED || DT_HAS_ZMK_BEHAVIOR_MACRO_ONE_PARAM_ENABLED || DT_HAS_ZMK_BEHAVIOR_MACRO_TWO_PARAM_ENABLED
--- a/app/Kconfig.defaults
+++ b/app/Kconfig.defaults
@@ -1,118 +0,0 @@
-# Copyright (c) 2024 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-config SYSTEM_WORKQUEUE_STACK_SIZE
-    default 3072 if ZMK_DISPLAY
-    default 2048
-
-# Basic
-config BT_DEVICE_APPEARANCE
-    default 961
-
-# HID
-if ZMK_HID_REPORT_TYPE_HKRO
-
-config ZMK_HID_KEYBOARD_REPORT_SIZE
-    default 6
-
-endif
-
-config ZMK_HID_CONSUMER_REPORT_SIZE
-    default 6
-
-# Behaviors
-
-if ZMK_BEHAVIOR_HOLD_TAP
-
-config ZMK_BEHAVIOR_HOLD_TAP_MAX_HELD
-    default 10
-
-config ZMK_BEHAVIOR_HOLD_TAP_MAX_CAPTURED_EVENTS
-    default 40
-
-endif
-
-if ZMK_BEHAVIOR_STICKY_KEY
-
-config ZMK_BEHAVIOR_STICKY_KEY_MAX_HELD
-    default 10
-
-endif
-
-if ZMK_BEHAVIOR_TAP_DANCE
-
-config ZMK_BEHAVIOR_TAP_DANCE_MAX_HELD
-    default 10
-
-endif
-
-# Underglow
-if ZMK_RGB_UNDERGLOW
-
-# This default value cuts down on tons of excess .conf files, if you're using GPIO, manually disable this
-config SPI
-    default y
-
-config ZMK_RGB_UNDERGLOW_EXT_POWER
-    default y
-
-config ZMK_RGB_UNDERGLOW_BRT_MIN
-    default 0
-
-config ZMK_RGB_UNDERGLOW_BRT_MAX
-    default 100
-
-config ZMK_RGB_UNDERGLOW_HUE_STEP
-    default 10
-
-config ZMK_RGB_UNDERGLOW_SAT_STEP
-    default 10
-
-config ZMK_RGB_UNDERGLOW_BRT_STEP
-    default 10
-
-config ZMK_RGB_UNDERGLOW_HUE_START
-    default 0
-
-config ZMK_RGB_UNDERGLOW_SAT_START
-    default 100
-
-config ZMK_RGB_UNDERGLOW_BRT_START
-    default ZMK_RGB_UNDERGLOW_BRT_MAX
-
-config ZMK_RGB_UNDERGLOW_SPD_START
-    default 3
-
-config ZMK_RGB_UNDERGLOW_EFF_START
-    default 0
-
-config ZMK_RGB_UNDERGLOW_ON_START
-    default y
-
-endif # ZMK_RGB_UNDERGLOW
-
-# Backlight
-if ZMK_BACKLIGHT
-
-config ZMK_BACKLIGHT_BRT_STEP
-    default 20
-
-config ZMK_BACKLIGHT_BRT_START
-    default 40
-
-config ZMK_BACKLIGHT_ON_START
-    default y
-
-endif # ZMK_BACKLIGHT
-
-# Ext_power
-config ZMK_EXT_POWER
-    default y
-
-# Battery
-config ZMK_BATTERY_REPORT_INTERVAL
-    default 60
-
-# Imports
-rsource "src/boot/Kconfig.defaults"
-rsource "src/split/Kconfig.defaults"
--- a/app/VERSION
+++ b/app/VERSION
@@ -1,13 +0,0 @@
-# x-release-please-start-major
-VERSION_MAJOR = 0
-# x-release-please-end
-
-# x-release-please-start-minor
-VERSION_MINOR = 3
-# x-release-please-end
-
-# x-release-please-start-patch
-PATCHLEVEL = 0
-# x-release-please-end
-
-VERSION_TWEAK = 0
--- a/app/boards/adafruit/kb2040/Kconfig.adafruit_kb2040
+++ b/app/boards/adafruit/kb2040/Kconfig.adafruit_kb2040
@@ -1,9 +0,0 @@
-# Copyright (c) 2026 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-config BOARD_ADAFRUIT_KB2040
-    select ZMK_BOARD_COMPAT if BOARD_ADAFRUIT_KB2040_RP2040_ZMK
-    imply RETAINED_MEM if BOARD_ADAFRUIT_KB2040_RP2040_ZMK
-    imply RETENTION if BOARD_ADAFRUIT_KB2040_RP2040_ZMK
-    imply RETENTION_BOOT_MODE if BOARD_ADAFRUIT_KB2040_RP2040_ZMK
-
--- a/app/boards/adafruit/kb2040/adafruit_kb2040.zmk.yml
+++ b/app/boards/adafruit/kb2040/adafruit_kb2040.zmk.yml
@@ -1,9 +0,0 @@
-file_format: "1"
-id: adafruit_kb2040//zmk
-name: Adafruit KB2040
-type: board
-arch: arm
-outputs:
-  - usb
-url: https://www.adafruit.com/product/5302
-exposes: [pro_micro]
--- a/app/boards/adafruit/kb2040/adafruit_kb2040_zmk.dts
+++ b/app/boards/adafruit/kb2040/adafruit_kb2040_zmk.dts
@@ -1,10 +0,0 @@
-/*
- * Copyright (c) 2023 The ZMK Contributors
- *
- * SPDX-License-Identifier: MIT
- */
-
-#include <../boards/adafruit/kb2040/adafruit_kb2040.dts>
-#include <arm/raspberrypi/rp2040-boot-mode-retention.dtsi>
-
-&pro_micro_serial { status = "disabled"; };
--- a/app/boards/adafruit/kb2040/adafruit_kb2040_zmk_defconfig
+++ b/app/boards/adafruit/kb2040/adafruit_kb2040_zmk_defconfig
@@ -1,23 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=125000000
-
-# Enable reset by default
-CONFIG_RESET=y
-
-# Enable clock control by default
-CONFIG_CLOCK_CONTROL=y
-
-# Code partition needed to target the correct flash range
-CONFIG_USE_DT_CODE_PARTITION=y
-
-# Output UF2 by default, native bootloader supports it.
-CONFIG_BUILD_OUTPUT_UF2=y
-
-# USB HID
-CONFIG_ZMK_USB=y
-
-# Bootloader Support
-CONFIG_RETAINED_MEM=y
-CONFIG_RETENTION=y
-CONFIG_RETENTION_BOOT_MODE=y
--- a/app/boards/adafruit/kb2040/board.yml
+++ b/app/boards/adafruit/kb2040/board.yml
@@ -1,5 +0,0 @@
-board:
-  extend: adafruit_kb2040
-  variants:
-    - name: zmk
-      qualifier: rp2040
--- a/app/boards/adafruit/qt_py_rp2040/Kconfig.adafruit_qt_py_rp2040
+++ b/app/boards/adafruit/qt_py_rp2040/Kconfig.adafruit_qt_py_rp2040
@@ -1,9 +0,0 @@
-# Copyright (c) 2026 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-config BOARD_ADAFRUIT_QT_PY_RP2040
-    select ZMK_BOARD_COMPAT if BOARD_ADAFRUIT_QT_PY_RP2040_RP2040_ZMK
-    imply RETAINED_MEM if BOARD_ADAFRUIT_QT_PY_RP2040_RP2040_ZMK
-    imply RETENTION if BOARD_ADAFRUIT_QT_PY_RP2040_RP2040_ZMK
-    imply RETENTION_BOOT_MODE if BOARD_ADAFRUIT_QT_PY_RP2040_RP2040_ZMK
-
--- a/app/boards/adafruit/qt_py_rp2040/adafruit_qt_py_rp2040.zmk.yml
+++ b/app/boards/adafruit/qt_py_rp2040/adafruit_qt_py_rp2040.zmk.yml
@@ -1,9 +0,0 @@
-file_format: "1"
-id: adafruit_qt_py_rp2040//zmk
-name: Adafruit QT Py RP2040
-type: board
-arch: arm
-outputs:
-  - usb
-url: https://www.adafruit.com/product/4900
-exposes: [seeed_xiao]
--- a/app/boards/adafruit/qt_py_rp2040/adafruit_qt_py_rp2040_zmk.dts
+++ b/app/boards/adafruit/qt_py_rp2040/adafruit_qt_py_rp2040_zmk.dts
@@ -1,10 +0,0 @@
-/*
- * Copyright (c) 2023 The ZMK Contributors
- *
- * SPDX-License-Identifier: MIT
- */
-
-#include <../boards/adafruit/qt_py_rp2040/adafruit_qt_py_rp2040.dts>
-#include <arm/raspberrypi/rp2040-boot-mode-retention.dtsi>
-
-&xiao_serial { status = "disabled"; };
--- a/app/boards/adafruit/qt_py_rp2040/adafruit_qt_py_rp2040_zmk_defconfig
+++ b/app/boards/adafruit/qt_py_rp2040/adafruit_qt_py_rp2040_zmk_defconfig
@@ -1,23 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=125000000
-
-# Enable reset by default
-CONFIG_RESET=y
-
-# Enable clock control by default
-CONFIG_CLOCK_CONTROL=y
-
-# Code partition needed to target the correct flash range
-CONFIG_USE_DT_CODE_PARTITION=y
-
-# Output UF2 by default, native bootloader supports it.
-CONFIG_BUILD_OUTPUT_UF2=y
-
-# USB HID
-CONFIG_ZMK_USB=y
-
-# Bootloader Support
-CONFIG_RETAINED_MEM=y
-CONFIG_RETENTION=y
-CONFIG_RETENTION_BOOT_MODE=y
--- a/app/boards/adafruit/qt_py_rp2040/board.yml
+++ b/app/boards/adafruit/qt_py_rp2040/board.yml
@@ -1,5 +0,0 @@
-board:
-  extend: adafruit_qt_py_rp2040
-  variants:
-    - name: zmk
-      qualifier: rp2040
--- a/app/boards/adafruit_metro_rp2040.conf
+++ b/app/boards/adafruit_metro_rp2040.conf
@@ -1,11 +0,0 @@
-CONFIG_CONSOLE=n
-CONFIG_SERIAL=n
-CONFIG_UART_CONSOLE=n
-CONFIG_ZMK_USB=y
-
-CONFIG_MPU_ALLOW_FLASH_WRITE=y
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
-CONFIG_FLASH=y
-CONFIG_FLASH_PAGE_LAYOUT=y
-CONFIG_FLASH_MAP=y
--- a/app/boards/aliases.cmake
+++ b/app/boards/aliases.cmake
@@ -1,2 +0,0 @@
-# defines board aliases for shorter names (or for renaming boards)
-set(mikoto_520_BOARD_ALIAS "mikoto")
--- a/app/boards/arm/bdn9/Kconfig.board
+++ b/app/boards/arm/bdn9/Kconfig.board
@@ -0,0 +1,8 @@
+# keeb.io BDN9 board configuration
+
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+config BOARD_BDN9
+	bool "BDN9 rev2"
+	depends on SOC_STM32F072XB
--- a/app/boards/keebio/bdn9/Kconfig.defconfig
+++ b/app/boards/keebio/bdn9/Kconfig.defconfig
@@ -1,6 +1,6 @@
 # keeb.io BDN9 board configuration

-# Copyright (c) 2020 The ZMK Contributors
+# Copyright (c) 2020 Pete Johanson
 # SPDX-License-Identifier: MIT

 if BOARD_BDN9
@@ -11,4 +11,7 @@ config BOARD
 config ZMK_KEYBOARD_NAME
 	default "BDN9 Rev2"

+config ZMK_USB
+	default y
+
 endif # BOARD_BDN9
--- a/app/boards/keebio/bdn9/README.md
+++ b/app/boards/keebio/bdn9/README.md
--- a/app/boards/arm/bdn9/bdn9_rev2.dts
+++ b/app/boards/arm/bdn9/bdn9_rev2.dts
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+/dts-v1/;
+#include <st/f0/stm32f072Xb.dtsi>
+
+/ {
+	model = "Keeb.io BDN9 rev2";
+	compatible = "keebio,bdn9", "st,stm32f072";
+
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+		zmk,kscan = &kscan;
+		/* TODO: Enable once the GPIO bitbanging driver supports STM32
+		zmk,underglow = &led_strip;
+		*/
+	};
+	
+	kscan: kscan {
+		compatible = "zmk,kscan-gpio-direct";
+		label = "KSCAN";
+
+		input-gpios
+			= <&gpiob 12 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+			, <&gpiob 5  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+			, <&gpiob 6  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+			, <&gpiob 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+			, <&gpiob 4  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+			, <&gpiob 7  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+			, <&gpioa 3  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+			, <&gpiof 1  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+			, <&gpiof 0  (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+			;
+	};
+
+	/*
+	led_strip: ws2812 {
+		compatible = "worldsemi,ws2812-gpio";
+		label = "WS2812";
+
+		in-gpios = <&gpiob 15 0>;
+
+		chain-length = <9>;
+	};
+	*/
+
+	left_encoder: encoder_left {
+		compatible = "alps,ec11";
+		label = "LEFT_ENCODER";
+		a-gpios = <&gpioa 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+		b-gpios = <&gpioa 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+		resolution = <4>;
+		status = "disabled";
+	};
+	mid_encoder: encoder_mid {
+		compatible = "alps,ec11";
+		label = "MID_ENCODER";
+		a-gpios = <&gpioa 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+		b-gpios = <&gpioa 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+		resolution = <4>;
+		status = "disabled";
+	};
+	right_encoder: encoder_right {
+		compatible = "alps,ec11";
+		label = "RIGHT_ENCODER";
+		a-gpios = <&gpioa 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+		b-gpios = <&gpiob 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+		resolution = <4>;
+		status = "disabled";
+	};
+
+	sensors: sensors {
+		compatible = "zmk,keymap-sensors";
+		status = "disabled";
+		sensors = <>;
+	};
+};
+
+&usb {
+	status = "okay";
+};
+
+&rtc {
+	status = "okay";
+};
+
+&flash0 {
+	/*
+	 * For more information, see:
+	 * http://docs.zephyrproject.org/latest/guides/dts/index.html#flash-partitions
+	 */
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		/* Set 6Kb of storage at the end of the 128Kb of flash */
+		storage_partition: partition@3e800 {
+			label = "storage";
+			reg = <0x0001e800 0x00001800>;
+		};
+	};
+};
--- a/app/boards/arm/bdn9/bdn9_rev2.keymap
+++ b/app/boards/arm/bdn9/bdn9_rev2.keymap
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/keys.h>
+
+/* Uncomment and keep whatever encoders are on your BDN9
+&sensors {
+	status = "okay";
+	sensors = <&left_encoder &mid_encoder &right_encoder>;
+};
+*/
+
+// Uncomment each encoder installed on your BDN9
+// &left_encoder { status = "okay"; };
+// &mid_encoder { status = "okay"; };
+// &right_encoder { status = "okay"; };
+
+/ {
+	keymap {
+		compatible = "zmk,keymap";
+
+		default_layer {
+			bindings = <
+				&kp HOME  &kp K_PP &kp END
+				&kp PG_UP &kp UP   &kp PG_DN
+				&kp LEFT  &kp DOWN &kp RIGHT
+			>;
+			/* Uncomment and add necessary bindings. This examples is for one encoder
+			sensor-bindings = <&inc_dec_kp PG_UP PG_DN>;
+			*/
+		};
+	};
+};
+
--- a/app/boards/arm/bdn9/bdn9_rev2.yaml
+++ b/app/boards/arm/bdn9/bdn9_rev2.yaml
--- a/app/boards/arm/bdn9/bdn9_rev2.yml
+++ b/app/boards/arm/bdn9/bdn9_rev2.yml
@@ -0,0 +1,11 @@
+file_format: "1"
+id: bdn9_rev2
+name: BDN9 Rev2
+type: board
+arch: arm
+features:
+  - keys
+  - encoder
+outputs:
+  - usb
+url: https://keeb.io/products/bdn9-rev-2-3x3-9-key-macropad-rotary-encoder-and-rgb
--- a/app/boards/arm/bdn9/bdn9_rev2.zmk.yml
+++ b/app/boards/arm/bdn9/bdn9_rev2.zmk.yml
@@ -1,6 +1,6 @@
 file_format: "1"
-id: bdn9//zmk
-name: BDN9 (Rev2)
+id: bdn9_rev2
+name: BDN9 Rev2
 type: board
 arch: arm
 outputs:
@@ -9,6 +9,3 @@ features:
  - keys
  - encoder
 url: https://keeb.io/collections/bdn9-collection/products/bdn9-rev-2-3x3-9-key-macropad-rotary-encoder-and-rgb
-revisions:
-  - "2.0.0"
-default_revision: "2.0.0"
--- a/app/boards/arm/bdn9/bdn9_rev2_defconfig
+++ b/app/boards/arm/bdn9/bdn9_rev2_defconfig
@@ -0,0 +1,32 @@
+# SPDX-License-Identifier: MIT
+
+CONFIG_SOC_SERIES_STM32F0X=y
+CONFIG_SOC_STM32F072XB=y
+# 72MHz system clock
+CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=72000000
+
+# Floating Point Options
+CONFIG_FPU=y
+
+# enable GPIO
+CONFIG_GPIO=y
+
+# Enable pinmux
+CONFIG_PINMUX=y
+
+# Needed to reduce this to size that will fit on F072
+CONFIG_HEAP_MEM_POOL_SIZE=1024
+
+# clock configuration
+CONFIG_CLOCK_CONTROL=y
+
+# Clock configuration for Cube Clock control driver
+CONFIG_CLOCK_STM32_SYSCLK_SRC_PLL=y
+# use HSI as PLL input
+CONFIG_CLOCK_STM32_PLL_SRC_HSI=y
+# produce 72MHz clock at PLL output
+CONFIG_CLOCK_STM32_PLL_PREDIV=1
+CONFIG_CLOCK_STM32_PLL_MULTIPLIER=12
+CONFIG_CLOCK_STM32_AHB_PRESCALER=1
+CONFIG_CLOCK_STM32_APB1_PRESCALER=2
+CONFIG_CLOCK_STM32_APB2_PRESCALER=1
--- a/app/boards/keebio/bdn9/board.cmake
+++ b/app/boards/keebio/bdn9/board.cmake
--- a/app/boards/arm/bluemicro840/CMakeLists.txt
+++ b/app/boards/arm/bluemicro840/CMakeLists.txt
@@ -0,0 +1,8 @@
+set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
+  COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/../tools/uf2/utils/uf2conv.py
+  -c 
+  -b 0x26000
+  -f 0xADA52840
+  -o ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.uf2
+  ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.bin
+)
--- a/app/boards/arm/bluemicro840/Kconfig
+++ b/app/boards/arm/bluemicro840/Kconfig
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: MIT
+
+config BOARD_ENABLE_DCDC
+	bool "Enable DCDC mode"
+	select SOC_DCDC_NRF52X
+	default y
+	depends on BOARD_BLUEMICRO840_V1
+
--- a/app/boards/arm/bluemicro840/Kconfig.board
+++ b/app/boards/arm/bluemicro840/Kconfig.board
@@ -0,0 +1,8 @@
+# BlueMicro840 board configuration
+
+# Copyright (c) 2020 Pete Johanson, Derek Schmell
+# SPDX-License-Identifier: MIT
+
+config BOARD_BLUEMICRO840_V1
+	bool "BlueMicro840_V1"
+	depends on SOC_NRF52840_QIAA
--- a/app/boards/arm/bluemicro840/Kconfig.defconfig
+++ b/app/boards/arm/bluemicro840/Kconfig.defconfig
@@ -0,0 +1,33 @@
+# BlueMicro840 board configuration
+
+# Copyright (c) 2020 Pete Johanson, Derek Schmell
+# SPDX-License-Identifier: MIT
+
+if BOARD_BLUEMICRO840_V1
+
+config BOARD
+	default "bluemicro840_v1"
+
+if USB
+
+config USB_NRFX
+	default y
+
+config USB_DEVICE_STACK
+	default y
+
+endif # USB
+
+config BT_CTLR
+	default BT
+
+config ZMK_BLE
+	default y
+
+config ZMK_USB
+	default y
+
+config ZMK_BATTERY_VOLTAGE_DIVIDER
+	default y
+
+endif # BOARD_BLUEMICRO840_V1
--- a/app/boards/arm/bluemicro840/arduino_pro_micro_pins.dtsi
+++ b/app/boards/arm/bluemicro840/arduino_pro_micro_pins.dtsi
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2020 Derek Schmell
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+/ {
+	pro_micro: connector {
+		compatible = "arduino-pro-micro";
+		#gpio-cells = <2>;
+		gpio-map-mask = <0xffffffff 0xffffffc0>;
+		gpio-map-pass-thru = <0 0x3f>;
+		gpio-map
+			= <0 0 &gpio0 8 0>		/* D0	D2 */ 			
+			, <1 0 &gpio0 6 0>		/* D1 	D3*/			
+			, <2 0 &gpio0 15 0>		/* D2 	D1*/			
+			, <3 0 &gpio0 17 0>		/* D3 	D0*/			
+			, <4 0 &gpio0 20 0>		/* D4/A6 	D4*/		
+			, <5 0 &gpio0 13 0>		/* D5 	C6*/
+			, <6 0 &gpio0 24 0>		/* D6/A7 	D7*/
+			, <7 0 &gpio0 9 0>		/* D7 	E6*/
+			, <8 0 &gpio0 10 0>		/* D8/A8 	B4*/
+			, <9 0 &gpio1 6 0>		/* D9/A9 	B5*/
+			, <10 0 &gpio1 11 0>		/* D10/A10 	B6*/
+			, <16 0 &gpio0 28 0>	/* D16 	B2*/
+			, <14 0 &gpio0 3 0>	/* D14 	B3*/
+			, <15 0 &gpio1 13 0>	/* D15 	B1*/
+			, <18 0 &gpio0 2 0>	/* D18/A0 	F7*/
+			, <19 0 &gpio0 29 0>	/* D19/A1 	F6*/
+			, <20 0 &gpio0 26 0>	/* D20/A2 	F5*/
+			, <21 0 &gpio0 30 0>	/* D21/A3 	F4*/
+			;
+	};
+
+	pro_micro_a: connector_a {
+		compatible = "arduino-pro-micro";
+		#gpio-cells = <2>;
+		gpio-map-mask = <0xffffffff 0xffffffc0>;
+		gpio-map-pass-thru = <0 0x3f>;
+		gpio-map
+			= <0 0 &gpio0 2 0>	/* D18/A0 	F7*/
+			, <1 0 &gpio0 29 0>	/* D19/A1 	F6*/
+			, <2 0 &gpio0 26 0>	/* D20/A2 	F5*/
+			, <3 0 &gpio0 30 0>	/* D21/A3 	F4*/
+			, <6 0 &gpio0 20 0>	/* D4/A6 	D4*/
+			, <7 0 &gpio0 24 0>	/* D6/A7 	D7*/
+			, <8 0 &gpio0 10 0>	/* D8/A8 	B4*/
+			, <9 0 &gpio1 6 0>	/* D9/A9 	B5*/
+			, <10 0 &gpio1 11 0>	/* D10/A10 	B6*/
+			;
+	};
+};
+
+pro_micro_d: &pro_micro {};
+pro_micro_i2c: &i2c0 {};
+pro_micro_spi: &spi0 {};
+pro_micro_serial: &uart0 {};
--- a/app/boards/arm/bluemicro840/bluemicro840_v1.dts
+++ b/app/boards/arm/bluemicro840/bluemicro840_v1.dts
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2020 Pete Johanson, Derek Schmell
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+/dts-v1/;
+#include <nordic/nrf52840_qiaa.dtsi>
+#include "arduino_pro_micro_pins.dtsi"
+
+/ {
+	model = "BlueMicro840_V1";
+	compatible = "bluemicro840,v1";
+
+	chosen {
+		zephyr,code-partition = &code_partition;
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		blue_led: led_0 {
+			gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
+			label = "Blue LED";
+		};
+	};
+
+	ext-power {
+		compatible = "zmk,ext-power-generic";
+		label = "EXT_POWER";
+		init-delay-ms = <20>;
+		control-gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
+	};
+
+	vbatt {
+		compatible = "zmk,battery-voltage-divider";
+		label = "BATTERY";
+		io-channels = <&adc 7>;
+		output-ohms = <2000000>;
+		full-ohms = <(2000000 + 806000)>;
+	};
+
+};
+
+&adc {
+	status = "okay";
+};
+
+&gpiote {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&i2c0 {
+	compatible = "nordic,nrf-twi";
+	sda-pin = <15>;
+	scl-pin = <17>;
+};
+
+&uart0 {
+	compatible = "nordic,nrf-uarte";
+	tx-pin = <6>;
+	rx-pin = <8>;
+};
+
+&usbd {
+	status = "okay";
+};
+
+
+&flash0 {
+	/*
+	 * For more information, see:
+	 * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
+	 */
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		sd_partition: partition@0 {
+			label = "softdevice";
+			reg = <0x00000000 0x00026000>;
+		};
+		code_partition: partition@26000 {
+			label = "code_partition";
+			reg = <0x00026000 0x000c6000>;
+		};
+
+		/*
+		 * The flash starting at 0x000ec000 and ending at
+		 * 0x000f3fff is reserved for use by the application.
+		 */
+
+		/*
+		 * Storage partition will be used by FCB/LittleFS/NVS
+		 * if enabled.
+		 */
+		storage_partition: partition@ec000 {
+			label = "storage";
+			reg = <0x000ec000 0x00008000>;
+		};
+
+		boot_partition: partition@f4000 {
+			label = "adafruit_boot";
+			reg = <0x000f4000 0x0000c000>;
+		};
+	};
+};
--- a/app/module/boards/jpconstantineau/bluemicro840/bluemicro840.yaml
+++ b/app/module/boards/jpconstantineau/bluemicro840/bluemicro840.yaml
@@ -1,4 +1,4 @@
-identifier: bluemicro840
+identifier: bluemicro840_v1
 name: BlueMicro840_V1
 type: mcu
 arch: arm
--- a/app/boards/jpconstantineau/bluemicro840/bluemicro840.zmk.yml
+++ b/app/boards/jpconstantineau/bluemicro840/bluemicro840.zmk.yml
@@ -1,5 +1,5 @@
 file_format: "1"
-id: bluemicro840//zmk
+id: bluemicro840_v1
 name: BlueMicro840 v1
 type: board
 arch: arm
--- a/app/boards/nicekeyboards/nice_nano/nice_nano_nrf52840_zmk_1_0_0_defconfig
+++ b/app/boards/nicekeyboards/nice_nano/nice_nano_nrf52840_zmk_1_0_0_defconfig
@@ -1,16 +1,16 @@
 # SPDX-License-Identifier: MIT

+CONFIG_SOC_SERIES_NRF52X=y
+CONFIG_SOC_NRF52840_QIAA=y
+CONFIG_BOARD_BLUEMICRO840_V1=y
+
 # Enable MPU
 CONFIG_ARM_MPU=y

 # enable GPIO
 CONFIG_GPIO=y

-# Use pinctrl
-CONFIG_PINCTRL=y
-
 CONFIG_USE_DT_CODE_PARTITION=y
-CONFIG_BUILD_OUTPUT_UF2=y

 CONFIG_MPU_ALLOW_FLASH_WRITE=y
 CONFIG_NVS=y
@@ -18,6 +18,3 @@ CONFIG_SETTINGS_NVS=y
 CONFIG_FLASH=y
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_FLASH_MAP=y
-
-CONFIG_ZMK_USB=y
-CONFIG_ZMK_BLE=y
--- a/app/module/boards/makerdiary/nrf52840_m2/board.cmake
+++ b/app/module/boards/makerdiary/nrf52840_m2/board.cmake
@@ -1,7 +1,5 @@
-# Copyright (c) 2026 The ZMK Contributors
 # SPDX-License-Identifier: MIT

 board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset")
-
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
--- a/app/boards/arm/bt60/CMakeLists.txt
+++ b/app/boards/arm/bt60/CMakeLists.txt
@@ -0,0 +1,8 @@
+set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
+  COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/../tools/uf2/utils/uf2conv.py
+  -c 
+  -b 0x26000
+  -f 0xADA52840
+  -o ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.uf2
+  ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.bin
+)
--- a/app/boards/arm/bt60/Kconfig
+++ b/app/boards/arm/bt60/Kconfig
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: MIT
+
+config BOARD_ENABLE_DCDC
+	bool "Enable DCDC mode"
+	select SOC_DCDC_NRF52X
+	default y
+	depends on (BOARD_BT60_V1_HS || BOARD_BT60_V1)
--- a/app/boards/arm/bt60/Kconfig.board
+++ b/app/boards/arm/bt60/Kconfig.board
@@ -0,0 +1,12 @@
+# BT60 board configuration
+
+# Copyright (c) 2021 Polarity Works
+# SPDX-License-Identifier: MIT
+
+config BOARD_BT60_V1
+	bool "bt60"
+	depends on SOC_NRF52840_QIAA
+
+config BOARD_BT60_V1_HS
+	bool "bt60 hotswap"
+	depends on SOC_NRF52840_QIAA
--- a/app/boards/arm/bt60/Kconfig.defconfig
+++ b/app/boards/arm/bt60/Kconfig.defconfig
@@ -0,0 +1,34 @@
+# Copyright (c) 2021 Polarity Works
+# SPDX-License-Identifier: MIT
+
+if BOARD_BT60_V1_HS || BOARD_BT60_V1
+
+config BOARD
+	default "bt60"
+
+if USB
+
+config USB_NRFX
+	default y
+
+config USB_DEVICE_STACK
+	default y
+
+endif # USB
+
+config BT_CTLR
+	default BT
+
+config ZMK_BLE
+	default y
+
+config ZMK_USB
+	default y
+
+config ZMK_BATTERY_VOLTAGE_DIVIDER
+	default y
+
+config ZMK_KEYBOARD_NAME
+	default "BT60"
+
+endif # BOARD_BT60
--- a/app/boards/polarityworks/bt60/board.cmake
+++ b/app/boards/polarityworks/bt60/board.cmake
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT

 board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset")
-include(${ZEPHYR_BASE}/boards/common/uf2.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
--- a/app/boards/arm/bt60/bt60.dtsi
+++ b/app/boards/arm/bt60/bt60.dtsi
@@ -0,0 +1,128 @@
+/*
+* Copyright (c) 2021 Polarity Works
+*
+* SPDX-License-Identifier: MIT
+*/
+
+/dts-v1/;
+#include <nordic/nrf52840_qiaa.dtsi>
+#include <dt-bindings/zmk/matrix_transform.h>
+
+/ {
+	model = "BT60";
+	compatible = "polarityworks,bt60";
+
+	chosen {
+		zephyr,code-partition = &code_partition;
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+		zmk,kscan = &kscan0;
+		zmk,matrix_transform = &default_transform;
+	};
+
+	sensors {
+		compatible = "zmk,keymap-sensors";
+		sensors = <&left_encoder>;
+	};
+
+
+
+	left_encoder: encoder_left {
+		compatible = "alps,ec11";
+		label = "LEFT_ENCODER";
+		a-gpios = <&gpio1 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+		b-gpios = <&gpio1 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+		resolution = <4>;
+		status = "okay";
+	};
+
+
+	leds {
+		compatible = "gpio-leds";
+		blue_led: led_0 {
+			gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
+			label = "Blue LED";
+		};
+	};
+
+	vbatt {
+		compatible = "zmk,battery-voltage-divider";
+		label = "BATTERY";
+		io-channels = <&adc 2>;
+		output-ohms = <2000000>;
+		full-ohms = <(2000000 + 806000)>;
+	};
+};
+
+&adc {
+	status = "okay";
+};
+
+&gpiote {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&i2c0 {
+	compatible = "nordic,nrf-twi";
+	sda-pin = <17>;
+	scl-pin = <20>;
+};
+
+&uart0 {
+	compatible = "nordic,nrf-uarte";
+	tx-pin = <6>;
+	rx-pin = <8>;
+};
+
+&usbd {
+	status = "okay";
+};
+
+
+&flash0 {
+	/*
+	 * For more information, see:
+	 * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
+	 */
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		sd_partition: partition@0 {
+			label = "softdevice";
+			reg = <0x00000000 0x00026000>;
+		};
+		code_partition: partition@26000 {
+			label = "code_partition";
+			reg = <0x00026000 0x000c6000>;
+		};
+
+		/*
+		 * The flash starting at 0x000ec000 and ending at
+		 * 0x000f3fff is reserved for use by the application.
+		 */
+
+		/*
+		 * Storage partition will be used by FCB/LittleFS/NVS
+		 * if enabled.
+		 */
+		storage_partition: partition@ec000 {
+			label = "storage";
+			reg = <0x000ec000 0x00008000>;
+		};
+
+		boot_partition: partition@f4000 {
+			label = "adafruit_boot";
+			reg = <0x000f4000 0x0000c000>;
+		};
+	};
+};
--- a/app/boards/arm/bt60/bt60_v1.dts
+++ b/app/boards/arm/bt60/bt60_v1.dts
@@ -0,0 +1,113 @@
+/*
+* Copyright (c) 2021 Polarity Works
+*
+* SPDX-License-Identifier: MIT
+*/
+
+/dts-v1/;
+#include "bt60.dtsi"
+
+
+/ {
+	chosen {
+		zmk,kscan = &kscan0;
+		zmk,matrix_transform = &ansi_transform;
+	};
+
+	ansi_transform: keymap_transform_0 {
+		compatible = "zmk,matrix-transform";
+		columns = <15>;
+		rows = <5>;
+		map = <
+			RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12)     RC(0,13)
+			RC(1,0)   RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12)   RC(1,13)
+			RC(2,0)     RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)          RC(2,13)
+			RC(3,0)       RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10)  RC(3,11)               RC(3,13)
+			RC(4,0)   RC(4,1)   RC(4,2)                      RC(4,6)                     RC(4,10)   RC(4,11)    RC(4,12)     RC(4,13) RC(4,14)
+		>;
+	};
+
+	hhkb_transform: keymap_transform_1 {
+		compatible = "zmk,matrix-transform";
+		columns = <15>;
+		rows = <5>;
+		map = <
+			RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12)     RC(0,13) RC(0,14)
+			RC(1,0)   RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12)   RC(1,13)
+			RC(2,0)     RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)          RC(2,13)
+			RC(3,0)   RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10)       RC(3,11)     RC(3,12) RC(3,14)
+			RC(4,0)   RC(4,1)   RC(4,2)                          RC(4,6)                  RC(4,10)  RC(4,11)   RC(4,12)    RC(4,13)
+		>;
+	};
+
+	iso_transform: keymap_transform_2 {
+		compatible = "zmk,matrix-transform";
+		columns = <15>;
+		rows = <5>;
+		map = <
+			RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12)     RC(0,13)
+			RC(1,0)   RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12)
+			RC(2,0)     RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) RC(2,12) RC(2,13)
+			RC(3,0)  RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10)       RC(3,11)       RC(3,12)
+			RC(4,0)   RC(4,1)   RC(4,2)                          RC(4,6)                  RC(4,10)  RC(4,11)   RC(4,12)    RC(4,13)
+		>;
+	};
+
+	all_1u_transform: keymap_transform_3 {
+		compatible = "zmk,matrix-transform";
+		columns = <15>;
+		rows = <5>;
+		map = <
+			RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12)     RC(0,13)
+			RC(1,0)   RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12)   RC(1,13)
+			RC(2,0)     RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)          RC(2,13)
+			RC(3,0)   RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10)  RC(3,11) RC(3,12) RC(3,13) RC(3,14)
+			RC(4,0)   RC(4,1)   RC(4,2)                      RC(4,6)                   RC(4,10) RC(4,11) RC(4,12) RC(4,13) RC(4,14)
+		>;
+	};
+
+	split_transform: keymap_transform_4 {
+		compatible = "zmk,matrix-transform";
+		columns = <15>;
+		rows = <5>;
+		map = <
+			RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12)     RC(0,13) RC(0,14)
+			RC(1,0)   RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12)   RC(1,13)
+			RC(2,0)     RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)          RC(2,13)
+			RC(3,0)   RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10)       RC(3,11)     RC(3,12) RC(3,14)
+			RC(4,0)   RC(4,1)   RC(4,2)                          RC(4,6)                  RC(4,10)  RC(4,11)   RC(4,12)    RC(4,13)
+		>;
+	};
+
+	kscan0: kscan_0 {
+		compatible = "zmk,kscan-gpio-matrix";
+		label = "KSCAN";
+		diode-direction = "col2row";
+
+		col-gpios
+			= <&gpio1 13 GPIO_ACTIVE_HIGH>
+			, <&gpio1 10 GPIO_ACTIVE_HIGH>
+			, <&gpio1 11 GPIO_ACTIVE_HIGH>
+			, <&gpio1 15 GPIO_ACTIVE_HIGH>
+			, <&gpio0 3 GPIO_ACTIVE_HIGH>
+			, <&gpio0 2 GPIO_ACTIVE_HIGH>
+			, <&gpio0 28 GPIO_ACTIVE_HIGH>
+			, <&gpio0 29 GPIO_ACTIVE_HIGH>
+			, <&gpio0 30 GPIO_ACTIVE_HIGH>
+			, <&gpio0 31 GPIO_ACTIVE_HIGH>
+			, <&gpio0 5 GPIO_ACTIVE_HIGH>
+			, <&gpio0 7 GPIO_ACTIVE_HIGH>
+			, <&gpio1 9 GPIO_ACTIVE_HIGH>
+			, <&gpio0 12 GPIO_ACTIVE_HIGH>
+			, <&gpio0 23 GPIO_ACTIVE_HIGH>
+			;
+
+		row-gpios
+			= <&gpio1 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&gpio0 22 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&gpio0 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&gpio0 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&gpio1 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			;
+	};
+};
--- a/app/boards/arm/bt60/bt60_v1.keymap
+++ b/app/boards/arm/bt60/bt60_v1.keymap
@@ -0,0 +1,180 @@
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/keys.h>
+#include <dt-bindings/zmk/bt.h>
+
+#define ANSI true
+//#define HHKB true
+//#define ISO true
+//#define ALL_1U true
+//#define SPLIT_BKSP_RSHFT true
+
+
+
+/ {
+	chosen {
+	#ifdef ANSI
+		zmk,matrix_transform = &ansi_transform;
+	#elif defined(HHKB)
+		zmk,matrix_transform = &hhkb_transform;
+	#elif defined(ISO)
+		zmk,matrix_transform = &iso_transform;
+	#elif defined(ALL_1U)
+		zmk,matrix_transform = &all_1u_transform;
+	#else
+		zmk,matrix_transform = &split_transform;
+	#endif
+	};
+
+
+	keymap {
+		compatible = "zmk,keymap";
+		#ifdef ANSI
+		default_layer {
+				// ------------------------------------------------------------------------------------------
+				// | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BKSP   |
+				// |  TAB  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   |    |
+				// |  CAPS  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    ENTER    |
+				// |  SHIFT    |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  | /   |      SHIFT     |
+				// |  CTL  |  WIN  |  ALT  |            SPACE              | ALT | 1    |  MENU    |  CTRL  |
+				// ------------------------------------------------------------------------------------------
+			bindings = <
+				&kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp  N8   &kp  N9 &kp  N0  &kp MINUS &kp EQUAL &kp BSPC
+				&kp TAB  &kp Q  &kp W  &kp E  &kp R  &kp T  &kp Y  &kp U  &kp  I    &kp  O  &kp  P   &kp LBKT &kp RBKT  &kp BSLH
+				&kp CLCK  &kp A  &kp S  &kp D  &kp F  &kp G  &kp H  &kp J  &kp  K    &kp  L  &kp SEMI &kp SQT           &kp RET
+				&kp LSHFT  &kp Z  &kp X  &kp C  &kp V  &kp B  &kp N  &kp M  &kp COMMA &kp DOT &kp FSLH             &kp RSHFT
+				&kp LCTRL &kp LGUI &kp LALT            &kp SPACE                          &kp RALT  &mo 1 &kp K_CMENU &kp RCTRL &bt BT_CLR
+			>;
+			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+		};
+		raise {
+				// ------------------------------------------------------------------------------------------
+				// |GRAVE| F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |   DEL   |
+				// | TAB  |  Q  | UP  |  E  |  R  |  T  |  Y  |  U  | INS |  O  |PSCRN|SLCK |PSEBRK| RESET |
+				// | CAPS  |LEFT |DOWN |RIGHT|  F  |  G  |  H  |  J  |  K  |  L  |HOME |PGUP |  BOOTLOADER |
+				// |   PREV  |VOLUP |VOLDN|MUTE |  V  |  B  |  N  |  M  |  ,  | END | PGDN |      NEXT     |
+				// |  CTL  |  WIN  |  ALT  |            SPACE               | ALT | 1    |  MENU  | BT_CLR |
+				// ------------------------------------------------------------------------------------------
+			bindings = <
+				&kp GRAVE &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp  F8   &kp  F9 &kp  F10  &kp F11 &kp F12   &kp DEL
+				&trans &trans &kp UP &trans &trans &trans &trans &trans &kp INS &trans &kp PSCRN &kp SLCK &kp PAUSE_BREAK &reset
+				&trans    &kp LEFT &kp DOWN &kp RIGHT &trans &trans &trans &trans &trans &trans &kp HOME  &kp PG_UP   &bootloader
+				&kp C_PREV &kp C_VOL_DN &kp C_VOL_UP &kp C_MUTE &trans &trans &trans &trans &trans &kp END &kp PG_DN  &kp C_NEXT
+				&bt BT_PRV &bt BT_NXT  &trans              &trans                            &trans   &trans   &trans &bt BT_CLR &trans
+			>;
+			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+		};
+		#elif defined(HHKB)
+		default_layer {
+				// ------------------------------------------------------------------------------------------
+				// | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  \  | `  |
+				// | TAB  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |  BSPC   |
+				// | CTRL  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |      ENTER   |
+				// |  SHIFT    |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  | /   | SHIFT |   1    |
+				// |  CAPS  |  ALT  |  WIN |                     SPACE               |   WIN   | ALT | CTRL |
+				// ------------------------------------------------------------------------------------------
+			bindings = <
+				&kp ESC       &kp N1          &kp N2          &kp N3        &kp N4    &kp N5    &kp N6    &kp N7    &kp  N8      &kp  N9     &kp  N0       &kp MINUS     &kp EQUAL          &kp BSLH    &kp GRAVE
+				&kp TAB       &kp Q           &kp W           &kp E         &kp R     &kp T     &kp Y     &kp U     &kp  I       &kp  O      &kp  P        &kp LBKT      &kp RBKT           &kp BSPC
+				&kp LCTRL     &kp A           &kp S           &kp D         &kp F     &kp G     &kp H     &kp J     &kp  K       &kp  L      &kp SEMI      &kp SQT       &kp RET
+				&kp LSHFT     &kp Z           &kp X           &kp C         &kp V     &kp B     &kp N     &kp M     &kp COMMA    &kp DOT     &kp FSLH      &kp RSHFT     &mo 1
+				&kp LCTRL     &kp LALT        &kp LGUI                                                    &kp SPACE                                        &kp RGUI      &kp RALT           &kp RCTRL
+			>;
+			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+		};
+		raise {
+			bindings = <
+				&trans        &kp F1          &kp F2          &kp F3        &kp F4    &kp F5    &kp F6    &kp F7    &kp F8       &kp F9      &kp F10       &kp F11       &kp F12            &kp INS      &kp DEL
+				&kp CLCK      &bt BT_PRV      &bt BT_NXT      &bt BT_CLR    &trans    &trans    &trans    &trans    &trans       &trans      &trans        &kp UP        &trans             &reset
+				&trans        &kp C_VOL_DN    &kp C_VOL_UP    &kp C_MUTE    &trans    &trans    &trans    &trans    &trans       &trans      &kp LEFT      &kp RIGHT     &trans
+				&trans        &trans          &trans          &trans        &trans    &trans    &trans    &trans    &trans       &trans      &kp DOWN      &trans        &trans
+				&trans        &trans          &trans                                                      &bootloader                                      &trans        &trans             &trans
+			>;
+			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+		};
+		#elif defined(ISO)
+		default_layer {
+				// ------------------------------------------------------------------------------------------
+				// | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BKSP   |
+				// | TAB  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |         |
+				// | CAPS  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |  #   | ENTER |
+				// |  SHIFT | |  |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  | /   |     SHIFT    |
+				// |  CTL  |  WIN  |  ALT  |                     SPACE        |   ALT   |  1  | MENU | CTRL |
+				// ------------------------------------------------------------------------------------------
+			bindings = <
+				&kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp  N8   &kp  N9 &kp  N0  &kp MINUS &kp EQUAL &kp BSPC
+				&kp TAB  &kp Q  &kp W  &kp E  &kp R  &kp T  &kp Y  &kp U  &kp  I    &kp  O  &kp  P   &kp LBKT &kp RBKT
+				&kp CLCK  &kp A  &kp S  &kp D  &kp F  &kp G  &kp H  &kp J  &kp  K    &kp  L  &kp SEMI &kp SQT  &kp NON_US_HASH  &kp RET
+				&kp LSHFT &kp NON_US_BSLH &kp Z  &kp X  &kp C  &kp V  &kp B  &kp N  &kp M  &kp COMMA &kp DOT &kp FSLH             &kp RSHFT
+				&kp LCTRL &kp LGUI &kp LALT            &kp SPACE                          &kp RALT  &mo 1 &kp K_CMENU &kp RCTRL
+			>;
+			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+		};
+		raise {
+			bindings = <
+				&kp GRAVE &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp  F8   &kp  F9 &kp  F10  &kp F11 &kp F12   &kp DEL
+				&reset &trans &kp UP &trans &trans &trans &trans &trans &kp INS &trans &kp PSCRN &kp SLCK &kp PAUSE_BREAK
+				&trans    &kp LEFT &kp DOWN &kp RIGHT &trans &trans &trans &trans &trans &trans &kp HOME  &kp PG_UP  &trans &bootloader
+				&kp C_PREV &kp C_VOL_DN &kp C_VOL_UP &kp C_MUTE &trans &trans &trans &trans &trans &trans &kp END &kp PG_DN  &kp C_NEXT
+				&bt BT_PRV &bt BT_NXT  &trans              &trans                            &trans   &trans   &trans &bt BT_CLR
+			>;
+			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+		};
+		#elif defined(ALL_1U)
+		default_layer {
+				// ------------------------------------------------------------------------------------------
+				// | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BKSP   |
+				// | TAB  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   "|"   |
+				// | CAPS  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |     ENTER    |
+				// |  SHIFT    |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  | /   | SHFT | UP | 1  |
+				// |  CTL  |  WIN  |  ALT  |            SPACE              | ALT | CTRL | LEFT | DOWN | RIGHT |
+				// ------------------------------------------------------------------------------------------
+			bindings = <
+				&kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp  N8   &kp  N9 &kp  N0  &kp MINUS &kp EQUAL &kp BSPC
+				&kp TAB  &kp Q  &kp W  &kp E  &kp R  &kp T  &kp Y  &kp U  &kp  I    &kp  O  &kp  P   &kp LBKT &kp RBKT  &kp BSLH
+				&kp CLCK  &kp A  &kp S  &kp D  &kp F  &kp G  &kp H  &kp J  &kp  K    &kp  L  &kp SEMI &kp SQT           &kp RET
+				&kp LSHFT  &kp Z  &kp X  &kp C  &kp V  &kp B  &kp N  &kp M  &kp COMMA &kp DOT &kp FSLH    &kp RSHFT &kp UP   &mo 1
+				&kp LCTRL &kp LGUI &kp LALT            &kp SPACE                          &kp RALT  &kp RCTRL &kp LEFT &kp DOWN &kp RIGHT
+			>;
+			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+		};
+		raise {
+			bindings = <
+				&kp GRAVE &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp  F8   &kp  F9 &kp  F10  &kp F11 &kp F12   &kp F1
+				&trans &trans &kp UP &trans &trans &trans &trans &trans &kp INS &trans &kp PSCRN &kp SLCK &kp PAUSE_BREAK &reset
+				&trans    &kp LEFT &kp DOWN &kp RIGHT &trans &trans &trans &trans &trans &trans &kp HOME  &kp PG_UP   &bootloader
+				&kp C_PREV &kp C_VOL_DN &kp C_VOL_UP &kp C_MUTE &trans &trans &trans &trans &trans &trans &trans &kp END &kp PG_DN  &kp C_NEXT
+				&bt BT_PRV &bt BT_NXT  &trans              &trans                            &trans  &trans &trans   &trans &bt BT_CLR
+			>;
+			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+		};
+		#else
+		default_layer {
+				// ------------------------------------------------------------------------------------------
+				// | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |BKSP| DEL |
+				// | TAB  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |    \    |
+				// | CAPS  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |     ENTER    |
+				// |  SHIFT    |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  | /   |   SHIFT  |  1  |
+				// |  CTL  |  WIN  |  ALT  |                     SPACE               |   ALT   |  1  | CTRL |
+				// ------------------------------------------------------------------------------------------
+			bindings = <
+				&kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp  N8   &kp  N9 &kp  N0  &kp MINUS &kp EQUAL &kp BSPC &kp DEL
+				&kp TAB  &kp Q  &kp W  &kp E  &kp R  &kp T  &kp Y  &kp U  &kp  I    &kp  O  &kp  P   &kp LBKT &kp RBKT  &kp BSLH
+				&kp CLCK  &kp A  &kp S  &kp D  &kp F  &kp G  &kp H  &kp J  &kp  K    &kp  L  &kp SEMI &kp SQT           &kp RET
+				&kp LSHFT  &kp Z  &kp X  &kp C  &kp V  &kp B  &kp N  &kp M  &kp COMMA &kp DOT &kp FSLH    &kp RSHFT    &mo 1
+				&kp LCTRL &kp LGUI &kp LALT            &kp SPACE                          &kp RALT &kp RGUI &kp C_MENU &kp RCTRL
+			>;
+			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+		};
+		raise {
+			bindings = <
+				&kp GRAVE &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp  F8   &kp  F9 &kp  F10  &kp F11 &kp F12   &kp DEL &trans
+				&trans &trans &kp UP &trans &trans &trans &trans &trans &kp INS &trans &kp PSCRN &kp SLCK &kp PAUSE_BREAK &reset
+				&trans    &kp LEFT &kp DOWN &kp RIGHT &trans &trans &trans &trans &trans &trans &kp HOME  &kp PG_UP   &bootloader
+				&kp C_PREV &kp C_VOL_DN &kp C_VOL_UP &kp C_MUTE &trans &trans &trans &trans &trans &kp END &kp PG_DN  &kp C_NEXT &trans
+				&bt BT_PRV &bt BT_NXT  &trans                       &trans                            &trans  &trans &trans &bt BT_CLR
+			>;
+			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+		};
+		#endif
+	};
+};
--- a/app/module/boards/keycapsss/puchi_ble/puchi_ble.yaml
+++ b/app/module/boards/keycapsss/puchi_ble/puchi_ble.yaml
@@ -1,5 +1,5 @@
-identifier: puchi_ble
-name: puchi_ble
+identifier: bt60_v1
+name: BT60 V1 Soldered
 type: mcu
 arch: arm
 toolchain:
--- a/app/boards/mechwild/s40nc/s40nc.zmk.yml
+++ b/app/boards/mechwild/s40nc/s40nc.zmk.yml
@@ -1,11 +1,12 @@
 file_format: "1"
-id: s40nc//zmk
-name: S40NC
+id: bt60_v1
+name: BT60 V1 Soldered
 type: board
 arch: arm
 features:
  - keys
+  - encoder
 outputs:
  - usb
  - ble
-url: https://mechwild.com
+url: https://polarityworks.com
--- a/app/boards/polarityworks/bt60/bt60_hs_nrf52840_zmk_defconfig
+++ b/app/boards/polarityworks/bt60/bt60_hs_nrf52840_zmk_defconfig
@@ -1,5 +1,9 @@
 # SPDX-License-Identifier: MIT

+CONFIG_SOC_SERIES_NRF52X=y
+CONFIG_SOC_NRF52840_QIAA=y
+CONFIG_BOARD_BT60_V1=y
+
 # Enable MPU
 CONFIG_ARM_MPU=y

@@ -11,7 +15,6 @@ CONFIG_EC11=y
 CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y

 CONFIG_USE_DT_CODE_PARTITION=y
-CONFIG_BUILD_OUTPUT_UF2=y

 CONFIG_MPU_ALLOW_FLASH_WRITE=y
 CONFIG_NVS=y
@@ -19,6 +22,3 @@ CONFIG_SETTINGS_NVS=y
 CONFIG_FLASH=y
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_FLASH_MAP=y
-
-CONFIG_ZMK_USB=y
-CONFIG_ZMK_BLE=y
--- a/app/boards/arm/bt60/bt60_v1_hs.dts
+++ b/app/boards/arm/bt60/bt60_v1_hs.dts
@@ -0,0 +1,61 @@
+/*
+* Copyright (c) 2021 Polarity Works
+*
+* SPDX-License-Identifier: MIT
+*/
+
+/dts-v1/;
+#include "bt60.dtsi"
+
+
+/ {
+	chosen {
+		zmk,kscan = &kscan0;
+		zmk,matrix_transform = &default_transform;
+	};
+
+	default_transform: keymap_transform_0 {
+		compatible = "zmk,matrix-transform";
+		columns = <15>;
+		rows = <5>;
+		map = <
+			RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12)     RC(0,13) RC(2,13)
+			RC(1,0)   RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12)   RC(1,13)
+			RC(2,0)     RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)          RC(2,12)
+			RC(3,0)       RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9)  RC(3,10)               RC(3,11)
+			RC(4,0)   RC(4,1)   RC(4,2)                      RC(4,5)                     RC(4,8)   RC(4,9)    RC(4,10)     RC(4,11)
+		>;
+	};
+
+
+	kscan0: kscan_0 {
+		compatible = "zmk,kscan-gpio-matrix";
+		label = "KSCAN";
+		diode-direction = "col2row";
+
+		col-gpios
+			= <&gpio1 11 GPIO_ACTIVE_HIGH>
+			, <&gpio1 10 GPIO_ACTIVE_HIGH>
+			, <&gpio1 13 GPIO_ACTIVE_HIGH>
+			, <&gpio1 15 GPIO_ACTIVE_HIGH>
+			, <&gpio0 3 GPIO_ACTIVE_HIGH>
+			, <&gpio0 2 GPIO_ACTIVE_HIGH>
+			, <&gpio0 28 GPIO_ACTIVE_HIGH>
+			, <&gpio0 29 GPIO_ACTIVE_HIGH>
+			, <&gpio0 30 GPIO_ACTIVE_HIGH>
+			, <&gpio0 31 GPIO_ACTIVE_HIGH>
+			, <&gpio0 5 GPIO_ACTIVE_HIGH>
+			, <&gpio0 7 GPIO_ACTIVE_HIGH>
+			, <&gpio1 9 GPIO_ACTIVE_HIGH>
+			, <&gpio0 12 GPIO_ACTIVE_HIGH>
+			;
+
+		row-gpios
+			= <&gpio1 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&gpio0 22 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&gpio0 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&gpio0 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&gpio0 23 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			;
+	};
+};
--- a/app/boards/arm/bt60/bt60_v1_hs.keymap
+++ b/app/boards/arm/bt60/bt60_v1_hs.keymap
@@ -0,0 +1,37 @@
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/keys.h>
+#include <dt-bindings/zmk/bt.h>
+
+/ {
+	keymap {
+		compatible = "zmk,keymap";
+
+		default_layer {
+				// ------------------------------------------------------------------------------------------
+				// | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BKSP   | DEL
+				// | TAB  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   |    |
+				// | CAPS  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |     ENTER    |
+				// |  SHIFT    |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  | /   |      SHIFT     |
+				// |  CTL  |  WIN  |  ALT  |            SPACE               | ALT | 1    |  MENU    |  CTRL    |
+				// ------------------------------------------------------------------------------------------
+			bindings = <
+				&kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp  N8   &kp  N9 &kp  N0  &kp MINUS &kp EQUAL &kp BSPC &bt BT_CLR
+				&kp TAB  &kp Q  &kp W  &kp E  &kp R  &kp T  &kp Y  &kp U  &kp  I    &kp  O  &kp  P   &kp LBKT &kp RBKT  &kp BSLH
+				&kp CLCK  &kp A  &kp S  &kp D  &kp F  &kp G  &kp H  &kp J  &kp  K    &kp  L  &kp SEMI &kp SQT           &kp RET
+				&kp LSHFT  &kp Z  &kp X  &kp C  &kp V  &kp B  &kp N  &kp M  &kp COMMA &kp DOT &kp FSLH             &kp RSHFT
+				&kp LCTRL &kp LGUI &kp LALT            &kp SPACE                          &kp RALT  &mo 1 &kp K_CMENU &kp RCTRL
+			>;
+			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+		};
+		raise {
+			bindings = <
+				&kp GRAVE &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp  F8   &kp  F9 &kp  F10  &kp F11 &kp F12   &kp DEL &trans
+				&trans &trans &kp UP &trans &trans &trans &trans &trans &kp INS &trans &kp PSCRN &kp SLCK &kp PAUSE_BREAK &reset
+				&trans    &kp LEFT &kp DOWN &kp RIGHT &trans &trans &trans &trans &trans &trans &kp HOME  &kp PG_UP   &bootloader
+				&kp C_PREV &kp C_VOL_DN &kp C_VOL_UP &kp C_MUTE &trans &trans &trans &trans &trans &kp END &kp PG_DN  &kp C_NEXT
+				&bt BT_PRV &bt BT_NXT  &trans              &trans                            &trans   &trans   &trans &bt BT_CLR
+			>;
+			sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
+		};
+	};
+};
--- a/app/boards/polarityworks/bt75/bt75.yaml
+++ b/app/boards/polarityworks/bt75/bt75.yaml
@@ -1,5 +1,5 @@
-identifier: bt75
-name: BT75_V1
+identifier: bt60_v1_hs
+name: BT60 V1 Hotswap
 type: mcu
 arch: arm
 toolchain:
--- a/app/boards/polarityworks/bt60/bt60_hs.zmk.yml
+++ b/app/boards/polarityworks/bt60/bt60_hs.zmk.yml
@@ -1,12 +1,11 @@
 file_format: "1"
-id: bt60_hs//zmk
+id: bt60_v1_hs
 name: BT60 V1 Hotswap
 type: board
 arch: arm
 features:
  - keys
  - encoder
-  - studio
 outputs:
  - usb
  - ble
--- a/app/boards/polarityworks/bt60/bt60_nrf52840_zmk_1_0_0_defconfig
+++ b/app/boards/polarityworks/bt60/bt60_nrf52840_zmk_1_0_0_defconfig
@@ -1,5 +1,9 @@
 # SPDX-License-Identifier: MIT

+CONFIG_SOC_SERIES_NRF52X=y
+CONFIG_SOC_NRF52840_QIAA=y
+CONFIG_BOARD_BT60_V1_HS=y
+
 # Enable MPU
 CONFIG_ARM_MPU=y

@@ -11,7 +15,6 @@ CONFIG_EC11=y
 CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y

 CONFIG_USE_DT_CODE_PARTITION=y
-CONFIG_BUILD_OUTPUT_UF2=y

 CONFIG_MPU_ALLOW_FLASH_WRITE=y
 CONFIG_NVS=y
@@ -19,6 +22,3 @@ CONFIG_SETTINGS_NVS=y
 CONFIG_FLASH=y
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_FLASH_MAP=y
-
-CONFIG_ZMK_USB=y
-CONFIG_ZMK_BLE=y
--- a/app/boards/arm/dz60rgb/CMakeLists.txt
+++ b/app/boards/arm/dz60rgb/CMakeLists.txt
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: MIT
+
+if(CONFIG_PINMUX)
+zephyr_library()
+zephyr_library_sources(pinmux.c)
+zephyr_library_include_directories(${ZEPHYR_BASE}/drivers)
+endif()
--- a/app/boards/arm/dz60rgb/Kconfig.board
+++ b/app/boards/arm/dz60rgb/Kconfig.board
@@ -0,0 +1,6 @@
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+config BOARD_DZ60RGB_REV1
+	bool "DZ60RGB Keyboard"
+	depends on SOC_STM32F303XC
--- a/app/boards/arm/dz60rgb/Kconfig.defconfig
+++ b/app/boards/arm/dz60rgb/Kconfig.defconfig
@@ -0,0 +1,14 @@
+# DZ60RGB keyboard configuration
+
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+if BOARD_DZ60RGB_REV1
+
+config ZMK_KEYBOARD_NAME
+	default "DZ60RGB Rev 1"
+
+config ZMK_USB
+	default y
+
+endif # BOARD_DZ60RGB_REV1
--- a/app/module/boards/qmk/proton_c/board.cmake
+++ b/app/module/boards/qmk/proton_c/board.cmake
@@ -3,5 +3,5 @@
 board_runner_args(dfu-util "--pid=0483:df11" "--alt=0" "--dfuse")
 board_runner_args(jlink "--device=STM32F303CC" "--speed=4000")

-include(${ZEPHYR_BASE}/boards/common/dfu-util.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
--- a/app/boards/arm/dz60rgb/dz60rgb_rev1.dts
+++ b/app/boards/arm/dz60rgb/dz60rgb_rev1.dts
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+/dts-v1/;
+#include <st/f3/stm32f303Xc.dtsi>
+
+#include <dt-bindings/zmk/matrix_transform.h>
+
+/ {
+	model = "DZ60RGB, Rev 1";
+	compatible = "dz60rgb,rev1", "st,stm32f303";
+
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+		zmk,kscan = &kscan0;
+		zmk,matrix_transform = &default_transform;
+	};
+
+	default_transform: keymap_transform_0 {
+		compatible = "zmk,matrix-transform";
+		columns = <14>;
+		rows = <5>;
+		map = <
+RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12)     RC(0,13)
+RC(1,0)   RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12)   RC(1,13)
+RC(2,0)     RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11)          RC(2,13)
+RC(3,0)       RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9)    RC(3,10)     RC(3,11) RC(3,13)
+RC(4,0)   RC(4,1)   RC(4,2)                      RC(4,5)                     RC(4,8) RC(4,9) RC(4,10) RC(4,11) RC(4,13)
+		>;
+	};
+
+	kscan0: kscan {
+		compatible = "zmk,kscan-gpio-matrix";
+		label = "KSCAN";
+
+		diode-direction = "col2row";
+		row-gpios
+			= <&gpioa 9  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&gpiob 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&gpiob 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&gpiob 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&gpiob 12 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			;
+		col-gpios
+			= <&gpioa 6  GPIO_ACTIVE_HIGH>
+			, <&gpioa 7  GPIO_ACTIVE_HIGH>
+			, <&gpiob 0  GPIO_ACTIVE_HIGH>
+			, <&gpiob 13 GPIO_ACTIVE_HIGH>
+			, <&gpiob 15 GPIO_ACTIVE_HIGH>
+			, <&gpioa 8  GPIO_ACTIVE_HIGH>
+			, <&gpioa 15 GPIO_ACTIVE_HIGH>
+			, <&gpiob 3  GPIO_ACTIVE_HIGH>
+			, <&gpiob 4  GPIO_ACTIVE_HIGH>
+			, <&gpiob 5  GPIO_ACTIVE_HIGH>
+			, <&gpiob 8  GPIO_ACTIVE_HIGH>
+			, <&gpiob 9  GPIO_ACTIVE_HIGH>
+			, <&gpioc 13 GPIO_ACTIVE_HIGH>
+			, <&gpioc 14 GPIO_ACTIVE_HIGH>
+			;
+	};
+
+};
+
+&usb {
+	status = "okay";
+};
+
+&flash0 {
+	/*
+	 * For more information, see:
+	 * http://docs.zephyrproject.org/latest/guides/dts/index.html#flash-partitions
+	 */
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		/* Set 6Kb of storage at the end of the 256Kb of flash */
+		storage_partition: partition@3e800 {
+			label = "storage";
+			reg = <0x0003e800 0x00001800>;
+		};
+	};
+};
--- a/app/boards/arm/dz60rgb/dz60rgb_rev1.keymap
+++ b/app/boards/arm/dz60rgb/dz60rgb_rev1.keymap
@@ -0,0 +1,25 @@
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/keys.h>
+
+/ {
+	keymap {
+		compatible = "zmk,keymap";
+
+		default_layer {
+// ------------------------------------------------------------------------------------------
+// | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BKSP   |
+// | TAB  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   "|"   |
+// | CAPS  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |     ENTER    |
+// |  SHIFT  |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  SHIFT(/)  |  ^  | DEL |
+// |  CTL  |  WIN  |  ALT  |            SPACE               | ALT | MO(1) |  <- |  v  | ->  |
+// ------------------------------------------------------------------------------------------
+			bindings = <
+	&kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp  N8   &kp  N9 &kp  N0  &kp MINUS &kp EQUAL &kp BSPC
+	&kp TAB  &kp Q  &kp W  &kp E  &kp R  &kp T  &kp Y  &kp U  &kp  I    &kp  O  &kp  P   &kp LBKT &kp RBKT  &kp BSLH
+	&kp CLCK  &kp A  &kp S  &kp D  &kp F  &kp G  &kp H  &kp J  &kp  K    &kp  L  &kp SEMI &kp SQT           &kp RET
+	&kp LSHFT  &kp Z  &kp X  &kp C  &kp V  &kp B  &kp N  &kp M  &kp COMMA &kp DOT &mt RSHFT FSLH   &kp  UP  &kp DEL
+	&kp LCTRL &kp LGUI &kp LALT            &kp SPACE                     &kp RALT &mo  1  &kp LEFT &kp DOWN &kp RIGHT
+			>;
+		};
+	};
+};
--- a/app/boards/arm/dz60rgb/dz60rgb_rev1.yaml
+++ b/app/boards/arm/dz60rgb/dz60rgb_rev1.yaml
@@ -1,5 +1,5 @@
-identifier: preonic_rev3
-name: PREONICREV3
+identifier: DZ60RGB_rev1
+name: DZ60RGBREV1
 type: keyboard
 arch: arm
 toolchain:
--- a/app/boards/arm/dz60rgb/dz60rgb_rev1_defconfig
+++ b/app/boards/arm/dz60rgb/dz60rgb_rev1_defconfig
@@ -0,0 +1,27 @@
+# SPDX-License-Identifier: MIT
+
+CONFIG_SOC_SERIES_STM32F3X=y
+CONFIG_SOC_STM32F303XC=y
+# 72MHz system clock
+CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=72000000
+
+# enable pinmux
+CONFIG_PINMUX=y
+
+# enable GPIO
+CONFIG_GPIO=y
+
+# clock configuration
+CONFIG_CLOCK_CONTROL=y
+
+# Clock configuration for Cube Clock control driver
+CONFIG_CLOCK_STM32_HSE_CLOCK=8000000
+CONFIG_CLOCK_STM32_SYSCLK_SRC_PLL=y
+# use HSE as PLL input
+CONFIG_CLOCK_STM32_PLL_SRC_HSE=y
+# produce 72MHz clock at PLL output
+CONFIG_CLOCK_STM32_PLL_PREDIV=1
+CONFIG_CLOCK_STM32_PLL_MULTIPLIER=9
+CONFIG_CLOCK_STM32_AHB_PRESCALER=1
+CONFIG_CLOCK_STM32_APB1_PRESCALER=2
+CONFIG_CLOCK_STM32_APB2_PRESCALER=1
--- a/app/boards/arm/dz60rgb/pinmux.c
+++ b/app/boards/arm/dz60rgb/pinmux.c
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2017 I-SENSE group of ICCS
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <kernel.h>
+#include <device.h>
+#include <init.h>
+#include <drivers/pinmux.h>
+#include <sys/sys_io.h>
+
+#include <pinmux/stm32/pinmux_stm32.h>
+
+/* pin assignments for STM32F3DISCOVERY board */
+static const struct pin_config pinconf[] = {
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(usart1), okay) && CONFIG_SERIAL
+    {STM32_PIN_PC4, STM32F3_PINMUX_FUNC_PC4_USART1_TX},
+    {STM32_PIN_PC5, STM32F3_PINMUX_FUNC_PC5_USART1_RX},
+#endif
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(usart2), okay) && CONFIG_SERIAL
+    {STM32_PIN_PA2, STM32F3_PINMUX_FUNC_PA2_USART2_TX},
+    {STM32_PIN_PA3, STM32F3_PINMUX_FUNC_PA3_USART2_RX},
+#endif
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c1), okay) && CONFIG_I2C
+    {STM32_PIN_PB6, STM32F3_PINMUX_FUNC_PB6_I2C1_SCL},
+    {STM32_PIN_PB7, STM32F3_PINMUX_FUNC_PB7_I2C1_SDA},
+#endif
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c2), okay) && CONFIG_I2C
+    {STM32_PIN_PA9, STM32F3_PINMUX_FUNC_PA9_I2C2_SCL},
+    {STM32_PIN_PA10, STM32F3_PINMUX_FUNC_PA10_I2C2_SDA},
+#endif
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(spi1), okay) && CONFIG_SPI
+#ifdef CONFIG_SPI_STM32_USE_HW_SS
+    {STM32_PIN_PA4, STM32F3_PINMUX_FUNC_PA4_SPI1_NSS},
+#endif /* CONFIG_SPI_STM32_USE_HW_SS */
+    {STM32_PIN_PA5, STM32F3_PINMUX_FUNC_PA5_SPI1_SCK},
+    {STM32_PIN_PA6, STM32F3_PINMUX_FUNC_PA6_SPI1_MISO},
+    {STM32_PIN_PA7, STM32F3_PINMUX_FUNC_PA7_SPI1_MOSI},
+#endif
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(spi2), okay) && CONFIG_SPI
+#ifdef CONFIG_SPI_STM32_USE_HW_SS
+    {STM32_PIN_PB12, STM32F3_PINMUX_FUNC_PB12_SPI2_NSS},
+#endif /* CONFIG_SPI_STM32_USE_HW_SS */
+    {STM32_PIN_PB13, STM32F3_PINMUX_FUNC_PB13_SPI2_SCK},
+    {STM32_PIN_PB14, STM32F3_PINMUX_FUNC_PB14_SPI2_MISO},
+    {STM32_PIN_PB15, STM32F3_PINMUX_FUNC_PB15_SPI2_MOSI},
+#endif
+#ifdef CONFIG_USB_DC_STM32
+    {STM32_PIN_PA11, STM32F3_PINMUX_FUNC_PA11_USB_DM},
+    {STM32_PIN_PA12, STM32F3_PINMUX_FUNC_PA12_USB_DP},
+#endif /* CONFIG_USB_DC_STM32 */
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(can1), okay) && CONFIG_CAN
+    {STM32_PIN_PD0, STM32F3_PINMUX_FUNC_PD0_CAN1_RX},
+    {STM32_PIN_PD1, STM32F3_PINMUX_FUNC_PD1_CAN1_TX},
+#endif
+};
+
+static int pinmux_stm32_init(const struct device *port) {
+    ARG_UNUSED(port);
+
+    stm32_setup_pins(pinconf, ARRAY_SIZE(pinconf));
+
+    return 0;
+}
+
+SYS_INIT(pinmux_stm32_init, PRE_KERNEL_1, CONFIG_PINMUX_STM32_DEVICE_INITIALIZATION_PRIORITY);
--- a/app/boards/arm/ferris/Kconfig.board
+++ b/app/boards/arm/ferris/Kconfig.board
@@ -0,0 +1,8 @@
+# Ferris board configuration
+
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+config BOARD_FERRIS
+	bool "Ferris rev 0.2"
+	depends on SOC_STM32F072XB
--- a/app/boards/pierrechevalier83/ferris/Kconfig.defconfig
+++ b/app/boards/pierrechevalier83/ferris/Kconfig.defconfig
@@ -5,10 +5,19 @@

 if BOARD_FERRIS

+config BOARD
+	default "ferris_rev02"
+
 config ZMK_KEYBOARD_NAME
 	default "Ferris rev 0.2"

+config ZMK_USB
+	default y
+
 config ZMK_KSCAN_MATRIX_POLLING
 	default y

+config ZMK_KSCAN_COMPOSITE_DRIVER
+	default y
+
 endif # BOARD_FERRIS
--- a/app/boards/pierrechevalier83/ferris/README.md
+++ b/app/boards/pierrechevalier83/ferris/README.md
@@ -1,9 +1,10 @@
 # Building ZMK for the Ferris 0.2

+
 ## Standard Build

 ```
-west build -p -d build/ferris --board ferris
+west build -p -d build/ferris --board ferris_rev02
 ```

 ## Flashing
--- a/app/boards/pierrechevalier83/ferris/board.cmake
+++ b/app/boards/pierrechevalier83/ferris/board.cmake
--- a/app/boards/arm/ferris/ferris_rev02.dts
+++ b/app/boards/arm/ferris/ferris_rev02.dts
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+/dts-v1/;
+#include <st/f0/stm32f072Xb.dtsi>
+#include <st/f0/stm32f072v(8-b)tx-pinctrl.dtsi>
+
+#include <dt-bindings/zmk/matrix_transform.h>
+
+/ {
+	model = "Ferris rev0.2";
+	compatible = "ferris,rev02", "st,stm32f072";
+
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+		zmk,kscan = &kscan;
+		zmk,matrix_transform = &transform;
+		/* TODO: Enable once we support the IC for underglow
+		zmk,underglow = &led_strip;
+		 */
+	};
+
+	transform: transform {
+		compatible = "zmk,matrix-transform";
+		rows = <4>;
+		columns = <10>;
+
+		map = <
+		RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4)     RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9)
+		RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4)     RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9)
+		RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4)     RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9)
+		RC(3,3)  RC(3,4)     RC(3,5) RC(3,6)
+		>;
+	};
+
+	kscan: kscan {
+		compatible = "zmk,kscan-composite";
+		label = "KSCAN";
+		rows = <4>;
+		columns = <10>;
+
+		left {
+			kscan = <&kscan_left>;
+		};
+
+		right {
+			kscan = <&kscan_right>;
+			column-offset = <5>;
+		};
+	};
+
+	kscan_left: kscan_left {
+		compatible = "zmk,kscan-gpio-matrix";
+		label = "KSCAN_LEFT";
+
+		diode-direction = "col2row";
+
+		col-gpios
+		= <&gpiob 8 (GPIO_ACTIVE_HIGH)>
+		, <&gpiob 4 (GPIO_ACTIVE_HIGH)>
+		, <&gpiob 3 (GPIO_ACTIVE_HIGH)>
+		, <&gpioa 15 (GPIO_ACTIVE_HIGH)>
+		, <&gpioa 14 (GPIO_ACTIVE_HIGH)>
+		;
+		row-gpios
+		= <&gpiob 7  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+		, <&gpiob 6  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+		, <&gpiob 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+		, <&gpioa 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+		;
+	};
+
+	kscan_right: kscan_right {
+		compatible = "zmk,kscan-gpio-matrix";
+		label = "KSCAN_RIGHT";
+
+		diode-direction = "row2col";
+
+		col-gpios
+		= <&right_io 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+		, <&right_io 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+		, <&right_io 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+		, <&right_io 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+		, <&right_io 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+		;
+		row-gpios
+		= <&right_io 8  (GPIO_ACTIVE_LOW)>
+		, <&right_io 9  (GPIO_ACTIVE_LOW)>
+		, <&right_io 10 (GPIO_ACTIVE_LOW)>
+		, <&right_io 11 (GPIO_ACTIVE_LOW)>
+		;
+	};
+};
+
+&i2c2 {
+	pinctrl-0 = <&i2c2_scl_pb10 &i2c2_sda_pb11>;
+	status = "okay";
+	clock-frequency = <I2C_BITRATE_FAST>;
+
+	right_io: mcp23017@20 {
+		compatible = "microchip,mcp23017";
+		status = "okay";
+		gpio-controller;
+		reg = <0x20>;
+		label = "RIGHT_IO";
+		#gpio-cells = <2>;
+		ngpios = <16>;
+	};
+};
+
+&usb {
+	status = "okay";
+};
+
+&rtc {
+	status = "okay";
+};
+
+&flash0 {
+	/*
+	 * For more information, see:
+	 * http: //docs.zephyrproject.org/latest/guides/dts/index.html#flash-partitions
+	 */
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		/* Set 6Kb of storage at the end of the 128Kb of flash */
+		storage_partition: partition@3e800 {
+			label = "storage";
+			reg = <0x0001e800 0x00001800>;
+		};
+	};
+};
--- a/app/boards/pierrechevalier83/ferris/ferris.keymap
+++ b/app/boards/pierrechevalier83/ferris/ferris.keymap
@@ -4,8 +4,6 @@
 * SPDX-License-Identifier: MIT
 */

-#undef ZMK_BEHAVIORS_KEEP_ALL
-
 #include <behaviors.dtsi>
 #include <dt-bindings/zmk/keys.h>
 #include <dt-bindings/zmk/bt.h>
@@ -16,14 +14,15 @@
 #define SYM_L 4

 // Using layer taps on thumbs, having quick tap as well helps w/ repeating space/backspace
-&lt { quick-tap-ms = <200>; };
+&lt { quick_tap_ms = <200>; };

 / {
    behaviors {
        hm: homerow_mods {
            compatible = "zmk,behavior-hold-tap";
+            label = "homerow mods";
            #binding-cells = <2>;
-            tapping-term-ms = <200>;
+            tapping_term_ms = <200>;
            flavor = "tap-preferred";
            bindings = <&kp>, <&kp>;
        };
@@ -35,16 +34,16 @@
        default_layer {
            bindings = <
                &kp Q      &kp W      &kp E       &kp R          &kp T         &kp Y            &kp U          &kp I       &kp O      &kp P
-                &hm LGUI A &hm LALT S &hm LCTRL D &hm LSHFT F    &kp G         &kp H            &hm RSHFT J    &hm RCTRL K &hm LALT L &hm LGUI SQT
+                &hm LGUI A &hm LALT S &hm LCTRL D &hm LSHFT F    &kp G         &kp H            &hm RSHFT J    &hm RCTRL K &hm LALT L &hm LGUI QUOT
                &kp Z      &kp X      &kp C       &kp V          &kp B         &kp N            &kp M          &kp COMMA   &kp DOT    &kp FSLH
-                                                  &lt NAV_L TAB  &kp ENTER     &lt NUM_L SPACE  &lt SYM_L BSPC
+                                                  &lt NAV_L TAB  &kp ENTER     &lt NUM_L SPACE  &lt SYM_L BKSP
            >;
        };

        nav_layer {
            bindings = <
                &trans     &trans     &trans      &trans          &trans       &trans           &trans         &trans      &trans     &trans
-                &trans     &trans     &trans      &trans          &trans       &trans           &kp LEFT       &kp DOWN    &kp UP   &kp RIGHT
+                &trans     &trans     &trans      &trans          &trans       &trans           &kp LARW       &kp DARW    &kp UARW   &kp RARW
                &trans     &trans     &trans      &trans          &trans       &trans           &kp HOME       &kp PG_DN   &kp PG_UP  &kp END
                                                  &trans          &trans       &kp ESC          &kp DEL
            >;
--- a/app/boards/pierrechevalier83/ferris/ferris.yaml
+++ b/app/boards/pierrechevalier83/ferris/ferris.yaml
@@ -1,4 +1,4 @@
-identifier: ferris
+identifier: ferris_rev02
 name: Ferris 0.2
 type: mcu
 arch: arm
--- a/app/boards/pierrechevalier83/ferris/ferris.zmk.yml
+++ b/app/boards/pierrechevalier83/ferris/ferris.zmk.yml
@@ -1,5 +1,5 @@
 file_format: "1"
-id: ferris//zmk
+id: ferris_rev02
 name: Ferris 0.2
 type: board
 arch: arm
--- a/app/boards/arm/ferris/ferris_rev02_defconfig
+++ b/app/boards/arm/ferris/ferris_rev02_defconfig
@@ -0,0 +1,43 @@
+# SPDX-License-Identifier: MIT
+
+CONFIG_BOARD_FERRIS=y
+CONFIG_SOC_SERIES_STM32F0X=y
+CONFIG_SOC_STM32F072XB=y
+# 48MHz system clock
+CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=48000000
+
+# enable PINMUX
+CONFIG_PINMUX=y
+
+# enable GPIO
+CONFIG_GPIO=y
+
+# Enable i2c
+CONFIG_I2C=y
+
+# ZMK Settings
+CONFIG_ZMK_USB=y
+CONFIG_ZMK_KSCAN_GPIO_DRIVER=y
+CONFIG_ZMK_KSCAN_COMPOSITE_DRIVER=y
+CONFIG_ZMK_KSCAN_MATRIX_POLLING=y
+CONFIG_USB_SELF_POWERED=n
+
+# Enable IO multiplexer
+CONFIG_GPIO_MCP23017=y
+
+# Needed to reduce this to size that will fit on F072
+CONFIG_HEAP_MEM_POOL_SIZE=1024
+
+# clock configuration
+CONFIG_CLOCK_CONTROL=y
+
+# Clock configuration for Cube Clock control driver
+CONFIG_CLOCK_STM32_SYSCLK_SRC_PLL=y
+# use HSI as PLL input
+CONFIG_CLOCK_STM32_PLL_SRC_HSI=y
+# produce 48MHz clock at PLL output
+# CONFIG_CLOCK_STM32_PLL_PREDIV=1
+CONFIG_CLOCK_STM32_PLL_MULTIPLIER=6
+CONFIG_CLOCK_STM32_AHB_PRESCALER=1
+CONFIG_CLOCK_STM32_APB1_PRESCALER=1
+# CONFIG_CLOCK_STM32_APB2_PRESCALER=1
--- a/app/boards/arm/mikoto/CMakeLists.txt
+++ b/app/boards/arm/mikoto/CMakeLists.txt
@@ -0,0 +1,14 @@
+set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
+  COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/../tools/uf2/utils/uf2conv.py
+  -c 
+  -b 0x26000
+  -f 0xADA52840
+  -o ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.uf2
+  ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.bin
+)
+
+if(CONFIG_PINMUX)
+zephyr_library()
+zephyr_library_sources(pinmux.c)
+zephyr_library_include_directories(${ZEPHYR_BASE}/drivers)
+endif()
--- a/app/module/boards/zhiayang/mikoto/Kconfig
+++ b/app/module/boards/zhiayang/mikoto/Kconfig
@@ -1,6 +1,12 @@
+config BOARD_ENABLE_DCDC
+	bool "Enable DCDC mode"
+	select SOC_DCDC_NRF52X
+	default y
+	depends on (BOARD_MIKOTO_520)
+
 choice BOARD_MIKOTO_CHARGER_CURRENT
    prompt "Charge current to supply to attached batteries"
-    depends on (BOARD_MIKOTO)
+	depends on (BOARD_MIKOTO_520)

 config BOARD_MIKOTO_CHARGER_CURRENT_40MA
    bool "40mA charge current, for battery capacity 40mAh or higher"
--- a/app/boards/arm/mikoto/Kconfig.board
+++ b/app/boards/arm/mikoto/Kconfig.board
@@ -0,0 +1,8 @@
+# mikoto board configuration
+
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+config BOARD_MIKOTO_520
+	bool "mikoto_520"
+	depends on SOC_NRF52840_QIAA
--- a/app/module/boards/zhiayang/mikoto/Kconfig.defconfig
+++ b/app/module/boards/zhiayang/mikoto/Kconfig.defconfig
@@ -3,7 +3,10 @@
 # Copyright (c) 2020 The ZMK Contributors
 # SPDX-License-Identifier: MIT

-if BOARD_MIKOTO
+if BOARD_MIKOTO_520
+
+config BOARD
+	default "mikoto"

 if USB

@@ -15,8 +18,23 @@ config USB_DEVICE_STACK

 endif # USB

+config BT_CTLR
+	default BT
+
+config ZMK_BLE
+	default y
+
+config ZMK_USB
+	default y
+
+config PINMUX
+	default y
+
 choice BOARD_MIKOTO_CHARGER_CURRENT
    default BOARD_MIKOTO_CHARGER_CURRENT_100MA
 endchoice

-endif # BOARD_MIKOTO
+config ZMK_BATTERY_VOLTAGE_DIVIDER
+	default y
+
+endif # BOARD_MIKOTO_520
--- a/Show More
+++ b/Show More