diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index a285e5e0..f74a4092 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -93,21 +93,9 @@ body:
         Please follow the guidelines below to ensure the logs are comprehensive:
 
         - **Boot Issues**: If the problem occurs during boot, capture the logs from the start of your device to a minute or two after the boot completes.
-
-
-
-
-
-
             Look for errors or unusual messages during this period.
 
         - **TFT File Update Issues**: For problems related to TFT file updates, include logs from the moment you press the **Update TFT Display** button until a few seconds after the device restarts.
-
-
-
-
-
-
             Pay attention to any error messages or warnings during the update process.
 
         - **Other Issues**: For other types of problems, include logs that encompass the issue's onset and continue for a short duration thereafter. This will help in pinpointing the exact moment and nature of the issue.
diff --git a/.github/scripts/update_bug_template.py b/.github/scripts/update_bug_template.py
new file mode 100644
index 00000000..3b8a777c
--- /dev/null
+++ b/.github/scripts/update_bug_template.py
@@ -0,0 +1,108 @@
+#!/usr/bin/env python3
+# .github/scripts/update_bug_template.py
+#
+# Updates version placeholder values in the GitHub bug report template
+# (.github/ISSUE_TEMPLATE/bug.yml) without reformatting the file.
+#
+# Called by the versioning workflow on every release to keep the placeholder
+# hints in sync with the current release versions.
+#
+# Usage:
+#   python3 update_bug_template.py <template> <tft> <firmware> <blueprint>
+#
+# Arguments:
+#   template   Path to the bug report template YAML file.
+#   tft        Minimum required TFT version (e.g. "15").
+#   firmware   Current ESPHome firmware version (e.g. "2026.4.2").
+#   blueprint  Minimum required Blueprint version (e.g. "2026.4.2").
+#
+# Each placeholder is located by the label that precedes it, making the
+# update index-independent and safe against future template reordering.
+
+import re
+import sys
+
+
+def update_placeholder(content: str, label: str, value: str) -> tuple[str, int]:
+    """Replace the placeholder value following a given label field.
+
+    Matches the label and the next placeholder: line using MULTILINE mode
+    with line anchors, replacing only the value after 'e.g., '.
+    Does NOT use DOTALL — the trailing match is restricted to non-newline
+    characters to avoid consuming content beyond the target line.
+
+    Args:
+        content: Full file content as a string.
+        label:   The label text to anchor the search (e.g. 'TFT Version').
+        value:   The new placeholder value to set.
+
+    Returns:
+        Tuple of (updated content, number of replacements made).
+        Returns (content, 0) if the label is not found.
+    """
+    pattern = (
+        r'(^\s*label:\s*' + re.escape(label) +
+        r'\s*$[\s\S]*?\s*placeholder:\s*)e\.g\.,[ \t]*[^\n\r]*'
+    )
+    replacement = r'\g<1>e.g., ' + value
+    updated, count = re.subn(
+        pattern,
+        replacement,
+        content,
+        count=1,
+        flags=re.MULTILINE,
+    )
+    return updated, count
+
+
+def main() -> None:
+    if len(sys.argv) != 5:
+        print(
+            f'Usage: {sys.argv[0]} <template> <tft> <firmware> <blueprint>',
+            file=sys.stderr,
+        )
+        sys.exit(1)
+
+    template_path = sys.argv[1]
+    tft_version = sys.argv[2]
+    firmware_version = sys.argv[3]
+    blueprint_version = sys.argv[4]
+
+    with open(template_path, encoding='utf-8') as f:
+        content = f.read()
+
+    replacements = [
+        ('TFT Version', tft_version),
+        ('Firmware Version', firmware_version),
+        ('Blueprint Version', blueprint_version),
+    ]
+
+    errors = []
+    for label, value in replacements:
+        content, count = update_placeholder(content, label, value)
+        if count != 1:
+            errors.append(
+                f"  '{label}': expected 1 replacement, got {count}"
+            )
+
+    if errors:
+        print('ERROR: placeholder update failed:', file=sys.stderr)
+        for error in errors:
+            print(error, file=sys.stderr)
+        print(
+            'Check that the label names in the template have not been renamed.',
+            file=sys.stderr,
+        )
+        sys.exit(2)
+
+    with open(template_path, 'w', encoding='utf-8') as f:
+        f.write(content)
+
+    print(f'Updated placeholders in {template_path}:')
+    print(f'  TFT Version:       e.g., {tft_version}')
+    print(f'  Firmware Version:  e.g., {firmware_version}')
+    print(f'  Blueprint Version: e.g., {blueprint_version}')
+
+
+if __name__ == '__main__':
+    main()
diff --git a/.github/workflows/esphome_build.yml b/.github/workflows/esphome_build.yml
index 9ab628d8..a0ad46ba 100644
--- a/.github/workflows/esphome_build.yml
+++ b/.github/workflows/esphome_build.yml
@@ -142,4 +142,95 @@ jobs:
           substitutions: |
             ref_name=${{ env.REF_NAME }}
             ref_url=${{ env.REF_URL }}
+
+  # ===========================================================================
+  # Pre-built firmware - ESPHome Latest
+  # ===========================================================================
+  build_prebuilt_latest:
+    name: ${{ matrix.firmware.name }} - Pre-built (latest)
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        firmware:
+          - name: NSPanel Easy
+            yaml-file: prebuilt/nspanel_esphome_prebuilt.yaml
+          - name: Wall Display
+            yaml-file: prebuilt/wall_display.yaml
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+      - name: Build firmware
+        uses: edwardtfn/build-action@add-substitutions-support
+        with:
+          yaml-file: ${{ matrix.firmware.yaml-file }}
+          substitutions: |
+            ref_name=${{ env.REF_NAME }}
+            ref_url=${{ env.REF_URL }}
+      - name: Verify compiled output
+        run: |
+          # Locate the binary produced by the build action.
+          # Using find avoids hardcoding the device name from the YAML.
+          BIN=$(find prebuilt/.esphome/build -name "firmware.bin" | head -1)
+          BIN_FACTORY=$(find prebuilt/.esphome/build -name "firmware-factory.bin" | head -1)
+          ok=true
+          if [ ! -s "$BIN" ]; then
+            echo "ERROR: firmware.bin missing or empty"
+            ok=false
+          else
+            echo "OK: firmware.bin ($(wc -c < "$BIN") bytes)"
+          fi
+          if [ -n "$BIN_FACTORY" ] && [ ! -s "$BIN_FACTORY" ]; then
+            echo "ERROR: firmware-factory.bin found but empty"
+            ok=false
+          elif [ -n "$BIN_FACTORY" ]; then
+            echo "OK: firmware-factory.bin ($(wc -c < "$BIN_FACTORY") bytes)"
+          fi
+          [ "$ok" = true ] || exit 1
+
+  # ===========================================================================
+  # Pre-built firmware - ESPHome Dev
+  # ===========================================================================
+  build_prebuilt_dev:
+    name: ${{ matrix.firmware.name }} - Pre-built (dev)
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        firmware:
+          - name: NSPanel Easy
+            yaml-file: prebuilt/nspanel_esphome_prebuilt.yaml
+          - name: Wall Display
+            yaml-file: prebuilt/wall_display.yaml
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+      - name: Build firmware
+        uses: edwardtfn/build-action@add-substitutions-support
+        with:
+          yaml-file: ${{ matrix.firmware.yaml-file }}
+          version: dev
+          substitutions: |
+            ref_name=${{ env.REF_NAME }}
+            ref_url=${{ env.REF_URL }}
+      - name: Verify compiled output
+        run: |
+          # Locate the binary produced by the build action.
+          # Using find avoids hardcoding the device name from the YAML.
+          BIN=$(find prebuilt/.esphome/build -name "firmware.bin" | head -1)
+          BIN_FACTORY=$(find prebuilt/.esphome/build -name "firmware-factory.bin" | head -1)
+          ok=true
+          if [ ! -s "$BIN" ]; then
+            echo "ERROR: firmware.bin missing or empty"
+            ok=false
+          else
+            echo "OK: firmware.bin ($(wc -c < "$BIN") bytes)"
+          fi
+          if [ -n "$BIN_FACTORY" ] && [ ! -s "$BIN_FACTORY" ]; then
+            echo "ERROR: firmware-factory.bin found but empty"
+            ok=false
+          elif [ -n "$BIN_FACTORY" ]; then
+            echo "OK: firmware-factory.bin ($(wc -c < "$BIN_FACTORY") bytes)"
+          fi
+          [ "$ok" = true ] || exit 1
 ...
diff --git a/.github/workflows/versioning.yml b/.github/workflows/versioning.yml
index 7da41320..e89cbb00 100644
--- a/.github/workflows/versioning.yml
+++ b/.github/workflows/versioning.yml
@@ -1,16 +1,14 @@
-# This GitHub Actions workflow handles version bumping, releases, and tag updates.
+# This GitHub Actions workflow handles version bumping, pre-built firmware, releases, and tag updates.
 #
 # Triggered by merging a PR to the main branch, it automatically:
 # 1. Bumps the CalVer version (YYYY.M.seq)
-# 2. Calculates the minimum upstream version (current month minus 2, YYYY.M.0)
-# 3. Resolves the "next" sentinel in min_blueprint_version, if set
-# 4. Updates min_esphome_compiler_version and blueprint homeassistant.min_version
-# 5. Updates the bug report template with current version placeholders
-# 6. Updates the blueprint version and display name
-# 7. Commits the changes and pushes to main
-# 8. Creates a version tag and GitHub Release
-# 9. Updates the stable and latest floating tags
-# 10. Announces the release on Discord
+# 2. Updates the bug report template with current version placeholders
+# 3. Commits the changes and pushes to main
+# 4. Builds pre-built firmware binaries in parallel (nspanel-easy, wall-display)
+# 5. Commits the compiled binaries, checksums, and manifests to main
+# 6. Creates a version tag and GitHub Release
+# 7. Updates the stable and latest floating tags
+# 8. Announces the release on Discord
 #
 # The workflow skips execution if the merge commit message contains
 # [skip-versioning] to prevent loops from its own version bump commits.
@@ -28,8 +26,12 @@ on:  # yamllint disable-line rule:truthy
       - 'versioning/version.yaml'
 
 jobs:
-  version-and-release:
-    # Only run if PR was actually merged (not just closed)
+  # ---------------------------------------------------------------------------
+  # Bump version, update bug template, and push to main.
+  # All downstream jobs depend on this one completing successfully.
+  # ---------------------------------------------------------------------------
+  bump:
+    name: Bump version
     if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
     concurrency:
@@ -39,13 +41,12 @@ jobs:
       contents: write
       pull-requests: read
 
-    # Expose release metadata for downstream jobs (e.g. notify-discord).
-    # Values are only populated when skip=false and push_tag succeeded;
-    # the notify-discord job guards on those conditions before consuming them.
     outputs:
-      released: ${{ steps.push_tag.outcome == 'success' && steps.skip_check.outputs.skip == 'false' }}
-      version: ${{ steps.push_tag.outputs.version }}
-      release_url: ${{ steps.create_release.outputs.url }}
+      skip: ${{ steps.skip_check.outputs.skip }}
+      version: ${{ steps.next_version.outputs.version }}
+      release_sha: ${{ steps.capture_sha.outputs.sha }}
+      pr_title: ${{ fromJson(steps.pr_info.outputs.result).title }}
+      pr_body: ${{ fromJson(steps.pr_info.outputs.result).body }}
 
     steps:
       - name: Checkout code
@@ -110,7 +111,10 @@ jobs:
           # Rebase early so the version we read is up-to-date,
           # avoiding duplicate versions when PRs merge in quick succession.
           git fetch origin main
-          git rebase origin/main
+          git rebase origin/main || {
+            echo "Rebase failed - main has diverged"
+            exit 1
+          }
 
       - name: Calculate next version
         id: next_version
@@ -148,28 +152,6 @@ jobs:
           echo "version=${NEXT_VERSION}" >> "$GITHUB_OUTPUT"
           echo "Bumping version: $CURRENT_VERSION -> $NEXT_VERSION"
 
-      - name: Calculate minimum upstream versions
-        id: min_upstream
-        if: steps.skip_check.outputs.skip == 'false'
-        run: |
-          # Minimum upstream version is always 2 months behind the current month,
-          # with patch fixed at 0 (e.g. April 2026 -> 2026.2.0, Jan 2026 -> 2025.11.0).
-          # This is the contract for the minimum ESPHome compiler and Home Assistant
-          # versions required to build and run NSPanel Easy.
-          CURRENT_YEAR=$(date +%Y)
-          CURRENT_MONTH=$(date +%-m)  # No leading zero
-
-          MIN_MONTH=$((CURRENT_MONTH - 2))
-          MIN_YEAR=$CURRENT_YEAR
-          if [[ $MIN_MONTH -le 0 ]]; then
-            MIN_MONTH=$((MIN_MONTH + 12))
-            MIN_YEAR=$((MIN_YEAR - 1))
-          fi
-
-          MIN_UPSTREAM_VERSION="${MIN_YEAR}.${MIN_MONTH}.0"
-          echo "version=${MIN_UPSTREAM_VERSION}" >> "$GITHUB_OUTPUT"
-          echo "Minimum upstream version: ${MIN_UPSTREAM_VERSION}"
-
       - name: Update version.yaml file
         if: steps.skip_check.outputs.skip == 'false'
         env:
@@ -177,34 +159,6 @@ jobs:
         run: |
           yq eval '.version = strenv(NEW_VERSION)' -i ./versioning/version.yaml
 
