Adding in code for jNumpad and pslgh

2026-03-20 04:55:20 -05:00 · 2023-11-24 09:05:16 +00:00
1132 changed files with 25393 additions and 40392 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:3.5
+FROM docker.io/zmkfirmware/zmk-dev-arm:3.2

 COPY .bashrc tmp
 RUN mv /tmp/.bashrc ~/.bashrc
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -9,7 +9,6 @@
  "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"
--- 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,8 +1,15 @@
-<!-- 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. -->
+<!-- If you're adding a board/shield please fill out this check-list, otherwise you can delete it -->

-## PR check-list
+## Board/Shield 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.
+- [ ] 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)
- [ ] [Pre-commit](https://zmk.dev/docs/development/local-toolchain/pre-commit) used to check formatting of files, commit messages, etc.
+- [ ] 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
+- [ ] Kconfig.defconfig file correctly wraps _all_ configuration in conditional on the shield symbol
+- [ ] `.conf` file has optional extra features commented out
+- [ ] Keyboard/PCB is part of a shipped group buy or is generally available in stock to purchase (OSH/personal projects without general availability should create a zmk-config repo instead)
--- 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@v4
-      - 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:3.5
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - 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
-      - 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
@@ -26,13 +26,13 @@ on:

 jobs:
  matrix:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
    name: Fetch Build Keyboards
    outputs:
      build_matrix: ${{ env.build_matrix }}
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3

      - name: Install yaml2json
        run: python3 -m pip install remarshal
@@ -52,59 +52,33 @@ jobs:
      fail-fast: false
      matrix: ${{ fromJson(needs.matrix.outputs.build_matrix) }}
    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Create build directory
-        run: |
-          echo "build_dir=$(mktemp -d)" >> $GITHUB_ENV
-
      - name: Prepare variables
        shell: sh -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 "extra_cmake_args=${shield:+-DSHIELD=\"$shield\"}" >> $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: Checkout
+        uses: actions/checkout@v3

      - name: Cache west modules
-        uses: actions/cache@v4
+        uses: actions/cache@v3.0.11
        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/
+            modules/
+            tools/
+            zephyr/
+            bootloader/
+            zmk/
          key: ${{ runner.os }}-build-${{ env.cache_name }}-${{ hashFiles('**/west.yml', '**/build.yaml') }}
          restore-keys: |
            ${{ runner.os }}-build-${{ env.cache_name }}-
@@ -112,27 +86,23 @@ jobs:
            ${{ runner.os }}-

      - name: West Init
-        working-directory: ${{ env.base_dir }}
-        run: west init -l "${{ env.base_dir }}/${{ inputs.config_path }}"
+        run: west init -l "${{ inputs.config_path }}"

      - name: West Update
-        working-directory: ${{ env.base_dir }}
        run: west update

      - 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 }}
+        run: west build -s zmk/app -b "${{ matrix.board }}" -- -DZMK_CONFIG="${GITHUB_WORKSPACE}/${{ inputs.config_path }}" ${{ env.extra_cmake_args }} ${{ matrix.cmake-args }}

      - name: ${{ env.display_name }} Kconfig file
        run: |
-          if [ -f "${{ env.build_dir }}/zephyr/.config" ]
+          if [ -f build/zephyr/.config ]
          then
-            grep -v -e "^#" -e "^$" "${{ env.build_dir }}/zephyr/.config" | sort
+            grep -v -e "^#" -e "^$" build/zephyr/.config | sort
          else
            echo "No Kconfig output"
          fi
@@ -140,12 +110,12 @@ jobs:

      - name: ${{ env.display_name }} Devicetree file
        run: |
-          if [ -f "${{ env.build_dir }}/zephyr/zephyr.dts" ]
+          if [ -f build/zephyr/zephyr.dts ]
          then
-            cat "${{ env.build_dir }}/zephyr/zephyr.dts"
-          elif [ -f "${{ env.build_dir }}/zephyr/zephyr.dts.pre" ]
+            cat build/zephyr/zephyr.dts
+          elif [ -f build/zephyr/zephyr.dts.pre ]
          then
-            cat -s "${{ env.build_dir }}/zephyr/zephyr.dts.pre"
+            cat -s build/zephyr/zephyr.dts.pre
          else
            echo "No Devicetree output"
          fi
@@ -154,29 +124,17 @@ jobs:
      - name: Rename artifacts
        shell: sh -x {0}
        run: |
-          mkdir "${{ env.build_dir }}/artifacts"
-          if [ -f "${{ env.build_dir }}/zephyr/zmk.uf2" ]
+          mkdir build/artifacts
+          if [ -f build/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 }}" ]
+            cp build/zephyr/zmk.uf2 "build/artifacts/${{ env.artifact_name }}.uf2"
+          elif [ -f build/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 }}"
+            cp "build/zephyr/zmk.${{ inputs.fallback_binary }}" "build/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
-    needs: build
-    name: Merge Output Artifacts
-    steps:
-      - name: Merge Artifacts
-        uses: actions/upload-artifact/merge@v4
+        uses: actions/upload-artifact@v3
        with:
          name: ${{ inputs.archive_name }}
-          pattern: artifact-*
-          delete-merged: true
+          path: build/artifacts
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,29 +12,21 @@ on:
  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:3.5
+      image: docker.io/zmkfirmware/zmk-build-arm:3.2
    needs: compile-matrix
    strategy:
      matrix:
        include: ${{ fromJSON(needs.compile-matrix.outputs.include-list) }}
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: false
+        uses: actions/checkout@v3
      - name: Cache west modules
-        uses: actions/cache@v4
+        uses: actions/cache@v3.0.2
        env:
          cache-name: cache-zephyr-modules
        with:
@@ -57,17 +49,19 @@ jobs:
      - name: Export Zephyr CMake package (west zephyr-export)
        run: west zephyr-export
      - name: Use Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v2
        with:
          node-version: "14.x"
      - name: Install @actions/artifact
        run: npm install @actions/artifact
-      - name: Build
-        uses: actions/github-script@v7
+      - name: Build and upload artifacts
+        uses: actions/github-script@v4
        id: boards-list
        with:
          script: |
            const fs = require('fs');
+            const artifact = require('@actions/artifact');
+            const artifactClient = artifact.create();

            const execSync = require('child_process').execSync;

@@ -77,39 +71,10 @@ jobs:

            for (const shieldArgs of buildShieldArgs) {
              try {
+                const output = execSync(`west build -s app -p -b ${{ matrix.board }} -- ${shieldArgs.shield ? '-DSHIELD="' + shieldArgs.shield + '"' : ''} ${shieldArgs['cmake-args'] || ''}`);
+
                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"];

@@ -125,9 +90,9 @@ jobs:
                const cmakeName = shieldArgs['cmake-args'] ? '-' + (shieldArgs.nickname || shieldArgs['cmake-args'].split(' ').join('')) : '';
                const artifactName = `${{ matrix.board }}${shieldArgs.shield ? '-' + shieldArgs.shield : ''}${cmakeName}-zmk`;

-                await artifact.uploadArtifact(artifactName, files, rootDirectory, options);
+                await artifactClient.uploadArtifact(artifactName, files, rootDirectory, options);
              } catch (e) {
-                console.error(`::error::Failed to upload ${{ matrix.board }} ${shieldArgs.shield} ${shieldArgs['cmake-args']}`);
+                console.error(`::error::Failed to build or upload ${{ matrix.board }} ${shieldArgs.shield} ${shieldArgs['cmake-args']}`);
                console.error(e);
                error = true;
              } finally {
@@ -139,14 +104,14 @@ jobs:
              throw new Error('Failed to build one or more configurations');
            }
  compile-matrix:
-    if: ${{ !cancelled() }}
+    if: ${{ always() }}
    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
+        uses: actions/github-script@v4
        id: compile-list
        with:
          script: |
@@ -170,7 +135,6 @@ jobs:
              perBoard[configuration.board].push({
                shield: configuration.shield,
                'cmake-args': configuration['cmake-args'],
-                snippet: configuration.snippet,
                nickname: configuration.nickname
              })
            }
@@ -187,16 +151,14 @@ jobs:
      core-include: ${{ steps.core-list.outputs.result }}
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: false
+        uses: actions/checkout@v3
      - name: Use Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v2
        with:
          node-version: "14.x"
      - name: Install js-yaml
        run: npm install js-yaml
-      - uses: actions/github-script@v7
+      - uses: actions/github-script@v4
        id: core-list
        with:
          script: |
@@ -218,14 +180,14 @@ jobs:
      boards-include: ${{ steps.boards-list.outputs.result }}
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      - name: Use Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v2
        with:
          node-version: "14.x"
      - name: Install js-yaml
        run: npm install js-yaml
-      - uses: actions/github-script@v7
+      - uses: actions/github-script@v4
        id: boards-list
        with:
          script: |
@@ -295,14 +257,14 @@ jobs:
              });
            }))).flat();
  nightly:
-    if: ${{ github.event_name == 'schedule' && github.repository_owner == 'zmkfirmware' }}
+    if: ${{ github.event_name == 'schedule' }}
    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
+        uses: actions/github-script@v4
        id: nightly-list
        with:
          script: |
@@ -345,17 +307,15 @@ jobs:
      organized-metadata: ${{ steps.organize-metadata.outputs.result }}
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: false
+        uses: actions/checkout@v3
      - name: Use Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v2
        with:
          node-version: "14.x"
      - name: Install js-yaml
        run: npm install js-yaml
      - name: Aggregate Metadata
-        uses: actions/github-script@v7
+        uses: actions/github-script@v4
        id: aggregate-metadata
        with:
          script: |
@@ -373,7 +333,7 @@ jobs:
          result-encoding: string

      - name: Organize Metadata
-        uses: actions/github-script@v7
+        uses: actions/github-script@v4
        id: organize-metadata
        with:
          script: |
@@ -422,32 +382,27 @@ jobs:
    if: ${{ github.event_name != 'schedule' }}
    runs-on: ubuntu-latest
    outputs:
-      changed-files: ${{ steps.changed-files.outputs.all_changed_files }}
+      changed-files: ${{ steps.changed-files.outputs.all }}
      board-changes: ${{ steps.board-changes.outputs.result }}
      core-changes: ${{ steps.core-changes.outputs.result }}
    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-      - uses: tj-actions/changed-files@v45
+      - uses: Ana06/get-changed-files@v2.0.0
        id: changed-files
        with:
-          json: true
-          escape_json: false
-      - uses: actions/github-script@v7
+          format: "json"
+      - uses: actions/github-script@v4
        id: board-changes
        with:
          script: |
-            const changedFiles = JSON.parse(`${{ steps.changed-files.outputs.all_changed_files }}`);
+            const changedFiles = JSON.parse(`${{ steps.changed-files.outputs.all }}`);
            const boardChanges = changedFiles.filter(f => f.startsWith('app/boards'));
            return boardChanges.length ? 'true' : 'false';
          result-encoding: string
-      - uses: actions/github-script@v7
+      - uses: actions/github-script@v4
        id: core-changes
        with:
          script: |
-            const changedFiles = JSON.parse(`${{ steps.changed-files.outputs.all_changed_files }}`);
+            const changedFiles = JSON.parse(`${{ steps.changed-files.outputs.all }}`);
            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');
--- a/.github/workflows/doc-checks.yml
+++ b/.github/workflows/doc-checks.yml
@@ -14,7 +14,7 @@ jobs:
  lint:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - uses: bahmutov/npm-install@v1
        with:
          working-directory: docs
@@ -24,7 +24,7 @@ jobs:
  typecheck:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - uses: bahmutov/npm-install@v1
        with:
          working-directory: docs
--- a/.github/workflows/hardware-metadata-validation.yml
+++ b/.github/workflows/hardware-metadata-validation.yml
@@ -18,11 +18,11 @@ jobs:
  validate-metadata:
    runs-on: ubuntu-latest
    container:
-      image: docker.io/zmkfirmware/zmk-dev-arm:3.5
+      image: docker.io/zmkfirmware/zmk-dev-arm:3.2
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - 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
@@ -8,8 +8,8 @@ jobs:
  pre-commit:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
        with:
          python-version: 3.x
-      - uses: pre-commit/action@v3.0.1
+      - uses: pre-commit/action@v3.0.0
--- a/.github/workflows/release-please.yml
+++ b/.github/workflows/release-please.yml
@@ -1,38 +0,0 @@
-on:
-  push:
-    branches:
-      - main
-      - "v*.*-branch"
-
-permissions:
-  contents: write
-  pull-requests: write
-
-name: release-please
-
-jobs:
-  release-please:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: googleapis/release-please-action@v4
-        id: release
-        with:
-          token: ${{ secrets.ZMK_RELEASE_PLEASE_TOKEN }}
-          target-branch: ${{ github.ref_name }}
-      - uses: actions/checkout@v4
-        if: ${{ steps.release.outputs.release_created }}
-      - name: create major, minor branch
-        if: ${{ steps.release.outputs.release_created && steps.release.outputs.patch == '0' }}
-        run: |
-          git remote add gh-token-branch "https://x-access-token:${{ secrets.ZMK_RELEASE_PLEASE_TOKEN }}@github.com/${{ github.repository }}.git"
-          git checkout -b v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}-branch
-          git push gh-token-branch v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}-branch
-      - name: tag major and minor versions
-        if: ${{ steps.release.outputs.release_created }}
-        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:${{ secrets.ZMK_RELEASE_PLEASE_TOKEN }}@github.com/${{ github.repository }}.git"
-          git tag -d v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} || true
-          git tag -a v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} -m "Release v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}"
-          git push --force gh-token v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -6,13 +6,11 @@ on:
      - ".github/workflows/test.yml"
      - "app/tests/**"
      - "app/src/**"
-      - "app/include/**"
  pull_request:
    paths:
      - ".github/workflows/test.yml"
      - "app/tests/**"
      - "app/src/**"
-      - "app/include/**"

 jobs:
  collect-tests:
@@ -21,13 +19,13 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      - 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
+          export TESTS=$(ls -d * | jq -R -s -c 'split("\n")[:-1]')
+          echo "::set-output name=test-dirs::${TESTS}"
  run-tests:
    needs: collect-tests
    strategy:
@@ -35,12 +33,12 @@ jobs:
        test: ${{ fromJSON(needs.collect-tests.outputs.test-dirs) }}
    runs-on: ubuntu-latest
    container:
