Bump version to 2025.7.2 [skip-versioning]

Merge pull request #116 from MorghusDragon/fix-incorrect-multitouch-trigger-when-swiping
Fix incorrect triggering of multitouch event when swiping
2025-07-29 12:54:52 +00:00 · 2025-07-29 14:54:39 +02:00 · 2025-07-29 20:58:44 +12:00 · 2025-07-09 22:42:27 +00:00 · 2025-07-10 00:42:19 +02:00 · 2025-07-10 00:29:34 +02:00
46 changed files with 778 additions and 836 deletions
--- a/.github/workflows/validate_esphome.yml
+++ b/.github/workflows/validate_esphome.yml
@@ -55,18 +55,6 @@ jobs:
          yaml-file: ".test/esphome_idf_core.yaml"
          version: latest

-  build_idf53_core:
-    name: Core (IDF v5.3)
-    needs: code_scan
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build Core (IDF v5.3)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_idf53_core.yaml"
-          version: latest
-
  build_ard_basic:
    name: Basic (Arduino)
    needs: build_ard_core
@@ -91,18 +79,6 @@ jobs:
          yaml-file: ".test/esphome_idf_basic.yaml"
          version: latest

-  build_idf53_basic:
-    name: Basic (IDF v5.3)
-    needs: build_idf53_core
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build Basic (IDF v5.3)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_idf53_basic.yaml"
-          version: latest
-
  build_ard_hw_relays:
    name: HW Relays (Arduino)
    needs: build_ard_core
@@ -127,18 +103,6 @@ jobs:
          yaml-file: ".test/esphome_idf_hw_relays.yaml"
          version: latest

-  build_idf53_hw_relays:
-    name: HW Relays (IDF v5.3)
-    needs: build_idf53_core
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build HW Relays (IDF v5.3)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_idf53_hw_relays.yaml"
-          version: latest
-
  build_ard_hw_speaker:
    name: HW Speaker (Arduino)
    needs: build_ard_core
@@ -163,18 +127,6 @@ jobs:
          yaml-file: ".test/esphome_idf_hw_speaker.yaml"
          version: latest

-  build_idf53_hw_speaker:
-    name: HW Speaker (IDF v5.3)
-    needs: build_idf53_core
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build HW Speaker (IDF v5.3)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_idf53_hw_speaker.yaml"
-          version: latest
-
  build_ard_hw_vibration:
    name: HW Vibration (Arduino)
    needs: build_ard_core
@@ -199,18 +151,6 @@ jobs:
          yaml-file: ".test/esphome_idf_hw_vibration.yaml"
          version: latest

-  build_idf53_hw_vibration:
-    name: HW Vibration (IDF v5.3)
-    needs: build_idf53_core
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build HW Vibration (IDF v5.3)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_idf53_hw_vibration.yaml"
-          version: latest
-
  build_ard_ble_proxy:
    name: Bluetooth Proxy (Ard)
    needs: build_ard_basic
@@ -235,18 +175,6 @@ jobs:
          yaml-file: ".test/esphome_idf_ble_proxy.yaml"
          version: latest

-  build_idf53_ble_proxy:
-    name: Bluetooth Proxy (IDF v5.3)
-    needs: build_idf53_basic
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build BLE Proxy (IDF v5.3)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_idf53_ble_proxy.yaml"
-          version: latest
-
  build_ard_media_player:
    name: Media Player (Ard)
    needs:
--- a/.github/workflows/validate_esphome_beta.yml
+++ b/.github/workflows/validate_esphome_beta.yml
@@ -8,10 +8,22 @@ permissions:
 on:  # yamllint disable-line rule:truthy
  push:
    paths:
-      - "**/*.{yml,yaml,h,cpp,c,py}"  # Match any file with the extensions in any directory
+      - "**/*.yml"
+      - "**/*.yaml"
+      - "**/*.h"
+      - "**/*.cpp"
+      - "**/*.c"
+      - "**/*.py"
+
  pull_request:
    paths:
-      - "**/*.{yml,yaml,h,cpp,c,py}"  # Match any file with the extensions in any directory
+      - "**/*.yml"
+      - "**/*.yaml"
+      - "**/*.h"
+      - "**/*.cpp"
+      - "**/*.c"
+      - "**/*.py"
+
  workflow_dispatch:

 concurrency:
@@ -61,18 +73,6 @@ jobs:
          yaml-file: ".test/esphome_idf_core.yaml"
          version: beta

-  build_idf53_core:
-    name: Core (IDF v5.3)
-    needs: code_scan
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build Core (IDF v5.3)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_idf53_core.yaml"
-          version: beta
-
  build_ard_basic:
    name: Basic (Arduino)
    needs: build_ard_core
@@ -97,18 +97,6 @@ jobs:
          yaml-file: ".test/esphome_idf_basic.yaml"
          version: beta

-  build_idf53_basic:
-    name: Basic (IDF v5.3)
-    needs: build_idf53_core
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build Basic (IDF v5.3)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_idf53_basic.yaml"
-          version: beta
-
  build_ard_hw_relays:
    name: HW Relays (Arduino)
    needs: build_ard_core
@@ -133,18 +121,6 @@ jobs:
          yaml-file: ".test/esphome_idf_hw_relays.yaml"
          version: beta

-  build_idf53_hw_relays:
-    name: HW Relays (IDF v5.3)
-    needs: build_idf53_core
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build HW Relays (IDF v5.3)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_idf53_hw_relays.yaml"
-          version: beta
-
  build_ard_hw_speaker:
    name: HW Speaker (Arduino)
    needs: build_ard_core
@@ -169,18 +145,6 @@ jobs:
          yaml-file: ".test/esphome_idf_hw_speaker.yaml"
          version: beta

-  build_idf53_hw_speaker:
-    name: HW Speaker (IDF v5.3)
-    needs: build_idf53_core
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build HW Speaker (IDF v5.3)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_idf53_hw_speaker.yaml"
-          version: beta
-
  build_ard_hw_vibration:
    name: HW Vibration (Arduino)
    needs: build_ard_core
@@ -205,18 +169,6 @@ jobs:
          yaml-file: ".test/esphome_idf_hw_vibration.yaml"
          version: beta

-  build_idf53_hw_vibration:
-    name: HW Vibration (IDF v5.3)
-    needs: build_idf53_core
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build HW Vibration (IDF v5.3)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_idf53_hw_vibration.yaml"
-          version: beta
-
  build_ard_ble_proxy:
    name: Bluetooth Proxy (Ard)
    needs: build_ard_basic
@@ -241,18 +193,6 @@ jobs:
          yaml-file: ".test/esphome_idf_ble_proxy.yaml"
          version: beta

-  build_idf53_ble_proxy:
-    name: Bluetooth Proxy (IDF v5.3)
-    needs: build_idf53_basic
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build BLE Proxy (IDF v5.3)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_idf53_ble_proxy.yaml"
-          version: beta
-
  build_ard_media_player:
    name: Media Player (Ard)
    needs:
--- a/.github/workflows/validate_markdown.yml
+++ b/.github/workflows/validate_markdown.yml
@@ -17,23 +17,28 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Check out code
-        uses: actions/checkout@main
+        uses: actions/checkout@v4
        with:
-          fetch-depth: '0'
+          fetch-depth: 0  # Ensures full commit history for diff

-      # https://github.com/marketplace/actions/markdownlint-cli2-action
      - name: Identify changed files
-        uses: tj-actions/changed-files@v41
        id: changed-files
-        with:
-          files: '**/*.md'
-          separator: ","
-      # https://github.com/marketplace/actions/markdownlint-cli2-action
+        run: |
+          BASE=${{ github.event.before }}
+          HEAD=${{ github.sha }}
+          FILES=$(git diff --name-only $BASE $HEAD -- '**/*.md' | tr '\n' ',')
+          echo "changed_files=$FILES" >> $GITHUB_ENV
+          if [[ -n "$FILES" ]]; then
+            echo "any_changed=true" >> $GITHUB_ENV
+          else
+            echo "any_changed=false" >> $GITHUB_ENV
+          fi
+
      - name: Markdown Lint
        uses: DavidAnson/markdownlint-cli2-action@v14
-        if: steps.changed-files.outputs.any_changed == 'true'
+        if: env.any_changed == 'true'
        with:
-          globs: ${{ steps.changed-files.outputs.all_changed_files }}
+          globs: ${{ env.changed_files }}
          separator: ","
          config: '.rules/.markdownlint.jsonc'
          fix: true
@@ -43,15 +48,27 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Check out code
-        uses: actions/checkout@main
+        uses: actions/checkout@v4
        with:
-          fetch-depth: '0'
+          fetch-depth: 0
+
+      - name: Identify changed files
+        id: changed-files
+        run: |
+          BASE=${{ github.event.before }}
+          HEAD=${{ github.sha }}
+          FILES=$(git diff --name-only $BASE $HEAD -- '**/*.md' | tr '\n' ',')
+          echo "changed_files=$FILES" >> $GITHUB_ENV
+          if [[ -n "$FILES" ]]; then
+            echo "any_changed=true" >> $GITHUB_ENV
+          else
+            echo "any_changed=false" >> $GITHUB_ENV
+          fi

-      # https://github.com/gaurav-nelson/github-action-markdown-link-check
      - name: Markdown links
        uses: gaurav-nelson/github-action-markdown-link-check@v1
+        if: env.any_changed == 'true'
        with:
-          # yamllint disable-line rule:truthy
          check-modified-files-only: yes
          config-file: '.rules/mlc_config.json'
          base-branch: 'main'
--- a/.github/workflows/validate_yamllint.yml
+++ b/.github/workflows/validate_yamllint.yml
@@ -19,24 +19,29 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Check out code
-        uses: actions/checkout@main
+        uses: actions/checkout@v4
        with:
-          fetch-depth: '0'
+          fetch-depth: 0  # Ensures full commit history for diff

      - name: Identify changed files
