Revert "feat: Split physical layout selection sync."

This reverts commit 03b5b38bc4.
2026-03-20 04:55:20 -05:00 · 2024-09-07 00:12:45 -06:00
774 changed files with 11535 additions and 30829 deletions
--- 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,9 +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.
- [ ] Includes any necessary [documentation changes](https://zmk.dev/docs/development/contributing/documentation).
+- [ ] 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
@@ -61,7 +61,7 @@ jobs:
      - name: Enable babblesim group filter
        run: west config manifest.group-filter -- +babblesim
      - name: Update modules (west update)
-        run: west update --fetch-opt=--filter=tree:0
+        run: west update
      - name: Export Zephyr CMake package (west zephyr-export)
        run: west zephyr-export
      - name: Build BabbleSim components
--- a/.github/workflows/build-user-config.yml
+++ b/.github/workflows/build-user-config.yml
@@ -26,7 +26,7 @@ on:

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

+      - name: Install yaml2json
+        run: python3 -m pip install remarshal
+
      - name: Fetch Build Matrix
        run: |
-          echo "build_matrix=$(yq -oj -I0 '${{ inputs.build_matrix_path }}')" >> $GITHUB_ENV
-          yq -oj "${{ inputs.build_matrix_path }}"
+          echo "build_matrix=$(yaml2json '${{ inputs.build_matrix_path }}' | jq -c .)" >> $GITHUB_ENV
+          yaml2json "${{ inputs.build_matrix_path }}" | jq

  build:
    runs-on: ubuntu-latest
@@ -114,7 +117,7 @@ jobs:

      - name: West Update
        working-directory: ${{ env.base_dir }}
-        run: west update --fetch-opt=--filter=tree:0
+        run: west update

      - name: West Zephyr export
        working-directory: ${{ env.base_dir }}
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -53,7 +53,7 @@ jobs:
      - name: Initialize workspace (west init)
        run: west init -l app
      - name: Update modules (west update)
-        run: west update --fetch-opt=--filter=tree:0
+        run: west update
      - name: Export Zephyr CMake package (west zephyr-export)
        run: west zephyr-export
      - name: Use Node.js
@@ -63,7 +63,7 @@ jobs:
      - name: Install @actions/artifact
        run: npm install @actions/artifact
      - name: Build
-        uses: actions/github-script@v8
+        uses: actions/github-script@v7
        id: boards-list
        with:
          script: |
@@ -95,7 +95,7 @@ jobs:
              throw new Error('Failed to build one or more configurations');
            }
      - name: Upload artifacts
-        uses: actions/github-script@v8
+        uses: actions/github-script@v7
        continue-on-error: ${{ github.event_name == 'pull_request' }}
        id: boards-upload
        with:
@@ -146,7 +146,7 @@ jobs:
      include-list: ${{ steps.compile-list.outputs.result }}
    steps:
      - name: Join build lists
-        uses: actions/github-script@v8
+        uses: actions/github-script@v7
        id: compile-list
        with:
          script: |
@@ -196,7 +196,7 @@ jobs:
          node-version: "14.x"
      - name: Install js-yaml
        run: npm install js-yaml
-      - uses: actions/github-script@v8
+      - uses: actions/github-script@v7
        id: core-list
        with:
          script: |
@@ -225,7 +225,7 @@ jobs:
          node-version: "14.x"
      - name: Install js-yaml
        run: npm install js-yaml
-      - uses: actions/github-script@v8
+      - uses: actions/github-script@v7
        id: boards-list
        with:
          script: |
@@ -302,7 +302,7 @@ jobs:
      nightly-include: ${{ steps.nightly-list.outputs.result }}
    steps:
      - name: Create nightly list
-        uses: actions/github-script@v8
+        uses: actions/github-script@v7
        id: nightly-list
        with:
          script: |
@@ -355,7 +355,7 @@ jobs:
      - name: Install js-yaml
        run: npm install js-yaml
      - name: Aggregate Metadata
-        uses: actions/github-script@v8
+        uses: actions/github-script@v7
        id: aggregate-metadata
        with:
          script: |
@@ -373,7 +373,7 @@ jobs:
          result-encoding: string

      - name: Organize Metadata
-        uses: actions/github-script@v8
+        uses: actions/github-script@v7
        id: organize-metadata
        with:
          script: |
@@ -430,12 +430,12 @@ jobs:
        uses: actions/checkout@v4
        with:
          persist-credentials: false
-      - uses: tj-actions/changed-files@9200e69727eb73eb060652b19946b8a2fdfb654b # pin to v45.0.8 due to https://github.com/tj-actions/changed-files/issues/2463 https://www.stepsecurity.io/blog/harden-runner-detection-tj-actions-changed-files-action-is-compromised
+      - uses: tj-actions/changed-files@v45
        id: changed-files
        with:
          json: true
          escape_json: false
-      - uses: actions/github-script@v8
+      - uses: actions/github-script@v7
        id: board-changes
        with:
          script: |
@@ -443,7 +443,7 @@ jobs:
            const boardChanges = changedFiles.filter(f => f.startsWith('app/boards'));
            return boardChanges.length ? 'true' : 'false';
          result-encoding: string
-      - uses: actions/github-script@v8
+      - uses: actions/github-script@v7
        id: core-changes
        with:
          script: |
