Merge branch 'develop' into XEdDSA

Update crypto commit hash
2025-12-26 20:50:27 +00:00 · 2025-12-01 15:07:32 -06:00 · 2025-08-27 16:46:57 -05:00 · 2025-08-21 09:05:05 -05:00 · 2025-08-19 14:42:09 -05:00 · 2025-08-15 14:32:13 -05:00
290 changed files with 4782 additions and 8495 deletions
--- a/.clusterfuzzlite/build.sh
+++ b/.clusterfuzzlite/build.sh
@@ -51,7 +51,7 @@ for f in .clusterfuzzlite/*_fuzzer.cpp; do
 	fuzzer=$(basename "$f" .cpp)
 	cp -f "$f" src/fuzzer.cpp
 	pio run -vvv --environment "$PIO_ENV"
-	program="$PLATFORMIO_WORKSPACE_DIR/build/$PIO_ENV/meshtasticd"
+	program="$PLATFORMIO_WORKSPACE_DIR/build/$PIO_ENV/program"
 	cp "$program" "$OUT/$fuzzer"

 	# Copy shared libraries used by the fuzzer.
--- a/.github/actionlint.yaml
+++ b/.github/actionlint.yaml
@@ -2,5 +2,4 @@
 self-hosted-runner:
  # Labels of self-hosted runner in array of strings.
  labels:
-    - arctastic
    - test-runner
--- a/.github/actions/build-variant/action.yml
+++ b/.github/actions/build-variant/action.yml
@@ -76,7 +76,7 @@ runs:
        done

    - name: PlatformIO ${{ inputs.arch }} download cache
-      uses: actions/cache@v5
+      uses: actions/cache@v4
      with:
        path: ~/.platformio/.cache
        key: pio-cache-${{ inputs.arch }}-${{ hashFiles('.github/actions/**', '**.ini') }}
@@ -100,9 +100,9 @@ runs:
      id: version

    - name: Store binaries as an artifact
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v5
      with:
-        name: firmware-${{ inputs.arch }}-${{ inputs.board }}-${{ steps.version.outputs.long }}
+        name: firmware-${{ inputs.arch }}-${{ inputs.board }}-${{ steps.version.outputs.long }}.zip
        overwrite: true
        path: |
          ${{ inputs.artifact-paths }}
--- a/.github/workflows/build_debian_src.yml
+++ b/.github/workflows/build_debian_src.yml
@@ -64,7 +64,7 @@ jobs:
          PKG_VERSION: ${{ steps.version.outputs.deb }}

      - name: Store binaries as an artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: firmware-debian-${{ steps.version.outputs.deb }}~${{ inputs.series }}-src
          overwrite: true
--- a/.github/workflows/build_firmware.yml
+++ b/.github/workflows/build_firmware.yml
@@ -18,8 +18,7 @@ permissions: read-all
 jobs:
  pio-build:
    name: build-${{ inputs.platform }}
-    # Use 'arctastic' self-hosted runner pool when building in the main repo
-    runs-on: ${{ github.repository_owner == 'meshtastic' && 'arctastic' || 'ubuntu-latest' }}
+    runs-on: ubuntu-24.04
    outputs:
      artifact-id: ${{ steps.upload.outputs.artifact-id }}
    steps:
@@ -56,31 +55,15 @@ jobs:
          ota_firmware_source: ${{ steps.ota_dir.outputs.src || '' }}
          ota_firmware_target: ${{ steps.ota_dir.outputs.tgt || '' }}

-      - name: Job summary
-        env:
-          PIO_ENV: ${{ inputs.pio_env }}
-        run: |
-          echo "## $PIO_ENV" >> $GITHUB_STEP_SUMMARY
-          echo "<details><summary><strong>Manifest</strong></summary>" >> $GITHUB_STEP_SUMMARY
-          echo '' >> $GITHUB_STEP_SUMMARY
-          echo '```json' >> $GITHUB_STEP_SUMMARY
-          cat release/firmware-*.mt.json >> $GITHUB_STEP_SUMMARY
-          echo '' >> $GITHUB_STEP_SUMMARY
-          echo '```' >> $GITHUB_STEP_SUMMARY
-          echo "</details>" >> $GITHUB_STEP_SUMMARY
-
      - name: Store binaries as an artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        id: upload
        with:
-          name: firmware-${{ inputs.platform }}-${{ inputs.pio_env }}-${{ inputs.version }}
+          name: firmware-${{ inputs.platform }}-${{ inputs.pio_env }}-${{ inputs.version }}.zip
          overwrite: true
          path: |
-            release/*.mt.json
            release/*.bin
            release/*.elf
            release/*.uf2
            release/*.hex
-            release/*.zip
-            release/device-*.sh
-            release/device-*.bat
+            release/*-ota.zip
--- a/.github/workflows/build_one_target.yml
+++ b/.github/workflows/build_one_target.yml
@@ -98,7 +98,7 @@ jobs:
          ref: ${{github.event.pull_request.head.ref}}
          repository: ${{github.event.pull_request.head.repo.full_name}}

-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
        with:
          path: ./
          pattern: firmware-*-*
@@ -111,7 +111,7 @@ jobs:
        run: mv -b -t ./ ./bin/device-*.sh ./bin/device-*.bat

      - name: Repackage in single firmware zip
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: firmware-${{inputs.target}}-${{ needs.version.outputs.long }}
          overwrite: true
@@ -119,7 +119,7 @@ jobs:
            ./firmware-*.bin
            ./firmware-*.uf2
            ./firmware-*.hex
-            ./firmware-*.zip
+            ./firmware-*-ota.zip
            ./device-*.sh
            ./device-*.bat
            ./littlefs-*.bin
@@ -127,7 +127,7 @@ jobs:
            ./Meshtastic_nRF52_factory_erase*.uf2
          retention-days: 30

-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
        with:
          pattern: firmware-*-${{ needs.version.outputs.long }}
          merge-multiple: true
@@ -139,14 +139,14 @@ jobs:

      - name: Device scripts permissions
        run: |
-          chmod +x ./output/device-install.sh || true
-          chmod +x ./output/device-update.sh || true
+          chmod +x ./output/device-install.sh
+          chmod +x ./output/device-update.sh

      - name: Zip firmware
        run: zip -j -9 -r ./firmware-${{inputs.target}}-${{ needs.version.outputs.long }}.zip ./output

      - name: Repackage in single elfs zip
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: debug-elfs-${{inputs.target}}-${{ needs.version.outputs.long }}.zip
          overwrite: true
--- a/.github/workflows/main_matrix.yml
+++ b/.github/workflows/main_matrix.yml
@@ -77,21 +77,16 @@ jobs:
      fail-fast: false
      matrix:
        check: ${{ fromJson(needs.setup.outputs.check) }}
-    # Use 'arctastic' self-hosted runner pool when checking in the main repo
-    runs-on: ${{ github.repository_owner == 'meshtastic' && 'arctastic' || 'ubuntu-latest' }}
+
+    runs-on: ubuntu-latest
    if: ${{ github.event_name != 'workflow_dispatch' && github.repository == 'meshtastic/firmware' }}
    steps:
      - uses: actions/checkout@v6
-        with:
-          submodules: recursive
-          ref: ${{github.event.pull_request.head.ref}}
-          repository: ${{github.event.pull_request.head.repo.full_name}}
+      - name: Build base
+        id: base
+        uses: ./.github/actions/setup-base
      - name: Check ${{ matrix.check.board }}
-        uses: meshtastic/gh-action-firmware@main
-        with:
-          pio_platform: ${{ matrix.check.platform }}
-          pio_env: ${{ matrix.check.board }}
-          pio_target: check
+        run: bin/check-all.sh ${{ matrix.check.board }}

  build:
    needs: [setup, version]
@@ -173,7 +168,7 @@ jobs:
          ref: ${{github.event.pull_request.head.ref}}
          repository: ${{github.event.pull_request.head.repo.full_name}}

-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
        with:
          path: ./
          pattern: firmware-${{matrix.arch}}-*
@@ -182,17 +177,19 @@ jobs:
      - name: Display structure of downloaded files
        run: ls -R

+      - name: Move files up
+        run: mv -b -t ./ ./bin/device-*.sh ./bin/device-*.bat
+
      - name: Repackage in single firmware zip
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
          overwrite: true
          path: |
-            ./firmware-*.mt.json
            ./firmware-*.bin
            ./firmware-*.uf2
            ./firmware-*.hex
-            ./firmware-*.zip
+            ./firmware-*-ota.zip
            ./device-*.sh
            ./device-*.bat
            ./littlefs-*.bin
@@ -200,7 +197,7 @@ jobs:
            ./Meshtastic_nRF52_factory_erase*.uf2
          retention-days: 30

-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
        with:
          name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
          merge-multiple: true
@@ -212,16 +209,16 @@ jobs:

      - name: Device scripts permissions
        run: |
-          chmod +x ./output/device-install.sh || true
-          chmod +x ./output/device-update.sh || true
+          chmod +x ./output/device-install.sh
+          chmod +x ./output/device-update.sh

      - name: Zip firmware
        run: zip -j -9 -r ./firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip ./output

      - name: Repackage in single elfs zip
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
-          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}
+          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip
          overwrite: true
          path: ./*.elf
          retention-days: 30
@@ -239,7 +236,6 @@ jobs:
    outputs:
      upload_url: ${{ steps.create_release.outputs.upload_url }}
    needs:
-      - setup
      - version
      - gather-artifacts
      - build-debian-src
@@ -248,6 +244,11 @@ jobs:
      - name: Checkout
        uses: actions/checkout@v6

+      - name: Setup Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: 3.x
+
      - name: Create release
        uses: softprops/action-gh-release@v2
        id: create_release
@@ -260,14 +261,14 @@ jobs:
            Autogenerated by github action, developer should edit as required before publishing...

      - name: Download source deb
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          pattern: firmware-debian-${{ needs.version.outputs.deb }}~UNRELEASED-src
          merge-multiple: true
          path: ./output/debian-src

      - name: Download `native-tft` pio deps
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          pattern: platformio-deps-native-tft-${{ needs.version.outputs.long }}
          merge-multiple: true
@@ -283,25 +284,10 @@ jobs:
      - name: Display structure of downloaded files
        run: ls -lR

-      - name: Generate Release manifest
-        run: |
-          jq -n --arg ver "${{ needs.version.outputs.long }}" --argjson targets ${{ toJson(needs.setup.outputs.all) }} '{
-            "version": $ver,
-            "targets": $targets
-          }' > firmware-${{ needs.version.outputs.long }}.json
-
-      - name: Save Release manifest artifact
-        uses: actions/upload-artifact@v6
-        with:
-          name: manifest-${{ needs.version.outputs.long }}
-          overwrite: true
-          path: firmware-${{ needs.version.outputs.long }}.json
-
-      - name: Add sources to GitHub Release
+      - name: Add Linux sources to GtiHub Release
        # Only run when targeting master branch with workflow_dispatch
        if: ${{ github.ref_name == 'master' }}
        run: |
-          gh release upload v${{ needs.version.outputs.long }} ./firmware-${{ needs.version.outputs.long }}.json
          gh release upload v${{ needs.version.outputs.long }} ./output/meshtasticd-${{ needs.version.outputs.deb }}-src.zip
          gh release upload v${{ needs.version.outputs.long }} ./output/platformio-deps-native-tft-${{ needs.version.outputs.long }}.zip
        env:
@@ -332,7 +318,7 @@ jobs:
        with:
          python-version: 3.x

-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
        with:
          pattern: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
          merge-multiple: true
@@ -343,15 +329,15 @@ jobs:

      - name: Device scripts permissions
        run: |
-          chmod +x ./output/device-install.sh || true
-          chmod +x ./output/device-update.sh || true
+          chmod +x ./output/device-install.sh
+          chmod +x ./output/device-update.sh

      - name: Zip firmware
        run: zip -j -9 -r ./firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip ./output

-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
        with:
-          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}
+          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip
          merge-multiple: true
          path: ./elfs

@@ -387,19 +373,12 @@ jobs:
        with:
          python-version: 3.x

-      - name: Get firmware artifacts
-        uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
        with:
          pattern: firmware-{${{ env.targets }}}-${{ needs.version.outputs.long }}
          merge-multiple: true
          path: ./publish

-      - name: Get manifest artifact
-        uses: actions/download-artifact@v7
-        with:
-          pattern: manifest-${{ needs.version.outputs.long }}
-          path: ./publish
-
      - name: Publish firmware to meshtastic.github.io
        uses: peaceiris/actions-gh-pages@v4
        env:
--- a/.github/workflows/merge_queue.yml
+++ b/.github/workflows/merge_queue.yml
@@ -147,7 +147,7 @@ jobs:
          ref: ${{github.event.pull_request.head.ref}}
          repository: ${{github.event.pull_request.head.repo.full_name}}

-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
        with:
          path: ./
          pattern: firmware-${{matrix.arch}}-*
@@ -160,7 +160,7 @@ jobs:
        run: mv -b -t ./ ./bin/device-*.sh ./bin/device-*.bat

      - name: Repackage in single firmware zip
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
          overwrite: true
@@ -168,7 +168,7 @@ jobs:
            ./firmware-*.bin
            ./firmware-*.uf2
            ./firmware-*.hex
-            ./firmware-*.zip
+            ./firmware-*-ota.zip
            ./device-*.sh
            ./device-*.bat
            ./littlefs-*.bin
@@ -176,7 +176,7 @@ jobs:
            ./Meshtastic_nRF52_factory_erase*.uf2
          retention-days: 30

-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
        with:
          name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
          merge-multiple: true
@@ -188,16 +188,16 @@ jobs:

      - name: Device scripts permissions
        run: |
-          chmod +x ./output/device-install.sh || true
-          chmod +x ./output/device-update.sh || true
+          chmod +x ./output/device-install.sh
+          chmod +x ./output/device-update.sh

      - name: Zip firmware
        run: zip -j -9 -r ./firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip ./output

      - name: Repackage in single elfs zip
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
-          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}
+          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip
          overwrite: true
          path: ./*.elf
          retention-days: 30
@@ -223,6 +223,11 @@ jobs:
      - name: Checkout
        uses: actions/checkout@v6

+      - name: Setup Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: 3.x
+
      - name: Create release
        uses: softprops/action-gh-release@v2
        id: create_release
@@ -235,14 +240,14 @@ jobs:
            Autogenerated by github action, developer should edit as required before publishing...

      - name: Download source deb
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          pattern: firmware-debian-${{ needs.version.outputs.deb }}~UNRELEASED-src
          merge-multiple: true
          path: ./output/debian-src

      - name: Download `native-tft` pio deps
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          pattern: platformio-deps-native-tft-${{ needs.version.outputs.long }}
          merge-multiple: true
@@ -292,7 +297,7 @@ jobs:
        with:
          python-version: 3.x

-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
        with:
          pattern: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
          merge-multiple: true
@@ -303,15 +308,15 @@ jobs:

      - name: Device scripts permissions
        run: |
-          chmod +x ./output/device-install.sh || true
-          chmod +x ./output/device-update.sh || true
+          chmod +x ./output/device-install.sh
+          chmod +x ./output/device-update.sh

      - name: Zip firmware
        run: zip -j -9 -r ./firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip ./output

-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
        with:
-          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}
+          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip
          merge-multiple: true
          path: ./elfs

@@ -347,7 +352,7 @@ jobs:
        with:
          python-version: 3.x

-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
        with:
          pattern: firmware-{${{ env.targets }}}-${{ needs.version.outputs.long }}
          merge-multiple: true
--- a/.github/workflows/package_obs.yml
+++ b/.github/workflows/package_obs.yml
@@ -58,7 +58,7 @@ jobs:
        id: version

      - name: Download artifacts
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: firmware-debian-${{ steps.version.outputs.deb }}~${{ inputs.series }}-src
          merge-multiple: true
--- a/.github/workflows/package_pio_deps.yml
+++ b/.github/workflows/package_pio_deps.yml
@@ -56,7 +56,7 @@ jobs:
          PLATFORMIO_CORE_DIR: pio/core

      - name: Store binaries as an artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: platformio-deps-${{ inputs.pio_env }}-${{ steps.version.outputs.long }}
          overwrite: true
--- a/.github/workflows/package_ppa.yml
+++ b/.github/workflows/package_ppa.yml
@@ -60,7 +60,7 @@ jobs:
        id: version

      - name: Download artifacts
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: firmware-debian-${{ steps.version.outputs.deb }}~${{ inputs.series }}-src
          merge-multiple: true
--- a/.github/workflows/pr_enforce_labels.yml
+++ b/.github/workflows/pr_enforce_labels.yml
@@ -17,7 +17,7 @@ jobs:
        with:
          script: |
            const labels = context.payload.pull_request.labels.map(label => label.name);
-            const requiredLabels = ['bugfix', 'enhancement', 'hardware-support', 'dependencies', 'submodules', 'github_actions', 'trunk', 'cleanup'];
+            const requiredLabels = ['bugfix', 'enhancement', 'hardware-support', 'dependencies', 'submodules', 'github_actions', 'trunk'];
            const hasRequiredLabel = labels.some(label => requiredLabels.includes(label));
            if (!hasRequiredLabel) {
              core.setFailed(`PR must have at least one of the following labels before it can be merged: ${requiredLabels.join(', ')}.`);
--- a/.github/workflows/pr_tests.yml
+++ b/.github/workflows/pr_tests.yml
@@ -50,9 +50,9 @@ jobs:

      - name: Download test artifacts
        if: needs.native-tests.result != 'skipped'
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
-          name: platformio-test-report-${{ steps.version.outputs.long }}
+          name: platformio-test-report-${{ steps.version.outputs.long }}.zip
          merge-multiple: true

      - name: Parse test results and create detailed summary
--- a/.github/workflows/release_channels.yml
+++ b/.github/workflows/release_channels.yml
@@ -102,7 +102,7 @@ jobs:
          PIP_DISABLE_PIP_VERSION_CHECK: 1

      - name: Create Bumps pull request
-        uses: peter-evans/create-pull-request@v8
+        uses: peter-evans/create-pull-request@v7
        with:
          base: ${{ github.event.repository.default_branch }}
          branch: create-pull-request/bump-version
--- a/.github/workflows/sec_sast_semgrep_cron.yml
+++ b/.github/workflows/sec_sast_semgrep_cron.yml
@@ -33,7 +33,7 @@ jobs:

      # step 3
      - name: save report as pipeline artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: report.sarif
          overwrite: true
--- a/.github/workflows/stale_bot.yml
+++ b/.github/workflows/stale_bot.yml
@@ -17,7 +17,7 @@ jobs:

    steps:
      - name: Stale PR+Issues
-        uses: actions/stale@v10.1.1
+        uses: actions/stale@v10.1.0
        with:
          days-before-stale: 45
          stale-issue-message: This issue has not had any comment or update in the last month. If it is still relevant, please post update comments. If no comments are made, this issue will be closed automagically in 7 days.
--- a/.github/workflows/test_native.yml
+++ b/.github/workflows/test_native.yml
@@ -40,7 +40,7 @@ jobs:

      - name: Integration test
        run: |
-          .pio/build/coverage/meshtasticd -s &
+          .pio/build/coverage/program -s &
          PID=$!
          timeout 20 bash -c "until ls -al /proc/$PID/fd | grep socket; do sleep 1; done"
          echo "Simulator started, launching python test..."
@@ -59,10 +59,10 @@ jobs:
        id: version

      - name: Save coverage information
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        if: always() # run this step even if previous step failed
        with:
-          name: lcov-coverage-info-native-simulator-test-${{ steps.version.outputs.long }}
+          name: lcov-coverage-info-native-simulator-test-${{ steps.version.outputs.long }}.zip
          overwrite: true
          path: ./coverage_*.info

@@ -94,9 +94,9 @@ jobs:

      - name: Save test results
        if: always() # run this step even if previous step failed
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
-          name: platformio-test-report-${{ steps.version.outputs.long }}
+          name: platformio-test-report-${{ steps.version.outputs.long }}.zip
          overwrite: true
          path: ./testreport.xml

@@ -108,10 +108,10 @@ jobs:
          sed -i -e "s#${PWD}#.#" coverage_tests.info # Make paths relative.

      - name: Save coverage information
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        if: always() # run this step even if previous step failed
        with:
-          name: lcov-coverage-info-native-platformio-tests-${{ steps.version.outputs.long }}
+          name: lcov-coverage-info-native-platformio-tests-${{ steps.version.outputs.long }}.zip
          overwrite: true
          path: ./coverage_*.info

@@ -137,22 +137,22 @@ jobs:
        id: version

      - name: Download test artifacts
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
-          name: platformio-test-report-${{ steps.version.outputs.long }}
+          name: platformio-test-report-${{ steps.version.outputs.long }}.zip
          merge-multiple: true

      - name: Test Report
-        uses: dorny/test-reporter@v2.3.0
+        uses: dorny/test-reporter@v2.2.0
        with:
          name: PlatformIO Tests
          path: testreport.xml
          reporter: java-junit

      - name: Download coverage artifacts
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
-          pattern: lcov-coverage-info-native-*-${{ steps.version.outputs.long }}
+          pattern: lcov-coverage-info-native-*-${{ steps.version.outputs.long }}.zip
          path: code-coverage-report
          merge-multiple: true

@@ -163,7 +163,7 @@ jobs:
          genhtml --quiet --legend --prefix "${PWD}" code-coverage-report/coverage_src.info --output-directory code-coverage-report

      - name: Save Code Coverage Report
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
-          name: code-coverage-report-${{ steps.version.outputs.long }}
+          name: code-coverage-report-${{ steps.version.outputs.long }}.zip
          path: code-coverage-report
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -22,7 +22,7 @@ jobs:
      - name: Checkout code
        uses: actions/checkout@v6

-      # - uses: actions/setup-python@v6
+      # - uses: actions/setup-python@v5
      #   with:
      #     python-version: '3.10'

--- a/.github/workflows/update_protobufs.yml
+++ b/.github/workflows/update_protobufs.yml
@@ -16,7 +16,7 @@ jobs:
          submodules: true

      - name: Update submodule
-        if: ${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop' }}
+        if: ${{ github.ref == 'refs/heads/master' }}
        run: |
          git submodule update --remote protobufs

@@ -31,7 +31,7 @@ jobs:
          ./bin/regen-protos.sh

      - name: Create pull request
-        uses: peter-evans/create-pull-request@v8
+        uses: peter-evans/create-pull-request@v7
        with:
          branch: create-pull-request/update-protobufs
          labels: submodules
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -9,24 +9,24 @@ plugins:
 lint:
  enabled:
    - checkov@3.2.495
-    - renovate@42.64.1
-    - prettier@3.7.4
-    - trufflehog@3.92.3
+    - renovate@42.24.1
+    - prettier@3.6.2
+    - trufflehog@3.91.1
    - yamllint@1.37.1
    - bandit@1.9.2
-    - trivy@0.68.2
+    - trivy@0.67.2
    - taplo@0.10.0
-    - ruff@0.14.10
+    - ruff@0.14.6
    - isort@7.0.0
-    - markdownlint@0.47.0
-    - oxipng@10.0.0
+    - markdownlint@0.46.0
+    - oxipng@9.1.5
    - svgo@4.0.0
    - actionlint@1.7.9
    - flake8@7.3.0
    - hadolint@2.14.0
    - shfmt@3.6.0
    - shellcheck@0.11.0
-    - black@25.12.0
+    - black@25.11.0
    - git-diff-check
    - gitleaks@8.30.0
    - clang-format@16.0.3
--- a/alpine.Dockerfile
+++ b/alpine.Dockerfile
@@ -28,7 +28,7 @@ RUN bash ./bin/build-native.sh "$PIO_ENV" && \

 # ##### PRODUCTION BUILD #############

-FROM alpine:3.23
+FROM alpine:3.22
 LABEL org.opencontainers.image.title="Meshtastic" \
      org.opencontainers.image.description="Alpine Meshtastic daemon" \
      org.opencontainers.image.url="https://meshtastic.org" \
--- a/variants/esp32/esp32.ini
+++ b/variants/esp32/esp32.ini
@@ -2,15 +2,9 @@
 [esp32_base]
 extends = arduino_base
 custom_esp32_kind = esp32
-custom_mtjson_part =
 platform =
  # renovate: datasource=custom.pio depName=platformio/espressif32 packageName=platformio/platform/espressif32
-  platformio/espressif32@6.12.0
-
-extra_scripts =
-  ${env.extra_scripts}
-  pre:extra_scripts/esp32_pre.py
-  extra_scripts/esp32_extra.py
+  platformio/espressif32@6.11.0

 build_src_filter = 
  ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2xx0> -<mesh/eth/> -<mesh/raspihttp>
@@ -38,7 +32,6 @@ build_flags =
  -DAXP_DEBUG_PORT=Serial
  -DCONFIG_BT_NIMBLE_ENABLED
  -DCONFIG_BT_NIMBLE_MAX_BONDS=6 # default is 3
-  -DCONFIG_BT_NIMBLE_ROLE_CENTRAL_DISABLED
  -DCONFIG_NIMBLE_CPP_LOG_LEVEL=2
  -DCONFIG_BT_NIMBLE_MAX_CCCDS=20
  -DCONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE=8192
@@ -54,22 +47,21 @@ build_flags =
 lib_deps =
  ${arduino_base.lib_deps}
  ${networking_base.lib_deps}
-  ${networking_extra.lib_deps}
  ${environmental_base.lib_deps}
  ${environmental_extra.lib_deps}
  ${radiolib_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-esp32_https_server packageName=https://github.com/meshtastic/esp32_https_server gitBranch=master
  https://github.com/meshtastic/esp32_https_server/archive/3223704846752e6d545139204837bdb2a55459ca.zip
  # renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino
-  h2zero/NimBLE-Arduino@^2.3.7
+  h2zero/NimBLE-Arduino@^1.4.3
  # renovate: datasource=git-refs depName=libpax packageName=https://github.com/dbinfrago/libpax gitBranch=master
  https://github.com/dbinfrago/libpax/archive/3cdc0371c375676a97967547f4065607d4c53fd1.zip
-  # renovate: datasource=custom.pio depName=XPowersLib packageName=lewisxhe/library/XPowersLib
-  lewisxhe/XPowersLib@0.3.2
+  # renovate: datasource=github-tags depName=XPowersLib packageName=lewisxhe/XPowersLib
+  https://github.com/lewisxhe/XPowersLib/archive/v0.3.1.zip
  # renovate: datasource=git-refs depName=meshtastic-ESP32_Codec2 packageName=https://github.com/meshtastic/ESP32_Codec2 gitBranch=master
  https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
  # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
-  rweather/Crypto@0.4.0
+  https://github.com/meshtastic/Crypto/archive/1aa30eb536bd52a576fde6dfa393bf7349cf102d.zip

 lib_ignore = 
  segger_rtt
--- a/variants/esp32c3/esp32c3.ini
+++ b/variants/esp32c3/esp32c3.ini
@@ -4,8 +4,3 @@ custom_esp32_kind = esp32c3

 monitor_speed = 115200
 monitor_filters = esp32_c3_exception_decoder
-
-build_flags =
-	${esp32_base.build_flags}
-	-DCONFIG_BT_NIMBLE_EXT_ADV=1
-	-DCONFIG_BT_NIMBLE_MAX_EXT_ADV_INSTANCES=2
--- a/variants/esp32c6/esp32c6.ini
+++ b/variants/esp32c6/esp32c6.ini
@@ -28,11 +28,11 @@ lib_deps =
  ${environmental_extra.lib_deps}
  ${radiolib_base.lib_deps}
  # renovate: datasource=custom.pio depName=XPowersLib packageName=lewisxhe/library/XPowersLib
-  lewisxhe/XPowersLib@0.3.2
+  lewisxhe/XPowersLib@0.3.1
  # renovate: datasource=git-refs depName=meshtastic-ESP32_Codec2 packageName=https://github.com/meshtastic/ESP32_Codec2 gitBranch=master
  https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
  # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
-  rweather/Crypto@0.4.0
+  https://github.com/meshtastic/Crypto/archive/1aa30eb536bd52a576fde6dfa393bf7349cf102d.zip

 build_src_filter = 
 ${esp32_base.build_src_filter} -<mesh/http> 
--- a/variants/esp32s2/esp32s2.ini
+++ b/variants/esp32s2/esp32s2.ini
--- a/arch/esp32/esp32s3.ini
+++ b/arch/esp32/esp32s3.ini
@@ -0,0 +1,5 @@
+[esp32s3_base]
+extends = esp32_base
+custom_esp32_kind = esp32s3
+
+monitor_speed = 115200
--- a/variants/nrf52840/cpp_overrides/lfs_util.h
+++ b/variants/nrf52840/cpp_overrides/lfs_util.h
--- a/variants/nrf52840/nrf52.ini
+++ b/variants/nrf52840/nrf52.ini
@@ -2,7 +2,7 @@
 ; Instead of the standard nordicnrf52 platform, we use our fork which has our added variant files
 platform =
  # renovate: datasource=custom.pio depName=platformio/nordicnrf52 packageName=platformio/platform/nordicnrf52
-  platformio/nordicnrf52@10.10.0
+  platformio/nordicnrf52@^10.8.0
 extends = arduino_base
 platform_packages =
  ; our custom Git version until they merge our PR
@@ -11,30 +11,16 @@ platform_packages =
  ; Don't renovate toolchain-gccarmnoneeabi
  platformio/toolchain-gccarmnoneeabi@~1.90301.0

-extra_scripts =
-  ${env.extra_scripts}
-  extra_scripts/nrf52_extra.py
-
-build_type = release
+build_type = debug
 build_flags =
-  -include variants/nrf52840/cpp_overrides/lfs_util.h
+  -include arch/nrf52/cpp_overrides/lfs_util.h
  ${arduino_base.build_flags}
+  -DSERIAL_BUFFER_SIZE=1024
  -Wno-unused-variable
  -Isrc/platform/nrf52
  -DLFS_NO_ASSERT                      ; Disable LFS assertions , see https://github.com/meshtastic/firmware/pull/3818
  -DMESHTASTIC_EXCLUDE_AUDIO=1
  -DMESHTASTIC_EXCLUDE_PAXCOUNTER=1
-  -Os
-build_unflags =
-  -Ofast
-  -Og
-  -ggdb3
-  -ggdb2
-  -g3
-  -g2
-  -g
-  -g1
-  -g0

 build_src_filter = 
  ${arduino_base.build_src_filter} -<platform/esp32/> -<platform/stm32wl> -<nimble/> -<mesh/wifi/> -<mesh/api/> -<mesh/http/> -<modules/esp32> -<platform/rp2xx0> -<mesh/eth/> -<mesh/raspihttp> -<serialization/>
@@ -43,7 +29,7 @@ lib_deps=
  ${arduino_base.lib_deps}
  ${radiolib_base.lib_deps}
  # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
-  rweather/Crypto@0.4.0
+  https://github.com/meshtastic/Crypto/archive/1aa30eb536bd52a576fde6dfa393bf7349cf102d.zip

 lib_ignore =
  BluetoothOTA
--- a/arch/nrf52/nrf52832.ini
+++ b/arch/nrf52/nrf52832.ini
@@ -0,0 +1,7 @@
+[nrf52832_base]
+extends = nrf52_base
+
+build_flags = ${nrf52_base.build_flags} 
+
+lib_deps =
+  ${nrf52_base.lib_deps}
--- a/variants/nrf52840/nrf52840.ini
+++ b/variants/nrf52840/nrf52840.ini
@@ -1,9 +1,7 @@
 [nrf52840_base]
 extends = nrf52_base

-build_flags =
-   ${nrf52_base.build_flags}
-  -DSERIAL_BUFFER_SIZE=4096
+build_flags = ${nrf52_base.build_flags} 

 lib_deps =
  ${nrf52_base.lib_deps}
--- a/variants/native/portduino.ini
+++ b/variants/native/portduino.ini
@@ -21,13 +21,13 @@ build_src_filter =
 lib_deps =
  ${env.lib_deps}
  ${networking_base.lib_deps}
-  ${networking_extra.lib_deps}
  ${radiolib_base.lib_deps}
  ${environmental_base.lib_deps}
  # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
-  rweather/Crypto@0.4.0
+  #rweather/Crypto@0.4.0
+  https://github.com/meshtastic/Crypto/archive/1aa30eb536bd52a576fde6dfa393bf7349cf102d.zip
  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.7
+  lovyan03/LovyanGFX@^1.2.0
  # renovate: datasource=git-refs depName=libch341-spi-userspace packageName=https://github.com/pine64/libch341-spi-userspace gitBranch=main
  https://github.com/pine64/libch341-spi-userspace/archive/af9bc27c9c30fa90772279925b7c5913dff789b4.zip
  # renovate: datasource=custom.pio depName=adafruit/Adafruit seesaw Library packageName=adafruit/library/Adafruit seesaw Library
--- a/variants/rp2040/rp2040.ini
+++ b/variants/rp2040/rp2040.ini
@@ -2,12 +2,12 @@
 [rp2040_base]
 platform =
  # TODO renovate
-  https://github.com/maxgerhardt/platform-raspberrypi#cc24cfef37ed22ca9f2a6aead28c2deb76c39f24
-  ; For arduino-pico >= 5.4.4
+  https://github.com/maxgerhardt/platform-raspberrypi#76ecf3c7e9dd4503af0331154c4ca1cddc4b03e5
+  ; For arduino-pico >= 4.4.3
 extends = arduino_base
 platform_packages =
  # TODO renovate
-  arduino-pico@https://github.com/earlephilhower/arduino-pico/releases/download/5.4.4/rp2040-5.4.4.zip
+  framework-arduinopico@https://github.com/earlephilhower/arduino-pico#4.4.3

 board_build.core = earlephilhower
 board_build.filesystem_size = 0.5m
@@ -17,7 +17,6 @@ build_flags =
  -Isrc/platform/rp2xx0/hardware_rosc/include
  -Isrc/platform/rp2xx0/pico_sleep/include
  -D__PLAT_RP2040__
-  -D__FREERTOS=1
 #  -D _POSIX_THREADS
 build_src_filter = 
  ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<modules/esp32> -<platform/nrf52/> -<platform/stm32wl> -<mesh/eth/> -<mesh/wifi/> -<mesh/http/> -<mesh/raspihttp>
@@ -32,4 +31,4 @@ lib_deps =
  ${environmental_extra.lib_deps}
  ${radiolib_base.lib_deps}
  # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
-  rweather/Crypto@0.4.0
+  https://github.com/meshtastic/Crypto/archive/1aa30eb536bd52a576fde6dfa393bf7349cf102d.zip
--- a/variants/rp2350/rp2350.ini
+++ b/variants/rp2350/rp2350.ini
@@ -2,12 +2,12 @@
 [rp2350_base]
 platform =
  # TODO renovate
-  https://github.com/maxgerhardt/platform-raspberrypi#cc24cfef37ed22ca9f2a6aead28c2deb76c39f24
-  ; For arduino-pico >= 5.4.4
+  https://github.com/maxgerhardt/platform-raspberrypi#76ecf3c7e9dd4503af0331154c4ca1cddc4b03e5
+  ; For arduino-pico >= 4.4.3
 extends = arduino_base
 platform_packages =
  # TODO renovate
-  arduino-pico@https://github.com/earlephilhower/arduino-pico/releases/download/5.4.4/rp2040-5.4.4.zip
+  framework-arduinopico@https://github.com/earlephilhower/arduino-pico#4.4.3

 board_build.core = earlephilhower
 board_build.filesystem_size = 0.5m
@@ -15,7 +15,6 @@ build_flags =
  ${arduino_base.build_flags} -Wno-unused-variable -Wcast-align
  -Isrc/platform/rp2xx0
  -D__PLAT_RP2350__
-  -D__FREERTOS=1
 build_src_filter = 
  ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<modules/esp32> -<platform/nrf52/> -<platform/stm32wl> -<mesh/eth/> -<mesh/wifi/> -<mesh/http/> -<mesh/raspihttp> -<platform/rp2xx0/pico_sleep> -<platform/rp2xx0/hardware_rosc>

@@ -29,4 +28,4 @@ lib_deps =
  ${environmental_extra.lib_deps}
  ${radiolib_base.lib_deps}
  # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
-  rweather/Crypto@0.4.0
+  https://github.com/meshtastic/Crypto/archive/1aa30eb536bd52a576fde6dfa393bf7349cf102d.zip
--- a/variants/stm32/stm32.ini
+++ b/variants/stm32/stm32.ini
@@ -4,11 +4,11 @@ platform =
  # renovate: datasource=custom.pio depName=platformio/ststm32 packageName=platformio/platform/ststm32
  platformio/ststm32@19.4.0
 platform_packages =
-  # renovate: datasource=github-tags depName=Arduino_Core_STM32 packageName=stm32duino/Arduino_Core_STM32
+  # TODO renovate
  platformio/framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/2.10.1.zip
 extra_scripts =
  ${env.extra_scripts}
-  extra_scripts/stm32_extra.py
+  post:extra_scripts/extra_stm32.py

 build_type = release

@@ -51,8 +51,9 @@ debug_tool = stlink
 lib_deps =
  ${env.lib_deps}
  ${radiolib_base.lib_deps}
+
  # renovate: datasource=git-refs depName=caveman99-stm32-Crypto packageName=https://github.com/caveman99/Crypto gitBranch=main
-  https://github.com/caveman99/Crypto/archive/1aa30eb536bd52a576fde6dfa393bf7349cf102d.zip
+  https://github.com/meshtastic/Crypto/archive/1aa30eb536bd52a576fde6dfa393bf7349cf102d.zip

 lib_ignore =
  OneButton
--- a/bin/analyze_map.py
+++ b/bin/analyze_map.py
@@ -1,165 +0,0 @@
-#!/usr/bin/env python3
-"""Summarise linker map output to highlight heavy object files and libraries.
-
-Usage:
-    python bin/analyze_map.py --map .pio/build/rak4631/output.map --top 20
-
-The script parses GNU ld map files and aggregates section sizes per object file
-and per archive/library, then prints sortable tables that make it easy to spot
-modules worth trimming or hiding behind feature flags.
-"""
-from __future__ import annotations
-
-import argparse
-import collections
-import os
-import re
-import sys
-from typing import DefaultDict, Dict, Tuple
-
-
-SECTION_LINE_RE = re.compile(r"^\s+(?P<section>\S+)\s+0x[0-9A-Fa-f]+\s+0x(?P<size>[0-9A-Fa-f]+)\s+(?P<object>.+)$")
-ARCHIVE_MEMBER_RE = re.compile(r"^(?P<archive>.+)\((?P<object>[^)]+)\)$")
-
-
-def human_size(num_bytes: int) -> str:
-    """Return a friendly size string with one decimal place."""
-    if num_bytes < 1024:
-        return f"{num_bytes:,} B"
-    num = float(num_bytes)
-    for unit in ("KB", "MB", "GB"):
-        num /= 1024.0
-        if num < 1024.0:
-            return f"{num:.1f} {unit}"
-    return f"{num:.1f} TB"
-
-
-def shorten_path(path: str, root: str) -> str:
-    """Prefer repository-relative paths for readability."""
-    path = path.strip()
-    if not path:
-        return path
-
-    # Normalise Windows archives (backslashes) to POSIX style for consistency.
-    path = path.replace("\\", "/")
-
-    # Attempt to strip the root when an absolute path lives inside the repo.
-    if os.path.isabs(path):
-        try:
-            rel = os.path.relpath(path, root)
-            if not rel.startswith(".."):
-                return rel
-        except ValueError:
-            # relpath can fail on mixed drives on Windows; fall back to basename.
-            pass
-    return path
-
-
-def describe_object(raw_object: str, root: str) -> Tuple[str, str]:
-    """Return a human friendly object label and the library it belongs to."""
-    raw_object = raw_object.strip()
-    lib_label = "[app]"
-    match = ARCHIVE_MEMBER_RE.match(raw_object)
-    if match:
-        archive = shorten_path(match.group("archive"), root)
-        obj = match.group("object")
-        lib_label = os.path.basename(archive) or archive
-        label = f"{archive}:{obj}"
-    else:
-        label = shorten_path(raw_object, root)
-        # If the object lives under libs, hint at the containing directory.
-        parent = os.path.basename(os.path.dirname(label))
-        if parent:
-            lib_label = parent
-    return label, lib_label
-
-
-def parse_map(map_path: str, repo_root: str) -> Tuple[Dict[str, int], Dict[str, int], Dict[str, Dict[str, int]]]:
-    per_object: DefaultDict[str, int] = collections.defaultdict(int)
-    per_library: DefaultDict[str, int] = collections.defaultdict(int)
-    per_object_sections: DefaultDict[str, DefaultDict[str, int]] = collections.defaultdict(lambda: collections.defaultdict(int))
-
-    try:
-        with open(map_path, "r", encoding="utf-8", errors="ignore") as handle:
-            for line in handle:
-                match = SECTION_LINE_RE.match(line)
-                if not match:
-                    continue
-
-                section = match.group("section")
-                if section.startswith("*") or section in {"LOAD", "ORIGIN"}:
-                    continue
-
-                size = int(match.group("size"), 16)
-                if size == 0:
-                    continue
-
-                obj_token = match.group("object").strip()
-                if not obj_token or obj_token.startswith("*") or "load address" in obj_token:
-                    continue
-
-                label, lib_label = describe_object(obj_token, repo_root)
-                per_object[label] += size
-                per_library[lib_label] += size
-                per_object_sections[label][section] += size
-    except FileNotFoundError:
-        raise SystemExit(f"error: map file '{map_path}' not found. Run a build first.")
-
-    return per_object, per_library, per_object_sections
-
-
-def format_section_breakdown(section_sizes: Dict[str, int], total: int, limit: int = 3) -> str:
-    items = sorted(section_sizes.items(), key=lambda kv: kv[1], reverse=True)
-    parts = []
-    for section, size in items[:limit]:
-        pct = (size / total) * 100 if total else 0
-        parts.append(f"{section} {pct:.1f}%")
-    if len(items) > limit:
-        remainder = total - sum(size for _, size in items[:limit])
-        pct = (remainder / total) * 100 if total else 0
-        parts.append(f"other {pct:.1f}%")
-    return ", ".join(parts)
-
-
-def print_report(map_path: str, top_n: int, per_object: Dict[str, int], per_library: Dict[str, int], per_object_sections: Dict[str, Dict[str, int]]):
-    total_bytes = sum(per_object.values())
-    if total_bytes == 0:
-        print("No section data found in map file.")
-        return
-
-    print(f"Map file: {map_path}")
-    print(f"Accounted size: {human_size(total_bytes)} across {len(per_object)} object files\n")
-
-    sorted_objects = sorted(per_object.items(), key=lambda kv: kv[1], reverse=True)
-    print(f"Top {min(top_n, len(sorted_objects))} object files by linked size:")
-    for idx, (obj, size) in enumerate(sorted_objects[:top_n], 1):
-        pct = (size / total_bytes) * 100
-        breakdown = format_section_breakdown(per_object_sections[obj], size)
-        print(f"{idx:2}. {human_size(size):>9}  ({size:,} B, {pct:5.2f}% of linked size)")
-        print(f"    {obj}")
-        if breakdown:
-            print(f"    sections: {breakdown}")
-    print()
-
-    sorted_libs = sorted(per_library.items(), key=lambda kv: kv[1], reverse=True)
-    print(f"Top {min(top_n, len(sorted_libs))} libraries or source roots:")
-    for idx, (lib, size) in enumerate(sorted_libs[:top_n], 1):
-        pct = (size / total_bytes) * 100
-        print(f"{idx:2}. {human_size(size):>9}  ({size:,} B, {pct:5.2f}% of linked size)  {lib}")
-
-
-def main() -> None:
-    parser = argparse.ArgumentParser(description="Highlight heavy object files from a GNU ld map file.")
-    parser.add_argument("--map", default=".pio/build/rak4631/output.map", help="Path to the map file (default: %(default)s)")
-    parser.add_argument("--top", type=int, default=20, help="Number of entries to display per table (default: %(default)s)")
-    args = parser.parse_args()
-
-    map_path = os.path.abspath(args.map)
-    repo_root = os.path.abspath(os.getcwd())
-
-    per_object, per_library, per_object_sections = parse_map(map_path, repo_root)
-    print_report(os.path.relpath(map_path, repo_root), args.top, per_object, per_library, per_object_sections)
-
-
-if __name__ == "__main__":
-    main()
--- a/bin/build-esp32.sh
+++ b/bin/build-esp32.sh
@@ -5,8 +5,7 @@ set -e
 VERSION=`bin/buildinfo.py long`
 SHORT_VERSION=`bin/buildinfo.py short`

-BUILDDIR=.pio/build/$1
-OUTDIR=release
+OUTDIR=release/

 rm -f $OUTDIR/firmware*
 rm -r $OUTDIR/* || true
@@ -15,27 +14,33 @@ rm -r $OUTDIR/* || true
 platformio pkg install -e $1

 echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS"
-rm -f $BUILDDIR/firmware*
+rm -f .pio/build/$1/firmware.*

 # The shell vars the build tool expects to find
 export APP_VERSION=$VERSION

 basename=firmware-$1-$VERSION

-pio run --environment $1 -t mtjson # -v
-
-cp $BUILDDIR/$basename.elf $OUTDIR/$basename.elf
+pio run --environment $1 # -v
+SRCELF=.pio/build/$1/firmware.elf
+cp $SRCELF $OUTDIR/$basename.elf

 echo "Copying ESP32 bin file"
-cp $BUILDDIR/$basename.factory.bin $OUTDIR/$basename.factory.bin
+SRCBIN=.pio/build/$1/firmware.factory.bin
+cp $SRCBIN $OUTDIR/$basename.bin

 echo "Copying ESP32 update bin file"
-cp $BUILDDIR/$basename.bin $OUTDIR/$basename.bin
+SRCBIN=.pio/build/$1/firmware.bin
+cp $SRCBIN $OUTDIR/$basename-update.bin

-echo "Copying Filesystem for ESP32 targets"
-cp $BUILDDIR/littlefs-$1-$VERSION.bin $OUTDIR/littlefs-$1-$VERSION.bin
-cp bin/device-install.* $OUTDIR/
-cp bin/device-update.* $OUTDIR/
-
-echo "Copying manifest"
-cp $BUILDDIR/$basename.mt.json $OUTDIR/$basename.mt.json
+echo "Building Filesystem for ESP32 targets"
+# If you want to build the webui, uncomment the following lines
+# pio run --environment $1 -t buildfs
+# cp .pio/build/$1/littlefs.bin $OUTDIR/littlefswebui-$1-$VERSION.bin
+# # Remove webserver files from the filesystem and rebuild
+# ls -l data/static # Diagnostic list of files
+# rm -rf data/static
+pio run --environment $1 -t buildfs
+cp .pio/build/$1/littlefs.bin $OUTDIR/littlefs-$1-$VERSION.bin
+cp bin/device-install.* $OUTDIR
+cp bin/device-update.* $OUTDIR
--- a/bin/build-native.sh
+++ b/bin/build-native.sh
@@ -17,19 +17,15 @@ VERSION=$(bin/buildinfo.py long)
 SHORT_VERSION=$(bin/buildinfo.py short)
 PIO_ENV=${1:-native}

-BUILDDIR=.pio/build/$PIO_ENV
-OUTDIR=release
+OUTDIR=release/

-rm -f $OUTDIR/meshtasticd*
+rm -f $OUTDIR/firmware*

 mkdir -p $OUTDIR/
 rm -r $OUTDIR/* || true

-basename=meshtasticd-$1-$VERSION
-
 # Important to pull latest version of libs into all device flavors, otherwise some devices might be stale
 pio pkg install --environment "$PIO_ENV" || platformioFailed
 pio run --environment "$PIO_ENV" || platformioFailed
-
-cp "$BUILDDIR/meshtasticd" "$OUTDIR/meshtasticd_linux_$(uname -m)"
-cp bin/native-install.* $OUTDIR/
+cp ".pio/build/$PIO_ENV/program" "$OUTDIR/meshtasticd_linux_$(uname -m)"
+cp bin/native-install.* $OUTDIR
--- a/bin/build-nrf52.sh
+++ b/bin/build-nrf52.sh
@@ -5,8 +5,7 @@ set -e
 VERSION=$(bin/buildinfo.py long)
 SHORT_VERSION=$(bin/buildinfo.py short)

-BUILDDIR=.pio/build/$1
-OUTDIR=release
+OUTDIR=release/

 rm -f $OUTDIR/firmware*
 rm -r $OUTDIR/* || true
@@ -15,37 +14,40 @@ rm -r $OUTDIR/* || true
 platformio pkg install -e $1

 echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS"
-rm -f $BUILDDIR/firmware*
+rm -f .pio/build/$1/firmware.*

 # The shell vars the build tool expects to find
 export APP_VERSION=$VERSION

 basename=firmware-$1-$VERSION

-pio run --environment $1 -t mtjson # -v
+pio run --environment $1 # -v
+SRCELF=.pio/build/$1/firmware.elf
+cp $SRCELF $OUTDIR/$basename.elf

-cp $BUILDDIR/$basename.elf $OUTDIR/$basename.elf
+echo "Generating NRF52 dfu file"
+DFUPKG=.pio/build/$1/firmware.zip
+cp $DFUPKG $OUTDIR/$basename-ota.zip

-echo "Copying NRF52 dfu (OTA) file"
-cp $BUILDDIR/$basename.zip $OUTDIR/$basename.zip
+echo "Generating NRF52 uf2 file"
+SRCHEX=.pio/build/$1/firmware.hex

-echo "Copying NRF52 UF2 file"
-cp $BUILDDIR/$basename.uf2 $OUTDIR/$basename.uf2
-cp bin/*.uf2 $OUTDIR/
-
-SRCHEX=$BUILDDIR/$basename.hex
-
-# if WM1110 target, copy the merged.hex
+# if WM1110 target, merge hex with softdevice 7.3.0
 if (echo $1 | grep -q "wio-sdk-wm1110"); then
-	echo "Copying .merged.hex file"
-	SRCHEX=$BUILDDIR/$basename.merged.hex
-	cp $SRCHEX $OUTDIR/
+	echo "Merging with softdevice"
+	bin/mergehex -m bin/s140_nrf52_7.3.0_softdevice.hex $SRCHEX -o .pio/build/$1/$basename.hex
+	SRCHEX=.pio/build/$1/$basename.hex
+	bin/uf2conv.py $SRCHEX -c -o $OUTDIR/$basename.uf2 -f 0xADA52840
+	cp $SRCHEX $OUTDIR
+	cp bin/*.uf2 $OUTDIR
+else
+	bin/uf2conv.py $SRCHEX -c -o $OUTDIR/$basename.uf2 -f 0xADA52840
+	cp bin/device-install.* $OUTDIR
+	cp bin/device-update.* $OUTDIR
+	cp bin/*.uf2 $OUTDIR
 fi

 if (echo $1 | grep -q "rak4631"); then
-	echo "Copying .hex file"
-	cp $SRCHEX $OUTDIR/
-fi
-
-echo "Copying manifest"
-cp $BUILDDIR/$basename.mt.json $OUTDIR/$basename.mt.json
+	echo "Copying hex file"
+	cp .pio/build/$1/firmware.hex $OUTDIR/$basename.hex
+fi
--- a/bin/build-rp2xx0.sh
+++ b/bin/build-rp2xx0.sh
@@ -5,8 +5,7 @@ set -e
 VERSION=`bin/buildinfo.py long`
 SHORT_VERSION=`bin/buildinfo.py short`

-BUILDDIR=.pio/build/$1
-OUTDIR=release
+OUTDIR=release/

 rm -f $OUTDIR/firmware*
 rm -r $OUTDIR/* || true
@@ -15,19 +14,20 @@ rm -r $OUTDIR/* || true
 platformio pkg install -e $1

 echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS"
-rm -f $BUILDDIR/firmware*
+rm -f .pio/build/$1/firmware.*

 # The shell vars the build tool expects to find
 export APP_VERSION=$VERSION

 basename=firmware-$1-$VERSION

-pio run --environment $1 -t mtjson # -v
-
-cp $BUILDDIR/$basename.elf $OUTDIR/$basename.elf
+pio run --environment $1 # -v
+SRCELF=.pio/build/$1/firmware.elf
+cp $SRCELF $OUTDIR/$basename.elf

 echo "Copying uf2 file"
-cp $BUILDDIR/$basename.uf2 $OUTDIR/$basename.uf2
+SRCBIN=.pio/build/$1/firmware.uf2
+cp $SRCBIN $OUTDIR/$basename.uf2

-echo "Copying manifest"
-cp $BUILDDIR/$basename.mt.json $OUTDIR/$basename.mt.json
+cp bin/device-install.* $OUTDIR
+cp bin/device-update.* $OUTDIR
--- a/bin/build-stm32wl.sh
+++ b/bin/build-stm32wl.sh
@@ -5,8 +5,7 @@ set -e
 VERSION=$(bin/buildinfo.py long)
 SHORT_VERSION=$(bin/buildinfo.py short)

-BUILDDIR=.pio/build/$1
-OUTDIR=release
+OUTDIR=release/

 rm -f $OUTDIR/firmware*
 rm -r $OUTDIR/* || true
@@ -15,19 +14,16 @@ rm -r $OUTDIR/* || true
 platformio pkg install -e $1

 echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS"
-rm -f $BUILDDIR/firmware*
+rm -f .pio/build/$1/firmware.*

 # The shell vars the build tool expects to find
 export APP_VERSION=$VERSION

 basename=firmware-$1-$VERSION

-pio run --environment $1 -t mtjson # -v
+pio run --environment $1 # -v
+SRCELF=.pio/build/$1/firmware.elf
+cp $SRCELF $OUTDIR/$basename.elf

-cp $BUILDDIR/$basename.elf $OUTDIR/$basename.elf
-
-echo "Copying STM32 bin file"
-cp $BUILDDIR/$basename.bin $OUTDIR/$basename.bin
-
-echo "Copying manifest"
-cp $BUILDDIR/$basename.mt.json $OUTDIR/$basename.mt.json
+SRCBIN=.pio/build/$1/firmware.bin
+cp $SRCBIN $OUTDIR/$basename.bin
--- a/bin/config-dist.yaml
+++ b/bin/config-dist.yaml
@@ -184,8 +184,6 @@ Input:
 Logging:
  LogLevel: info # debug, info, warn, error
 #  TraceFile: /var/log/meshtasticd.json
-#  JSONFile: /packets.json # File location for JSON output of decoded packets
-#  JSONFilter: position # filter for packets to save to JSON file
 #  AsciiLogs: true     # default if not specified is !isatty() on stdout

 Webserver:
--- a/bin/device-install.bat
+++ b/bin/device-install.bat
@@ -5,14 +5,22 @@ TITLE Meshtastic device-install
 SET "SCRIPT_NAME=%~nx0"
 SET "DEBUG=0"
 SET "PYTHON="
+SET "TFT_BUILD=0"
+SET "BIGDB8=0"
+SET "MUIDB8=0"
+SET "BIGDB16=0"
 SET "ESPTOOL_BAUD=115200"
 SET "ESPTOOL_CMD="
 SET "LOGCOUNTER=0"
 SET "BPS_RESET=0"
-@REM Default offsets.
-@REM https://github.com/meshtastic/web-flasher/blob/main/stores/firmwareStore.ts#L202
-SET "OTA_OFFSET=0x260000"
-SET "SPIFFS_OFFSET=0x300000"
+
+@REM FIXME: Determine mcu from PlatformIO variant, this is unmaintainable.
+SET "S3=s3 v3 t-deck wireless-paper wireless-tracker station-g2 unphone t-eth-elite tlora-pager mesh-tab dreamcatcher ESP32-S3-Pico seeed-sensecap-indicator heltec_capsule_sensor_v3 vision-master icarus tracksenger elecrow-adv heltec-v4"
+SET "C3=esp32c3"
+@REM FIXME: Determine flash size from PlatformIO variant, this is unmaintainable.
+SET "BIGDB_8MB=crowpanel-esp32s3 heltec_capsule_sensor_v3 heltec-v3 heltec-vision-master-e213 heltec-vision-master-e290 heltec-vision-master-t190 heltec-wireless-paper heltec-wireless-tracker heltec-wsl-v3 icarus seeed-xiao-s3 tbeam-s3-core tracksenger"
+SET "MUIDB_8MB=picomputer-s3 unphone seeed-sensecap-indicator"
+SET "BIGDB_16MB=t-deck mesh-tab t-energy-s3 dreamcatcher ESP32-S3-Pico m5stack-cores3 station-g2 t-eth-elite tlora-pager t-watch-s3 elecrow-adv heltec-v4"

 GOTO getopts
 :help
@@ -21,7 +29,7 @@ ECHO.
 ECHO Usage: %SCRIPT_NAME% -f filename [-p PORT] [-P python] [--1200bps-reset]
 ECHO.
 ECHO Options:
-ECHO     -f filename      The firmware .factory.bin file to flash.  Custom to your device type and region. (required)
+ECHO     -f filename      The firmware .bin file to flash.  Custom to your device type and region. (required)
 ECHO                      The file must be located in this current directory.
 ECHO     -p PORT          Set the environment variable for ESPTOOL_PORT.
 ECHO                      If not set, ESPTOOL iterates all ports (Dangerous).
@@ -32,12 +40,12 @@ ECHO     --1200bps-reset  Attempt to place the device in correct mode. (1200bps
 ECHO                      Some hardware requires this twice.
 ECHO.
 ECHO Example: %SCRIPT_NAME% -p COM17 --1200bps-reset
-ECHO Example: %SCRIPT_NAME% -f firmware-t-deck-tft-2.6.0.0b106d4.factory.bin -p COM11
-ECHO Example: %SCRIPT_NAME% -f firmware-unphone-2.6.0.0b106d4.factory.bin -p COM11
+ECHO Example: %SCRIPT_NAME% -f firmware-t-deck-tft-2.6.0.0b106d4.bin -p COM11
+ECHO Example: %SCRIPT_NAME% -f firmware-unphone-2.6.0.0b106d4.bin -p COM11
 GOTO eof

 :version
-ECHO %SCRIPT_NAME% [Version 2.7.0]
+ECHO %SCRIPT_NAME% [Version 2.6.2]
 ECHO Meshtastic
 GOTO eof

@@ -70,8 +78,8 @@ IF "__!FILENAME!__"=="____" (
        CALL :LOG_MESSAGE ERROR "Filename containing spaces are not supported."
        GOTO help
    )
-    IF NOT "__!FILENAME:.factory.bin=!__"=="__!FILENAME!__" (
-        CALL :LOG_MESSAGE ERROR "Filename must be a firmware-*.factory.bin file."
+    IF "__!FILENAME:firmware-=!__"=="__!FILENAME!__" (
+        CALL :LOG_MESSAGE ERROR "Filename must be a firmware-* file."
        GOTO help
    )
    @REM Remove ".\" or "./" file prefix if present.
@@ -85,26 +93,12 @@ IF NOT EXIST !FILENAME! (
    GOTO eof
 )

-CALL :LOG_MESSAGE DEBUG "Checking for metadata..."
-@REM Derive metadata filename from firmware filename.
-SET "METAFILE=!FILENAME:.factory.bin=!.mt.json"
-IF EXIST !METAFILE! (
-    @REM Print parsed json with powershell
-    CALL :LOG_MESSAGE INFO "Firmware metadata: !METAFILE!"
-    powershell -NoProfile -Command "(Get-Content '!METAFILE!' | ConvertFrom-Json | Out-String).Trim()"
-
-    @REM Save metadata values to variables for later use.
-    FOR /f "usebackq" %%A IN (`powershell -NoProfile -Command ^
-        "(Get-Content '!METAFILE!' | ConvertFrom-Json).mcu"`) DO SET "MCU=%%A"
-    FOR /f "usebackq" %%A IN (`powershell -NoProfile -Command ^
-        "(Get-Content '!METAFILE!' | ConvertFrom-Json).part | Where-Object { $_.subtype -eq 'ota_1' } | Select-Object -ExpandProperty offset"`
-    ) DO SET "OTA_OFFSET=%%A"
-    FOR /f "usebackq" %%A IN (`powershell -NoProfile -Command ^
-        "(Get-Content '!METAFILE!' | ConvertFrom-Json).part | Where-Object { $_.subtype -eq 'spiffs' } | Select-Object -ExpandProperty offset"`
-    ) DO SET "SPIFFS_OFFSET=%%A"
-) ELSE (
-    CALL :LOG_MESSAGE ERROR "No metadata file found: !METAFILE!"
+IF NOT "!FILENAME:update=!"=="!FILENAME!" (
+    CALL :LOG_MESSAGE DEBUG "We are working with a *update* file. !FILENAME!"
+    CALL :LOG_MESSAGE INFO "Use script device-update.bat to flash update !FILENAME!."
    GOTO eof
+) ELSE (
+    CALL :LOG_MESSAGE DEBUG "We are NOT working with a *update* file. !FILENAME!"
 )

 :skip-filename
@@ -114,7 +108,7 @@ IF NOT "__%PYTHON%__"=="____" (
    SET "ESPTOOL_CMD=!PYTHON! -m esptool"
    CALL :LOG_MESSAGE DEBUG "Python interpreter supplied."
 ) ELSE (
-    CALL :LOG_MESSAGE DEBUG "Python interpreter NOT supplied. Looking for esptool..."
+    CALL :LOG_MESSAGE DEBUG "Python interpreter NOT supplied. Looking for esptool...
    WHERE esptool >nul 2>&1
    IF %ERRORLEVEL% EQU 0 (
        @REM WHERE exits with code 0 if esptool is found.
@@ -152,26 +146,100 @@ IF %BPS_RESET% EQU 1 (
    GOTO eof
 )

-@REM Extract PROGNAME from %FILENAME% for later use.
-SET "PROGNAME=!FILENAME:.factory.bin=!"
-CALL :LOG_MESSAGE DEBUG "Computed PROGNAME: !PROGNAME!"
-
-IF "__!MCU!__" == "__esp32s3__" (
-    @REM We are working with ESP32-S3
-    SET "OTA_FILENAME=bleota-s3.bin"
-) ELSE IF "__!MCU!__" == "__esp32c3__" (
-    @REM We are working with ESP32-C3
-    SET "OTA_FILENAME=bleota-c3.bin"
+@REM Check if FILENAME contains "-tft-" and set target partitionScheme accordingly.
+@REM https://github.com/meshtastic/web-flasher/blob/main/types/resources.ts#L3
+IF NOT "!FILENAME:-tft-=!"=="!FILENAME!" (
+    CALL :LOG_MESSAGE DEBUG "We are working with a *-tft-* file. !FILENAME!"
+    SET "TFT_BUILD=1"
 ) ELSE (
-    @REM Everything else
-    SET "OTA_FILENAME=bleota.bin"
+    CALL :LOG_MESSAGE DEBUG "We are NOT working with a *-tft-* file. !FILENAME!"
 )
+
+FOR %%a IN (%BIGDB_8MB%) DO (
+    IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
+        @REM We are working with any of %BIGDB_8MB%.
+        SET "BIGDB8=1"
+        GOTO end_loop_bigdb_8mb
+    )
+)
+:end_loop_bigdb_8mb
+
+FOR %%a IN (%MUIDB_8MB%) DO (
+    IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
+        @REM We are working with any of %MUIDB_8MB%.
+        SET "MUIDB8=1"
+        GOTO end_loop_muidb_8mb
+    )
+)
+:end_loop_muidb_8mb
+
+FOR %%a IN (%BIGDB_16MB%) DO (
+    IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
+        @REM We are working with any of %BIGDB_16MB%.
+        SET "BIGDB16=1"
+        GOTO end_loop_bigdb_16mb
+    )
+)
+:end_loop_bigdb_16mb
+
+IF %BIGDB8% EQU 1 CALL :LOG_MESSAGE INFO "BigDB 8mb partition selected."
+IF %MUIDB8% EQU 1 CALL :LOG_MESSAGE INFO "MUIDB 8mb partition selected."
+IF %BIGDB16% EQU 1 CALL :LOG_MESSAGE INFO "BigDB 16mb partition selected."
+
+@REM Extract BASENAME from %FILENAME% for later use.
+SET "BASENAME=!FILENAME:firmware-=!"
+CALL :LOG_MESSAGE DEBUG "Computed firmware basename: !BASENAME!"
+
+@REM Account for S3 and C3 board's different OTA partition.
+FOR %%a IN (%S3%) DO (
+    IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
+        @REM We are working with any of %S3%.
+        SET "OTA_FILENAME=bleota-s3.bin"
+        GOTO :end_loop_s3
+    )
+)
+
+FOR %%a IN (%C3%) DO (
+    IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
+        @REM We are working with any of %C3%.
+        SET "OTA_FILENAME=bleota-c3.bin"
+        GOTO :end_loop_c3
+    )
+)
+
+@REM Everything else
+SET "OTA_FILENAME=bleota.bin"
+:end_loop_s3
+:end_loop_c3
 CALL :LOG_MESSAGE DEBUG "Set OTA_FILENAME to: !OTA_FILENAME!"

@REM Set SPIFFS filename with "littlefs-" prefix.
-SET "SPIFFS_FILENAME=littlefs-!PROGNAME:firmware-=!.bin"
+SET "SPIFFS_FILENAME=littlefs-%BASENAME%"
 CALL :LOG_MESSAGE DEBUG "Set SPIFFS_FILENAME to: !SPIFFS_FILENAME!"

+@REM Default offsets.
+@REM https://github.com/meshtastic/web-flasher/blob/main/stores/firmwareStore.ts#L202
+SET "OTA_OFFSET=0x260000"
+SET "SPIFFS_OFFSET=0x300000"
+
+@REM Offsets for BigDB 8mb.
+IF %BIGDB8% EQU 1 (
+    SET "OTA_OFFSET=0x340000"
+    SET "SPIFFS_OFFSET=0x670000"
+)
+
+@REM Offsets for MUIDB 8mb.
+IF %MUIDB8% EQU 1 (
+    SET "OTA_OFFSET=0x5D0000"
+    SET "SPIFFS_OFFSET=0x670000"
+)
+
+@REM Offsets for BigDB 16mb.
+IF %BIGDB16% EQU 1 (
+    SET "OTA_OFFSET=0x650000"
+    SET "SPIFFS_OFFSET=0xc90000"
+)
+
 CALL :LOG_MESSAGE DEBUG "Set OTA_OFFSET to: !OTA_OFFSET!"
 CALL :LOG_MESSAGE DEBUG "Set SPIFFS_OFFSET to: !SPIFFS_OFFSET!"

--- a/bin/device-install.sh
+++ b/bin/device-install.sh
@@ -2,15 +2,69 @@

 PYTHON=${PYTHON:-$(which python3 python | head -n 1)}
 BPS_RESET=false
+TFT_BUILD=false
 MCU=""

 # Constants
 RESET_BAUD=1200
 FIRMWARE_OFFSET=0x00
-# Default littlefs* offset.
-OFFSET=0x300000
-# Default OTA Offset
-OTA_OFFSET=0x260000
+
+# Variant groups
+BIGDB_8MB=(
+    "crowpanel-esp32s3"
+    "heltec_capsule_sensor_v3"
+    "heltec-v3"
+    "heltec-vision-master-e213"
+    "heltec-vision-master-e290"
+    "heltec-vision-master-t190"
+    "heltec-wireless-paper"
+    "heltec-wireless-tracker"
+    "heltec-wsl-v3"
+    "icarus"
+    "seeed-xiao-s3"
+    "tbeam-s3-core"
+    "tracksenger"
+)
+MUIDB_8MB=(
+    "picomputer-s3"
+    "unphone"
+    "seeed-sensecap-indicator"
+)
+BIGDB_16MB=(
+    "dreamcatcher"
+    "elecrow-adv"
+    "ESP32-S3-Pico"
+    "heltec-v4"
+    "m5stack-cores3"
+    "mesh-tab"
+    "station-g2"
+    "t-deck"
+    "t-energy-s3"
+    "t-eth-elite"
+    "t-watch-s3"
+    "tlora-pager"
+)
+S3_VARIANTS=(
+    "s3"
+    "-v3"
+    "-v4"
+    "t-deck"
+    "wireless-paper"
+    "wireless-tracker"
+    "station-g2"
+    "unphone"
+    "t-eth-elite"
+    "tlora-pager"
+    "mesh-tab"
+    "dreamcatcher"
+    "ESP32-S3-Pico"
+    "seeed-sensecap-indicator"
+    "heltec_capsule_sensor_v3"
+    "vision-master"
+    "icarus"
+    "tracksenger"
+    "elecrow-adv"
+)

 # Determine the correct esptool command to use
 if "$PYTHON" -m esptool version >/dev/null 2>&1; then
@@ -24,14 +78,6 @@ else
    exit 1
 fi

-# Check for jq
-if ! command -v jq >/dev/null 2>&1; then
-    echo "Error: jq not found" >&2
-    echo "Install jq with your package manager." >&2
-    echo "e.g. 'apt install jq', 'dnf install jq', 'brew install jq', etc." >&2
-    exit 1
-fi
-
 set -e

 # Usage info
@@ -43,7 +89,7 @@ Flash image file to device, but first erasing and writing system information.
    -h               Display this help and exit.
    -p ESPTOOL_PORT  Set the environment variable for ESPTOOL_PORT.  If not set, ESPTOOL iterates all ports (Dangerous).
    -P PYTHON        Specify alternate python interpreter to use to invoke esptool. (Default: "$PYTHON")
-    -f FILENAME      The firmware *.factory.bin file to flash.  Custom to your device type and region.
+    -f FILENAME      The firmware .bin file to flash.  Custom to your device type and region.
    --1200bps-reset  Attempt to place the device in correct mode. Some hardware requires this twice. (1200bps Reset)

 EOF
@@ -92,43 +138,69 @@ fi
    shift
 }

-if [[ $(basename "$FILENAME") != firmware-*.factory.bin ]]; then
-  echo "Filename must be a firmware-*.factory.bin file."
+if [[ "$FILENAME" != firmware-* ]]; then
+  echo "Filename must be a firmware-* file."
  exit 1
 fi

-# Extract PROGNAME from %FILENAME% for later use.
-PROGNAME="${FILENAME/.factory.bin/}"
-# Derive metadata filename from %PROGNAME%.
-METAFILE="${PROGNAME}.mt.json"
+# Check if FILENAME contains "-tft-" and set target partitionScheme accordingly.
+if [[ "${FILENAME//-tft-/}" != "$FILENAME" ]]; then
+    TFT_BUILD=true
+fi

-if [[ -f "$FILENAME" && "$FILENAME" == *.factory.bin ]]; then
-    # Display metadata if it exists
-    if [[ -f "$METAFILE" ]]; then
-        echo "Firmware metadata: ${METAFILE}"
-        jq . "$METAFILE"
-        # Extract relevant fields from metadata
-        if [[ $(jq -r '.part' "$METAFILE") != "null" ]]; then
-            OTA_OFFSET=$(jq -r '.part[] | select(.subtype == "ota_1") | .offset' "$METAFILE")
-            SPIFFS_OFFSET=$(jq -r '.part[] | select(.subtype == "spiffs") | .offset' "$METAFILE")
+# Extract BASENAME from %FILENAME% for later use.
+BASENAME="${FILENAME/firmware-/}"
+
+if [ -f "${FILENAME}" ] && [ -n "${FILENAME##*"update"*}" ]; then
+    # Default littlefs* offset.
+    OFFSET=0x300000
+
+    # Default OTA Offset
+    OTA_OFFSET=0x260000
+
+    # littlefs* offset for BigDB 8mb and OTA OFFSET.
+    for variant in "${BIGDB_8MB[@]}"; do
+        if [ -z "${FILENAME##*"$variant"*}" ]; then
+            OFFSET=0x670000
+            OTA_OFFSET=0x340000
        fi
-        MCU=$(jq -r '.mcu' "$METAFILE")
-    else
-        echo "ERROR: No metadata file found at ${METAFILE}"
-        exit 1
-    fi
+    done

-    # Determine OTA filename based on MCU type
-    if [ "$MCU" == "esp32s3" ]; then
-        OTAFILE=bleota-s3.bin
-    elif [ "$MCU" == "esp32c3" ]; then
-        OTAFILE=bleota-c3.bin
+    for variant in "${MUIDB_8MB[@]}"; do
+        if [ -z "${FILENAME##*"$variant"*}" ]; then
+            OFFSET=0x670000
+            OTA_OFFSET=0x5D0000
+        fi
+    done
+
+    # littlefs* offset for BigDB 16mb and OTA OFFSET.
+    for variant in "${BIGDB_16MB[@]}"; do
+        if [ -z "${FILENAME##*"$variant"*}" ]; then
+            OFFSET=0xc90000
+            OTA_OFFSET=0x650000
+        fi
+    done
+
+    # Account for S3 board's different OTA partition
+    # FIXME: Use PlatformIO info to determine MCU type, this is unmaintainable
+    for variant in "${S3_VARIANTS[@]}"; do
+        if [ -z "${FILENAME##*"$variant"*}" ]; then
+            MCU="esp32s3"
+        fi
+    done
+
+    if [ "$MCU" != "esp32s3" ]; then
+        if [ -n "${FILENAME##*"esp32c3"*}" ]; then
+            OTAFILE=bleota.bin
+        else
+            OTAFILE=bleota-c3.bin
+        fi
    else
-        OTAFILE=bleota.bin
+        OTAFILE=bleota-s3.bin
    fi

    # Set SPIFFS filename with "littlefs-" prefix.
-    SPIFFSFILE="littlefs-${PROGNAME/firmware-/}.bin"
+    SPIFFSFILE=littlefs-${BASENAME}

    if [[ ! -f "$FILENAME" ]]; then
        echo "Error: file ${FILENAME} wasn't found. Terminating."
--- a/bin/device-update.bat
+++ b/bin/device-update.bat
@@ -30,11 +30,11 @@ ECHO     --change-mode    Attempt to place the device in correct mode. (1200bps
 ECHO                      Some hardware requires this twice.
 ECHO.
 ECHO Example: %SCRIPT_NAME% -p COM17 --change-mode
-ECHO Example: %SCRIPT_NAME% -f firmware-t-deck-tft-2.6.0.0b106d4.bin -p COM11
+ECHO Example: %SCRIPT_NAME% -f firmware-t-deck-tft-2.6.0.0b106d4-update.bin -p COM11
 GOTO eof

 :version
-ECHO %SCRIPT_NAME% [Version 2.7.0]
+ECHO %SCRIPT_NAME% [Version 2.6.2]
 ECHO Meshtastic
 GOTO eof

@@ -78,12 +78,12 @@ IF NOT EXIST !FILENAME! (
    GOTO eof
 )

-IF NOT "__!FILENAME:.factory.bin=!__"=="__!FILENAME!__" (
-    CALL :LOG_MESSAGE DEBUG "We are working with a *.factory.bin* file. !FILENAME!"
+IF "!FILENAME:update=!"=="!FILENAME!" (
+    CALL :LOG_MESSAGE DEBUG "We are NOT working with a *update* file. !FILENAME!"
    CALL :LOG_MESSAGE INFO "Use script device-install.bat to flash !FILENAME!."
    GOTO eof
 ) ELSE (
-    CALL :LOG_MESSAGE DEBUG "We are not working with a *.factory.bin* file. !FILENAME!"
+    CALL :LOG_MESSAGE DEBUG "We are working with a *update* file. !FILENAME!"
 )

 :skip-filename
--- a/bin/device-update.sh
+++ b/bin/device-update.sh
@@ -29,7 +29,7 @@ Flash image file to device, leave existing system intact."
    -h               Display this help and exit
    -p ESPTOOL_PORT  Set the environment variable for ESPTOOL_PORT.  If not set, ESPTOOL iterates all ports (Dangerous).
    -P PYTHON        Specify alternate python interpreter to use to invoke esptool. (Default: "$PYTHON")
-    -f FILENAME      The *.bin file to flash.  Custom to your device type.
+    -f FILENAME      The *update.bin file to flash.  Custom to your device type.
    --change-mode    Attempt to place the device in correct mode. Some hardware requires this twice. (1200bps Reset)

 EOF
@@ -78,7 +78,7 @@ fi
    shift
 }

-if [[ -f "$FILENAME" && "$FILENAME" != *.factory.bin ]]; then
+if [ -f "${FILENAME}" ] && [ -z "${FILENAME##*"update"*}" ]; then
    echo "Trying to flash update ${FILENAME}"
    $ESPTOOL_CMD --baud $FLASH_BAUD write-flash $UPDATE_OFFSET "${FILENAME}"
 else
--- a/bin/exception_decoder.py
+++ b/bin/exception_decoder.py
@@ -75,7 +75,7 @@ TOOLS = {
 }

 BACKTRACE_REGEX = re.compile(
-    r"\b(0x4[0-9a-fA-F]{7,8}):0x[0-9a-fA-F]{8}\b"
+    r"(?:\s+(0x40[0-2](?:\d|[a-f]|[A-F]){5}):0x(?:\d|[a-f]|[A-F]){8})\b"
 )
 EXCEPTION_REGEX = re.compile("^Exception \\((?P<exc>[0-9]*)\\):$")
 COUNTER_REGEX = re.compile(
@@ -89,7 +89,7 @@ POINTER_REGEX = re.compile(
 STACK_BEGIN = ">>>stack>>>"
 STACK_END = "<<<stack<<<"
 STACK_REGEX = re.compile(
-    r"^(?P<off>[0-9a-f]+):\W+(?P<c1>[0-9a-f]+) (?P<c2>[0-9a-f]+) (?P<c3>[0-9a-f]+) (?P<c4>[0-9a-f]+)(\W.*)?$"
+    "^(?P<off>[0-9a-f]+):\W+(?P<c1>[0-9a-f]+) (?P<c2>[0-9a-f]+) (?P<c3>[0-9a-f]+) (?P<c4>[0-9a-f]+)(\W.*)?$"
 )

 StackLine = namedtuple("StackLine", ["offset", "content"])
@@ -223,7 +223,7 @@ class AddressResolver(object):
            if match is None:
                if last is not None and line.startswith("(inlined by)"):
                    line = line[12:].strip()
-                    self._address_map[last] += "\n  \\-> inlined by: " + line
+                    self._address_map[last] += "\n  \-> inlined by: " + line
                continue

            if match.group("result") == "?? ??:0":
--- a/bin/native-gdbserver.sh
+++ b/bin/native-gdbserver.sh
@@ -2,4 +2,4 @@

 set -e
 pio run --environment native
-gdbserver --once localhost:2345 .pio/build/native/meshtasticd "$@"
+gdbserver --once localhost:2345 .pio/build/native/program "$@"
--- a/bin/native-run.sh
+++ b/bin/native-run.sh
@@ -2,4 +2,4 @@

 set -e
 pio run --environment native
-.pio/build/native/meshtasticd "$@"
+.pio/build/native/program "$@"
--- a/bin/org.meshtastic.meshtasticd.metainfo.xml
+++ b/bin/org.meshtastic.meshtasticd.metainfo.xml
@@ -87,12 +87,6 @@
  </screenshots>

  <releases>
-    <release version="2.7.18" date="2025-12-20">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.18</url>
-    </release>
-    <release version="2.7.17" date="2025-11-28">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.17</url>
-    </release>
    <release version="2.7.16" date="2025-11-19">
      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.16</url>
    </release>
--- a/bin/platformio-custom.py
+++ b/bin/platformio-custom.py
@@ -2,77 +2,98 @@
 # trunk-ignore-all(ruff/F821)
 # trunk-ignore-all(flake8/F821): For SConstruct imports
 import sys
-from os.path import join, basename, isfile
+from os.path import join
 import subprocess
 import json
 import re
+import time
 from datetime import datetime

 from readprops import readProps

 Import("env")
 platform = env.PioPlatform()
-progname = env.get("PROGNAME")
-lfsbin = f"{progname.replace('firmware-', 'littlefs-')}.bin"

-def manifest_gather(source, target, env):
-    out = []
-    check_paths = [
-        progname,
-        f"{progname}.elf",
-        f"{progname}.bin",
-        f"{progname}.factory.bin",
-        f"{progname}.hex",
-        f"{progname}.merged.hex",
-        f"{progname}.uf2",
-        f"{progname}.factory.uf2",
-        f"{progname}.zip",
-        lfsbin
+
+def esp32_create_combined_bin(source, target, env):
+    # this sub is borrowed from ESPEasy build toolchain. It's licensed under GPL V3
+    # https://github.com/letscontrolit/ESPEasy/blob/mega/tools/pio/post_esp32.py
+    print("Generating combined binary for serial flashing")
+
+    app_offset = 0x10000
+
+    new_file_name = env.subst("$BUILD_DIR/${PROGNAME}.factory.bin")
+    sections = env.subst(env.get("FLASH_EXTRA_IMAGES"))
+    firmware_name = env.subst("$BUILD_DIR/${PROGNAME}.bin")
+    chip = env.get("BOARD_MCU")
+    flash_size = env.BoardConfig().get("upload.flash_size")
+    flash_freq = env.BoardConfig().get("build.f_flash", "40m")
+    flash_freq = flash_freq.replace("000000L", "m")
+    flash_mode = env.BoardConfig().get("build.flash_mode", "dio")
+    memory_type = env.BoardConfig().get("build.arduino.memory_type", "qio_qspi")
+    if flash_mode == "qio" or flash_mode == "qout":
+        flash_mode = "dio"
+    if memory_type == "opi_opi" or memory_type == "opi_qspi":
+        flash_mode = "dout"
+    cmd = [
+        "--chip",
+        chip,
+        "merge_bin",
+        "-o",
+        new_file_name,
+        "--flash_mode",
+        flash_mode,
+        "--flash_freq",
+        flash_freq,
+        "--flash_size",
+        flash_size,
    ]
-    for p in check_paths:
-        f = env.File(env.subst(f"$BUILD_DIR/{p}"))
-        if f.exists():
-            d = {
-                "name": p,
-                "md5": f.get_content_hash(), # Returns MD5 hash
-                "bytes": f.get_size() # Returns file size in bytes
-            }
-            out.append(d)
-            print(d)
-    manifest_write(out, env)

-def manifest_write(files, env):
-    manifest = {
-        "version": verObj["long"],
-        "build_epoch": build_epoch,
-        "board": env.get("PIOENV"),
-        "mcu": env.get("BOARD_MCU"),
-        "repo": repo_owner,
-        "files": files,
-        "part": None,
-        "has_mui": False,
-        "has_inkhud": False,
-    }
-    # Get partition table (generated in esp32_pre.py) if it exists
-    if env.get("custom_mtjson_part"):
-        # custom_mtjson_part is a JSON string, convert it back to a dict
-        pj = json.loads(env.get("custom_mtjson_part"))
-        manifest["part"] = pj
-    # Enable has_mui for TFT builds
-    if ("HAS_TFT", 1) in env.get("CPPDEFINES", []):
-        manifest["has_mui"] = True
-    if "MESHTASTIC_INCLUDE_INKHUD" in env.get("CPPDEFINES", []):
-        manifest["has_inkhud"] = True
+    print("    Offset | File")
+    for section in sections:
+        sect_adr, sect_file = section.split(" ", 1)
+        print(f" -  {sect_adr} | {sect_file}")
+        cmd += [sect_adr, sect_file]

-    # Write the manifest to the build directory
-    with open(env.subst("$BUILD_DIR/${PROGNAME}.mt.json"), "w") as f:
-        json.dump(manifest, f, indent=2)
+    print(f" - {hex(app_offset)} | {firmware_name}")
+    cmd += [hex(app_offset), firmware_name]
+
+    print("Using esptool.py arguments: %s" % " ".join(cmd))
+
+    esptool.main(cmd)
+
+
+if platform.name == "espressif32":
+    sys.path.append(join(platform.get_package_dir("tool-esptoolpy")))
+    import esptool
+
+    env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", esp32_create_combined_bin)
+
+    esp32_kind = env.GetProjectOption("custom_esp32_kind")
+    if esp32_kind == "esp32":
+        # Free up some IRAM by removing auxiliary SPI flash chip drivers.
+        # Wrapped stub symbols are defined in src/platform/esp32/iram-quirk.c.
+        env.Append(
+            LINKFLAGS=[
+                "-Wl,--wrap=esp_flash_chip_gd",
+                "-Wl,--wrap=esp_flash_chip_issi",
+                "-Wl,--wrap=esp_flash_chip_winbond",
+            ]
+        )
+    else:
+        # For newer ESP32 targets, using newlib nano works better.
+        env.Append(LINKFLAGS=["--specs=nano.specs", "-u", "_printf_float"])
+
+if platform.name == "nordicnrf52":
+    env.AddPostAction("$BUILD_DIR/${PROGNAME}.hex",
+                      env.VerboseAction(f"\"{sys.executable}\" ./bin/uf2conv.py \"$BUILD_DIR/firmware.hex\" -c -f 0xADA52840 -o \"$BUILD_DIR/firmware.uf2\"",
+                                        "Generating UF2 file"))

 Import("projenv")

 prefsLoc = projenv["PROJECT_DIR"] + "/version.properties"
 verObj = readProps(prefsLoc)
-print(f"Using meshtastic platformio-custom.py, firmware version {verObj['long']} on {env.get('PIOENV')}")
+print("Using meshtastic platformio-custom.py, firmware version " + verObj["long"] + " on " + env.get("PIOENV"))

 # get repository owner if git is installed
 try:
@@ -118,10 +139,10 @@ flags = [
        "-DBUILD_EPOCH=" + str(build_epoch),
    ] + pref_flags

-print("Using flags:")
+print ("Using flags:")
 for flag in flags:
    print(flag)
-
+    
 projenv.Append(
    CCFLAGS=flags,
 )
@@ -159,22 +180,4 @@ def load_boot_logo(source, target, env):

 # Load the boot logo on TFT builds
 if ("HAS_TFT", 1) in env.get("CPPDEFINES", []):
-    env.AddPreAction(f"$BUILD_DIR/{lfsbin}", load_boot_logo)
-
-mtjson_deps = ["buildprog"]
-if platform.name == "espressif32":
-    # Build littlefs image as part of mtjson target
-    # Equivalent to `pio run -t buildfs`
-    target_lfs = env.DataToBin(
-        join("$BUILD_DIR", "${ESP32_FS_IMAGE_NAME}"), "$PROJECT_DATA_DIR"
-    )
-    mtjson_deps.append(target_lfs)
-
-env.AddCustomTarget(
-    name="mtjson",
-    dependencies=mtjson_deps,
-    actions=[manifest_gather],
-    title="Meshtastic Manifest",
-    description="Generating Meshtastic manifest JSON + Checksums",
-    always_build=False,
-)
+    env.AddPreAction('$BUILD_DIR/littlefs.bin', load_boot_logo)
--- a/bin/platformio-pre.py
+++ b/bin/platformio-pre.py
@@ -1,19 +0,0 @@
-#!/usr/bin/env python3
-# trunk-ignore-all(ruff/F821)
-# trunk-ignore-all(flake8/F821): For SConstruct imports
-Import("env")
-platform = env.PioPlatform()
-
-if platform.name == "native":
-    env.Replace(PROGNAME="meshtasticd")
-else:
-    from readprops import readProps
-    prefsLoc = env["PROJECT_DIR"] + "/version.properties"
-    verObj = readProps(prefsLoc)
-    env.Replace(PROGNAME=f"firmware-{env.get('PIOENV')}-{verObj['long']}")
-    env.Replace(ESP32_FS_IMAGE_NAME=f"littlefs-{env.get('PIOENV')}-{verObj['long']}")
-
-# Print the new program name for verification
-print(f"PROGNAME: {env.get('PROGNAME')}")
-if platform.name == "espressif32":
-    print(f"ESP32_FS_IMAGE_NAME: {env.get('ESP32_FS_IMAGE_NAME')}")
--- a/bin/test-simulator.sh
+++ b/bin/test-simulator.sh
@@ -3,7 +3,7 @@
 set -e

 echo "Starting simulator"
-.pio/build/native/meshtasticd -s &
+.pio/build/native/program &
 sleep 20 # 5 seconds was not enough

 echo "Simulator started, launching python test..."
--- a/boards/heltec_v4.json
+++ b/boards/heltec_v4.json
@@ -9,7 +9,7 @@
    "extra_flags": [
      "-DBOARD_HAS_PSRAM",
      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=1",
+      "-DARDUINO_USB_MODE=0",
      "-DARDUINO_RUNNING_CORE=1",
      "-DARDUINO_EVENT_RUNNING_CORE=1"
    ],
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,3 @@
-meshtasticd (2.7.18.0) unstable; urgency=medium
-
-  * Version 2.7.18
-
- -- GitHub Actions <github-actions[bot]@users.noreply.github.com>  Sat, 20 Dec 2025 15:47:25 +0000
-
-meshtasticd (2.7.17.0) unstable; urgency=medium
-
-  * Version 2.7.17
-
- -- GitHub Actions <github-actions[bot]@users.noreply.github.com>  Fri, 28 Nov 2025 15:11:34 +0000
-
 meshtasticd (2.7.16.0) unstable; urgency=medium

  * Version 2.7.16
--- a/debian/rules
+++ b/debian/rules
@@ -28,4 +28,5 @@ override_dh_auto_build:
 	# Build with platformio
 	$(PIO_ENV) platformio run -e native-tft
 	# Move the binary and default config to the correct name
+	mv .pio/build/native-tft/program .pio/build/native-tft/meshtasticd
 	cp bin/config-dist.yaml bin/config.yaml
--- a/extra_scripts/disable_adafruit_usb.py
+++ b/extra_scripts/disable_adafruit_usb.py
@@ -1,9 +1,10 @@
-#!/usr/bin/env python3
 # trunk-ignore-all(flake8/F821)
 # trunk-ignore-all(ruff/F821)

 Import("env")

+# NOTE: This is not currently used, but can serve as an example on how to write extra_scripts
+
 # print("Current CLI targets", COMMAND_LINE_TARGETS)
 # print("Current Build targets", BUILD_TARGETS)
 # print("CPP defs", env.get("CPPDEFINES"))
--- a/extra_scripts/esp32_extra.py
+++ b/extra_scripts/esp32_extra.py
@@ -1,86 +0,0 @@
-#!/usr/bin/env python3
-# trunk-ignore-all(ruff/F821)
-# trunk-ignore-all(flake8/F821): For SConstruct imports
-# trunk-ignore-all(ruff/E402): Hacky esptool import
-# trunk-ignore-all(flake8/E402): Hacky esptool import
-import sys
-from os.path import join
-
-Import("env")
-platform = env.PioPlatform()
-
-sys.path.append(join(platform.get_package_dir("tool-esptoolpy")))
-# IntelHex workaround, remove after fixed upstream
-# https://github.com/platformio/platform-espressif32/issues/1632
-try:
-    import intelhex
-except ImportError:
-    env.Execute("$PYTHONEXE -m pip install intelhex")
-import esptool
-
-
-def esp32_create_combined_bin(source, target, env):
-    # this sub is borrowed from ESPEasy build toolchain. It's licensed under GPL V3
-    # https://github.com/letscontrolit/ESPEasy/blob/mega/tools/pio/post_esp32.py
-    print("Generating combined binary for serial flashing")
-
-    app_offset = 0x10000
-
-    new_file_name = env.subst("$BUILD_DIR/${PROGNAME}.factory.bin")
-    sections = env.subst(env.get("FLASH_EXTRA_IMAGES"))
-    firmware_name = env.subst("$BUILD_DIR/${PROGNAME}.bin")
-    chip = env.get("BOARD_MCU")
-    board = env.BoardConfig()
-    flash_size = board.get("upload.flash_size")
-    flash_freq = board.get("build.f_flash", "40m")
-    flash_freq = flash_freq.replace("000000L", "m")
-    flash_mode = board.get("build.flash_mode", "dio")
-    memory_type = board.get("build.arduino.memory_type", "qio_qspi")
-    if flash_mode == "qio" or flash_mode == "qout":
-        flash_mode = "dio"
-    if memory_type == "opi_opi" or memory_type == "opi_qspi":
-        flash_mode = "dout"
-    cmd = [
-        "--chip",
-        chip,
-        "merge_bin",
-        "-o",
-        new_file_name,
-        "--flash_mode",
-        flash_mode,
-        "--flash_freq",
-        flash_freq,
-        "--flash_size",
-        flash_size,
-    ]
-
-    print("    Offset | File")
-    for section in sections:
-        sect_adr, sect_file = section.split(" ", 1)
-        print(f" -  {sect_adr} | {sect_file}")
-        cmd += [sect_adr, sect_file]
-
-    print(f" - {hex(app_offset)} | {firmware_name}")
-    cmd += [hex(app_offset), firmware_name]
-
-    print("Using esptool.py arguments: %s" % " ".join(cmd))
-
-    esptool.main(cmd)
-
-
-env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", esp32_create_combined_bin)
-
-esp32_kind = env.GetProjectOption("custom_esp32_kind")
-if esp32_kind == "esp32":
-    # Free up some IRAM by removing auxiliary SPI flash chip drivers.
-    # Wrapped stub symbols are defined in src/platform/esp32/iram-quirk.c.
-    env.Append(
-        LINKFLAGS=[
-            "-Wl,--wrap=esp_flash_chip_gd",
-            "-Wl,--wrap=esp_flash_chip_issi",
-            "-Wl,--wrap=esp_flash_chip_winbond",
-        ]
-    )
-else:
-    # For newer ESP32 targets, using newlib nano works better.
-    env.Append(LINKFLAGS=["--specs=nano.specs", "-u", "_printf_float"])
--- a/extra_scripts/esp32_pre.py
+++ b/extra_scripts/esp32_pre.py
@@ -1,73 +0,0 @@
-#!/usr/bin/env python3
-# trunk-ignore-all(ruff/F821)
-# trunk-ignore-all(flake8/F821): For SConstruct imports
-import json
-import sys
-from os.path import isfile
-
-Import("env")
-
-
-# From https://github.com/platformio/platform-espressif32/blob/develop/builder/main.py
-def _parse_size(value):
-    if isinstance(value, int):
-        return value
-    elif value.isdigit():
-        return int(value)
-    elif value.startswith("0x"):
-        return int(value, 16)
-    elif value[-1].upper() in ("K", "M"):
-        base = 1024 if value[-1].upper() == "K" else 1024 * 1024
-        return int(value[:-1]) * base
-    return value
-
-
-def _parse_partitions(env):
-    partitions_csv = env.subst("$PARTITIONS_TABLE_CSV")
-    if not isfile(partitions_csv):
-        sys.stderr.write(
-            "Could not find the file %s with partitions " "table.\n" % partitions_csv
-        )
-        env.Exit(1)
-        return
-
-    result = []
-    # The first offset is 0x9000 because partition table is flashed to 0x8000 and
-    # occupies an entire flash sector, which size is 0x1000
-    next_offset = 0x9000
-    with open(partitions_csv) as fp:
-        for line in fp.readlines():
-            line = line.strip()
-            if not line or line.startswith("#"):
-                continue
-            tokens = [t.strip() for t in line.split(",")]
-            if len(tokens) < 5:
-                continue
-
-            bound = 0x10000 if tokens[1] in ("0", "app") else 4
-            calculated_offset = (next_offset + bound - 1) & ~(bound - 1)
-            partition = {
-                "name": tokens[0],
-                "type": tokens[1],
-                "subtype": tokens[2],
-                "offset": tokens[3] or calculated_offset,
-                "size": tokens[4],
-                "flags": tokens[5] if len(tokens) > 5 else None,
-            }
-            result.append(partition)
-            next_offset = _parse_size(partition["offset"]) + _parse_size(
-                partition["size"]
-            )
-
-    return result
-
-
-def mtjson_esp32_part(target, source, env):
-    part = _parse_partitions(env)
-    pj = json.dumps(part)
-    # print(f"JSON_PARTITIONS: {pj}")
-    # Dump json string to 'custom_mtjson_part' variable to use later when writing the manifest
-    env.Replace(custom_mtjson_part=pj)
-
-
-env.AddPreAction("mtjson", mtjson_esp32_part)
--- a/extra_scripts/extra_stm32.py
+++ b/extra_scripts/extra_stm32.py
@@ -1,9 +1,7 @@
-#!/usr/bin/env python3
 # trunk-ignore-all(ruff/F821)
 # trunk-ignore-all(flake8/F821): For SConstruct imports

 Import("env")
-
 # Custom HEX from ELF
 env.AddPostAction(
    "$BUILD_DIR/${PROGNAME}.elf",
--- a/extra_scripts/nrf52_extra.py
+++ b/extra_scripts/nrf52_extra.py
@@ -1,50 +0,0 @@
-#!/usr/bin/env python3
-# trunk-ignore-all(ruff/F821)
-# trunk-ignore-all(flake8/F821): For SConstruct imports
-
-import sys
-from os.path import basename
-
-Import("env")
-
-
-# Custom HEX from ELF
-# Convert hex to uf2 for nrf52
-def nrf52_hex_to_uf2(source, target, env):
-    hex_path = target[0].get_abspath()
-    # When using merged hex, drop 'merged' from uf2 filename
-    uf2_path = hex_path.replace(".merged.", ".")
-    uf2_path = uf2_path.replace(".hex", ".uf2")
-    env.Execute(
-        env.VerboseAction(
-            f'"{sys.executable}" ./bin/uf2conv.py "{hex_path}" -c -f 0xADA52840 -o "{uf2_path}"',
-            f"Generating UF2 file from {basename(hex_path)}",
-        )
-    )
-
-
-def nrf52_mergehex(source, target, env):
-    hex_path = target[0].get_abspath()
-    merged_hex_path = hex_path.replace(".hex", ".merged.hex")
-    merge_with = None
-    if "wio-sdk-wm1110" == str(env.get("PIOENV")):
-        merge_with = env.subst("$PROJECT_DIR/bin/s140_nrf52_7.3.0_softdevice.hex")
-    else:
-        print("merge_with not defined for this target")
-
-    if merge_with is not None:
-        env.Execute(
-            env.VerboseAction(
-                f'"$PROJECT_DIR/bin/mergehex" -m "{hex_path}" "{merge_with}" -o "{merged_hex_path}"',
-                "Merging HEX with SoftDevice",
-            )
-        )
-        print(f'Merged file saved at "{basename(merged_hex_path)}"')
-        nrf52_hex_to_uf2([hex_path, merge_with], [env.File(merged_hex_path)], env)
-
-
-# if WM1110 target, merge hex with softdevice 7.3.0
-if "wio-sdk-wm1110" == env.get("PIOENV"):
-    env.AddPostAction("$BUILD_DIR/${PROGNAME}.hex", nrf52_mergehex)
-else:
-    env.AddPostAction("$BUILD_DIR/${PROGNAME}.hex", nrf52_hex_to_uf2)
--- a/meshtasticd.spec.rpkg
+++ b/meshtasticd.spec.rpkg
@@ -33,6 +33,7 @@ BuildRequires: python3dist(grpcio[protobuf])
 BuildRequires: python3dist(grpcio-tools)
 BuildRequires: git-core
 BuildRequires: gcc-c++
+BuildRequires: (glibc-devel >= 2.38) or pkgconfig(libbsd-overlay)
 BuildRequires: pkgconfig(yaml-cpp)
 BuildRequires: pkgconfig(libgpiod)
 BuildRequires: pkgconfig(bluez)
@@ -76,7 +77,7 @@ platformio run -e native-tft
 %install
 # Install meshtasticd binary
 mkdir -p %{buildroot}%{_bindir}
-install -m 0755 .pio/build/native-tft/meshtasticd %{buildroot}%{_bindir}/meshtasticd
+install -m 0755 .pio/build/native-tft/program %{buildroot}%{_bindir}/meshtasticd

 # Install portduino VFS dir
 install -p -d -m 0770 %{buildroot}%{_localstatedir}/lib/meshtasticd
--- a/platformio.ini
+++ b/platformio.ini
@@ -5,7 +5,7 @@
 default_envs = tbeam

 extra_configs =
-	variants/*/*.ini
+	arch/*/*.ini
 	variants/*/*/platformio.ini
 	variants/*/diy/*/platformio.ini
 	src/graphics/niche/InkHUD/PlatformioConfig.ini