-      image: docker.io/zmkfirmware/zmk-build-arm:3.5
+      image: docker.io/zmkfirmware/zmk-build-arm:3.2
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      - name: Cache west modules
-        uses: actions/cache@v4
+        uses: actions/cache@v3.0.2
        env:
          cache-name: cache-zephyr-modules
        with:
@@ -67,7 +65,7 @@ jobs:
        run: west test tests/${{ matrix.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
@@ -5,14 +5,5 @@
 /zephyr
 /zmk-config
 /build
-
-# macOS
 *.DS_Store
-
-# Python
-__pycache__
-.python-version
-.venv
-
-# clangd
-app/.cache/
+__pycache__
--- 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
@@ -4,31 +4,20 @@ repos:
    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
+        exclude: "vendor-prefixes\\.txt$"
+  - repo: https://github.com/pocc/pre-commit-hooks
+    rev: v1.3.5
    hooks:
      - id: clang-format
-        types_or: [c++, c]
        args:
          - -i
  - repo: https://github.com/pre-commit/mirrors-prettier
    rev: v2.7.1
    hooks:
      - id: prettier
-        exclude: |
-          (?x)^(
-              .git/COMMIT_EDITMSG|
-              CHANGELOG.md|
-              .release-please-manifest.json
-          )$
        # Workaround for https://github.com/pre-commit/mirrors-prettier/issues/29
        additional_dependencies:
          - prettier@2.8.7
-  - 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:
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1 +0,0 @@
-{".":"0.1.0"}
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -4,7 +4,6 @@
    "ms-python.python",
    "ms-vscode.cpptools",
    "plorefice.devicetree",
-    "twxs.cmake",
-    "unifiedjs.vscode-mdx"
+    "twxs.cmake"
  ]
 }
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,22 +0,0 @@
-# Changelog
-
-## 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/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -2,37 +2,32 @@ cmake_minimum_required(VERSION 3.13.1)

 set(CONFIG_APPLICATION_DEFINED_SYSCALL true)

-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)
+
+set(ZephyrBuildConfiguration_ROOT ${CMAKE_SOURCE_DIR}/cmake)
+
+list(APPEND ZEPHYR_EXTRA_MODULES
+  ${CMAKE_CURRENT_SOURCE_DIR}/module
+)

 # 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/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)
 target_sources(app PRIVATE src/stdlib.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/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/sensor_event.c)
@@ -41,14 +36,13 @@ 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)
 if ((NOT CONFIG_ZMK_SPLIT) OR CONFIG_ZMK_SPLIT_ROLE_CENTRAL)
  target_sources(app PRIVATE src/hid.c)
  target_sources_ifdef(CONFIG_ZMK_MOUSE app PRIVATE src/mouse.c)
  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_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)
@@ -63,7 +57,6 @@ if ((NOT CONFIG_ZMK_SPLIT) OR CONFIG_ZMK_SPLIT_ROLE_CENTRAL)
  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(app PRIVATE src/combo.c)
  target_sources(app PRIVATE src/behaviors/behavior_tap_dance.c)
  target_sources(app PRIVATE src/behavior_queue.c)
@@ -75,7 +68,6 @@ if ((NOT CONFIG_ZMK_SPLIT) OR CONFIG_ZMK_SPLIT_ROLE_CENTRAL)
  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)
@@ -91,8 +83,6 @@ target_sources_ifdef(CONFIG_ZMK_BACKLIGHT app PRIVATE src/behaviors/behavior_bac
 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(src/split)

@@ -100,33 +90,9 @@ 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_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/workqueue.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
@@ -37,17 +37,6 @@ config BT_DIS_MODEL
 config BT_DIS_MANUF
    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
-
 menu "HID"

 choice ZMK_HID_REPORT_TYPE
@@ -64,19 +53,10 @@ 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
@@ -107,18 +87,6 @@ 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
@@ -153,49 +121,21 @@ 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_SETTINGS
+    select SETTINGS
+    imply ZMK_BATTERY_REPORTING

 if ZMK_BLE

-config ZMK_BLE_EXPERIMENTAL_CONN
-    bool "Experimental BLE connection changes"
-    help
-      Enables a combination of settings that are planned to be default in future versions of ZMK
-      to improve connection stability. This includes changes to timing on BLE pairing initiation,
-      restores use of the updated/new LLCP implementation, and disables 2M PHY support.
-
-config ZMK_BLE_EXPERIMENTAL_SEC
-    bool "Experimental BLE security changes"
-    imply BT_SMP_ALLOW_UNAUTH_OVERWRITE
-    help
-      Enables a combination of settings that are planned to be officially supported in the future.
-      This includes enabling BT Secure Connection passkey entry, and allows overwrite of keys from
-      previously paired hosts.
-
-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
-
 # BT_TINYCRYPT_ECC is required for BT_SMP_SC_PAIR_ONLY when using HCI
 config BT_TINYCRYPT_ECC
    default y if BT_HCI && !BT_CTLR

+choice BT_LL_SW_LLCP_IMPL
+    default BT_LL_SW_LLCP_LEGACY
+
+endchoice
+
 config SYSTEM_WORKQUEUE_STACK_SIZE
    default 4096 if SOC_RP2040
    default 2048
@@ -222,17 +162,23 @@ config ZMK_BLE_MOUSE_REPORT_QUEUE_SIZE

 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)
+    default n

 config BT_DEVICE_APPEARANCE
    default 961

+config ZMK_BLE_PASSKEY_ENTRY
+    bool "Require passkey entry on the keyboard to complete pairing"
+    default n
+    select RING_BUFFER
+
 config BT_PERIPHERAL_PREF_MIN_INT
    default 6

@@ -259,36 +205,13 @@ rsource "src/split/Kconfig"
 #Basic Keyboard Setup
 endmenu

-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
-
-endmenu # Keymaps
-
-rsource "src/studio/Kconfig"
-
 menu "Display/LED Options"

 rsource "src/display/Kconfig"

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

 if ZMK_RGB_UNDERGLOW

@@ -400,6 +323,7 @@ menu "Mouse Options"

 config ZMK_MOUSE
    bool "Enable ZMK mouse emulation"
+    default n

 #Mouse Options
 endmenu
@@ -408,33 +332,16 @@ menu "Power Management"

 config ZMK_BATTERY_REPORTING
    bool "Battery level detection/reporting"
+    default n
    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
-
 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
@@ -453,26 +360,6 @@ config ZMK_EXT_POWER
    bool "Enable support to control external power output"
    default y

-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
 endmenu

@@ -519,11 +406,7 @@ if USB_DEVICE_STACK

 config ZMK_USB_INIT_PRIORITY
    int "USB Init Priority"
-    default 94
-
-config ZMK_USB_HID_INIT_PRIORITY
-    int "USB HID Init Priority"
-    default 95
+    default 50

 #USB
 endif
@@ -553,21 +436,6 @@ config ZMK_KSCAN_EVENT_QUEUE_SIZE

 endif # ZMK_KSCAN

-config ZMK_KSCAN_SIDEBAND_BEHAVIORS
-    bool
-    default y
-    depends on DT_HAS_ZMK_KSCAN_SIDEBAND_BEHAVIORS_ENABLED
-    select KSCAN
-
-if ZMK_KSCAN_SIDEBAND_BEHAVIORS
-
-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
@@ -648,22 +516,6 @@ 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
-
-
 config ZMK_SETTINGS_SAVE_DEBOUNCE
    int "Milliseconds to debounce settings saves"
    default 60000
@@ -676,11 +528,6 @@ config ZMK_BATTERY_REPORT_INTERVAL
    int "Battery level report interval in seconds"
    default 60

-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
@@ -689,14 +536,15 @@ config ZMK_LOW_PRIORITY_THREAD_PRIORITY
    int "Low priority thread priority"
    default 10

-endif
-
 #Advanced
 endmenu

 #ZMK
 endmenu

+config HEAP_MEM_POOL_SIZE
+    default 8192
+
 config KERNEL_BIN_NAME
    default "zmk"

@@ -706,11 +554,9 @@ config REBOOT
 config USB_DEVICE_STACK
    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"
--- a/app/Kconfig.behaviors
+++ b/app/Kconfig.behaviors
@@ -1,68 +1,6 @@
 # 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"
-    default 10
-    help
-      Max number of simultaneously held hold-taps
-
-config ZMK_BEHAVIOR_HOLD_TAP_MAX_CAPTURED_EVENTS
-    int "Hold Tap Max Captured Events"
-    default 40
-    help
-      Max number of captured system events while waiting to resolve hold taps
-
-endif
-
 config ZMK_BEHAVIOR_KEY_TOGGLE
    bool
    default y
@@ -74,28 +12,9 @@ config ZMK_BEHAVIOR_MOUSE_KEY_PRESS
    depends on DT_HAS_ZMK_BEHAVIOR_MOUSE_KEY_PRESS_ENABLED
    imply ZMK_MOUSE

-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"
-    default 10
-    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_SENSOR_ROTATE_COMMON
    bool
+    default n

 config ZMK_BEHAVIOR_SENSOR_ROTATE
    bool
@@ -109,12 +28,7 @@ config ZMK_BEHAVIOR_SENSOR_ROTATE_VAR
    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
+    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/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 = 1
-# x-release-please-end
-
-# x-release-please-start-patch
-PATCHLEVEL = 0
-# x-release-please-end
-
-VERSION_TWEAK = 0
--- a/app/boards/01space_rp2040_042lcd.overlay
+++ b/app/boards/01space_rp2040_042lcd.overlay
@@ -4,4 +4,6 @@
 * SPDX-License-Identifier: MIT
 */

+#include "usb_console.dtsi"
+
 &xiao_serial { status = "disabled"; };
--- a/app/boards/adafruit_kb2040.overlay
+++ b/app/boards/adafruit_kb2040.overlay
@@ -4,4 +4,6 @@
 * SPDX-License-Identifier: MIT
 */

+#include "usb_console.dtsi"
+
 &pro_micro_serial { status = "disabled"; };
--- a/app/boards/adafruit_qt_py_rp2040.overlay
+++ b/app/boards/adafruit_qt_py_rp2040.overlay
@@ -4,4 +4,6 @@
 * SPDX-License-Identifier: MIT
 */

+#include "usb_console.dtsi"
+
 &xiao_serial { status = "disabled"; };