--- a/.github/workflows/release-please.yml
+++ b/.github/workflows/release-please.yml
@@ -1,80 +0,0 @@
-on:
-  push:
-    branches:
-      - main
-      - "v*.*-branch"
-
-permissions:
-  contents: write
-  pull-requests: write
-
-name: release-please
-
-jobs:
-  handle-commit:
-    name: Handle new commit
-    runs-on: ubuntu-latest
-    outputs:
-      release_created: ${{ steps.release.outputs.release_created }}
-      major: ${{ steps.release.outputs.major }}
-      minor: ${{ steps.release.outputs.minor }}
-      patch: ${{ steps.release.outputs.patch }}
-    steps:
-      - uses: googleapis/release-please-action@v4
-        id: release
-        with:
-          token: ${{ secrets.ZMK_RELEASE_PLEASE_TOKEN }}
-          target-branch: ${{ github.ref_name }}
-
-  release-new-version:
-    name: Release new version
-    needs: handle-commit
-    runs-on: ubuntu-latest
-    if: ${{ needs.handle-commit.outputs.release_created }}
-    env:
-      ZMK_RELEASE_PLEASE_TOKEN: ${{ secrets.ZMK_RELEASE_PLEASE_TOKEN }}
-      VERSION: v${{ needs.handle-commit.outputs.major }}.${{ needs.handle-commit.outputs.minor }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Create major.minor branch
-        if: ${{ needs.handle-commit.outputs.patch == '0' }}
-        run: |
-          git remote add gh-token-branch "https://x-access-token:$ZMK_RELEASE_PLEASE_TOKEN@github.com/${{ github.repository }}.git"
-          git checkout -b $VERSION-branch
-          git push gh-token-branch $VERSION-branch
-
-      - name: tag major and minor versions
-        run: |
-          git config user.name github-actions[bot]
-          git config user.email 41898282+github-actions[bot]@users.noreply.github.com
-          git remote add gh-token "https://x-access-token:$ZMK_RELEASE_PLEASE_TOKEN@github.com/${{ github.repository }}.git"
-          git tag -d $VERSION || true
-          git tag -a $VERSION -m "Release $VERSION"
-          git push --force gh-token $VERSION
-
-  bump-user-config-template-version:
-    name: Bump user config template version
-    needs: handle-commit
-    runs-on: ubuntu-latest
-    if: ${{ needs.handle-commit.outputs.release_created }}
-    env:
-      ZMK_RELEASE_PLEASE_TOKEN: ${{ secrets.ZMK_RELEASE_PLEASE_TOKEN }}
-      VERSION: v${{ needs.handle-commit.outputs.major }}.${{ needs.handle-commit.outputs.minor }}
-    steps:
-      - name: Bump user config template
-        run: |
-          if [ -z "$VERSION" ]; then
-            echo "VERSION is not set, exiting."
-            exit 1
-          fi
-
-          git clone "https://x-access-token:$ZMK_RELEASE_PLEASE_TOKEN@github.com/zmkfirmware/unified-zmk-config-template.git"
-          cd unified-zmk-config-template
-          git config user.name github-actions[bot]
-          git config user.email 41898282+github-actions[bot]@users.noreply.github.com
-          sed -i 's/^\(\s*\)revision: .*/\1revision: '"$VERSION"'/' config/west.yml
-          sed -i 's|uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@.*|uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@'"$VERSION"'|' .github/workflows/build.yml
-          git add .
-          git commit -m "Version bump to $VERSION"
-          git push origin main
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -1,28 +0,0 @@
-name: "Mark and close stale PRs in the repo"
-on:
-  schedule:
-    - cron: "00 14 * * *" # runs daily at 14:00 https://crontab.guru/#00_14_*_*_*
-
-jobs:
-  stale:
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/stale@v9.1.0
-        with:
-          days-before-pr-stale: 300 # ~10 months
-          stale-pr-label: "stale"
-          stale-pr-message: >
-            This PR has been automatically marked as stale because it has not
-            had activity in 10 months. It will be closed in 14 days if no
-            further activity occurs. Feel free to give a status update or
-            re-open when it has been rebased and is ready for review (again).
-            Thanks!
-          days-before-pr-close: 14
-          close-pr-message: >
-            This PR was closed because it had no activity for over 10 months.
-            Feel free to give a status update or re-open when it has been
-            rebased and is ready for review (again).
-          days-before-issue-stale: 1000 # ~3 years
-          days-before-issue-close: -1
-          ascending: true # Process older PRs first
-          operations-per-run: 30 # Default value, listed here again to make it explicit
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -4,14 +4,12 @@ on:
  push:
    paths:
      - ".github/workflows/test.yml"
-      - "app/run-test.sh"
      - "app/tests/**"
      - "app/src/**"
      - "app/include/**"
  pull_request:
    paths:
      - ".github/workflows/test.yml"
-      - "app/run-test.sh"
      - "app/tests/**"
      - "app/src/**"
      - "app/include/**"
@@ -61,7 +59,7 @@ jobs:
      - name: Initialize workspace (west init)
        run: west init -l app
      - name: Update modules (west update)
-        run: west update --fetch-opt=--filter=tree:0
+        run: west update
      - name: Export Zephyr CMake package (west zephyr-export)
        run: west zephyr-export
      - name: Test ${{ matrix.test }}
--- 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,28 +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/rbubley/mirrors-prettier
-    rev: 787fb9f542b140ba0b2aced38e6a3e68021647a3
+  - 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
-          )$
-  - repo: https://github.com/jorisroovers/gitlint
-    rev: v0.19.1
-    hooks:
-      - id: gitlint
+        # Workaround for https://github.com/pre-commit/mirrors-prettier/issues/29
+        additional_dependencies:
+          - prettier@2.8.7
  - 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.3.0"}
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,7 +1,6 @@
 {
  "recommendations": [
    "esbenp.prettier-vscode",
-    "ms-python.black-formatter",
    "ms-python.python",
    "ms-vscode.cpptools",
    "plorefice.devicetree",
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -3,7 +3,7 @@
    "*.overlay": "dts",
    "*.keymap": "dts"
  },
-  "python.analysis.include": ["app/scripts", "zephyr/scripts"],
+  "python.formatting.provider": "black",
  "[c]": {
    "editor.formatOnSave": true
  },
@@ -13,7 +13,7 @@
  },
  "[python]": {
    "editor.formatOnSave": true,
-    "editor.defaultFormatter": "ms-python.black-formatter"
+    "editor.defaultFormatter": "ms-python.python"
  },
  "[css][json][jsonc][html][markdown][yaml]": {
    "editor.formatOnSave": true,
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,116 +0,0 @@
-# Changelog
-
-## [0.3.0](https://github.com/zmkfirmware/zmk/compare/v0.2.1...v0.3.0) (2025-08-01)
-
-
-### Features
-
-* **ble:** Add function to get profile address by index ([#2992](https://github.com/zmkfirmware/zmk/issues/2992)) ([9e905d6](https://github.com/zmkfirmware/zmk/commit/9e905d65936348824588dc3f424755353ac61186))
-* **ci:** Add stale GitHub Action to automatically close stale PRs ([#2924](https://github.com/zmkfirmware/zmk/issues/2924)) ([6d7bbc8](https://github.com/zmkfirmware/zmk/commit/6d7bbc8670d175fd63e8c834feb41f80e7b52e74))
-* **display:** nice!view individual profile status ([#2265](https://github.com/zmkfirmware/zmk/issues/2265)) ([d09087f](https://github.com/zmkfirmware/zmk/commit/d09087f4dc280b8fdb1d32d63b03cc10162b89ce))
-* Full-Duplex Wired Split ([#2766](https://github.com/zmkfirmware/zmk/issues/2766)) ([147c340](https://github.com/zmkfirmware/zmk/commit/147c340c6e8d377304acfdd64dc86cf83ebdfef2))
-* **metadata:** Add metadata to the mouse_key_press behavior ([#2950](https://github.com/zmkfirmware/zmk/issues/2950)) ([239baa4](https://github.com/zmkfirmware/zmk/commit/239baa487509ace108d36f0e5c627d61a3d95f53))
-* **pointing:** Allow peripheral input processing to stop propagation ([#2844](https://github.com/zmkfirmware/zmk/issues/2844)) ([462d48b](https://github.com/zmkfirmware/zmk/commit/462d48b78edac8bedb75666699ea4fa446d2152c))
-* **shield:** Add underglow for reviung5 ([#2191](https://github.com/zmkfirmware/zmk/issues/2191)) ([ad6a181](https://github.com/zmkfirmware/zmk/commit/ad6a181d7ec34fb6e31134f6bb991a9b2d0b8f78))
-* **shields:** Add a physical layout for a_dux ([#3000](https://github.com/zmkfirmware/zmk/issues/3000)) ([7292df0](https://github.com/zmkfirmware/zmk/commit/7292df02d4b05d783f432f8658de22d940909fe4))
-* **shields:** Add physical layouts for tester_xiao and tester_pro_micro ([#2852](https://github.com/zmkfirmware/zmk/issues/2852)) ([eb170c9](https://github.com/zmkfirmware/zmk/commit/eb170c930f56e3fb3df0b813d987abfd1dc31b9a))
-* **shields:** Add tester_pro_micro layouts ([eb170c9](https://github.com/zmkfirmware/zmk/commit/eb170c930f56e3fb3df0b813d987abfd1dc31b9a))
-* **shields:** Add tester_xiao layouts ([eb170c9](https://github.com/zmkfirmware/zmk/commit/eb170c930f56e3fb3df0b813d987abfd1dc31b9a))
-* **split:** Add full-duplex wired split support ([147c340](https://github.com/zmkfirmware/zmk/commit/147c340c6e8d377304acfdd64dc86cf83ebdfef2))
-* **split:** Runtime selection of split transport ([6b44d33](https://github.com/zmkfirmware/zmk/commit/6b44d33db2f4bad7d98e475e6f7968493b05af73))
-* **split:** Runtime selection of split transport ([#2886](https://github.com/zmkfirmware/zmk/issues/2886)) ([6b44d33](https://github.com/zmkfirmware/zmk/commit/6b44d33db2f4bad7d98e475e6f7968493b05af73))
-* **split:** Suspend/resume wired UART devices. ([6b44d33](https://github.com/zmkfirmware/zmk/commit/6b44d33db2f4bad7d98e475e6f7968493b05af73))
-
-
-### Bug Fixes
-
-* **behaviors:** Correct macro release state for parametrized ([1bac680](https://github.com/zmkfirmware/zmk/commit/1bac680c4fb4f07e43c01754b6f1e72dab455e50))
-* **behaviors:** Correct macro release state for parametrized macros ([#2942](https://github.com/zmkfirmware/zmk/issues/2942)) ([1bac680](https://github.com/zmkfirmware/zmk/commit/1bac680c4fb4f07e43c01754b6f1e72dab455e50))
-* **ble,hid:** Fix smooth scrolling over BLE ([#2998](https://github.com/zmkfirmware/zmk/issues/2998)) ([342d838](https://github.com/zmkfirmware/zmk/commit/342d83891301b1be53233a12c7723bb99cbe5ff6)), closes [#2957](https://github.com/zmkfirmware/zmk/issues/2957)
-* **boards:** Disable high voltage DC-DC by default ([#2995](https://github.com/zmkfirmware/zmk/issues/2995)) ([8059e67](https://github.com/zmkfirmware/zmk/commit/8059e671b24a261939401afb5a65c4fa756adc2d)), closes [#2990](https://github.com/zmkfirmware/zmk/issues/2990)
-* changed shebang to make scripts more platform independent ([#2893](https://github.com/zmkfirmware/zmk/issues/2893)) ([84772eb](https://github.com/zmkfirmware/zmk/commit/84772ebf14e5a7c67ba573a61f0a50048802c799))
-* **ci:** pin tj-actions/changed-files due to compromise ([#2874](https://github.com/zmkfirmware/zmk/issues/2874)) ([4da89bd](https://github.com/zmkfirmware/zmk/commit/4da89bd99716bf6c1d7d788f3cdaec4cee7403e9))
-* **combos:** Properly clean up all old candidates. ([#2928](https://github.com/zmkfirmware/zmk/issues/2928)) ([e3030bf](https://github.com/zmkfirmware/zmk/commit/e3030bfcc87b7f511b0ebe993fb1f1f06215982e))
-* **combos:** Restore prompts for two deprecated Kconfigs ([#2926](https://github.com/zmkfirmware/zmk/issues/2926)) ([00ff486](https://github.com/zmkfirmware/zmk/commit/00ff48693113ed74a3345aa1ac81fdea302b3a09))
-* **core:** Correctly sync BAS battery level ([#2977](https://github.com/zmkfirmware/zmk/issues/2977)) ([af96766](https://github.com/zmkfirmware/zmk/commit/af967667b0e139a963178e63028c7be341cade9e))
-* **display:** Make stock battery widget depend on the right symbol ([#2953](https://github.com/zmkfirmware/zmk/issues/2953)) ([9da5d3b](https://github.com/zmkfirmware/zmk/commit/9da5d3ba82b38b74ad798a82a838d84c52220bbe))
-* **docs:** Fix soft off waker configuration example ([#2960](https://github.com/zmkfirmware/zmk/issues/2960)) ([eb99b4e](https://github.com/zmkfirmware/zmk/commit/eb99b4ede06bc01674ce16217ebbad40bc11ec50))
-* **docs:** remove title as alt text ([#2922](https://github.com/zmkfirmware/zmk/issues/2922)) ([d9576c5](https://github.com/zmkfirmware/zmk/commit/d9576c55346acfc8eed36709aaae28f91e0d06ad))
-* Fix build with Studio and USB but not UART ([#2996](https://github.com/zmkfirmware/zmk/issues/2996)) ([cef7af4](https://github.com/zmkfirmware/zmk/commit/cef7af4408cc44c20fab93a0b2e20b3429d0a98e))
-* **hid:** Fix scroll value truncation ([#2865](https://github.com/zmkfirmware/zmk/issues/2865)) ([2c0e7da](https://github.com/zmkfirmware/zmk/commit/2c0e7daced1421c34a9d417b7d3e9bccbf0ebd7f)), closes [#2864](https://github.com/zmkfirmware/zmk/issues/2864)
-* **pointing:** Avoids mutex leak for default layer toggle event ([#2934](https://github.com/zmkfirmware/zmk/issues/2934)) ([461f5c8](https://github.com/zmkfirmware/zmk/commit/461f5c832fb8854d87dca54d113d306323697219))
-* Properly override stack size on RP2040 ([147c340](https://github.com/zmkfirmware/zmk/commit/147c340c6e8d377304acfdd64dc86cf83ebdfef2))
-* **split:** add source to battery event ([#2901](https://github.com/zmkfirmware/zmk/issues/2901)) ([6f85f48](https://github.com/zmkfirmware/zmk/commit/6f85f48b19afae04f98e9abacb36ce1425b61f78))
-* **split:** Compile and run properly in wired polling mode. ([#3012](https://github.com/zmkfirmware/zmk/issues/3012)) ([2ae5185](https://github.com/zmkfirmware/zmk/commit/2ae51854192aed92af95536f79547e2928cd1bf5))
-* **split:** Conditionally build all split code ([#2884](https://github.com/zmkfirmware/zmk/issues/2884)) ([5bb39ec](https://github.com/zmkfirmware/zmk/commit/5bb39ec3eae23055593350cb3689a8240028181e))
-* **split:** Enable wired split by default if DTS is set ([#3010](https://github.com/zmkfirmware/zmk/issues/3010)) ([1530ae3](https://github.com/zmkfirmware/zmk/commit/1530ae36c22e3e2285e895737c74de5d960a5ae4))
-* **split:** Minor wired split fixes. ([6b44d33](https://github.com/zmkfirmware/zmk/commit/6b44d33db2f4bad7d98e475e6f7968493b05af73))
-* Unconditionally define HID payloads to avoid error. ([6b44d33](https://github.com/zmkfirmware/zmk/commit/6b44d33db2f4bad7d98e475e6f7968493b05af73))
-
-## [0.2.1](https://github.com/zmkfirmware/zmk/compare/v0.2.0...v0.2.1) (2025-03-02)
-
-
-### Bug Fixes
-
-* **behaviors:** Proper comma separated device list ([#2850](https://github.com/zmkfirmware/zmk/issues/2850)) ([f20e6ea](https://github.com/zmkfirmware/zmk/commit/f20e6ea7594b49eef1e3acc017529073a0409962))
-
-## [0.2.0](https://github.com/zmkfirmware/zmk/compare/v0.1.0...v0.2.0) (2025-03-01)
-
-
-### Features
-
-* Added `toggle-mode`, allowing toggle-on and toggle-off ([#2555](https://github.com/zmkfirmware/zmk/issues/2555)) ([4ef231f](https://github.com/zmkfirmware/zmk/commit/4ef231f4bba87151acfbd1cf3babd83b69813e45))
-* added toggle mode to key and layer toggles ([4ef231f](https://github.com/zmkfirmware/zmk/commit/4ef231f4bba87151acfbd1cf3babd83b69813e45))
-* **boards:** Update for mikoto board definition ([#1946](https://github.com/zmkfirmware/zmk/issues/1946)) ([b26058b](https://github.com/zmkfirmware/zmk/commit/b26058b6c7c83f8d1f095d2f9c6c3998b391a61b))
-* **core:** Make physical layout key rotation optional ([#2770](https://github.com/zmkfirmware/zmk/issues/2770)) ([c367d8f](https://github.com/zmkfirmware/zmk/commit/c367d8f636f0842b414c2b58df6101761cdd676d))
-* **display:** Add ability to set display on/off pin. ([#2814](https://github.com/zmkfirmware/zmk/issues/2814)) ([627e6db](https://github.com/zmkfirmware/zmk/commit/627e6dbec99211b3d7cce55904fb1c824ed87bf3))
-* **display:** Add config for display update period ([#2819](https://github.com/zmkfirmware/zmk/issues/2819)) ([aa3e5dd](https://github.com/zmkfirmware/zmk/commit/aa3e5dd70fdd1b364fa9ad26f14425be613d180c))
-* input processor behavior invocation ([#2714](https://github.com/zmkfirmware/zmk/issues/2714)) ([cb867f9](https://github.com/zmkfirmware/zmk/commit/cb867f92dbe4e32675c2137fc6aa914a44ecc8dc))
-* **Kconfig:** Allow overriding ZMK Kconfig defaults ([#2537](https://github.com/zmkfirmware/zmk/issues/2537)) ([40925d4](https://github.com/zmkfirmware/zmk/commit/40925d48e67b3eeaeb3e848a2287ed628de9f674))
-* **mouse:** Add mouse move and scroll support ([#2477](https://github.com/zmkfirmware/zmk/issues/2477)) ([6b40bfd](https://github.com/zmkfirmware/zmk/commit/6b40bfda53571f7a960ccc448aa87f29da7496ac))
-* **pointing:** Add behavior input processor ([cb867f9](https://github.com/zmkfirmware/zmk/commit/cb867f92dbe4e32675c2137fc6aa914a44ecc8dc))
-* **pointing:** Add pre-defined scroll scaler ([0f7c112](https://github.com/zmkfirmware/zmk/commit/0f7c11248a1ddb7c6559064c2a1e7a3c446d5d55))
-* **pointing:** Add pre-defined scroll scaler and mouse scroll tests ([#2759](https://github.com/zmkfirmware/zmk/issues/2759)) ([0f7c112](https://github.com/zmkfirmware/zmk/commit/0f7c11248a1ddb7c6559064c2a1e7a3c446d5d55))
-* **shields:** Add physical layout for Lotus58 ([#2753](https://github.com/zmkfirmware/zmk/issues/2753)) ([424e532](https://github.com/zmkfirmware/zmk/commit/424e53210ea16c2287abaf770ebf45be432d841a))
-* **studio:** Add ortho_4x10 grid layout ([#2651](https://github.com/zmkfirmware/zmk/issues/2651)) ([7e8c542](https://github.com/zmkfirmware/zmk/commit/7e8c542c94908ac011ec7272a5f8ab10d2102632))
-
-
-### Bug Fixes
-
-* allow kscan-composite to wake up device. ([#2682](https://github.com/zmkfirmware/zmk/issues/2682)) ([a8f5ab6](https://github.com/zmkfirmware/zmk/commit/a8f5ab67b5d449a2624e2de7ddfb264da778ea6c))
-* **behaviors:** Make multiple sticky keys work on same key position ([7186528](https://github.com/zmkfirmware/zmk/commit/7186528f77bf077173927c1c8506b4d434e5c371))
-* **behaviors:** Make multiple sticky keys work on same key position ([#2758](https://github.com/zmkfirmware/zmk/issues/2758)) ([7186528](https://github.com/zmkfirmware/zmk/commit/7186528f77bf077173927c1c8506b4d434e5c371))
-* **ble:** enforce maximum length for dynamic device name ([#2784](https://github.com/zmkfirmware/zmk/issues/2784)) ([ea267b0](https://github.com/zmkfirmware/zmk/commit/ea267b0f35f862b882ac568dde6365c3a0c85099))
-* **combos:** Properly report combos len with emply block ([#2739](https://github.com/zmkfirmware/zmk/issues/2739)) ([f0a77b8](https://github.com/zmkfirmware/zmk/commit/f0a77b888ac482a863386ced08e04660ddacb026))
-* **display:** Only default mono theme when 1bpp ([#2804](https://github.com/zmkfirmware/zmk/issues/2804)) ([425256b](https://github.com/zmkfirmware/zmk/commit/425256bc0de7ed08802533b170abba78ee90f546))
-* **display:** POSIX lvgl fixes ([#2812](https://github.com/zmkfirmware/zmk/issues/2812)) ([4b4a8a3](https://github.com/zmkfirmware/zmk/commit/4b4a8a35f3f90f1af75cdf5d9c26b47d4b8dcabb))
-* **drivers:** Proper static/const for data/config ([#2769](https://github.com/zmkfirmware/zmk/issues/2769)) ([6941abc](https://github.com/zmkfirmware/zmk/commit/6941abc2afab16502cff9c5149d8dc0fcd5112c9))
-* Fix warnings in nanopb encoding code ([#2643](https://github.com/zmkfirmware/zmk/issues/2643)) ([7013158](https://github.com/zmkfirmware/zmk/commit/7013158a6715d94b34e8c471ce25bb5005f3bb49))
-* Kconfig refactor now works correctly with external modules ([#2711](https://github.com/zmkfirmware/zmk/issues/2711)) ([bb48661](https://github.com/zmkfirmware/zmk/commit/bb486619a183f6df7fbb4620c80164555a22da0b))
-* **Kconfig:** Added a name to EC11's trigger mode choice ([40925d4](https://github.com/zmkfirmware/zmk/commit/40925d48e67b3eeaeb3e848a2287ed628de9f674))
-* **kscan:** Remove warning when keyboard is built without CONFIG_PM_DEVICE ([#2808](https://github.com/zmkfirmware/zmk/issues/2808)) ([8e065d5](https://github.com/zmkfirmware/zmk/commit/8e065d55b916481ef06ce37cddedb84cf1d15d99))
-* **pointing:** Complete header rename missed in refactor ([#2702](https://github.com/zmkfirmware/zmk/issues/2702)) ([84baf92](https://github.com/zmkfirmware/zmk/commit/84baf929c9bb95f255d4bafd0e57f2ec47455fca))
-* **pointing:** Temp layer threading protection. ([#2729](https://github.com/zmkfirmware/zmk/issues/2729)) ([1e3e62c](https://github.com/zmkfirmware/zmk/commit/1e3e62c13d0666d98831ee302ae2fb17e68196c9))
-* **studio:** Allow adding layers after a layer move ([#2748](https://github.com/zmkfirmware/zmk/issues/2748)) ([36508c2](https://github.com/zmkfirmware/zmk/commit/36508c27fddfb84d912e0122e313ad3904ceb946))
-* **studio:** Properly return complete keymap from RPC ([#2696](https://github.com/zmkfirmware/zmk/issues/2696)) ([0820991](https://github.com/zmkfirmware/zmk/commit/0820991901a95ab7a0eb1f1cc608a631d514e26c))
-
-## 0.1.0 (2024-11-29)
-
-
-### Features
-
-* **boards:** Add glove80 nexus node for extension GPIO. ([#2594](https://github.com/zmkfirmware/zmk/issues/2594)) ([fb359f5](https://github.com/zmkfirmware/zmk/commit/fb359f576619940164ca2e770b49b7b34f13428e))
-* **boards:** add nrf52833-nosd snippet ([63af296](https://github.com/zmkfirmware/zmk/commit/63af296b6efd8d677d584f372c9da9a4fedaa496))
-* **boards:** add nrf52840-nosd snippet ([4438b7b](https://github.com/zmkfirmware/zmk/commit/4438b7b835bfd1d4e89cdd955a4ab0fd2e2ae3bf))
-* **ci:** Add release-please automation with VERSION ([#2622](https://github.com/zmkfirmware/zmk/issues/2622)) ([ffa485c](https://github.com/zmkfirmware/zmk/commit/ffa485c11b48444acf3adf1e3c1cb3eed16fad94))
-* **drivers:** Support init high/low in 595 driver ([888c0d9](https://github.com/zmkfirmware/zmk/commit/888c0d966cd52f3ab5145992f61b14d6262c1951))
-
-
-### Bug Fixes
-
-* **boards:** Disable uart serial node in Xiao BLE by default ([#2672](https://github.com/zmkfirmware/zmk/issues/2672)) ([230b860](https://github.com/zmkfirmware/zmk/commit/230b860f31063774c3bcc19afb6f92479462de24))
-* **boards:** Fix typo in BT75 metadata ([c9553c3](https://github.com/zmkfirmware/zmk/commit/c9553c31e3a3f39964391b006492995b5bb09c39))
-* Disable display feature for settings_reset ([b0f5789](https://github.com/zmkfirmware/zmk/commit/b0f5789b128f0f5599341398898fdb0e0407b2d3))
-* Fix inconsistent column offset property ([c7473fc](https://github.com/zmkfirmware/zmk/commit/c7473fc32557d2d384ab78d3acf51a05488f0214))
-* include a header file for RC macros ([#2649](https://github.com/zmkfirmware/zmk/issues/2649)) ([f8eff2f](https://github.com/zmkfirmware/zmk/commit/f8eff2fe34609c91211c25113f9d7db09f7d1689))
-* **studio:** Improved error message when keyboard is missing a physical layout. ([fed66a9](https://github.com/zmkfirmware/zmk/commit/fed66a92d000f4c8e0019d9ccdd167271324e8e9))
--- a/app/.prettierrc.js
+++ b/app/.prettierrc.js
@@ -1,4 +1,3 @@
 module.exports = {
  endOfLine: "auto",
-  trailingComma: "es5",
 };
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.13.1)

 set(CONFIG_APPLICATION_DEFINED_SYSCALL true)

-set(ZEPHYR_BOARD_ALIASES "boards/aliases.cmake")
 set(ZEPHYR_EXTRA_MODULES "${ZMK_EXTRA_MODULES};${CMAKE_CURRENT_SOURCE_DIR}/module;${CMAKE_CURRENT_SOURCE_DIR}/keymap-module")

 # Find Zephyr. This also loads Zephyr's build system.
@@ -17,7 +16,6 @@ if(CONFIG_ZMK_BEHAVIOR_LOCAL_IDS)
 endif()

 zephyr_syscall_header(${APPLICATION_SOURCE_DIR}/include/drivers/behavior.h)
-zephyr_syscall_header(${APPLICATION_SOURCE_DIR}/include/drivers/input_processor.h)
 zephyr_syscall_header(${APPLICATION_SOURCE_DIR}/include/drivers/ext_power.h)

 # Add your source file to the "app" target. This must come after
@@ -38,14 +36,15 @@ target_sources_ifdef(CONFIG_ZMK_GPIO_KEY_WAKEUP_TRIGGER app PRIVATE src/gpio_key
 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)
+target_sources(app PRIVATE src/events/mouse_button_state_changed.c)
 target_sources_ifdef(CONFIG_ZMK_WPM app PRIVATE src/events/wpm_state_changed.c)
 target_sources_ifdef(CONFIG_USB_DEVICE_STACK app PRIVATE src/events/usb_conn_state_changed.c)
 target_sources(app PRIVATE src/behaviors/behavior_reset.c)
 target_sources_ifdef(CONFIG_ZMK_EXT_POWER app PRIVATE src/behaviors/behavior_ext_power.c)
 target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_SOFT_OFF app PRIVATE src/behaviors/behavior_soft_off.c)
-add_subdirectory_ifdef(CONFIG_ZMK_POINTING src/pointing/)
 if ((NOT CONFIG_ZMK_SPLIT) OR CONFIG_ZMK_SPLIT_ROLE_CENTRAL)
  target_sources(app PRIVATE src/hid.c)
+  target_sources_ifdef(CONFIG_ZMK_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)
@@ -65,9 +64,8 @@ if ((NOT CONFIG_ZMK_SPLIT) OR CONFIG_ZMK_SPLIT_ROLE_CENTRAL)
  target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_SENSOR_ROTATE_COMMON app PRIVATE src/behaviors/behavior_sensor_rotate_common.c)
  target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_MOUSE_KEY_PRESS app PRIVATE src/behaviors/behavior_mouse_key_press.c)
  target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_STUDIO_UNLOCK app PRIVATE src/behaviors/behavior_studio_unlock.c)
-  target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_INPUT_TWO_AXIS app PRIVATE src/behaviors/behavior_input_two_axis.c)
  target_sources(app PRIVATE src/combo.c)
-  target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_TAP_DANCE app PRIVATE src/behaviors/behavior_tap_dance.c)
+  target_sources(app PRIVATE src/behaviors/behavior_tap_dance.c)
  target_sources(app PRIVATE src/behavior_queue.c)
  target_sources(app PRIVATE src/conditional_layer.c)
  target_sources(app PRIVATE src/endpoints.c)
@@ -96,7 +94,7 @@ target_sources_ifdef(CONFIG_ZMK_BATTERY_REPORTING app PRIVATE src/battery.c)
 target_sources_ifdef(CONFIG_ZMK_HID_INDICATORS app PRIVATE src/events/hid_indicators_changed.c)

 target_sources_ifdef(CONFIG_ZMK_SPLIT app PRIVATE src/events/split_peripheral_status_changed.c)
-add_subdirectory_ifdef(CONFIG_ZMK_SPLIT src/split)
+add_subdirectory(src/split)

 target_sources_ifdef(CONFIG_USB_DEVICE_STACK app PRIVATE src/usb.c)
 target_sources_ifdef(CONFIG_ZMK_USB app PRIVATE src/usb_hid.c)
--- a/app/Kconfig
+++ b/app/Kconfig
@@ -46,7 +46,7 @@ config NRF_STORE_REBOOT_TYPE_GPREGRET
    bool
    default y

-endif # SOC_SERIES_NRF52X
+endif

 menu "HID"

@@ -81,11 +81,14 @@ if ZMK_HID_REPORT_TYPE_HKRO

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

-endif # ZMK_HID_REPORT_TYPE_HKRO
+endif

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

 choice ZMK_HID_CONSUMER_REPORT_USAGES
    prompt "HID Report Type"
@@ -139,7 +142,8 @@ config USB_NUMOF_EP_WRITE_RETRIES
 config USB_HID_POLL_INTERVAL_MS
    default 1

-endif # ZMK_USB
+#ZMK_USB
+endif

 menuconfig ZMK_BLE
    bool "BLE (HID over GATT)"
@@ -149,7 +153,6 @@ 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
@@ -159,14 +162,17 @@ if ZMK_BLE
 config ZMK_BLE_EXPERIMENTAL_CONN
    bool "Experimental BLE connection changes"
    help
-      Enables settings that are planned to be default in future versions of ZMK
-      to improve connection stability.
+      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 security settings that are planned to be officially supported in the future.
+      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"
@@ -189,6 +195,10 @@ config BT_CTLR_PHY_2M
 config BT_TINYCRYPT_ECC
    default y if BT_HCI && !BT_CTLR

+config SYSTEM_WORKQUEUE_STACK_SIZE
+    default 4096 if SOC_RP2040
+    default 2048
+
 config ZMK_BLE_THREAD_STACK_SIZE
    int "BLE notify thread stack size"
    default 768
@@ -234,20 +244,19 @@ config BT_PERIPHERAL_PREF_LATENCY
 config BT_PERIPHERAL_PREF_TIMEOUT
    default 400

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

-endif # ZMK_BLE
+#Output Types
+endmenu

-endmenu # Output Types
-
-endmenu # HID
+# HID
+endmenu

 rsource "src/split/Kconfig"

-endmenu # Basic Keyboard Setup
+#Basic Keyboard Setup
+endmenu

 menu "Keymaps"

@@ -265,7 +274,7 @@ config ZMK_KEYMAP_LAYER_NAME_MAX_LEN
    int "Max Layer Name Length"
    default 20

-endif # ZMK_KEYMAP_SETTINGS_STORAGE
+endif

 endmenu # Keymaps

@@ -282,51 +291,67 @@ menuconfig ZMK_RGB_UNDERGLOW

 if ZMK_RGB_UNDERGLOW

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

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

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

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

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

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

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

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

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

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

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

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

 config ZMK_RGB_UNDERGLOW_AUTO_OFF_IDLE
    bool "Turn off RGB underglow when keyboard goes into idle state"
@@ -335,7 +360,8 @@ config ZMK_RGB_UNDERGLOW_AUTO_OFF_USB
    bool "Turn off RGB underglow when USB is disconnected"
    depends on USB_DEVICE_STACK

-endif # ZMK_RGB_UNDERGLOW
+#ZMK_RGB_UNDERGLOW
+endif

 menuconfig ZMK_BACKLIGHT
    bool "LED backlight"
@@ -346,13 +372,16 @@ if ZMK_BACKLIGHT
 config ZMK_BACKLIGHT_BRT_STEP
    int "Brightness step in percent"
    range 1 100
+    default 20

 config ZMK_BACKLIGHT_BRT_START
    int "Default brightness in percent"
    range 1 100
+    default 40

 config ZMK_BACKLIGHT_ON_START
    bool "Default backlight state"
+    default y

 config ZMK_BACKLIGHT_AUTO_OFF_IDLE
    bool "Turn off backlight when keyboard goes into idle state"
@@ -360,11 +389,19 @@ config ZMK_BACKLIGHT_AUTO_OFF_IDLE
 config ZMK_BACKLIGHT_AUTO_OFF_USB
    bool "Turn off backlight when USB is disconnected"

-endif # ZMK_BACKLIGHT
+#ZMK_BACKLIGHT
+endif

-endmenu # Display/LED Options
+#Display/LED Options
+endmenu

-rsource "src/pointing/Kconfig"
+menu "Mouse Options"
+
+config ZMK_MOUSE
+    bool "Enable ZMK mouse emulation"
+
+#Mouse Options
+endmenu

 menu "Power Management"

@@ -386,8 +423,7 @@ config ZMK_BATTERY_REPORTING_FETCH_MODE_LITHIUM_VOLTAGE
    bool "Lithium Voltage"

 endchoice
-
-endif # ZMK_BATTERY_REPORTING
+endif

 config ZMK_IDLE_TIMEOUT
    int "Milliseconds of inactivity before entering idle state (OLED shutoff, etc)"
@@ -409,10 +445,12 @@ config ZMK_IDLE_SLEEP_TIMEOUT
    int "Milliseconds of inactivity before entering deep sleep"
    default 900000

-endif # ZMK_SLEEP
+#ZMK_SLEEP
+endif

 config ZMK_EXT_POWER
    bool "Enable support to control external power output"
+    default y

 config ZMK_PM
    bool
@@ -434,7 +472,7 @@ config ZMK_GPIO_KEY_WAKEUP_TRIGGER
    default y
    depends on DT_HAS_ZMK_GPIO_KEY_WAKEUP_TRIGGER_ENABLED && ZMK_PM_SOFT_OFF

-# Power Management
+#Power Management
 endmenu

 menu "Combo options"
@@ -444,18 +482,14 @@ config ZMK_COMBO_MAX_PRESSED_COMBOS
    default 4

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

 config ZMK_COMBO_MAX_KEYS_PER_COMBO
-    int "Deprecated: Max keys per combo"
-    default 0
-    help
-       Deprecated: This is now auto-calculated based on `key-positions` in devicetree
+    int "Maximum number of keys per combo"
+    default 4

-# Combo options
+#Combo options
 endmenu

 menu "Behavior Options"
@@ -490,7 +524,8 @@ config ZMK_USB_HID_INIT_PRIORITY
    int "USB HID Init Priority"
    default 95

-endif # USB
+#USB
+endif

 if ZMK_BLE || ZMK_SPLIT_BLE

@@ -498,13 +533,11 @@ config ZMK_BLE_INIT_PRIORITY
    int "BLE Init Priority"
    default 50

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

-endmenu # Initialization Priorities
-
-config ZMK_PHYSICAL_LAYOUT_KEY_ROTATION
-    bool "Support rotation of keys in physical layouts"
-    default y
+#Initialization Priorities
+endmenu

 menuconfig ZMK_KSCAN
    bool "ZMK KScan Integration"
@@ -578,7 +611,8 @@ config USB_CDC_ACM_RINGBUF_SIZE
 config LOG_PROCESS_THREAD_STARTUP_DELAY_MS
    default 1000

-endif # ZMK_USB_LOGGING
+#ZMK_USB_LOGGING
+endif

 config ZMK_RTT_LOGGING
    bool "Enable RTT logging to help debug"
@@ -594,7 +628,8 @@ if ZMK_RTT_LOGGING
 config SEGGER_RTT_BUFFER_SIZE_UP
    default 8192

-endif # ZMK_RTT_LOGGING
+#ZMK_RTT_LOGGING
+endif

 if ZMK_USB_LOGGING || ZMK_RTT_LOGGING

@@ -604,9 +639,11 @@ config LOG_BUFFER_SIZE
 config LOG_PROCESS_THREAD_SLEEP_MS
    default 100

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

-endmenu # Logging
+#Logging
+endmenu

 if SETTINGS

@@ -622,17 +659,21 @@ config ZMK_SETTINGS_RESET_ON_START_INIT_PRIORITY
      Initialization priority for the settings reset on start. Must be lower priority/
      higher value than FLASH_INIT_PRIORITY if using the NVS/Flash settings backend.

-endif # ZMK_SETTINGS_RESET_ON_START
+
+endif
+

 config ZMK_SETTINGS_SAVE_DEBOUNCE
    int "Milliseconds to debounce settings saves"
    default 60000

-endif # SETTINGS
+#SETTINGS
+endif

 config ZMK_BATTERY_REPORT_INTERVAL
    depends on ZMK_BATTERY_REPORTING
    int "Battery level report interval in seconds"
+    default 60

 config ZMK_LOW_PRIORITY_WORK_QUEUE
    bool "Work queue for low priority items"
@@ -647,11 +688,13 @@ config ZMK_LOW_PRIORITY_THREAD_PRIORITY
    int "Low priority thread priority"
    default 10

-endif # ZMK_LOW_PRIORITY_WORK_QUEUE
+endif

-endmenu # Advanced
+#Advanced
+endmenu

-endmenu # ZMK
+#ZMK
+endmenu

 config KERNEL_BIN_NAME
    default "zmk"
@@ -696,22 +739,12 @@ module = ZMK
 module-str = zmk
 source "subsys/logging/Kconfig.template.log_config"

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

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

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

 source "Kconfig.zephyr"
--- a/app/Kconfig.behaviors
+++ b/app/Kconfig.behaviors
@@ -51,11 +51,13 @@ 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

@@ -69,7 +71,8 @@ config ZMK_BEHAVIOR_KEY_TOGGLE
 config ZMK_BEHAVIOR_MOUSE_KEY_PRESS
    bool
    default y
-    depends on DT_HAS_ZMK_BEHAVIOR_MOUSE_KEY_PRESS_ENABLED && ZMK_POINTING
+    depends on DT_HAS_ZMK_BEHAVIOR_MOUSE_KEY_PRESS_ENABLED
+    imply ZMK_MOUSE

 config ZMK_BEHAVIOR_STICKY_KEY
    bool
@@ -80,6 +83,7 @@ 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

@@ -90,26 +94,6 @@ config ZMK_BEHAVIOR_SOFT_OFF
    default y
    depends on DT_HAS_ZMK_BEHAVIOR_SOFT_OFF_ENABLED && ZMK_PM_SOFT_OFF

-
-config ZMK_BEHAVIOR_TAP_DANCE
-    bool
-    default y
-    depends on DT_HAS_ZMK_BEHAVIOR_TAP_DANCE_ENABLED
-
-if ZMK_BEHAVIOR_TAP_DANCE
-
-config ZMK_BEHAVIOR_TAP_DANCE_MAX_HELD
-    int "Tap-Dance Max Held"
-    help
-      Max number of simultaneously held taps-dances
-
-endif
-
-config ZMK_BEHAVIOR_INPUT_TWO_AXIS
-    bool
-    default y
-    depends on DT_HAS_ZMK_BEHAVIOR_INPUT_TWO_AXIS_ENABLED && ZMK_POINTING
-
 config ZMK_BEHAVIOR_SENSOR_ROTATE_COMMON
    bool

--- a/app/Kconfig.defaults
+++ b/app/Kconfig.defaults
@@ -1,113 +0,0 @@
-# Copyright (c) 2024 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-config SYSTEM_WORKQUEUE_STACK_SIZE
-    default 2048 if SOC_RP2040
-    default 2048 if ZMK_BLE
-
-# HID
-if ZMK_HID_REPORT_TYPE_HKRO
-
-config ZMK_HID_KEYBOARD_REPORT_SIZE
-    default 6
-
-endif
-
-config ZMK_HID_CONSUMER_REPORT_SIZE
-    default 6
-
-# Behaviors
-
-if ZMK_BEHAVIOR_HOLD_TAP
-
-config ZMK_BEHAVIOR_HOLD_TAP_MAX_HELD
-    default 10
-
-config ZMK_BEHAVIOR_HOLD_TAP_MAX_CAPTURED_EVENTS
-    default 40
-
-endif
-
-if ZMK_BEHAVIOR_STICKY_KEY
-
-config ZMK_BEHAVIOR_STICKY_KEY_MAX_HELD
-    default 10
-
-endif
-
-if ZMK_BEHAVIOR_TAP_DANCE
-
-config ZMK_BEHAVIOR_TAP_DANCE_MAX_HELD
-    default 10
-
-endif
-
-# Underglow
-if ZMK_RGB_UNDERGLOW
-
-# This default value cuts down on tons of excess .conf files, if you're using GPIO, manually disable this
-config SPI
-    default y
-
-config ZMK_RGB_UNDERGLOW_EXT_POWER
-    default y
-
-config ZMK_RGB_UNDERGLOW_BRT_MIN
-    default 0
-
-config ZMK_RGB_UNDERGLOW_BRT_MAX
-    default 100
-
-config ZMK_RGB_UNDERGLOW_HUE_STEP
-    default 10
-
-config ZMK_RGB_UNDERGLOW_SAT_STEP
-    default 10
-
-config ZMK_RGB_UNDERGLOW_BRT_STEP
-    default 10
-
-config ZMK_RGB_UNDERGLOW_HUE_START
-    default 0
-
-config ZMK_RGB_UNDERGLOW_SAT_START
-    default 100
-
-config ZMK_RGB_UNDERGLOW_BRT_START
-    default ZMK_RGB_UNDERGLOW_BRT_MAX
-
-config ZMK_RGB_UNDERGLOW_SPD_START
-    default 3
-
-config ZMK_RGB_UNDERGLOW_EFF_START
-    default 0
-
-config ZMK_RGB_UNDERGLOW_ON_START
-    default y
-
-endif # ZMK_RGB_UNDERGLOW
-
-# Backlight
-if ZMK_BACKLIGHT
-
-config ZMK_BACKLIGHT_BRT_STEP
-    default 20
-
-config ZMK_BACKLIGHT_BRT_START
-    default 40
-
-config ZMK_BACKLIGHT_ON_START
-    default y
-
-endif # ZMK_BACKLIGHT
-
-# Ext_power
-config ZMK_EXT_POWER
-    default y
-
-# Battery
-config ZMK_BATTERY_REPORT_INTERVAL
-    default 60
-
-# Imports
-rsource "src/split/Kconfig.defaults"
--- a/app/VERSION
+++ b/app/VERSION
@@ -1,13 +0,0 @@
-# x-release-please-start-major
-VERSION_MAJOR = 0
-# x-release-please-end
-
-# x-release-please-start-minor
-VERSION_MINOR = 3
-# x-release-please-end
-
-# x-release-please-start-patch
-PATCHLEVEL = 0
-# x-release-please-end
-
-VERSION_TWEAK = 0
--- a/app/boards/aliases.cmake
+++ b/app/boards/aliases.cmake
@@ -1,2 +0,0 @@
-# defines board aliases for shorter names (or for renaming boards)
-set(mikoto_520_BOARD_ALIAS "mikoto")
--- a/app/boards/arm/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.dtsi
+++ b/app/boards/arm/adv360pro/adv360pro.dtsi
@@ -11,13 +11,8 @@
 #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";
@@ -26,14 +21,14 @@
        zephyr,code-partition = &code_partition;
        zephyr,sram = &sram0;
        zephyr,flash = &flash0;
+        zmk,kscan = &kscan0;
        zmk,backlight = &backlight;
        zmk,battery = &vbatt;
-        zmk,physical-layout = &physical_layout0;
-        zmk,kscan = &kscan0;
+        zmk,matrix-transform = &default_transform;
        zmk,underglow = &led_strip;
    };

-    matrix_transform0: keymap_transform_0 {
+    default_transform: keymap_transform_0 {
        compatible = "zmk,matrix-transform";
        columns = <20>;
        rows = <5>;
--- a/app/boards/arm/adv360pro/adv360pro.zmk.yml
+++ b/app/boards/arm/adv360pro/adv360pro.zmk.yml
@@ -8,7 +8,6 @@ features:
  - keys
  - underglow
  - backlight
-  - studio
 outputs:
  - usb
  - ble
--- a/app/boards/arm/adv360pro/adv360pro_right.dts
+++ b/app/boards/arm/adv360pro/adv360pro_right.dts
@@ -36,6 +36,6 @@
    };
 };

-&matrix_transform0 {
+&default_transform {
    col-offset = <10>;
 };
--- 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,23 +16,11 @@
    chosen {
        zephyr,sram = &sram0;
        zephyr,flash = &flash0;
+        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";

        input-gpios
--- a/app/boards/arm/bt60/bt60.dtsi
+++ b/app/boards/arm/bt60/bt60.dtsi
@@ -17,6 +17,8 @@
        zephyr,sram = &sram0;
        zephyr,flash = &flash0;
        zmk,battery = &vbatt;
+        zmk,kscan = &kscan0;
+        zmk,matrix-transform = &default_transform;
    };

    sensors: sensors {
--- 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,6 +66,19 @@
        >;
    };

+    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;
@@ -103,19 +112,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
    };

@@ -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  |  -  |  =  |BSPC| 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 {
@@ -60,7 +60,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  |  -  |  =  |   BSPC   | 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/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
--- 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
--- 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
--- 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/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,7 @@
        zephyr,flash = &flash0;
        zmk,kscan = &kscan0;
        zmk,display = &epd;
-        zmk,physical-layout = &foostan_corne_6col_layout;
+        zmk,matrix-transform = &default_transform;
    };

    default_transform: keymap_transform_0 {
--- 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;
    };
 };

--- 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_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/widgets/battery_status.c
+++ b/app/boards/arm/corneish_zen/widgets/battery_status.c
@@ -68,7 +68,7 @@ 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){
+    return (struct battery_status_state) {
        .level = (ev != NULL) ? ev->state_of_charge : zmk_battery_state_of_charge(),
 #if IS_ENABLED(CONFIG_USB_DEVICE_STACK)
        .usb_present = zmk_usb_is_powered(),
--- 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_name(index)};
 }

 ZMK_DISPLAY_WIDGET_LISTENER(widget_layer_status, struct layer_status_state, layer_status_update_cb,
--- a/app/boards/arm/ferris/ferris_rev02.dts
+++ b/app/boards/arm/ferris/ferris_rev02.dts
@@ -13,7 +13,7 @@
 #include <layouts/cuddlykeyboards/ferris.dtsi>

 &cuddlykeyboards_ferris_layout {
-    transform = <&matrix_transform0>;
+    transform = <&transform>;
 };

 / {
@@ -23,14 +23,13 @@
    chosen {
        zephyr,sram = &sram0;
        zephyr,flash = &flash0;
-        zmk,kscan = &kscan0;
-        zmk,physical-layout = &cuddlykeyboards_ferris_layout;
+        zmk,kscan = &kscan;
        /* 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,7 +42,7 @@
        >;
    };

-    kscan0: kscan0 {
+    kscan: kscan {
        compatible = "zmk,kscan-composite";
        rows = <4>;
        columns = <10>;
@@ -54,7 +53,7 @@

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

--- a/app/boards/arm/glove80/Kconfig.defconfig
+++ b/app/boards/arm/glove80/Kconfig.defconfig
@@ -6,7 +6,7 @@ if BOARD_GLOVE80_LH
 config BOARD
    default "glove80 lh"

-config ZMK_SPLIT_ROLE_CENTRAL
+config ZMK_SPLIT_BLE_ROLE_CENTRAL
    default y

 endif # BOARD_GLOVE80_LH
--- 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/app/boards/arm/glove80/glove80.dtsi
+++ b/app/boards/arm/glove80/glove80.dtsi
@@ -7,23 +7,17 @@
 #include <nordic/nrf52840_qiaa.dtsi>

 #include <dt-bindings/zmk/matrix_transform.h>
-#include "glove80-layouts.dtsi"
-
-&physical_layout0 {
-    transform = <&matrix_transform0>;
-};
-

 / {
    chosen {
        zmk,kscan = &kscan0;
-        zmk,physical-layout = &physical_layout0;
+        zmk,matrix-transform = &default_transform;
        zephyr,code-partition = &code_partition;
        zephyr,sram = &sram0;
        zephyr,flash = &flash0;
    };

-    matrix_transform0: keymap_transform_0 {
+    default_transform: keymap_transform_0 {
        compatible = "zmk,matrix-transform";
        columns = <14>;
        rows = <6>;
@@ -45,6 +39,7 @@
        debounce-press-ms = <4>;
        debounce-release-ms = <20>;
    };
+
 };

 &adc {
--- a/app/boards/arm/glove80/glove80.zmk.yml
+++ b/app/boards/arm/glove80/glove80.zmk.yml
@@ -8,7 +8,6 @@ features:
  - keys
  - underglow
  - backlight
-  - studio
 outputs:
  - usb
  - ble
--- a/app/boards/arm/glove80/glove80_lh.dts
+++ b/app/boards/arm/glove80/glove80_lh.dts
@@ -36,21 +36,6 @@
    vbatt: vbatt {
        compatible = "zmk,battery-nrf-vddh";
    };
-
-    glove80_ext: connector {
-        compatible = "moergo,glove80-ext";
-        #gpio-cells = <2>;
-        gpio-map-mask = <0xffffffff 0xffffffc0>;
-        gpio-map-pass-thru = <0 0x3f>;
-        gpio-map
-            = <1 0 &gpio0 22 0>     /* EXT1 */
-            , <2 0 &gpio0 21 0>     /* EXT2 */
-            , <3 0 &gpio0 24 0>     /* EXT3 */
-            , <4 0 &gpio0 20 0>     /* EXT4 */
-            , <5 0 &gpio0 25 0>     /* EXT5 */
-            , <6 0 &gpio1 00 0>     /* EXT6 */
-            ;
-    };
 };

 &spi3 {
--- a/app/boards/arm/glove80/glove80_rh.dts
+++ b/app/boards/arm/glove80/glove80_rh.dts
@@ -37,21 +37,6 @@
    vbatt: vbatt {
        compatible = "zmk,battery-nrf-vddh";
    };
-
-    glove80_ext: connector {
-        compatible = "moergo,glove80-ext";
-        #gpio-cells = <2>;
-        gpio-map-mask = <0xffffffff 0xffffffc0>;
-        gpio-map-pass-thru = <0 0x3f>;
-        gpio-map
-            = <1 0 &gpio0 21 0>     /* EXT1 */
-            , <2 0 &gpio0 24 0>     /* EXT2 */
-            , <3 0 &gpio0 20 0>     /* EXT3 */
-            , <4 0 &gpio0 25 0>     /* EXT4 */
-            , <5 0 &gpio0 22 0>     /* EXT5 */
-            , <6 0 &gpio1 00 0>     /* EXT6 */
-            ;
-    };
 };

 &spi3 {
@@ -94,7 +79,7 @@
 };

 /* For right hand, the columns are offset by 7 */
-&matrix_transform0 {
+&default_transform {
    col-offset = <7>;
 };

--- a/app/boards/arm/kbdfans_tofu65/kbdfans_tofu65_v2.dts
+++ b/app/boards/arm/kbdfans_tofu65/kbdfans_tofu65_v2.dts
@@ -8,8 +8,6 @@
 #include <rpi_pico/rp2040.dtsi>
 #include <dt-bindings/zmk/matrix_transform.h>

-#include <layouts/common/65percent/ansi.dtsi>
-
 / {

    chosen {
@@ -17,7 +15,7 @@
        zephyr,flash = &flash0;
        zephyr,code-partition = &code_partition;
        zmk,kscan = &kscan0;
-        zmk,physical-layout = &layout_65_ansi;
+        zmk,matrix-transform = &default_transform;
    };

    xtal_clk: xtal-clk {
@@ -117,6 +115,3 @@ zephyr_udc0: &usbd {
    status = "okay";
 };

-&layout_65_ansi {
-    transform = <&default_transform>;
-};
--- a/app/boards/arm/mikoto/Kconfig
+++ b/app/boards/arm/mikoto/Kconfig
@@ -2,17 +2,17 @@ config BOARD_ENABLE_DCDC
    bool "Enable DCDC mode"
    select SOC_DCDC_NRF52X
    default y
-    depends on (BOARD_MIKOTO)
+    depends on (BOARD_MIKOTO_520)

 config BOARD_ENABLE_DCDC_HV
    bool "High voltage DCDC converter"
    select SOC_DCDC_NRF52X_HV
-    default n
-    depends on (BOARD_MIKOTO)
+    default y
+    depends on (BOARD_MIKOTO_520)

 choice BOARD_MIKOTO_CHARGER_CURRENT
    prompt "Charge current to supply to attached batteries"
-    depends on (BOARD_MIKOTO)
+    depends on (BOARD_MIKOTO_520)

 config BOARD_MIKOTO_CHARGER_CURRENT_40MA
    bool "40mA charge current, for battery capacity 40mAh or higher"
@@ -32,4 +32,4 @@ config BOARD_MIKOTO_CHARGER_CURRENT_350MA
 config BOARD_MIKOTO_CHARGER_CURRENT_NONE
    bool "Disable charge current"

-endchoice
+endchoice
--- a/app/boards/arm/mikoto/Kconfig.board
+++ b/app/boards/arm/mikoto/Kconfig.board
@@ -3,6 +3,6 @@
 # Copyright (c) 2020 The ZMK Contributors
 # SPDX-License-Identifier: MIT

-config BOARD_MIKOTO
-    bool "mikoto"
+config BOARD_MIKOTO_520
+    bool "mikoto_520"
    depends on SOC_NRF52840_QIAA
--- a/app/boards/arm/mikoto/Kconfig.defconfig
+++ b/app/boards/arm/mikoto/Kconfig.defconfig
@@ -3,7 +3,7 @@
 # Copyright (c) 2020 The ZMK Contributors
 # SPDX-License-Identifier: MIT

-if BOARD_MIKOTO
+if BOARD_MIKOTO_520

 config BOARD
    default "mikoto"
@@ -25,4 +25,4 @@ choice BOARD_MIKOTO_CHARGER_CURRENT
    default BOARD_MIKOTO_CHARGER_CURRENT_100MA
 endchoice

-endif # BOARD_MIKOTO
+endif # BOARD_MIKOTO_520
--- a/app/boards/arm/mikoto/arduino_pro_micro_pins_v5.dtsi
+++ b/app/boards/arm/mikoto/arduino_pro_micro_pins_v5.dtsi
--- a/app/boards/arm/mikoto/arduino_pro_micro_pins_v6.dtsi
+++ b/app/boards/arm/mikoto/arduino_pro_micro_pins_v6.dtsi
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2020 The ZMK Contributors
- *
- * SPDX-License-Identifier: MIT
- */
-
-
-/ {
-    pro_micro: connector {
-        compatible = "arduino-pro-micro";
-        #gpio-cells = <2>;
-        gpio-map-mask = <0xffffffff 0xffffffc0>;
-        gpio-map-pass-thru = <0 0x3f>;
-        gpio-map
-            = <0 0 &gpio0 4 0>      /* D0 */
-            , <1 0 &gpio0 8 0>      /* D1 */
-            , <2 0 &gpio0 17 0>     /* D2 */
-            , <3 0 &gpio0 20 0>     /* D3 */
-            , <4 0 &gpio0 22 0>     /* D4/A6 */
-            , <5 0 &gpio0 24 0>     /* D5 */
-            , <6 0 &gpio1 8 0>      /* D6/A7 */
-            , <7 0 &gpio1 2 0>      /* D7 */
-            , <8 0 &gpio1 4 0>      /* D8/A8 */
-            , <9 0 &gpio1 6 0>      /* D9/A9 */
-            , <10 0 &gpio0 9 0> /* D10/A10 */
-            , <16 0 &gpio0 10 0>    /* D16 */
-            , <14 0 &gpio1 13 0>    /* D14 */
-            , <15 0 &gpio0 2 0> /* D15 */
-            , <18 0 &gpio0 29 0>    /* D18/A0 */
-            , <19 0 &gpio0 31 0>    /* D19/A1 */
-            , <20 0 &gpio0 25 0>    /* D20/A2 */
-            , <21 0 &gpio0 11 0>    /* D21/A3 */
-            ;
-    };
-
-    pro_micro_a: connector_a {
-        compatible = "arduino-pro-micro";
-        #gpio-cells = <2>;
-        gpio-map-mask = <0xffffffff 0xffffffc0>;
-        gpio-map-pass-thru = <0 0x3f>;
-        gpio-map
-            = <0 0 &gpio0 29 0> /* D18/A0 */
-            , <1 0 &gpio0 31 0> /* D19/A1 */
-            , <2 0 &gpio0 25 0> /* D20/A2 */
-            , <3 0 &gpio0 11 0> /* D21/A3 */
-            , <6 0 &gpio0 22 0> /* D4/A6 */
-            , <7 0 &gpio1 8 0>  /* D6/A7 */
-            , <8 0 &gpio1 4 0>  /* D8/A8 */
-            , <9 0 &gpio1 6 0>  /* D9/A9 */
-            , <10 0 &gpio0 9 0> /* D10/A10 */
-            ;
-    };
-};
-
-
-pro_micro_d: &pro_micro {};
-pro_micro_i2c: &i2c0 {};
-pro_micro_spi: &spi0 {};
-pro_micro_serial: &uart0 {};
--- a/app/boards/arm/mikoto/mikoto_520-pinctrl.dtsi
+++ b/app/boards/arm/mikoto/mikoto_520-pinctrl.dtsi
@@ -17,7 +17,7 @@
    uart0_sleep: uart0_sleep {
        group1 {
            psels = <NRF_PSEL(UART_RX, 0, 4)>,
-                    <NRF_PSEL(UART_TX, 0, 8)>;
+                <NRF_PSEL(UART_TX, 0, 8)>;
            low-power-enable;
        };
    };
@@ -25,14 +25,14 @@
    i2c0_default: i2c0_default {
        group1 {
            psels = <NRF_PSEL(TWIM_SDA, 0, 17)>,
-                    <NRF_PSEL(TWIM_SCL, 0, 20)>;
+                <NRF_PSEL(TWIM_SCL, 0, 20)>;
        };
    };

    i2c0_sleep: i2c0_sleep {
        group1 {
            psels = <NRF_PSEL(TWIM_SDA, 0, 17)>,
-                    <NRF_PSEL(TWIM_SCL, 0, 20)>;
+                <NRF_PSEL(TWIM_SCL, 0, 20)>;
            low-power-enable;
        };
    };
--- a/app/boards/arm/mikoto/mikoto_520.dts
+++ b/app/boards/arm/mikoto/mikoto_520.dts
@@ -6,6 +6,8 @@

 /dts-v1/;
 #include <nordic/nrf52840_qiaa.dtsi>
+#include "arduino_pro_micro_pins.dtsi"
+#include "mikoto_520-pinctrl.dtsi"

 / {
    model = "mikoto";
--- a/app/boards/arm/mikoto/mikoto_520.yaml
+++ b/app/boards/arm/mikoto/mikoto_520.yaml
@@ -1,5 +1,5 @@
-identifier: mikoto
-name: mikoto
+identifier: mikoto_520
+name: mikoto_520
 type: mcu
 arch: arm
 toolchain:
--- a/app/boards/arm/mikoto/mikoto_520.zmk.yml
+++ b/app/boards/arm/mikoto/mikoto_520.zmk.yml
@@ -1,6 +1,6 @@
 file_format: "1"
-id: mikoto
-name: Mikoto
+id: mikoto_520
+name: Mikoto 5.20
 type: board
 arch: arm
 outputs:
@@ -8,9 +8,3 @@ outputs:
  - ble
 url: https://github.com/zhiayang/mikoto
 exposes: [pro_micro]
-revisions:
-  - "5.20"
-  - "6.1"
-  - "6.3"
-  - "7.2"
-default_revision: "5.20"
--- a/app/boards/arm/mikoto/mikoto_520_defconfig
+++ b/app/boards/arm/mikoto/mikoto_520_defconfig
@@ -2,10 +2,11 @@

 CONFIG_SOC_SERIES_NRF52X=y
 CONFIG_SOC_NRF52840_QIAA=y
-CONFIG_BOARD_MIKOTO=y
+CONFIG_BOARD_MIKOTO_520=y

 # Enable MPU
 CONFIG_ARM_MPU=y
+
 CONFIG_PINCTRL=y

 # enable GPIO
--- a/app/boards/arm/mikoto/mikoto_5_20_0.overlay
+++ b/app/boards/arm/mikoto/mikoto_5_20_0.overlay
@@ -1,8 +0,0 @@
-/*
- * Copyright (c) 2023 The ZMK Contributors
- *
- * SPDX-License-Identifier: MIT
- */
-
-#include "mikoto-pinctrl.dtsi"
-#include "arduino_pro_micro_pins_v5.dtsi"
--- a/app/boards/arm/mikoto/mikoto_6_1_0.overlay
+++ b/app/boards/arm/mikoto/mikoto_6_1_0.overlay
@@ -1,8 +0,0 @@
-/*
- * Copyright (c) 2023 The ZMK Contributors
- *
- * SPDX-License-Identifier: MIT
- */
-
-#include "mikoto-pinctrl.dtsi"
-#include "arduino_pro_micro_pins_v6.dtsi"
--- a/app/boards/arm/mikoto/mikoto_7_2_0.conf
+++ b/app/boards/arm/mikoto/mikoto_7_2_0.conf
@@ -1,2 +0,0 @@
-CONFIG_I2C=y
-CONFIG_ZMK_MAX17048=y
--- a/app/boards/arm/mikoto/mikoto_7_2_0.overlay
+++ b/app/boards/arm/mikoto/mikoto_7_2_0.overlay
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2023 The ZMK Contributors
- *
- * SPDX-License-Identifier: MIT
- */
-
-#include "mikoto-pinctrl.dtsi"
-#include "arduino_pro_micro_pins_v6.dtsi"
-
-&pinctrl {
-    i2c1_default: i2c1_default {
-        group1 {
-            psels = <NRF_PSEL(TWIM_SDA, 0, 23)>,
-                    <NRF_PSEL(TWIM_SCL, 0, 19)>;
-            bias-pull-up;
-        };
-    };
-
-    i2c1_sleep: i2c1_sleep {
-        group1 {
-            psels = <NRF_PSEL(TWIM_SDA, 0, 23)>,
-                    <NRF_PSEL(TWIM_SCL, 0, 19)>;
-            low-power-enable;
-            bias-pull-up;
-        };
-    };
-};
-
-&i2c1 {
-    status = "okay";
-    compatible = "nordic,nrf-twi";
-    pinctrl-0 = <&i2c1_default>;
-    pinctrl-1 = <&i2c1_sleep>;
-    pinctrl-names = "default", "sleep";
-
-    builtin_fuel_gauge: max17048@36 {
-        compatible = "zmk,maxim-max17048";
-        status = "okay";
-        reg = <0x36>;
-    };
-};
-
-/ {
-    chosen {
-        zmk,battery = &builtin_fuel_gauge;
-    };
-};
--- a/app/boards/arm/mikoto/pinmux.c
+++ b/app/boards/arm/mikoto/pinmux.c
@@ -13,7 +13,7 @@

 static int pinmux_mikoto_init(void) {

-#if CONFIG_BOARD_MIKOTO
+#if CONFIG_BOARD_MIKOTO_520
    const struct device *p0 = DEVICE_DT_GET(DT_NODELABEL(gpio0));
    const struct device *p1 = DEVICE_DT_GET(DT_NODELABEL(gpio1));
 #if CONFIG_BOARD_MIKOTO_CHARGER_CURRENT_40MA
--- a/app/boards/arm/mikoto/revision.cmake
+++ b/app/boards/arm/mikoto/revision.cmake
@@ -1,7 +0,0 @@
-board_check_revision(FORMAT MAJOR.MINOR.PATCH
-                     DEFAULT_REVISION 5.20.0
-                     VALID_REVISIONS
-                     5.20.0         # first public release
-                     6.1.0  6.3.0   # incompatible pinout change from v5+
-                     7.2.0          # addition of MAX17048; compatible pinout with v6+
-)
--- a/app/boards/arm/nice60/nice60.dts
+++ b/app/boards/arm/nice60/nice60.dts
@@ -10,8 +10,6 @@
 #include <dt-bindings/led/led.h>
 #include <dt-bindings/zmk/matrix_transform.h>

-#include <layouts/common/60percent/ansi.dtsi>
-
 #include "nice60-pinctrl.dtsi"

 / {
@@ -24,7 +22,7 @@
        zephyr,flash = &flash0;
        zmk,battery = &vbatt;
        zmk,kscan = &kscan0;
-        zmk,physical-layout = &layout_60_ansi;
+        zmk,matrix-transform = &default_transform;
        zmk,underglow = &led_strip;
    };

@@ -171,7 +169,3 @@ zephyr_udc0: &usbd {
        };
    };
 };
-
-&layout_60_ansi {
-    transform = <&default_transform>;
-};
--- a/app/boards/arm/nice60/nice60.zmk.yml
+++ b/app/boards/arm/nice60/nice60.zmk.yml
@@ -6,7 +6,6 @@ arch: arm
 features:
  - keys
  - underglow
-  - studio
 outputs:
  - usb
  - ble
--- a/app/boards/arm/nice_nano/Kconfig
+++ b/app/boards/arm/nice_nano/Kconfig
@@ -9,5 +9,5 @@ config BOARD_ENABLE_DCDC
 config BOARD_ENABLE_DCDC_HV
    bool "High voltage DCDC converter"
    select SOC_DCDC_NRF52X_HV
-    default n
+    default y
    depends on (BOARD_NICE_NANO_V2)
--- a/app/boards/arm/planck/planck_rev6.dts
+++ b/app/boards/arm/planck/planck_rev6.dts
@@ -9,11 +9,6 @@
 #include <st/f3/stm32f303c(b-c)tx-pinctrl.dtsi>
 #include <dt-bindings/zmk/matrix_transform.h>

-#include <layouts/common/ortho_4x12/1x2u.dtsi>
-#include <layouts/common/ortho_4x12/2x2u.dtsi>
-#include <layouts/common/ortho_4x12/all1u.dtsi>
-
-
 / {
    model = "Plack PCD, rev6";
    compatible = "planck,rev6", "st,stm32f303";
@@ -22,7 +17,7 @@
        zephyr,sram = &sram0;
        zephyr,flash = &flash0;
        zmk,kscan = &kscan0;
-        zmk,physical-layout = &layout_ortho_4x12_all1u;
+        zmk,matrix-transform = &layout_grid_transform;
    };

    kscan0: kscan {
@@ -142,15 +137,3 @@ zephyr_udc0: &usb {
        };
    };
 };
-
-&layout_ortho_4x12_all1u {
-    transform = <&layout_grid_transform>;
-};
-
-&layout_ortho_4x12_1x2u {
-    transform = <&layout_mit_transform>;
-};
-
-&layout_ortho_4x12_2x2u {
-    transform = <&layout_2x2u_transform>;
-};
--- a/app/boards/arm/preonic/preonic_rev3.dts
+++ b/app/boards/arm/preonic/preonic_rev3.dts
@@ -9,9 +9,6 @@
 #include <st/f3/stm32f303c(b-c)tx-pinctrl.dtsi>
 #include <dt-bindings/zmk/matrix_transform.h>

-#include <layouts/common/ortho_5x12/1x2u.dtsi>
-#include <layouts/common/ortho_5x12/2x2u.dtsi>
-#include <layouts/common/ortho_5x12/all1u.dtsi>

 / {
    model = "Preonic PCD, rev3";
@@ -21,7 +18,7 @@
        zephyr,sram = &sram0;
        zephyr,flash = &flash0;
        zmk,kscan = &kscan0;
-        zmk,physical-layout = &layout_ortho_5x12_all1u;
+        zmk,matrix-transform = &layout_grid_transform;
    };

    kscan0: kscan_0 {
@@ -134,15 +131,3 @@ zephyr_udc0: &usb {
        };
    };
 };
-
-&layout_ortho_5x12_all1u {
-    transform = <&layout_grid_transform>;
-};
-
-&layout_ortho_5x12_1x2u {
-    transform = <&layout_mit_transform>;
-};
-
-&layout_ortho_5x12_2x2u {
-    transform = <&layout_2x2u_transform>;
-};
--- a/app/boards/arm/preonic/preonic_rev3.keymap
+++ b/app/boards/arm/preonic/preonic_rev3.keymap
@@ -13,6 +13,7 @@
 #define RAISE   2

 / {
+    chosen { zmk,matrix-transform = &layout_grid_transform; };
    keymap {
        compatible = "zmk,keymap";
        default_layer {
--- a/app/boards/arm/seeeduino_xiao/seeeduino_xiao.zmk.yml
+++ b/app/boards/arm/seeeduino_xiao/seeeduino_xiao.zmk.yml
@@ -1,6 +1,6 @@
 file_format: "1"
 id: seeeduino_xiao
-name: Seeed Studio XIAO SAMD21
+name: Seeeduino XIAO
 type: board
 arch: arm
 outputs:
--- a/app/boards/arm/seeeduino_xiao_ble/seeeduino_xiao_ble.zmk.yml
+++ b/app/boards/arm/seeeduino_xiao_ble/seeeduino_xiao_ble.zmk.yml
@@ -1,6 +1,6 @@
 file_format: "1"
 id: seeeduino_xiao_ble
-name: Seeed Studio XIAO nRF52840
+name: Seeeduino XIAO BLE
 type: board
 arch: arm
 outputs:
--- a/app/boards/arm/seeeduino_xiao_rp2040/seeeduino_xiao_rp2040.zmk.yml
+++ b/app/boards/arm/seeeduino_xiao_rp2040/seeeduino_xiao_rp2040.zmk.yml
@@ -1,6 +1,6 @@
 file_format: "1"
 id: seeeduino_xiao_rp2040
-name: Seeed Studio XIAO RP2040
+name: Seeeduino XIAO RP2040
 type: board
 arch: arm
 outputs:
--- a/app/boards/interconnects/seeed_xiao/seeed_xiao.zmk.yml
+++ b/app/boards/interconnects/seeed_xiao/seeed_xiao.zmk.yml
@@ -5,9 +5,9 @@ type: interconnect
 url: https://wiki.seeedstudio.com/Seeeduino-XIAO/
 manufacturer: Seeed
 description: |
-  The Seeed Studio XIAO is a popular smaller format micro-controller, that has gained popularity as an alternative
+  The Seeed(uino) XIAO is a popular smaller format micro-controller, that has gained popularity as an alternative
  to the SparkFun Pro Micro. Since its creation, several pin compatible controllers, such
-  as the Seeed Studio XIAO nRF52840 (also known as XIAO BLE), Adafruit QT Py and Adafruit QT Py RP2040, have become available.
+  as the Seeeduino XIAO BLE, Adafruit QT Py and Adafruit QT Py RP2040, have become available.
 node_labels:
  gpio: xiao_d
  i2c: xiao_i2c
--- a/app/boards/nrf52840dongle_nrf52840.conf
+++ b/app/boards/nrf52840dongle_nrf52840.conf
@@ -1,12 +0,0 @@
-# Copyright (c) 2025 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-CONFIG_ZMK_BLE=y
-CONFIG_ZMK_USB=y
-
-CONFIG_MPU_ALLOW_FLASH_WRITE=y
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
-CONFIG_FLASH=y
-CONFIG_FLASH_PAGE_LAYOUT=y
-CONFIG_FLASH_MAP=y
--- a/app/boards/rpi_pico.conf
+++ b/app/boards/rpi_pico.conf
@@ -3,10 +3,3 @@ CONFIG_SERIAL=n
 CONFIG_UART_CONSOLE=n
 CONFIG_UART_INTERRUPT_DRIVEN=n
 CONFIG_ZMK_USB=y
-
-CONFIG_MPU_ALLOW_FLASH_WRITE=y
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
-CONFIG_FLASH=y
-CONFIG_FLASH_PAGE_LAYOUT=y
-CONFIG_FLASH_MAP=y
--- a/app/boards/rpi_pico.overlay
+++ b/app/boards/rpi_pico.overlay
@@ -1,15 +0,0 @@
-
-&uart0 { status = "disabled"; };
-
-&code_partition {
-    reg = <0x100 (DT_SIZE_M(2) - 0x100 - DT_SIZE_K(512))>;
-};
-
-&flash0 {
-    partitions {
-        storage_partition: partition@180000 {
-            reg = <0x180000 DT_SIZE_K(512)>;
-            read-only;
-        };
-    };
-};
--- a/app/boards/seeeduino_xiao_ble.overlay
+++ b/app/boards/seeeduino_xiao_ble.overlay
@@ -19,8 +19,6 @@
    };
 };

-&xiao_serial { status = "disabled"; };
-
 &adc {
    status = "okay";
 };
--- a/app/boards/shields/a_dux/a_dux-layouts.dtsi
+++ b/app/boards/shields/a_dux/a_dux-layouts.dtsi
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2025 The ZMK Contributors
- *
- * SPDX-License-Identifier: MIT
- */
-#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  133       0     0     0>
-            , <&key_physical_attrs 100 100  100   31       0     0     0>
-            , <&key_physical_attrs 100 100  200    0       0     0     0>
-            , <&key_physical_attrs 100 100  300   28       0     0     0>
-            , <&key_physical_attrs 100 100  400   42       0     0     0>
-            , <&key_physical_attrs 100 100  800   42       0     0     0>
-            , <&key_physical_attrs 100 100  900   28       0     0     0>
-            , <&key_physical_attrs 100 100 1000    0       0     0     0>
-            , <&key_physical_attrs 100 100 1100   31       0     0     0>
-            , <&key_physical_attrs 100 100 1200  133       0     0     0>
-            , <&key_physical_attrs 100 100    0  233       0     0     0>
-            , <&key_physical_attrs 100 100  100  131       0     0     0>
-            , <&key_physical_attrs 100 100  200  100       0     0     0>
-            , <&key_physical_attrs 100 100  300  128       0     0     0>
-            , <&key_physical_attrs 100 100  400  142       0     0     0>
-            , <&key_physical_attrs 100 100  800  142       0     0     0>
-            , <&key_physical_attrs 100 100  900  128       0     0     0>
-            , <&key_physical_attrs 100 100 1000  100       0     0     0>
-            , <&key_physical_attrs 100 100 1100  131       0     0     0>
-            , <&key_physical_attrs 100 100 1200  233       0     0     0>
-            , <&key_physical_attrs 100 100    0  333       0     0     0>
-            , <&key_physical_attrs 100 100  100  231       0     0     0>
-            , <&key_physical_attrs 100 100  200  200       0     0     0>
-            , <&key_physical_attrs 100 100  300  228       0     0     0>
-            , <&key_physical_attrs 100 100  400  242       0     0     0>
-            , <&key_physical_attrs 100 100  800  242       0     0     0>
-            , <&key_physical_attrs 100 100  900  228       0     0     0>
-            , <&key_physical_attrs 100 100 1000  200       0     0     0>
-            , <&key_physical_attrs 100 100 1100  231       0     0     0>
-            , <&key_physical_attrs 100 100 1200  333       0     0     0>
-            , <&key_physical_attrs 100 100  400  375       0     0     0>
-            , <&key_physical_attrs 100 100  500  400       0     0     0>
-            , <&key_physical_attrs 100 100  700  400       0     0     0>
-            , <&key_physical_attrs 100 100  800  375       0     0     0>
-            ;
-    };
-};
--- a/app/boards/shields/a_dux/a_dux.dtsi
+++ b/app/boards/shields/a_dux/a_dux.dtsi
@@ -5,18 +5,12 @@
 */

 #include <dt-bindings/zmk/matrix_transform.h>
-#include "a_dux-layouts.dtsi"
-
-&physical_layout0 {
-    transform = <&default_transform>;
-};
-

 / {

    chosen {
        zmk,kscan = &kscan0;
-        zmk,physical-layout = &physical_layout0;
+        zmk,matrix-transform = &default_transform;
    };

    default_transform: keymap_transform_0 {
@@ -55,4 +49,5 @@
            <&pro_micro  9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
        ;
    };
+
 };
--- a/app/boards/shields/boardsource5x12/boardsource5x12.overlay
+++ b/app/boards/shields/boardsource5x12/boardsource5x12.overlay
@@ -6,25 +6,9 @@

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

-#include <layouts/common/ortho_5x12/all1u.dtsi>
-
 / {
    chosen {
        zmk,kscan = &kscan0;
-        zmk,physical-layout = &layout_ortho_5x12_all1u;
-    };
-
-    matrix_transform_50_all1u: keymap_transform_0 {
-        compatible = "zmk,matrix-transform";
-        columns = <12>;
-        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(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(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(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11)
-            RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5) RC(4,6) RC(4,7) RC(4,8) RC(4,9) RC(4,10) RC(4,11)
-            >;
    };

    kscan0: kscan {
@@ -56,8 +40,4 @@
            , <&pro_micro 6 GPIO_ACTIVE_HIGH>
            ;
    };
-};
-
-&layout_ortho_5x12_all1u {
-    transform = <&matrix_transform_50_all1u>;
-};
+};
--- a/app/boards/shields/boardsource5x12/boardsource5x12.zmk.yml
+++ b/app/boards/shields/boardsource5x12/boardsource5x12.zmk.yml
@@ -6,4 +6,3 @@ url: https://boardsource.xyz/store/5ecb802c86879c9a0c22db61
 requires: [pro_micro]
 features:
  - keys
-  - studio
--- a/app/boards/shields/contra/contra.overlay
+++ b/app/boards/shields/contra/contra.overlay
@@ -4,26 +4,9 @@
 * SPDX-License-Identifier: MIT
 */

-#include <dt-bindings/zmk/matrix_transform.h>
-
-#include <layouts/common/ortho_4x12/all1u.dtsi>
-
 / {
    chosen {
        zmk,kscan = &kscan0;
-        zmk,physical-layout = &layout_ortho_4x12_all1u;
-    };
-
-    matrix_transform_40_all1u: keymap_transform_0 {
-        compatible = "zmk,matrix-transform";
-        columns = <12>;
-        rows = <4>;
-        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(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(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(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11)
-            >;
    };

    kscan0: kscan_0 {
@@ -54,8 +37,4 @@
            , <&pro_micro 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
            ;
    };
-};
-
-&layout_ortho_4x12_all1u {
-    transform = <&matrix_transform_40_all1u>;
-};
+};
--- a/app/boards/shields/contra/contra.zmk.yml
+++ b/app/boards/shields/contra/contra.zmk.yml
@@ -6,4 +6,3 @@ url: https://github.com/ai03-2725/Contra
 requires: [pro_micro]
 features:
  - keys
-  - studio
--- a/app/boards/shields/corne/corne.dtsi
+++ b/app/boards/shields/corne/corne.dtsi
@@ -6,8 +6,7 @@

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

-#include <layouts/foostan/corne/5column.dtsi>
-#include <layouts/foostan/corne/6column.dtsi>
+#include <layouts/foostan/corne.dtsi>

 &foostan_corne_6col_layout {
    transform = <&default_transform>;
--- a/app/boards/shields/corne/corne.zmk.yml
+++ b/app/boards/shields/corne/corne.zmk.yml
@@ -9,7 +9,6 @@ features:
  - keys
  - display
  - underglow
-  - studio
 siblings:
  - corne_left
  - corne_right
--- a/app/boards/shields/cradio/cradio.zmk.yml
+++ b/app/boards/shields/cradio/cradio.zmk.yml
@@ -7,7 +7,6 @@ requires: [pro_micro]
 exposes: [i2c_oled]
 features:
  - keys
-  - studio
 siblings:
  - cradio_left
  - cradio_right
--- a/app/boards/shields/crbn/crbn.overlay
+++ b/app/boards/shields/crbn/crbn.overlay
@@ -6,24 +6,9 @@

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

-#include <layouts/common/ortho_4x12/all1u.dtsi>
-
 / {
    chosen {
        zmk,kscan = &kscan0;
-        zmk,physical-layout = &layout_ortho_4x12_all1u;
-    };
-
-    matrix_transform_40_all1u: keymap_transform_0 {
-        compatible = "zmk,matrix-transform";
-        columns = <12>;
-        rows = <4>;
-        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(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(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(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11)
-            >;
    };

    kscan0: kscan_0 {
@@ -69,7 +54,3 @@
        triggers-per-rotation = <20>;
    };
 };
-
-&layout_ortho_4x12_all1u {
-    transform = <&matrix_transform_40_all1u>;
-};
--- a/app/boards/shields/crbn/crbn.zmk.yml
+++ b/app/boards/shields/crbn/crbn.zmk.yml
@@ -7,4 +7,3 @@ requires: [pro_micro]
 features:
  - keys
  - encoder
-  - studio
--- a/app/boards/shields/hummingbird/hummingbird-layouts.dtsi
+++ b/app/boards/shields/hummingbird/hummingbird-layouts.dtsi
@@ -1,41 +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   75       0     0     0>
-            , <&key_physical_attrs 100 100  100   25       0     0     0>
-            , <&key_physical_attrs 100 100  200    0       0     0     0>
-            , <&key_physical_attrs 100 100  300   25       0     0     0>
-            , <&key_physical_attrs 100 100  400   75       0     0     0>
-            , <&key_physical_attrs 100 100  600   75       0     0     0>
-            , <&key_physical_attrs 100 100  700   25       0     0     0>
-            , <&key_physical_attrs 100 100  800    0       0     0     0>
-            , <&key_physical_attrs 100 100  900   25       0     0     0>
-            , <&key_physical_attrs 100 100 1000   75       0     0     0>
-            , <&key_physical_attrs 100 100    0  175       0     0     0>
-            , <&key_physical_attrs 100 100  100  125       0     0     0>
-            , <&key_physical_attrs 100 100  200  100       0     0     0>
-            , <&key_physical_attrs 100 100  300  125       0     0     0>
-            , <&key_physical_attrs 100 100  400  175       0     0     0>
-            , <&key_physical_attrs 100 100  600  175       0     0     0>
-            , <&key_physical_attrs 100 100  700  125       0     0     0>
-            , <&key_physical_attrs 100 100  800  100       0     0     0>
-            , <&key_physical_attrs 100 100  900  125       0     0     0>
-            , <&key_physical_attrs 100 100 1000  175       0     0     0>
-            , <&key_physical_attrs 100 100  100  225       0     0     0>
-            , <&key_physical_attrs 100 100  200  200       0     0     0>
-            , <&key_physical_attrs 100 100  300  225       0     0     0>
-            , <&key_physical_attrs 100 100  700  225       0     0     0>
-            , <&key_physical_attrs 100 100  800  200       0     0     0>
-            , <&key_physical_attrs 100 100  900  225       0     0     0>
-            , <&key_physical_attrs 100 100  325  350       0     0     0>
-            , <&key_physical_attrs 100 100  425  375       0     0     0>
-            , <&key_physical_attrs 100 100  575  375       0     0     0>
-            , <&key_physical_attrs 100 100  675  350       0     0     0>
-            ;
-    };
-};
--- a/Show More
+++ b/Show More