@@ -14,9 +14,7 @@ description = Meshtastic

 [env]
 test_build_src = true
-extra_scripts =
-	pre:bin/platformio-pre.py
-	bin/platformio-custom.py
+extra_scripts = bin/platformio-custom.py
 ; note: we add src to our include search path so that lmic_project_config can override
 ; note: TINYGPS_OPTION_NO_CUSTOM_FIELDS is VERY important.  We don't use custom fields and somewhere in that pile
 ; of code is a heap corruption bug!
@@ -94,7 +92,7 @@ lib_deps =
 	# renovate: datasource=custom.pio depName=NonBlockingRTTTL packageName=end2endzone/library/NonBlockingRTTTL
 	end2endzone/NonBlockingRTTTL@1.4.0
 build_flags = ${env.build_flags} -Os
-build_src_filter = ${env.build_src_filter} -<platform/portduino/> -<graphics/niche/> -<modules/Native/>
+build_src_filter = ${env.build_src_filter} -<platform/portduino/> -<graphics/niche/>

 ; Common libs for communicating over TCP/IP networks such as MQTT
 [networking_base]
@@ -103,13 +101,17 @@ lib_deps =
 	thingsboard/TBPubSubClient@2.12.1
 	# renovate: datasource=custom.pio depName=NTPClient packageName=arduino-libraries/library/NTPClient
 	arduino-libraries/NTPClient@3.2.1