--- a/app/boards/arm/adv360pro/Kconfig
+++ b/app/boards/arm/adv360pro/Kconfig
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-config BOARD_ENABLE_DCDC
-    bool "Enable DCDC mode"
-    select SOC_DCDC_NRF52X
-    default y
-    depends on BOARD_ADV360PRO_LEFT || BOARD_ADV360PRO_RIGHT
--- a/app/boards/arm/adv360pro/Kconfig.board
+++ b/app/boards/arm/adv360pro/Kconfig.board
@@ -1,12 +0,0 @@
-#
-# Copyright (c) 2023 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-#
-
-config BOARD_ADV360PRO_LEFT
-    bool "adv360pro_left"
-    depends on SOC_NRF52840_QIAA
-
-config BOARD_ADV360PRO_RIGHT
-    bool "adv360pro_right"
-    depends on SOC_NRF52840_QIAA
--- a/app/boards/arm/adv360pro/Kconfig.defconfig
+++ b/app/boards/arm/adv360pro/Kconfig.defconfig
@@ -1,55 +0,0 @@
-#
-# Copyright (c) 2023 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-#
-
-if BOARD_ADV360PRO_LEFT
-
-config ZMK_KEYBOARD_NAME
-    default "Adv360 Pro"
-
-config ZMK_SPLIT_ROLE_CENTRAL
-    default y
-
-endif # BOARD_ADV360PRO_LEFT
-
-if BOARD_ADV360PRO_RIGHT
-
-config ZMK_KEYBOARD_NAME
-    default "Adv360 Pro rt"
-
-endif # BOARD_ADV360PRO_RIGHT
-
-
-if BOARD_ADV360PRO_LEFT || BOARD_ADV360PRO_RIGHT
-
-config BOARD
-    default "adv360pro"
-
-config ZMK_SPLIT
-    default y
-
-config SPI
-    bool
-    default y
-
-config BT_CTLR
-    default BT
-
-if USB
-
-config USB_NRFX
-    default y
-
-config USB_DEVICE_STACK
-    default y
-
-endif # USB
-
-config ZMK_BATTERY_VOLTAGE_DIVIDER
-    default y
-
-config SPI
-    default y
-
-endif # BOARD_ADV360PRO_LEFT || BOARD_ADV360PRO_RIGHT
--- a/app/boards/arm/adv360pro/README.md
+++ b/app/boards/arm/adv360pro/README.md
@@ -1,7 +0,0 @@
-# Kinesis Advantage 360 Professional
-
-This board definition provides upstream support for the [Kinesis Advantage 360 Professional](https://kinesis-ergo.com/keyboards/advantage360/)
-
-Kinesis offer a specific [custom configuration](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/) for the 360 Pro that references [a customised version of ZMK](https://github.com/ReFil/zmk/tree/adv360-z3.2-2) with Advantage 360 Pro specific functionality and changes over base ZMK. The Kinesis fork is regularly updated to bring the latest updates and changes from base ZMK however will not always be completely up to date, some features such as new keycodes will not be immediately available on the 360 Pro after they are implemented in base ZMK.
-
-When using this board definition some of the more advanced features (the indicator RGB leds) will not work, and Kinesis cannot provide customer service for usage of base ZMK. Likewise the ZMK community cannot provide support for either the Kinesis keymap editor, nor any usage of the Kinesis custom fork.
--- a/app/boards/arm/adv360pro/adv360pro-layouts.dtsi
+++ b/app/boards/arm/adv360pro/adv360pro-layouts.dtsi
@@ -1,87 +0,0 @@
-#include <physical_layouts.dtsi>
-
-/ {
-    physical_layout0: physical_layout_0 {
-        compatible = "zmk,physical-layout";
-        display-name = "Default";
-
-        keys  //                     w   h    x    y     rot    rx    ry
-            = <&key_physical_attrs 125 100    0   25       0     0     0>
-            , <&key_physical_attrs 100 100  125   25       0     0     0>
-            , <&key_physical_attrs 100 100  225    0       0     0     0>
-            , <&key_physical_attrs 100 100  325    0       0     0     0>
-            , <&key_physical_attrs 100 100  425    0       0     0     0>
-            , <&key_physical_attrs 100 100  525    0       0     0     0>
-            , <&key_physical_attrs 100 100  625    0       0     0     0>
-            , <&key_physical_attrs 100 100 1075    0       0     0     0>
-            , <&key_physical_attrs 100 100 1175    0       0     0     0>
-            , <&key_physical_attrs 100 100 1275    0       0     0     0>
-            , <&key_physical_attrs 100 100 1375    0       0     0     0>
-            , <&key_physical_attrs 100 100 1475    0       0     0     0>
-            , <&key_physical_attrs 100 100 1575   25       0     0     0>
-            , <&key_physical_attrs 125 100 1675   25       0     0     0>
-            , <&key_physical_attrs 125 100    0  125       0     0     0>
-            , <&key_physical_attrs 100 100  125  125       0     0     0>
-            , <&key_physical_attrs 100 100  225  100       0     0     0>
-            , <&key_physical_attrs 100 100  325  100       0     0     0>
-            , <&key_physical_attrs 100 100  425  100       0     0     0>
-            , <&key_physical_attrs 100 100  525  100       0     0     0>
-            , <&key_physical_attrs 100 100  625  100       0     0     0>
-            , <&key_physical_attrs 100 100 1075  100       0     0     0>
-            , <&key_physical_attrs 100 100 1175  100       0     0     0>
-            , <&key_physical_attrs 100 100 1275  100       0     0     0>
-            , <&key_physical_attrs 100 100 1375  100       0     0     0>
-            , <&key_physical_attrs 100 100 1475  100       0     0     0>
-            , <&key_physical_attrs 100 100 1575  125       0     0     0>
-            , <&key_physical_attrs 125 100 1675  125       0     0     0>
-            , <&key_physical_attrs 125 100    0  225       0     0     0>
-            , <&key_physical_attrs 100 100  125  225       0     0     0>
-            , <&key_physical_attrs 100 100  225  200       0     0     0>
-            , <&key_physical_attrs 100 100  325  200       0     0     0>
-            , <&key_physical_attrs 100 100  425  200       0     0     0>
-            , <&key_physical_attrs 100 100  525  200       0     0     0>
-            , <&key_physical_attrs 100 100  625  200       0     0     0>
-            , <&key_physical_attrs 100 100  675  400    1500   525   400>
-            , <&key_physical_attrs 100 100  775  400    1500   525   400>
-            , <&key_physical_attrs 100 100  925  400 (-1500)  1275   400>
-            , <&key_physical_attrs 100 100 1025  400 (-1500)  1275   400>
-            , <&key_physical_attrs 100 100 1075  200       0     0     0>
-            , <&key_physical_attrs 100 100 1175  200       0     0     0>
-            , <&key_physical_attrs 100 100 1275  200       0     0     0>
-            , <&key_physical_attrs 100 100 1375  200       0     0     0>
-            , <&key_physical_attrs 100 100 1475  200       0     0     0>
-            , <&key_physical_attrs 100 100 1575  225       0     0     0>
-            , <&key_physical_attrs 125 100 1675  225       0     0     0>
-            , <&key_physical_attrs 125 100    0  325       0     0     0>
-            , <&key_physical_attrs 100 100  125  325       0     0     0>
-            , <&key_physical_attrs 100 100  225  300       0     0     0>
-            , <&key_physical_attrs 100 100  325  300       0     0     0>
-            , <&key_physical_attrs 100 100  425  300       0     0     0>
-            , <&key_physical_attrs 100 100  525  300       0     0     0>
-            , <&key_physical_attrs 100 100  775  500    1500   525   400>
-            , <&key_physical_attrs 100 100  925  500 (-1500)  1275   400>
-            , <&key_physical_attrs 100 100 1175  300       0     0     0>
-            , <&key_physical_attrs 100 100 1275  300       0     0     0>
-            , <&key_physical_attrs 100 100 1375  300       0     0     0>
-            , <&key_physical_attrs 100 100 1475  300       0     0     0>
-            , <&key_physical_attrs 100 100 1575  325       0     0     0>
-            , <&key_physical_attrs 125 100 1675  325       0     0     0>
-            , <&key_physical_attrs 125 100    0  425       0     0     0>
-            , <&key_physical_attrs 100 100  125  425       0     0     0>
-            , <&key_physical_attrs 100 100  225  400       0     0     0>
-            , <&key_physical_attrs 100 100  325  400       0     0     0>
-            , <&key_physical_attrs 100 100  425  400       0     0     0>
-            , <&key_physical_attrs 100 200  575  500    1500   525   400>
-            , <&key_physical_attrs 100 200  675  500    1500   525   400>
-            , <&key_physical_attrs 100 100  775  600    1500   525   400>
-            , <&key_physical_attrs 100 100  925  600 (-1500)  1275   400>
-            , <&key_physical_attrs 100 200 1025  500 (-1500)  1275   400>
-            , <&key_physical_attrs 100 200 1125  500 (-1500)  1275   400>
-            , <&key_physical_attrs 100 100 1275  400       0     0     0>
-            , <&key_physical_attrs 100 100 1375  400       0     0     0>
-            , <&key_physical_attrs 100 100 1475  400       0     0     0>
-            , <&key_physical_attrs 100 100 1575  425       0     0     0>
-            , <&key_physical_attrs 125 100 1675  425       0     0     0>
-            ;
-    };
-};
--- a/app/boards/arm/adv360pro/adv360pro-pinctrl.dtsi
+++ b/app/boards/arm/adv360pro/adv360pro-pinctrl.dtsi
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2023 The ZMK Contributors
- * SPDX-License-Identifier: MIT
- */
-
-&pinctrl {
-    spi3_default: spi3_default {
-        group1 {
-            psels = <NRF_PSEL(SPIM_MOSI, 0, 20)>;
-        };
-    };
-
-    spi3_sleep: spi3_sleep {
-        group1 {
-            psels = <NRF_PSEL(SPIM_MOSI, 0, 20)>;
-            low-power-enable;
-        };
-    };
-    pwm0_default: pwm0_default {
-        group1 {
-            psels = <NRF_PSEL(PWM_OUT0, 0, 17)>;
-        };
-    };
-    pwm0_sleep: pwm0_sleep {
-        group1 {
-            psels = <NRF_PSEL(PWM_OUT0, 0, 17)>;
-            low-power-enable;
-        };
-    };
-};
--- a/app/boards/arm/adv360pro/adv360pro.dtsi
+++ b/app/boards/arm/adv360pro/adv360pro.dtsi
@@ -1,160 +0,0 @@
-/*
-*
-* Copyright (c) 2023 The ZMK Contributors
-* SPDX-License-Identifier: MIT
-*
-*/
-
-/dts-v1/;
-#include <nordic/nrf52840_qiaa.dtsi>
-
-#include <dt-bindings/led/led.h>
-#include <dt-bindings/zmk/matrix_transform.h>
-
-#include "adv360pro-layouts.dtsi"
-#include "adv360pro-pinctrl.dtsi"
-
-&physical_layout0 {
-    transform = <&matrix_transform0>;
-};
-
-/ {
-    model = "Adv360 Pro";
-    compatible = "kinesis,adv360pro";
-
-    chosen {
-        zephyr,code-partition = &code_partition;
-        zephyr,sram = &sram0;
-        zephyr,flash = &flash0;
-        zmk,backlight = &backlight;
-        zmk,battery = &vbatt;
-        zmk,physical-layout = &physical_layout0;
-        zmk,kscan = &kscan0;
-        zmk,underglow = &led_strip;
-    };
-
-    matrix_transform0: keymap_transform_0 {
-        compatible = "zmk,matrix-transform";
-        columns = <20>;
-        rows = <5>;
-
-
-        map = <
-            RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5)  RC(4,6)                                                                        RC(4,13) RC(4,14) RC(4,15) RC(4,16) RC(4,17) RC(4,18) RC(4,19)
-            RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5)  RC(3,6)                                                                        RC(3,13) RC(3,14) RC(3,15) RC(3,16) RC(3,17) RC(3,18) RC(3,19)
-            RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)  RC(2,6)           RC(2,8)  RC(2,9)            RC(2,10) RC(2,11)                RC(2,13) RC(2,14) RC(2,15) RC(2,16) RC(2,17) RC(2,18) RC(2,19)
-            RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)                             RC(1,9)            RC(1,10)                                  RC(1,14) RC(1,15) RC(1,16) RC(1,17) RC(1,18) RC(1,19)
-            RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4)                     RC(0,7) RC(0,8) RC(0,9)            RC(0,10) RC(0,11) RC(0,12)                         RC(0,15) RC(0,16) RC(0,17) RC(0,18) RC(0,19)
-
-        >;
-    };
-
-    // Node name must match original "EXT_POWER" label to preserve user settings.
-    EXT_POWER {
-        compatible = "zmk,ext-power-generic";
-        control-gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
-    };
-
-    vbatt: vbatt {
-        compatible = "zmk,battery-voltage-divider";
-        io-channels = <&adc 2>;
-        output-ohms = <100000>;
-        full-ohms = <(100000 + 100000)>;
-    };
-
-    backlight: pwmleds {
-        compatible = "pwm-leds";
-        pwm_led_0 {
-            pwms = <&pwm0 0 10000 PWM_POLARITY_NORMAL>;
-        };
-    };
-
-};
-
-&pwm0 {
-    status = "okay";
-    pinctrl-0 = <&pwm0_default>;
-    pinctrl-1 = <&pwm0_sleep>;
-    pinctrl-names = "default", "sleep";
-};
-
-&adc {
-    status = "okay";
-};
-
-&gpiote {
-    status = "okay";
-};
-
-&gpio0 {
-    status = "okay";
-};
-
-&gpio1 {
-    status = "okay";
-};
-
-zephyr_udc0: &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 {
-            reg = <0x00000000 0x00026000>;
-        };
-        code_partition: partition@26000 {
-            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 {
-            reg = <0x000ec000 0x00008000>;
-        };
-
-        boot_partition: partition@f4000 {
-            reg = <0x000f4000 0x0000c000>;
-        };
-    };
-};
-
-&spi3 {
-    compatible = "nordic,nrf-spim";
-    status = "okay";
-    pinctrl-0 = <&spi3_default>;
-    pinctrl-1 = <&spi3_sleep>;
-    pinctrl-names = "default", "sleep";
-
-    led_strip: ws2812@0 {
-        compatible = "worldsemi,ws2812-spi";
-
-        /* SPI */
-        reg = <0>;
-        spi-max-frequency = <4000000>;
-
-        /* WS2812 */
-        chain-length = <3>; /* number of LEDs */
-        spi-one-frame = <0x70>;
-        spi-zero-frame = <0x40>;
-
-        color-mapping = <LED_COLOR_ID_GREEN
-                        LED_COLOR_ID_RED
-                        LED_COLOR_ID_BLUE>;
-    };
-};
--- a/app/boards/arm/adv360pro/adv360pro.keymap
+++ b/app/boards/arm/adv360pro/adv360pro.keymap
@@ -1,48 +0,0 @@
-#include <behaviors.dtsi>
-#include <dt-bindings/zmk/keys.h>
-#include <dt-bindings/zmk/bt.h>
-#include <dt-bindings/zmk/rgb.h>
-#include <dt-bindings/zmk/backlight.h>
-
-/ {
-    keymap {
-        compatible = "zmk,keymap";
-
-        default_layer {
-            bindings = <
-                &kp EQUAL &kp N1    &kp N2   &kp N3   &kp N4     &kp N5 &tog 1                                                           &mo 3 &kp N6 &kp N7 &kp N8    &kp N9   &kp N0   &kp MINUS
-                &kp TAB   &kp Q     &kp W    &kp E    &kp R      &kp T  &none                                                            &none &kp Y  &kp U  &kp I     &kp O    &kp P    &kp BSLH
-                &kp ESC   &kp A     &kp S    &kp D    &kp F      &kp G  &none           &kp LCTRL &kp LALT &kp LGUI  &kp RCTRL           &none &kp H  &kp J  &kp K     &kp L    &kp SEMI &kp SQT
-                &kp LSHFT &kp Z     &kp X    &kp C    &kp V      &kp B                            &kp HOME &kp PG_UP                           &kp N  &kp M  &kp COMMA &kp DOT  &kp FSLH &kp RSHFT
-                &mo 2     &kp GRAVE &kp CAPS &kp LEFT &kp RIGHT                &kp BSPC &kp DEL   &kp END  &kp PG_DN &kp ENTER &kp SPACE              &kp UP &kp DOWN  &kp LBKT &kp RBKT &mo 2
-            >;
-        };
-        keypad {
-            bindings = <
-                &kp EQUAL &kp N1    &kp N2   &kp N3   &kp N4     &kp N5 &trans                                                           &mo 3 &kp N6 &kp KP_NUM &kp KP_EQUAL &kp KP_DIVIDE &kp KP_MULTIPLY &kp MINUS
-                &kp TAB   &kp Q     &kp W    &kp E    &kp R      &kp T  &none                                                            &none &kp Y  &kp KP_N7  &kp KP_N8    &kp KP_N9     &kp KP_MINUS    &kp BSLH
-                &kp ESC   &kp A     &kp S    &kp D    &kp F      &kp G  &none           &kp LCTRL &kp LALT &kp LGUI  &kp RCTRL           &none &kp H  &kp KP_N4  &kp KP_N5    &kp KP_N6     &kp KP_PLUS     &kp SQT
-                &kp LSHFT &kp Z     &kp X    &kp C    &kp V      &kp B                            &kp HOME &kp PG_UP                           &kp N  &kp KP_N1  &kp KP_N2    &kp KP_N3     &kp KP_ENTER    &kp RSHFT
-                &mo 2     &kp GRAVE &kp CAPS &kp LEFT &kp RIGHT                &kp BSPC &kp DEL   &kp END  &kp PG_DN &kp ENTER &kp KP_N0              &kp UP     &kp DOWN     &kp KP_DOT    &kp RBKT        &mo 2
-            >;
-        };
-        fn {
-            bindings = <
-                &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &tog 1                                           &mo 3 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12
-                &trans &trans &trans &trans &trans &trans  &none                                           &none &trans &trans &trans &trans  &trans  &trans
-                &trans &trans &trans &trans &trans &trans  &none        &trans &trans &trans &trans        &none &trans &trans &trans &trans  &trans  &trans
-                &trans &trans &trans &trans &trans &trans                      &trans &trans                     &trans &trans &trans &trans  &trans  &trans
-                &trans &trans &trans &trans &trans               &trans &trans &trans &trans &trans &trans              &trans &trans &trans  &trans  &trans
-            >;
-        };
-        mod {
-            bindings = <
-                &none &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &none                                                               &trans      &none &none      &none      &none &none &none
-                &none &none        &none        &none        &none        &none        &bootloader                                                         &bootloader &none &none      &none      &none &none &none
-                &none &none        &none        &none        &none        &none        &none             &none &none &bt BT_CLR &none                      &none       &none &none      &none      &none &none &none
-                &none &none        &none        &none        &none        &none                                &none &none                                             &none &none      &none      &none &none &none
-                &none &none        &none        &none        &none                                 &none &none &none &none      &bl BL_TOG &rgb_ug RGB_TOG                   &bl BL_INC &bl BL_DEC &none &none &none
-            >;
-        };
-    };
-};
--- a/app/boards/arm/adv360pro/adv360pro.yaml
+++ b/app/boards/arm/adv360pro/adv360pro.yaml
@@ -1,19 +0,0 @@
-identifier: adv360pro
-name: Advantage 360 Pro
-type: keyboard
-arch: arm
-toolchain:
-  - zephyr
-  - gnuarmemb
-  - xtools
-supported:
-  - gpio
-  - i2c
-  - counter
-  - spi
-  - usb_device
-  - nvs
-  - can
-  - kscan
-  - ble
-  - pwm
--- a/app/boards/arm/adv360pro/adv360pro.zmk.yml
+++ b/app/boards/arm/adv360pro/adv360pro.zmk.yml
@@ -1,17 +0,0 @@
-file_format: "1"
-id: adv360pro
-name: Advantage 360 Pro
-type: board
-url: https://kinesis-ergo.com/keyboards/advantage360
-arch: arm
-features:
-  - keys
-  - underglow
-  - backlight
-  - studio
-outputs:
-  - usb
-  - ble
-siblings:
-  - adv360pro_left
-  - adv360pro_right
--- a/app/boards/arm/adv360pro/adv360pro_left.dts
+++ b/app/boards/arm/adv360pro/adv360pro_left.dts
@@ -1,37 +0,0 @@
-/*
-*
-* Copyright (c) 2023 The ZMK Contributors
-* SPDX-License-Identifier: MIT
-*
-*/
-
-#include "adv360pro.dtsi"
-
-/{
-    kscan0: kscan {
-        compatible = "zmk,kscan-gpio-matrix";
-        wakeup-source;
-
-        diode-direction = "col2row";
-        row-gpios
-            = <&gpio1 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&gpio1 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&gpio0 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&gpio1 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&gpio1 12 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            ;
-
-        col-gpios
-            = <&gpio0 25 GPIO_ACTIVE_HIGH>
-            , <&gpio0 11 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>
-            , <&gpio1 9 GPIO_ACTIVE_HIGH>
-            , <&gpio0 12 GPIO_ACTIVE_HIGH>
-            , <&gpio0 7 GPIO_ACTIVE_HIGH>
-            ;
-    };
-};
--- a/app/boards/arm/adv360pro/adv360pro_left_defconfig
+++ b/app/boards/arm/adv360pro/adv360pro_left_defconfig
@@ -1,55 +0,0 @@
-#
-# Copyright (c) 2023 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-#
-
-CONFIG_SOC_SERIES_NRF52X=y
-CONFIG_SOC_NRF52840_QIAA=y
-CONFIG_BOARD_ADV360PRO_LEFT=y
-
-# Enable MPU
-CONFIG_ARM_MPU=y
-
-# enable GPIO
-CONFIG_GPIO=y
-
-# Enable SPI for LEDS
-CONFIG_PINCTRL=y
-CONFIG_SPI=y
-CONFIG_SPI_NRFX=y
-
-# Enable writing to flash
-CONFIG_USE_DT_CODE_PARTITION=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
-
-# Enable 32kHz crystal
-CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y
-CONFIG_CLOCK_CONTROL_NRF_K32SRC_150PPM=y
-
-#RGB leds config
-CONFIG_WS2812_STRIP=y
-CONFIG_ZMK_RGB_UNDERGLOW=y
-CONFIG_ZMK_RGB_UNDERGLOW_EXT_POWER=y
-CONFIG_ZMK_RGB_UNDERGLOW_ON_START=n
-CONFIG_ZMK_RGB_UNDERGLOW_EFF_START=0
-CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_IDLE=y
-
-#Backlighting configuration
-CONFIG_PWM=y
-CONFIG_LED_PWM=y
-CONFIG_ZMK_BACKLIGHT=y
-CONFIG_ZMK_BACKLIGHT_BRT_START=20
-CONFIG_ZMK_BACKLIGHT_AUTO_OFF_IDLE=y
-
-#Misc configuration
-CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
-CONFIG_ZMK_HID_REPORT_TYPE_NKRO=y
-CONFIG_ZMK_HID_CONSUMER_REPORT_USAGES_BASIC=y
-CONFIG_BUILD_OUTPUT_UF2=y
-CONFIG_ZMK_USB=y
-CONFIG_ZMK_BLE=y
--- a/app/boards/arm/adv360pro/adv360pro_right.dts
+++ b/app/boards/arm/adv360pro/adv360pro_right.dts
@@ -1,41 +0,0 @@
-/*
-*
-* Copyright (c) 2023 The ZMK Contributors
-* SPDX-License-Identifier: MIT
-*
-*/
-
-#include "adv360pro.dtsi"
-
-/{
-    kscan0: kscan {
-        compatible = "zmk,kscan-gpio-matrix";
-        wakeup-source;
-
-        diode-direction = "col2row";
-        row-gpios
-            = <&gpio0 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&gpio0 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&gpio0 31 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&gpio0 30 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            , <&gpio0 29 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            ;
-
-        col-gpios
-            = <&gpio0  12 GPIO_ACTIVE_HIGH>
-            , <&gpio1  9 GPIO_ACTIVE_HIGH>
-            , <&gpio0  7 GPIO_ACTIVE_HIGH>
-            , <&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>
-            ;
-    };
-};
-
-&matrix_transform0 {
-    col-offset = <10>;
-};
--- a/app/boards/arm/adv360pro/adv360pro_right_defconfig
+++ b/app/boards/arm/adv360pro/adv360pro_right_defconfig
@@ -1,54 +0,0 @@
-#
-# Copyright (c) 2023 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-#
-
-CONFIG_SOC_SERIES_NRF52X=y
-CONFIG_SOC_NRF52840_QIAA=y
-CONFIG_BOARD_ADV360PRO_RIGHT=y
-
-# Enable MPU
-CONFIG_ARM_MPU=y
-
-# enable GPIO
-CONFIG_GPIO=y
-
-# Enable SPI for LEDS
-CONFIG_PINCTRL=y
-CONFIG_SPI=y
-CONFIG_SPI_NRFX=y
-
-# Enable writing to flash
-CONFIG_USE_DT_CODE_PARTITION=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
-
-# Enable 32kHz crystal
-CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y
-CONFIG_CLOCK_CONTROL_NRF_K32SRC_150PPM=y
-
-#RGB leds config
-CONFIG_WS2812_STRIP=y
-CONFIG_ZMK_RGB_UNDERGLOW=y
-CONFIG_ZMK_RGB_UNDERGLOW_EXT_POWER=y
-CONFIG_ZMK_RGB_UNDERGLOW_ON_START=n
-CONFIG_ZMK_RGB_UNDERGLOW_EFF_START=0
-CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_IDLE=y
-
-#Backlighting configuration
-CONFIG_PWM=y
-CONFIG_LED_PWM=y
-CONFIG_ZMK_BACKLIGHT=y
-CONFIG_ZMK_BACKLIGHT_BRT_START=20
-CONFIG_ZMK_BACKLIGHT_AUTO_OFF_IDLE=y
-
-#Misc configuration
-CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
-CONFIG_ZMK_HID_REPORT_TYPE_NKRO=y
-CONFIG_ZMK_HID_CONSUMER_REPORT_USAGES_BASIC=y
-CONFIG_BUILD_OUTPUT_UF2=y
-CONFIG_ZMK_BLE=y
--- a/app/boards/arm/adv360pro/board.cmake
+++ b/app/boards/arm/adv360pro/board.cmake
@@ -1,9 +0,0 @@
-#
-# Copyright (c) 2023 The ZMK Contributors
-# 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/nrfjprog.board.cmake)
--- a/app/boards/arm/adv360pro/pre_dt_board.cmake
+++ b/app/boards/arm/adv360pro/pre_dt_board.cmake
@@ -1,9 +0,0 @@
-#
-# Copyright (c) 2024 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-#
-
-# Suppresses duplicate unit-address warning at build time for power, clock, acl and flash-controller
-# https://docs.zephyrproject.org/latest/build/dts/intro-input-output.html
-
-list(APPEND EXTRA_DTC_FLAGS "-Wno-unique_unit_address_if_enabled")
--- a/app/boards/arm/bdn9/bdn9_rev2-layouts.dtsi
+++ b/app/boards/arm/bdn9/bdn9_rev2-layouts.dtsi
@@ -1,20 +0,0 @@
-#include <physical_layouts.dtsi>
-
-/ {
-    physical_layout0: physical_layout_0 {
-        compatible = "zmk,physical-layout";
-        display-name = "BDN9";
-
-        keys  //                     w   h    x    y     rot    rx    ry
-            = <&key_physical_attrs 100 100    0    0       0     0     0>
-            , <&key_physical_attrs 100 100  100    0       0     0     0>
-            , <&key_physical_attrs 100 100  200    0       0     0     0>
-            , <&key_physical_attrs 100 100    0  100       0     0     0>
-            , <&key_physical_attrs 100 100  100  100       0     0     0>
-            , <&key_physical_attrs 100 100  200  100       0     0     0>
-            , <&key_physical_attrs 100 100    0  200       0     0     0>
-            , <&key_physical_attrs 100 100  100  200       0     0     0>
-            , <&key_physical_attrs 100 100  200  200       0     0     0>
-            ;
-    };
-};
--- a/app/boards/arm/bdn9/bdn9_rev2.dts
+++ b/app/boards/arm/bdn9/bdn9_rev2.dts
@@ -9,14 +9,6 @@
 #include <st/f0/stm32f072c(8-b)tx-pinctrl.dtsi>
 #include <dt-bindings/led/led.h>