-      - name: Resolve min_blueprint_version sentinel and update upstream versions
-        if: steps.skip_check.outputs.skip == 'false'
-        env:
-          NEW_VERSION: ${{ steps.next_version.outputs.version }}
-          MIN_UPSTREAM_VERSION: ${{ steps.min_upstream.outputs.version }}
-        run: |
-          ESPHOME_VERSION_FILE="esphome/nspanel_esphome_version.yaml"
-          MIN_BP=$(yq eval '.substitutions.min_blueprint_version' "$ESPHOME_VERSION_FILE")
-
-          # If min_blueprint_version is set to the sentinel "next", replace it
-          # with the actual version being released, tying the compatibility
-          # requirement to this exact release.
-          if [[ "$MIN_BP" == "next" || "$MIN_BP" == '${version}' ]]; then
-            yq eval \
-              '.substitutions.min_blueprint_version = strenv(NEW_VERSION)' \
-              -i "$ESPHOME_VERSION_FILE"
-            echo "Resolved min_blueprint_version sentinel to ${NEW_VERSION}"
-          else
-            echo "min_blueprint_version is already set to ${MIN_BP}, no sentinel to resolve"
-          fi
-
-          # Always update the minimum ESPHome compiler version to 2 months ago,
-          # keeping the upstream contract in sync with the release date.
-          yq eval \
-            '.substitutions.min_esphome_compiler_version = strenv(MIN_UPSTREAM_VERSION)' \
-            -i "$ESPHOME_VERSION_FILE"
-          echo "Updated min_esphome_compiler_version to ${MIN_UPSTREAM_VERSION}"
-
       - name: Extract cross-component version information
         id: versions
         if: steps.skip_check.outputs.skip == 'false'
@@ -228,89 +182,31 @@ jobs:
           MIN_BLUEPRINT_VERSION: ${{ steps.versions.outputs.min_blueprint_version }}
           MIN_TFT_VERSION: ${{ steps.versions.outputs.min_tft_version }}
         run: |
-          TEMPLATE=".github/ISSUE_TEMPLATE/bug.yml"
-
-          # Update TFT Version placeholder (index 2)
-          yq eval \
-            '.body[2].attributes.placeholder = ("e.g., " + strenv(MIN_TFT_VERSION))' \
-            -i "$TEMPLATE"
-
-          # Update Firmware Version placeholder (index 3)
-          yq eval \
-            '.body[3].attributes.placeholder = ("e.g., " + strenv(VERSION))' \
-            -i "$TEMPLATE"
-
-          # Update Blueprint Version placeholder (index 4)
-          yq eval \
-            '.body[4].attributes.placeholder = ("e.g., " + strenv(MIN_BLUEPRINT_VERSION))' \
-            -i "$TEMPLATE"
-
-      - name: Update blueprint version and name
-        if: steps.skip_check.outputs.skip == 'false'
-        env:
-          NEW_VERSION: ${{ steps.next_version.outputs.version }}
-          MIN_UPSTREAM_VERSION: ${{ steps.min_upstream.outputs.version }}
-        run: |
-          BLUEPRINT="nspanel_easy_blueprint.yaml"
-
-          # sed is used intentionally here instead of yq — the blueprint contains
-          # a large icon table with unicode escape sequences (\uXXXX) that yq would
-          # silently convert to their literal UTF-8 characters, corrupting the file.
-
-          # Update the blueprint display name shown in the HA Blueprints dashboard.
-          sed -i \
-            "s/^  name: NSPanel Easy Configuration.*/  name: NSPanel Easy Configuration (v${NEW_VERSION})/" \
-            "$BLUEPRINT"
-
-          # Update the blueprint's own version number, used by ESPHome to verify
-          # compatibility against min_blueprint_version at runtime.
-          sed -i \
-            "s/^  blueprint_version: .*/  blueprint_version: ${NEW_VERSION}/" \
-            "$BLUEPRINT"
-
-          # Update the minimum Home Assistant version required to run this blueprint,
-          # kept 2 months behind the release date to match the upstream contract.
-          sed -i \
-            "s/^    min_version: .*/    min_version: ${MIN_UPSTREAM_VERSION}/" \
-            "$BLUEPRINT"
+          # Use label-anchored Python script to avoid fragile body index references.
+          python3 .github/scripts/update_bug_template.py \
+            .github/ISSUE_TEMPLATE/bug.yml \
+            "$MIN_TFT_VERSION" \
+            "$VERSION" \
+            "$MIN_BLUEPRINT_VERSION"
 
       - name: Restore YAML document end markers
         if: steps.skip_check.outputs.skip == 'false'
         run: |
-          # yq strips the YAML document end marker (...) on in-place edits.
-          # Re-append it to all files modified by yq.
-          for file in ./versioning/version.yaml .github/ISSUE_TEMPLATE/bug.yml \
-                      esphome/nspanel_esphome_version.yaml; do
+          # Re-append document end marker stripped by yq on version.yaml in-place edits.
+          for file in ./versioning/version.yaml; do
             if [ -f "$file" ] && ! tail -1 "$file" | grep -qx '\.\.\.'; then
               echo '...' >> "$file"
             fi
           done
 
-      # -------------------------------------------------------------------
-      # Commit, tag, and release
-      # -------------------------------------------------------------------
-
       - name: Commit version and template changes
         if: steps.skip_check.outputs.skip == 'false'
         env:
           NEW_VERSION: ${{ steps.next_version.outputs.version }}
         run: |
-          git add ./versioning/version.yaml .github/ISSUE_TEMPLATE/bug.yml \
-                  esphome/nspanel_esphome_version.yaml nspanel_easy_blueprint.yaml
+          git add ./versioning/version.yaml .github/ISSUE_TEMPLATE/bug.yml
           git commit -m "Bump version to ${NEW_VERSION} [skip-versioning]"
 
-      - name: Build tag message from PR
-        if: steps.skip_check.outputs.skip == 'false'
-        env:
-          NEW_VERSION: ${{ steps.next_version.outputs.version }}
-          PR_TITLE: ${{ fromJson(steps.pr_info.outputs.result).title }}
-          PR_BODY: ${{ fromJson(steps.pr_info.outputs.result).body }}
-        run: |
-          {
-            printf '# v%s - %s\n\n' "$NEW_VERSION" "$PR_TITLE"
-            printf '%s\n' "$PR_BODY"
-          } > tag_message.txt
-
       - name: Push changes to main
         if: steps.skip_check.outputs.skip == 'false'
         env:
@@ -324,31 +220,319 @@ jobs:
           }
           git push origin HEAD:main
 
+      - name: Capture post-bump SHA
+        id: capture_sha
+        if: steps.skip_check.outputs.skip == 'false'
+        run: echo "sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
+
+  # ---------------------------------------------------------------------------
+  # Build pre-built firmware: nspanel-easy
+  # Runs in parallel with build-wall-display once bump completes.
+  # ---------------------------------------------------------------------------
+  build-nspanel:
+    name: Build pre-built (nspanel-easy)
+    needs: bump
+    if: needs.bump.outputs.skip == 'false'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    steps:
+      - name: Checkout post-bump main
+        uses: actions/checkout@v6
+        with:
+          ref: ${{ needs.bump.outputs.release_sha }}
+          fetch-depth: 1
+
+      - name: Build firmware
+        uses: edwardtfn/build-action@add-substitutions-support
+        with:
+          yaml-file: prebuilt/nspanel_esphome_prebuilt.yaml
+
+      - name: Locate compiled binaries
+        id: locate
+        run: |
+          BIN=$(find prebuilt/.esphome/build -name "firmware.bin" | head -1)
+          BIN_FACTORY=$(find prebuilt/.esphome/build -name "firmware-factory.bin" | head -1)
+          if [ -z "$BIN" ]; then
+            echo "ERROR: firmware.bin not found after build"
+            echo "Build directory contents:"
+            find prebuilt/.esphome/build -type f 2>/dev/null || echo "Build directory does not exist"
+            exit 1
+          fi
+          echo "bin=${BIN}" >> "$GITHUB_OUTPUT"
+          echo "bin_factory=${BIN_FACTORY}" >> "$GITHUB_OUTPUT"
+
+      - name: Copy artifacts to staging directory
+        env:
+          BIN: ${{ steps.locate.outputs.bin }}
+          BIN_FACTORY: ${{ steps.locate.outputs.bin_factory }}
+        run: |
+          mkdir -p staging
+          cp "$BIN" staging/nspanel_esphome_prebuilt.bin
+          if [ -n "$BIN_FACTORY" ]; then
+            cp "$BIN_FACTORY" staging/nspanel_esphome_prebuilt-factory.bin
+          fi
+
+      - name: Generate checksums
+        run: |
+          md5sum staging/nspanel_esphome_prebuilt.bin \
+            | awk '{print $1}' > staging/nspanel_esphome_prebuilt.bin.md5
+          if [ -f staging/nspanel_esphome_prebuilt-factory.bin ]; then
+            md5sum staging/nspanel_esphome_prebuilt-factory.bin \
+              | awk '{print $1}' > staging/nspanel_esphome_prebuilt-factory.bin.md5
+          fi
+
+      - name: Generate update manifest
+        env:
+          NEW_VERSION: ${{ needs.bump.outputs.version }}
+        run: |
+          MD5=$(cat staging/nspanel_esphome_prebuilt.bin.md5)
+          jq -n \
+            --arg name    "NSPanel Easy Pre-built" \
+            --arg version "$NEW_VERSION" \
+            --arg path    "nspanel_esphome_prebuilt.bin" \
+            --arg md5     "$MD5" \
+            --arg summary "NSPanel Easy Pre-built v${NEW_VERSION}" \
+            --arg url     "https://github.com/edwardtfn/NSPanel-Easy/releases/tag/v${NEW_VERSION}" \
+            '{
+              name: $name,
+              version: $version,
+              home_assistant_domain: "esphome",
+              new_install_prompt_erase: false,
+              builds: [{
+                chipFamily: "ESP32",
+                ota: {path: $path, md5: $md5, summary: $summary, release_url: $url}
+              }]
+            }' > staging/nspanel_esphome_prebuilt.manifest.json
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: prebuilt-nspanel
+          path: staging/
+          retention-days: 1
+
+  # ---------------------------------------------------------------------------
+  # Build pre-built firmware: wall-display
+  # Runs in parallel with build-nspanel once bump completes.
+  # ---------------------------------------------------------------------------
+  build-wall-display:
+    name: Build pre-built (wall-display)
+    needs: bump
+    if: needs.bump.outputs.skip == 'false'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    steps:
+      - name: Checkout post-bump main
+        uses: actions/checkout@v6
+        with:
+          ref: ${{ needs.bump.outputs.release_sha }}
+          fetch-depth: 1
+
+      - name: Build firmware
+        uses: edwardtfn/build-action@add-substitutions-support
+        with:
+          yaml-file: prebuilt/wall_display.yaml
+
+      - name: Locate compiled binaries
+        id: locate
+        run: |
+          BIN=$(find prebuilt/.esphome/build -name "firmware.bin" | head -1)
+          BIN_FACTORY=$(find prebuilt/.esphome/build -name "firmware-factory.bin" | head -1)
+          if [ -z "$BIN" ]; then
+            echo "ERROR: firmware.bin not found after build"
+            echo "Build directory contents:"
+            find prebuilt/.esphome/build -type f 2>/dev/null || echo "Build directory does not exist"
+            exit 1
+          fi
+          echo "bin=${BIN}" >> "$GITHUB_OUTPUT"
+          echo "bin_factory=${BIN_FACTORY}" >> "$GITHUB_OUTPUT"
+
+      - name: Copy artifacts to staging directory
+        env:
+          BIN: ${{ steps.locate.outputs.bin }}
+          BIN_FACTORY: ${{ steps.locate.outputs.bin_factory }}
+        run: |
+          mkdir -p staging
+          cp "$BIN" staging/wall_display.bin
+          if [ -n "$BIN_FACTORY" ]; then
+            cp "$BIN_FACTORY" staging/wall_display-factory.bin
+          fi
+
+      - name: Generate checksums
+        run: |
+          md5sum staging/wall_display.bin \
+            | awk '{print $1}' > staging/wall_display.bin.md5
+          if [ -f staging/wall_display-factory.bin ]; then
+            md5sum staging/wall_display-factory.bin \
+              | awk '{print $1}' > staging/wall_display-factory.bin.md5
+          fi
+
+      - name: Generate update manifest
+        env:
+          NEW_VERSION: ${{ needs.bump.outputs.version }}
+        run: |
+          MD5=$(cat staging/wall_display.bin.md5)
+          jq -n \
+            --arg name    "NSPanel Easy - Wall Display" \
+            --arg version "$NEW_VERSION" \
+            --arg path    "wall_display.bin" \
+            --arg md5     "$MD5" \
+            --arg summary "NSPanel Easy Wall Display v${NEW_VERSION}" \
+            --arg url     "https://github.com/edwardtfn/NSPanel-Easy/releases/tag/v${NEW_VERSION}" \
+            '{
+              name: $name,
+              version: $version,
+              home_assistant_domain: "esphome",
+              new_install_prompt_erase: false,
+              builds: [{
+                chipFamily: "ESP32",
+                ota: {path: $path, md5: $md5, summary: $summary, release_url: $url}
+              }]
+            }' > staging/wall_display.manifest.json
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: prebuilt-wall-display
+          path: staging/
+          retention-days: 1
+
+  # ---------------------------------------------------------------------------
+  # Collect both firmware artifacts, commit to main, tag, and release.
+  # Runs only after both build jobs succeed.
+  # ---------------------------------------------------------------------------
+  commit-and-release:
+    name: Commit artifacts & release
+    needs: [bump, build-nspanel, build-wall-display]
+    if: needs.bump.outputs.skip == 'false'
+    runs-on: ubuntu-latest
+    concurrency:
+      group: version-and-release
+      cancel-in-progress: false
+    permissions:
+      contents: write
+
+    outputs:
+      released: ${{ steps.push_tag.outcome == 'success' }}
+      version: ${{ needs.bump.outputs.version }}
+      release_url: ${{ steps.create_release.outputs.url }}
+
+    steps:
+      - name: Checkout post-bump main
+        uses: actions/checkout@v6
+        with:
+          ref: ${{ needs.bump.outputs.release_sha }}
+          fetch-depth: 0
+
+      - name: Set up Git
+        run: |
+          git config user.name "GitHub Actions"
+          git config user.email "actions@github.com"
+
+      - name: Remove previously committed generated artifacts
+        run: |
+          # Remove all known generated files so stale artifacts from a previous
+          # release (e.g. factory binaries) are not silently carried forward.
+          rm -f \
+            prebuilt/nspanel_esphome_prebuilt.bin \
+            prebuilt/nspanel_esphome_prebuilt.bin.md5 \
+            prebuilt/nspanel_esphome_prebuilt.manifest.json \
+            prebuilt/nspanel_esphome_prebuilt-factory.bin \
+            prebuilt/nspanel_esphome_prebuilt-factory.bin.md5 \
+            prebuilt/wall_display.bin \
+            prebuilt/wall_display.bin.md5 \
+            prebuilt/wall_display.manifest.json \
+            prebuilt/wall_display-factory.bin \
+            prebuilt/wall_display-factory.bin.md5
+
+      - name: Download nspanel-easy artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: prebuilt-nspanel
+          path: prebuilt/
+
+      - name: Download wall-display artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: prebuilt-wall-display
+          path: prebuilt/
+
+      - name: Verify pre-built artifacts
+        run: |
+          # Check all required files exist and are non-empty (-s: exists and size > 0).
+          # Factory binaries are optional and excluded from this check.
+          ok=true
+          for f in \
+            prebuilt/nspanel_esphome_prebuilt.bin \
+            prebuilt/nspanel_esphome_prebuilt.bin.md5 \
+            prebuilt/nspanel_esphome_prebuilt.manifest.json \
+            prebuilt/wall_display.bin \
+            prebuilt/wall_display.bin.md5 \
+            prebuilt/wall_display.manifest.json; do
+            if [ ! -s "$f" ]; then
+              echo "ERROR: missing or empty file: $f"
+              ok=false
+            else
+              echo "OK: $f ($(wc -c < "$f") bytes)"
+            fi
+          done
+          [ "$ok" = true ] || exit 1
+
+      - name: Commit pre-built artifacts
+        env:
+          NEW_VERSION: ${{ needs.bump.outputs.version }}
+        run: |
+          # Stage all changes under prebuilt/ including deletions of stale files.
+          git add -A prebuilt/
+          git diff --cached --quiet || \
+            git commit -m "build: pre-built firmware for v${NEW_VERSION} [skip-versioning]"
+
+      - name: Push artifacts to main
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          # Push directly — no rebase. If main has advanced since the bump job
+          # pushed, abort rather than silently tagging the wrong revision.
+          git push origin HEAD:main || {
+            echo "ERROR: main has advanced since artifacts were built; aborting to avoid tagging the wrong revision"
+            exit 1
+          }
+
+      # -------------------------------------------------------------------
+      # Tag and release (after binary commit, so tag points to final state)
+      # -------------------------------------------------------------------
+
+      - name: Build tag message from PR
+        env:
+          NEW_VERSION: ${{ needs.bump.outputs.version }}
+          PR_TITLE: ${{ needs.bump.outputs.pr_title }}
+          PR_BODY: ${{ needs.bump.outputs.pr_body }}
+        run: |
+          {
+            printf '# v%s - %s\n\n' "$NEW_VERSION" "$PR_TITLE"
+            printf '%s\n' "$PR_BODY"
+          } > tag_message.txt
+
       - name: Create and push version tag
         id: push_tag