-        uses: tj-actions/changed-files@v41
        id: changed-files
-        with:
-          files: '**/*.y*ml'
-          separator: ","
+        run: |
+          BASE=${{ github.event.before }}
+          HEAD=${{ github.sha }}
+          FILES=$(git diff --name-only $BASE $HEAD -- '**/*.yml' '**/*.yaml' | tr '\n' ',')
+          echo "changed_files=$FILES" >> $GITHUB_ENV
+          if [[ -n "$FILES" ]]; then
+            echo "any_changed=true" >> $GITHUB_ENV
+          else
+            echo "any_changed=false" >> $GITHUB_ENV
+          fi

      - name: Validate YAML
-        if: steps.changed-files.outputs.any_changed == 'true'
+        if: env.any_changed == 'true'
        run: |
-          IFS=',' read -ra FILES <<< "${{ steps.changed-files.outputs.all_changed_files }}"
+          IFS=',' read -ra FILES <<< "${{ env.changed_files }}"
          for file in "${FILES[@]}"; do
-            if [[ "$file" =~ ^*\.yaml$ ]] || \
-              [[ "$file" =~ ^ESPHome/*\.yaml$ ]]; then
+            if [[ "$file" =~ ^.*\.yaml$ ]] || [[ "$file" =~ ^ESPHome/.*\.yaml$ ]]; then
              echo "Skipping $file"
              continue
            fi
--- a/.github/workflows/versioning.yml
+++ b/.github/workflows/versioning.yml
@@ -4,7 +4,6 @@
 # 2. Manual dispatch - allows independent control over stable and latest tags

 ---
-
 name: Version and Tags

 on:  # yamllint disable-line rule:truthy
@@ -56,10 +55,9 @@ jobs:

      - name: Update stable tag
        if: |
-          success() && (
-            github.event_name == 'workflow_dispatch' && inputs.update_stable ||
-            github.event_name == 'push'
-          )
+          success() &&
+          github.event_name == 'workflow_dispatch' &&
+          inputs.update_stable
        run: |
          # Verify version bump was successful
          if [ ! -f "./versioning/VERSION" ]; then
--- a/.test/common.yaml
+++ b/.test/common.yaml
@@ -0,0 +1,5 @@
+---
+wifi:
+  ssid: !secret wifi_ssid
+  password: !secret wifi_password
+...
--- a/.test/common_ard.yaml
+++ b/.test/common_ard.yaml
@@ -0,0 +1,8 @@
+---
+packages:
+  common: !include common.yaml
+
+esp32:
+  framework:
+    type: arduino
+...
--- a/.test/common_idf.yaml
+++ b/.test/common_idf.yaml
@@ -0,0 +1,18 @@
+---
+packages:
+  common: !include common.yaml
+
+esp32:
+  framework:
+    type: esp-idf
+
+light:
+  - id: !extend light_full
+    platform: esp32_rmt_led_strip
+    rgb_order: GRB
+    chipset: ws2812
+    max_refresh_rate: 33ms
+    use_psram: false
+    type: !remove
+    variant: !remove
+...
--- a/.test/common_idf53.yaml
+++ b/.test/common_idf53.yaml
@@ -0,0 +1,10 @@
+---
+packages:
+  common_idf: !include common_idf.yaml
+
+esp32:
+  framework:
+    type: esp-idf
+    version: 5.3.1
+    platform_version: 6.9.0
+...
--- a/.test/esphome_ard_basic.yaml
+++ b/.test/esphome_ard_basic.yaml
@@ -1,13 +1,6 @@
 ---
 packages:
+  common_arduino: !include common_ard.yaml
  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
  standard_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml
-
-esp32:
-  framework:
-    type: arduino
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...
--- a/.test/esphome_ard_ble_proxy.yaml
+++ b/.test/esphome_ard_ble_proxy.yaml
@@ -1,14 +1,7 @@
 ---
 packages:
+  common_arduino: !include common_ard.yaml
  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
  standard_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml
  addon_bluetooth_proxy: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_addon_ble_proxy.yaml
-
-esp32:
-  framework:
-    type: arduino
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...
--- a/.test/esphome_ard_core.yaml
+++ b/.test/esphome_ard_core.yaml
@@ -1,12 +1,5 @@
 ---
 packages:
+  common_arduino: !include common_ard.yaml
  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
-
-esp32:
-  framework:
-    type: arduino
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...
--- a/.test/esphome_ard_hw_relays.yaml
+++ b/.test/esphome_ard_hw_relays.yaml
@@ -1,13 +1,6 @@
 ---
 packages:
+  common_arduino: !include common_ard.yaml
  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
  standard_hw_relays_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_relays.yaml
-
-esp32:
-  framework:
-    type: arduino
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...
--- a/.test/esphome_ard_hw_speaker.yaml
+++ b/.test/esphome_ard_hw_speaker.yaml
@@ -1,13 +1,6 @@
 ---
 packages:
+  common_arduino: !include common_ard.yaml
  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
  standard_hw_speaker_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_speaker.yaml
-
-esp32:
-  framework:
-    type: arduino
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...
--- a/.test/esphome_ard_hw_vibration.yaml
+++ b/.test/esphome_ard_hw_vibration.yaml
@@ -1,13 +1,6 @@
 ---
 packages:
+  common_arduino: !include common_ard.yaml
  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
  standard_hw_vibration_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_vibration.yaml
-
-esp32:
-  framework:
-    type: arduino
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...
--- a/.test/esphome_ard_media_player.yaml
+++ b/.test/esphome_ard_media_player.yaml
@@ -1,15 +1,8 @@
 ---
 packages:
+  common_arduino: !include common_ard.yaml
  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
  standard_hw_relays_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_relays.yaml
  standard_hw_vibration_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_vibration.yaml
  addon_media_player: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_addon_media_player.yaml
-
-esp32:
-  framework:
-    type: arduino
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...
--- a/.test/esphome_idf53_basic.yaml
+++ b/.test/esphome_idf53_basic.yaml
@@ -1,15 +0,0 @@
---
-packages:
-  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
-  standard_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml
-
-esp32:
-  framework:
-    type: esp-idf
-    version: 5.3.1
-    platform_version: 6.9.0
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
-...
--- a/.test/esphome_idf53_ble_proxy.yaml
+++ b/.test/esphome_idf53_ble_proxy.yaml
@@ -1,16 +0,0 @@
---
-packages:
-  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
-  standard_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml
-  addon_bluetooth_proxy: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_addon_ble_proxy.yaml
-
-esp32:
-  framework:
-    type: esp-idf
-    version: 5.3.1
-    platform_version: 6.9.0
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
-...
--- a/.test/esphome_idf53_core.yaml
+++ b/.test/esphome_idf53_core.yaml
@@ -1,14 +0,0 @@
---
-packages:
-  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
-
-esp32:
-  framework:
-    type: esp-idf
-    version: 5.3.1
-    platform_version: 6.9.0
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
-...
--- a/.test/esphome_idf53_hw_relays.yaml
+++ b/.test/esphome_idf53_hw_relays.yaml
@@ -1,15 +0,0 @@
---
-packages:
-  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
-  standard_hw_relays_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_relays.yaml
-
-esp32:
-  framework:
-    type: esp-idf
-    version: 5.3.1
-    platform_version: 6.9.0
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
-...
--- a/.test/esphome_idf53_hw_speaker.yaml
+++ b/.test/esphome_idf53_hw_speaker.yaml
@@ -1,15 +0,0 @@
---
-packages:
-  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
-  standard_hw_speaker_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_speaker.yaml
-
-esp32:
-  framework:
-    type: esp-idf
-    version: 5.3.1
-    platform_version: 6.9.0
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
-...
--- a/.test/esphome_idf53_hw_vibration.yaml
+++ b/.test/esphome_idf53_hw_vibration.yaml
@@ -1,15 +0,0 @@
---
-packages:
-  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
-  standard_hw_vibration_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_vibration.yaml
-
-esp32:
-  framework:
-    type: esp-idf
-    version: 5.3.1
-    platform_version: 6.9.0
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
-...
--- a/.test/esphome_idf_basic.yaml
+++ b/.test/esphome_idf_basic.yaml
@@ -1,13 +1,11 @@
 ---
 packages:
+  common_idf: !include common_idf.yaml
  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
  standard_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml

-esp32:
-  framework:
-    type: esp-idf
+media_player: !remove

-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
+switch:
+  - id: !remove sw_speaker_amplifier
 ...
--- a/.test/esphome_idf_ble_proxy.yaml
+++ b/.test/esphome_idf_ble_proxy.yaml
@@ -1,14 +1,7 @@
 ---
 packages:
+  common: !include common.yaml
  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
  standard_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml
  addon_bluetooth_proxy: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_addon_ble_proxy.yaml
-
-esp32:
-  framework:
-    type: esp-idf
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...
--- a/.test/esphome_idf_core.yaml
+++ b/.test/esphome_idf_core.yaml
@@ -1,12 +1,5 @@
 ---
 packages:
+  common_idf: !include common_idf.yaml
  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
-
-esp32:
-  framework:
-    type: esp-idf
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...
--- a/.test/esphome_idf_hw_relays.yaml
+++ b/.test/esphome_idf_hw_relays.yaml
@@ -1,13 +1,6 @@
 ---
 packages:
+  common_idf: !include common_idf.yaml
  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
  standard_hw_relays_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_relays.yaml
-
-esp32:
-  framework:
-    type: esp-idf
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...
--- a/.test/esphome_idf_hw_speaker.yaml
+++ b/.test/esphome_idf_hw_speaker.yaml
@@ -1,13 +1,6 @@
 ---
 packages:
+  common_idf: !include common_idf.yaml
  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
  standard_hw_speaker_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_speaker.yaml
-
-esp32:
-  framework:
-    type: esp-idf
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...
--- a/.test/esphome_idf_hw_vibration.yaml
+++ b/.test/esphome_idf_hw_vibration.yaml
@@ -1,13 +1,6 @@
 ---
 packages:
+  common_idf: !include common_idf.yaml
  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
  standard_hw_vibration_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_vibration.yaml
-
-esp32:
-  framework:
-    type: esp-idf
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...
--- a/Assets/Logo_dark.png
+++ b/Assets/Logo_dark.png
--- a/Assets/Logo_dark.webp
+++ b/Assets/Logo_dark.webp
--- a/Assets/Logo_light.png
+++ b/Assets/Logo_light.png
--- a/ESPHome/TX-Ultimate-Easy-ESPHome.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome.yaml
@@ -0,0 +1,19 @@
+####################################################################################################
+#####                              TX Ultimate Easy for ESPHome                                #####
+#####                  Repository: https://github.com/edwardtfn/TX-Ultimate-Easy               #####
+####################################################################################################
+##### Purpose: ESPHome Basic (includes core plus non-essential, but recommended packages)      #####
+####################################################################################################
+##### Author: edwardtfn - https://github.com/edwardtfn - https://buymeacoffee.com/edwardfirmo  #####
+####################################################################################################
+##### NOTE:                                                                                    #####
+##### - Make changes ONLY if absolutely necessary and you have the required knowledge.         #####
+##### - For normal system use, modifications to this file are NOT required.                    #####
+####################################################################################################
+---
+packages:
+  # yamllint disable rule:colons
+  core:     !include TX-Ultimate-Easy-ESPHome_core.yaml
+  standard: !include TX-Ultimate-Easy-ESPHome_standard.yaml
+  # yamllint enable rule:colons
+...
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_addon_ble_proxy.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_addon_ble_proxy.yaml
@@ -11,13 +11,35 @@
 ##### - For normal system use, modifications to this file are NOT required.                    #####
 ####################################################################################################
 ---
+packages:
+  standard_hw_speaker: !include TX-Ultimate-Easy-ESPHome_standard_hw_speaker.yaml
+
 bluetooth_proxy:

+esp32:
+  framework:
+    type: esp-idf
+
 esphome:
  platformio_options:
    build_flags:
      - -D TX_ULTIMATE_EASY_ADDON_BLE_PROXY

+i2s_audio: !remove
+
+light:
+  - id: !extend light_full
+    platform: esp32_rmt_led_strip
+    rgb_order: GRB
+    # rmt_channel: 1  # Not supported with IDF 5
+    chipset: ws2812
+    max_refresh_rate: 33ms
+    use_psram: false
+    type: !remove
+    variant: !remove
+
+media_player: !remove
+
 script:
  - id: !extend dump_config_list_packages
    then:
@@ -30,4 +52,7 @@ script:

          // Identify itself
          ESP_LOGCONFIG(ESPHOME_PROJECT_NAME, "  - Add-on - BLE Proxy");
+
+switch:
+  - id: !remove sw_speaker_amplifier
 ...
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
@@ -11,312 +11,11 @@
 ##### - For normal system use, modifications to this file are NOT required.                    #####
 ####################################################################################################
 ---
-substitutions:
-  name: tx-ultimate-easy
-  friendly_name: TX Ultimate Easy
-
-  <<: !include ../versioning/VERSION_YAML
-
-  TX_MODEL_FORMAT_EU_TEXT: "EU (Square, T5-xC-86)"
-  TX_MODEL_FORMAT_US_TEXT: "US (Rectangle, T5-xC-120)"
-
-  TX_MODEL_1_GANG_TEXT: "1 Gang"
-  TX_MODEL_2_GANG_TEXT: "2 Gang"
-  TX_MODEL_3_GANG_TEXT: "3 Gang"
-  TX_MODEL_4_GANG_TEXT: "4 Gang"
-
-  DUMP_CONFIG_CALLER_DELAY: 10s  # Delay to dump config after requested
-
 packages:
  # yamllint disable rule:colons
+  core_common:     !include TX-Ultimate-Easy-ESPHome_core_common.yaml
  core_hw_buttons: !include TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml
  core_hw_leds:    !include TX-Ultimate-Easy-ESPHome_core_hw_leds.yaml
  core_hw_touch:   !include TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml
  # yamllint enable rule:colons
-
-api:
-  id: api_server
-  on_client_connected:
-    then:
-      - script.execute: dump_config_caller
-      - script.execute: publish_device_info
-
-binary_sensor:
-  - id: bs_pending_restart
-    name: Pending Restart Status
-    internal: false
-    disabled_by_default: false
-    platform: template
-    entity_category: diagnostic
-    device_class: problem
-    on_state:
-      then:
-        - lambda: |-
-            if (x)
-              ESP_LOGW("core", "Pending restart: YES");
-            else
-              ESP_LOGCONFIG("core", "Pending restart: No");
-        - script.execute: dump_config_caller
-
-esp32:
-  board: esp32dev  # adafruit_feather_esp32_v2  # esp32dev
-  flash_size: 8MB
-  framework:
-    type: esp-idf
-
-esphome:
-  name: ${name}
-  friendly_name: ${friendly_name}
-  comment: TX Ultimate Easy
-  project:
-    name: "edwardtfn.tx_ultimate_easy"
-    version: ${version}
-  platformio_options:
-    build_flags:
-      - -D TX_ULTIMATE_EASY_CORE
-
-  on_boot:
-    - priority: 700
-      then:
-        - script.execute: boot_initialize
-
-    - priority: 600  # This is where most sensors are set up.
-      then:
-        - script.execute: boot_sequence
-
-    - priority: -100  # At this priority, pretty much everything should already be initialized.
-      then:
-        - script.execute: boot_done
-
-globals:
-  - id: is_us_model
-    type: bool
-    restore_value: true
-    initial_value: 'false'
-
-  - id: gang_count
-    type: uint8_t
-    restore_value: true
-    initial_value: '0'
-
-  - id: gang_count_plural_suffix
-    type: std::string
-    restore_value: true
-    max_restore_data_length: 3
-    # initial_value: "''"
-
-logger:
-  level: DEBUG
-
-ota:
-  platform: esphome
-
-psram:
-  mode: octal
-  speed: 80MHz
-
-script:
-  - id: api_send_ha_event_boot
-    mode: queued
-    parameters:
-      type: string
-    then:
-      - homeassistant.event:
-          event: esphome.tx_ultimate_easy
-          data:
-            device_name: !lambda return tx_device_name->state.c_str();
-            firmware: ${version}
-            domain: boot
-            type: !lambda return type.c_str();
-
-  - id: boot_done
-    mode: restart
-    then:
-      - script.execute:
-          id: api_send_ha_event_boot
-          type: done
-
-  - id: boot_initialize
-    mode: restart
-    then:
-      # Extended by:
-      #   - HW Buttons
-      #   - HW Relays
-      #   - HW Touch
-      - script.execute:
-          id: api_send_ha_event_boot
-          type: start
-      - wait_until:
-          condition:
-            - lambda: return sl_tx_model_format->active_index().has_value();
-            - lambda: return sl_tx_model_gang->active_index().has_value();
-      - lambda: |-
-          id(is_us_model) = (sl_tx_model_format->state == "${TX_MODEL_FORMAT_US_TEXT}");
-          id(gang_count) = sl_tx_model_gang->active_index().value() + 1;
-          if (id(gang_count) < 1 || id(gang_count) > 4) {
-            ESP_LOGE("core_hw_leds", "Invalid number of gangs: %" PRIu8, id(gang_count));
-          }
-          id(gang_count_plural_suffix) = id(gang_count) > 1 ? "s" : "";
-
-  - id: boot_sequence
-    mode: restart
-    then:
-      - script.execute: publish_device_info
-      - binary_sensor.template.publish:
-          id: bs_pending_restart
-          state: false
-
-  - id: dump_config
-    mode: restart
-    then:
-      # Extended by all modules
-      - lambda: |-
-          // Device identification
-          ESP_LOGCONFIG("core", "Device friendly name: ${friendly_name}");
-          ESP_LOGCONFIG("core", "Device name: ${name}");
-          ESP_LOGCONFIG("core", "Device name (HA): %s", tx_device_name->state.c_str());
-          ESP_LOGCONFIG("core", "Device hostname: %s", App.get_name().c_str());
-
-          dump_config_versions->execute();
-
-          // Framework detection
-          #ifdef USE_ARDUINO
-          ESP_LOGCONFIG("core", "Framework: Arduino");
-          #elif defined(USE_ESP_IDF)
-          ESP_LOGCONFIG("core", "Framework: ESP-IDF");
-          #else
-          ESP_LOGW("core", "Framework: UNKNOWN");
-          #endif
-
-          // Model configuration
-          ESP_LOGCONFIG("core", "Model format (selected): %s", sl_tx_model_format->state.c_str());
-          ESP_LOGCONFIG("core", "Model format (detected): %s", id(is_us_model) ? "US" : "EU");
-          ESP_LOGCONFIG("core", "Gangs (selected): %s", sl_tx_model_gang->state.c_str());
-          ESP_LOGCONFIG("core", "Gangs (detected): %" PRIu8 "-Gang%s", id(gang_count), id(gang_count_plural_suffix).c_str());
-
-          // System state
-          if (bs_pending_restart->state)
-            ESP_LOGW("core", "Pending restart: YES");
-          else
-            ESP_LOGCONFIG("core", "Pending restart: No");
-
-  - id: dump_config_caller
-    mode: restart
-    then:
-      - delay: ${DUMP_CONFIG_CALLER_DELAY}
-      - script.execute: dump_config
-      - script.wait: dump_config
-      - script.execute: dump_config_list_packages
-
-  - id: dump_config_list_packages
-    mode: restart
-    then:
-      - script.wait: dump_config
-      - lambda: |-
-          ESP_LOGCONFIG(ESPHOME_PROJECT_NAME, "Installed packages:");
-
-          // Identify itself
-          ESP_LOGCONFIG(ESPHOME_PROJECT_NAME, "  - Core");
-
-  - id: dump_config_versions
-    mode: restart
-    then:
-      - lambda: |-
-          // Version information
-          ESP_LOGCONFIG("core", "TX Ultimate firmware version: ${version}");
-
-  - id: publish_device_info
-    mode: restart
-    then:
-      - lambda: |-
-          tx_fw_version->publish_state("${version}");
-          tx_device_name->publish_state(App.get_name().c_str());
-
-select:
-  - id: sl_tx_model_format
-    name: Model (Format)
-    platform: template
-    options:
-      - "${TX_MODEL_FORMAT_EU_TEXT}"
-      - "${TX_MODEL_FORMAT_US_TEXT}"
-    initial_option: "${TX_MODEL_FORMAT_EU_TEXT}"
-    optimistic: true
-    restore_value: true
-    internal: false
-    entity_category: config
-    disabled_by_default: false
-    icon: mdi:tablet-cellphone
-    on_value:
-      then:
-        - binary_sensor.template.publish:
-            id: bs_pending_restart
-            state: true
-        - lambda: |-
-            id(is_us_model) = (x == "${TX_MODEL_FORMAT_US_TEXT}");
-            ESP_LOGI("core", "New model selected: %s", id(is_us_model) ? "US" : "EU");
-
-  - id: sl_tx_model_gang
-    name: Model (Gang)
-    platform: template
-    options:
-      - "${TX_MODEL_1_GANG_TEXT}"
-      - "${TX_MODEL_2_GANG_TEXT}"
-      - "${TX_MODEL_3_GANG_TEXT}"
-      - "${TX_MODEL_4_GANG_TEXT}"
-    initial_option: "${TX_MODEL_1_GANG_TEXT}"
-    optimistic: true
-    restore_value: true
-    internal: false
-    entity_category: config
-    disabled_by_default: false
-    icon: mdi:dip-switch
-    on_value:
-      then:
-        - binary_sensor.template.publish:
-            id: bs_pending_restart
-            state: true
-        - lambda: |-
-            id(gang_count) = static_cast<uint8_t>(i) + 1;
-            ESP_LOGI("core", "New model selected: %" PRIu8 "-%s", id(gang_count), id(gang_count) > 1 ? "Gangs" : "Gang");
-            tx_ultimate->set_gang_count(id(gang_count));
-
-text_sensor:
-  - id: tx_fw_version
-    name: TX Ultimate Easy Firmware Version
-    platform: template
-    entity_category: diagnostic
-    icon: mdi:tag-text-outline
-    internal: false
-    update_interval: never
-    lambda: |-
-      return {"${version}"};
-
-  - id: tx_device_name
-    name: Device Name
-    platform: template
-    icon: mdi:identifier
-    entity_category: diagnostic
-    internal: false
-    disabled_by_default: false
-    update_interval: never
-    lambda: |-
-      return {"${name}"};
-    filters:
-      - lambda: |-
-          const std::string raw_name = x;
-          std::string result;
-          bool last_was_underscore = false;
-          for (const char& c : raw_name) {
-            if (isalnum(c)) {
-              result += tolower(c);  // Add alphanumeric characters as lowercase
-              last_was_underscore = false;
-            } else if (!last_was_underscore) {  // Replace non-alphanumeric with '_' but avoid consecutive '_'
-              result += '_';
-              last_was_underscore = true;
-            }
-          }
-          return result;
-
-wifi:
-  id: wifi_component
 ...
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_core_common.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_core_common.yaml
@@ -0,0 +1,324 @@
+####################################################################################################
+#####                              TX Ultimate Easy for ESPHome                                #####
+#####                  Repository: https://github.com/edwardtfn/TX-Ultimate-Easy               #####
+####################################################################################################
+##### Purpose: ESPHome Core - Common                                                           #####
+####################################################################################################
+##### Author: edwardtfn - https://github.com/edwardtfn - https://buymeacoffee.com/edwardfirmo  #####
+####################################################################################################
+##### NOTE:                                                                                    #####
+##### - Make changes ONLY if absolutely necessary and you have the required knowledge.         #####
+##### - For normal system use, modifications to this file are NOT required.                    #####
+####################################################################################################
+---
+substitutions:
+  name: tx-ultimate-easy
+  friendly_name: TX Ultimate Easy
+
+  <<: !include ../versioning/VERSION_YAML
+
+  EVENT_NAME: esphome.tx_ultimate_easy
+
+  TX_MODEL_FORMAT_EU_TEXT: "EU (Square, T5-xC-86)"
+  TX_MODEL_FORMAT_US_TEXT: "US (Rectangle, T5-xC-120)"
+
+  TX_MODEL_1_GANG_TEXT: "1 Gang"
+  TX_MODEL_2_GANG_TEXT: "2 Gang"
+  TX_MODEL_3_GANG_TEXT: "3 Gang"
+  TX_MODEL_4_GANG_TEXT: "4 Gang"
+
+  DUMP_CONFIG_CALLER_DELAY: 10s  # Delay to dump config after requested
+
+
+api:
+  id: api_server
+  on_client_connected:
+    then:
+      - script.execute: dump_config_caller
+      - script.execute: publish_device_info
+
+binary_sensor:
+  - id: bs_pending_restart
+    name: Pending Restart Status
+    internal: false
+    disabled_by_default: false
+    platform: template
+    entity_category: diagnostic
+    device_class: problem
+    on_state:
+      then:
+        - lambda: |-
+            if (x)
+              ESP_LOGW("core", "Pending restart: YES");
+            else
+              ESP_LOGCONFIG("core", "Pending restart: No");
+        - script.execute: dump_config_caller
+
+button:
+  - id: bt_restart
+    name: Restart
+    internal: false
+    platform: restart
+
+esp32:
+  board: esp32dev
+  flash_size: 8MB
+
+esphome:
+  name: ${name}
+  friendly_name: ${friendly_name}
+  comment: TX Ultimate Easy
+  project:
+    name: "edwardtfn.tx_ultimate_easy"
+    version: ${version}
+  platformio_options:
+    build_flags:
+      - -D TX_ULTIMATE_EASY_CORE
+
+  on_boot:
+    - priority: 700
+      then:
+        - script.execute: boot_initialize
+
+    - priority: 600  # This is where most sensors are set up.
+      then:
+        - script.execute: boot_sequence
+
+    - priority: -100  # At this priority, pretty much everything should already be initialized.
+      then:
+        - script.execute: boot_done
+
+globals:
+  - id: is_us_model
+    type: bool
+    restore_value: true
+    initial_value: 'false'
+
+  - id: gang_count
+    type: uint8_t
+    restore_value: true
+    initial_value: '0'
+
+  - id: gang_count_plural_suffix
+    type: std::string
+    restore_value: true
+    max_restore_data_length: 3
+
+logger:
+  level: DEBUG
+
+ota:
+  platform: esphome
+
+psram:
+
+script:
+  - id: api_send_ha_event_boot
+    mode: queued
+    parameters:
+      type: string
+    then:
+      - lambda: |-
+          // Send event to Home Assistant
+          esphome::api::CustomAPIDevice ha_event;
+          ha_event.fire_homeassistant_event("${EVENT_NAME}", {
+            {"device_name", id(tx_device_name).state.c_str()},
+            {"firmware", "${version}"},
+            {"domain", "boot"},
+            {"type", type.c_str()}
+          });
+
+  - id: boot_done
+    mode: restart
+    then:
+      - script.execute:
+          id: api_send_ha_event_boot
+          type: done
+
+  - id: boot_initialize
+    mode: restart
+    then:
+      # Extended by:
+      #   - HW Buttons
+      #   - HW Relays
+      #   - HW Touch
+      - script.execute:
+          id: api_send_ha_event_boot
+          type: start
+      - wait_until:
+          condition:
+            - lambda: return sl_tx_model_format->active_index().has_value();
+            - lambda: return sl_tx_model_gang->active_index().has_value();
+      - lambda: |-
+          id(is_us_model) = (sl_tx_model_format->state == "${TX_MODEL_FORMAT_US_TEXT}");
+          id(gang_count) = sl_tx_model_gang->active_index().value() + 1;
+          if (id(gang_count) < 1 || id(gang_count) > 4) {
+            ESP_LOGE("core_hw_leds", "Invalid number of gangs: %" PRIu8, id(gang_count));
+          }
+          id(gang_count_plural_suffix) = id(gang_count) > 1 ? "s" : "";
+
+  - id: boot_sequence
+    mode: restart
+    then:
+      - script.execute: publish_device_info
+      - binary_sensor.template.publish:
+          id: bs_pending_restart
+          state: false
+
+  - id: dump_config
+    mode: restart
+    then:
+      # Extended by all modules
+      - lambda: |-
+          // Device identification
+          ESP_LOGCONFIG("core", "Device friendly name: ${friendly_name}");
+          ESP_LOGCONFIG("core", "Device name: ${name}");
+          ESP_LOGCONFIG("core", "Device name (HA): %s", tx_device_name->state.c_str());
+          ESP_LOGCONFIG("core", "Device hostname: %s", App.get_name().c_str());
+
+          dump_config_versions->execute();
+
+          // Framework detection
+          #ifdef USE_ARDUINO
+          ESP_LOGCONFIG("core", "Framework: Arduino");
+          #elif defined(USE_ESP_IDF)
+          ESP_LOGCONFIG("core", "Framework: ESP-IDF");
+          #else
+          ESP_LOGW("core", "Framework: UNKNOWN");
+          #endif
+
+          // Model configuration
+          ESP_LOGCONFIG("core", "Model format (selected): %s", sl_tx_model_format->state.c_str());
+          ESP_LOGCONFIG("core", "Model format (detected): %s", id(is_us_model) ? "US" : "EU");
+          ESP_LOGCONFIG("core", "Gangs (selected): %s", sl_tx_model_gang->state.c_str());
+          ESP_LOGCONFIG("core", "Gangs (detected): %" PRIu8 "-Gang%s", id(gang_count), id(gang_count_plural_suffix).c_str());
+
+          // System state
+          if (bs_pending_restart->state)
+            ESP_LOGW("core", "Pending restart: YES");
+          else
+            ESP_LOGCONFIG("core", "Pending restart: No");
+
+  - id: dump_config_caller
+    mode: restart
+    then:
+      - delay: ${DUMP_CONFIG_CALLER_DELAY}
+      - script.execute: dump_config
+      - script.wait: dump_config
+      - script.execute: dump_config_list_packages
+
+  - id: dump_config_list_packages
+    mode: restart
+    then:
+      - script.wait: dump_config
+      - lambda: |-
+          ESP_LOGCONFIG(ESPHOME_PROJECT_NAME, "Installed packages:");
+
+          // Identify itself
+          ESP_LOGCONFIG(ESPHOME_PROJECT_NAME, "  - Core");
+
+  - id: dump_config_versions
+    mode: restart
+    then:
+      - lambda: |-
+          // Version information
+          ESP_LOGCONFIG("core", "TX Ultimate firmware version: ${version}");
+          // ESPHome builder information
+          ESP_LOGCONFIG("core", "ESPHome builder: " ESPHOME_VERSION);
+          ESP_LOGCONFIG("core", "ESPHome build timestamp: %s", App.get_compilation_time().c_str());
+
+  - id: publish_device_info
+    mode: restart
+    then:
+      - lambda: |-
+          tx_fw_version->publish_state("${version}");
+          tx_device_name->publish_state(App.get_name().c_str());
+
+select:
+  - id: sl_tx_model_format
+    name: Model (Format)
+    platform: template
+    options:
+      - "${TX_MODEL_FORMAT_EU_TEXT}"
+      - "${TX_MODEL_FORMAT_US_TEXT}"
+    initial_option: "${TX_MODEL_FORMAT_EU_TEXT}"
+    optimistic: true
+    restore_value: true
+    internal: false
+    entity_category: config
+    disabled_by_default: false
+    icon: mdi:tablet-cellphone
+    on_value:
+      then:
+        - binary_sensor.template.publish:
+            id: bs_pending_restart
+            state: true
+        - lambda: |-
+            id(is_us_model) = (x == "${TX_MODEL_FORMAT_US_TEXT}");
+            ESP_LOGI("core", "New model selected: %s", id(is_us_model) ? "US" : "EU");
+
+  - id: sl_tx_model_gang
+    name: Model (Gang)
+    platform: template
+    options:
+      - "${TX_MODEL_1_GANG_TEXT}"
+      - "${TX_MODEL_2_GANG_TEXT}"
+      - "${TX_MODEL_3_GANG_TEXT}"
+      - "${TX_MODEL_4_GANG_TEXT}"
+    initial_option: "${TX_MODEL_1_GANG_TEXT}"
+    optimistic: true
+    restore_value: true
+    internal: false
+    entity_category: config
+    disabled_by_default: false
+    icon: mdi:dip-switch
+    on_value:
+      then:
+        - binary_sensor.template.publish:
+            id: bs_pending_restart
+            state: true
+        - lambda: |-
+            id(gang_count) = static_cast<uint8_t>(i) + 1;
+            ESP_LOGI("core", "New model selected: %" PRIu8 "-%s", id(gang_count), id(gang_count) > 1 ? "Gangs" : "Gang");
+            tx_ultimate->set_gang_count(id(gang_count));
+
+text_sensor:
+  - id: tx_fw_version
+    name: TX Ultimate Easy Firmware Version
+    platform: template
+    entity_category: diagnostic
+    icon: mdi:tag-text-outline
+    internal: false
+    update_interval: never
+    lambda: |-
+      return {"${version}"};
+
+  - id: tx_device_name
+    name: Device Name
+    platform: template
+    icon: mdi:identifier
+    entity_category: diagnostic
+    internal: false
+    disabled_by_default: false
+    update_interval: never
+    lambda: |-
+      return {"${name}"};
+    filters:
+      - lambda: |-
+          const std::string raw_name = x;
+          std::string result;
+          bool last_was_underscore = false;
+          for (const char& c : raw_name) {
+            if (isalnum(c)) {
+              result += tolower(c);  // Add alphanumeric characters as lowercase
+              last_was_underscore = false;
+            } else if (!last_was_underscore) {  // Replace non-alphanumeric with '_' but avoid consecutive '_'
+              result += '_';
+              last_was_underscore = true;
+            }
+          }
+          return result;
+
+wifi:
+  id: wifi_component
+...
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml
@@ -112,18 +112,19 @@ script:
      action: string
      count: uint8_t
    then:
-      - homeassistant.event:
-          event: esphome.tx_ultimate_easy
-          data:
-            device_name: !lambda return tx_device_name->state.c_str();
-            firmware: ${version}
-            domain: touch
-            type: button
-            action: !lambda return action.c_str();
-            button_id: !lambda return button;
-            count: !lambda return count;
-            position: !lambda return id(button_press_position);
      - lambda: |-
+          // Send event to Home Assistant
+          esphome::api::CustomAPIDevice ha_event;
+          ha_event.fire_homeassistant_event("${EVENT_NAME}", {
+            {"device_name", id(tx_device_name).state.c_str()},
+            {"firmware", "${version}"},
+            {"domain", "touch"},
+            {"type", "button"},
+            {"action", action.c_str()},
+            {"button_id", std::to_string(button)},
+            {"count", std::to_string(count)},
+            {"position", std::to_string(id(button_press_position))}
+          });
          ESP_LOGI("core_hw_buttons", "Button %" PRIu8 " action: '%s'", button, action.c_str());
          if (action == "click") {
            switch (button) {
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_leds.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_leds.yaml
@@ -47,20 +47,17 @@ light:
  - id: light_full
    name: Light - All
    internal: true
-    platform: esp32_rmt_led_strip
-    rgb_order: GRB
-    rmt_channel: 1
-    chipset: ws2812
    num_leds: 32
    pin: GPIO13
    restore_mode: ${LIGHT_FULL_RESTORE_MODE}
-    max_refresh_rate: 33ms
-    use_psram: true
+    platform: neopixelbus
+    type: GRB
+    variant: WS2811

  # Those lights are available based on the model selections
  - &light_partition_with_effects
    id: light_eu
-    name: Light
+    name: Light EU
    platform: partition
    default_transition_length: ${default_transition_length}
    internal: true
@@ -109,7 +106,7 @@ light:
        to: 27

  - id: light_us
-    name: Light
+    name: Light US
    <<: *light_partition_with_effects
    segments:
      - id: light_full
@@ -118,7 +115,7 @@ light:

  - &light_partition_with_effects_disabled
    id: light_eu_bottom
-    name: Light - Bottom
+    name: Light - Bottom EU
    disabled_by_default: true
    <<: *light_partition_with_effects
    segments:
@@ -127,7 +124,7 @@ light:
        to: 12
        reversed: true
  - id: light_eu_left
-    name: Light - Left
+    name: Light - Left EU
    <<: *light_partition_with_effects_disabled
    segments:
      - id: light_full
@@ -135,7 +132,7 @@ light:
        to: 19
        reversed: true
  - id: light_eu_right
-    name: Light - Right
+    name: Light - Right EU
    <<: *light_partition_with_effects_disabled
    segments:
      - id: light_full
@@ -147,7 +144,7 @@ light:
        to: 5
        reversed: false
  - id: light_eu_top
-    name: Light - Top
+    name: Light - Top EU
    <<: *light_partition_with_effects_disabled
    segments:
      - id: light_full
@@ -155,7 +152,7 @@ light:
        to: 26
        reversed: false
  - id: light_us_bottom
-    name: Light - Bottom
+    name: Light - Bottom US
    <<: *light_partition_with_effects_disabled
    segments:
      - id: light_full
@@ -163,7 +160,7 @@ light:
        to: 14
        reversed: true
  - id: light_us_left
-    name: Light - Left
+    name: Light - Left US
    <<: *light_partition_with_effects_disabled
    segments:
      - id: light_full
@@ -171,7 +168,7 @@ light:
        to: 24
        reversed: true
  - id: light_us_right
-    name: Light - Right
+    name: Light - Right US
    <<: *light_partition_with_effects_disabled
    segments:
      - id: light_full
@@ -183,7 +180,7 @@ light:
        to: 8
        reversed: false
  - id: light_us_top
-    name: Light - Top
+    name: Light - Top US
    <<: *light_partition_with_effects_disabled
    segments:
      - id: light_full
@@ -570,7 +567,7 @@ select:
  # EU relay light mode template
  - &relay_light_mode_eu
    id: sl_relay_1_light_mode_eu
-    name: Relay 1 light mode
+    name: Relay 1 light mode EU
    platform: template
    options:
      - "${LIGHT_MODE_DISABLED_TEXT}"
@@ -585,19 +582,19 @@ select:
    disabled_by_default: false
    icon: mdi:dots-square
  - id: sl_relay_2_light_mode_eu
-    name: Relay 2 light mode
+    name: Relay 2 light mode EU
    <<: *relay_light_mode_eu
  - id: sl_relay_3_light_mode_eu
-    name: Relay 3 light mode
+    name: Relay 3 light mode EU
    <<: *relay_light_mode_eu
  - id: sl_relay_4_light_mode_eu
-    name: Relay 4 light mode
+    name: Relay 4 light mode EU
    <<: *relay_light_mode_eu

  # US relay light mode template
  - &relay_light_mode_us
    id: sl_relay_1_light_mode_us
-    name: Relay 1 light mode
+    name: Relay 1 light mode US
    platform: template
    options:
      - "${LIGHT_MODE_DISABLED_TEXT}"
@@ -612,12 +609,12 @@ select:
    disabled_by_default: false
    icon: mdi:dots-square
  - id: sl_relay_2_light_mode_us
-    name: Relay 2 light mode
+    name: Relay 2 light mode US
    <<: *relay_light_mode_us
  - id: sl_relay_3_light_mode_us
-    name: Relay 3 light mode
+    name: Relay 3 light mode US
    <<: *relay_light_mode_us
  - id: sl_relay_4_light_mode_us
-    name: Relay 4 light mode
+    name: Relay 4 light mode US
    <<: *relay_light_mode_us
 ...
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml
@@ -318,7 +318,7 @@ script:
      #   - HW Vibration
      - binary_sensor.template.publish:
          id: bs_multi_touch
-          state: OFF  # yamllint disable-line rule:truthy
+          state: ON  # yamllint disable-line rule:truthy

  - id: touch_on_press
    mode: restart
@@ -386,69 +386,72 @@ tx_ultimate_easy:
        }

  on_multi_touch_release:
-    - homeassistant.event:
-        event: esphome.tx_ultimate_easy
-        data:
-          device_name: !lambda return tx_device_name->state.c_str();
-          firmware: ${version}
-          domain: touch
-          type: multi_touch
-          action: release
-          position: !lambda return touch.x;
-    - lambda: ESP_LOGI("core_hw_touch", "Multi-touch released");
-    - script.execute: touch_on_multi_touch_release
+    then:
+      - lambda: |-
+          // Send event to Home Assistant
+          esphome::api::CustomAPIDevice ha_event;
+          ha_event.fire_homeassistant_event("${EVENT_NAME}", {
+            {"device_name", id(tx_device_name).state.c_str()},
+            {"firmware", "${version}"},
+            {"domain", "touch"},
+            {"type", "multi_touch"},
+            {"action", "release"},
+            {"position", std::to_string(touch.x)}
+          });
+          ESP_LOGI("core_hw_touch", "Multi-touch released");
+          touch_on_multi_touch_release->execute();

  on_press:
-    - lambda: |-
-        const uint8_t position = static_cast<uint8_t>(touch.x);
-        if (position > ${TOUCH_POSITION_MAX_VALUE}) {  // Check for valid range
-          ESP_LOGE("core_hw_touch", "Invalid touch position: %" PRIu8, position);
-        } else {
-          ESP_LOGI("core_hw_touch", "Pressed at position %" PRIu8, position);
-          touch_on_press->execute(static_cast<uint8_t>(touch.button), position);
-        }
+    then:
+      - lambda: |-
+          const uint8_t position = static_cast<uint8_t>(touch.x);
+          if (position > ${TOUCH_POSITION_MAX_VALUE}) {  // Check for valid range
+            ESP_LOGE("core_hw_touch", "Invalid touch position: %" PRIu8, position);
+          } else {
+            ESP_LOGI("core_hw_touch", "Pressed at position %" PRIu8, position);
+            touch_on_press->execute(static_cast<uint8_t>(touch.button), position);
+          }

  on_release:
-    - lambda: ESP_LOGI("core_hw_touch", "Released");
-    - script.execute: touch_on_release
+    then:
+      - lambda: ESP_LOGI("core_hw_touch", "Released");
+      - script.execute: touch_on_release

  on_swipe_left:
-    - homeassistant.event:
-        event: esphome.tx_ultimate_easy
-        data:
-          device_name: !lambda return tx_device_name->state.c_str();
-          firmware: ${version}
-          domain: touch
-          type: swipe
-          action: !lambda |-
-            return sl_tx_model_format->state == "${TX_MODEL_FORMAT_EU_TEXT}" ? "left" : "down";
-          swipe-direction: !lambda |-
-            return sl_tx_model_format->state == "${TX_MODEL_FORMAT_EU_TEXT}" ? "left" : "down";
-          position: !lambda return touch.x;
-    - lambda: |-
-        ESP_LOGI("core_hw_touch", "Swipe %s", sl_tx_model_format->state == "${TX_MODEL_FORMAT_EU_TEXT}"
-                                                  ? "left"
-                                                  : "down");
-    - script.execute: touch_swipe_left
+    then:
+      - lambda: |-
+          std::string swipe_direction = (sl_tx_model_format->state == "${TX_MODEL_FORMAT_EU_TEXT}") ? "left" : "down";
+          // Send event to Home Assistant
+          esphome::api::CustomAPIDevice ha_event;
+          ha_event.fire_homeassistant_event("${EVENT_NAME}", {
+            {"device_name", id(tx_device_name).state.c_str()},
+            {"firmware", "${version}"},
+            {"domain", "touch"},
+            {"type", "swipe"},
+            {"action", swipe_direction.c_str()},
+            {"swipe-direction", swipe_direction.c_str()},
+            {"position", std::to_string(touch.x)}
+          });
+          ESP_LOGI("core_hw_touch", "Swipe %s", swipe_direction.c_str());
+          touch_swipe_left->execute();

  on_swipe_right:
-    - homeassistant.event:
-        event: esphome.tx_ultimate_easy
-        data:
-          device_name: !lambda return tx_device_name->state.c_str();
-          firmware: ${version}
-          domain: touch
-          type: swipe
-          action: !lambda |-
-            return sl_tx_model_format->state == "${TX_MODEL_FORMAT_EU_TEXT}" ? "right" : "up";
-          swipe-direction: !lambda |-
-            return sl_tx_model_format->state == "${TX_MODEL_FORMAT_EU_TEXT}" ? "right" : "up";
-          position: !lambda return touch.x;
-    - lambda: |-
-        ESP_LOGI("core_hw_touch", "Swipe %s", sl_tx_model_format->state == "${TX_MODEL_FORMAT_EU_TEXT}"
-                                                  ? "right"
-                                                  : "up");
-    - script.execute: touch_swipe_right
+    then:
+      - lambda: |-
+          std::string swipe_direction = (sl_tx_model_format->state == "${TX_MODEL_FORMAT_EU_TEXT}") ? "right" : "up";
+          // Send event to Home Assistant
+          esphome::api::CustomAPIDevice ha_event;
+          ha_event.fire_homeassistant_event("${EVENT_NAME}", {
+            {"device_name", id(tx_device_name).state.c_str()},
+            {"firmware", "${version}"},
+            {"domain", "touch"},
+            {"type", "swipe"},
+            {"action", swipe_direction.c_str()},
+            {"swipe-direction", swipe_direction.c_str()},
+            {"position", std::to_string(touch.x)}
+          });
+          ESP_LOGI("core_hw_touch", "Swipe %s", swipe_direction.c_str());
+          touch_swipe_right->execute();

  on_touch_event:
    - lambda: |-
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml
@@ -13,60 +13,8 @@
 ---
 packages:
  # yamllint disable rule:colons
-  core_hw_relays:    !include TX-Ultimate-Easy-ESPHome_standard_hw_relays.yaml
-  core_hw_speaker:   !include TX-Ultimate-Easy-ESPHome_standard_hw_speaker.yaml
-  core_hw_vibration: !include TX-Ultimate-Easy-ESPHome_standard_hw_vibration.yaml
+  standard_hw_relays:    !include TX-Ultimate-Easy-ESPHome_standard_hw_relays.yaml
+  standard_hw_vibration: !include TX-Ultimate-Easy-ESPHome_standard_hw_vibration.yaml
+  standard_media_player: !include TX-Ultimate-Easy-ESPHome_standard_media_player.yaml
  # yamllint enable rule:colons
-
-button:
-  - id: bt_restart
-    name: Restart
-    internal: false
-    platform: restart
-
-captive_portal:
-  id: ap_captive_portal
-
-esphome:
-  platformio_options:
-    build_flags:
-      - -D TX_ULTIMATE_EASY_STANDARD
-
-script:
-  - id: !extend dump_config_list_packages
-    then:
-      - script.wait: dump_config
-      - lambda: |-
-          // Check for requirements
-          #if !defined(TX_ULTIMATE_EASY_CORE)
-            #error "The package TX-Ultimate-Easy-ESPHome_core.yaml is required."
-          #endif
-
-          // Identify itself
-          ESP_LOGCONFIG(ESPHOME_PROJECT_NAME, "  - Standard");
-
-  - id: !extend dump_config_versions
-    then:
-      - lambda: |-
-          // Version information
-          ESP_LOGCONFIG("standard", "ESPHome builder: %s", esphome_fw_version->state.c_str());
-
-improv_serial:
-  id: serial_improv
-
-text_sensor:
-  - id: esphome_fw_version
-    name: ESPHome Version
-    platform: version
-    entity_category: diagnostic
-    internal: false
-
-time:
-  - id: time_source
-    platform: homeassistant
-
-web_server:
-
-wifi:
-  ap:
 ...
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_standard_media_player.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_standard_media_player.yaml
@@ -0,0 +1,64 @@
+####################################################################################################
+#####                              TX Ultimate Easy for ESPHome                                #####
+#####                  Repository: https://github.com/edwardtfn/TX-Ultimate-Easy               #####
+####################################################################################################
+##### Purpose: ESPHome - Add-on - Media player                                                 #####
+####################################################################################################
+##### Author: edwardtfn - https://github.com/edwardtfn - https://buymeacoffee.com/edwardfirmo  #####
+####################################################################################################
+##### NOTE:                                                                                    #####
+##### - Make changes ONLY if absolutely necessary and you have the required knowledge.         #####
+##### - For normal system use, modifications to this file are NOT required.                    #####
+####################################################################################################
+---
+packages:
+  standard_hw_audio: !include TX-Ultimate-Easy-ESPHome_standard_hw_audio.yaml
+
+esphome:
+  platformio_options:
+    build_flags:
+      - -D TX_ULTIMATE_EASY_ADDON_MEDIA_PLAYER
+
+media_player:
+  - id: mp_media_player
+    name: Media Player
+    internal: false
+    platform: i2s_audio
+    i2s_dout_pin: GPIO15
+    i2s_audio_id: if_i2s_audio
+    i2s_comm_fmt: msb
+    dac_type: external
+    mode: mono
+    mute_pin:
+      number: GPIO26
+      inverted: true
+      allow_other_uses: true
+
+script:
+  - id: !extend dump_config_list_packages
+    then:
+      - script.wait: dump_config
+      - lambda: |-
+          // Check for requirements
+          #if !defined(TX_ULTIMATE_EASY_CORE)
+            #error "The package TX-Ultimate-Easy-ESPHome_core.yaml is required."
+          #endif
+          #if !defined(TX_ULTIMATE_EASY_STANDARD_HW_AUDIO)
+            #error "The package TX-Ultimate-Easy-ESPHome_standard_hw_audio.yaml is required."
+          #endif
+
+          // Identify itself
+          ESP_LOGCONFIG(ESPHOME_PROJECT_NAME, "  - Add-on - Media Player");
+
+switch:
+  - id: sw_speaker_amplifier
+    name: Speaker - Amplifier
+    platform: gpio
+    pin:
+      number: GPIO26
+      inverted: true
+      allow_other_uses: true
+    restore_mode: RESTORE_DEFAULT_ON
+    internal: true
+    entity_category: config
+...
--- a/README.md
+++ b/README.md
@@ -8,10 +8,10 @@
 [![Discord][discord-shield]](https://discord.gg/Db6WJWzWuf)
 [![Buy me an ice-cream][buymeacoffee-shield]](https://www.buymeacoffee.com/edwardfirmo)

-<!-- markdownlint-disable MD013 -->
-| &nbsp;![TX Ultimate Easy Logo](Assets/Logo.webp) | TX Ultimate Easy provides custom ESPHome firmware for Sonoff TX Ultimate devices. Our project focuses on user-friendly configuration through the Home Assistant UI, eliminating the need for manual YAML editing. Whether you're new to home automation or an experienced user, TX Ultimate Easy makes it simple to manage your device. |
+<!-- markdownlint-disable MD013 MD033 -->
+| &nbsp;<picture><source media="(prefers-color-scheme: dark)" srcset="Assets/Logo_dark.png"><source media="(prefers-color-scheme: light)" srcset="Assets/Logo_light.png"><img alt="TX Ultimate Easy Logo" src="Assets/Logo_light.png"></picture> | TX Ultimate Easy provides custom ESPHome firmware for Sonoff TX Ultimate devices. Our project focuses on user-friendly configuration through the Home Assistant UI, eliminating the need for manual YAML editing. Whether you're new to home automation or an experienced user, TX Ultimate Easy makes it simple to manage your device. |
 | --- | :-- |
-<!-- markdownlint-enable MD013 -->
+<!-- markdownlint-enable MD013 MD033 -->

 [version-shield]: https://img.shields.io/github/v/tag/edwardtfn/TX-Ultimate-Easy?label=version
 [version]: https://github.com/edwardtfn/TX-Ultimate-Easy/tags
@@ -111,28 +111,81 @@ Follow these steps to get your TX Ultimate device up and running with ESPHome.
 4. Copy this basic configuration to your new device:
   ```yaml
   substitutions:
-     name: tx-ultimate-easy  # Change this to your device name
+     name: tx-ultimate-easy
     friendly_name: TX Ultimate Easy
-   
-   packages:
-     remote_package:
-       url: https://github.com/edwardtfn/TX-Ultimate-Easy
-       ref: main  # For latest stable release
-       files:
-         - ESPHome/TX-Ultimate-Easy-ESPHome.yaml
-   
+
   wifi:
     ssid: !secret wifi_ssid
     password: !secret wifi_password
-   ```

+   packages:
+     remote_package:
+       url: https://github.com/edwardtfn/TX-Ultimate-Easy
+       ref: stable  # Or you can specify a version, like `ref: v2024.12.6` or `ref: latest` to the latest non-stable
+       refresh: 5min
+       files:
+         - ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml                  # Core (essential) packages
+         - ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml              # Non-essential, but recommended packages
+         # - ESPHome/TX-Ultimate-Easy-ESPHome_addon_ble_proxy.yaml     # Adds BLE proxy support
+   ```
   You can also use a specific version tag for better control over updates:
   ```yaml
   ref: v2024.12.2  # Using specific version for controlled updates
   ```
-    **Note:** [Click here](https://github.com/edwardtfn/TX-Ultimate-Easy/tags) for a full list of versions available.
+    **Notes:**
+      - [Click here](https://github.com/edwardtfn/TX-Ultimate-Easy/tags) for a full list of versions available.
+      - [Click here](TX-Ultimate-Easy-ESPHome.yaml)
+        for the latest version of this yaml.
 5. Click "Save" and then "Install"

+> [!IMPORTANT]  
+> Starting from version 2025.1.0, non-essential components like `web_server`, `captive_portal`, and `wifi`
+> are no longer included in the core package. If you need these components,
+> you must add them manually to your local configuration file.
+> For example:
+> ```yaml
+> # Add these to your configuration if needed
+> web_server:
+> captive_portal:
+> wifi:
+>   ap: # Access point configuration
+> ```
+
+### Advanced Settings
+For more granular control over components,
+you can use our [advanced configuration template](TX-Ultimate-Easy-ESPHome_advanced.yaml).
+This template allows you to selectively include specific packages, which can be useful for:
+
+- Troubleshooting specific components
+- Reducing memory usage by excluding unused features
+- Customizing functionality for specific use cases
+
+Here's an example of the advanced configuration:
+```yaml
+packages:
+  remote_package:
+    url: https://github.com/edwardtfn/TX-Ultimate-Easy
+    ref: stable  # Or you can specify a version, like `ref: v2024.12.6` or `ref: latest` to the latest non-stable
+    refresh: 5min
+    files:
+      # Core (essential) packages
+      - ESPHome/TX-Ultimate-Easy-ESPHome_core_common.yaml      # Basic shared settings
+      - ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml  # Button logic
+      - ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_leds.yaml     # LED configuration
+      - ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml    # Touch panel support
+
+      # Optional but recommended packages
+      - ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_relays.yaml     # Relay control
+      - ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_vibration.yaml  # Haptic feedback
+
+      # Audio options (use none or choose only one - using both will fail)
+      - ESPHome/TX-Ultimate-Easy-ESPHome_standard_media_player.yaml  # Media player (Recommended for most users)
+      # - ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_speaker.yaml  # Basic speaker
+```
+
+> [!NOTE]
+> Use the advanced configuration with caution. Excluding core packages may cause instability or reduced functionality.
+
 ### Device Flashing

 Initial flashing must be done via serial connection.
@@ -314,5 +367,9 @@ This project is licensed under the MIT License - see the [LICENSE](LICENSE) file
 ---

 <!-- markdownlint-disable MD033 -->
-<img src="Assets/Logo.webp" alt="TX Ultimate Easy Logo" width="100"/>
+<picture>
+  <source media="(prefers-color-scheme: dark)" srcset="Assets/Logo_dark.png">
+  <source media="(prefers-color-scheme: light)" srcset="Assets/Logo_light.png">
+  <img alt="TX Ultimate Easy Logo" src="Assets/Logo_light.png" width="100">
+</picture>
 <!-- markdownlint-enable MD033 -->
--- a/TX-Ultimate-Easy-ESPHome.yaml
+++ b/TX-Ultimate-Easy-ESPHome.yaml
@@ -16,11 +16,10 @@ wifi:
 packages:
  remote_package:
    url: https://github.com/edwardtfn/TX-Ultimate-Easy
-    ref: latest  # Or you can specify a version, like `ref: v2024.12.6`
+    ref: stable  # Or you can specify a version, like `ref: v2024.12.6` or `ref: latest` to the latest non-stable
    refresh: 5min
    files:
      - ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml                  # Core (essential) packages
      - ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml              # Non-essential, but recommended packages
      # - ESPHome/TX-Ultimate-Easy-ESPHome_addon_ble_proxy.yaml     # Adds BLE proxy support
-      # - ESPHome/TX-Ultimate-Easy-ESPHome_addon_media_player.yaml  # Adds experimental Media Player (limited)
 ...
--- a/TX-Ultimate-Easy-ESPHome_advanced.yaml
+++ b/TX-Ultimate-Easy-ESPHome_advanced.yaml
@@ -0,0 +1,38 @@
+####################################################################################################
+#####                              TX Ultimate Easy for ESPHome                                #####
+#####                  Repository: https://github.com/edwardtfn/TX-Ultimate-Easy               #####
+####################################################################################################
+##### Author: edwardtfn - https://github.com/edwardtfn - https://buymeacoffee.com/edwardfirmo  #####
+####################################################################################################
+##### WARNING: This is an advanced configuration template. Use with caution as improper        #####
+##### configuration may lead to reduced functionality or system instability.                   #####
+####################################################################################################
+---
+substitutions:
+  name: tx-ultimate-easy-adv
+  friendly_name: TX Ultimate Easy Advanced
+
+wifi:
+  ssid: !secret wifi_ssid
+  password: !secret wifi_password
+
+packages:
+  remote_package:
+    url: https://github.com/edwardtfn/TX-Ultimate-Easy
+    ref: stable  # Or you can specify a version, like `ref: v2024.12.6` or `ref: latest` to the latest non-stable
+    refresh: 5min
+    files:
+      # Core (essential) packages - Do not disable these unless you know what you're doing
+      - ESPHome/TX-Ultimate-Easy-ESPHome_core_common.yaml            # Basic shared settings
+      - ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml        # Button logic
+      - ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_leds.yaml           # LED configuration
+      - ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml          # Touch panel support
+
+      # Optional functionality - Can be enabled/disabled as needed
+      - ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_relays.yaml     # Relay control
+      - ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_vibration.yaml  # Haptic feedback
+
+      # Audio options (use none or choose only one - using both will fail)
+      - ESPHome/TX-Ultimate-Easy-ESPHome_standard_media_player.yaml  # Media player (Recommended for most users)
+      # - ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_speaker.yaml  # Basic speaker
+...
--- a/components/tx_ultimate_easy/init.py
+++ b/components/tx_ultimate_easy/init.py
@@ -1,11 +1,12 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
+from esphome import automation
 from esphome.components import uart
+from esphome.components.esp32 import add_idf_sdkconfig_option
 from esphome.const import (
    CONF_ID,
 )
-
-from esphome import automation
+from esphome.core import CORE

 CODEOWNERS = ["@edwardtfn"]
 DEPENDENCIES = ['uart']
@@ -109,3 +110,17 @@ async def to_code(config):
    await cg.register_component(var, config)
    await uart.register_uart_device(var, config)
    await register_tx_ultimate_easy(var, config)
+
+    if CORE.using_esp_idf:
+        add_idf_sdkconfig_option("CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST", True)
+        add_idf_sdkconfig_option("CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY", True)
+        add_idf_sdkconfig_option("CONFIG_ESP32_REV_MIN_3", True)
+        add_idf_sdkconfig_option("CONFIG_MBEDTLS_DYNAMIC_BUFFER", True)
+        add_idf_sdkconfig_option("CONFIG_MBEDTLS_DYNAMIC_FREE_CA_CERT", True)
+        add_idf_sdkconfig_option("CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA", True)
+        add_idf_sdkconfig_option("CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC", True)
+        add_idf_sdkconfig_option("CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY", True)
+        add_idf_sdkconfig_option("CONFIG_SPIRAM_RODATA", True)
+        add_idf_sdkconfig_option("CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP", True)
+
+    cg.add_define("USE_TX_ULTIMATE_EASY")
--- a/versioning/VERSION
+++ b/versioning/VERSION
@@ -1 +1 @@
-2024.12.25
+2025.7.2
--- a/versioning/VERSION_YAML
+++ b/versioning/VERSION_YAML
@@ -1 +1 @@
-version: 2024.12.25
+version: 2025.7.2
Author	SHA1	Message	Date
GitHub Actions	754ad9cffe	Bump version to 2025.7.2 [skip-versioning]	2025-07-29 12:54:52 +00:00
Edward Firmo	637f47583a	Merge pull request #116 from MorghusDragon/fix-incorrect-multitouch-trigger-when-swiping Fix incorrect triggering of multitouch event when swiping	2025-07-29 14:54:39 +02:00
Morghus	2d1ef49ca9	Fix incorrect triggering of multitouch event when swiping	2025-07-29 20:58:44 +12:00
GitHub Actions	ffdb3a22b5	Bump version to 2025.7.1 [skip-versioning]	2025-07-09 22:42:27 +00:00
Edward Firmo	b426bdd5dc	Merge pull request #111 from edwardtfn/remove-duplicated-names Support to ESPHome 2025.7.0	2025-07-10 00:42:19 +02:00
Edward Firmo	3cdd9f87af	Standardize `std::to_string`	2025-07-10 00:29:34 +02:00
Edward Firmo	ddb26cd833	Test with recommended IDF only	2025-07-10 00:13:56 +02:00
Edward Firmo	5ea4f2015b	Support to ESPHome 2025.7.0 - Resolve duplicated names - Rebuilt HA event calls	2025-07-09 23:36:54 +02:00
GitHub Actions	ddb5e0f783	Bump version to 2025.5.1 [skip-versioning]	2025-05-14 19:19:50 +00:00
Edward Firmo	ab078f597a	Merge pull request #106 from edwardtfn/dev Remove enforcing psram mode to octal	2025-05-14 21:19:39 +02:00
Edward Firmo	5eb42082db	Remove `rmt_channel` Not supported with IDF 5	2025-05-14 21:07:07 +02:00
Edward Firmo	b1a978b3f3	Remove `rmt_channel` Not supported with IDF 5	2025-05-14 20:57:58 +02:00
Edward Firmo	4ec44e611f	Merge branch 'main' into dev	2025-05-02 18:30:35 +02:00
Edward Firmo	4d7895a2e9	Remove enforcing psram mode to octal Solves #105	2025-05-02 18:29:07 +02:00
GitHub Actions	be76ebd603	Bump version to 2025.3.1 [skip-versioning]	2025-03-21 19:08:53 +00:00
Edward Firmo	49a0f088e7	Merge pull request #101 from edwardtfn/edwardtfn-patch-1 Remove reference to tj-actions	2025-03-21 20:08:45 +01:00
Edward Firmo	ace945a4ea	Update validate_yamllint.yml	2025-03-15 18:23:25 +01:00
Edward Firmo	e944cd2c21	Remove reference to tj-actions Security reasons	2025-03-15 18:19:32 +01:00
GitHub Actions	1cf6f60c78	Bump version to 2025.1.4 [skip-versioning]	2025-01-07 07:49:22 +00:00
Edward Firmo	58ba5e0136	Merge pull request #92 from edwardtfn/fix-name-CORE-is-not-defined Fix missing `add_idf_sdkconfig_option`	2025-01-07 08:49:12 +01:00
Edward Firmo	b0b19fee45	Fix missing `add_idf_sdkconfig_option`	2025-01-07 08:48:38 +01:00
GitHub Actions	fe222ffe32	Bump version to 2025.1.3 [skip-versioning]	2025-01-07 07:17:53 +00:00
Edward Firmo	bb09d7f7f7	Merge pull request #91 from edwardtfn/fix-name-CORE-is-not-defined Fix `name 'CORE' is not defined`	2025-01-07 08:17:42 +01:00
Edward Firmo	b6e3f41952	Fix `name 'CORE' is not defined`	2025-01-07 08:15:27 +01:00
GitHub Actions	ba3fc89032	Bump version to 2025.1.2 [skip-versioning]	2025-01-06 16:01:26 +00:00
Edward Firmo	fcbc92aaec	Merge pull request #88 from edwardtfn/revert-to-media-player-as-default Revert to media player and neopixelbus as default	2025-01-06 17:01:15 +01:00
GitHub Actions	a59f667e7d	Bump version to 2025.1.1 [skip-versioning]	2025-01-06 16:00:59 +00:00
Edward Firmo	ff3bf05ed1	Merge pull request #90 from Matthijs33/patch-1 Fix value for multi_touch event publishing	2025-01-06 17:00:46 +01:00
Edward Firmo	8a4009dd7e	Move `sdkconfig_options` to component	2025-01-05 12:58:45 +01:00
Edward Firmo	6bdf6e97b7	Move sdkconfig to component	2025-01-05 12:51:22 +01:00
Edward Firmo	acb602c4ca	Lint	2025-01-05 12:44:48 +01:00
Edward Firmo	9bae016573	Lint	2025-01-05 12:43:08 +01:00
Edward Firmo	e47726dc47	Advanced settings with granular package selection Resolves #86	2025-01-05 12:40:52 +01:00
Edward Firmo	5988681132	Include common	2025-01-05 11:02:46 +01:00
Edward Firmo	5d80ce1117	Do not remove attributes twice	2025-01-05 01:34:18 +01:00
Edward Firmo	036e62b277	Remove check for framework type	2025-01-05 01:06:52 +01:00
Edward Firmo	56c613a70f	Remove `sw_speaker_amplifier` when the `media_player` is removed	2025-01-05 00:54:48 +01:00
Edward Firmo	12fd2d3747	Lint	2025-01-05 00:38:30 +01:00
Edward Firmo	81f0420987	Lint	2025-01-05 00:37:05 +01:00
Edward Firmo	e89adca5cb	Remove reference to `esphome_fw_version`	2025-01-05 00:34:40 +01:00
Edward Firmo	a64c45b37b	Media Player is not compatible with IDF	2025-01-04 23:58:05 +01:00
Edward Firmo	95291c0381	Remove non-essential packages	2025-01-04 23:54:35 +01:00
Edward Firmo	39cf0f2b10	Do not remove media player from core	2025-01-04 22:58:09 +01:00
Edward Firmo	8d03105caf	Reorg tests	2025-01-04 22:54:08 +01:00
Edward Firmo	e911482deb	Lint	2025-01-04 22:39:31 +01:00
Edward Firmo	ef4f412223	Split extensions	2025-01-04 22:38:19 +01:00
Edward Firmo	9d64b099a4	Lint	2025-01-04 22:34:38 +01:00
Edward Firmo	037801e961	Revert to media player and neopixelbus	2025-01-04 22:31:14 +01:00
Edward Firmo	79b57304c7	Point users to `stable` tag.	2025-01-03 22:53:46 +01:00
Matthijs33	48ddfbf8b0	Update TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml fixes #74 Value was "OFF" instead of "ON"	2025-01-01 14:32:17 +01:00
GitHub Actions	2e43160acb	Bump version to 2024.12.27 [skip-versioning]	2024-12-28 00:11:36 +00:00
Edward Firmo	8656d0c4ca	Merge pull request #81 from skykingjwc/patch-1 Update README.md	2024-12-28 01:11:26 +01:00
Jordan W. Cobb	133d571874	Update README.md Corrected path to TX-Ultimate-Easy-ESPHome.yaml	2024-12-27 17:39:05 -05:00
GitHub Actions	1489bc5237	Bump version to 2024.12.26 [skip-versioning]	2024-12-27 10:12:23 +00:00
Edward Firmo	11b21de8a9	Merge pull request #80 from edwardtfn/adaptative-logo Adaptative logo	2024-12-27 11:12:12 +01:00
Edward Firmo	e8346e4436	Revert the new line thing It broke the visual	2024-12-27 11:09:11 +01:00
Edward Firmo	e3abc6c6d5	Split table in lines	2024-12-27 11:07:31 +01:00
Edward Firmo	3e847bbd4a	Allow for Inline HTML	2024-12-27 11:05:12 +01:00
Edward Firmo	ba69b43688	Adaptative logo	2024-12-27 11:02:25 +01:00
@@ -1 +1 @@
 .12.25
 .7.2