-#include <dt-bindings/zmk/matrix_transform.h>
-
-#include "bdn9_rev2-layouts.dtsi"
-
-&physical_layout0 {
-    transform = <&matrix_transform0>;
-};
-
 / {
    model = "Keeb.io BDN9 rev2";
    compatible = "keebio,bdn9", "st,stm32f072";
@@ -24,24 +16,14 @@
    chosen {
        zephyr,sram = &sram0;
        zephyr,flash = &flash0;
+        zephyr,console = &cdc_acm_uart;
+        zmk,kscan = &kscan;
        zmk,underglow = &led_strip;
-        zmk,physical-layout = &physical_layout0;
-        zmk,kscan = &kscan0;
    };

-    matrix_transform0: matrix_transform_0 {
-        compatible = "zmk,matrix-transform";
-        columns = <3>;
-        rows = <3>;
-        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)
-        >;
-    };
-
-    kscan0: kscan_0 {
+    kscan: kscan {
        compatible = "zmk,kscan-gpio-direct";
+        label = "KSCAN";

        input-gpios
            = <&gpiob 12 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
@@ -58,6 +40,7 @@

    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)>;
        steps = <80>;
@@ -65,6 +48,7 @@
    };
    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)>;
        steps = <80>;
@@ -72,6 +56,7 @@
    };
    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)>;
        steps = <80>;
@@ -93,6 +78,7 @@

    led_strip: ws2812@0 {
        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";

        /* SPI */
        reg = <0>; /* ignored, but necessary for SPI bindings */
@@ -125,13 +111,14 @@
    apb1-prescaler = <1>;
 };

-zephyr_udc0: &usb {
+&usb {
    status = "okay";
    pinctrl-0 = <&usb_dm_pa11 &usb_dp_pa12>;
    pinctrl-names = "default";
-
-    // Overridden to lower RAM usage.
-    num-bidir-endpoints = <4>;
+    cdc_acm_uart: cdc_acm_uart {
+        compatible = "zephyr,cdc-acm-uart";
+        label = "CDC_ACM_0";
+    };
 };

 &rtc {
@@ -150,6 +137,7 @@ zephyr_udc0: &usb {

        /* Set 6Kb of storage at the end of the 128Kb of flash */
        storage_partition: partition@1e800 {
+            label = "storage";
            reg = <0x0001e800 0x00001800>;
        };
    };
--- a/app/boards/arm/bdn9/bdn9_rev2.keymap
+++ b/app/boards/arm/bdn9/bdn9_rev2.keymap
@@ -4,8 +4,6 @@
 * SPDX-License-Identifier: MIT
 */

-#undef ZMK_BEHAVIORS_KEEP_ALL
-
 #include <behaviors.dtsi>
 #include <dt-bindings/zmk/keys.h>

--- a/app/boards/arm/bdn9/bdn9_rev2_defconfig
+++ b/app/boards/arm/bdn9/bdn9_rev2_defconfig
@@ -5,6 +5,9 @@ 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

@@ -14,9 +17,10 @@ CONFIG_PINCTRL=y
 # Poll to avoid interrupt overlap issues
 CONFIG_ZMK_KSCAN_DIRECT_POLLING=y

-CONFIG_ISR_STACK_SIZE=1024
+# Needed to reduce this to size that will fit on F072
+CONFIG_HEAP_MEM_POOL_SIZE=1024

 # clock configuration
 CONFIG_CLOCK_CONTROL=y

-CONFIG_ZMK_USB=y
+CONFIG_ZMK_USB=y
--- a/app/boards/arm/blackpill_f401cc/blackpill_f401cc.zmk.yml
+++ b/app/boards/arm/blackpill_f401cc/blackpill_f401cc.zmk.yml
@@ -1,9 +0,0 @@
-file_format: "1"
-id: blackpill_f401cc
-name: BlackPill F401CC
-type: board
-arch: arm
-outputs:
-  - usb
-url: https://github.com/WeActStudio/WeActStudio.MiniSTM32F4x1
-exposes: [blackpill]
--- a/app/boards/arm/bluemicro840/arduino_pro_micro_pins.dtsi
+++ b/app/boards/arm/bluemicro840/arduino_pro_micro_pins.dtsi
@@ -53,5 +53,5 @@

 pro_micro_d: &pro_micro {};
 pro_micro_i2c: &i2c0 {};
-pro_micro_spi: &spi1 {};
+pro_micro_spi: &spi0 {};
 pro_micro_serial: &uart0 {};
--- a/app/boards/arm/bluemicro840/bluemicro840_v1-pinctrl.dtsi
+++ b/app/boards/arm/bluemicro840/bluemicro840_v1-pinctrl.dtsi
@@ -36,21 +36,4 @@
            low-power-enable;
        };
    };