-        if: steps.skip_check.outputs.skip == 'false'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NEW_VERSION: ${{ steps.next_version.outputs.version }}
+          NEW_VERSION: ${{ needs.bump.outputs.version }}
         run: |
           git tag -a "v${NEW_VERSION}" -F tag_message.txt
           git push origin "v${NEW_VERSION}"
-          echo "version=${NEW_VERSION}" >> "$GITHUB_OUTPUT"
 
       - name: Create GitHub Release
         id: create_release
-        if: >-
-          steps.skip_check.outputs.skip == 'false'
-          && steps.push_tag.outcome == 'success'
+        if: steps.push_tag.outcome == 'success'
         uses: softprops/action-gh-release@v2
-        env:
-          PR_TITLE: ${{ fromJson(steps.pr_info.outputs.result).title }}
         with:
-          tag_name: v${{ steps.push_tag.outputs.version }}
-          name: >-
-            v${{ steps.push_tag.outputs.version }} - ${{
-              fromJson(steps.pr_info.outputs.result).title
-            }}
+          tag_name: v${{ needs.bump.outputs.version }}
+          name: v${{ needs.bump.outputs.version }} - ${{ needs.bump.outputs.pr_title }}
           generate_release_notes: true
 
       # -------------------------------------------------------------------
@@ -356,45 +540,35 @@ jobs:
       # -------------------------------------------------------------------
 
       - name: Update stable tag
-        if: >-
-          steps.skip_check.outputs.skip == 'false'
-          && steps.push_tag.outcome == 'success'
+        if: steps.push_tag.outcome == 'success'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          # Log previous stable SHA for auditability
           if git rev-parse --verify stable >/dev/null 2>&1; then
             echo "Previous stable: $(git rev-parse stable)"
           fi
-
           git tag -fa stable -F tag_message.txt
           git push origin stable --force
 
       - name: Update latest tag
-        if: >-
-          steps.skip_check.outputs.skip == 'false'
-          && steps.push_tag.outcome == 'success'
+        if: steps.push_tag.outcome == 'success'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          # Log previous latest SHA for auditability
           if git rev-parse --verify latest >/dev/null 2>&1; then
             echo "Previous latest: $(git rev-parse latest)"
           fi
-
           git tag -fa latest -F tag_message.txt
           git push origin latest --force
 
   # ---------------------------------------------------------------------------
   # Announce the new release on Discord.
-  # Runs only when version-and-release actually created a release (i.e. the
-  # skip marker was absent and the version tag was pushed successfully).
+  # Always runs last — only when a release was actually published.
   # ---------------------------------------------------------------------------
   notify-discord:
     name: Notify Discord
-    needs: [version-and-release]
-    # needs.*.outputs expressions are always strings; compare explicitly.
-    if: needs.version-and-release.outputs.released == 'true'
+    needs: [commit-and-release]
+    if: needs.commit-and-release.outputs.released == 'true'
     runs-on: ubuntu-latest
     permissions: {}
 
@@ -402,8 +576,8 @@ jobs:
       - name: Send release message to Discord
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_CH_GENERAL_WEBHOOK }}
-          RELEASE_TAG: v${{ needs.version-and-release.outputs.version }}
-          RELEASE_URL: ${{ needs.version-and-release.outputs.release_url }}
+          RELEASE_TAG: v${{ needs.commit-and-release.outputs.version }}
+          RELEASE_URL: ${{ needs.commit-and-release.outputs.release_url }}
         run: |
           MESSAGE="🚀 New NSPanel Easy release published
           ${RELEASE_TAG}
diff --git a/components/nspanel_easy/addon_climate.cpp b/components/nspanel_easy/addon_climate.cpp
index d4ed7c5f..845e2405 100644
--- a/components/nspanel_easy/addon_climate.cpp
+++ b/components/nspanel_easy/addon_climate.cpp
@@ -4,14 +4,12 @@
 
 #include "addon_climate.h"
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 // Global var for the friendly name of the embedded climate entity
 std::string addon_climate_friendly_name = "Thermostat";
 bool is_addon_climate_visible = false;
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
 
 #endif  // NSPANEL_EASY_ADDON_CLIMATE_BASE
diff --git a/components/nspanel_easy/addon_climate.h b/components/nspanel_easy/addon_climate.h
index 97ef0f5e..b35508ed 100644
--- a/components/nspanel_easy/addon_climate.h
+++ b/components/nspanel_easy/addon_climate.h
@@ -7,8 +7,7 @@
 #include <string>
 #include "nextion_constants.h"
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 // Global var for the friendly name of the embedded climate entity
 extern std::string addon_climate_friendly_name;
@@ -121,7 +120,6 @@ constexpr IconData climate_action_icons[] = {
     {Icons::MDI_FAN, Colors::RGB565_CYAN}               // CLIMATE_ACTION_FAN (6)
 };
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
 
 #endif  // NSPANEL_EASY_ADDON_CLIMATE_BASE
diff --git a/components/nspanel_easy/addon_upload_tft.cpp b/components/nspanel_easy/addon_upload_tft.cpp
index fa681115..d18e9117 100644
--- a/components/nspanel_easy/addon_upload_tft.cpp
+++ b/components/nspanel_easy/addon_upload_tft.cpp
@@ -4,8 +4,7 @@
 
 #include "addon_upload_tft.h"
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 // TFT upload state variables (previously YAML globals)
 uint8_t tft_upload_attempt = 0;
@@ -13,7 +12,6 @@ bool tft_upload_manual_request = false;
 uint32_t tft_upload_first_time_synced_ms = 0;
 bool tft_upload_result = false;
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
 
 #endif  // NSPANEL_EASY_ADDON_UPLOAD_TFT
diff --git a/components/nspanel_easy/addon_upload_tft.h b/components/nspanel_easy/addon_upload_tft.h
index a73f82c5..d4379f99 100644
--- a/components/nspanel_easy/addon_upload_tft.h
+++ b/components/nspanel_easy/addon_upload_tft.h
@@ -6,8 +6,7 @@
 
 #include <cstdint>
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 // TFT upload state variables (previously YAML globals)
 extern uint8_t tft_upload_attempt;
@@ -15,7 +14,6 @@ extern bool tft_upload_manual_request;
 extern uint32_t tft_upload_first_time_synced_ms;
 extern bool tft_upload_result;
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
 
 #endif  // NSPANEL_EASY_ADDON_UPLOAD_TFT
diff --git a/components/nspanel_easy/base.cpp b/components/nspanel_easy/base.cpp
index b56cb2df..fa042fa8 100644
--- a/components/nspanel_easy/base.cpp
+++ b/components/nspanel_easy/base.cpp
@@ -2,8 +2,7 @@
 #include "base.h"
 #include "esphome/core/application.h"
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 static const char *TAG_COMPONENT_BASE = "nspanel.component.base";
 