-
-; Extra TCP/IP networking libs for supported devices
-[networking_extra]
-lib_deps =
 	# renovate: datasource=custom.pio depName=Syslog packageName=arcao/library/Syslog
 	arcao/Syslog@2.0.0

+; Minimal networking libs for nrf52 (excludes Syslog to save flash)
+[nrf52_networking_base]
+lib_deps =
+	# renovate: datasource=custom.pio depName=TBPubSubClient packageName=thingsboard/library/TBPubSubClient
+	thingsboard/TBPubSubClient@2.12.1
+	# renovate: datasource=custom.pio depName=NTPClient packageName=arduino-libraries/library/NTPClient
+	arduino-libraries/NTPClient@3.2.1
+
 [radiolib_base]
 lib_deps =
 	# renovate: datasource=custom.pio depName=RadioLib packageName=jgromes/library/RadioLib
@@ -119,7 +121,7 @@ lib_deps =
 [device-ui_base]
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
-	https://github.com/meshtastic/device-ui/archive/862ed040c4ab44f0dfbbe492691f144886102588.zip
+	https://github.com/meshtastic/device-ui/archive/28167c67dfd13015a0b5eef1828f95fe8e3ab7c3.zip

 ; Common libs for environmental measurements in telemetry module
 [environmental_base]