-
-    spi1_default: spi1_default {
-        group1 {
-            psels = <NRF_PSEL(SPIM_SCK, 1, 13)>,
-                <NRF_PSEL(SPIM_MOSI, 0, 28)>,
-                <NRF_PSEL(SPIM_MISO, 0, 3)>;
-        };
-    };
-
-    spi1_sleep: spi1_sleep {
-        group1 {
-            psels = <NRF_PSEL(SPIM_SCK, 1, 13)>,
-                <NRF_PSEL(SPIM_MOSI, 0, 28)>,
-                <NRF_PSEL(SPIM_MISO, 0, 3)>;
-            low-power-enable;
-        };
-    };
 };
--- a/app/boards/arm/bluemicro840/bluemicro840_v1.dts
+++ b/app/boards/arm/bluemicro840/bluemicro840_v1.dts
@@ -17,6 +17,7 @@
        zephyr,code-partition = &code_partition;
        zephyr,sram = &sram0;
        zephyr,flash = &flash0;
+        zephyr,console = &cdc_acm_uart;
        zmk,battery = &vbatt;
    };

@@ -24,18 +25,20 @@
        compatible = "gpio-leds";
        blue_led: led_0 {
            gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
+            label = "Blue LED";
        };
    };

-    // Node name must match original "EXT_POWER" label to preserve user settings.
-    EXT_POWER {
+    ext-power {
        compatible = "zmk,ext-power-generic";
+        label = "EXT_POWER";
        init-delay-ms = <20>;
        control-gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
    };

    vbatt: vbatt {
        compatible = "zmk,battery-voltage-divider";
+        label = "BATTERY";
        io-channels = <&adc 7>;
        output-ohms = <2000000>;
        full-ohms = <(2000000 + 806000)>;
@@ -66,13 +69,6 @@
    pinctrl-names = "default", "sleep";
 };

-&spi1 {
-    compatible = "nordic,nrf-spim";
-    pinctrl-0 = <&spi1_default>;
-    pinctrl-1 = <&spi1_sleep>;
-    pinctrl-names = "default", "sleep";
-};
-
 &uart0 {
    compatible = "nordic,nrf-uarte";
    current-speed = <115200>;
@@ -81,8 +77,12 @@
    pinctrl-names = "default", "sleep";
 };

-zephyr_udc0: &usbd {
+&usbd {
    status = "okay";
+    cdc_acm_uart: cdc_acm_uart {
+        compatible = "zephyr,cdc-acm-uart";
+        label = "CDC_ACM_0";
+    };
 };


@@ -97,9 +97,11 @@ zephyr_udc0: &usbd {
        #size-cells = <1>;

        sd_partition: partition@0 {
+            label = "softdevice";
            reg = <0x00000000 0x00026000>;
        };
        code_partition: partition@26000 {
+            label = "code_partition";
            reg = <0x00026000 0x000c6000>;
        };

@@ -113,10 +115,12 @@ zephyr_udc0: &usbd {
         * 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/bluemicro840/board.cmake
+++ b/app/boards/arm/bluemicro840/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/bluemicro840/pre_dt_board.cmake
+++ b/app/boards/arm/bluemicro840/pre_dt_board.cmake
@@ -1,9 +0,0 @@
-#
-# Copyright (c) 2024 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-#
-
-# Suppresses duplicate unit-address warning at build time for power, clock, acl and flash-controller
-# https://docs.zephyrproject.org/latest/build/dts/intro-input-output.html
-
-list(APPEND EXTRA_DTC_FLAGS "-Wno-unique_unit_address_if_enabled")
--- a/app/boards/arm/bt60/board.cmake
+++ b/app/boards/arm/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
@@ -16,7 +16,10 @@
        zephyr,code-partition = &code_partition;
        zephyr,sram = &sram0;
        zephyr,flash = &flash0;
+        zephyr,console = &cdc_acm_uart;
        zmk,battery = &vbatt;
+        zmk,kscan = &kscan0;
+        zmk,matrix_transform = &default_transform;
    };

    sensors: sensors {
@@ -29,6 +32,7 @@

    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)>;
        steps = <80>;
@@ -40,11 +44,13 @@
        compatible = "gpio-leds";
        blue_led: led_0 {
            gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
+            label = "Blue LED";
        };
    };

    vbatt: vbatt {
        compatible = "zmk,battery-voltage-divider";
+        label = "BATTERY";
        io-channels = <&adc 2>;
        output-ohms = <2000000>;
        full-ohms = <(2000000 + 806000)>;
@@ -67,8 +73,24 @@
    status = "okay";
 };

-zephyr_udc0: &usbd {
+&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";
+    cdc_acm_uart: cdc_acm_uart {
+        compatible = "zephyr,cdc-acm-uart";
+        label = "CDC_ACM_0";
+    };
 };


@@ -83,9 +105,11 @@ zephyr_udc0: &usbd {
        #size-cells = <1>;

        sd_partition: partition@0 {
+            label = "softdevice";
            reg = <0x00000000 0x00026000>;
        };
        code_partition: partition@26000 {
+            label = "code_partition";
            reg = <0x00026000 0x000c6000>;
        };

@@ -99,10 +123,12 @@ zephyr_udc0: &usbd {
         * 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
@@ -6,16 +6,12 @@

 /dts-v1/;
 #include "bt60.dtsi"
-#include <layouts/common/60percent/all1u.dtsi>
-#include <layouts/common/60percent/ansi.dtsi>
-#include <layouts/common/60percent/hhkb.dtsi>
-#include <layouts/common/60percent/iso.dtsi>


 / {
    chosen {
        zmk,kscan = &kscan0;
-        zmk,physical-layout = &layout_60_ansi;
+        zmk,matrix_transform = &ansi_transform;
    };

    ansi_transform: keymap_transform_0 {
@@ -70,10 +66,22 @@
        >;
    };

+    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";
-        wakeup-source;
-
+        label = "KSCAN";
        diode-direction = "col2row";

        col-gpios
@@ -103,19 +111,3 @@
            ;
    };
 };
-
-&layout_60_ansi {
-    transform = <&ansi_transform>;
-};
-
-&layout_60_iso {
-    transform = <&iso_transform>;
-};
-
-&layout_60_all1u {
-    transform = <&all_1u_transform>;
-};
-
-&layout_60_hhkb {
-    transform = <&hhkb_transform>;
-};
--- a/app/boards/arm/bt60/bt60_v1.keymap
+++ b/app/boards/arm/bt60/bt60_v1.keymap
@@ -2,25 +2,26 @@
 #include <dt-bindings/zmk/keys.h>
 #include <dt-bindings/zmk/bt.h>

-#define ANSI
-//#define HHKB
-//#define ISO
-//#define ALL_1U
+#define ANSI true
+//#define HHKB true
+//#define ISO true
+//#define ALL_1U true
+//#define SPLIT_BKSP_RSHFT true



 / {
    chosen {
    #ifdef ANSI
-        zmk,physical-layout = &layout_60_ansi;
-    #elif defined(ISO)
-        zmk,physical-layout = &layout_60_iso;
-    #elif defined(ALL_1U)
-        zmk,physical-layout = &layout_60_all1u;
+        zmk,matrix_transform = &ansi_transform;
    #elif defined(HHKB)
-        zmk,physical-layout = &layout_60_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
-    #error "Layout not defined, please define a layout by uncommenting the appropriate line in bt60_v1.keymap"
+        zmk,matrix_transform = &split_transform;
    #endif
    };

@@ -30,7 +31,7 @@
        #ifdef ANSI
        default_layer {
                // ------------------------------------------------------------------------------------------
-                // | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BSPC   |
+                // | 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     |
@@ -93,7 +94,7 @@
        #elif defined(ISO)
        default_layer {
                // ------------------------------------------------------------------------------------------
-                // | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BSPC   |
+                // | 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    |
@@ -121,7 +122,7 @@
        #elif defined(ALL_1U)
        default_layer {
                // ------------------------------------------------------------------------------------------
-                // | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BSPC   |
+                // | 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  |
@@ -147,7 +148,33 @@
            sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
        };
        #else
-        #error "Layout not defined, please define a layout by uncommenting the appropriate line in bt60_v2.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  |  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 &sys_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/boards/arm/bt60/bt60_v1.zmk.yml
+++ b/app/boards/arm/bt60/bt60_v1.zmk.yml
@@ -6,7 +6,6 @@ arch: arm
 features:
  - keys
  - encoder
-  - studio
 outputs:
  - usb
  - ble
--- a/app/boards/arm/bt60/bt60_v1_hs.dts
+++ b/app/boards/arm/bt60/bt60_v1_hs.dts
@@ -6,12 +6,12 @@

 /dts-v1/;
 #include "bt60.dtsi"
-#include <layouts/common/60percent/ansi.dtsi>
+

 / {
    chosen {
        zmk,kscan = &kscan0;
-        zmk,physical-layout = &layout_60_ansi;
+        zmk,matrix_transform = &default_transform;
    };

    default_transform: keymap_transform_0 {
@@ -30,8 +30,7 @@

    kscan0: kscan_0 {
        compatible = "zmk,kscan-gpio-matrix";
-        wakeup-source;
-
+        label = "KSCAN";
        diode-direction = "col2row";

        col-gpios
@@ -60,7 +59,3 @@
            ;
    };
 };
-
-&layout_60_ansi {
-    transform = <&default_transform>;
-};
--- a/app/boards/arm/bt60/bt60_v1_hs.keymap
+++ b/app/boards/arm/bt60/bt60_v1_hs.keymap
@@ -8,14 +8,14 @@

        default_layer {
                // ------------------------------------------------------------------------------------------
-                // | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BSPC   |
-                // | TAB  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |    |    |
+                // | 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 |
+                // |  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 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
@@ -25,7 +25,7 @@
        };
        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
+                &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 &sys_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
--- a/app/boards/arm/bt60/bt60_v1_hs.zmk.yml
+++ b/app/boards/arm/bt60/bt60_v1_hs.zmk.yml
@@ -6,7 +6,6 @@ arch: arm
 features:
  - keys
  - encoder
-  - studio
 outputs:
  - usb
  - ble
--- a/app/boards/arm/bt60/pre_dt_board.cmake
+++ b/app/boards/arm/bt60/pre_dt_board.cmake
@@ -1,9 +0,0 @@
-#
-# Copyright (c) 2024 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-#
-
-# Suppresses duplicate unit-address warning at build time for power, clock, acl and flash-controller
-# https://docs.zephyrproject.org/latest/build/dts/intro-input-output.html
-
-list(APPEND EXTRA_DTC_FLAGS "-Wno-unique_unit_address_if_enabled")
--- a/app/boards/arm/ckp/board.cmake
+++ b/app/boards/arm/ckp/board.cmake
@@ -1,5 +1,4 @@
 # 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/nrfjprog.board.cmake)
--- a/app/boards/arm/ckp/bt60_v2.dts
+++ b/app/boards/arm/ckp/bt60_v2.dts
@@ -6,10 +6,6 @@

 /dts-v1/;
 #include "ckp.dtsi"
-#include <layouts/common/60percent/all1u.dtsi>
-#include <layouts/common/60percent/ansi.dtsi>
-#include <layouts/common/60percent/hhkb.dtsi>
-#include <layouts/common/60percent/iso.dtsi>


 / {
@@ -17,7 +13,7 @@
  compatible = "polarityworks,bt60_v2";

  chosen {
-    zmk,physical-layout = &layout_60_ansi;
+    zmk,matrix_transform = &ansi_transform;
  };


@@ -73,19 +69,3 @@
    >;
  };
 };
-
-&layout_60_ansi {
-  transform = <&ansi_transform>;
-};
-
-&layout_60_iso {
-  transform = <&iso_transform>;
-};
-
-&layout_60_all1u {
-  transform = <&all_1u_transform>;
-};
-
-&layout_60_hhkb {
-  transform = <&hhkb_transform>;
-};
--- a/app/boards/arm/ckp/bt60_v2.keymap
+++ b/app/boards/arm/ckp/bt60_v2.keymap
@@ -12,13 +12,13 @@
 / {
  chosen {
  #ifdef ANSI
-    zmk,physical-layout = &layout_60_ansi;
+    zmk,matrix_transform = &ansi_transform;
  #elif defined(ISO)
-    zmk,physical-layout = &layout_60_iso;
+    zmk,matrix_transform = &iso_transform;
  #elif defined(ALL_1U)
-    zmk,physical-layout = &layout_60_all1u;
+    zmk,matrix_transform = &all_1u_transform;
  #elif defined(HHKB)
-    zmk,physical-layout = &layout_60_hhkb;
+    zmk,matrix_transform = &hhkb_transform;
  #else
  #error "Layout not defined, please define a layout by uncommenting the appropriate line in bt60_v2.keymap"
  #endif
@@ -29,7 +29,7 @@
    #ifdef ANSI
    default_layer {
        // ------------------------------------------------------------------------------------------
-        // | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BSPC   |
+        // | 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     |
@@ -65,7 +65,7 @@
    #elif defined(ISO)
    default_layer {
        // ------------------------------------------------------------------------------------------
-        // | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |    BSPC   |
+        // | 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     |
@@ -101,7 +101,7 @@
    #elif defined(ALL_1U)
    default_layer {
        // ------------------------------------------------------------------------------------------
-        // | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |BSPC | DEL |
+        // | 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    |
        // | SHFT  |NONE|  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  | /   | SHFT | UP |  1 |
@@ -118,7 +118,7 @@
    };
    raise {
        // ------------------------------------------------------------------------------------------
-        // |GRAVE| F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |BSPC | DEL |
+        // |GRAVE| F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |BKSP | DEL |
        // | TAB  |  Q  |  W  |  E  | HUI | HUD |  Y  |  U  | INS |  O  |PSCRN| SLCK| P_B | RGB_TOG  |
        // | CAPS  |  A  |  S  |  D  | BRI | BRD |  H  |  J  |  K  |  L  | HOME| PGUP|      BOOT     |
        // | SHFT |NONE|VOLDN|VOLUP|MUTE|BLINC|BLDEC|  N  |  M  |  ,  | END | PGDN | SHFT|BL_TOG| 1  |
@@ -136,7 +136,7 @@
    #elif defined(HHKB)
    default_layer {
        // ------------------------------------------------------------------------------------------
-        // | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BSPC   |
+        // | 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     |
--- a/app/boards/arm/ckp/bt60_v2.zmk.yml
+++ b/app/boards/arm/ckp/bt60_v2.zmk.yml
@@ -8,7 +8,6 @@ features:
  - encoder
  - underglow
  - backlight
-  - studio
 outputs:
  - usb
  - ble
--- a/app/boards/arm/ckp/bt65_v1.dts
+++ b/app/boards/arm/ckp/bt65_v1.dts
@@ -6,10 +6,6 @@

 /dts-v1/;
 #include "ckp.dtsi"
-#include <layouts/common/65percent/all1u.dtsi>
-#include <layouts/common/65percent/ansi.dtsi>
-#include <layouts/common/65percent/iso.dtsi>
-#include <layouts/common/65percent/hhkb.dtsi>


 / {
@@ -17,7 +13,7 @@
  compatible = "polarityworks,bt65_v1";

  chosen {
-    zmk,physical-layout = &layout_65_ansi;
+    zmk,matrix_transform = &ansi_transform;
  };


@@ -73,19 +69,3 @@
    >;
  };
 };
-
-&layout_65_ansi {
-  transform = <&ansi_transform>;
-};
-
-&layout_65_iso {
-  transform = <&iso_transform>;
-};
-
-&layout_65_all1u {
-  transform = <&all_1u_transform>;
-};
-
-&layout_65_hhkb {
-  transform = <&hhkb_transform>;
-};
--- a/app/boards/arm/ckp/bt65_v1.keymap
+++ b/app/boards/arm/ckp/bt65_v1.keymap
@@ -12,13 +12,13 @@
 / {
  chosen {
  #ifdef ANSI
-    zmk,physical-layout = &layout_65_ansi;
+    zmk,matrix_transform = &ansi_transform;
  #elif defined(ISO)
-    zmk,physical-layout = &layout_65_iso;
+    zmk,matrix_transform = &iso_transform;
  #elif defined(ALL_1U)
-    zmk,physical-layout = &layout_65_all1u;
+    zmk,matrix_transform = &all_1u_transform;
  #elif defined(HHKB)
-    zmk,physical-layout = &layout_65_hhkb;
+    zmk,matrix_transform = &hhkb_transform;
  #else
  #error "Layout not defined, please define a layout by uncommenting the appropriate line in bt65_v1.keymap"
  #endif
@@ -29,7 +29,7 @@
    #ifdef ANSI
    default_layer {
        // ------------------------------------------------------------------------------------------------
-        // | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BSPC   | DEL |
+        // | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BKSP   | DEL |
        // | TAB   |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   \    | INS |
        // | CAPS   |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    ENTER    | PGUP|
        // |  SHIFT   |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |   SHIFT   | UP  | PGDN|
@@ -37,7 +37,7 @@
        // ------------------------------------------------------------------------------------------------
      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 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 BKSP &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 INS
        &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 PG_UP
        &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 &kp PG_DN
@@ -65,7 +65,7 @@
    #elif defined(ISO)
    default_layer {
        // ------------------------------------------------------------------------------------------------
-        // | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BSPC   | DEL |
+        // | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BKSP   | DEL |
        // | TAB   |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |        | INS |
        // | CAPS   |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |  #  | ENTER | PGUP|
        // |SHIFT |  \  |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |  SHIFT  | UP  | PGDN|
@@ -73,7 +73,7 @@
        // ------------------------------------------------------------------------------------------------
      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 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 BKSP &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 INS
        &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 PG_UP
        &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 UP &kp PG_DN
@@ -101,7 +101,7 @@
    #elif defined(ALL_1U)
    default_layer {
        // -------------------------------------------------------------------------------------------------
-        // | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |BSPC | DEL | HOME|
+        // | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |BKSP | DEL | HOME|
        // | TAB    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   \    | END |
        // | CAPS    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |     ENTER   | PGUP|
        // |SHIFT|NONE |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |SHIFT|NONE |  UP | PGDN|
@@ -136,7 +136,7 @@
    #elif defined(HHKB)
    default_layer {
        // ------------------------------------------------------------------------------------------------
-        // | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BSPC   | DEL |
+        // | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BKSP   | DEL |
        // | TAB   |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   \    | HOME|
        // | CAPS   |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    ENTER    | END |
        // |  SHIFT   |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |      SHIFT      | PGUP|
@@ -144,7 +144,7 @@
        // ------------------------------------------------------------------------------------------------
      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 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 BKSP &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 HOME
        &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 END
        &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 PG_UP
--- a/app/boards/arm/ckp/bt65_v1.zmk.yml
+++ b/app/boards/arm/ckp/bt65_v1.zmk.yml
@@ -8,7 +8,6 @@ features:
  - encoder
  - underglow
  - backlight
-  - studio
 outputs:
  - usb
  - ble
--- a/app/boards/arm/ckp/bt75_v1.dts
+++ b/app/boards/arm/ckp/bt75_v1.dts
@@ -6,9 +6,6 @@

 /dts-v1/;
 #include "ckp.dtsi"
-#include <layouts/common/75percent/all1u.dtsi>
-#include <layouts/common/75percent/ansi.dtsi>
-#include <layouts/common/75percent/iso.dtsi>


 / {
@@ -16,7 +13,7 @@
  compatible = "polarityworks,bt75_v1";

  chosen {
-    zmk,physical-layout = &layout_75_ansi;
+    zmk,matrix_transform = &ansi_transform;
  };


@@ -62,15 +59,3 @@
    >;
  };
 };
-
-&layout_75_ansi {
-  transform = <&ansi_transform>;
-};
-
-&layout_75_iso {
-  transform = <&iso_transform>;
-};
-
-&layout_75_all1u {
-  transform = <&all_1u_transform>;
-};
--- a/app/boards/arm/ckp/bt75_v1.keymap
+++ b/app/boards/arm/ckp/bt75_v1.keymap
@@ -11,11 +11,11 @@
 / {
  chosen {
  #ifdef ANSI
-    zmk,physical-layout = &layout_75_ansi;
+    zmk,matrix_transform = &ansi_transform;
  #elif defined(ISO)
-    zmk,physical-layout = &layout_75_iso;
+    zmk,matrix_transform = &iso_transform;
  #elif defined(ALL_1U)
-    zmk,physical-layout = &layout_75_all1u;
+    zmk,matrix_transform = &all_1u_transform;
  #else
  #error "Layout not defined, please define a layout using by uncommenting the appropriate line in bt75_v1.keymap"
  #endif
@@ -27,7 +27,7 @@
    default_layer {
        // ------------------------------------------------------------------------------------------------
        // | ESC | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F9  | F9  | F10 | F11 | F12 |PSCRN|HOME| END |
-        // |GRAVE|  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BSPC   | DEL |
+        // |GRAVE|  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BKSP   | DEL |
        // | TAB   |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   \    | INS |
        // | CAPS   |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    ENTER    | PGUP|
        // |  SHIFT   |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |   SHIFT   | UP  | PGDN|
@@ -35,7 +35,7 @@
        // ------------------------------------------------------------------------------------------------
      bindings = <
        &kp ESC &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 PSCRN &kp HOME &kp END
-        &kp GRAVE &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 GRAVE &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 BKSP &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 INS
        &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 PG_UP
        &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 &kp PG_DN
@@ -66,7 +66,7 @@
    default_layer {
        // ------------------------------------------------------------------------------------------------
        // | ESC | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F9  | F9  | F10 | F11 | F12 |PSCRN|HOME| END |
-        // |GRAVE|  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BSPC   | DEL |
+        // |GRAVE|  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BKSP   | DEL |
        // | TAB   |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |        | INS |
        // | CAPS   |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |  #  | ENTER | PGUP|
        // |SHIFT |  \  |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |  SHIFT  | UP  | PGDN|
@@ -74,7 +74,7 @@
        // ------------------------------------------------------------------------------------------------
      bindings = <
        &kp ESC &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 PSCRN &kp HOME &kp END
-        &kp GRAVE &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 GRAVE &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 BKSP &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 INS
        &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 PG_UP
        &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 UP &kp PG_DN
@@ -105,7 +105,7 @@
    default_layer {
        // -------------------------------------------------------------------------------------------------
        // | ESC | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F9  | F9  | F10 | F11 | F12 |PSCRN| P_B | INS |
-        // |GRAVE|  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |BSPC | DEL | HOME|
+        // |GRAVE|  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |BKSP | DEL | HOME|
        // | TAB    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   \    | END |
        // | CAPS    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |     ENTER   | PGUP|
        // |SHIFT|NONE |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |SHIFT|NONE |  UP | PGDN|
--- a/app/boards/arm/ckp/bt75_v1.zmk.yml
+++ b/app/boards/arm/ckp/bt75_v1.zmk.yml
@@ -1,6 +1,6 @@
 file_format: "1"
 id: bt75_v1
-name: BT75 V1
+name: BT75_V1
 type: board
 arch: arm
 features:
@@ -8,7 +8,6 @@ features:
  - encoder
  - underglow
  - backlight
-  - studio
 outputs:
  - usb
  - ble
--- a/app/boards/arm/ckp/ckp.dtsi
+++ b/app/boards/arm/ckp/ckp.dtsi
@@ -34,8 +34,7 @@

    kscan0: kscan_0 {
        compatible = "zmk,kscan-gpio-matrix";
-        wakeup-source;
-
+        label = "KSCAN";
        diode-direction = "col2row";

        col-gpios
@@ -67,14 +66,15 @@
            ;
    };

-    // Node name must match original "EXT_POWER" label to preserve user settings.
-    EXT_POWER {
+    ext-power {
        compatible = "zmk,ext-power-generic";
+        label = "EXT_POWER";
        control-gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
    };

    encoder_1: encoder_1 {
        compatible = "alps,ec11";
+        label = "ENCODER_ONE";
        a-gpios = <&gpio0 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
        b-gpios = <&gpio0 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
        steps = <80>;
@@ -83,6 +83,7 @@

    encoder_2: encoder_2 {
        compatible = "alps,ec11";
+        label = "ENCODER_TWO";
        a-gpios = <&gpio0 26 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
        b-gpios = <&gpio0 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
        steps = <80>;
@@ -91,6 +92,7 @@

    encoder_3: encoder_3 {
        compatible = "alps,ec11";
+        label = "encoder_3";
        a-gpios = <&gpio0 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
        b-gpios = <&gpio0 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
        steps = <80>;
@@ -99,6 +101,7 @@

    backlight: pwmleds {
        compatible = "pwm-leds";
+        label = "Backlight LEDs";
        pwm_led_0 {
            pwms = <&pwm0 0 10000 PWM_POLARITY_NORMAL>;
        };
@@ -108,11 +111,13 @@
        compatible = "gpio-leds";
        blue_led: led_0 {
            gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
+            label = "Blue LED";
        };
    };

    vbatt: vbatt {
        compatible = "zmk,battery-voltage-divider";
+        label = "VBATT";
        io-channels = <&adc 2>;
        output-ohms = <100000>;
        full-ohms = <(100000 + 100000)>;
@@ -142,7 +147,7 @@
    status = "okay";
 };

-zephyr_udc0: &usbd {
+&usbd {
    status = "okay";
 };

@@ -158,9 +163,11 @@ zephyr_udc0: &usbd {
        #size-cells = <1>;

        sd_partition: partition@0 {
+            label = "softdevice";
            reg = <0x00000000 0x00026000>;
        };
        code_partition: partition@26000 {
+            label = "code_partition";
            reg = <0x00026000 0x000c6000>;
        };

@@ -174,10 +181,12 @@ zephyr_udc0: &usbd {
         * if enabled.
         */
        storage_partition: partition@ec000 {
+            label = "storage";
            reg = <0x000ec000 0x00008000>;
        };

        boot_partition: partition@f4000 {
+            label = "adafruit_boot";
            reg = <0x000f4000 0x0000c000>;
        };
    };
@@ -192,6 +201,7 @@ zephyr_udc0: &usbd {

    led_strip: ws2812@0 {
        compatible = "worldsemi,ws2812-spi";
+        label = "WS2812";

        /* SPI */
        reg = <0>;
--- a/app/boards/arm/ckp/pre_dt_board.cmake
+++ b/app/boards/arm/ckp/pre_dt_board.cmake
@@ -1,9 +0,0 @@
-#
-# Copyright (c) 2024 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-#
-
-# Suppresses duplicate unit-address warning at build time for power, clock, acl and flash-controller
-# https://docs.zephyrproject.org/latest/build/dts/intro-input-output.html
-
-list(APPEND EXTRA_DTC_FLAGS "-Wno-unique_unit_address_if_enabled")
--- a/app/boards/arm/corneish_zen/Kconfig.defconfig
+++ b/app/boards/arm/corneish_zen/Kconfig.defconfig
@@ -57,13 +57,6 @@ config IL0323
 config ZMK_DISPLAY_BLANK_ON_IDLE
    default n

-# Needed for the IL0323 driver which allocs memory to clear the display
-config HEAP_MEM_POOL_SIZE
-    default 1024
-
- config LV_Z_MEM_POOL_SIZE
-     default 4096
-
 endif # ZMK_DISPLAY

 menuconfig CUSTOM_WIDGET_BATTERY_STATUS
--- a/app/boards/arm/corneish_zen/board.cmake
+++ b/app/boards/arm/corneish_zen/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/corneish_zen/corneish_zen.dtsi
+++ b/app/boards/arm/corneish_zen/corneish_zen.dtsi
@@ -10,17 +10,6 @@

 #include <dt-bindings/zmk/matrix_transform.h>

-#include <layouts/foostan/corne/5column.dtsi>
-#include <layouts/foostan/corne/6column.dtsi>
-
-&foostan_corne_6col_layout {
-    transform = <&default_transform>;
-};
-
-&foostan_corne_5col_layout {
-    transform = <&five_column_transform>;
-};
-
 / {
    model = "Corne-ish Zen";
    compatible = "corneish_zen";
@@ -31,7 +20,8 @@
        zephyr,flash = &flash0;
        zmk,kscan = &kscan0;
        zmk,display = &epd;
-        zmk,physical-layout = &foostan_corne_6col_layout;
+        zephyr,console = &cdc_acm_uart;
+        zmk,matrix_transform = &default_transform;
    };

    default_transform: keymap_transform_0 {
@@ -86,8 +76,12 @@
    status = "okay";
 };

-zephyr_udc0: &usbd {
+&usbd {
    status = "okay";
+    cdc_acm_uart: cdc_acm_uart {
+        compatible = "zephyr,cdc-acm-uart";
+        label = "CDC_ACM_0";
+    };
 };

 &flash0 {
@@ -101,9 +95,11 @@ zephyr_udc0: &usbd {
        #size-cells = <1>;

        sd_partition: partition@0 {
+            label = "softdevice";
            reg = <0x00000000 0x00026000>;
        };
        code_partition: partition@26000 {
+            label = "code_partition";
            reg = <0x00026000 0x000c6000>;
        };

@@ -117,10 +113,12 @@ zephyr_udc0: &usbd {
         * 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/corneish_zen/corneish_zen.keymap
+++ b/app/boards/arm/corneish_zen/corneish_zen.keymap
@@ -11,8 +11,8 @@

 / {
    chosen {
-        zmk,physical-layout = &foostan_corne_6col_layout;
-        // zmk,physical-layout = &foostan_corne_5col_layout;
+        zmk,matrix_transform = &default_transform;
+        // zmk,matrix_transform = &five_column_transform;
    };
 };

@@ -21,9 +21,9 @@
        compatible = "zmk,keymap";

        default_layer {
-            display-name = "QWERTY";
+            label = "QWERTY";
 // --------------------------------------------------------------------------------
-// |  TAB |  Q  |  W  |  E  |  R  |  T  |   |  Y  |  U   |  I  |  O  |  P  | BSPC |
+// |  TAB |  Q  |  W  |  E  |  R  |  T  |   |  Y  |  U   |  I  |  O  |  P  | BKSP |
 // | CTRL |  A  |  S  |  D  |  F  |  G  |   |  H  |  J   |  K  |  L  |  ;  |  '   |
 // | SHFT |  Z  |  X  |  C  |  V  |  B  |   |  N  |  M   |  ,  |  .  |  /  | ESC  |
 //                    | GUI | LWR | SPC |   | ENT | RSE  | ALT |
@@ -36,9 +36,9 @@
        };

        lower_layer {
-            display-name = "NUMBER";
+            label = "NUMBER";
 // -----------------------------------------------------------------------------------------
-// |  TAB |  1  |  2  |  3  |  4  |  5  |   |  6  |  7  |  8  |  9  |  0  | BSPC |
+// |  TAB |  1  |  2  |  3  |  4  |  5  |   |  6  |  7  |  8  |  9  |  0  | BKSP |
 // | BTCLR| BT1 | BT2 | BT3 | BT4 | BT5 |   | LFT | DWN |  UP | RGT |     |      |
 // | SHFT |     |     |     |     |     |   |     |     |     |     |     |      |
 //                    | GUI |     | SPC |   | ENT |     | ALT |
@@ -51,16 +51,16 @@
        };

        raise_layer {
-            display-name = "SYMBOL";
+            label = "SYMBOL";
 // -----------------------------------------------------------------------------------------
-// |  TAB |  !  |  @  |  #  |  $  |  %  |   |  ^  |  &  |  *  |  (  |  )  | BSPC |
+// |  TAB |  !  |  @  |  #  |  $  |  %  |   |  ^  |  &  |  *  |  (  |  )  | BKSP |
 // | CTRL |     |     |     |     |     |   |  -  |  =  |  [  |  ]  |  \  |  `   |
 // | SHFT |     |     |     |     |     |   |  _  |  +  |  {  |  }  | "|" |  ~   |
 //                    | GUI |     | SPC |   | ENT |     | ALT |
            bindings = <
-&kp  TAB  &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT   &kp CARET &kp AMPS  &kp ASTRK &kp LPAR &kp RPAR &kp BSPC
-&kp LCTRL &trans   &trans &trans   &trans   &trans      &kp MINUS &kp EQUAL &kp LBKT  &kp RBKT &kp BSLH &kp GRAVE
-&kp LSHFT &trans   &trans &trans   &trans   &trans      &kp UNDER &kp PLUS  &kp LBRC  &kp RBRC &kp PIPE &kp TILDE
+&kp  TAB  &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT   &kp CARET &kp AMPS  &kp KP_MULTIPLY &kp LPAR &kp RPAR &kp BSPC
+&kp LCTRL &trans   &trans &trans   &trans   &trans      &kp MINUS &kp EQUAL &kp LBKT        &kp RBKT &kp BSLH &kp GRAVE
+&kp LSHFT &trans   &trans &trans   &trans   &trans      &kp UNDER &kp PLUS  &kp LBRC        &kp RBRC &kp PIPE &kp TILDE
                          &kp LGUI &trans   &kp SPACE   &kp RET   &trans    &kp RALT
            >;
        };
--- a/app/boards/arm/corneish_zen/corneish_zen_v1.zmk.yml
+++ b/app/boards/arm/corneish_zen/corneish_zen_v1.zmk.yml
@@ -7,7 +7,6 @@ arch: arm
 features:
  - keys
  - display
-  - studio
 outputs:
  - usb
  - ble
--- a/app/boards/arm/corneish_zen/corneish_zen_v1_left.dts
+++ b/app/boards/arm/corneish_zen/corneish_zen_v1_left.dts
@@ -15,7 +15,7 @@

    kscan0: kscan {
        compatible = "zmk,kscan-gpio-matrix";
-        wakeup-source;
+        label = "KSCAN";

        diode-direction = "col2row";
        row-gpios
@@ -39,6 +39,7 @@
        compatible = "gpio-leds";
        blue_led: led_0 {
            gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
+            label = "Blue LED";
        };
    };
 };
@@ -87,8 +88,9 @@

    fuelgauge: bq274xx@55 {
        compatible = "ti,bq274xx";
+        label = "BATTERY";
        reg = <0x55>;
-        design-voltage = <3700>; //Battery Design Voltage in mV
+        design-voltage = <3700>; //Battery Design Volatge in mV
        design-capacity = <180>; //Battery Design Capacity in mAh
        taper-current = <2>; //Battery Taper current in mAh
        terminate-voltage = <2750>; //Battery Terminate Voltage in mV
@@ -107,6 +109,7 @@
    epd: il0323@0 {
        compatible = "gooddisplay,il0323";
        reg =  <0>;
+        label = "DISPLAY";
        width = <80>;
        height = <128>;
        spi-max-frequency = <4000000>;
--- a/app/boards/arm/corneish_zen/corneish_zen_v1_left_defconfig
+++ b/app/boards/arm/corneish_zen/corneish_zen_v1_left_defconfig
@@ -44,7 +44,7 @@ CONFIG_ZMK_BLE=y

 # enable display drivers
 CONFIG_ZMK_DISPLAY_WORK_QUEUE_DEDICATED=y
-CONFIG_ZMK_DISPLAY_DEDICATED_THREAD_STACK_SIZE=4096
+CONFIG_ZMK_DISPLAY_DEDICATED_THREAD_STACK_SIZE=2048
 CONFIG_LV_Z_BITS_PER_PIXEL=1
 CONFIG_LV_COLOR_DEPTH_1=y
 CONFIG_LV_DPI_DEF=145
--- a/app/boards/arm/corneish_zen/corneish_zen_v1_right.dts
+++ b/app/boards/arm/corneish_zen/corneish_zen_v1_right.dts
@@ -15,7 +15,7 @@

    kscan0: kscan {
        compatible = "zmk,kscan-gpio-matrix";
-        wakeup-source;
+        label = "KSCAN";

        diode-direction = "col2row";
        row-gpios
@@ -39,6 +39,7 @@
        compatible = "gpio-leds";
        blue_led: led_0 {
            gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>;
+            label = "Blue LED";
        };
    };
 };
@@ -95,8 +96,9 @@

    fuelgauge: bq274xx@55 {
        compatible = "ti,bq274xx";
+        label = "BATTERY";
        reg = <0x55>;
-        design-voltage = <3700>; //Battery Design Voltage in mV
+        design-voltage = <3700>; //Battery Design Volatge in mV
        design-capacity = <180>; //Battery Design Capacity in mAh
        taper-current = <2>; //Battery Taper current in mAh 2.1
        terminate-voltage = <2750>; //Battery Terminate Voltage in mV
@@ -115,6 +117,7 @@
    epd: il0323@0 {
        compatible = "gooddisplay,il0323";
        reg =  <0>;
+        label = "DISPLAY";
        width = <80>;
        height = <128>;
        spi-max-frequency = <4000000>;
--- a/app/boards/arm/corneish_zen/corneish_zen_v1_right_defconfig
+++ b/app/boards/arm/corneish_zen/corneish_zen_v1_right_defconfig
@@ -39,12 +39,12 @@ CONFIG_FLASH_MAP=y
 CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y
 CONFIG_CLOCK_CONTROL_NRF_K32SRC_30PPM=y

-CONFIG_ZMK_USB=n
+CONFIG_ZMK_USB=y
 CONFIG_ZMK_BLE=y

 # enable display drivers
 CONFIG_ZMK_DISPLAY_WORK_QUEUE_DEDICATED=y
-CONFIG_ZMK_DISPLAY_DEDICATED_THREAD_STACK_SIZE=4096
+CONFIG_ZMK_DISPLAY_DEDICATED_THREAD_STACK_SIZE=2048
 CONFIG_LV_Z_BITS_PER_PIXEL=1
 CONFIG_LV_COLOR_DEPTH_1=y
 CONFIG_LV_DPI_DEF=145
--- a/app/boards/arm/corneish_zen/corneish_zen_v2.zmk.yml
+++ b/app/boards/arm/corneish_zen/corneish_zen_v2.zmk.yml
@@ -7,7 +7,6 @@ arch: arm
 features:
  - keys
  - display
-  - studio
 outputs:
  - usb
  - ble
--- a/app/boards/arm/corneish_zen/corneish_zen_v2_left.dts
+++ b/app/boards/arm/corneish_zen/corneish_zen_v2_left.dts
@@ -15,7 +15,7 @@

    kscan0: kscan {
        compatible = "zmk,kscan-gpio-matrix";
-        wakeup-source;
+        label = "KSCAN";

        diode-direction = "col2row";
        row-gpios
@@ -39,11 +39,13 @@
        compatible = "gpio-leds";
        blue_led: led_0 {
            gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
+            label = "Blue LED";
        };
    };

    vbatt: vbatt {
        compatible = "zmk,battery-voltage-divider";
+        label = "BATTERY";
        io-channels = <&adc 0>;
        output-ohms = <1960000>;
        full-ohms = <(1960000 + 810000)>;
@@ -81,6 +83,7 @@
    epd: il0323@0 {
        compatible = "gooddisplay,il0323";
        reg =  <0>;
+        label = "DISPLAY";
        width = <80>;
        height = <128>;
        spi-max-frequency = <4000000>;
--- a/app/boards/arm/corneish_zen/corneish_zen_v2_left_defconfig
+++ b/app/boards/arm/corneish_zen/corneish_zen_v2_left_defconfig
@@ -40,7 +40,7 @@ CONFIG_ZMK_BLE=y

 # enable display drivers
 CONFIG_ZMK_DISPLAY_WORK_QUEUE_DEDICATED=y
-CONFIG_ZMK_DISPLAY_DEDICATED_THREAD_STACK_SIZE=4096
+CONFIG_ZMK_DISPLAY_DEDICATED_THREAD_STACK_SIZE=2048
 CONFIG_LV_Z_BITS_PER_PIXEL=1
 CONFIG_LV_COLOR_DEPTH_1=y
 CONFIG_LV_DPI_DEF=145
--- a/app/boards/arm/corneish_zen/corneish_zen_v2_right.dts
+++ b/app/boards/arm/corneish_zen/corneish_zen_v2_right.dts
@@ -15,7 +15,7 @@

    kscan0: kscan {
        compatible = "zmk,kscan-gpio-matrix";
-        wakeup-source;
+        label = "KSCAN";

        diode-direction = "col2row";
        row-gpios
@@ -39,11 +39,13 @@
        compatible = "gpio-leds";
        blue_led: led_0 {
            gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>;
+            label = "Blue LED";
        };
    };

    vbatt: vbatt {
        compatible = "zmk,battery-voltage-divider";
+        label = "BATTERY";
        io-channels = <&adc 0>;
        output-ohms = <1960000>;
        full-ohms = <(1960000 + 810000)>;
@@ -88,6 +90,7 @@
    epd: il0323@0 {
        compatible = "gooddisplay,il0323";
        reg =  <0>;
+        label = "DISPLAY";
        width = <80>;
        height = <128>;
        spi-max-frequency = <4000000>;
--- a/app/boards/arm/corneish_zen/corneish_zen_v2_right_defconfig
+++ b/app/boards/arm/corneish_zen/corneish_zen_v2_right_defconfig
@@ -35,12 +35,12 @@ CONFIG_FLASH_MAP=y
 CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y
 CONFIG_CLOCK_CONTROL_NRF_K32SRC_30PPM=y

-CONFIG_ZMK_USB=n
+CONFIG_ZMK_USB=y
 CONFIG_ZMK_BLE=y

 # enable display drivers
 CONFIG_ZMK_DISPLAY_WORK_QUEUE_DEDICATED=y
-CONFIG_ZMK_DISPLAY_DEDICATED_THREAD_STACK_SIZE=4096
+CONFIG_ZMK_DISPLAY_DEDICATED_THREAD_STACK_SIZE=2048
 CONFIG_LV_Z_BITS_PER_PIXEL=1
 CONFIG_LV_COLOR_DEPTH_1=y
 CONFIG_LV_DPI_DEF=145
--- a/app/boards/arm/corneish_zen/pre_dt_board.cmake
+++ b/app/boards/arm/corneish_zen/pre_dt_board.cmake
@@ -1,9 +0,0 @@
-#
-# Copyright (c) 2024 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-#
-
-# Suppresses duplicate unit-address warning at build time for power, clock, acl and flash-controller
-# https://docs.zephyrproject.org/latest/build/dts/intro-input-output.html
-
-list(APPEND EXTRA_DTC_FLAGS "-Wno-unique_unit_address_if_enabled")
--- a/app/boards/arm/corneish_zen/widgets/battery_status.c
+++ b/app/boards/arm/corneish_zen/widgets/battery_status.c
@@ -6,12 +6,12 @@
 */

 #include <zephyr/kernel.h>
+#include <zephyr/bluetooth/services/bas.h>

 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);

 #include <zmk/display.h>
-#include <zmk/battery.h>
 #include "battery_status.h"
 #include <zmk/usb.h>
 #include <zmk/events/usb_conn_state_changed.h>
@@ -66,10 +66,8 @@ void battery_status_update_cb(struct battery_status_state state) {
 }

 static struct battery_status_state battery_status_get_state(const zmk_event_t *eh) {
-    const struct zmk_battery_state_changed *ev = as_zmk_battery_state_changed(eh);
-
-    return (struct battery_status_state){
-        .level = (ev != NULL) ? ev->state_of_charge : zmk_battery_state_of_charge(),
+    return (struct battery_status_state) {
+        .level = bt_bas_get_battery_level(),
 #if IS_ENABLED(CONFIG_USB_DEVICE_STACK)
        .usb_present = zmk_usb_is_powered(),
 #endif /* IS_ENABLED(CONFIG_USB_DEVICE_STACK) */
--- a/app/boards/arm/corneish_zen/widgets/layer_status.c
+++ b/app/boards/arm/corneish_zen/widgets/layer_status.c
@@ -19,15 +19,15 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 static sys_slist_t widgets = SYS_SLIST_STATIC_INIT(&widgets);

 struct layer_status_state {
-    zmk_keymap_layer_index_t index;
+    uint8_t index;
    const char *label;
 };

 static void set_layer_symbol(lv_obj_t *label, struct layer_status_state state) {
    const char *layer_label = state.label;
-    zmk_keymap_layer_index_t active_layer_index = state.index;
+    uint8_t active_layer_index = state.index;

-    if (layer_label == NULL || strlen(layer_label) == 0) {
+    if (layer_label == NULL) {
        char text[6] = {};

        sprintf(text, " %i", active_layer_index);
@@ -44,9 +44,8 @@ static void layer_status_update_cb(struct layer_status_state state) {
 }

 static struct layer_status_state layer_status_get_state(const zmk_event_t *eh) {
-    zmk_keymap_layer_index_t index = zmk_keymap_highest_layer_active();
-    return (struct layer_status_state){
-        .index = index, .label = zmk_keymap_layer_name(zmk_keymap_layer_index_to_id(index))};
+    uint8_t index = zmk_keymap_highest_layer_active();
+    return (struct layer_status_state){.index = index, .label = zmk_keymap_layer_label(index)};
 }

 ZMK_DISPLAY_WIDGET_LISTENER(widget_layer_status, struct layer_status_state, layer_status_update_cb,
--- a/app/boards/arm/corneish_zen/widgets/peripheral_status.c
+++ b/app/boards/arm/corneish_zen/widgets/peripheral_status.c
@@ -6,6 +6,7 @@
 */

 #include <zephyr/kernel.h>
+#include <zephyr/bluetooth/services/bas.h>

 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
--- a/app/boards/arm/dz60rgb/dz60rgb_rev1.dts
+++ b/app/boards/arm/dz60rgb/dz60rgb_rev1.dts
@@ -16,8 +16,9 @@
    chosen {
        zephyr,sram = &sram0;
        zephyr,flash = &flash0;
+        zephyr,console = &cdc_acm_uart;
        zmk,kscan = &kscan0;
-        zmk,matrix-transform = &default_transform;
+        zmk,matrix_transform = &default_transform;
    };

    default_transform: keymap_transform_0 {
@@ -35,6 +36,7 @@ RC(4,0)   RC(4,1)   RC(4,2)                      RC(4,5)                     RC(

    kscan0: kscan {
        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN";

        diode-direction = "col2row";
        row-gpios
@@ -64,8 +66,12 @@ RC(4,0)   RC(4,1)   RC(4,2)                      RC(4,5)                     RC(

 };

-zephyr_udc0: &usb {
+&usb {
    status = "okay";
+    cdc_acm_uart: cdc_acm_uart {
+        compatible = "zephyr,cdc-acm-uart";
+        label = "CDC_ACM_0";
+    };
 };

 &flash0 {
@@ -80,6 +86,7 @@ zephyr_udc0: &usb {

        /* 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
@@ -7,7 +7,7 @@

        default_layer {
 // ------------------------------------------------------------------------------------------
-// | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BSPC   |
+// | 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 |
--- a/app/boards/arm/dz60rgb/dz60rgb_rev1_defconfig
+++ b/app/boards/arm/dz60rgb/dz60rgb_rev1_defconfig
@@ -5,6 +5,9 @@ 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

--- a/app/boards/arm/ferris/ferris_rev02.dts
+++ b/app/boards/arm/ferris/ferris_rev02.dts
@@ -10,12 +10,6 @@

 #include <dt-bindings/zmk/matrix_transform.h>

-#include <layouts/cuddlykeyboards/ferris.dtsi>
-
-&cuddlykeyboards_ferris_layout {
-    transform = <&matrix_transform0>;
-};
-
 / {
    model = "Ferris rev0.2";
    compatible = "ferris,rev02", "st,stm32f072";
@@ -23,14 +17,15 @@
    chosen {
        zephyr,sram = &sram0;
        zephyr,flash = &flash0;
-        zmk,kscan = &kscan0;
-        zmk,physical-layout = &cuddlykeyboards_ferris_layout;
+        zephyr,console = &cdc_acm_uart;
+        zmk,kscan = &kscan;
+        zmk,matrix_transform = &transform;
        /* TODO: Enable once we support the IC for underglow
        zmk,underglow = &led_strip;
         */
    };

-    matrix_transform0: matrix_transform0 {
+    transform: transform {
        compatible = "zmk,matrix-transform";
        rows = <4>;
        columns = <10>;
@@ -43,8 +38,9 @@
        >;
    };

-    kscan0: kscan0 {
+    kscan: kscan {
        compatible = "zmk,kscan-composite";
+        label = "KSCAN";
        rows = <4>;
        columns = <10>;

@@ -54,12 +50,13 @@

        right {
            kscan = <&kscan_right>;
-            col-offset = <5>;
+            column-offset = <5>;
        };
    };

    kscan_left: kscan_left {
        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN_LEFT";

        diode-direction = "col2row";

@@ -80,6 +77,7 @@

    kscan_right: kscan_right {
        compatible = "zmk,kscan-gpio-matrix";
+        label = "KSCAN_RIGHT";

        diode-direction = "row2col";

@@ -115,24 +113,18 @@
    };
 };

-zephyr_udc0: &usb {
+&usb {
    status = "okay";
-
-    pinctrl-0 = <&usb_dm_pa11 &usb_dp_pa12>;
-    pinctrl-names = "default";
-
-    // Overridden to lower RAM usage.
-    num-bidir-endpoints = <4>;
+    cdc_acm_uart: cdc_acm_uart {
+        compatible = "zephyr,cdc-acm-uart";
+        label = "CDC_ACM_0";
+    };
 };

 &clk_hsi {
    status = "okay";
 };

-&clk_hsi48 {
-    status = "okay";
-};
-
 &pll {
    prediv = <1>;
    mul = <6>;
@@ -164,6 +156,7 @@ zephyr_udc0: &usb {

        /* 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/ferris/ferris_rev02.keymap
+++ b/app/boards/arm/ferris/ferris_rev02.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/arm/ferris/ferris_rev02_defconfig
+++ b/app/boards/arm/ferris/ferris_rev02_defconfig
@@ -6,7 +6,7 @@ CONFIG_SOC_STM32F072XB=y
 # 48MHz system clock
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=48000000

-# enable PINCTRL
+# enable PINMUX
 CONFIG_PINCTRL=y

 # enable GPIO
--- a/app/boards/arm/glove80/board.cmake
+++ b/app/boards/arm/glove80/board.cmake
@@ -2,5 +2,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/glove80/glove80-layouts.dtsi
+++ b/app/boards/arm/glove80/glove80-layouts.dtsi
@@ -1,91 +0,0 @@
-#include <physical_layouts.dtsi>
-
-/ {
-    physical_layout0: physical_layout_0 {
-        compatible = "zmk,physical-layout";
-        display-name = "Default";
-
-        keys  //                     w   h    x    y     rot    rx    ry
-            = <&key_physical_attrs 100 100    0   50       0     0     0>
-            , <&key_physical_attrs 100 100  100   50       0     0     0>
-            , <&key_physical_attrs 100 100  200    0       0     0     0>
-            , <&key_physical_attrs 100 100  300    0       0     0     0>
-            , <&key_physical_attrs 100 100  400    0       0     0     0>
-            , <&key_physical_attrs 100 100 1300    0       0     0     0>
-            , <&key_physical_attrs 100 100 1400    0       0     0     0>
-            , <&key_physical_attrs 100 100 1500    0       0     0     0>
-            , <&key_physical_attrs 100 100 1600   50       0     0     0>
-            , <&key_physical_attrs 100 100 1700   50       0     0     0>
-            , <&key_physical_attrs 100 100    0  150       0     0     0>
-            , <&key_physical_attrs 100 100  100  150       0     0     0>
-            , <&key_physical_attrs 100 100  200  100       0     0     0>
-            , <&key_physical_attrs 100 100  300  100       0     0     0>
-            , <&key_physical_attrs 100 100  400  100       0     0     0>
-            , <&key_physical_attrs 100 100  500  100       0     0     0>
-            , <&key_physical_attrs 100 100 1200  100       0     0     0>
-            , <&key_physical_attrs 100 100 1300  100       0     0     0>
-            , <&key_physical_attrs 100 100 1400  100       0     0     0>
-            , <&key_physical_attrs 100 100 1500  100       0     0     0>
-            , <&key_physical_attrs 100 100 1600  150       0     0     0>
-            , <&key_physical_attrs 100 100 1700  150       0     0     0>
-            , <&key_physical_attrs 100 100    0  250       0     0     0>
-            , <&key_physical_attrs 100 100  100  250       0     0     0>
-            , <&key_physical_attrs 100 100  200  200       0     0     0>
-            , <&key_physical_attrs 100 100  300  200       0     0     0>
-            , <&key_physical_attrs 100 100  400  200       0     0     0>
-            , <&key_physical_attrs 100 100  500  200       0     0     0>
-            , <&key_physical_attrs 100 100 1200  200       0     0     0>
-            , <&key_physical_attrs 100 100 1300  200       0     0     0>
-            , <&key_physical_attrs 100 100 1400  200       0     0     0>
-            , <&key_physical_attrs 100 100 1500  200       0     0     0>
-            , <&key_physical_attrs 100 100 1600  250       0     0     0>
-            , <&key_physical_attrs 100 100 1700  250       0     0     0>
-            , <&key_physical_attrs 100 100    0  350       0     0     0>
-            , <&key_physical_attrs 100 100  100  350       0     0     0>
-            , <&key_physical_attrs 100 100  200  300       0     0     0>
-            , <&key_physical_attrs 100 100  300  300       0     0     0>
-            , <&key_physical_attrs 100 100  400  300       0     0     0>
-            , <&key_physical_attrs 100 100  500  300       0     0     0>
-            , <&key_physical_attrs 100 100 1200  300       0     0     0>
-            , <&key_physical_attrs 100 100 1300  300       0     0     0>
-            , <&key_physical_attrs 100 100 1400  300       0     0     0>
-            , <&key_physical_attrs 100 100 1500  300       0     0     0>
-            , <&key_physical_attrs 100 100 1600  350       0     0     0>
-            , <&key_physical_attrs 100 100 1700  350       0     0     0>
-            , <&key_physical_attrs 100 100    0  450       0     0     0>
-            , <&key_physical_attrs 100 100  100  450       0     0     0>
-            , <&key_physical_attrs 100 100  200  400       0     0     0>
-            , <&key_physical_attrs 100 100  300  400       0     0     0>
-            , <&key_physical_attrs 100 100  400  400       0     0     0>
-            , <&key_physical_attrs 100 100  500  400       0     0     0>
-            , <&key_physical_attrs 100 100  400  450    3000   450   925>
-            , <&key_physical_attrs 100 100  400  450    4500   450   925>
-            , <&key_physical_attrs 100 100  400  450    6000   450   925>
-            , <&key_physical_attrs 100 100 1300  450 (-6000)  1350   925>
-            , <&key_physical_attrs 100 100 1300  450 (-4500)  1350   925>
-            , <&key_physical_attrs 100 100 1300  450 (-3000)  1350   925>
-            , <&key_physical_attrs 100 100 1200  400       0     0     0>
-            , <&key_physical_attrs 100 100 1300  400       0     0     0>
-            , <&key_physical_attrs 100 100 1400  400       0     0     0>
-            , <&key_physical_attrs 100 100 1500  400       0     0     0>
-            , <&key_physical_attrs 100 100 1600  450       0     0     0>
-            , <&key_physical_attrs 100 100 1700  450       0     0     0>
-            , <&key_physical_attrs 100 100    0  550       0     0     0>
-            , <&key_physical_attrs 100 100  100  550       0     0     0>
-            , <&key_physical_attrs 100 100  200  500       0     0     0>
-            , <&key_physical_attrs 100 100  300  500       0     0     0>
-            , <&key_physical_attrs 100 100  400  500       0     0     0>
-            , <&key_physical_attrs 100 100  400  550    2000   450   925>
-            , <&key_physical_attrs 100 100  400  550    4000   450   925>
-            , <&key_physical_attrs 100 100  400  550    6000   450   925>
-            , <&key_physical_attrs 100 100 1300  550 (-6000)  1350   925>
-            , <&key_physical_attrs 100 100 1300  550 (-4000)  1350   925>
-            , <&key_physical_attrs 100 100 1300  550 (-2000)  1350   925>
-            , <&key_physical_attrs 100 100 1300  500       0     0     0>
-            , <&key_physical_attrs 100 100 1400  500       0     0     0>
-            , <&key_physical_attrs 100 100 1500  500       0     0     0>
-            , <&key_physical_attrs 100 100 1600  550       0     0     0>
-            , <&key_physical_attrs 100 100 1700  550       0     0     0>
-            ;
-    };
-};
--- a/Show More
+++ b/Show More