@@ -39,5 +38,4 @@ void fire_ha_event(const std::string &type, std::map<std::string, std::string> d
   ESP_LOGV(TAG_COMPONENT_BASE, "HA event 'esphome.nspanel_easy' sent successfully");
 }
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
diff --git a/components/nspanel_easy/base.h b/components/nspanel_easy/base.h
index 04711dba..903310a2 100644
--- a/components/nspanel_easy/base.h
+++ b/components/nspanel_easy/base.h
@@ -9,8 +9,7 @@
 #include <map>
 #include <string>
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 /**
  * @brief System-wide flags for NSPanel HA Blueprint component state tracking
@@ -202,5 +201,4 @@ extern std::string cached_device_name;
  */
 void fire_ha_event(const std::string &type, std::map<std::string, std::string> data = {});
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
diff --git a/components/nspanel_easy/ha_components.cpp b/components/nspanel_easy/ha_components.cpp
index 1d833abc..e0cc2967 100644
--- a/components/nspanel_easy/ha_components.cpp
+++ b/components/nspanel_easy/ha_components.cpp
@@ -2,8 +2,7 @@
 
 #include "ha_components.h"
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 // Function Definition
 HomeAssistantEntity extractHomeAssistantEntity(const std::string &entity_id) {
@@ -25,5 +24,4 @@ HomeAssistantEntity extractHomeAssistantEntity(const std::string &entity_id) {
   return result;
 }
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
diff --git a/components/nspanel_easy/ha_components.h b/components/nspanel_easy/ha_components.h
index 71f4933f..89582983 100644
--- a/components/nspanel_easy/ha_components.h
+++ b/components/nspanel_easy/ha_components.h
@@ -5,8 +5,7 @@
 #include <string>
 
 // Defines structures and functions related to Home Assistant entities within the nspanel_easy namespace.
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 // Represents a Home Assistant entity with a domain and an identifier.
 struct HomeAssistantEntity {
@@ -34,5 +33,4 @@ struct HomeAssistantEntity {
  */
 HomeAssistantEntity extractHomeAssistantEntity(const std::string &entity_id);
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
diff --git a/components/nspanel_easy/hardware.h b/components/nspanel_easy/hardware.h
index 95063e0a..2dfd9583 100644
--- a/components/nspanel_easy/hardware.h
+++ b/components/nspanel_easy/hardware.h
@@ -4,8 +4,7 @@
 
 #include <cstdint>
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 /**
  * @brief Combined hardware settings using bitfields
@@ -93,5 +92,4 @@ inline void set_hardware_settings(uint8_t &raw_value, const HardwareSettings &se
   raw_value = to_raw(settings);
 }
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
diff --git a/components/nspanel_easy/hw_display.cpp b/components/nspanel_easy/hw_display.cpp
index ced16180..43a97674 100644
--- a/components/nspanel_easy/hw_display.cpp
+++ b/components/nspanel_easy/hw_display.cpp
@@ -4,8 +4,7 @@
 
 #include "hw_display.h"
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 static const char *TAG_COMPONENT_HW_DISPLAY = "nspanel.component.hw_display";
 
@@ -15,7 +14,6 @@ uint8_t brightness_current = 100;
 uint8_t display_mode = UINT8_MAX;
 uint8_t display_charset = UINT8_MAX;
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
 
 #endif  // NSPANEL_EASY_HW_DISPLAY
diff --git a/components/nspanel_easy/hw_display.h b/components/nspanel_easy/hw_display.h
index 8a6fca68..4b149be3 100644
--- a/components/nspanel_easy/hw_display.h
+++ b/components/nspanel_easy/hw_display.h
@@ -12,8 +12,7 @@
 #include "pages.h"
 #include "base.h"
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 /**
  * @brief Display theme modes.
@@ -31,7 +30,6 @@ extern uint8_t brightness_current;
 extern uint8_t display_mode;
 extern uint8_t display_charset;
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
 
 #endif  // NSPANEL_EASY_HW_DISPLAY
diff --git a/components/nspanel_easy/nextion_components.cpp b/components/nspanel_easy/nextion_components.cpp
index 0aa43658..e5bd7554 100644
--- a/components/nspanel_easy/nextion_components.cpp
+++ b/components/nspanel_easy/nextion_components.cpp
@@ -4,8 +4,7 @@
 #include <algorithm>
 #include <cstring>
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 NSPanelEasyNextionComponent extractNextionComponent(const std::string &input, const std::string &defaultPage) {
   NSPanelEasyNextionComponent result{};
@@ -28,5 +27,4 @@ NSPanelEasyNextionComponent extractNextionComponent(const std::string &input, co
   return result;
 }
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
diff --git a/components/nspanel_easy/nextion_components.h b/components/nspanel_easy/nextion_components.h
index 1e1972f2..3e308df4 100644
--- a/components/nspanel_easy/nextion_components.h
+++ b/components/nspanel_easy/nextion_components.h
@@ -6,8 +6,7 @@
 #include <vector>
 #include <cstdint>
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 /**
  * @struct HMIComponent
@@ -74,5 +73,4 @@ template<typename Container> inline uint16_t rgbTo565(const Container &rgb) {
  */
 constexpr uint16_t invertColor565(uint16_t color) { return (~color) & 0xFFFF; }
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
diff --git a/components/nspanel_easy/nextion_constants.h b/components/nspanel_easy/nextion_constants.h
index 0fb156fd..0ef51567 100644
--- a/components/nspanel_easy/nextion_constants.h
+++ b/components/nspanel_easy/nextion_constants.h
@@ -18,8 +18,7 @@
  * - IconData: Structure pairing icons with colors
  */
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 // =============================================================================
 // Icon Constants
@@ -118,5 +117,4 @@ struct IconData {
   uint16_t color;    ///< RGB565 color value for icon display
 };
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
diff --git a/components/nspanel_easy/nspanel_easy.h b/components/nspanel_easy/nspanel_easy.h
index bcc2f515..b33add79 100644
--- a/components/nspanel_easy/nspanel_easy.h
+++ b/components/nspanel_easy/nspanel_easy.h
@@ -4,8 +4,7 @@
 #include "esphome/core/component.h"
 #include "esphome/core/log.h"
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 /// @brief Main NSPanel Easy component — provides on_setup and on_dump_config triggers.
 class NSPanelEasyComponent : public Component {
@@ -46,5 +45,4 @@ class DumpConfigTrigger : public Trigger<> {
   }
 };
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
diff --git a/components/nspanel_easy/page_alarm.h b/components/nspanel_easy/page_alarm.h
index c22c01d1..063733a5 100644
--- a/components/nspanel_easy/page_alarm.h
+++ b/components/nspanel_easy/page_alarm.h
@@ -2,8 +2,7 @@
 
 #ifdef NSPANEL_EASY_PAGE_ALARM
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 // Home Assistant alarm control panel supported features
 // Matches Home Assistant AlarmControlPanelEntityFeature values
@@ -16,7 +15,6 @@ enum class AlarmFeature : uint8_t {
   ALWAYS_SHOW = 0          // Special value for always-visible buttons
 };
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
 
 #endif  // NSPANEL_EASY_PAGE_ALARM
diff --git a/components/nspanel_easy/page_climate.cpp b/components/nspanel_easy/page_climate.cpp
index 07a1b742..5aee116d 100644
--- a/components/nspanel_easy/page_climate.cpp
+++ b/components/nspanel_easy/page_climate.cpp
@@ -4,8 +4,7 @@
 
 #include "page_climate.h"
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 float set_climate_current_temp;
 uint32_t set_climate_supported_features;
@@ -18,7 +17,6 @@ uint16_t set_climate_temp_offset;
 std::string set_climate_climate_icon;
 bool set_climate_embedded_climate;
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
 
 #endif  // NSPANEL_EASY_PAGE_CLIMATE
diff --git a/components/nspanel_easy/page_climate.h b/components/nspanel_easy/page_climate.h
index d3db024f..b3cf837a 100644
--- a/components/nspanel_easy/page_climate.h
+++ b/components/nspanel_easy/page_climate.h
@@ -7,8 +7,7 @@
 #include <cstdint>
 #include <string>
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 extern float set_climate_current_temp;
 extern uint32_t set_climate_supported_features;
@@ -21,7 +20,6 @@ extern uint16_t set_climate_temp_offset;
 extern std::string set_climate_climate_icon;
 extern bool set_climate_embedded_climate;
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
 
 #endif  // NSPANEL_EASY_PAGE_CLIMATE
diff --git a/components/nspanel_easy/page_entities.cpp b/components/nspanel_easy/page_entities.cpp
index ae34f172..171d8e99 100644
--- a/components/nspanel_easy/page_entities.cpp
+++ b/components/nspanel_easy/page_entities.cpp
@@ -4,12 +4,10 @@
 
 #include "page_entities.h"
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 uint8_t page_entities_value_horizontal_alignment = 1;  // Horizontal alignment: 0-Left; 1-Center; 2-Right
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
 
 #endif  // NSPANEL_EASY_PAGE_ENTITIES
diff --git a/components/nspanel_easy/page_entities.h b/components/nspanel_easy/page_entities.h
index 25ff3d4d..e5c281f7 100644
--- a/components/nspanel_easy/page_entities.h
+++ b/components/nspanel_easy/page_entities.h
@@ -6,12 +6,10 @@
 
 #include <cstdint>
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 extern uint8_t page_entities_value_horizontal_alignment;
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
 
 #endif  // NSPANEL_EASY_PAGE_ENTITIES
diff --git a/components/nspanel_easy/page_home.h b/components/nspanel_easy/page_home.h
index 1dbf7c91..a119dcca 100644
--- a/components/nspanel_easy/page_home.h
+++ b/components/nspanel_easy/page_home.h
@@ -14,10 +14,8 @@
  * of the NSPanel interface.
  */
 
-namespace esphome {
-namespace nspanel_easy {
-namespace hmi {
-namespace home {
+namespace esphome::nspanel_easy {
+namespace hmi::home {
 
 /**
  * @namespace home
@@ -99,9 +97,7 @@ constexpr HMIComponent TIMER_SETTINGS = {"home.settings_timer", 34};     ///< Se
 constexpr HMIComponent TIMER_CLICK = {"home.click_timer", 39};           ///< Click timer
 constexpr HMIComponent TIMER_SHORT_CLICK = {"home.short_click_tm", 47};  ///< Short click timer
 
-}  // namespace home
-}  // namespace hmi
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace hmi::home
+}  // namespace esphome::nspanel_easy
 
 #endif  // NSPANEL_EASY_PAGE_HOME
diff --git a/components/nspanel_easy/page_media_player.cpp b/components/nspanel_easy/page_media_player.cpp
index dc2af3e9..3a837f85 100644
--- a/components/nspanel_easy/page_media_player.cpp
+++ b/components/nspanel_easy/page_media_player.cpp
@@ -4,14 +4,12 @@
 
 #include "page_media_player.h"
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 uint8_t last_volume_level = 0;
 uint32_t last_media_duration = 0;
 uint32_t last_media_position = 0;
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
 
 #endif  // NSPANEL_EASY_PAGE_MEDIA_PLAYER
diff --git a/components/nspanel_easy/page_media_player.h b/components/nspanel_easy/page_media_player.h
index 5a22b31a..4d02019d 100644
--- a/components/nspanel_easy/page_media_player.h
+++ b/components/nspanel_easy/page_media_player.h
@@ -6,14 +6,12 @@
 
 #include <cstdint>
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 extern uint8_t last_volume_level;     // Last volume level from Home Assistant
 extern uint32_t last_media_duration;  // Last duration from Home Assistant
 extern uint32_t last_media_position;  // Last position from Home Assistant
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
 
 #endif  // NSPANEL_EASY_PAGE_MEDIA_PLAYER
diff --git a/components/nspanel_easy/page_notification.cpp b/components/nspanel_easy/page_notification.cpp
index aec099a0..aed8488d 100644
--- a/components/nspanel_easy/page_notification.cpp
+++ b/components/nspanel_easy/page_notification.cpp
@@ -4,15 +4,13 @@
 
 #include "page_notification.h"
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 std::string notification_label;
 std::string notification_text;
 uint16_t notification_icon_color_normal = 52857;
 uint16_t notification_icon_color_unread = 63488;
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
 
 #endif  // NSPANEL_EASY_PAGE_NOTIFICATION
diff --git a/components/nspanel_easy/page_notification.h b/components/nspanel_easy/page_notification.h
index 16fb4195..8db0c6f3 100644
--- a/components/nspanel_easy/page_notification.h
+++ b/components/nspanel_easy/page_notification.h
@@ -7,15 +7,13 @@
 #include <cstdint>
 #include <string>
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 extern std::string notification_label;
 extern std::string notification_text;
 extern uint16_t notification_icon_color_normal;
 extern uint16_t notification_icon_color_unread;
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
 
 #endif  // NSPANEL_EASY_PAGE_NOTIFICATION
diff --git a/components/nspanel_easy/page_qrcode.h b/components/nspanel_easy/page_qrcode.h
index 51f0996a..959ee125 100644
--- a/components/nspanel_easy/page_qrcode.h
+++ b/components/nspanel_easy/page_qrcode.h
@@ -15,10 +15,8 @@
  * of the NSPanel interface.
  */
 
-namespace esphome {
-namespace nspanel_easy {
-namespace hmi {
-namespace qrcode {
+namespace esphome::nspanel_easy {
+namespace hmi::qrcode {
 
 /**
  * @namespace qrcode
@@ -49,9 +47,7 @@ constexpr HMIComponent ALL[] = {PAGE, BUTTON_BACK, QR, ICON_STATE, PAGE_LABEL};
 
 constexpr size_t COMPONENT_COUNT = sizeof(ALL) / sizeof(ALL[0]);
 
-}  // namespace qrcode
-}  // namespace hmi
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace hmi::qrcode
+}  // namespace esphome::nspanel_easy
 
 #endif  // NSPANEL_EASY_PAGE_QRCODE
diff --git a/components/nspanel_easy/page_screensaver.cpp b/components/nspanel_easy/page_screensaver.cpp
index cda3e085..c1dad803 100644
--- a/components/nspanel_easy/page_screensaver.cpp
+++ b/components/nspanel_easy/page_screensaver.cpp
@@ -12,8 +12,6 @@
  * page_screensaver.h.
  */
 
-namespace esphome {
-namespace nspanel_easy {}  // namespace nspanel_easy
-}  // namespace esphome
+namespace esphome::nspanel_easy {}  // namespace esphome::nspanel_easy
 
 #endif  // NSPANEL_EASY_PAGE_SCREENSAVER
diff --git a/components/nspanel_easy/page_screensaver.h b/components/nspanel_easy/page_screensaver.h
index 71aa99b2..2c851e26 100644
--- a/components/nspanel_easy/page_screensaver.h
+++ b/components/nspanel_easy/page_screensaver.h
@@ -16,11 +16,9 @@
  * avoid redundant display updates.
  */
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
-namespace hmi {
-namespace screensaver {
+namespace hmi::screensaver {
 
 /**
  * @namespace screensaver
@@ -49,9 +47,7 @@ constexpr HMIComponent ALL[] = {PAGE, TEXT};
 
 constexpr size_t COMPONENT_COUNT = sizeof(ALL) / sizeof(ALL[0]);
 
-}  // namespace screensaver
-}  // namespace hmi
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace hmi::screensaver
+}  // namespace esphome::nspanel_easy
 
 #endif  // NSPANEL_EASY_PAGE_SCREENSAVER
diff --git a/components/nspanel_easy/page_utilities.cpp b/components/nspanel_easy/page_utilities.cpp
index 7cc85f19..22f4059c 100644
--- a/components/nspanel_easy/page_utilities.cpp
+++ b/components/nspanel_easy/page_utilities.cpp
@@ -11,8 +11,7 @@
 #include "esp32-hal-psram.h"
 #endif
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 bool page_utilities_enabled = false;
 uint16_t page_utilities_icon_color = Colors::RGB565_GRAY_LIGHT;
@@ -52,7 +51,6 @@ uint8_t findUtilitiesGroupIndex(const char *group_id) {
   return UINT8_MAX;  // Not found
 }
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
 
 #endif  // NSPANEL_EASY_PAGE_UTILITIES
diff --git a/components/nspanel_easy/page_utilities.h b/components/nspanel_easy/page_utilities.h
index a72a998c..f6668627 100644
--- a/components/nspanel_easy/page_utilities.h
+++ b/components/nspanel_easy/page_utilities.h
@@ -22,8 +22,7 @@
  * of the NSPanel interface.
  */
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 extern bool page_utilities_enabled;
 extern uint16_t page_utilities_icon_color;
@@ -59,8 +58,7 @@ template<unsigned int N> void copyStringToCharArray(char (&dest)[N], const std::
   dest[length] = '\0';
 }
 
-namespace hmi {
-namespace utilities {
+namespace hmi::utilities {
 
 /**
  * @namespace utilities
@@ -134,9 +132,7 @@ constexpr HMIComponent GROUP06_LINE = {"utilities.group06_line", 84};      ///<
 // Navigation button
 constexpr HMIComponent BUTTON_BACK = {"button_back", 90};  ///< Back button (local scope)
 
-}  // namespace utilities
-}  // namespace hmi
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace hmi::utilities
+}  // namespace esphome::nspanel_easy
 
 #endif  // NSPANEL_EASY_PAGE_UTILITIES
diff --git a/components/nspanel_easy/pages.cpp b/components/nspanel_easy/pages.cpp
index 3faaaba1..b043a256 100644
--- a/components/nspanel_easy/pages.cpp
+++ b/components/nspanel_easy/pages.cpp
@@ -2,12 +2,10 @@
 
 #include "pages.h"
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 uint8_t current_page_id = 0;
 uint8_t last_page_id = UINT8_MAX;
 uint8_t wakeup_page_id = 1;
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
diff --git a/components/nspanel_easy/pages.h b/components/nspanel_easy/pages.h
index 444c0a01..e0c839d5 100644
--- a/components/nspanel_easy/pages.h
+++ b/components/nspanel_easy/pages.h
@@ -13,8 +13,7 @@
  * Defines constants and functions related to page names for the NSPanel HA Blueprint project.
  */
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 // Constants
 /**
@@ -127,5 +126,4 @@ static_assert(get_page_id("weather03") != UINT8_MAX, "Missing required page: wea
 static_assert(get_page_id("weather04") != UINT8_MAX, "Missing required page: weather04");
 static_assert(get_page_id("weather05") != UINT8_MAX, "Missing required page: weather05");
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
diff --git a/components/nspanel_easy/text.cpp b/components/nspanel_easy/text.cpp
index 0ab7f98b..0caf6119 100644
--- a/components/nspanel_easy/text.cpp
+++ b/components/nspanel_easy/text.cpp
@@ -6,8 +6,7 @@
 #include <cstdlib>
 #include <cstring>
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 std::string adjustDecimalSeparator(const std::string &input, char decimalSeparator) {
   if (decimalSeparator == '.') {
@@ -185,5 +184,4 @@ void replace_all(std::string &str, const char *token, const char *value) {
   }
 }
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
diff --git a/components/nspanel_easy/text.h b/components/nspanel_easy/text.h
index 5111aa4a..4c59d6f6 100644
--- a/components/nspanel_easy/text.h
+++ b/components/nspanel_easy/text.h
@@ -6,8 +6,7 @@
 #include <initializer_list>
 #include <string>
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 /**
  * Adjusts the decimal separator in a numeric string to the specified character.
@@ -96,5 +95,4 @@ constexpr bool strings_equal(const char *a, const char *b) {
  */
 void replace_all(std::string &str, const char *token, const char *value);
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
diff --git a/components/nspanel_easy/versioning.cpp b/components/nspanel_easy/versioning.cpp
index 9d9f0012..014e64db 100644
--- a/components/nspanel_easy/versioning.cpp
+++ b/components/nspanel_easy/versioning.cpp
@@ -4,8 +4,7 @@
 
 #include "versioning.h"
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 bool calver_gte(const std::string &version, const std::string &min_version) {
   int ver_y = 0, ver_m = 0, ver_s = 0;
@@ -30,7 +29,6 @@ bool calver_gte(const std::string &version, const std::string &min_version) {
   return ver_s >= min_s;
 }
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
 
 #endif  // NSPANEL_EASY_VERSIONING
diff --git a/components/nspanel_easy/versioning.h b/components/nspanel_easy/versioning.h
index b45be73a..4d582e32 100644
--- a/components/nspanel_easy/versioning.h
+++ b/components/nspanel_easy/versioning.h
@@ -6,8 +6,7 @@
 
 #include <string>
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 /**
  * @brief Compare two CalVer version strings segment by segment.
@@ -42,7 +41,6 @@ namespace nspanel_easy {
  */
 bool calver_gte(const std::string &version, const std::string &min_version);
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
 
 #endif  // NSPANEL_EASY_VERSIONING
diff --git a/components/nspanel_easy/weather.cpp b/components/nspanel_easy/weather.cpp
index f10f64c2..9da3d586 100644
--- a/components/nspanel_easy/weather.cpp
+++ b/components/nspanel_easy/weather.cpp
@@ -4,8 +4,7 @@
 
 #include "weather.h"
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 SunInfo sun_info = {
     .is_up = true,            // Safe daytime default before first blueprint update or SNTP sync
@@ -14,7 +13,6 @@ SunInfo sun_info = {
 
 uint8_t weather_condition_index = 0;  // Defaults to fallback until first blueprint update
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
 
 #endif  // NSPANEL_EASY_USE_WEATHER
diff --git a/components/nspanel_easy/weather.h b/components/nspanel_easy/weather.h
index bdb9ba50..5ec19dc0 100644
--- a/components/nspanel_easy/weather.h
+++ b/components/nspanel_easy/weather.h
@@ -27,8 +27,7 @@
  * @c on_sunrise and @c on_sunset triggers.
  */
 
-namespace esphome {
-namespace nspanel_easy {
+namespace esphome::nspanel_easy {
 
 // =============================================================================
 // Sun elevation state
@@ -228,7 +227,6 @@ inline const WeatherPicVariant &select_weather_variant(const WeatherPics &pics,
   return is_dark_theme ? pics.legacy_dark : pics.legacy_light;
 }
 
-}  // namespace nspanel_easy
-}  // namespace esphome
+}  // namespace esphome::nspanel_easy
 
 #endif  // NSPANEL_EASY_USE_WEATHER
diff --git a/esphome/nspanel_esphome_page_notification.yaml b/esphome/nspanel_esphome_page_notification.yaml
index e2d8d020..c0a1b9e2 100644
--- a/esphome/nspanel_esphome_page_notification.yaml
+++ b/esphome/nspanel_esphome_page_notification.yaml
@@ -29,8 +29,12 @@ api:
         message: string
       then:
         - lambda: |-
-            notification_label = label;
-            notification_text = message;
+            if (message.empty()) {
+              ESP_LOGW("${TAG_PAGE_NOTIFICATION}", "`notification_show` action called without a notification message");
+              return;
+            }
+            notification_label = label.c_str();
+            notification_text = message.c_str();
             notification_unread->publish_state(true);
             if (current_page_id == get_page_id("notification")) {
               page_notification->execute();
@@ -42,9 +46,7 @@ api:
             notification_play_sound->execute();
             #endif
             disp1->set_component_font_color(hmi::home::BT_NOTIFIC.name, notification_icon_color_unread);
-            if (current_page_id == hmi::home::PAGE.id) {
-              disp1->show_component("bt_notific");
-            }
+            disp1->send_command("vis_bt_notific=1");
 
 binary_sensor:
   - id: notification_unread
@@ -99,20 +101,35 @@ script:
       - lambda: |-
           notification_clear->execute();
 
-  - id: !extend page_change
+  - id: notification_clear
+    mode: single
     then:
-      - lambda: if (new_page_id == get_page_id("notification")) page_notification->execute();
+      - lambda: |-
+          if (current_page_id == get_page_id("notification"))
+            goto_page->execute(hmi::home::PAGE.id);
+          notification_label = "";
+          notification_text = "";
+          notification_unread->publish_state(false);
+          disp1->set_component_font_color(hmi::home::BT_NOTIFIC.name, Colors::RGB565_BLACK);
+          if (current_page_id == hmi::home::PAGE.id) {
+            disp1->hide_component("bt_notific");
+          }
 
-  - id: page_notification
+  - id: notification_play_sound
     mode: single
     then:
       - lambda: |-
-          if (current_page_id == get_page_id("notification")) {
-            disp1->set_component_text("notifi_label", notification_label.c_str());
-            disp1->set_component_text("notifi_text01", wrapText(notification_text.c_str(),
-                                                                display_mode == 2 ? 23 : 32,
-                                                                ${LANG_BYTES_PER_CHAR}).c_str());
-          }
+          // Only when buzzer is available
+          #ifdef NSPANEL_EASY_HW_BUZZER
+          if (notification_sound->state)
+            buzzer->play("${tone_notification}");
+          #endif
+
+  - id: !extend page_change
+    then:
+      - lambda: |-
+          if (new_page_id != get_page_id("notification")) return;
+          page_notification->execute();
 
   - id: !extend page_home
     then:
@@ -131,29 +148,15 @@ script:
             }
           }
 
-  - id: notification_clear
-    mode: single
-    then:
-      - lambda: |-
-          if (current_page_id == get_page_id("notification"))
-            goto_page->execute(hmi::home::PAGE.id);
-          notification_label = "";
-          notification_text = "";
-          notification_unread->publish_state(false);
-          disp1->set_component_font_color(hmi::home::BT_NOTIFIC.name, Colors::RGB565_BLACK);
-          if (current_page_id == hmi::home::PAGE.id) {
-            disp1->hide_component("bt_notific");
-          }
-
-  - id: notification_play_sound
+  - id: page_notification
     mode: single
     then:
       - lambda: |-
-          // Only when buzzer is available
-          #ifdef NSPANEL_EASY_HW_BUZZER
-          if (notification_sound->state)
-            buzzer->play("${tone_notification}");
-          #endif
+          if (current_page_id != get_page_id("notification")) return;
+          disp1->set_component_text("notifi_label", notification_label.c_str());
+          disp1->set_component_text("notifi_text01", wrapText(notification_text.c_str(),
+                                                              display_mode == 2 ? 23 : 32,
+                                                              ${LANG_BYTES_PER_CHAR}).c_str());
 
   - id: !extend stop_all
     then:
diff --git a/esphome/nspanel_esphome_version.yaml b/esphome/nspanel_esphome_version.yaml
index fcc1adfe..b352c6b2 100644
--- a/esphome/nspanel_esphome_version.yaml
+++ b/esphome/nspanel_esphome_version.yaml
@@ -9,18 +9,23 @@
 substitutions:
   # Automatically updated by CI/CD on each release
   # Value is imported from versioning/version.yaml
-  !!merge <<: !include ../versioning/version.yaml
+  <<: !include ../versioning/version.yaml
+
   # Minimum required blueprint version for compatibility
   # Select 'next' or '${version}' when you change the "contract" between ESPHome and Blueprint
   # Versioning workflow will replace this by the new version being generated
   min_blueprint_version: 2026.4.2
+
   # Minimum required TFT version for compatibility
   # Must be manually updated with Nextion Editor
   min_tft_version: 15
+
   # Minimum required ESPHome compiler to run this
   # Versioning workflow will take care of updating this
   min_esphome_compiler_version: 2026.2.0
+
   TAG_VERSIONING: nspanel.versioning
+
 esphome:
   project:
     version: '"${version}"'
@@ -28,6 +33,7 @@ esphome:
     build_flags:
       - -D NSPANEL_EASY_VERSIONING
   min_version: ${min_esphome_compiler_version}
+
 script:
   - id: !extend action_component_text
     then:
@@ -39,11 +45,13 @@ script:
             return;
           }
           version_blueprint->publish_state(txt);
+
   - id: !extend boot_early_routines
     then:
       - text_sensor.template.publish:
           id: version_esphome
           state: ${version}
+
   - id: check_versions
     mode: restart
     parameters:
@@ -119,6 +127,7 @@ script:
           #endif  // NSPANEL_EASY_ADDON_UPLOAD_TFT
           });
           ESP_LOGD("${TAG_VERSIONING}", "Check version completed");
+
   - id: !extend dump_config
     then:
       - lambda: |-
@@ -146,17 +155,19 @@ script:
           #else
           ESP_LOGE("${TAG_VERSIONING}", "  Framework: Unknown");
           #endif
+
   - id: !extend stop_all
     then:
       - lambda: |-
           check_versions->stop();
           wait_for_version_blueprint->stop();
           wait_for_versions->stop();
+
   - id: wait_for_version_blueprint
     mode: single
     then:
       - repeat:
-          count: 60 # seconds
+          count: 60  # seconds
           then:
             - lambda: |-
                 ESP_LOGV("${TAG_VERSIONING}", "Blueprint version: '%s'", version_blueprint->state.c_str());
@@ -164,11 +175,13 @@ script:
                 if (iteration % 5 == 1) boot_log->execute("Boot", "Waiting for Blueprint version");
                 if (iteration % 9 == 0) boot_request_blueprint_settings->execute("timeout");
             - delay: 1s
+
   - id: wait_for_versions
     mode: single
     then:
       - script.execute: wait_for_version_blueprint
       - script.wait: wait_for_version_blueprint
+
 sensor:
   - id: version_tft
     name: "Version - TFT"
@@ -179,6 +192,7 @@ sensor:
     update_interval: never
     # Initial state is empty, which HA renders as unavailable.
     # Published by nspanel_esphome_page_boot when the TFT version is received from the display.
+
 text_sensor:
   - id: version_esphome
     name: "Version - ESPHome"
@@ -188,6 +202,7 @@ text_sensor:
     internal: false
     update_interval: never
     # Published by boot_early_routines during boot sequence.
+
   - id: version_blueprint
     name: "Version - Blueprint"
     platform: template
diff --git a/hmi/dev/scripts/ui/eu-white/0.png b/hmi/dev/scripts/ui/eu-white/0.png
new file mode 100644
index 00000000..ff079f62
Binary files /dev/null and b/hmi/dev/scripts/ui/eu-white/0.png differ
diff --git a/hmi/dev/scripts/ui/eu/0.png b/hmi/dev/scripts/ui/eu/0.png
new file mode 100644
index 00000000..4ca2946c
Binary files /dev/null and b/hmi/dev/scripts/ui/eu/0.png differ
diff --git a/hmi/dev/scripts/ui/us-white/0.png b/hmi/dev/scripts/ui/us-white/0.png
new file mode 100644
index 00000000..9a7926c1
Binary files /dev/null and b/hmi/dev/scripts/ui/us-white/0.png differ
diff --git a/hmi/dev/scripts/ui/us/0.png b/hmi/dev/scripts/ui/us/0.png
new file mode 100644
index 00000000..beecd3c2
Binary files /dev/null and b/hmi/dev/scripts/ui/us/0.png differ
diff --git a/hmi/dev/ui/eu-white/1.png b/hmi/dev/ui/eu-white/1.png
index 01e356e8..c1e9ff0c 100644
Binary files a/hmi/dev/ui/eu-white/1.png and b/hmi/dev/ui/eu-white/1.png differ
diff --git a/hmi/dev/ui/eu-white/10.png b/hmi/dev/ui/eu-white/10.png
index 0de856e0..480808aa 100644
Binary files a/hmi/dev/ui/eu-white/10.png and b/hmi/dev/ui/eu-white/10.png differ
diff --git a/hmi/dev/ui/eu-white/11.png b/hmi/dev/ui/eu-white/11.png
index 98ca43eb..746e1ab1 100644
Binary files a/hmi/dev/ui/eu-white/11.png and b/hmi/dev/ui/eu-white/11.png differ
diff --git a/hmi/dev/ui/eu-white/12.png b/hmi/dev/ui/eu-white/12.png
index 5544b75c..9859ae6d 100644
Binary files a/hmi/dev/ui/eu-white/12.png and b/hmi/dev/ui/eu-white/12.png differ
diff --git a/hmi/dev/ui/eu-white/13.png b/hmi/dev/ui/eu-white/13.png
index 923fcc13..05b64bd8 100644
Binary files a/hmi/dev/ui/eu-white/13.png and b/hmi/dev/ui/eu-white/13.png differ
diff --git a/hmi/dev/ui/eu-white/14.png b/hmi/dev/ui/eu-white/14.png
index 626d386a..872cb7f0 100644
Binary files a/hmi/dev/ui/eu-white/14.png and b/hmi/dev/ui/eu-white/14.png differ
diff --git a/hmi/dev/ui/eu-white/15.png b/hmi/dev/ui/eu-white/15.png
index 27668f13..c2923928 100644
Binary files a/hmi/dev/ui/eu-white/15.png and b/hmi/dev/ui/eu-white/15.png differ
diff --git a/hmi/dev/ui/eu-white/17.png b/hmi/dev/ui/eu-white/17.png
index 2e6bc5ee..8b46e459 100644
Binary files a/hmi/dev/ui/eu-white/17.png and b/hmi/dev/ui/eu-white/17.png differ
diff --git a/hmi/dev/ui/eu-white/19.png b/hmi/dev/ui/eu-white/19.png
index 6fd3ea9d..c4a02b56 100644
Binary files a/hmi/dev/ui/eu-white/19.png and b/hmi/dev/ui/eu-white/19.png differ
diff --git a/hmi/dev/ui/eu-white/2.png b/hmi/dev/ui/eu-white/2.png
index 1acc5143..525c3bf9 100644
Binary files a/hmi/dev/ui/eu-white/2.png and b/hmi/dev/ui/eu-white/2.png differ
diff --git a/hmi/dev/ui/eu-white/20.png b/hmi/dev/ui/eu-white/20.png
index f74279e8..2a35387a 100644
Binary files a/hmi/dev/ui/eu-white/20.png and b/hmi/dev/ui/eu-white/20.png differ
diff --git a/hmi/dev/ui/eu-white/21.png b/hmi/dev/ui/eu-white/21.png
index 1d217b72..007bc8b5 100644
Binary files a/hmi/dev/ui/eu-white/21.png and b/hmi/dev/ui/eu-white/21.png differ
diff --git a/hmi/dev/ui/eu-white/22.png b/hmi/dev/ui/eu-white/22.png
index 5eabe095..e330c9c8 100644
Binary files a/hmi/dev/ui/eu-white/22.png and b/hmi/dev/ui/eu-white/22.png differ
diff --git a/hmi/dev/ui/eu-white/23.png b/hmi/dev/ui/eu-white/23.png
index 9350f375..37826c2f 100644
Binary files a/hmi/dev/ui/eu-white/23.png and b/hmi/dev/ui/eu-white/23.png differ
diff --git a/hmi/dev/ui/eu-white/24.png b/hmi/dev/ui/eu-white/24.png
index d45331bc..c46b19b5 100644
Binary files a/hmi/dev/ui/eu-white/24.png and b/hmi/dev/ui/eu-white/24.png differ
diff --git a/hmi/dev/ui/eu-white/25.png b/hmi/dev/ui/eu-white/25.png
index e4a8277c..64695d36 100644
Binary files a/hmi/dev/ui/eu-white/25.png and b/hmi/dev/ui/eu-white/25.png differ
diff --git a/hmi/dev/ui/eu-white/26.png b/hmi/dev/ui/eu-white/26.png
index 83aefca4..001b1c65 100644
Binary files a/hmi/dev/ui/eu-white/26.png and b/hmi/dev/ui/eu-white/26.png differ
diff --git a/hmi/dev/ui/eu-white/27.png b/hmi/dev/ui/eu-white/27.png
index 9e2d02e0..0ab376c2 100644
Binary files a/hmi/dev/ui/eu-white/27.png and b/hmi/dev/ui/eu-white/27.png differ
diff --git a/hmi/dev/ui/eu-white/28.png b/hmi/dev/ui/eu-white/28.png
index 21189418..b806a1ea 100644
Binary files a/hmi/dev/ui/eu-white/28.png and b/hmi/dev/ui/eu-white/28.png differ
diff --git a/hmi/dev/ui/eu-white/29.png b/hmi/dev/ui/eu-white/29.png
index 80dce32c..8cee21c8 100644
Binary files a/hmi/dev/ui/eu-white/29.png and b/hmi/dev/ui/eu-white/29.png differ
diff --git a/hmi/dev/ui/eu-white/3.png b/hmi/dev/ui/eu-white/3.png
index 0317715a..ade512d3 100644
Binary files a/hmi/dev/ui/eu-white/3.png and b/hmi/dev/ui/eu-white/3.png differ
diff --git a/hmi/dev/ui/eu-white/32.png b/hmi/dev/ui/eu-white/32.png
index f4a6cbb4..93933fdb 100644
Binary files a/hmi/dev/ui/eu-white/32.png and b/hmi/dev/ui/eu-white/32.png differ
diff --git a/hmi/dev/ui/eu-white/33.png b/hmi/dev/ui/eu-white/33.png
index cdf20283..836ada22 100644
Binary files a/hmi/dev/ui/eu-white/33.png and b/hmi/dev/ui/eu-white/33.png differ
diff --git a/hmi/dev/ui/eu-white/34.png b/hmi/dev/ui/eu-white/34.png
index 4a53b6cc..d7b88874 100644
Binary files a/hmi/dev/ui/eu-white/34.png and b/hmi/dev/ui/eu-white/34.png differ
diff --git a/hmi/dev/ui/eu-white/37.png b/hmi/dev/ui/eu-white/37.png
index feb37df3..ad9e36f8 100644
Binary files a/hmi/dev/ui/eu-white/37.png and b/hmi/dev/ui/eu-white/37.png differ
diff --git a/hmi/dev/ui/eu-white/39.png b/hmi/dev/ui/eu-white/39.png
index 274e5d79..ecac6fdb 100644
Binary files a/hmi/dev/ui/eu-white/39.png and b/hmi/dev/ui/eu-white/39.png differ
diff --git a/hmi/dev/ui/eu-white/4.png b/hmi/dev/ui/eu-white/4.png
index aff62e5f..526dd992 100644
Binary files a/hmi/dev/ui/eu-white/4.png and b/hmi/dev/ui/eu-white/4.png differ
diff --git a/hmi/dev/ui/eu-white/40.png b/hmi/dev/ui/eu-white/40.png
index 7bb45c98..30f59742 100644
Binary files a/hmi/dev/ui/eu-white/40.png and b/hmi/dev/ui/eu-white/40.png differ
diff --git a/hmi/dev/ui/eu-white/46.png b/hmi/dev/ui/eu-white/46.png
index 4143f9d4..9142e550 100644
Binary files a/hmi/dev/ui/eu-white/46.png and b/hmi/dev/ui/eu-white/46.png differ
diff --git a/hmi/dev/ui/eu-white/47.png b/hmi/dev/ui/eu-white/47.png
index 19c864cc..df28da60 100644
Binary files a/hmi/dev/ui/eu-white/47.png and b/hmi/dev/ui/eu-white/47.png differ
diff --git a/hmi/dev/ui/eu-white/5.png b/hmi/dev/ui/eu-white/5.png
index 4dc814c7..d86bcb25 100644
Binary files a/hmi/dev/ui/eu-white/5.png and b/hmi/dev/ui/eu-white/5.png differ
diff --git a/hmi/dev/ui/eu-white/6.png b/hmi/dev/ui/eu-white/6.png
index 4466e3d9..ebc3b628 100644
Binary files a/hmi/dev/ui/eu-white/6.png and b/hmi/dev/ui/eu-white/6.png differ
diff --git a/hmi/dev/ui/eu-white/7.png b/hmi/dev/ui/eu-white/7.png
index 4aa68067..c9f3f672 100644
Binary files a/hmi/dev/ui/eu-white/7.png and b/hmi/dev/ui/eu-white/7.png differ
diff --git a/hmi/dev/ui/eu-white/8.png b/hmi/dev/ui/eu-white/8.png
index ced058c2..4e3ecd17 100644
Binary files a/hmi/dev/ui/eu-white/8.png and b/hmi/dev/ui/eu-white/8.png differ
diff --git a/hmi/dev/ui/eu-white/9.png b/hmi/dev/ui/eu-white/9.png
index 828b48dc..d710d32c 100644
Binary files a/hmi/dev/ui/eu-white/9.png and b/hmi/dev/ui/eu-white/9.png differ
diff --git a/hmi/dev/ui/eu/1.png b/hmi/dev/ui/eu/1.png
index b5c17f34..b4f257b6 100644
Binary files a/hmi/dev/ui/eu/1.png and b/hmi/dev/ui/eu/1.png differ
diff --git a/hmi/dev/ui/eu/10.png b/hmi/dev/ui/eu/10.png
index df0a384f..9028cac8 100644
Binary files a/hmi/dev/ui/eu/10.png and b/hmi/dev/ui/eu/10.png differ
diff --git a/hmi/dev/ui/eu/11.png b/hmi/dev/ui/eu/11.png
index 60845e84..ae4fdd08 100644
Binary files a/hmi/dev/ui/eu/11.png and b/hmi/dev/ui/eu/11.png differ
diff --git a/hmi/dev/ui/eu/12.png b/hmi/dev/ui/eu/12.png
index 0d55720e..45367c1b 100644
Binary files a/hmi/dev/ui/eu/12.png and b/hmi/dev/ui/eu/12.png differ
diff --git a/hmi/dev/ui/eu/13.png b/hmi/dev/ui/eu/13.png
index 120d15ce..5ba0eba9 100644
Binary files a/hmi/dev/ui/eu/13.png and b/hmi/dev/ui/eu/13.png differ
diff --git a/hmi/dev/ui/eu/14.png b/hmi/dev/ui/eu/14.png
index d0c5adef..c8a4f35c 100644
Binary files a/hmi/dev/ui/eu/14.png and b/hmi/dev/ui/eu/14.png differ
diff --git a/hmi/dev/ui/eu/15.png b/hmi/dev/ui/eu/15.png
index 58586fef..2efcca5e 100644
Binary files a/hmi/dev/ui/eu/15.png and b/hmi/dev/ui/eu/15.png differ
diff --git a/hmi/dev/ui/eu/17.png b/hmi/dev/ui/eu/17.png
index d6551013..18b5ccc3 100644
Binary files a/hmi/dev/ui/eu/17.png and b/hmi/dev/ui/eu/17.png differ
diff --git a/hmi/dev/ui/eu/19.png b/hmi/dev/ui/eu/19.png
index 33a022a9..74d8a942 100644
Binary files a/hmi/dev/ui/eu/19.png and b/hmi/dev/ui/eu/19.png differ
diff --git a/hmi/dev/ui/eu/2.png b/hmi/dev/ui/eu/2.png
index 3cba08c8..b024c7ce 100644
Binary files a/hmi/dev/ui/eu/2.png and b/hmi/dev/ui/eu/2.png differ
diff --git a/hmi/dev/ui/eu/20.png b/hmi/dev/ui/eu/20.png
index ac6db596..1cea93cd 100644
Binary files a/hmi/dev/ui/eu/20.png and b/hmi/dev/ui/eu/20.png differ
diff --git a/hmi/dev/ui/eu/21.png b/hmi/dev/ui/eu/21.png
index fde79410..7f2c967c 100644
Binary files a/hmi/dev/ui/eu/21.png and b/hmi/dev/ui/eu/21.png differ
diff --git a/hmi/dev/ui/eu/22.png b/hmi/dev/ui/eu/22.png
index 6907a2cb..05e20f46 100644
Binary files a/hmi/dev/ui/eu/22.png and b/hmi/dev/ui/eu/22.png differ
diff --git a/hmi/dev/ui/eu/23.png b/hmi/dev/ui/eu/23.png
index 5c796d30..f0f93bda 100644
Binary files a/hmi/dev/ui/eu/23.png and b/hmi/dev/ui/eu/23.png differ
diff --git a/hmi/dev/ui/eu/24.png b/hmi/dev/ui/eu/24.png
index 9e60c1d4..e378974b 100644
Binary files a/hmi/dev/ui/eu/24.png and b/hmi/dev/ui/eu/24.png differ
diff --git a/hmi/dev/ui/eu/25.png b/hmi/dev/ui/eu/25.png
index 35b6c73e..705fe120 100644
Binary files a/hmi/dev/ui/eu/25.png and b/hmi/dev/ui/eu/25.png differ
diff --git a/hmi/dev/ui/eu/26.png b/hmi/dev/ui/eu/26.png
index 1be4ad9f..2b7b7317 100644
Binary files a/hmi/dev/ui/eu/26.png and b/hmi/dev/ui/eu/26.png differ
diff --git a/hmi/dev/ui/eu/27.png b/hmi/dev/ui/eu/27.png
index 0e3486c1..33b4c7b1 100644
Binary files a/hmi/dev/ui/eu/27.png and b/hmi/dev/ui/eu/27.png differ
diff --git a/hmi/dev/ui/eu/28.png b/hmi/dev/ui/eu/28.png
index 3e130d8e..263399b5 100644
Binary files a/hmi/dev/ui/eu/28.png and b/hmi/dev/ui/eu/28.png differ
diff --git a/hmi/dev/ui/eu/29.png b/hmi/dev/ui/eu/29.png
index 32fa3c73..7754b8c2 100644
Binary files a/hmi/dev/ui/eu/29.png and b/hmi/dev/ui/eu/29.png differ
diff --git a/hmi/dev/ui/eu/3.png b/hmi/dev/ui/eu/3.png
index 76572790..1f24753b 100644
Binary files a/hmi/dev/ui/eu/3.png and b/hmi/dev/ui/eu/3.png differ
diff --git a/hmi/dev/ui/eu/32.png b/hmi/dev/ui/eu/32.png
index 060fd753..76945cd3 100644
Binary files a/hmi/dev/ui/eu/32.png and b/hmi/dev/ui/eu/32.png differ
diff --git a/hmi/dev/ui/eu/33.png b/hmi/dev/ui/eu/33.png
index cb8a0fa4..67380b10 100644
Binary files a/hmi/dev/ui/eu/33.png and b/hmi/dev/ui/eu/33.png differ
diff --git a/hmi/dev/ui/eu/34.png b/hmi/dev/ui/eu/34.png
index 113d23d6..42c74148 100644
Binary files a/hmi/dev/ui/eu/34.png and b/hmi/dev/ui/eu/34.png differ
diff --git a/hmi/dev/ui/eu/37.png b/hmi/dev/ui/eu/37.png
index f332b946..e7eaccb4 100644
Binary files a/hmi/dev/ui/eu/37.png and b/hmi/dev/ui/eu/37.png differ
diff --git a/hmi/dev/ui/eu/39.png b/hmi/dev/ui/eu/39.png
index 5872586b..1b6a91d3 100644
Binary files a/hmi/dev/ui/eu/39.png and b/hmi/dev/ui/eu/39.png differ
diff --git a/hmi/dev/ui/eu/4.png b/hmi/dev/ui/eu/4.png
index 06fd7708..e3c67aa9 100644
Binary files a/hmi/dev/ui/eu/4.png and b/hmi/dev/ui/eu/4.png differ
diff --git a/hmi/dev/ui/eu/40.png b/hmi/dev/ui/eu/40.png
index f76dffbb..794c33c5 100644
Binary files a/hmi/dev/ui/eu/40.png and b/hmi/dev/ui/eu/40.png differ
diff --git a/hmi/dev/ui/eu/46.png b/hmi/dev/ui/eu/46.png
index 4371a0d9..dfa10073 100644
Binary files a/hmi/dev/ui/eu/46.png and b/hmi/dev/ui/eu/46.png differ
diff --git a/hmi/dev/ui/eu/47.png b/hmi/dev/ui/eu/47.png
index 20f076a8..75416161 100644
Binary files a/hmi/dev/ui/eu/47.png and b/hmi/dev/ui/eu/47.png differ
diff --git a/hmi/dev/ui/eu/5.png b/hmi/dev/ui/eu/5.png
index fe1fa6b8..f8bf39ad 100644
Binary files a/hmi/dev/ui/eu/5.png and b/hmi/dev/ui/eu/5.png differ
diff --git a/hmi/dev/ui/eu/6.png b/hmi/dev/ui/eu/6.png
index 09ab5076..f2d8d79d 100644
Binary files a/hmi/dev/ui/eu/6.png and b/hmi/dev/ui/eu/6.png differ
diff --git a/hmi/dev/ui/eu/7.png b/hmi/dev/ui/eu/7.png
index f42f50be..6c5c9668 100644
Binary files a/hmi/dev/ui/eu/7.png and b/hmi/dev/ui/eu/7.png differ
diff --git a/hmi/dev/ui/eu/8.png b/hmi/dev/ui/eu/8.png
index 7642b170..15851789 100644
Binary files a/hmi/dev/ui/eu/8.png and b/hmi/dev/ui/eu/8.png differ
diff --git a/hmi/dev/ui/eu/9.png b/hmi/dev/ui/eu/9.png
index 6ad24006..11568947 100644
Binary files a/hmi/dev/ui/eu/9.png and b/hmi/dev/ui/eu/9.png differ
diff --git a/hmi/dev/ui/eu/NSPanel - EU.pptx b/hmi/dev/ui/eu/NSPanel - EU.pptx
index 6a0bdf90..c0d8941d 100644
Binary files a/hmi/dev/ui/eu/NSPanel - EU.pptx and b/hmi/dev/ui/eu/NSPanel - EU.pptx differ
diff --git a/hmi/dev/ui/generate_pics_all.cmd b/hmi/dev/ui/generate_pics_all.cmd
index b729c056..f99ca5d8 100644
--- a/hmi/dev/ui/generate_pics_all.cmd
+++ b/hmi/dev/ui/generate_pics_all.cmd
@@ -1,6 +1,12 @@
 bash ../scripts/generate_images.sh pics/0.png eu
+if errorlevel 1 timeout /t 10
 bash ../scripts/generate_images.sh pics/0-portrait.png us
+if errorlevel 1 timeout /t 10
 bash ../scripts/generate_images.sh pics/0-white.png eu-white
+if errorlevel 1 timeout /t 10
 bash ../scripts/generate_images.sh pics/0-portrait-white.png us-white
+if errorlevel 1 timeout /t 10
+ 
+timeout /t 30
 
 
diff --git a/hmi/dev/ui/pics/15.png b/hmi/dev/ui/pics/15.png
index 732e3c39..e1bbfb48 100644
Binary files a/hmi/dev/ui/pics/15.png and b/hmi/dev/ui/pics/15.png differ
diff --git a/hmi/dev/ui/pics/15_new_black.png b/hmi/dev/ui/pics/15_new_black.png
deleted file mode 100644
index 61af0705..00000000
Binary files a/hmi/dev/ui/pics/15_new_black.png and /dev/null differ
diff --git a/hmi/dev/ui/pics/15_new_white.png b/hmi/dev/ui/pics/15_new_white.png
deleted file mode 100644
index d6faaf76..00000000
Binary files a/hmi/dev/ui/pics/15_new_white.png and /dev/null differ
diff --git a/hmi/dev/ui/pics/settings_brightness_bar_blue_landscape.png b/hmi/dev/ui/pics/settings_brightness_bar_blue_landscape.png
new file mode 100644
index 00000000..2a495d0b
Binary files /dev/null and b/hmi/dev/ui/pics/settings_brightness_bar_blue_landscape.png differ
diff --git a/hmi/dev/ui/pics/settings_brightness_bar_blue_portrait.png b/hmi/dev/ui/pics/settings_brightness_bar_blue_portrait.png
new file mode 100644
index 00000000..87ec802b
Binary files /dev/null and b/hmi/dev/ui/pics/settings_brightness_bar_blue_portrait.png differ
diff --git a/hmi/dev/ui/pics/settings_brightness_bar_gray_landscape.png b/hmi/dev/ui/pics/settings_brightness_bar_gray_landscape.png
new file mode 100644
index 00000000..587ea349
Binary files /dev/null and b/hmi/dev/ui/pics/settings_brightness_bar_gray_landscape.png differ
diff --git a/hmi/dev/ui/pics/settings_brightness_bar_gray_portrait.png b/hmi/dev/ui/pics/settings_brightness_bar_gray_portrait.png
new file mode 100644
index 00000000..a84f8bae
Binary files /dev/null and b/hmi/dev/ui/pics/settings_brightness_bar_gray_portrait.png differ
diff --git a/hmi/dev/ui/us-white/1.png b/hmi/dev/ui/us-white/1.png
index b02ef99b..31d8c0b2 100644
Binary files a/hmi/dev/ui/us-white/1.png and b/hmi/dev/ui/us-white/1.png differ
diff --git a/hmi/dev/ui/us-white/10.png b/hmi/dev/ui/us-white/10.png
index 4b81b8ce..bec146f3 100644
Binary files a/hmi/dev/ui/us-white/10.png and b/hmi/dev/ui/us-white/10.png differ
diff --git a/hmi/dev/ui/us-white/11.png b/hmi/dev/ui/us-white/11.png
index 75d00fbb..abce7fa7 100644
Binary files a/hmi/dev/ui/us-white/11.png and b/hmi/dev/ui/us-white/11.png differ
diff --git a/hmi/dev/ui/us-white/12.png b/hmi/dev/ui/us-white/12.png
index 2551b7ab..047b52e3 100644
Binary files a/hmi/dev/ui/us-white/12.png and b/hmi/dev/ui/us-white/12.png differ
diff --git a/hmi/dev/ui/us-white/13.png b/hmi/dev/ui/us-white/13.png
index 30732c8e..4bd33be0 100644
Binary files a/hmi/dev/ui/us-white/13.png and b/hmi/dev/ui/us-white/13.png differ
diff --git a/hmi/dev/ui/us-white/14.png b/hmi/dev/ui/us-white/14.png
index 5ef7204f..20f5f44f 100644
Binary files a/hmi/dev/ui/us-white/14.png and b/hmi/dev/ui/us-white/14.png differ
diff --git a/hmi/dev/ui/us-white/15.png b/hmi/dev/ui/us-white/15.png
index da6de9c3..5fd8820c 100644
Binary files a/hmi/dev/ui/us-white/15.png and b/hmi/dev/ui/us-white/15.png differ
diff --git a/hmi/dev/ui/us-white/17.png b/hmi/dev/ui/us-white/17.png
index e1e28713..b4134c1b 100644
Binary files a/hmi/dev/ui/us-white/17.png and b/hmi/dev/ui/us-white/17.png differ
diff --git a/hmi/dev/ui/us-white/19.png b/hmi/dev/ui/us-white/19.png
index c06193e7..e1be901c 100644
Binary files a/hmi/dev/ui/us-white/19.png and b/hmi/dev/ui/us-white/19.png differ
diff --git a/hmi/dev/ui/us-white/2.png b/hmi/dev/ui/us-white/2.png
index 36306789..f90f5fc4 100644
Binary files a/hmi/dev/ui/us-white/2.png and b/hmi/dev/ui/us-white/2.png differ
diff --git a/hmi/dev/ui/us-white/20.png b/hmi/dev/ui/us-white/20.png
index 0cfb0a39..3dbc4d8e 100644
Binary files a/hmi/dev/ui/us-white/20.png and b/hmi/dev/ui/us-white/20.png differ
diff --git a/hmi/dev/ui/us-white/21.png b/hmi/dev/ui/us-white/21.png
index 06c929ca..23cfc7dd 100644
Binary files a/hmi/dev/ui/us-white/21.png and b/hmi/dev/ui/us-white/21.png differ
diff --git a/hmi/dev/ui/us-white/22.png b/hmi/dev/ui/us-white/22.png
index 0a94387b..e6c64648 100644
Binary files a/hmi/dev/ui/us-white/22.png and b/hmi/dev/ui/us-white/22.png differ
diff --git a/hmi/dev/ui/us-white/23.png b/hmi/dev/ui/us-white/23.png
index 0f142a7a..34c68fb4 100644
Binary files a/hmi/dev/ui/us-white/23.png and b/hmi/dev/ui/us-white/23.png differ
diff --git a/hmi/dev/ui/us-white/24.png b/hmi/dev/ui/us-white/24.png
index 1bc2e869..f6942e37 100644
Binary files a/hmi/dev/ui/us-white/24.png and b/hmi/dev/ui/us-white/24.png differ
diff --git a/hmi/dev/ui/us-white/25.png b/hmi/dev/ui/us-white/25.png
index 82eb0bef..9b4a6574 100644
Binary files a/hmi/dev/ui/us-white/25.png and b/hmi/dev/ui/us-white/25.png differ
diff --git a/hmi/dev/ui/us-white/26.png b/hmi/dev/ui/us-white/26.png
index 7702efc4..27cc518e 100644
Binary files a/hmi/dev/ui/us-white/26.png and b/hmi/dev/ui/us-white/26.png differ
diff --git a/hmi/dev/ui/us-white/27.png b/hmi/dev/ui/us-white/27.png
index 6927e646..5aa2d7d1 100644
Binary files a/hmi/dev/ui/us-white/27.png and b/hmi/dev/ui/us-white/27.png differ
diff --git a/hmi/dev/ui/us-white/28.png b/hmi/dev/ui/us-white/28.png
index 9c56cd2b..44eccb86 100644
Binary files a/hmi/dev/ui/us-white/28.png and b/hmi/dev/ui/us-white/28.png differ
diff --git a/hmi/dev/ui/us-white/29.png b/hmi/dev/ui/us-white/29.png
index fa7b396a..34227e70 100644
Binary files a/hmi/dev/ui/us-white/29.png and b/hmi/dev/ui/us-white/29.png differ
diff --git a/hmi/dev/ui/us-white/3.png b/hmi/dev/ui/us-white/3.png
index 314a3052..dbed60fb 100644
Binary files a/hmi/dev/ui/us-white/3.png and b/hmi/dev/ui/us-white/3.png differ
diff --git a/hmi/dev/ui/us-white/32.png b/hmi/dev/ui/us-white/32.png
index 31ac75bb..1ac257b7 100644
Binary files a/hmi/dev/ui/us-white/32.png and b/hmi/dev/ui/us-white/32.png differ
diff --git a/hmi/dev/ui/us-white/33.png b/hmi/dev/ui/us-white/33.png
index 1879ca9c..e15a037f 100644
Binary files a/hmi/dev/ui/us-white/33.png and b/hmi/dev/ui/us-white/33.png differ
diff --git a/hmi/dev/ui/us-white/34.png b/hmi/dev/ui/us-white/34.png
index a8b0c98c..b307a2b0 100644
Binary files a/hmi/dev/ui/us-white/34.png and b/hmi/dev/ui/us-white/34.png differ
diff --git a/hmi/dev/ui/us-white/37.png b/hmi/dev/ui/us-white/37.png
index e2acdcf5..2d1faea4 100644
Binary files a/hmi/dev/ui/us-white/37.png and b/hmi/dev/ui/us-white/37.png differ
diff --git a/hmi/dev/ui/us-white/39.png b/hmi/dev/ui/us-white/39.png
index cb43956f..134f06ec 100644
Binary files a/hmi/dev/ui/us-white/39.png and b/hmi/dev/ui/us-white/39.png differ
diff --git a/hmi/dev/ui/us-white/4.png b/hmi/dev/ui/us-white/4.png
index a4bd95df..f790121c 100644
Binary files a/hmi/dev/ui/us-white/4.png and b/hmi/dev/ui/us-white/4.png differ
diff --git a/hmi/dev/ui/us-white/40.png b/hmi/dev/ui/us-white/40.png
index 45d7a0fc..620e5d23 100644
Binary files a/hmi/dev/ui/us-white/40.png and b/hmi/dev/ui/us-white/40.png differ
diff --git a/hmi/dev/ui/us-white/46.png b/hmi/dev/ui/us-white/46.png
index 9da98062..edf09c78 100644
Binary files a/hmi/dev/ui/us-white/46.png and b/hmi/dev/ui/us-white/46.png differ
diff --git a/hmi/dev/ui/us-white/47.png b/hmi/dev/ui/us-white/47.png
index 064a3133..6ff7ac13 100644
Binary files a/hmi/dev/ui/us-white/47.png and b/hmi/dev/ui/us-white/47.png differ
diff --git a/hmi/dev/ui/us-white/5.png b/hmi/dev/ui/us-white/5.png
index 42ae4bc0..7af4ab57 100644
Binary files a/hmi/dev/ui/us-white/5.png and b/hmi/dev/ui/us-white/5.png differ
diff --git a/hmi/dev/ui/us-white/6.png b/hmi/dev/ui/us-white/6.png
index 4741e0b9..beee2292 100644
Binary files a/hmi/dev/ui/us-white/6.png and b/hmi/dev/ui/us-white/6.png differ
diff --git a/hmi/dev/ui/us-white/7.png b/hmi/dev/ui/us-white/7.png
index a1f634fd..5768d34b 100644
Binary files a/hmi/dev/ui/us-white/7.png and b/hmi/dev/ui/us-white/7.png differ
diff --git a/hmi/dev/ui/us-white/8.png b/hmi/dev/ui/us-white/8.png
index 2a66d9b9..d6ae4755 100644
Binary files a/hmi/dev/ui/us-white/8.png and b/hmi/dev/ui/us-white/8.png differ
diff --git a/hmi/dev/ui/us-white/9.png b/hmi/dev/ui/us-white/9.png
index e5588c6f..5181227c 100644
Binary files a/hmi/dev/ui/us-white/9.png and b/hmi/dev/ui/us-white/9.png differ
diff --git a/hmi/dev/ui/us/1.png b/hmi/dev/ui/us/1.png
index c63f2818..5b5fc674 100644
Binary files a/hmi/dev/ui/us/1.png and b/hmi/dev/ui/us/1.png differ
diff --git a/hmi/dev/ui/us/10.png b/hmi/dev/ui/us/10.png
index f0cf4d00..4872e320 100644
Binary files a/hmi/dev/ui/us/10.png and b/hmi/dev/ui/us/10.png differ
diff --git a/hmi/dev/ui/us/11.png b/hmi/dev/ui/us/11.png
index f1c2a861..1e4c3380 100644
Binary files a/hmi/dev/ui/us/11.png and b/hmi/dev/ui/us/11.png differ
diff --git a/hmi/dev/ui/us/12.png b/hmi/dev/ui/us/12.png
index 38556af6..1f7b87e2 100644
Binary files a/hmi/dev/ui/us/12.png and b/hmi/dev/ui/us/12.png differ
diff --git a/hmi/dev/ui/us/13.png b/hmi/dev/ui/us/13.png
index dc8e74e2..e47b9dac 100644
Binary files a/hmi/dev/ui/us/13.png and b/hmi/dev/ui/us/13.png differ
diff --git a/hmi/dev/ui/us/14.png b/hmi/dev/ui/us/14.png
index 00a8d44d..388255e0 100644
Binary files a/hmi/dev/ui/us/14.png and b/hmi/dev/ui/us/14.png differ
diff --git a/hmi/dev/ui/us/15.png b/hmi/dev/ui/us/15.png
index f2af406a..e33b4903 100644
Binary files a/hmi/dev/ui/us/15.png and b/hmi/dev/ui/us/15.png differ
diff --git a/hmi/dev/ui/us/17.png b/hmi/dev/ui/us/17.png
index aaaf83d3..081b692c 100644
Binary files a/hmi/dev/ui/us/17.png and b/hmi/dev/ui/us/17.png differ
diff --git a/hmi/dev/ui/us/19.png b/hmi/dev/ui/us/19.png
index bff8c419..c4a3214f 100644
Binary files a/hmi/dev/ui/us/19.png and b/hmi/dev/ui/us/19.png differ
diff --git a/hmi/dev/ui/us/2.png b/hmi/dev/ui/us/2.png
index 0d3d7126..491c0d04 100644
Binary files a/hmi/dev/ui/us/2.png and b/hmi/dev/ui/us/2.png differ
diff --git a/hmi/dev/ui/us/20.png b/hmi/dev/ui/us/20.png
index cf161600..6165b795 100644
Binary files a/hmi/dev/ui/us/20.png and b/hmi/dev/ui/us/20.png differ
diff --git a/hmi/dev/ui/us/21.png b/hmi/dev/ui/us/21.png
index 898a3724..1ebc2dcf 100644
Binary files a/hmi/dev/ui/us/21.png and b/hmi/dev/ui/us/21.png differ
diff --git a/hmi/dev/ui/us/22.png b/hmi/dev/ui/us/22.png
index e03cdaaa..b8d3d972 100644
Binary files a/hmi/dev/ui/us/22.png and b/hmi/dev/ui/us/22.png differ
diff --git a/hmi/dev/ui/us/23.png b/hmi/dev/ui/us/23.png
index 5bfd5ec4..828e99bf 100644
Binary files a/hmi/dev/ui/us/23.png and b/hmi/dev/ui/us/23.png differ
diff --git a/hmi/dev/ui/us/24.png b/hmi/dev/ui/us/24.png
index 284ea00e..c7730246 100644
Binary files a/hmi/dev/ui/us/24.png and b/hmi/dev/ui/us/24.png differ
diff --git a/hmi/dev/ui/us/25.png b/hmi/dev/ui/us/25.png
index 95446c71..95b17d49 100644
Binary files a/hmi/dev/ui/us/25.png and b/hmi/dev/ui/us/25.png differ
diff --git a/hmi/dev/ui/us/26.png b/hmi/dev/ui/us/26.png
index c4ffaad7..dc980f9c 100644
Binary files a/hmi/dev/ui/us/26.png and b/hmi/dev/ui/us/26.png differ
diff --git a/hmi/dev/ui/us/27.png b/hmi/dev/ui/us/27.png
index e7b8e215..2a1d8c49 100644
Binary files a/hmi/dev/ui/us/27.png and b/hmi/dev/ui/us/27.png differ
diff --git a/hmi/dev/ui/us/28.png b/hmi/dev/ui/us/28.png
index af700984..2103ed9c 100644
Binary files a/hmi/dev/ui/us/28.png and b/hmi/dev/ui/us/28.png differ
diff --git a/hmi/dev/ui/us/29.png b/hmi/dev/ui/us/29.png
index abcb24ce..bea77fe9 100644
Binary files a/hmi/dev/ui/us/29.png and b/hmi/dev/ui/us/29.png differ
diff --git a/hmi/dev/ui/us/3.png b/hmi/dev/ui/us/3.png
index e47a49ed..697d9983 100644
Binary files a/hmi/dev/ui/us/3.png and b/hmi/dev/ui/us/3.png differ
diff --git a/hmi/dev/ui/us/32.png b/hmi/dev/ui/us/32.png
index 9e7ec58c..804cf3eb 100644
Binary files a/hmi/dev/ui/us/32.png and b/hmi/dev/ui/us/32.png differ
diff --git a/hmi/dev/ui/us/33.png b/hmi/dev/ui/us/33.png
index e378105c..58959765 100644
Binary files a/hmi/dev/ui/us/33.png and b/hmi/dev/ui/us/33.png differ
diff --git a/hmi/dev/ui/us/34.png b/hmi/dev/ui/us/34.png
index 7312510a..4e7a4a3e 100644
Binary files a/hmi/dev/ui/us/34.png and b/hmi/dev/ui/us/34.png differ
diff --git a/hmi/dev/ui/us/37.png b/hmi/dev/ui/us/37.png
index 29c65690..df5ac956 100644
Binary files a/hmi/dev/ui/us/37.png and b/hmi/dev/ui/us/37.png differ
diff --git a/hmi/dev/ui/us/39.png b/hmi/dev/ui/us/39.png
index 67da7bba..59d17e78 100644
Binary files a/hmi/dev/ui/us/39.png and b/hmi/dev/ui/us/39.png differ
diff --git a/hmi/dev/ui/us/4.png b/hmi/dev/ui/us/4.png
index 40dff22c..48cd486b 100644
Binary files a/hmi/dev/ui/us/4.png and b/hmi/dev/ui/us/4.png differ
diff --git a/hmi/dev/ui/us/40.png b/hmi/dev/ui/us/40.png
index 6b3b4810..11bf08a6 100644
Binary files a/hmi/dev/ui/us/40.png and b/hmi/dev/ui/us/40.png differ
diff --git a/hmi/dev/ui/us/46.png b/hmi/dev/ui/us/46.png
index 5051b7bf..9633c771 100644
Binary files a/hmi/dev/ui/us/46.png and b/hmi/dev/ui/us/46.png differ
diff --git a/hmi/dev/ui/us/47.png b/hmi/dev/ui/us/47.png
index 285adcaf..395d31c1 100644
Binary files a/hmi/dev/ui/us/47.png and b/hmi/dev/ui/us/47.png differ
diff --git a/hmi/dev/ui/us/5.png b/hmi/dev/ui/us/5.png
index 9021d4d9..fa7ab5de 100644
Binary files a/hmi/dev/ui/us/5.png and b/hmi/dev/ui/us/5.png differ
diff --git a/hmi/dev/ui/us/6.png b/hmi/dev/ui/us/6.png
index 51e014f3..449afe13 100644
Binary files a/hmi/dev/ui/us/6.png and b/hmi/dev/ui/us/6.png differ
diff --git a/hmi/dev/ui/us/7.png b/hmi/dev/ui/us/7.png
index 9757f807..8f560dbc 100644
Binary files a/hmi/dev/ui/us/7.png and b/hmi/dev/ui/us/7.png differ
diff --git a/hmi/dev/ui/us/8.png b/hmi/dev/ui/us/8.png
index dc087f38..63d9243e 100644
Binary files a/hmi/dev/ui/us/8.png and b/hmi/dev/ui/us/8.png differ
diff --git a/hmi/dev/ui/us/9.png b/hmi/dev/ui/us/9.png
index fc674d5a..66e65d8d 100644
Binary files a/hmi/dev/ui/us/9.png and b/hmi/dev/ui/us/9.png differ
diff --git a/hmi/dev/ui/us/NSPanel - US.pptx b/hmi/dev/ui/us/NSPanel - US.pptx
index baa032ab..3538ec83 100644
Binary files a/hmi/dev/ui/us/NSPanel - US.pptx and b/hmi/dev/ui/us/NSPanel - US.pptx differ
diff --git a/hmi/nspanel_eu.HMI b/hmi/nspanel_eu.HMI
index d446845c..0dbdd82f 100644
Binary files a/hmi/nspanel_eu.HMI and b/hmi/nspanel_eu.HMI differ
diff --git a/hmi/nspanel_eu.tft b/hmi/nspanel_eu.tft
index d237a641..62090f67 100644
Binary files a/hmi/nspanel_eu.tft and b/hmi/nspanel_eu.tft differ
diff --git a/hmi/nspanel_us.HMI b/hmi/nspanel_us.HMI
index 6752da34..7c04f7d5 100644
Binary files a/hmi/nspanel_us.HMI and b/hmi/nspanel_us.HMI differ
diff --git a/hmi/nspanel_us.tft b/hmi/nspanel_us.tft
index 63c07673..5b73f06e 100644
Binary files a/hmi/nspanel_us.tft and b/hmi/nspanel_us.tft differ
diff --git a/hmi/nspanel_us_land.HMI b/hmi/nspanel_us_land.HMI
index 265b836b..3b3d011c 100644
Binary files a/hmi/nspanel_us_land.HMI and b/hmi/nspanel_us_land.HMI differ
diff --git a/hmi/nspanel_us_land.tft b/hmi/nspanel_us_land.tft
index c2922552..38b57516 100644
Binary files a/hmi/nspanel_us_land.tft and b/hmi/nspanel_us_land.tft differ
diff --git a/nspanel_easy_blueprint.yaml b/nspanel_easy_blueprint.yaml
index 4e3d7dc6..81f7e449 100644
--- a/nspanel_easy_blueprint.yaml
+++ b/nspanel_easy_blueprint.yaml
@@ -6,7 +6,7 @@
 ##################################################################################################
 ---
 blueprint:
-  name: NSPanel Easy Configuration (v2026.4.2)
+  name: NSPanel Easy Configuration (v9999.99.9)
   author: Edward Firmo (https://github.com/edwardtfn)
   description: >
     # NSPanel Easy Configuration via Blueprint
@@ -4211,7 +4211,7 @@ trigger_variables:
     }}
 
 variables:
-  blueprint_version: 2026.4.2
+  blueprint_version: 9999.99.9
   pages:
     current: '{{ states(currentpage) }}'
     alarm: "alarm"