@@ -158,8 +160,8 @@ lib_deps =
 	emotibit/EmotiBit MLX90632@1.0.8
 	# renovate: datasource=custom.pio depName=Adafruit MLX90614 packageName=adafruit/library/Adafruit MLX90614 Library
 	adafruit/Adafruit MLX90614 Library@2.1.5
-	# renovate: datasource=git-refs depName=INA3221 packageName=https://github.com/sgtwilko/INA3221 gitBranch=FixOverflow
-	https://github.com/sgtwilko/INA3221/archive/bb03d7e9bfcc74fc798838a54f4f99738f29fc6a.zip
+	# renovate: datasource=github-tags depName=INA3221 packageName=sgtwilko/INA3221
+	https://github.com/sgtwilko/INA3221#bb03d7e9bfcc74fc798838a54f4f99738f29fc6a
 	# renovate: datasource=custom.pio depName=QMC5883L Compass packageName=mprograms/library/QMC5883LCompass
 	mprograms/QMC5883LCompass@1.2.3
 	# renovate: datasource=custom.pio depName=DFRobot_RTU packageName=dfrobot/library/DFRobot_RTU
@@ -180,8 +182,8 @@ lib_deps =
 	dfrobot/DFRobot_BMM150@1.0.0
 	# renovate: datasource=custom.pio depName=Adafruit_TSL2561 packageName=adafruit/library/Adafruit TSL2561
 	adafruit/Adafruit TSL2561@1.1.2
-	# renovate: datasource=custom.pio depName=BH1750_WE packageName=wollewald/library/BH1750_WE
-	wollewald/BH1750_WE@1.1.10
+	# renovate: datasource=custom.pio depName=BH1750_WE packageName=wollewald/BH1750_WE@^1.1.10
+	wollewald/BH1750_WE@^1.1.10

 ; (not included in native / portduino)
 [environmental_extra]
@@ -203,7 +205,7 @@ lib_deps =
 	# renovate: datasource=custom.pio depName=SparkFun Qwiic Scale NAU7802 packageName=sparkfun/library/SparkFun Qwiic Scale NAU7802 Arduino Library
 	sparkfun/SparkFun Qwiic Scale NAU7802 Arduino Library@1.0.6
 	# renovate: datasource=custom.pio depName=ClosedCube OPT3001 packageName=closedcube/library/ClosedCube OPT3001
-	closedcube/ClosedCube OPT3001@1.1.2
+	ClosedCube OPT3001@1.1.2
 	# renovate: datasource=custom.pio depName=Bosch BSEC2 packageName=boschsensortec/library/bsec2
 	boschsensortec/bsec2@1.10.2610
 	# renovate: datasource=custom.pio depName=Bosch BME68x packageName=boschsensortec/library/BME68x Sensor Library
--- a/2
+++ b/2
--- a/src/AudioThread.h
+++ b/src/AudioThread.h
@@ -50,11 +50,8 @@ class AudioThread : public concurrency::OSThread
            delete i2sRtttl;
            i2sRtttl = nullptr;
        }
-
-        if (rtttlFile != nullptr) {
-            delete rtttlFile;
-            rtttlFile = nullptr;
-        }
+        delete rtttlFile;
+        rtttlFile = nullptr;

        setCPUFast(false);
 #ifdef T_LORA_PAGER
@@ -102,9 +99,9 @@ class AudioThread : public concurrency::OSThread
    };

    AudioGeneratorRTTTL *i2sRtttl = nullptr;
-    AudioOutputI2S *audioOut = nullptr;
+    AudioOutputI2S *audioOut;

-    AudioFileSourcePROGMEM *rtttlFile = nullptr;
+    AudioFileSourcePROGMEM *rtttlFile;
 };

 #endif
--- a/src/DisplayFormatters.cpp
+++ b/src/DisplayFormatters.cpp
@@ -31,9 +31,6 @@ const char *DisplayFormatters::getModemPresetDisplayName(meshtastic_Config_LoRaC
    case meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST:
        return useShortName ? "LongF" : "LongFast";
        break;
-    case meshtastic_Config_LoRaConfig_ModemPreset_LONG_TURBO:
-        return useShortName ? "LongT" : "LongTurbo";
-        break;
    case meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE:
        return useShortName ? "LongM" : "LongMod";
        break;
--- a/src/buzz/buzz.cpp
+++ b/src/buzz/buzz.cpp
@@ -16,7 +16,6 @@ struct ToneDuration {
 };

 // Some common frequencies.
-#define NOTE_SILENT 1
 #define NOTE_C3 131
 #define NOTE_CS3 139
 #define NOTE_D3 147
@@ -30,16 +29,11 @@ struct ToneDuration {
 #define NOTE_AS3 233
 #define NOTE_B3 247
 #define NOTE_CS4 277
-#define NOTE_B4 494
-#define NOTE_F5 698
-#define NOTE_G6 1568
-#define NOTE_E7 2637

-const int DURATION_1_16 = 62;  // 1/16 note
 const int DURATION_1_8 = 125;  // 1/8 note
 const int DURATION_1_4 = 250;  // 1/4 note
 const int DURATION_1_2 = 500;  // 1/2 note
-const int DURATION_3_4 = 750;  // 3/4 note
+const int DURATION_3_4 = 750;  // 1/4 note
 const int DURATION_1_1 = 1000; // 1/1 note

 void playTones(const ToneDuration *tone_durations, int size)
@@ -77,24 +71,13 @@ void playLongBeep()

 void playGPSEnableBeep()
 {
-#if defined(R1_NEO) || defined(MUZI_BASE)
-    ToneDuration melody[] = {
-        {NOTE_F5, DURATION_1_2}, {NOTE_G6, DURATION_1_8}, {NOTE_E7, DURATION_1_4}, {NOTE_SILENT, DURATION_1_2}};
-#else
    ToneDuration melody[] = {{NOTE_C3, DURATION_1_8}, {NOTE_FS3, DURATION_1_4}, {NOTE_CS4, DURATION_1_4}};
-#endif
    playTones(melody, sizeof(melody) / sizeof(ToneDuration));
 }

 void playGPSDisableBeep()
 {
-#if defined(R1_NEO) || defined(MUZI_BASE)
-    ToneDuration melody[] = {{NOTE_B4, DURATION_1_16}, {NOTE_B4, DURATION_1_16},   {NOTE_SILENT, DURATION_1_8},
-                             {NOTE_F3, DURATION_1_16}, {NOTE_F3, DURATION_1_16},   {NOTE_SILENT, DURATION_1_8},
-                             {NOTE_C3, DURATION_1_1},  {NOTE_SILENT, DURATION_1_1}};
-#else
    ToneDuration melody[] = {{NOTE_CS4, DURATION_1_8}, {NOTE_FS3, DURATION_1_4}, {NOTE_C3, DURATION_1_4}};
-#endif
    playTones(melody, sizeof(melody) / sizeof(ToneDuration));
 }

--- a/src/configuration.h
+++ b/src/configuration.h
@@ -36,29 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Offer chance for variant-specific defines */
 #include "variant.h"

-// -----------------------------------------------------------------------------
-// Display feature overrides
-// -----------------------------------------------------------------------------
-
-// Allow build environments to opt-in explicitly to the E-Ink UI stack while
-// keeping headless targets slim by default. Existing variants that already
-// define USE_EINK continue to work without additional flags.
-#ifndef MESHTASTIC_USE_EINK_UI
-#ifdef USE_EINK
-#define MESHTASTIC_USE_EINK_UI 1
-#else
-#define MESHTASTIC_USE_EINK_UI 0
-#endif
-#endif
-
-#if MESHTASTIC_USE_EINK_UI
-#ifndef USE_EINK
-#define USE_EINK
-#endif
-#else
-#undef USE_EINK
-#endif
-
 // -----------------------------------------------------------------------------
 // Version
 // -----------------------------------------------------------------------------
@@ -394,9 +371,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef HAS_BLUETOOTH
 #define HAS_BLUETOOTH 0
 #endif
-#ifndef USE_TFTDISPLAY
-#define USE_TFTDISPLAY 0
-#endif

 #ifndef HW_VENDOR
 #error HW_VENDOR must be defined
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -69,11 +69,7 @@ using graphics::Emote;
 using graphics::emotes;
 using graphics::numEmotes;

-#if USE_TFTDISPLAY
 extern uint16_t TFT_MESH;
-#else
-uint16_t TFT_MESH = COLOR565(0x67, 0xEA, 0x94);
-#endif

 #if HAS_WIFI && !defined(ARCH_PORTDUINO)
 #include "mesh/wifi/WiFiAPClient.h"
@@ -230,9 +226,24 @@ void Screen::showTextInput(const char *header, const char *initialText, uint32_t
 {
    LOG_INFO("showTextInput called with header='%s', durationMs=%d", header ? header : "NULL", durationMs);

-    // Start OnScreenKeyboardModule session (non-touch variant)
-    OnScreenKeyboardModule::instance().start(header, initialText, durationMs, textCallback);
+    if (NotificationRenderer::virtualKeyboard) {
+        delete NotificationRenderer::virtualKeyboard;
+        NotificationRenderer::virtualKeyboard = nullptr;
+    }
+
+    NotificationRenderer::textInputCallback = nullptr;
+
+    NotificationRenderer::virtualKeyboard = new VirtualKeyboard();
+    if (header) {
+        NotificationRenderer::virtualKeyboard->setHeader(header);
+    }
+    if (initialText) {
+        NotificationRenderer::virtualKeyboard->setInputText(initialText);
+    }
+
+    // Set up callback with safer cleanup mechanism
    NotificationRenderer::textInputCallback = textCallback;
+    NotificationRenderer::virtualKeyboard->setCallback([textCallback](const std::string &text) { textCallback(text); });

    // Store the message and set the expiration timestamp (use same pattern as other notifications)
    strncpy(NotificationRenderer::alertBannerMessage, header ? header : "Text Input", 255);
@@ -1498,14 +1509,14 @@ int Screen::handleTextMessage(const meshtastic_MeshPacket *packet)
            // Incoming message
            devicestate.has_rx_text_message = true; // Needed to include the message frame
            hasUnreadMessage = true;                // Enables mail icon in the header
-            setFrames(FOCUS_PRESERVE);              // Refresh frame list without switching view (no-op during text_input)
+            setFrames(FOCUS_PRESERVE);              // Refresh frame list without switching view

            // Only wake/force display if the configuration allows it
            if (shouldWakeOnReceivedMessage()) {
                setOn(true);    // Wake up the screen first
                forceDisplay(); // Forces screen redraw
            }
-            // === Prepare banner/popup content ===
+            // === Prepare banner content ===
            const meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(packet->from);
            const meshtastic_Channel channel =
                channels.getByIndex(packet->channel ? packet->channel : channels.getPrimaryIndex());
@@ -1529,84 +1540,38 @@ int Screen::handleTextMessage(const meshtastic_MeshPacket *packet)

            // Unlike generic messages, alerts (when enabled via the ext notif module) ignore any
            // 'mute' preferences set to any specific node or channel.
-            // If on-screen keyboard is active, show a transient popup over keyboard instead of interrupting it
-            if (NotificationRenderer::current_notification_type == notificationTypeEnum::text_input) {
-                // Wake and force redraw so popup is visible immediately
-                if (shouldWakeOnReceivedMessage()) {
-                    setOn(true);
-                    forceDisplay();
-                }
-
-                // Build popup: title = message source name, content = message text (sanitized)
-                // Title
-                char titleBuf[64] = {0};
+            if (isAlert) {
                if (longName && longName[0]) {
-                    // Sanitize sender name
-                    std::string t = sanitizeString(longName);
-                    strncpy(titleBuf, t.c_str(), sizeof(titleBuf) - 1);
+                    snprintf(banner, sizeof(banner), "Alert Received from\n%s", longName);
                } else {
-                    strncpy(titleBuf, "Message", sizeof(titleBuf) - 1);
+                    strcpy(banner, "Alert Received");
                }
-
-                // Content: payload bytes may not be null-terminated, remove ASCII_BELL and sanitize
-                char content[256] = {0};
-                {
-                    std::string raw;
-                    raw.reserve(packet->decoded.payload.size);
-                    for (size_t i = 0; i < packet->decoded.payload.size; ++i) {
-                        char c = msgRaw[i];
-                        if (c == ASCII_BELL)
-                            continue; // strip bell
-                        raw.push_back(c);
-                    }
-                    std::string sanitized = sanitizeString(raw);
-                    strncpy(content, sanitized.c_str(), sizeof(content) - 1);
-                }
-
-                NotificationRenderer::showKeyboardMessagePopupWithTitle(titleBuf, content, 3000);
-
-// Maintain existing buzzer behavior on M5 if applicable
+                screen->showSimpleBanner(banner, 3000);
+            } else if (!channel.settings.has_module_settings || !channel.settings.module_settings.is_muted) {
+                if (longName && longName[0]) {
 #if defined(M5STACK_UNITC6L)
+                    strcpy(banner, "New Message");
+#else
+                    snprintf(banner, sizeof(banner), "New Message from\n%s", longName);
+#endif
+
+                } else {
+                    strcpy(banner, "New Message");
+                }
+#if defined(M5STACK_UNITC6L)
+                screen->setOn(true);
+                screen->showSimpleBanner(banner, 1500);
                if (config.device.buzzer_mode != meshtastic_Config_DeviceConfig_BuzzerMode_DIRECT_MSG_ONLY ||
                    (isAlert && moduleConfig.external_notification.alert_bell_buzzer) ||
                    (!isBroadcast(packet->to) && isToUs(packet))) {
+                    // Beep if not in DIRECT_MSG_ONLY mode or if in DIRECT_MSG_ONLY mode and either
+                    // - packet contains an alert and alert bell buzzer is enabled
+                    // - packet is a non-broadcast that is addressed to this node
                    playLongBeep();
                }
-#endif
-            } else {
-                // No keyboard active: use regular banner flow, respecting mute settings
-                if (isAlert) {
-                    if (longName && longName[0]) {
-                        snprintf(banner, sizeof(banner), "Alert Received from\n%s", longName);
-                    } else {
-                        strcpy(banner, "Alert Received");
-                    }
-                    screen->showSimpleBanner(banner, 3000);
-                } else if (!channel.settings.has_module_settings || !channel.settings.module_settings.is_muted) {
-                    if (longName && longName[0]) {
-#if defined(M5STACK_UNITC6L)
-                        strcpy(banner, "New Message");
 #else
-                        snprintf(banner, sizeof(banner), "New Message from\n%s", longName);
+                screen->showSimpleBanner(banner, 3000);
 #endif
-                    } else {
-                        strcpy(banner, "New Message");
-                    }
-#if defined(M5STACK_UNITC6L)
-                    screen->setOn(true);
-                    screen->showSimpleBanner(banner, 1500);
-                    if (config.device.buzzer_mode != meshtastic_Config_DeviceConfig_BuzzerMode_DIRECT_MSG_ONLY ||
-                        (isAlert && moduleConfig.external_notification.alert_bell_buzzer) ||
-                        (!isBroadcast(packet->to) && isToUs(packet))) {
-                        // Beep if not in DIRECT_MSG_ONLY mode or if in DIRECT_MSG_ONLY mode and either
-                        // - packet contains an alert and alert bell buzzer is enabled
-                        // - packet is a non-broadcast that is addressed to this node
-                        playLongBeep();
-                    }
-#else
-                    screen->showSimpleBanner(banner, 3000);
-#endif
-                }
            }
        }
    }
@@ -1689,12 +1654,6 @@ int Screen::handleInputEvent(const InputEvent *event)
                showPrevFrame();
            } else if (event->inputEvent == INPUT_BROKER_RIGHT || event->inputEvent == INPUT_BROKER_USER_PRESS) {
                showNextFrame();
-            } else if (event->inputEvent == INPUT_BROKER_UP_LONG) {
-                // Long press up button for fast frame switching
-                showPrevFrame();
-            } else if (event->inputEvent == INPUT_BROKER_DOWN_LONG) {
-                // Long press down button for fast frame switching
-                showNextFrame();
            } else if (event->inputEvent == INPUT_BROKER_SELECT) {
                if (this->ui->getUiState()->currentFrame == framesetInfo.positions.home) {
                    menuHandler::homeBaseMenu();
--- a/src/graphics/TFTDisplay.cpp
+++ b/src/graphics/TFTDisplay.cpp
@@ -1,6 +1,5 @@
 #include "configuration.h"
 #include "main.h"
-#if USE_TFTDISPLAY

 #if ARCH_PORTDUINO
 #include "platform/portduino/PortduinoGlue.h"
@@ -1139,6 +1138,9 @@ static LGFX *tft = nullptr;

 #endif

+#if defined(ST7701_CS) || defined(ST7735_CS) || defined(ST7789_CS) || defined(ST7796_CS) || defined(ILI9341_DRIVER) ||           \
+    defined(ILI9342_DRIVER) || defined(RAK14014) || defined(HX8357_CS) || defined(ILI9488_CS) || defined(ST72xx_DE) ||           \
+    (ARCH_PORTDUINO && HAS_SCREEN != 0) || defined(HACKADAY_COMMUNICATOR)
 #include "SPILock.h"
 #include "TFTDisplay.h"
 #include <SPI.h>
@@ -1516,4 +1518,4 @@ bool TFTDisplay::connect()
    return true;
 }

-#endif // USE_TFTDISPLAY
+#endif
--- a/src/graphics/VirtualKeyboard.cpp
+++ b/src/graphics/VirtualKeyboard.cpp
@@ -506,9 +506,6 @@ void VirtualKeyboard::drawKey(OLEDDisplay *display, const VirtualKey &key, bool
            centeredTextY -= 1;
        }
    }
-#ifdef MUZI_BASE // Correct issue with character vertical position on MUZI_BASE
-    centeredTextY -= 2;
-#endif
    display->drawString(textX, centeredTextY, keyText.c_str());
 }

--- a/src/graphics/draw/DebugRenderer.cpp
+++ b/src/graphics/draw/DebugRenderer.cpp
@@ -532,10 +532,8 @@ void drawSystemScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x
    const int labelX = x;
    int barsOffset = (isHighResolution) ? 24 : 0;
 #ifdef USE_EINK
-#ifndef T_DECK_PRO
    barsOffset -= 12;
 #endif
-#endif
 #if defined(M5STACK_UNITC6L)
    const int barX = x + 45 + barsOffset;
 #else
@@ -576,7 +574,7 @@ void drawSystemScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x
 #endif
        // Value string
        display->setTextAlignment(TEXT_ALIGN_RIGHT);
-        display->drawString(SCREEN_WIDTH, getTextPositions(display)[line], combinedStr);
+        display->drawString(SCREEN_WIDTH - 2, getTextPositions(display)[line], combinedStr);
    };

    // === Memory values ===
--- a/src/graphics/draw/MenuHandler.cpp
+++ b/src/graphics/draw/MenuHandler.cpp
@@ -13,48 +13,18 @@
 #include "input/RotaryEncoderInterruptImpl1.h"
 #include "input/UpDownInterruptImpl1.h"
 #include "main.h"
-#include "mesh/Default.h"
 #include "mesh/MeshTypes.h"
 #include "modules/AdminModule.h"
 #include "modules/CannedMessageModule.h"
 #include "modules/KeyVerificationModule.h"

 #include "modules/TraceRouteModule.h"
-#include <algorithm>
-#include <array>
 #include <functional>
-#include <utility>

 extern uint16_t TFT_MESH;

 namespace graphics
 {
-
-namespace
-{
-
-// Caller must ensure the provided options array outlives the banner callback.
-template <typename T, size_t N, typename Callback>
-BannerOverlayOptions createStaticBannerOptions(const char *message, const MenuOption<T> (&options)[N],
-                                               std::array<const char *, N> &labels, Callback &&onSelection)
-{
-    for (size_t i = 0; i < N; ++i) {
-        labels[i] = options[i].label;
-    }
-
-    const MenuOption<T> *optionsPtr = options;
-    auto callback = std::function<void(const MenuOption<T> &, int)>(std::forward<Callback>(onSelection));
-
-    BannerOverlayOptions bannerOptions;
-    bannerOptions.message = message;
-    bannerOptions.optionsArrayPtr = labels.data();
-    bannerOptions.optionsCount = static_cast<uint8_t>(N);
-    bannerOptions.bannerCallback = [optionsPtr, callback](int selected) -> void { callback(optionsPtr[selected], selected); };
-    return bannerOptions;
-}
-
-} // namespace
-
 menuHandler::screenMenus menuHandler::menuQueue = menu_none;
 bool test_enabled = false;
 uint8_t test_count = 0;
@@ -149,28 +119,8 @@ void menuHandler::LoraRegionPicker(uint32_t duration)
            auto changes = SEGMENT_CONFIG;

            // This is needed as we wait til picking the LoRa region to generate keys for the first time.
-#if !(MESHTASTIC_EXCLUDE_PKI_KEYGEN || MESHTASTIC_EXCLUDE_PKI)
-            if (!owner.is_licensed) {
-                bool keygenSuccess = false;
-                if (config.security.private_key.size == 32) {
-                    // public key is derived from private, so this will always have the same result.
-                    if (crypto->regeneratePublicKey(config.security.public_key.bytes, config.security.private_key.bytes)) {
-                        keygenSuccess = true;
-                    }
-
-                } else {
-                    LOG_INFO("Generate new PKI keys");
-                    crypto->generateKeyPair(config.security.public_key.bytes, config.security.private_key.bytes);
-                    keygenSuccess = true;
-                }
-                if (keygenSuccess) {
-                    config.security.public_key.size = 32;
-                    config.security.private_key.size = 32;
-                    owner.public_key.size = 32;
-                    memcpy(owner.public_key.bytes, config.security.public_key.bytes, 32);
-                }
-            }
-#endif
+            // Use consolidated key generation function
+            nodeDB->generateCryptoKeyPair();
            config.lora.tx_enabled = true;
            initRegion();
            if (myRegion->dutyCycle < 100) {
@@ -226,38 +176,48 @@ void menuHandler::DeviceRolePicker()

 void menuHandler::RadioPresetPicker()
 {
-    static const RadioPresetOption presetOptions[] = {
-        {"Back", OptionsAction::Back},
-        {"LongTurbo", OptionsAction::Select, meshtastic_Config_LoRaConfig_ModemPreset_LONG_TURBO},
-        {"LongModerate", OptionsAction::Select, meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE},
-        {"LongFast", OptionsAction::Select, meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST},
-        {"MediumSlow", OptionsAction::Select, meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_SLOW},
-        {"MediumFast", OptionsAction::Select, meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST},
-        {"ShortSlow", OptionsAction::Select, meshtastic_Config_LoRaConfig_ModemPreset_SHORT_SLOW},
-        {"ShortFast", OptionsAction::Select, meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST},
-        {"ShortTurbo", OptionsAction::Select, meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO},
+    static const char *optionsArray[] = {"Back",       "LongSlow",  "LongModerate", "LongFast",  "MediumSlow",
+                                         "MediumFast", "ShortSlow", "ShortFast",    "ShortTurbo"};
+    enum optionsNumbers {
+        Back = 0,
+        radiopreset_LongSlow = 1,
+        radiopreset_LongModerate = 2,
+        radiopreset_LongFast = 3,
+        radiopreset_MediumSlow = 4,
+        radiopreset_MediumFast = 5,
+        radiopreset_ShortSlow = 6,
+        radiopreset_ShortFast = 7,
+        radiopreset_ShortTurbo = 8
+    };
+    BannerOverlayOptions bannerOptions;
+    bannerOptions.message = "Radio Preset";
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsCount = 9;
+    bannerOptions.bannerCallback = [](int selected) -> void {
+        if (selected == Back) {
+            menuHandler::menuQueue = menuHandler::lora_Menu;
+            screen->runNow();
+            return;
+        } else if (selected == radiopreset_LongSlow) {
+            config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW;
+        } else if (selected == radiopreset_LongModerate) {
+            config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE;
+        } else if (selected == radiopreset_LongFast) {
+            config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST;
+        } else if (selected == radiopreset_MediumSlow) {
+            config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_SLOW;
+        } else if (selected == radiopreset_MediumFast) {
+            config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST;
+        } else if (selected == radiopreset_ShortSlow) {
+            config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_SHORT_SLOW;
+        } else if (selected == radiopreset_ShortFast) {
+            config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST;
+        } else if (selected == radiopreset_ShortTurbo) {
+            config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO;
+        }
+        service->reloadConfig(SEGMENT_CONFIG);
+        rebootAtMsec = (millis() + DEFAULT_REBOOT_SECONDS * 1000);
    };
-
-    constexpr size_t presetCount = sizeof(presetOptions) / sizeof(presetOptions[0]);
-    static std::array<const char *, presetCount> presetLabels{};
-
-    auto bannerOptions =
-        createStaticBannerOptions("Radio Preset", presetOptions, presetLabels, [](const RadioPresetOption &option, int) -> void {
-            if (option.action == OptionsAction::Back) {
-                menuHandler::menuQueue = menuHandler::lora_Menu;
-                screen->runNow();
-                return;
-            }
-
-            if (!option.hasValue) {
-                return;
-            }
-
-            config.lora.modem_preset = option.value;
-            service->reloadConfig(SEGMENT_CONFIG);
-            rebootAtMsec = (millis() + DEFAULT_REBOOT_SECONDS * 1000);
-        });
-
    screen->showOverlayBanner(bannerOptions);
 }

@@ -1060,13 +1020,12 @@ void menuHandler::switchToMUIMenu()

 void menuHandler::TFTColorPickerMenu(OLEDDisplay *display)
 {
-    static const char *optionsArray[] = {
-        "Back",  "Default", "Meshtastic Green", "Yellow", "Red", "Orange", "Purple", "Blue", "Teal", "Cyan", "Ice", "Pink",
-        "White", "Gray"};
+    static const char *optionsArray[] = {"Back", "Default", "Meshtastic Green", "Yellow", "Red", "Orange", "Purple", "Teal",
+                                         "Pink", "White"};
    BannerOverlayOptions bannerOptions;
    bannerOptions.message = "Select Screen Color";
    bannerOptions.optionsArrayPtr = optionsArray;
-    bannerOptions.optionsCount = 14;
+    bannerOptions.optionsCount = 10;
    bannerOptions.bannerCallback = [display](int selected) -> void {
 #if defined(HELTEC_MESH_NODE_T114) || defined(HELTEC_VISION_MASTER_T190) || defined(T_DECK) || defined(T_LORA_PAGER) ||          \
    HAS_TFT || defined(HACKADAY_COMMUNICATOR)
@@ -1102,40 +1061,20 @@ void menuHandler::TFTColorPickerMenu(OLEDDisplay *display)
            TFT_MESH_g = 153;
            TFT_MESH_b = 255;
        } else if (selected == 7) {
-            LOG_INFO("Setting color to Blue");
-            TFT_MESH_r = 0;
-            TFT_MESH_g = 0;
-            TFT_MESH_b = 255;
-        } else if (selected == 8) {
            LOG_INFO("Setting color to Teal");
-            TFT_MESH_r = 16;
-            TFT_MESH_g = 102;
-            TFT_MESH_b = 102;
-        } else if (selected == 9) {
-            LOG_INFO("Setting color to Cyan");
-            TFT_MESH_r = 0;
-            TFT_MESH_g = 255;
-            TFT_MESH_b = 255;
-        } else if (selected == 10) {
-            LOG_INFO("Setting color to Ice");
-            TFT_MESH_r = 173;
-            TFT_MESH_g = 216;
-            TFT_MESH_b = 230;
-        } else if (selected == 11) {
+            TFT_MESH_r = 64;
+            TFT_MESH_g = 224;
+            TFT_MESH_b = 208;
+        } else if (selected == 8) {
            LOG_INFO("Setting color to Pink");
            TFT_MESH_r = 255;
            TFT_MESH_g = 105;
            TFT_MESH_b = 180;
-        } else if (selected == 12) {
+        } else if (selected == 9) {
            LOG_INFO("Setting color to White");
            TFT_MESH_r = 255;
            TFT_MESH_g = 255;
            TFT_MESH_b = 255;
-        } else if (selected == 13) {
-            LOG_INFO("Setting color to Gray");
-            TFT_MESH_r = 128;
-            TFT_MESH_g = 128;
-            TFT_MESH_b = 128;
        } else {
            menuQueue = system_base_menu;
            screen->runNow();
--- a/src/graphics/draw/MenuHandler.h
+++ b/src/graphics/draw/MenuHandler.h
@@ -99,24 +99,5 @@ class menuHandler
    static void BluetoothToggleMenu();
 };

-/* Generic Menu Options designations  */
-enum class OptionsAction { Back, Select };
-
-template <typename T> struct MenuOption {
-    const char *label;
-    OptionsAction action;
-    bool hasValue;
-    T value;
-
-    MenuOption(const char *labelIn, OptionsAction actionIn, T valueIn)
-        : label(labelIn), action(actionIn), hasValue(true), value(valueIn)
-    {
-    }
-
-    MenuOption(const char *labelIn, OptionsAction actionIn) : label(labelIn), action(actionIn), hasValue(false), value() {}
-};
-
-using RadioPresetOption = MenuOption<meshtastic_Config_LoRaConfig_ModemPreset>;
-
 } // namespace graphics
 #endif
--- a/src/graphics/draw/NotificationRenderer.cpp
+++ b/src/graphics/draw/NotificationRenderer.cpp
@@ -85,13 +85,9 @@ void NotificationRenderer::drawSSLScreen(OLEDDisplay *display, OLEDDisplayUiStat

 void NotificationRenderer::resetBanner()
 {
-    notificationTypeEnum previousType = current_notification_type;
-
    alertBannerMessage[0] = '\0';
    current_notification_type = notificationTypeEnum::none;

-    OnScreenKeyboardModule::instance().clearPopup();
-
    inEvent.inputEvent = INPUT_BROKER_NONE;
    inEvent.kbchar = 0;
    curSelected = 0;
@@ -104,13 +100,6 @@ void NotificationRenderer::resetBanner()
    currentNumber = 0;

    nodeDB->pause_sort(false);
-
-    // If we're exiting from text_input (virtual keyboard), stop module and trigger frame update
-    // to ensure any messages received during keyboard use are now displayed
-    if (previousType == notificationTypeEnum::text_input && screen) {
-        OnScreenKeyboardModule::instance().stop(false);
-        screen->setFrames(graphics::Screen::FOCUS_PRESERVE);
-    }
 }

 void NotificationRenderer::drawBannercallback(OLEDDisplay *display, OLEDDisplayUiState *state)
@@ -174,15 +163,13 @@ void NotificationRenderer::drawNumberPicker(OLEDDisplay *display, OLEDDisplayUiS
    // modulo to extract
    uint8_t this_digit = (currentNumber % (pow_of_10(numDigits - curSelected))) / (pow_of_10(numDigits - curSelected - 1));
    // Handle input
-    if (inEvent.inputEvent == INPUT_BROKER_UP || inEvent.inputEvent == INPUT_BROKER_ALT_PRESS ||
-        inEvent.inputEvent == INPUT_BROKER_UP_LONG) {
+    if (inEvent.inputEvent == INPUT_BROKER_UP || inEvent.inputEvent == INPUT_BROKER_ALT_PRESS) {
        if (this_digit == 9) {
            currentNumber -= 9 * (pow_of_10(numDigits - curSelected - 1));
        } else {
            currentNumber += (pow_of_10(numDigits - curSelected - 1));
        }
-    } else if (inEvent.inputEvent == INPUT_BROKER_DOWN || inEvent.inputEvent == INPUT_BROKER_USER_PRESS ||
-               inEvent.inputEvent == INPUT_BROKER_DOWN_LONG) {
+    } else if (inEvent.inputEvent == INPUT_BROKER_DOWN || inEvent.inputEvent == INPUT_BROKER_USER_PRESS) {
        if (this_digit == 0) {
            currentNumber += 9 * (pow_of_10(numDigits - curSelected - 1));
        } else {
@@ -264,10 +251,10 @@ void NotificationRenderer::drawNodePicker(OLEDDisplay *display, OLEDDisplayUiSta

    // Handle input
    if (inEvent.inputEvent == INPUT_BROKER_UP || inEvent.inputEvent == INPUT_BROKER_LEFT ||
-        inEvent.inputEvent == INPUT_BROKER_ALT_PRESS || inEvent.inputEvent == INPUT_BROKER_UP_LONG) {
+        inEvent.inputEvent == INPUT_BROKER_ALT_PRESS) {
        curSelected--;
    } else if (inEvent.inputEvent == INPUT_BROKER_DOWN || inEvent.inputEvent == INPUT_BROKER_RIGHT ||
-               inEvent.inputEvent == INPUT_BROKER_USER_PRESS || inEvent.inputEvent == INPUT_BROKER_DOWN_LONG) {
+               inEvent.inputEvent == INPUT_BROKER_USER_PRESS) {
        curSelected++;
    } else if (inEvent.inputEvent == INPUT_BROKER_SELECT) {
        alertBannerCallback(selectedNodenum);
@@ -381,10 +368,10 @@ void NotificationRenderer::drawAlertBannerOverlay(OLEDDisplay *display, OLEDDisp
    // Handle input
    if (alertBannerOptions > 0) {
        if (inEvent.inputEvent == INPUT_BROKER_UP || inEvent.inputEvent == INPUT_BROKER_LEFT ||
-            inEvent.inputEvent == INPUT_BROKER_ALT_PRESS || inEvent.inputEvent == INPUT_BROKER_UP_LONG) {
+            inEvent.inputEvent == INPUT_BROKER_ALT_PRESS) {
            curSelected--;
        } else if (inEvent.inputEvent == INPUT_BROKER_DOWN || inEvent.inputEvent == INPUT_BROKER_RIGHT ||
-                   inEvent.inputEvent == INPUT_BROKER_USER_PRESS || inEvent.inputEvent == INPUT_BROKER_DOWN_LONG) {
+                   inEvent.inputEvent == INPUT_BROKER_USER_PRESS) {
            curSelected++;
        } else if (inEvent.inputEvent == INPUT_BROKER_SELECT) {
            if (optionsEnumPtr != nullptr) {
@@ -782,8 +769,40 @@ void NotificationRenderer::drawTextInput(OLEDDisplay *display, OLEDDisplayUiStat
        }

        if (inEvent.inputEvent != INPUT_BROKER_NONE) {
-            bool handled = OnScreenKeyboardModule::processVirtualKeyboardInput(inEvent, virtualKeyboard);
-            if (!handled && inEvent.inputEvent == INPUT_BROKER_CANCEL) {
+            if (inEvent.inputEvent == INPUT_BROKER_UP) {
+                // high frequency for move cursor left/right than up/down with encoders
+                extern ::RotaryEncoderInterruptImpl1 *rotaryEncoderInterruptImpl1;
+                extern ::UpDownInterruptImpl1 *upDownInterruptImpl1;
+                if (::rotaryEncoderInterruptImpl1 || ::upDownInterruptImpl1) {
+                    virtualKeyboard->moveCursorLeft();
+                } else {
+                    virtualKeyboard->moveCursorUp();
+                }
+            } else if (inEvent.inputEvent == INPUT_BROKER_DOWN) {
+                extern ::RotaryEncoderInterruptImpl1 *rotaryEncoderInterruptImpl1;
+                extern ::UpDownInterruptImpl1 *upDownInterruptImpl1;
+                if (::rotaryEncoderInterruptImpl1 || ::upDownInterruptImpl1) {
+                    virtualKeyboard->moveCursorRight();
+                } else {
+                    virtualKeyboard->moveCursorDown();
+                }
+            } else if (inEvent.inputEvent == INPUT_BROKER_LEFT) {
+                virtualKeyboard->moveCursorLeft();
+            } else if (inEvent.inputEvent == INPUT_BROKER_RIGHT) {
+                virtualKeyboard->moveCursorRight();
+            } else if (inEvent.inputEvent == INPUT_BROKER_UP_LONG) {
+                virtualKeyboard->moveCursorUp();
+            } else if (inEvent.inputEvent == INPUT_BROKER_DOWN_LONG) {
+                virtualKeyboard->moveCursorDown();
+            } else if (inEvent.inputEvent == INPUT_BROKER_ALT_PRESS) {
+                virtualKeyboard->moveCursorLeft();
+            } else if (inEvent.inputEvent == INPUT_BROKER_USER_PRESS) {
+                virtualKeyboard->moveCursorRight();
+            } else if (inEvent.inputEvent == INPUT_BROKER_SELECT) {
+                virtualKeyboard->handlePress();
+            } else if (inEvent.inputEvent == INPUT_BROKER_SELECT_LONG) {
+                virtualKeyboard->handleLongPress();
+            } else if (inEvent.inputEvent == INPUT_BROKER_CANCEL) {
                auto callback = textInputCallback;
                delete virtualKeyboard;
                virtualKeyboard = nullptr;
@@ -802,28 +821,12 @@ void NotificationRenderer::drawTextInput(OLEDDisplay *display, OLEDDisplayUiStat
            inEvent.inputEvent = INPUT_BROKER_NONE;
        }

-        // Re-check pointer before drawing to avoid use-after-free and crashes
-        if (!virtualKeyboard) {
-            // Ensure we exit text_input state and restore frames
-            if (current_notification_type == notificationTypeEnum::text_input) {
-                resetBanner();
-            }
-            if (screen) {
-                screen->setFrames(graphics::Screen::FOCUS_PRESERVE);
-            }
-            // If screen is null, do nothing (safe fallback)
-            return;
-        }
-
        // Clear the screen to avoid overlapping with underlying frames or overlays
        display->setColor(BLACK);
        display->fillRect(0, 0, display->getWidth(), display->getHeight());
        display->setColor(WHITE);
        // Draw the virtual keyboard
        virtualKeyboard->draw(display, 0, 0);
-
-        // Draw transient popup overlay (if any) managed by OnScreenKeyboardModule
-        OnScreenKeyboardModule::instance().drawPopupOverlay(display);
    } else {
        // If virtualKeyboard is null, reset the banner to avoid getting stuck
        LOG_INFO("Virtual keyboard is null - resetting banner");
@@ -836,12 +839,5 @@ bool NotificationRenderer::isOverlayBannerShowing()
    return strlen(alertBannerMessage) > 0 && (alertBannerUntil == 0 || millis() <= alertBannerUntil);
 }

-void NotificationRenderer::showKeyboardMessagePopupWithTitle(const char *title, const char *content, uint32_t durationMs)
-{
-    if (!title || !content || current_notification_type != notificationTypeEnum::text_input)
-        return;
-    OnScreenKeyboardModule::instance().showPopup(title, content, durationMs);
-}
-
 } // namespace graphics
 #endif
--- a/src/graphics/draw/NotificationRenderer.h
+++ b/src/graphics/draw/NotificationRenderer.h
@@ -4,7 +4,6 @@
 #include "OLEDDisplayUi.h"
 #include "graphics/Screen.h"
 #include "graphics/VirtualKeyboard.h"
-#include "modules/OnScreenKeyboardModule.h"
 #include <functional>
 #include <string>
 #define MAX_LINES 5
@@ -32,7 +31,6 @@ class NotificationRenderer
    static bool pauseBanner;

    static void resetBanner();
-    static void showKeyboardMessagePopupWithTitle(const char *title, const char *content, uint32_t durationMs);
    static void drawBannercallback(OLEDDisplay *display, OLEDDisplayUiState *state);
    static void drawAlertBannerOverlay(OLEDDisplay *display, OLEDDisplayUiState *state);
    static void drawNumberPicker(OLEDDisplay *display, OLEDDisplayUiState *state);
--- a/src/graphics/emotes.cpp
+++ b/src/graphics/emotes.cpp
@@ -13,81 +13,41 @@ const Emote emotes[] = {
    {"\U0001F44E", thumbdown, thumbs_width, thumbs_height}, // 👎 Thumbs Down

    // --- Smileys (Multiple Unicode Aliases) ---
-    {"\U0001F60A", smiling_eyes, smiling_eyes_width, smiling_eyes_height},             // 😊 Smiling Eyes
-    {"\U0001F600", grinning, grinning_width, grinning_height},                         // 😀 Grinning Face
-    {"\U0001F642", slightly_smiling, slightly_smiling_width, slightly_smiling_height}, // 🙂 Slightly Smiling Face
-    {"\U0001F609", winking_face, winking_face_width, winking_face_height},             // 😉 Winking Face
-    {"\U0001F601", grinning_smiling_eyes, grinning_smiling_eyes_width, grinning_smiling_eyes_height}, // 😁 Grinning Smiling Eyes
-    {"\U0001F60D", heart_eyes, heart_eyes_width, heart_eyes_height},                                  // 😍 Heart Eyes
+    {"\U0001F60A", Smiling_Eyes, Smiling_Eyes_width, Smiling_Eyes_height},             // 😊 Smiling Eyes
+    {"\U0001F600", Grinning, Grinning_width, Grinning_height},                         // 😀 Grinning Face
+    {"\U0001F642", Slightly_Smiling, Slightly_Smiling_width, Slightly_Smiling_height}, // 🙂 Slightly Smiling Face
+    {"\U0001F609", Winking_Face, Winking_Face_width, Winking_Face_height},             // 😉 Winking Face
+    {"\U0001F601", Grinning_Smiling_Eyes, Grinning_Smiling_Eyes_width, Grinning_Smiling_Eyes_height}, // 😁 Grinning Smiling Eyes
+    {"\U0001F60D", Heart_eyes, Heart_eyes_width, Heart_eyes_height},                                  // 😍 Heart Eyes
    {"\U0001F970", heart_smile, heart_smile_width, heart_smile_height}, // 🥰 Smiling Face with Hearts

    // --- Question/Alert ---
-    {"\u2753", question, question_width, question_height},    // ❓ Question Mark
-    {"\u203C\uFE0F", bang, bang_width, bang_height},          // ‼️ Double Exclamation Mark
-    {"\u26A0\uFE0F", caution, caution_width, caution_height}, // ⚠️ Warning Sign
+    {"\u2753", question, question_width, question_height}, // ❓ Question Mark
+    {"\u203C\uFE0F", bang, bang_width, bang_height},       // ‼️ Double Exclamation Mark

    // --- Laughing Faces ---
    {"\U0001F602", haha, haha_width, haha_height}, // 😂 Face with Tears of Joy
-    {"\U0001F923", rofl, rofl_width, rofl_height}, // 🤣 Rolling on the Floor Laughing
-    {"\U0001F606", smiling_closed_eyes, smiling_closed_eyes_width, smiling_closed_eyes_height}, // 😆 Smiling Closed Eyes
+    {"\U0001F923", ROFL, ROFL_width, ROFL_height}, // 🤣 Rolling on the Floor Laughing
+    {"\U0001F606", Smiling_Closed_Eyes, Smiling_Closed_Eyes_width, Smiling_Closed_Eyes_height}, // 😆 Smiling Closed Eyes
    {"\U0001F605", haha, haha_width, haha_height},                                              // 😅 Smiling with Sweat
-    {"\U0001F604", grinning_smiling_eyes_2, grinning_smiling_eyes_2_width,
-     grinning_smiling_eyes_2_height}, // 😄 Grinning Face with Smiling Eyes
-    {"\U0001F62D", loudly_crying_face, loudly_crying_face_width, loudly_crying_face_height}, // 😭 Loudly Crying Face
-    {"\U0001F92E", vomiting, vomiting_width, vomiting_height},                               // 🤮 Face Vomiting
-    {"\U0001F60E", cool, cool_width, cool_height},                                           // 😎 Smiling Face with Sunglasses
-    {"\U0001F440", eyes, eyes_width, eyes_height},                                           // 👀 Eyes
-    {"\U0001F441\uFE0F", eye, eye_width, eye_height},                                        // 👁️ Eye
+    {"\U0001F604", Grinning_SmilingEyes2, Grinning_SmilingEyes2_width,
+     Grinning_SmilingEyes2_height}, // 😄 Grinning Face with Smiling Eyes
+    {"\U0001F62D", Loudly_Crying_Face, Loudly_Crying_Face_width, Loudly_Crying_Face_height}, // 😭 Loudly Crying Face

    // --- Gestures and People ---
    {"\U0001F44B", wave_icon, wave_icon_width, wave_icon_height},             // 👋 Waving Hand
    {"\u270C\uFE0F", peace_sign, peace_sign_width, peace_sign_height},        // ✌️ Victory Hand
    {"\U0001F596", vulcan_salute, vulcan_salute_width, vulcan_salute_height}, // 🖖 Vulcan Salute
-    {"\U0001F64F", praying, praying_width, praying_height},                   // 🙏 Praying Hands
-    {"\U0001F4AA", strong, strong_width, strong_height},                      // 💪 Flexed Biceps
-    {"\U0001F937", shrug, shrug_width, shrug_height},                         // 🤷 Person Shrugging
+    {"\U0001F64F", Praying, Praying_width, Praying_height},                   // 🙏 Praying Hands
    {"\U0001F920", cowboy, cowboy_width, cowboy_height},                      // 🤠 Cowboy Hat Face
    {"\U0001F3A7", deadmau5, deadmau5_width, deadmau5_height},                // 🎧 Headphones

-    // --- Symbols ---
-    {"\u2714\uFE0F", check_mark, check_mark_width, check_mark_height}, // ✔️ Check Mark
-    {"\u2705", check_mark, check_mark_width, check_mark_height},       // ✅ Check Mark Button
-    {"\u2611\uFE0F", check_mark, check_mark_width, check_mark_height}, // ☑️ Check Box with Check
-    {"\U0001F3E0", house, house_width, house_height},                  // 🏠 House
-
    // --- Weather ---
-    {"\u2600", sun, sun_width, sun_height},                                   // ☀ Sun (without variation selector)
-    {"\u2600\uFE0F", sun, sun_width, sun_height},                             // ☀️ Sun (with variation selector)
-    {"\U0001F327\uFE0F", rain, rain_width, rain_height},                      // 🌧️ Cloud with Rain
-    {"\u2601\uFE0F", cloud, cloud_width, cloud_height},                       // ☁️ Cloud
-    {"\U0001F32B\uFE0F", fog, fog_width, fog_height},                         // 🌫️ Fog
-    {"\u2744\uFE0F", snowflake, snowflake_width, snowflake_height},           // ❄️ Snowflake
-    {"\U0001F4A7", drop, drop_width, drop_height},                            // 💧 Droplet
-    {"\U0001F321\uFE0F", thermometer, thermometer_width, thermometer_height}, // 🌡️ Thermometer
-    {"\U0001F326\uFE0F", sun_behind_raincloud, sun_behind_raincloud_width,
-     sun_behind_raincloud_height},                                                        // 🌦️ Sun Behind Rain Cloud
-    {"\u26C5", sun_behind_cloud, sun_behind_cloud_width, sun_behind_cloud_height},        // ⛅ Sun Behind Cloud
-    {"\u26C5\uFE0F", sun_behind_cloud, sun_behind_cloud_width, sun_behind_cloud_height},  // ⛅️ Sun Behind Cloud
-    {"\U0001F328\uFE0F", cloud_with_snow, cloud_with_snow_width, cloud_with_snow_height}, // 🌨️ Cloud with Snow
-    {"\U0001F329\uFE0F", cloud_with_lightning, cloud_with_lightning_width,
-     cloud_with_lightning_height}, // 🌩️ Cloud with Lightning
-    {"\u26C8", cloud_with_lightning_rain, cloud_with_lightning_rain_width,
-     cloud_with_lightning_rain_height}, // ⛈ Cloud with Lightning and Rain
-    {"\u26C8\uFE0F", cloud_with_lightning_rain, cloud_with_lightning_rain_width,
-     cloud_with_lightning_rain_height},                                 // ⛈️ Cloud with Lightning and Rain
-    {"\U0001F32C\uFE0F", wind_face, wind_face_width, wind_face_height}, // 🌬️ Wind Face
-
-    // --- Moon Phases ---
-    {"\U0001F311", new_moon, new_moon_width, new_moon_height},                                     // 🌑 New Moon
-    {"\U0001F312", waxing_crescent_moon, waxing_crescent_moon_width, waxing_crescent_moon_height}, // 🌒 Waxing Crescent Moon
-    {"\U0001F313", first_quarter_moon, first_quarter_moon_width, first_quarter_moon_height},       // 🌓 First Quarter Moon
-    {"\U0001F314", waxing_gibbous_moon, waxing_gibbous_moon_width, waxing_gibbous_moon_height},    // 🌔 Waxing Gibbous Moon
-    {"\U0001F315", full_moon, full_moon_width, full_moon_height},                                  // 🌕 Full Moon
-    {"\U0001F316", waning_gibbous_moon, waning_gibbous_moon_width, waning_gibbous_moon_height},    // 🌖 Waning Gibbous Moon
-    {"\U0001F317", last_quarter_moon, last_quarter_moon_width, last_quarter_moon_height},          // 🌗 Last Quarter Moon
-    {"\U0001F318", waning_crescent_moon, waning_crescent_moon_width, waning_crescent_moon_height}, // 🌘 Waning Crescent Moon
-    {"\U0001F31B", first_quarter_moon_face, first_quarter_moon_face_width,
-     first_quarter_moon_face_height}, // 🌛 First Quarter Moon Face
+    {"\u2600", sun, sun_width, sun_height},              // ☀ Sun (without variation selector)
+    {"\u2600\uFE0F", sun, sun_width, sun_height},        // ☀️ Sun (with variation selector)
+    {"\U0001F327\uFE0F", rain, rain_width, rain_height}, // 🌧️ Cloud with Rain
+    {"\u2601\uFE0F", cloud, cloud_width, cloud_height},  // ☁️ Cloud
+    {"\U0001F32B\uFE0F", fog, fog_width, fog_height},    // 🌫️ Fog

    // --- Misc Faces ---
    {"\U0001F608", devil, devil_width, devil_height}, // 😈 Smiling Face with Horns
@@ -107,49 +67,13 @@ const Emote emotes[] = {
    {"\U0001F498", heart, heart_width, heart_height},   // 💘 Heart with Arrow

    // --- Objects ---
-    {"\U0001F4A9", poo, poo_width, poo_height},                      // 💩 Pile of Poo
-    {"\U0001F514", bell_icon, bell_icon_width, bell_icon_height},    // 🔔 Bell
-    {"\U0001F4CB", clipboard, clipboard_width, clipboard_height},    // 📋 Clipboard
-    {"\U0001F36A", cookie, cookie_width, cookie_height},             // 🍪 Cookie
-    {"\U0001F370", shortcake, shortcake_width, shortcake_height},    // 🍰 Shortcake
-    {"\U0001F351", peach, peach_width, peach_height},                // 🍑 Peach
-    {"\U0001F983", turkey, turkey_width, turkey_height},             // 🦃 Turkey
-    {"\U0001F357", turkey_leg, turkey_leg_width, turkey_leg_height}, // 🍗 Poultry Leg
-    {"\U0001F525", fire, fire_width, fire_height},                   // 🔥 Fire
-    {"\u2728", sparkles, sparkles_width, sparkles_height},           // ✨ Sparkles
-    {"\U0001F573\uFE0F", hole, hole_width, hole_height},             // 🕳️ Hole
-    {"\U0001F3B3", bowling, bowling_width, bowling_height},          // 🎳 Bowling
-
-    // --- Arrows ---
-    {"\u2193", downwards_arrow, downwards_arrow_width, downwards_arrow_height},          // ↓ Downwards Arrow
-    {"\u2193\uFE0E", downwards_arrow, downwards_arrow_width, downwards_arrow_height},    // ↓︎ Downwards Arrow (text)
-    {"\u2193\uFE0F", downwards_arrow, downwards_arrow_width, downwards_arrow_height},    // ↓️ Downwards Arrow (emoji)
-    {"\u2199", south_west_arrow, south_west_arrow_width, south_west_arrow_height},       // ↙ South West Arrow
-    {"\u2199\uFE0E", south_west_arrow, south_west_arrow_width, south_west_arrow_height}, // ↙︎ South West Arrow (text)
-    {"\u2199\uFE0F", south_west_arrow, south_west_arrow_width, south_west_arrow_height}, // ↙️ South West Arrow (emoji)
-    {"\u2190", leftwards_arrow, leftwards_arrow_width, leftwards_arrow_height},          // ← Leftwards Arrow
-    {"\u2190\uFE0E", leftwards_arrow, leftwards_arrow_width, leftwards_arrow_height},    // ←︎ Leftwards Arrow (text)
-    {"\u2190\uFE0F", leftwards_arrow, leftwards_arrow_width, leftwards_arrow_height},    // ←️ Leftwards Arrow (emoji)
-    {"\u2196", north_west_arrow, north_west_arrow_width, north_west_arrow_height},       // ↖ North West Arrow
-    {"\u2196\uFE0E", north_west_arrow, north_west_arrow_width, north_west_arrow_height}, // ↖︎ North West Arrow (text)
-    {"\u2196\uFE0F", north_west_arrow, north_west_arrow_width, north_west_arrow_height}, // ↖️ North West Arrow (emoji)
-    {"\u2191", upwards_arrow, upwards_arrow_width, upwards_arrow_height},                // ↑ Upwards Arrow
-    {"\u2191\uFE0E", upwards_arrow, upwards_arrow_width, upwards_arrow_height},          // ↑︎ Upwards Arrow (text)
-    {"\u2191\uFE0F", upwards_arrow, upwards_arrow_width, upwards_arrow_height},          // ↑️ Upwards Arrow (emoji)
-    {"\u2197", north_east_arrow, north_east_arrow_width, north_east_arrow_height},       // ↗ North East Arrow
-    {"\u2197\uFE0E", north_east_arrow, north_east_arrow_width, north_east_arrow_height}, // ↗︎ North East Arrow (text)
-    {"\u2197\uFE0F", north_east_arrow, north_east_arrow_width, north_east_arrow_height}, // ↗️ North East Arrow (emoji)
-    {"\u2192", rightwards_arrow, rightwards_arrow_width, rightwards_arrow_height},       // → Rightwards Arrow
-    {"\u2192\uFE0E", rightwards_arrow, rightwards_arrow_width, rightwards_arrow_height}, // →︎ Rightwards Arrow (text)
-    {"\u2192\uFE0F", rightwards_arrow, rightwards_arrow_width, rightwards_arrow_height}, // →️ Rightwards Arrow (emoji)
-    {"\u2198", south_east_arrow, south_east_arrow_width, south_east_arrow_height},       // ↘ South East Arrow
-    {"\u2198\uFE0E", south_east_arrow, south_east_arrow_width, south_east_arrow_height}, // ↘︎ South East Arrow (text)
-    {"\u2198\uFE0F", south_east_arrow, south_east_arrow_width, south_east_arrow_height}, // ↘️ South East Arrow (emoji)
-
-    // --- Halloween ---
-    {"\U0001F383", jack_o_lantern, jack_o_lantern_width, jack_o_lantern_height}, // 🎃 Jack-O-Lantern
-    {"\U0001F47B", ghost, ghost_width, ghost_height},                            // 👻 Ghost
-    {"\U0001F480", skull, skull_width, skull_height}                             // 💀 Skull
+    {"\U0001F4A9", poo, poo_width, poo_height},                   // 💩 Pile of Poo
+    {"\U0001F514", bell_icon, bell_icon_width, bell_icon_height}, // 🔔 Bell
+    {"\U0001F36A", cookie, cookie_width, cookie_height},          // 🍪 Cookie
+    {"\U0001F525", Fire, Fire_width, Fire_height},                // 🔥 Fire
+    {"\u2728", Sparkles, Sparkles_width, Sparkles_height},        // ✨ Sparkles
+    {"\U0001F573\uFE0F", hole, hole_width, hole_height},          // 🕳️ Hole
+    {"\U0001F3B3", bowling, bowling_width, bowling_height}        // 🎳 Bowling
 #endif
 };

@@ -164,23 +88,23 @@ const unsigned char thumbdown[] PROGMEM = {0xF0, 0x1F, 0x08, 0x20, 0x06, 0x30, 0
                                           0x40, 0x06, 0x70, 0x06, 0x40, 0x06, 0x3F, 0x18, 0x02, 0x20, 0x02,
                                           0x40, 0x04, 0x80, 0x04, 0x80, 0x04, 0x00, 0x03, 0x00, 0x00};

-const unsigned char smiling_eyes[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0x18, 0x18, 0x04, 0x20, 0x24, 0x24, 0x52,
+const unsigned char Smiling_Eyes[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0x18, 0x18, 0x04, 0x20, 0x24, 0x24, 0x52,
                                              0x4A, 0x02, 0x40, 0x02, 0x40, 0x22, 0x44, 0x22, 0x44, 0xC2, 0x43,
                                              0x04, 0x20, 0x04, 0x20, 0x18, 0x18, 0xE0, 0x07, 0x00, 0x00};

-const unsigned char grinning[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0x18, 0x18, 0x04, 0x20, 0x44, 0x22, 0x42,
+const unsigned char Grinning[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0x18, 0x18, 0x04, 0x20, 0x44, 0x22, 0x42,
                                          0x42, 0x02, 0x40, 0x02, 0x40, 0xF2, 0x4F, 0x12, 0x48, 0x22, 0x44,
                                          0xC4, 0x23, 0x04, 0x20, 0x18, 0x18, 0xE0, 0x07, 0x00, 0x00};

-const unsigned char slightly_smiling[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0x18, 0x18, 0x04, 0x20, 0x44, 0x22, 0x42,
+const unsigned char Slightly_Smiling[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0x18, 0x18, 0x04, 0x20, 0x44, 0x22, 0x42,
                                                  0x42, 0x02, 0x40, 0x02, 0x40, 0x12, 0x48, 0x12, 0x48, 0x22, 0x44,
                                                  0xC4, 0x23, 0x04, 0x20, 0x18, 0x18, 0xE0, 0x07, 0x00, 0x00};

-const unsigned char winking_face[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0x18, 0x18, 0x04, 0x20, 0x44, 0x20, 0x42,
+const unsigned char Winking_Face[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0x18, 0x18, 0x04, 0x20, 0x44, 0x20, 0x42,
                                              0x46, 0x02, 0x40, 0x02, 0x40, 0x12, 0x48, 0x12, 0x48, 0x22, 0x44,
                                              0xC4, 0x23, 0x04, 0x20, 0x18, 0x18, 0xE0, 0x07, 0x00, 0x00};

-const unsigned char grinning_smiling_eyes[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0x18, 0x18, 0x04, 0x20, 0x24, 0x24, 0x52,
+const unsigned char Grinning_Smiling_Eyes[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0x18, 0x18, 0x04, 0x20, 0x24, 0x24, 0x52,
                                                       0x4A, 0x02, 0x40, 0xFA, 0x5F, 0x0A, 0x50, 0x0A, 0x50, 0x12, 0x48,
                                                       0x24, 0x24, 0xC4, 0x23, 0x18, 0x18, 0xE0, 0x07, 0x00, 0x00};

@@ -188,7 +112,7 @@ const unsigned char heart_smile[] PROGMEM = {0x00, 0x00, 0x6C, 0x07, 0x7C, 0x18,
                                             0x0A, 0x02, 0xD8, 0x02, 0xF8, 0x22, 0xFC, 0x20, 0x74, 0xDB, 0x23,
                                             0x1F, 0x00, 0x1F, 0x20, 0x0E, 0x18, 0xE4, 0x07, 0x00, 0x00};

-const unsigned char heart_eyes[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0x18, 0x18, 0x04, 0x20, 0x54, 0x2A, 0xFA,
+const unsigned char Heart_eyes[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0x18, 0x18, 0x04, 0x20, 0x54, 0x2A, 0xFA,
                                            0x5F, 0x72, 0x4E, 0x22, 0x44, 0x02, 0x40, 0x12, 0x48, 0x12, 0x48,
                                            0x24, 0x24, 0xC4, 0x23, 0x18, 0x18, 0xE0, 0x07, 0x00, 0x00};

@@ -204,19 +128,19 @@ const unsigned char haha[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0x18, 0x18, 0x04,
                                      0x4A, 0x0A, 0x50, 0x0E, 0x70, 0xF2, 0x4F, 0x12, 0x48, 0x32, 0x44,
                                      0xC4, 0x23, 0x04, 0x20, 0x18, 0x18, 0xE0, 0x07, 0x00, 0x00};

-const unsigned char rofl[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0x18, 0x18, 0x84, 0x21, 0x84, 0x20, 0x02,
+const unsigned char ROFL[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0x18, 0x18, 0x84, 0x21, 0x84, 0x20, 0x02,
                                      0x4C, 0x02, 0x4A, 0x1A, 0x49, 0x8A, 0x48, 0x42, 0x48, 0x22, 0x44,
                                      0xE4, 0x23, 0x04, 0x20, 0x18, 0x18, 0xE0, 0x07, 0x00, 0x00};

-const unsigned char smiling_closed_eyes[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0x18, 0x18, 0x04, 0x20, 0x24, 0x24, 0x42,
+const unsigned char Smiling_Closed_Eyes[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0x18, 0x18, 0x04, 0x20, 0x24, 0x24, 0x42,
                                                     0x42, 0x22, 0x44, 0x02, 0x40, 0xF2, 0x4F, 0x12, 0x48, 0x22, 0x44,
                                                     0xC4, 0x23, 0x04, 0x20, 0x18, 0x18, 0xE0, 0x07, 0x00, 0x00};

-const unsigned char grinning_smiling_eyes_2[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0x18, 0x18, 0x04, 0x20, 0x24, 0x24, 0x52,
-                                                         0x4A, 0x02, 0x40, 0x02, 0x40, 0xF2, 0x4F, 0x12, 0x48, 0x22, 0x44,
-                                                         0xC4, 0x23, 0x04, 0x20, 0x18, 0x18, 0xE0, 0x07, 0x00, 0x00};
+const unsigned char Grinning_SmilingEyes2[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0x18, 0x18, 0x04, 0x20, 0x24, 0x24, 0x52,
+                                                       0x4A, 0x02, 0x40, 0x02, 0x40, 0xF2, 0x4F, 0x12, 0x48, 0x22, 0x44,
+                                                       0xC4, 0x23, 0x04, 0x20, 0x18, 0x18, 0xE0, 0x07, 0x00, 0x00};

-const unsigned char loudly_crying_face[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0x18, 0x18, 0x04, 0x20, 0x34, 0x2C, 0x4A,
+const unsigned char Loudly_Crying_Face[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0x18, 0x18, 0x04, 0x20, 0x34, 0x2C, 0x4A,
                                                    0x52, 0x12, 0x48, 0x12, 0x48, 0x92, 0x49, 0x52, 0x4A, 0x52, 0x4A,
                                                    0x54, 0x2A, 0x94, 0x29, 0x18, 0x18, 0xF0, 0x0F, 0x00, 0x00};

@@ -268,7 +192,7 @@ const unsigned char cookie[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0x18, 0x18, 0x04
                                        0x40, 0x02, 0x58, 0x82, 0x5B, 0x92, 0x43, 0x82, 0x43, 0x02, 0x40,
                                        0x64, 0x28, 0x64, 0x20, 0x18, 0x18, 0xE0, 0x07, 0x00, 0x00};

-const unsigned char fire[] PROGMEM = {0x30, 0x00, 0xF0, 0x00, 0xF8, 0x03, 0xF8, 0x07, 0xFC, 0x1F, 0xFC,
+const unsigned char Fire[] PROGMEM = {0x30, 0x00, 0xF0, 0x00, 0xF8, 0x03, 0xF8, 0x07, 0xFC, 0x1F, 0xFC,
                                      0x1F, 0xFE, 0x3E, 0x7E, 0x3E, 0x3E, 0x7C, 0x1E, 0x78, 0x1E, 0x70,
                                      0x1C, 0x70, 0x1C, 0x70, 0x38, 0x38, 0x30, 0x38, 0x60, 0x0C};

@@ -276,11 +200,11 @@ const unsigned char peace_sign[] PROGMEM = {0xC0, 0x30, 0x40, 0x29, 0x40, 0x25,
                                            0x0A, 0x54, 0x68, 0x54, 0x58, 0x54, 0x44, 0x3C, 0x22, 0x04, 0x22,
                                            0x04, 0x12, 0x08, 0x10, 0x10, 0x08, 0xE0, 0x07, 0x00, 0x00};

-const unsigned char praying[] PROGMEM = {0x00, 0x00, 0x40, 0x02, 0xA0, 0x05, 0x90, 0x09, 0x90, 0x09, 0x90,
+const unsigned char Praying[] PROGMEM = {0x00, 0x00, 0x40, 0x02, 0xA0, 0x05, 0x90, 0x09, 0x90, 0x09, 0x90,
                                         0x09, 0x98, 0x19, 0x94, 0x29, 0xA4, 0x25, 0xA4, 0x25, 0x84, 0x21,
                                         0x84, 0x21, 0x86, 0x61, 0x4E, 0x72, 0x7F, 0x7E, 0x3F, 0xFC};

-const unsigned char sparkles[] PROGMEM = {0x00, 0x00, 0x10, 0x00, 0x38, 0x04, 0x10, 0x04, 0x00, 0x0E, 0x00,
+const unsigned char Sparkles[] PROGMEM = {0x00, 0x00, 0x10, 0x00, 0x38, 0x04, 0x10, 0x04, 0x00, 0x0E, 0x00,
                                          0x1F, 0x80, 0x3F, 0xE0, 0xFF, 0x80, 0x3F, 0x10, 0x1F, 0x10, 0x0E,
                                          0x38, 0x04, 0xFE, 0x04, 0x38, 0x00, 0x10, 0x00, 0x10, 0x00};

@@ -303,179 +227,7 @@ const unsigned char bowling[] PROGMEM = {0x00, 0x38, 0x00, 0x44, 0x00, 0x44, 0x0
 const unsigned char vulcan_salute[] PROGMEM = {0x08, 0x02, 0x16, 0x0D, 0x15, 0x15, 0x15, 0x15, 0xA9, 0x12, 0x4A,
                                               0x0A, 0x02, 0x38, 0x04, 0x48, 0x04, 0x44, 0x04, 0x22, 0x04, 0x22,
                                               0x04, 0x12, 0x08, 0x10, 0x10, 0x08, 0xE0, 0x07, 0x00, 0x00};
-
-const unsigned char jack_o_lantern[] PROGMEM = {0xC0, 0x00, 0x80, 0x01, 0xB8, 0x1D, 0xC4, 0x23, 0x22, 0x44, 0x05,
-                                                0xA0, 0x31, 0x8C, 0x51, 0x8A, 0x61, 0x86, 0x09, 0x90, 0xB9, 0x9D,
-                                                0x49, 0x92, 0xB2, 0x4D, 0x42, 0x42, 0x04, 0x20, 0xF8, 0x1F};
-
-const unsigned char ghost[] PROGMEM = {0xC0, 0x03, 0xF0, 0x0F, 0xF8, 0x1F, 0xDC, 0x3B, 0xBC, 0x3D, 0xDF,
-                                       0xFB, 0xFF, 0xFF, 0x1F, 0xF8, 0x1E, 0x78, 0x1C, 0x38, 0x3C, 0x3C,
-                                       0xFC, 0x3F, 0xFE, 0x7F, 0xFE, 0x7F, 0xFE, 0x7F, 0x8C, 0x31};
-
-const unsigned char skull[] PROGMEM = {0xE0, 0x07, 0xF8, 0x1F, 0xFC, 0x3F, 0xFE, 0x7F, 0xFE, 0x7F, 0xC7,
-                                       0xE3, 0x87, 0xE1, 0x87, 0xE1, 0x8F, 0xF1, 0xFE, 0x7F, 0x7C, 0x3E,
-                                       0xFC, 0x3F, 0xFC, 0x3F, 0xFC, 0x3F, 0xF8, 0x1F, 0xB0, 0x0D};
-
-const unsigned char vomiting[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0x18, 0x18, 0x04, 0x20, 0x04, 0x20, 0x22,
-                                          0x44, 0x42, 0x42, 0x22, 0x44, 0x02, 0x40, 0x02, 0x40, 0xC2, 0x43,
-                                          0x64, 0x26, 0x64, 0x26, 0x68, 0x16, 0x50, 0x0A, 0xF8, 0x1F};
-
-const unsigned char cool[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0x18, 0x18, 0x04, 0x20, 0xFC, 0x3F, 0xFA,
-                                      0x5F, 0x72, 0x4E, 0x02, 0x40, 0x12, 0x48, 0x12, 0x48, 0x22, 0x44,
-                                      0xC4, 0x23, 0x04, 0x20, 0x18, 0x18, 0xE0, 0x07, 0x00, 0x00};
-
-const unsigned char shortcake[] PROGMEM = {0x00, 0x00, 0x00, 0x0F, 0x80, 0x3F, 0xE0, 0xFC, 0xE0, 0xE1, 0xF0,
-                                           0xB8, 0x10, 0x87, 0xC8, 0x80, 0x3C, 0xE0, 0x06, 0x98, 0x02, 0xC7,
-                                           0xE2, 0x30, 0x1A, 0x0E, 0xC6, 0x01, 0x32, 0x00, 0x0E, 0x00};
-
-const unsigned char caution[] PROGMEM = {0x00, 0x00, 0x80, 0x01, 0xC0, 0x03, 0xC0, 0x03, 0x60, 0x06, 0x60,
-                                         0x06, 0x70, 0x0E, 0x70, 0x0E, 0x78, 0x1E, 0x78, 0x1E, 0x7C, 0x3E,
-                                         0xFC, 0x3F, 0x7E, 0x7E, 0x7E, 0x7E, 0xFC, 0x3F, 0x00, 0x00};
-
-const unsigned char clipboard[] PROGMEM = {0xC0, 0x03, 0x7E, 0x7E, 0xC2, 0x43, 0xFA, 0x5F, 0x0A, 0x5B, 0xFA,
-                                           0x5F, 0x8A, 0x54, 0xFA, 0x5F, 0x4A, 0x58, 0xFA, 0x5F, 0x2A, 0x51,
-                                           0xFA, 0x5F, 0x0A, 0x59, 0xFA, 0x5F, 0x02, 0x40, 0xFE, 0x7F};
-
-const unsigned char snowflake[] PROGMEM = {0x00, 0x00, 0x40, 0x01, 0x88, 0x08, 0x8C, 0x18, 0xD0, 0x05, 0x60,
-                                           0x03, 0x32, 0x26, 0x1C, 0x1C, 0x32, 0x26, 0x60, 0x03, 0xD0, 0x05,
-                                           0x8C, 0x18, 0x88, 0x08, 0x40, 0x01, 0x00, 0x00, 0x00, 0x00};
-
-const unsigned char drop[] PROGMEM = {0x00, 0x00, 0x00, 0x01, 0x80, 0x03, 0xC0, 0x07, 0xE0, 0x0F, 0xE0,
-                                      0x0F, 0xF0, 0x1F, 0xF0, 0x1F, 0xF8, 0x3F, 0xF8, 0x3F, 0xF8, 0x3F,
-                                      0xF8, 0x3F, 0xF0, 0x1F, 0xE0, 0x0F, 0x80, 0x03, 0x00, 0x00};
-
-const unsigned char thermometer[] PROGMEM = {0x00, 0x00, 0x0C, 0x00, 0x16, 0x00, 0x2E, 0x00, 0x5C, 0x00, 0xB8,
-                                             0x00, 0x70, 0x01, 0xE0, 0x02, 0xC0, 0x05, 0x80, 0x3B, 0x00, 0x47,
-                                             0x00, 0xBE, 0x00, 0x9E, 0x00, 0xBE, 0x00, 0x7C, 0x00, 0x38};
-
-const unsigned char sun_behind_raincloud[] PROGMEM = {0xC0, 0x03, 0x20, 0x04, 0x10, 0x0E, 0x38, 0x1F, 0xFC, 0x37, 0xEE,
-                                                      0x77, 0xDE, 0x7B, 0x3E, 0x7C, 0xFC, 0x3F, 0x00, 0x00, 0x48, 0x12,
-                                                      0x48, 0x12, 0x24, 0x09, 0x24, 0x09, 0x00, 0x00, 0x00, 0x00};
-
-const unsigned char sun_behind_cloud[] PROGMEM = {0x00, 0x00, 0xF0, 0x01, 0x08, 0x02, 0x04, 0x0E, 0x3C, 0x1B, 0xFC,
-                                                  0x3B, 0xFE, 0x7B, 0xFA, 0x7B, 0xF6, 0x7D, 0x0C, 0x3E, 0xF8, 0x1F,
-                                                  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-const unsigned char cloud_with_snow[] PROGMEM = {0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x38, 0x1F, 0xFC, 0x3F, 0xFE,
-                                                 0x7F, 0xFE, 0x7F, 0xFE, 0x7F, 0xFC, 0x3F, 0x00, 0x00, 0x08, 0x02,
-                                                 0x40, 0x10, 0x00, 0x00, 0x24, 0x09, 0x00, 0x00, 0x00, 0x00};
-
-const unsigned char cloud_with_lightning[] PROGMEM = {0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x38, 0x1F, 0xFC, 0x3F, 0xFE,
-                                                      0x7F, 0xFE, 0x7F, 0xFE, 0x7F, 0xFC, 0x3F, 0x00, 0x01, 0x80, 0x01,
-                                                      0x80, 0x01, 0xC0, 0x07, 0x00, 0x03, 0x00, 0x03, 0x00, 0x01};
-
-const unsigned char cloud_with_lightning_rain[] PROGMEM = {0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x38, 0x1F, 0xFC, 0x3F, 0xFE,
-                                                           0x7F, 0xFE, 0x7F, 0xFE, 0x7F, 0xFC, 0x3F, 0x00, 0x01, 0x90, 0x21,
-                                                           0x90, 0x21, 0xC8, 0x17, 0x08, 0x13, 0x00, 0x03, 0x00, 0x01};
-
-const unsigned char wind_face[] PROGMEM = {0xFF, 0x00, 0x01, 0x01, 0x01, 0x01, 0xF9, 0x00, 0xF9, 0x01, 0xD9,
-                                           0x01, 0x99, 0x01, 0xF9, 0x01, 0xF9, 0x33, 0xFD, 0x4B, 0xFD, 0x85,
-                                           0xFD, 0x9A, 0xFD, 0x75, 0xFD, 0x09, 0xFD, 0x01, 0xFF, 0x00};
-
-const unsigned char new_moon[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0x18, 0x18, 0x04, 0x20, 0x04, 0x20, 0x02,
-                                          0x40, 0x02, 0x40, 0x02, 0x40, 0x02, 0x40, 0x02, 0x40, 0x02, 0x40,
-                                          0x04, 0x20, 0x04, 0x20, 0x18, 0x18, 0xE0, 0x07, 0x00, 0x00};
-
-const unsigned char waxing_crescent_moon[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0x18, 0x1F, 0x04, 0x3E, 0x04, 0x3C, 0x02,
-                                                      0x78, 0x02, 0x78, 0x02, 0x78, 0x02, 0x78, 0x02, 0x78, 0x02, 0x78,
-                                                      0x04, 0x3C, 0x04, 0x3E, 0x18, 0x1F, 0xE0, 0x07, 0x00, 0x00};
-
-const unsigned char first_quarter_moon[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0x18, 0x1F, 0x04, 0x3F, 0x04, 0x3F, 0x02,
-                                                    0x7F, 0x02, 0x7F, 0x02, 0x7F, 0x02, 0x7F, 0x02, 0x7F, 0x02, 0x7F,
-                                                    0x04, 0x3F, 0x04, 0x3F, 0x18, 0x1F, 0xE0, 0x07, 0x00, 0x00};
-
-const unsigned char waxing_gibbous_moon[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0x18, 0x1F, 0x84, 0x3F, 0xC4, 0x3F, 0xC2,
-                                                     0x7F, 0xC2, 0x7F, 0xC2, 0x7F, 0xC2, 0x7F, 0xC2, 0x7F, 0xC2, 0x7F,
-                                                     0xC4, 0x3F, 0x84, 0x3F, 0x18, 0x1F, 0xE0, 0x07, 0x00, 0x00};
-
-const unsigned char full_moon[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0xF8, 0x1F, 0xFC, 0x3F, 0xFC, 0x3F, 0xFE,
-                                           0x7F, 0xFE, 0x7F, 0xFE, 0x7F, 0xFE, 0x7F, 0xFE, 0x7F, 0xFE, 0x7F,
-                                           0xFC, 0x3F, 0xFC, 0x3F, 0xF8, 0x1F, 0xE0, 0x07, 0x00, 0x00};
-
-const unsigned char waning_gibbous_moon[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0xF8, 0x18, 0xFC, 0x21, 0xFC, 0x23, 0xFE,
-                                                     0x43, 0xFE, 0x43, 0xFE, 0x43, 0xFE, 0x43, 0xFE, 0x43, 0xFE, 0x43,
-                                                     0xFC, 0x23, 0xFC, 0x21, 0xF8, 0x18, 0xE0, 0x07, 0x00, 0x00};
-
-const unsigned char last_quarter_moon[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0xF8, 0x18, 0xFC, 0x20, 0xFC, 0x20, 0xFE,
-                                                   0x40, 0xFE, 0x40, 0xFE, 0x40, 0xFE, 0x40, 0xFE, 0x40, 0xFE, 0x40,
-                                                   0xFC, 0x20, 0xFC, 0x20, 0xF8, 0x18, 0xE0, 0x07, 0x00, 0x00};
-
-const unsigned char waning_crescent_moon[] PROGMEM = {0x00, 0x00, 0xE0, 0x07, 0xF8, 0x18, 0x7C, 0x20, 0x3C, 0x20, 0x1E,
-                                                      0x40, 0x1E, 0x40, 0x1E, 0x40, 0x1E, 0x40, 0x1E, 0x40, 0x1E, 0x40,
-                                                      0x3C, 0x20, 0x7C, 0x20, 0xF8, 0x18, 0xE0, 0x07, 0x00, 0x00};
-
-const unsigned char first_quarter_moon_face[] PROGMEM = {0x00, 0x0F, 0x00, 0x12, 0x00, 0x24, 0x00, 0x44, 0x00, 0x48, 0x00,
-                                                         0x88, 0x00, 0x84, 0x80, 0x93, 0x80, 0x80, 0x03, 0x81, 0x8D, 0x80,
-                                                         0x71, 0x40, 0x82, 0x41, 0x02, 0x20, 0x0C, 0x18, 0xF0, 0x07};
-
-const unsigned char peach[] PROGMEM = {0x70, 0x0F, 0x88, 0x10, 0x78, 0x1F, 0x88, 0x11, 0x04, 0x22, 0x02,
-                                       0x44, 0x02, 0x44, 0x02, 0x44, 0x02, 0x44, 0x02, 0x42, 0x02, 0x40,
-                                       0x04, 0x20, 0x04, 0x20, 0x08, 0x10, 0x30, 0x0C, 0xC0, 0x03};
-
-const unsigned char turkey[] PROGMEM = {0x00, 0x00, 0x38, 0x00, 0x44, 0x38, 0x56, 0x54, 0x45, 0x52, 0xE2,
-                                        0x21, 0x2C, 0x56, 0x14, 0x58, 0x0A, 0x37, 0x86, 0x68, 0x82, 0x50,
-                                        0x82, 0x20, 0x04, 0x41, 0xF8, 0x7F, 0x40, 0x02, 0xF0, 0x07};
-
-const unsigned char turkey_leg[] PROGMEM = {0x0C, 0x00, 0x1E, 0x00, 0x1F, 0x00, 0x2F, 0x00, 0x46, 0x00, 0x88,
-                                            0x01, 0x10, 0x0E, 0x20, 0x30, 0x20, 0x40, 0x40, 0x40, 0x40, 0x80,
-                                            0x40, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x43, 0x00, 0x3C};
-
-const unsigned char south_west_arrow[] PROGMEM = {0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x1C, 0x00, 0x3E, 0x00,
-                                                  0x1F, 0x80, 0x0F, 0xC2, 0x07, 0xE6, 0x03, 0xFE, 0x01, 0xFE, 0x00,
-                                                  0x7E, 0x00, 0x7E, 0x00, 0xFE, 0x00, 0xFE, 0x01, 0x00, 0x00};
-
-const unsigned char south_east_arrow[] PROGMEM = {0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x38, 0x00, 0x7C, 0x00, 0xF8,
-                                                  0x00, 0xF0, 0x01, 0xE0, 0x43, 0xC0, 0x67, 0x80, 0x7F, 0x00, 0x7F,
-                                                  0x00, 0x7E, 0x00, 0x7E, 0x00, 0x7F, 0x80, 0x7F, 0x00, 0x00};
-
-const unsigned char north_west_arrow[] PROGMEM = {0x00, 0x00, 0xFE, 0x01, 0xFE, 0x00, 0x7E, 0x00, 0x7E, 0x00, 0xFE,
-                                                  0x00, 0xFE, 0x01, 0xE6, 0x03, 0xC2, 0x07, 0x80, 0x0F, 0x00, 0x1F,
-                                                  0x00, 0x3E, 0x00, 0x1C, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00};
-
-const unsigned char north_east_arrow[] PROGMEM = {0x00, 0x00, 0x80, 0x7F, 0x00, 0x7F, 0x00, 0x7E, 0x00, 0x7E, 0x00,
-                                                  0x7F, 0x80, 0x7F, 0xC0, 0x67, 0xE0, 0x43, 0xF0, 0x01, 0xF8, 0x00,
-                                                  0x7C, 0x00, 0x38, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-const unsigned char downwards_arrow[] PROGMEM = {0x00, 0x00, 0x00, 0x00, 0xC0, 0x03, 0xC0, 0x03, 0xC0, 0x03, 0xC0,
-                                                 0x03, 0xC0, 0x03, 0xC0, 0x03, 0xC0, 0x03, 0xC0, 0x03, 0xFC, 0x3F,
-                                                 0xF8, 0x1F, 0xF0, 0x0F, 0xE0, 0x07, 0xC0, 0x03, 0x80, 0x01};
-
-const unsigned char leftwards_arrow[] PROGMEM = {0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x30, 0x00, 0x38, 0x00, 0x3C,
-                                                 0x00, 0xFE, 0x3F, 0xFF, 0x3F, 0xFF, 0x3F, 0xFE, 0x3F, 0x3C, 0x00,
-                                                 0x38, 0x00, 0x30, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-const unsigned char upwards_arrow[] PROGMEM = {0x80, 0x01, 0xC0, 0x03, 0xE0, 0x07, 0xF0, 0x0F, 0xF8, 0x1F, 0xFC,
-                                               0x3F, 0xC0, 0x03, 0xC0, 0x03, 0xC0, 0x03, 0xC0, 0x03, 0xC0, 0x03,
-                                               0xC0, 0x03, 0xC0, 0x03, 0xC0, 0x03, 0x00, 0x00, 0x00, 0x00};
-
-const unsigned char rightwards_arrow[] PROGMEM = {0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x0C, 0x00, 0x1C, 0x00,
-                                                  0x3C, 0xFC, 0x7F, 0xFC, 0xFF, 0xFC, 0xFF, 0xFC, 0x7F, 0x00, 0x3C,
-                                                  0x00, 0x1C, 0x00, 0x0C, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00};
-
-const unsigned char strong[] PROGMEM = {0x38, 0x00, 0x44, 0x00, 0x62, 0x00, 0x42, 0x00, 0x42, 0x00, 0x3A,
-                                        0x00, 0x11, 0x3C, 0x11, 0x42, 0xD1, 0x81, 0x31, 0x82, 0x11, 0x82,
-                                        0x21, 0x80, 0x01, 0x80, 0x01, 0x80, 0x02, 0x40, 0xFC, 0x3F};
-
-const unsigned char check_mark[] PROGMEM = {0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x70, 0x00, 0x3C, 0x00,
-                                            0x1E, 0x00, 0x0F, 0x80, 0x07, 0xC3, 0x03, 0xEE, 0x03, 0xFC, 0x01,
-                                            0xF8, 0x00, 0xF0, 0x00, 0x70, 0x00, 0x60, 0x00, 0x20, 0x00};
-
-const unsigned char house[] PROGMEM = {0x80, 0x01, 0x5C, 0x02, 0x34, 0x04, 0x14, 0x08, 0x0C, 0x10, 0x04,
-                                       0x20, 0x02, 0x40, 0xFF, 0xFF, 0x02, 0x40, 0x7A, 0x5F, 0x4A, 0x55,
-                                       0x4A, 0x5F, 0x6A, 0x55, 0x4A, 0x5F, 0x4A, 0x40, 0xFE, 0x7F};
-
-const unsigned char shrug[] PROGMEM = {0xC0, 0x03, 0x20, 0x04, 0x10, 0x08, 0x50, 0x0A, 0x10, 0x08, 0x90,
-                                       0x09, 0x27, 0xE4, 0x49, 0x92, 0xAA, 0x55, 0x16, 0x68, 0x12, 0x48,
-                                       0x02, 0x40, 0x02, 0x40, 0x0C, 0x30, 0x08, 0x10, 0xF8, 0x1F};
-
-const unsigned char eyes[] PROGMEM = {0x00, 0x00, 0x3C, 0x3C, 0x42, 0x42, 0x81, 0x81, 0x85, 0x85, 0x8F,
-                                      0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F,
-                                      0x85, 0x85, 0x81, 0x81, 0x42, 0x42, 0x3C, 0x3C, 0x00, 0x00};
-
-const unsigned char eye[] PROGMEM = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x07, 0xF8, 0x1F, 0xF4,
-                                     0x2F, 0x7A, 0x5E, 0x39, 0x9C, 0x39, 0x9C, 0x7A, 0x5E, 0xF4, 0x2F,
-                                     0xF8, 0x1F, 0xE0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 #endif

 } // namespace graphics
-#endif
+#endif
--- a/src/graphics/emotes.h
+++ b/src/graphics/emotes.h
@@ -22,33 +22,33 @@ extern const int numEmotes;
 extern const unsigned char thumbup[] PROGMEM;
 extern const unsigned char thumbdown[] PROGMEM;

-#define smiling_eyes_height 16
-#define smiling_eyes_width 16
-extern const unsigned char smiling_eyes[] PROGMEM;
+#define Smiling_Eyes_height 16
+#define Smiling_Eyes_width 16
+extern const unsigned char Smiling_Eyes[] PROGMEM;

-#define grinning_height 16
-#define grinning_width 16
-extern const unsigned char grinning[] PROGMEM;
+#define Grinning_height 16
+#define Grinning_width 16
+extern const unsigned char Grinning[] PROGMEM;

-#define slightly_smiling_height 16
-#define slightly_smiling_width 16
-extern const unsigned char slightly_smiling[] PROGMEM;
+#define Slightly_Smiling_height 16
+#define Slightly_Smiling_width 16
+extern const unsigned char Slightly_Smiling[] PROGMEM;

-#define winking_face_height 16
-#define winking_face_width 16
-extern const unsigned char winking_face[] PROGMEM;
+#define Winking_Face_height 16
+#define Winking_Face_width 16
+extern const unsigned char Winking_Face[] PROGMEM;

-#define grinning_smiling_eyes_height 16
-#define grinning_smiling_eyes_width 16
-extern const unsigned char grinning_smiling_eyes[] PROGMEM;
+#define Grinning_Smiling_Eyes_height 16
+#define Grinning_Smiling_Eyes_width 16
+extern const unsigned char Grinning_Smiling_Eyes[] PROGMEM;

 #define heart_smile_height 16
 #define heart_smile_width 16
 extern const unsigned char heart_smile[] PROGMEM;

-#define heart_eyes_height 16
-#define heart_eyes_width 16
-extern const unsigned char heart_eyes[] PROGMEM;
+#define Heart_eyes_height 16
+#define Heart_eyes_width 16
+extern const unsigned char Heart_eyes[] PROGMEM;

 #define question_height 16
 #define question_width 16
@@ -62,21 +62,21 @@ extern const unsigned char bang[] PROGMEM;
 #define haha_width 16
 extern const unsigned char haha[] PROGMEM;

-#define rofl_height 16
-#define rofl_width 16
-extern const unsigned char rofl[] PROGMEM;
+#define ROFL_height 16
+#define ROFL_width 16
+extern const unsigned char ROFL[] PROGMEM;

-#define smiling_closed_eyes_height 16
-#define smiling_closed_eyes_width 16
-extern const unsigned char smiling_closed_eyes[] PROGMEM;
+#define Smiling_Closed_Eyes_height 16
+#define Smiling_Closed_Eyes_width 16
+extern const unsigned char Smiling_Closed_Eyes[] PROGMEM;

-#define grinning_smiling_eyes_2_height 16
-#define grinning_smiling_eyes_2_width 16
-extern const unsigned char grinning_smiling_eyes_2[] PROGMEM;
+#define Grinning_SmilingEyes2_height 16
+#define Grinning_SmilingEyes2_width 16
+extern const unsigned char Grinning_SmilingEyes2[] PROGMEM;

-#define loudly_crying_face_height 16
-#define loudly_crying_face_width 16
-extern const unsigned char loudly_crying_face[] PROGMEM;
+#define Loudly_Crying_Face_height 16
+#define Loudly_Crying_Face_width 16
+extern const unsigned char Loudly_Crying_Face[] PROGMEM;

 #define wave_icon_height 16
 #define wave_icon_width 16
@@ -126,21 +126,21 @@ extern const unsigned char bell_icon[] PROGMEM;
 #define cookie_height 16
 extern const unsigned char cookie[] PROGMEM;

-#define fire_width 16
-#define fire_height 16
-extern const unsigned char fire[] PROGMEM;
+#define Fire_width 16
+#define Fire_height 16
+extern const unsigned char Fire[] PROGMEM;

 #define peace_sign_width 16
 #define peace_sign_height 16
 extern const unsigned char peace_sign[] PROGMEM;

-#define praying_width 16
-#define praying_height 16
-extern const unsigned char praying[] PROGMEM;
+#define Praying_width 16
+#define Praying_height 16
+extern const unsigned char Praying[] PROGMEM;

-#define sparkles_width 16
-#define sparkles_height 16
-extern const unsigned char sparkles[] PROGMEM;
+#define Sparkles_width 16
+#define Sparkles_height 16
+extern const unsigned char Sparkles[] PROGMEM;

 #define clown_width 16
 #define clown_height 16
@@ -161,178 +161,6 @@ extern const unsigned char bowling[] PROGMEM;
 #define vulcan_salute_width 16
 #define vulcan_salute_height 16
 extern const unsigned char vulcan_salute[] PROGMEM;
-
-#define jack_o_lantern_width 16
-#define jack_o_lantern_height 16
-extern const unsigned char jack_o_lantern[] PROGMEM;
-
-#define ghost_width 16
-#define ghost_height 16
-extern const unsigned char ghost[] PROGMEM;
-
-#define skull_width 16
-#define skull_height 16
-extern const unsigned char skull[] PROGMEM;
-
-#define vomiting_width 16
-#define vomiting_height 16
-extern const unsigned char vomiting[] PROGMEM;
-
-#define cool_width 16
-#define cool_height 16
-extern const unsigned char cool[] PROGMEM;
-
-#define shortcake_width 16
-#define shortcake_height 16
-extern const unsigned char shortcake[] PROGMEM;
-
-#define caution_width 16
-#define caution_height 16
-extern const unsigned char caution[] PROGMEM;
-
-#define clipboard_width 16
-#define clipboard_height 16
-extern const unsigned char clipboard[] PROGMEM;
-
-#define snowflake_width 16
-#define snowflake_height 16
-extern const unsigned char snowflake[] PROGMEM;
-
-#define drop_width 16
-#define drop_height 16
-extern const unsigned char drop[] PROGMEM;
-
-#define thermometer_width 16
-#define thermometer_height 16
-extern const unsigned char thermometer[] PROGMEM;
-
-#define sun_behind_raincloud_width 16
-#define sun_behind_raincloud_height 16
-extern const unsigned char sun_behind_raincloud[] PROGMEM;
-
-#define sun_behind_cloud_width 16
-#define sun_behind_cloud_height 16
-extern const unsigned char sun_behind_cloud[] PROGMEM;
-
-#define cloud_with_snow_width 16
-#define cloud_with_snow_height 16
-extern const unsigned char cloud_with_snow[] PROGMEM;
-
-#define cloud_with_lightning_width 16
-#define cloud_with_lightning_height 16
-extern const unsigned char cloud_with_lightning[] PROGMEM;
-
-#define cloud_with_lightning_rain_width 16
-#define cloud_with_lightning_rain_height 16
-extern const unsigned char cloud_with_lightning_rain[] PROGMEM;
-
-#define wind_face_width 16
-#define wind_face_height 16
-extern const unsigned char wind_face[] PROGMEM;
-
-#define new_moon_width 16
-#define new_moon_height 16
-extern const unsigned char new_moon[] PROGMEM;
-
-#define waxing_crescent_moon_width 16
-#define waxing_crescent_moon_height 16
-extern const unsigned char waxing_crescent_moon[] PROGMEM;
-
-#define first_quarter_moon_width 16
-#define first_quarter_moon_height 16
-extern const unsigned char first_quarter_moon[] PROGMEM;
-
-#define waxing_gibbous_moon_width 16
-#define waxing_gibbous_moon_height 16
-extern const unsigned char waxing_gibbous_moon[] PROGMEM;
-
-#define full_moon_width 16
-#define full_moon_height 16
-extern const unsigned char full_moon[] PROGMEM;
-
-#define waning_gibbous_moon_width 16
-#define waning_gibbous_moon_height 16
-extern const unsigned char waning_gibbous_moon[] PROGMEM;
-
-#define last_quarter_moon_width 16
-#define last_quarter_moon_height 16
-extern const unsigned char last_quarter_moon[] PROGMEM;
-
-#define waning_crescent_moon_width 16
-#define waning_crescent_moon_height 16
-extern const unsigned char waning_crescent_moon[] PROGMEM;
-
-#define first_quarter_moon_face_width 16
-#define first_quarter_moon_face_height 16
-extern const unsigned char first_quarter_moon_face[] PROGMEM;
-
-#define peach_width 16
-#define peach_height 16
-extern const unsigned char peach[] PROGMEM;
-
-#define turkey_width 16
-#define turkey_height 16
-extern const unsigned char turkey[] PROGMEM;
-
-#define turkey_leg_width 16
-#define turkey_leg_height 16
-extern const unsigned char turkey_leg[] PROGMEM;
-
-#define south_west_arrow_width 16
-#define south_west_arrow_height 16
-extern const unsigned char south_west_arrow[] PROGMEM;
-
-#define south_east_arrow_width 16
-#define south_east_arrow_height 16
-extern const unsigned char south_east_arrow[] PROGMEM;
-
-#define north_west_arrow_width 16
-#define north_west_arrow_height 16
-extern const unsigned char north_west_arrow[] PROGMEM;
-
-#define north_east_arrow_width 16
-#define north_east_arrow_height 16
-extern const unsigned char north_east_arrow[] PROGMEM;
-
-#define downwards_arrow_width 16
-#define downwards_arrow_height 16
-extern const unsigned char downwards_arrow[] PROGMEM;
-
-#define leftwards_arrow_width 16
-#define leftwards_arrow_height 16
-extern const unsigned char leftwards_arrow[] PROGMEM;
-
-#define upwards_arrow_width 16
-#define upwards_arrow_height 16
-extern const unsigned char upwards_arrow[] PROGMEM;
-
-#define rightwards_arrow_width 16
-#define rightwards_arrow_height 16
-extern const unsigned char rightwards_arrow[] PROGMEM;
-
-#define strong_width 16
-#define strong_height 16
-extern const unsigned char strong[] PROGMEM;
-
-#define check_mark_width 16
-#define check_mark_height 16
-extern const unsigned char check_mark[] PROGMEM;
-
-#define house_width 16
-#define house_height 16
-extern const unsigned char house[] PROGMEM;
-
-#define shrug_width 16
-#define shrug_height 16
-extern const unsigned char shrug[] PROGMEM;
-
-#define eyes_width 16
-#define eyes_height 16
-extern const unsigned char eyes[] PROGMEM;
-
-#define eye_width 16
-#define eye_height 16
-extern const unsigned char eye[] PROGMEM;
 #endif // EXCLUDE_EMOJI

-} // namespace graphics
+} // namespace graphics
--- a/src/graphics/niche/InkHUD/AppletFont.cpp
+++ b/src/graphics/niche/InkHUD/AppletFont.cpp
@@ -124,7 +124,7 @@ uint32_t InkHUD::AppletFont::toUtf32(std::string utf8)
        utf32 |= (utf8.at(3) & 0b00111111);
        break;
    default:
-        return 0;
+        assert(false);
    }

    return utf32;
--- a/src/graphics/niche/InkHUD/PlatformioConfig.ini
+++ b/src/graphics/niche/InkHUD/PlatformioConfig.ini
@@ -8,5 +8,4 @@ build_flags =
  -D MESHTASTIC_EXCLUDE_INPUTBROKER ; Suppress default input handling
  -D HAS_BUTTON=0 ; Suppress default ButtonThread
 lib_deps =
-  # TODO renovate
-  https://github.com/ZinggJM/GFX_Root#2.0.0 ; Used by InkHUD as a "slimmer" version of AdafruitGFX
+  https://github.com/ZinggJM/GFX_Root#2.0.0 ; Used by InkHUD as a "slimmer" version of AdafruitGFX
--- a/src/input/InputBroker.h
+++ b/src/input/InputBroker.h
@@ -53,7 +53,6 @@ typedef struct _InputEvent {
 class InputPollable
 {
  public:
-    virtual ~InputPollable() = default;
    virtual void pollOnce() = 0;
 };

--- a/src/input/RotaryEncoderImpl.cpp
+++ b/src/input/RotaryEncoderImpl.cpp
@@ -3,9 +3,6 @@
 #include "RotaryEncoderImpl.h"
 #include "InputBroker.h"
 #include "RotaryEncoder.h"
-#ifdef ARCH_ESP32
-#include "sleep.h"
-#endif

 #define ORIGIN_NAME "RotaryEncoder"

@@ -14,20 +11,6 @@ RotaryEncoderImpl *rotaryEncoderImpl;
 RotaryEncoderImpl::RotaryEncoderImpl()
 {
    rotary = nullptr;
-#ifdef ARCH_ESP32
-    isFirstInit = true;
-#endif
-}
-
-RotaryEncoderImpl::~RotaryEncoderImpl()
-{
-    LOG_DEBUG("RotaryEncoderImpl destructor");
-    detachRotaryEncoderInterrupts();
-
-    if (rotary != nullptr) {
-        delete rotary;
-        rotary = nullptr;
-    }
 }

 bool RotaryEncoderImpl::init()
@@ -42,22 +25,15 @@ bool RotaryEncoderImpl::init()
    eventCcw = static_cast<input_broker_event>(moduleConfig.canned_message.inputbroker_event_ccw);
    eventPressed = static_cast<input_broker_event>(moduleConfig.canned_message.inputbroker_event_press);

-    if (rotary == nullptr) {
-        rotary = new RotaryEncoder(moduleConfig.canned_message.inputbroker_pin_a, moduleConfig.canned_message.inputbroker_pin_b,
-                                   moduleConfig.canned_message.inputbroker_pin_press);
-    }
+    rotary = new RotaryEncoder(moduleConfig.canned_message.inputbroker_pin_a, moduleConfig.canned_message.inputbroker_pin_b,
+                               moduleConfig.canned_message.inputbroker_pin_press);
+    rotary->resetButton();

-    attachRotaryEncoderInterrupts();
-
-#ifdef ARCH_ESP32
-    // Register callbacks for before and after lightsleep
-    // Used to detach and reattach interrupts
-    if (isFirstInit) {
-        lsObserver.observe(&notifyLightSleep);
-        lsEndObserver.observe(&notifyLightSleepEnd);
-        isFirstInit = false;
-    }
-#endif
+    interruptInstance = this;
+    auto interruptHandler = []() { inputBroker->requestPollSoon(interruptInstance); };
+    attachInterrupt(moduleConfig.canned_message.inputbroker_pin_a, interruptHandler, CHANGE);
+    attachInterrupt(moduleConfig.canned_message.inputbroker_pin_b, interruptHandler, CHANGE);
+    attachInterrupt(moduleConfig.canned_message.inputbroker_pin_press, interruptHandler, CHANGE);

    LOG_INFO("RotaryEncoder initialized pins(%d, %d, %d), events(%d, %d, %d)", moduleConfig.canned_message.inputbroker_pin_a,
             moduleConfig.canned_message.inputbroker_pin_b, moduleConfig.canned_message.inputbroker_pin_press, eventCw, eventCcw,
@@ -95,50 +71,6 @@ void RotaryEncoderImpl::pollOnce()
    }
 }

-void RotaryEncoderImpl::detachRotaryEncoderInterrupts()
-{
-    LOG_DEBUG("RotaryEncoderImpl detach button interrupts");
-    if (interruptInstance == this) {
-        detachInterrupt(moduleConfig.canned_message.inputbroker_pin_a);
-        detachInterrupt(moduleConfig.canned_message.inputbroker_pin_b);
-        detachInterrupt(moduleConfig.canned_message.inputbroker_pin_press);
-        interruptInstance = nullptr;
-    } else {
-        LOG_WARN("RotaryEncoderImpl: interrupts already detached");
-    }
-}
-
-void RotaryEncoderImpl::attachRotaryEncoderInterrupts()
-{
-    LOG_DEBUG("RotaryEncoderImpl attach button interrupts");
-    if (rotary != nullptr && interruptInstance == nullptr) {
-        rotary->resetButton();
-
-        interruptInstance = this;
-        auto interruptHandler = []() { inputBroker->requestPollSoon(interruptInstance); };
-        attachInterrupt(moduleConfig.canned_message.inputbroker_pin_a, interruptHandler, CHANGE);
-        attachInterrupt(moduleConfig.canned_message.inputbroker_pin_b, interruptHandler, CHANGE);
-        attachInterrupt(moduleConfig.canned_message.inputbroker_pin_press, interruptHandler, CHANGE);
-    } else {
-        LOG_WARN("RotaryEncoderImpl: interrupts already attached");
-    }
-}
-
-#ifdef ARCH_ESP32
-
-int RotaryEncoderImpl::beforeLightSleep(void *unused)
-{
-    detachRotaryEncoderInterrupts();
-    return 0; // Indicates success;
-}
-
-int RotaryEncoderImpl::afterLightSleep(esp_sleep_wakeup_cause_t cause)
-{
-    attachRotaryEncoderInterrupts();
-    return 0; // Indicates success;
-}
-#endif
-
 RotaryEncoderImpl *RotaryEncoderImpl::interruptInstance;

 #endif
--- a/src/input/RotaryEncoderImpl.h
+++ b/src/input/RotaryEncoderImpl.h
@@ -8,18 +8,12 @@

 class RotaryEncoder;

-class RotaryEncoderImpl final : public InputPollable
+class RotaryEncoderImpl : public InputPollable
 {
  public:
    RotaryEncoderImpl();
-    ~RotaryEncoderImpl() override;
-    bool init();
+    bool init(void);
    virtual void pollOnce() override;
-    // Disconnect and reconnect interrupts for light sleep
-#ifdef ARCH_ESP32
-    int beforeLightSleep(void *unused);
-    int afterLightSleep(esp_sleep_wakeup_cause_t cause);
-#endif

  protected:
    static RotaryEncoderImpl *interruptInstance;
@@ -29,21 +23,6 @@ class RotaryEncoderImpl final : public InputPollable
    input_broker_event eventPressed = INPUT_BROKER_NONE;

    RotaryEncoder *rotary;
-
-  private:
-#ifdef ARCH_ESP32
-    bool isFirstInit;
-#endif
-    void detachRotaryEncoderInterrupts();
-    void attachRotaryEncoderInterrupts();
-
-#ifdef ARCH_ESP32
-    // Get notified when lightsleep begins and ends
-    CallbackObserver<RotaryEncoderImpl, void *> lsObserver =
-        CallbackObserver<RotaryEncoderImpl, void *>(this, &RotaryEncoderImpl::beforeLightSleep);
-    CallbackObserver<RotaryEncoderImpl, esp_sleep_wakeup_cause_t> lsEndObserver =
-        CallbackObserver<RotaryEncoderImpl, esp_sleep_wakeup_cause_t>(this, &RotaryEncoderImpl::afterLightSleep);
-#endif
 };

 extern RotaryEncoderImpl *rotaryEncoderImpl;
--- a/src/input/TrackballInterruptBase.cpp
+++ b/src/input/TrackballInterruptBase.cpp
@@ -88,50 +88,6 @@ int32_t TrackballInterruptBase::runOnce()
        }
    }

-    if (directionDetected && directionStartTime > 0) {
-        uint32_t directionDuration = millis() - directionStartTime;
-        uint8_t directionPressedNow = 0;
-        directionInterval++;
-
-        if (!digitalRead(_pinUp)) {
-            directionPressedNow = TB_ACTION_UP;
-        } else if (!digitalRead(_pinDown)) {
-            directionPressedNow = TB_ACTION_DOWN;
-        } else if (!digitalRead(_pinLeft)) {
-            directionPressedNow = TB_ACTION_LEFT;
-        } else if (!digitalRead(_pinRight)) {
-            directionPressedNow = TB_ACTION_RIGHT;
-        }
-
-        const uint8_t DIRECTION_REPEAT_THRESHOLD = 3;
-
-        if (directionPressedNow == TB_ACTION_NONE) {
-            // Reset state
-            directionDetected = false;
-            directionStartTime = 0;
-            directionInterval = 0;
-            this->action = TB_ACTION_NONE;
-        } else if (directionDuration >= LONG_PRESS_DURATION && directionInterval >= DIRECTION_REPEAT_THRESHOLD) {
-            // repeat event when long press these direction.
-            switch (directionPressedNow) {
-            case TB_ACTION_UP:
-                e.inputEvent = this->_eventUp;
-                break;
-            case TB_ACTION_DOWN:
-                e.inputEvent = this->_eventDown;
-                break;
-            case TB_ACTION_LEFT:
-                e.inputEvent = this->_eventLeft;
-                break;
-            case TB_ACTION_RIGHT:
-                e.inputEvent = this->_eventRight;
-                break;
-            }
-
-            directionInterval = 0;
-        }
-    }
-
 #if defined(T_DECK) // T-deck gets a super-simple debounce on trackball
    if (this->action == TB_ACTION_PRESSED && !pressDetected) {
        // Start long press detection
@@ -157,22 +113,17 @@ int32_t TrackballInterruptBase::runOnce()
        pressDetected = true;
        pressStartTime = millis();
        // Don't send event yet, wait to see if it's a long press
-    } else if (this->action == TB_ACTION_UP && !digitalRead(_pinUp) && !directionDetected) {
-        directionDetected = true;
-        directionStartTime = millis();
+    } else if (this->action == TB_ACTION_UP && !digitalRead(_pinUp)) {
+        // LOG_DEBUG("Trackball event UP");
        e.inputEvent = this->_eventUp;
-        // send event first,will automatically trigger every 50ms * 3 after 500ms
-    } else if (this->action == TB_ACTION_DOWN && !digitalRead(_pinDown) && !directionDetected) {
-        directionDetected = true;
-        directionStartTime = millis();
+    } else if (this->action == TB_ACTION_DOWN && !digitalRead(_pinDown)) {
+        // LOG_DEBUG("Trackball event DOWN");
        e.inputEvent = this->_eventDown;
-    } else if (this->action == TB_ACTION_LEFT && !digitalRead(_pinLeft) && !directionDetected) {
-        directionDetected = true;
-        directionStartTime = millis();
+    } else if (this->action == TB_ACTION_LEFT && !digitalRead(_pinLeft)) {
+        // LOG_DEBUG("Trackball event LEFT");
        e.inputEvent = this->_eventLeft;
-    } else if (this->action == TB_ACTION_RIGHT && !digitalRead(_pinRight) && !directionDetected) {
-        directionDetected = true;
-        directionStartTime = millis();
+    } else if (this->action == TB_ACTION_RIGHT && !digitalRead(_pinRight)) {
+        // LOG_DEBUG("Trackball event RIGHT");
        e.inputEvent = this->_eventRight;
    }
 #endif
--- a/src/input/TrackballInterruptBase.h
+++ b/src/input/TrackballInterruptBase.h
@@ -49,14 +49,10 @@ class TrackballInterruptBase : public Observable<const InputEvent *>, public con

    // Long press detection for press button
    uint32_t pressStartTime = 0;
-    uint32_t directionStartTime = 0;
-    uint8_t directionInterval = 0;
    bool pressDetected = false;
-    bool directionDetected = false;
    uint32_t lastLongPressEventTime = 0;
-    uint32_t lastDirectionPressEventTime = 0;
    static const uint32_t LONG_PRESS_DURATION = 500;        // ms
-    static const uint32_t LONG_PRESS_REPEAT_INTERVAL = 300; // ms - interval between repeated long press events
+    static const uint32_t LONG_PRESS_REPEAT_INTERVAL = 500; // ms - interval between repeated long press events

  private:
    input_broker_event _eventDown = INPUT_BROKER_NONE;
--- a/src/input/UpDownInterruptBase.h
+++ b/src/input/UpDownInterruptBase.h
@@ -3,14 +3,6 @@
 #include "InputBroker.h"
 #include "mesh/NodeDB.h"

-#ifndef UPDOWN_LONG_PRESS_DURATION
-#define UPDOWN_LONG_PRESS_DURATION 300
-#endif
-
-#ifndef UPDOWN_LONG_PRESS_REPEAT_INTERVAL
-#define UPDOWN_LONG_PRESS_REPEAT_INTERVAL 300
-#endif
-
 class UpDownInterruptBase : public Observable<const InputEvent *>, public concurrency::OSThread
 {
  public:
@@ -48,8 +40,8 @@ class UpDownInterruptBase : public Observable<const InputEvent *>, public concur
    uint32_t lastPressLongEventTime = 0;
    uint32_t lastUpLongEventTime = 0;
    uint32_t lastDownLongEventTime = 0;
-    static const uint32_t LONG_PRESS_DURATION = UPDOWN_LONG_PRESS_DURATION;
-    static const uint32_t LONG_PRESS_REPEAT_INTERVAL = UPDOWN_LONG_PRESS_REPEAT_INTERVAL;
+    static const uint32_t LONG_PRESS_DURATION = 300;
+    static const uint32_t LONG_PRESS_REPEAT_INTERVAL = 300;

  private:
    uint8_t _pinDown = 0;
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -428,17 +428,10 @@ void setup()
 #endif

 #if ARCH_PORTDUINO
-    RTCQuality ourQuality = RTCQualityDevice;
-
-    std::string timeCommandResult = exec("timedatectl status | grep synchronized | grep yes -c");
-    if (timeCommandResult[0] == '1') {
-        ourQuality = RTCQualityNTP;
-    }
-
    struct timeval tv;
    tv.tv_sec = time(NULL);
    tv.tv_usec = 0;
-    perhapsSetRTC(ourQuality, &tv);
+    perhapsSetRTC(RTCQualityDevice, &tv);
 #endif

    powerMonInit();
@@ -446,13 +439,6 @@ void setup()

    LOG_INFO("\n\n//\\ E S H T /\\ S T / C\n");

-#if defined(ARCH_ESP32) && defined(BOARD_HAS_PSRAM)
-#ifndef SENSECAP_INDICATOR
-    // use PSRAM for malloc calls > 256 bytes
-    heap_caps_malloc_extmem_enable(256);
-#endif
-#endif
-
 #if defined(DEBUG_MUTE) && defined(DEBUG_PORT)
    DEBUG_PORT.printf("\r\n\r\n//\\ E S H T /\\ S T / C\r\n");
    DEBUG_PORT.printf("Version %s for %s from %s\r\n", optstr(APP_VERSION), optstr(APP_ENV), optstr(APP_REPO));
--- a/src/mesh/Channels.h
+++ b/src/mesh/Channels.h
@@ -96,8 +96,6 @@ class Channels

    bool setDefaultPresetCryptoForHash(ChannelHash channelHash);

-    int16_t getHash(ChannelIndex i) { return hashes[i]; }
-
  private:
    /** Given a channel index, change to use the crypto key specified by that index
     *
@@ -115,6 +113,8 @@ class Channels
     */
    int16_t generateHash(ChannelIndex channelNum);

+    int16_t getHash(ChannelIndex i) { return hashes[i]; }
+
    /**
     * Validate a channel, fixing any errors as needed
     */
--- a/src/mesh/CryptoEngine.cpp
+++ b/src/mesh/CryptoEngine.cpp
@@ -4,17 +4,22 @@

 #if !(MESHTASTIC_EXCLUDE_PKI)
 #include "NodeDB.h"
+#include "XEdDSA.h"
 #include "aes-ccm.h"
 #include "meshUtils.h"
 #include <Crypto.h>
 #include <Curve25519.h>
+#include <Ed25519.h>
 #include <RNG.h>
 #include <SHA256.h>
-#if !(MESHTASTIC_EXCLUDE_PKI_KEYGEN)
-#if !defined(ARCH_STM32WL)
-#define CryptRNG RNG
+
+#ifndef NUM_LIMBS_256BIT
+#define NUM_LIMBS_BITS(n) (((n) + sizeof(limb_t) * 8 - 1) / (8 * sizeof(limb_t)))
+#define NUM_LIMBS_256BIT NUM_LIMBS_BITS(256)
 #endif

+#if !(MESHTASTIC_EXCLUDE_PKI_KEYGEN)
+
 /**
 * Create a public/private key pair with Curve25519.
 *
@@ -35,6 +40,7 @@ void CryptoEngine::generateKeyPair(uint8_t *pubKey, uint8_t *privKey)
    Curve25519::dh1(public_key, private_key);
    memcpy(pubKey, public_key, sizeof(public_key));
    memcpy(privKey, private_key, sizeof(private_key));
+    XEdDSA::priv_curve_to_ed_keys(private_key, xeddsa_private_key, xeddsa_public_key);
 }

 /**
@@ -54,12 +60,66 @@ bool CryptoEngine::regeneratePublicKey(uint8_t *pubKey, uint8_t *privKey)
        }
        memcpy(private_key, privKey, sizeof(private_key));
        memcpy(public_key, pubKey, sizeof(public_key));
+        XEdDSA::priv_curve_to_ed_keys(private_key, xeddsa_private_key, xeddsa_public_key);
    } else {
        LOG_WARN("X25519 key generation failed due to blank private key");
        return false;
    }
    return true;
 }
+
+bool CryptoEngine::xeddsa_sign(uint8_t *message, size_t len, uint8_t *signature)
+{
+    XEdDSA::sign(signature, xeddsa_private_key, xeddsa_public_key, message,
+                 len); // sign will need modified to use the raw secret scalar, and not hash it first.
+    return true;
+}
+bool CryptoEngine::xeddsa_verify(uint8_t *pubKey, uint8_t *message, size_t len, uint8_t *signature)
+{
+    uint8_t publicKey[32] = {0};
+    curve_to_ed_pub(pubKey, publicKey);
+
+    return XEdDSA::verify(signature, publicKey, message, len);
+}
+
+void CryptoEngine::curve_to_ed_pub(uint8_t *curve_pubkey, uint8_t *ed_pubkey)
+{
+
+    // Apply the birational map defined in RFC 7748, section 4.1 "Curve25519" to calculate an Ed25519 public
+    // key from a Curve25519 public key. Because the serialization format of Curve25519 public keys only
+    // contains the u coordinate, the x coordinate of the corresponding Ed25519 public key can't be uniquely
+    // calculated as defined by the birational map. The x coordinate is represented in the serialization
+    // format of Ed25519 public keys only in a single sign bit. This function assumes that the sign bit is
+    // known to the user and is passed accordingly.
+    fe u, y;
+    fe one;
+    fe u_minus_one, u_plus_one, u_plus_one_inv;
+
+    // Parse the Curve25519 public key input as a field element containing the u coordinate. RFC 7748,
+    // section 5 "The X25519 and X448 Functions", mandates that the most significant bit of the Curve25519
+    // public key has to be zeroized. This is handled by fe_frombytes internally.
+    fe_frombytes(u, curve_pubkey);
+
+    // Calculate the parameters (u - 1) and (u + 1)
+    fe_1(one);
+    fe_sub(u_minus_one, u, one);
+    fe_add(u_plus_one, u, one);
+
+    // Invert u + 1
+    fe_invert(u_plus_one_inv, u_plus_one);
+
+    // Calculate y = (u - 1) * inv(u + 1) (mod p)
+    fe_mul(y, u_minus_one, u_plus_one_inv);
+
+    // Serialize the field element containing the y coordinate to the Ed25519 public key output
+    fe_tobytes(ed_pubkey, y);
+
+    // Set the sign bit to zero
+    ed_pubkey[31] &= 0x7f;
+
+    // need to convert the pubkey y = ( u - 1) * inv( u + 1) (mod p).
+}
+
 #endif
 void CryptoEngine::clearKeys()
 {
--- a/src/mesh/CryptoEngine.h
+++ b/src/mesh/CryptoEngine.h
@@ -35,6 +35,8 @@ class CryptoEngine
 #if !(MESHTASTIC_EXCLUDE_PKI_KEYGEN)
    virtual void generateKeyPair(uint8_t *pubKey, uint8_t *privKey);
    virtual bool regeneratePublicKey(uint8_t *pubKey, uint8_t *privKey);
+    bool xeddsa_sign(uint8_t *message, size_t len, uint8_t *signature);
+    bool xeddsa_verify(uint8_t *pubKey, uint8_t *message, size_t len, uint8_t *signature);

 #endif
    void clearKeys();
@@ -82,6 +84,9 @@ class CryptoEngine
 #if !(MESHTASTIC_EXCLUDE_PKI)
    uint8_t shared_key[32] = {0};
    uint8_t private_key[32] = {0};
+    uint8_t xeddsa_public_key[32] = {0};
+    uint8_t xeddsa_private_key[32] = {0};
+    void curve_to_ed_pub(uint8_t *curve_pubkey, uint8_t *ed_pubkey);
 #endif
    /**
     * Init our 128 bit nonce for a new packet
--- a/src/mesh/Default.h
+++ b/src/mesh/Default.h
@@ -57,7 +57,14 @@ class Default
    // Note: Kept as uint32_t to match the public API parameter type
    static float congestionScalingCoefficient(uint32_t numOnlineNodes)
    {
-        if (numOnlineNodes <= 40) {
+        // Increase frequency of broadcasts for small networks regardless of preset
+        if (numOnlineNodes <= 10) {
+            return 0.6;
+        } else if (numOnlineNodes <= 20) {
+            return 0.7;
+        } else if (numOnlineNodes <= 30) {
+            return 0.8;
+        } else if (numOnlineNodes <= 40) {
            return 1.0;
        } else {
            float throttlingFactor = 0.075;
--- a/src/mesh/FloodingRouter.cpp
+++ b/src/mesh/FloodingRouter.cpp
@@ -124,10 +124,6 @@ void FloodingRouter::perhapsCancelDupe(const meshtastic_MeshPacket *p)
    if (config.device.role == meshtastic_Config_DeviceConfig_Role_ROUTER_LATE && iface) {
        iface->clampToLateRebroadcastWindow(getFrom(p), p->id);
    }
-    if (config.device.role == meshtastic_Config_DeviceConfig_Role_CLIENT_BASE && iface && nodeDB &&
-        nodeDB->isFromOrToFavoritedNode(*p)) {
-        iface->clampToLateRebroadcastWindow(getFrom(p), p->id);
-    }
 }

 bool FloodingRouter::isRebroadcaster()
--- a/src/mesh/MeshModule.h
+++ b/src/mesh/MeshModule.h
@@ -225,4 +225,4 @@ class MeshModule
 /** set the destination and packet parameters of packet p intended as a reply to a particular "to" packet
 * This ensures that if the request packet was sent reliably, the reply is sent that way as well.
 */
-void setReplyTo(meshtastic_MeshPacket *p, const meshtastic_MeshPacket &to);
+void setReplyTo(meshtastic_MeshPacket *p, const meshtastic_MeshPacket &to);
--- a/src/mesh/MeshService.cpp
+++ b/src/mesh/MeshService.cpp
@@ -276,10 +276,6 @@ bool MeshService::trySendPosition(NodeNum dest, bool wantReplies)
    if (nodeDB->hasValidPosition(node)) {
 #if HAS_GPS && !MESHTASTIC_EXCLUDE_GPS
        if (positionModule) {
-            if (!config.position.fixed_position && !nodeDB->hasLocalPositionSinceBoot()) {
-                LOG_DEBUG("Skip position ping; no fresh position since boot");
-                return false;
-            }
            LOG_INFO("Send position ping to 0x%x, wantReplies=%d, channel=%d", dest, wantReplies, node->channel);
            positionModule->sendOurPosition(dest, wantReplies, node->channel);
            return true;
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -246,8 +246,6 @@ NodeDB::NodeDB()

    // likewise - we always want the app requirements to come from the running appload
    myNodeInfo.min_app_version = 30200; // format is Mmmss (where M is 1+the numeric major number. i.e. 30200 means 2.2.00
-    // Note! We do this after loading saved settings, so that if somehow an invalid nodenum was stored in preferences we won't
-    // keep using that nodenum forever. Crummy guess at our nodenum (but we will check against the nodedb to avoid conflicts)
    pickNewNodeNum();

    // Set our board type so we can share it with others
@@ -267,31 +265,18 @@ NodeDB::NodeDB()
    }

 #if !(MESHTASTIC_EXCLUDE_PKI_KEYGEN || MESHTASTIC_EXCLUDE_PKI)
-
-    if (!owner.is_licensed && config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_UNSET) {
-        bool keygenSuccess = false;
-        keyIsLowEntropy = checkLowEntropyPublicKey(config.security.public_key);
-        if (config.security.private_key.size == 32 && !keyIsLowEntropy) {
-            if (crypto->regeneratePublicKey(config.security.public_key.bytes, config.security.private_key.bytes)) {
-                keygenSuccess = true;
-            }
-        } else {
-            crypto->generateKeyPair(config.security.public_key.bytes, config.security.private_key.bytes);
-            keygenSuccess = true;
-        }
-        if (keygenSuccess) {
-            config.security.public_key.size = 32;
-            config.security.private_key.size = 32;
-            owner.public_key.size = 32;
-            memcpy(owner.public_key.bytes, config.security.public_key.bytes, 32);
-        }
-    }
+    // Generate crypto keys if needed using consolidated function
+    // Set my node num uint32 value to bytes from the public key (if we have one)
+    // Generate identity and crypto keys if needed; this will create a new identity if one does not exist
+    generateCryptoKeyPair(nullptr);
 #elif !(MESHTASTIC_EXCLUDE_PKI)
    // Calculate Curve25519 public and private keys
    if (config.security.private_key.size == 32 && config.security.public_key.size == 32) {
        owner.public_key.size = config.security.public_key.size;
        memcpy(owner.public_key.bytes, config.security.public_key.bytes, config.security.public_key.size);
        crypto->setDHPrivateKey(config.security.private_key.bytes);
+        // Set my node num uint32 value to bytes from the new public key
+        myNodeInfo.my_node_num = crc32Buffer(config.security.public_key.bytes, config.security.public_key.size);
    }
 #endif
    // Include our owner in the node db under our nodenum
@@ -805,15 +790,11 @@ void NodeDB::installDefaultModuleConfig()
    moduleConfig.external_notification.output_ms = 500;
    moduleConfig.external_notification.nag_timeout = 2;
 #endif
-#if defined(RAK4630) || defined(RAK11310) || defined(RAK3312) || defined(MUZI_BASE) || defined(ELECROW_ThinkNode_M3)
-    // Default to PIN_LED2 for external notification output (LED color depends on device variant)
+#if defined(RAK4630) || defined(RAK11310) || defined(RAK3312)
+    // Default to RAK led pin 2 (blue)
    moduleConfig.external_notification.enabled = true;
    moduleConfig.external_notification.output = PIN_LED2;
-#if defined(MUZI_BASE) || defined(ELECROW_ThinkNode_M3)
-    moduleConfig.external_notification.active = false;
-#else
    moduleConfig.external_notification.active = true;
-#endif
    moduleConfig.external_notification.alert_message = true;
    moduleConfig.external_notification.output_ms = 1000;
    moduleConfig.external_notification.nag_timeout = default_ringtone_nag_secs;
@@ -1043,7 +1024,6 @@ void NodeDB::clearLocalPosition()
    node->position.altitude = 0;
    node->position.time = 0;
    setLocalPosition(meshtastic_Position_init_default);
-    localPositionUpdatedSinceBoot = false;
 }

 void NodeDB::cleanupMeshDB()
@@ -2034,6 +2014,94 @@ bool NodeDB::checkLowEntropyPublicKey(const meshtastic_Config_SecurityConfig_pub
 }
 #endif

+bool NodeDB::generateCryptoKeyPair(const uint8_t *privateKey)
+{
+#if !(MESHTASTIC_EXCLUDE_PKI_KEYGEN || MESHTASTIC_EXCLUDE_PKI)
+    // Only generate keys for non-licensed users and if LoRa region is set
+    if (owner.is_licensed || config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_UNSET) {
+        return false;
+    }
+
+    bool keygenSuccess = false;
+    bool lowEntropy = checkLowEntropyPublicKey(config.security.public_key);
+
+    // If a specific private key was provided, use it
+    if (privateKey != nullptr) {
+        LOG_INFO("Using provided private key for PKI");
+        memcpy(config.security.private_key.bytes, privateKey, 32);
+        config.security.private_key.size = 32;
+        config.security.public_key.size = 32;
+
+        // Generate public key from the provided private key
+        if (crypto->regeneratePublicKey(config.security.public_key.bytes, config.security.private_key.bytes)) {
+            keygenSuccess = true;
+        } else {
+            LOG_ERROR("Failed to generate public key from provided private key");
+            return false;
+        }
+    }
+    // Try to regenerate public key from existing private key if it's valid and not low entropy
+    else if (config.security.private_key.size == 32 && !lowEntropy) {
+        config.security.public_key.size = 32;
+        LOG_DEBUG("Regenerate PKI public key from existing private key");
+        if (crypto->regeneratePublicKey(config.security.public_key.bytes, config.security.private_key.bytes)) {
+            keygenSuccess = true;
+        }
+    } else {
+        // Generate a new key pair
+        LOG_INFO("Generate new PKI keys");
+        config.security.public_key.size = 32;
+        config.security.private_key.size = 32;
+        crypto->generateKeyPair(config.security.public_key.bytes, config.security.private_key.bytes);
+        keygenSuccess = true;
+    }
+
+    // Update sizes and copy to owner if successful
+    if (keygenSuccess) {
+        owner.public_key.size = 32;
+        memcpy(owner.public_key.bytes, config.security.public_key.bytes, 32);
+
+        // Update global entropy flag for UI display
+        keyIsLowEntropy = false;
+
+        // Set the DH private key for crypto operations
+        LOG_DEBUG("Set DH private key for crypto operations");
+        crypto->setDHPrivateKey(config.security.private_key.bytes);
+
+        // Conditionally create new identity based on parameter
+        createNewIdentity();
+    }
+    return keygenSuccess;
+#else
+    return false;
+#endif
+}
+
+bool NodeDB::createNewIdentity()
+{
+    // Remove the old node from the NodeDB
+    uint32_t oldNodeNum = getNodeNum();
+    meshtastic_NodeInfoLite *node = getMeshNode(oldNodeNum);
+
+    // Set my node num uint32 value to bytes from the new public key
+    myNodeInfo.my_node_num = crc32Buffer(config.security.public_key.bytes, config.security.public_key.size);
+
+    if (node != NULL && myNodeInfo.my_node_num != oldNodeNum) {
+        LOG_DEBUG("Old node num %u is now %u", oldNodeNum, myNodeInfo.my_node_num);
+        node->is_ignored = true;
+        node->has_device_metrics = false;
+        node->has_position = false;
+        node->user.public_key.size = 0;
+        node->user.public_key.bytes[0] = 0;
+    }
+
+    meshtastic_NodeInfoLite *info = getOrCreateMeshNode(getNodeNum());
+    info->user = TypeConversions::ConvertToUserLite(owner);
+    info->has_user = true;
+
+    return true;
+}
+
 bool NodeDB::backupPreferences(meshtastic_AdminMessage_BackupLocation location)
 {
    bool success = false;
--- a/src/mesh/NodeDB.h
+++ b/src/mesh/NodeDB.h
@@ -279,18 +279,20 @@ class NodeDB
        LOG_DEBUG("Set local position: lat=%i lon=%i time=%u timestamp=%u", position.latitude_i, position.longitude_i,
                  position.time, position.timestamp);
        localPosition = position;
-        if (position.latitude_i != 0 || position.longitude_i != 0) {
-            localPositionUpdatedSinceBoot = true;
-        }
    }

    bool hasValidPosition(const meshtastic_NodeInfoLite *n);
-    bool hasLocalPositionSinceBoot() const { return localPositionUpdatedSinceBoot; }

 #if !defined(MESHTASTIC_EXCLUDE_PKI)
    bool checkLowEntropyPublicKey(const meshtastic_Config_SecurityConfig_public_key_t &keyToTest);
 #endif

+    /// Consolidate crypto key generation logic used across multiple modules
+    /// @param privateKey Optional 32-byte private key to use. If nullptr, generates new random keys.
+    bool generateCryptoKeyPair(const uint8_t *privateKey = nullptr);
+
+    bool createNewIdentity();
+
    bool backupPreferences(meshtastic_AdminMessage_BackupLocation location);
    bool restorePreferences(meshtastic_AdminMessage_BackupLocation location,
                            int restoreWhat = SEGMENT_CONFIG | SEGMENT_MODULECONFIG | SEGMENT_DEVICESTATE | SEGMENT_CHANNELS);
@@ -305,7 +307,6 @@ class NodeDB

  private:
    bool duplicateWarned = false;
-    bool localPositionUpdatedSinceBoot = false;
    uint32_t lastNodeDbSave = 0;    // when we last saved our db to flash
    uint32_t lastBackupAttempt = 0; // when we last tried a backup automatically or manually
    uint32_t lastSort = 0;          // When last sorted the nodeDB
@@ -375,6 +376,9 @@ extern uint32_t error_address;
 #define NODEINFO_BITFIELD_IS_KEY_MANUALLY_VERIFIED_SHIFT 0
 #define NODEINFO_BITFIELD_IS_KEY_MANUALLY_VERIFIED_MASK (1 << NODEINFO_BITFIELD_IS_KEY_MANUALLY_VERIFIED_SHIFT)

+#define NODEINFO_BITFIELD_HAS_XEDDSA_SIGNED_SHIFT 1
+#define NODEINFO_BITFIELD_HAS_XEDDSA_SIGNED_MASK (1 << NODEINFO_BITFIELD_HAS_XEDDSA_SIGNED_SHIFT)
+
 #define Module_Config_size                                                                                                       \
    (ModuleConfig_CannedMessageConfig_size + ModuleConfig_ExternalNotificationConfig_size + ModuleConfig_MQTTConfig_size +       \
     ModuleConfig_RangeTestConfig_size + ModuleConfig_SerialConfig_size + ModuleConfig_StoreForwardConfig_size +                 \
--- a/src/mesh/RadioInterface.cpp
+++ b/src/mesh/RadioInterface.cpp
@@ -296,6 +296,11 @@ bool RadioInterface::shouldRebroadcastEarlyLikeRouter(meshtastic_MeshPacket *p)
        return true;
    }

+    // If we are a CLIENT_BASE and the packet is from or to a favorited node, we should rebroadcast early
+    if (config.device.role == meshtastic_Config_DeviceConfig_Role_CLIENT_BASE) {
+        return nodeDB->isFromOrToFavoritedNode(*p);
+    }
+
    return false;
 }

@@ -323,9 +328,9 @@ uint32_t RadioInterface::getTxDelayMsecWeighted(meshtastic_MeshPacket *p)
 void printPacket(const char *prefix, const meshtastic_MeshPacket *p)
 {
 #if defined(DEBUG_PORT) && !defined(DEBUG_MUTE)
-    std::string out = DEBUG_PORT.mt_sprintf(
-        "%s (id=0x%08x fr=0x%08x to=0x%08x, transport = %u, WantAck=%d, HopLim=%d HopStart=%d Ch=0x%x", prefix, p->id, p->from,
-        p->to, p->transport_mechanism, p->want_ack, p->hop_limit, p->hop_start, p->channel);
+    std::string out =
+        DEBUG_PORT.mt_sprintf("%s (id=0x%08x fr=0x%08x to=0x%08x, transport = %u, WantAck=%d, HopLim=%d Ch=0x%x", prefix, p->id,
+                              p->from, p->to, p->transport_mechanism, p->want_ack, p->hop_limit, p->channel);
    if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
        auto &s = p->decoded;

@@ -498,11 +503,6 @@ void RadioInterface::applyModemConfig()
                cr = 5;
                sf = 10;
                break;
-            case meshtastic_Config_LoRaConfig_ModemPreset_LONG_TURBO:
-                bw = (myRegion->wideLora) ? 1625.0 : 500;
-                cr = 8;
-                sf = 11;
-                break;
            default: // Config_LoRaConfig_ModemPreset_LONG_FAST is default. Gracefully use this is preset is something illegal.
                bw = (myRegion->wideLora) ? 812.5 : 250;
                cr = 5;
@@ -539,26 +539,13 @@ void RadioInterface::applyModemConfig()
        }

        if ((myRegion->freqEnd - myRegion->freqStart) < bw / 1000) {
-            const float regionSpanKHz = (myRegion->freqEnd - myRegion->freqStart) * 1000.0f;
-            const float requestedBwKHz = bw;
-            const bool isWideRequest = requestedBwKHz >= 499.5f; // treat as 500 kHz preset
-            const char *presetName =
-                DisplayFormatters::getModemPresetDisplayName(loraConfig.modem_preset, false, loraConfig.use_preset);
-
-            char err_string[160];
-            if (isWideRequest) {
-                snprintf(err_string, sizeof(err_string), "%s region too narrow for 500kHz preset (%s). Falling back to LongFast.",
-                         myRegion->name, presetName);
-            } else {
-                snprintf(err_string, sizeof(err_string), "%s region span %.0fkHz < requested %.0fkHz. Falling back to LongFast.",
-                         myRegion->name, regionSpanKHz, requestedBwKHz);
-            }
-            LOG_ERROR("%s", err_string);
+            static const char *err_string = "Regional frequency range is smaller than bandwidth. Fall back to default preset";
+            LOG_ERROR(err_string);
            RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);

            meshtastic_ClientNotification *cn = clientNotificationPool.allocZeroed();
            cn->level = meshtastic_LogRecord_Level_ERROR;
-            snprintf(cn->message, sizeof(cn->message), "%s", err_string);
+            sprintf(cn->message, err_string);
            service->sendClientNotification(cn);

            // Set to default modem preset
--- a/src/mesh/ReliableRouter.cpp
+++ b/src/mesh/ReliableRouter.cpp
@@ -150,9 +150,7 @@ void ReliableRouter::sniffReceived(const meshtastic_MeshPacket *p, const meshtas
        PacketId nakId = (c && c->error_reason != meshtastic_Routing_Error_NONE) ? p->decoded.request_id : 0;

        // We intentionally don't check wasSeenRecently, because it is harmless to delete non existent retransmission records
-        if ((ackId || nakId) &&
-            // Implicit ACKs from MQTT should not stop retransmissions
-            !(isFromUs(p) && p->transport_mechanism == meshtastic_MeshPacket_TransportMechanism_TRANSPORT_MQTT)) {
+        if (ackId || nakId) {
            LOG_DEBUG("Received a %s for 0x%x, stopping retransmissions", ackId ? "ACK" : "NAK", ackId);
            if (ackId) {
                stopRetransmission(p->to, ackId);
--- a/src/mesh/Router.cpp
+++ b/src/mesh/Router.cpp
@@ -37,8 +37,8 @@

 static MemoryDynamic<meshtastic_MeshPacket> dynamicPool;
 Allocator<meshtastic_MeshPacket> &packetPool = dynamicPool;
-#elif defined(ARCH_STM32WL) || defined(BOARD_HAS_PSRAM)
-// On STM32 and boards with PSRAM, there isn't enough heap left over for the rest of the firmware if we allocate this statically.
+#elif defined(ARCH_STM32WL)
+// On STM32 there isn't enough heap left over for the rest of the firmware if we allocate this statically.
 // For now, make it dynamic again.
 #define MAX_PACKETS                                                                                                              \
    (MAX_RX_TOPHONE + MAX_RX_FROMRADIO + 2 * MAX_TX_QUEUE +                                                                      \
@@ -500,6 +500,25 @@ DecodeState perhapsDecode(meshtastic_MeshPacket *p)
        if (p->decoded.has_bitfield)
            p->decoded.want_response |= p->decoded.bitfield & BITFIELD_WANT_RESPONSE_MASK;

+        if (p->decoded.has_xeddsa_signature) {
+            LOG_WARN("packet shows XEdDSA");
+            meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(p->from);
+            if (node && node->user.public_key.size == 32) {
+                LOG_WARN("attempting to verify");
+                p->xeddsa_signed = crypto->xeddsa_verify(node->user.public_key.bytes, p->decoded.payload.bytes,
+                                                         p->decoded.payload.size, p->decoded.xeddsa_signature.bytes);
+            } else {
+                LOG_WARN("Don't have key to verify");
+            }
+        }
+        if (p->xeddsa_signed) {
+            LOG_WARN("Received XEdDSA Signed Packet!");
+        } else if (p->decoded.has_xeddsa_signature) {
+            LOG_ERROR("Node sent signed packet, but cannot verify!");
+        } else {
+            LOG_WARN("Received Unsigned Packet!");
+        }
+
        /* Not actually ever used.
        // Decompress if needed. jm
        if (p->decoded.portnum == meshtastic_PortNum_TEXT_MESSAGE_COMPRESSED_APP) {
@@ -526,10 +545,6 @@ DecodeState perhapsDecode(meshtastic_MeshPacket *p)
 #elif ARCH_PORTDUINO
        if (portduino_config.traceFilename != "" || portduino_config.logoutputlevel == level_trace) {
            LOG_TRACE("%s", MeshPacketSerializer::JsonSerialize(p, false).c_str());
-        } else if (portduino_config.JSONFilename != "") {
-            if (portduino_config.JSONFilter == (_meshtastic_PortNum)0 || portduino_config.JSONFilter == p->decoded.portnum) {
-                JSONFile << MeshPacketSerializer::JsonSerialize(p, false) << std::endl;
-            }
        }
 #endif
        return DecodeState::DECODE_SUCCESS;
@@ -553,6 +568,12 @@ meshtastic_Routing_Error perhapsEncode(meshtastic_MeshPacket *p)
            p->decoded.has_bitfield = true;
            p->decoded.bitfield |= (config.lora.config_ok_to_mqtt << BITFIELD_OK_TO_MQTT_SHIFT);
            p->decoded.bitfield |= (p->decoded.want_response << BITFIELD_WANT_RESPONSE_SHIFT);
+            if (p->pki_encrypted == false && isBroadcast(p->to) && p->decoded.payload.size < 120) {
+                crypto->xeddsa_sign(p->decoded.payload.bytes, p->decoded.payload.size, p->decoded.xeddsa_signature.bytes);
+                p->decoded.xeddsa_signature.size = 64;
+                p->decoded.has_xeddsa_signature = true;
+                LOG_WARN("XEDDSA Signed!");
+            }
        }

        size_t numbytes = pb_encode_to_bytes(bytes, sizeof(bytes), &meshtastic_Data_msg, &p->decoded);
@@ -692,7 +713,7 @@ void Router::handleReceived(meshtastic_MeshPacket *p, RxSource src)

    // Store a copy of encrypted packet for MQTT
    DEBUG_HEAP_BEFORE;
-    p_encrypted = packetPool.allocCopy(*p);
+    meshtastic_MeshPacket *p_encrypted = packetPool.allocCopy(*p);
    DEBUG_HEAP_AFTER("Router::handleReceived", p_encrypted);

    // Take those raw bytes and convert them back into a well structured protobuf we can understand
@@ -758,7 +779,6 @@ void Router::handleReceived(meshtastic_MeshPacket *p, RxSource src)
    }

    packetPool.release(p_encrypted); // Release the encrypted packet
-    p_encrypted = nullptr;
 }

 void Router::perhapsHandleReceived(meshtastic_MeshPacket *p)
--- a/src/mesh/Router.h
+++ b/src/mesh/Router.h
@@ -91,9 +91,6 @@ class Router : protected concurrency::OSThread, protected PacketHistory
        before us */
    uint32_t rxDupe = 0, txRelayCanceled = 0;

-    // pointer to the encrypted packet
-    meshtastic_MeshPacket *p_encrypted = nullptr;
-
  protected:
    friend class RoutingModule;

--- a/src/mesh/TypeConversions.cpp
+++ b/src/mesh/TypeConversions.cpp
@@ -14,6 +14,7 @@ meshtastic_NodeInfo TypeConversions::ConvertToNodeInfo(const meshtastic_NodeInfo
    info.is_favorite = lite->is_favorite;
    info.is_ignored = lite->is_ignored;
    info.is_key_manually_verified = lite->bitfield & NODEINFO_BITFIELD_IS_KEY_MANUALLY_VERIFIED_MASK;
+    info.has_xeddsa_signed = lite->bitfield & NODEINFO_BITFIELD_HAS_XEDDSA_SIGNED_MASK;

    if (lite->has_hops_away) {
        info.has_hops_away = true;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jonathan Bennett	c53c959cbd	Merge branch 'develop' into XEdDSA	2025-12-01 15:07:32 -06:00
Jonathan Bennett	14a790cec5	Merge branch 'develop' into XEdDSA	2025-08-27 16:46:57 -05:00
Jonathan Bennett	51b83a2ca2	Update crypto commit hash	2025-08-21 09:05:05 -05:00
Jonathan Bennett	b0812cec27	Merge branch 'master' into XEdDSA	2025-08-19 14:42:09 -05:00
Jonathan Bennett	05526df7c8	Merge branch 'master' into XEdDSA	2025-08-15 14:32:13 -05:00
Ben Meadors	c5c634ee27	Generate a new node identity on key generation (#7628 ) * Generate a new node identity on key generation * Fixes * Fixes * Fixes * Messed up * Fixes * Update src/modules/AdminModule.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/mesh/NodeDB.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Figured it out! * Cleanup * Update src/mesh/NodeDB.h Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/mesh/NodeDB.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/modules/AdminModule.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-08-14 21:06:55 -05:00
Jonathan Bennett	359338db32	Merge branch 'master' into XEdDSA	2025-08-13 17:13:46 -05:00
Jonathan Bennett	1dfad22f5f	Update to Crypto lib in Meshtatic org	2025-08-13 15:39:41 -05:00
Ben Meadors	15e04ef048	Merge branch 'master' into XEdDSA	2025-08-11 06:21:14 -05:00
Jonathan Bennett	99c4096517	Test commit for XEdDSA support	2025-08-11 00:55:51 -05:00