diff --git a/.test/esphome_advanced.yaml b/.test/esphome_advanced.yaml
index a220a91..d8c7a8d 100644
--- a/.test/esphome_advanced.yaml
+++ b/.test/esphome_advanced.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device_name: nspanel
   wifi_ssid: "nspanel"
@@ -5,8 +6,9 @@ substitutions:
   nextion_update_url: "https://github.com/Blackymas/NSPanel_HA_Blueprint/dummy"
 
 packages:
-  core_package: !include ../nspanel_esphome.yaml # Core package
+  core_package: !include ../nspanel_esphome.yaml  # Core package
   advanced_package: !include ../advanced/esphome/nspanel_esphome_advanced.yaml
-  #addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
-  #addon_climate_cool: !include ../nspanel_esphome_addon_climate_cool.yaml
-  #addon_climate_dual: !include ../nspanel_esphome_addon_climate_dual.yaml
+  # addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
+  # addon_climate_cool: !include ../nspanel_esphome_addon_climate_cool.yaml
+  # addon_climate_dual: !include ../nspanel_esphome_addon_climate_dual.yaml
+...
diff --git a/.test/esphome_advanced_climate_cool_esp_idf.yaml b/.test/esphome_advanced_climate_cool_esp_idf.yaml
index 32fb9e8..cca2a07 100644
--- a/.test/esphome_advanced_climate_cool_esp_idf.yaml
+++ b/.test/esphome_advanced_climate_cool_esp_idf.yaml
@@ -5,11 +5,11 @@ substitutions:
   nextion_update_url: "https://github.com/Blackymas/NSPanel_HA_Blueprint/dummy"
 
 packages:
-  core_package: !include ../nspanel_esphome.yaml # Core package
+  core_package: !include ../nspanel_esphome.yaml  # Core package
   advanced_package: !include ../advanced/esphome/nspanel_esphome_advanced.yaml
-  #addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
+  # addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
   addon_climate_cool: !include ../nspanel_esphome_addon_climate_cool.yaml
-  #addon_climate_dual: !include ../nspanel_esphome_addon_climate_dual.yaml
+  # addon_climate_dual: !include ../nspanel_esphome_addon_climate_dual.yaml
 
 esp32:
   framework:
diff --git a/.test/esphome_advanced_climate_dual_esp_idf5.yaml b/.test/esphome_advanced_climate_dual_esp_idf5.yaml
index 5106406..621b0c5 100644
--- a/.test/esphome_advanced_climate_dual_esp_idf5.yaml
+++ b/.test/esphome_advanced_climate_dual_esp_idf5.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device_name: nspanel
   wifi_ssid: "nspanel"
@@ -5,10 +6,10 @@ substitutions:
   nextion_update_url: "https://github.com/Blackymas/NSPanel_HA_Blueprint/dummy"
 
 packages:
-  core_package: !include ../nspanel_esphome.yaml # Core package
-  #advanced_package: !include ../advanced/esphome/nspanel_esphome_advanced.yaml
-  #addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
-  #addon_climate_cool: !include ../nspanel_esphome_addon_climate_cool.yaml
+  core_package: !include ../nspanel_esphome.yaml  # Core package
+  # advanced_package: !include ../advanced/esphome/nspanel_esphome_advanced.yaml
+  # addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
+  # addon_climate_cool: !include ../nspanel_esphome_addon_climate_cool.yaml
   addon_climate_dual: !include ../nspanel_esphome_addon_climate_dual.yaml
 
 esp32:
@@ -22,3 +23,4 @@ bluetooth_proxy:
 # Set Wi-Fi power save mode to "LIGHT" as required for Bluetooth on ESP32
 wifi:
   power_save_mode: LIGHT
+...
diff --git a/.test/esphome_advanced_climate_heat.yaml b/.test/esphome_advanced_climate_heat.yaml
index 2267551..57f7f06 100644
--- a/.test/esphome_advanced_climate_heat.yaml
+++ b/.test/esphome_advanced_climate_heat.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device_name: nspanel
   wifi_ssid: "nspanel"
@@ -5,8 +6,9 @@ substitutions:
   nextion_update_url: "https://github.com/Blackymas/NSPanel_HA_Blueprint/dummy"
 
 packages:
-  core_package: !include ../nspanel_esphome.yaml # Core package
+  core_package: !include ../nspanel_esphome.yaml  # Core package
   advanced_package: !include ../advanced/esphome/nspanel_esphome_advanced.yaml
   addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
-  #addon_climate_cold: !include ../nspanel_esphome_addon_climate_cold.yaml
-  #addon_climate_dual: !include ../nspanel_esphome_addon_climate_dual.yaml
+  # addon_climate_cold: !include ../nspanel_esphome_addon_climate_cold.yaml
+  # addon_climate_dual: !include ../nspanel_esphome_addon_climate_dual.yaml
+...
diff --git a/.test/esphome_advanced_climate_heat_customizations.yaml b/.test/esphome_advanced_climate_heat_customizations.yaml
index 190e079..80702e1 100644
--- a/.test/esphome_advanced_climate_heat_customizations.yaml
+++ b/.test/esphome_advanced_climate_heat_customizations.yaml
@@ -1,14 +1,15 @@
+---
 substitutions:
   device_name: nspanel
   wifi_ssid: "nspanel"
   wifi_password: "NSPanel_HA_Blueprint"
 
 packages:
-  core_package: !include ../nspanel_esphome.yaml # Core package
+  core_package: !include ../nspanel_esphome.yaml  # Core package
   advanced_package: !include ../advanced/esphome/nspanel_esphome_advanced.yaml
   addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
-  #addon_climate_cold: !include ../nspanel_esphome_addon_climate_cold.yaml
-  #addon_climate_dual: !include ../nspanel_esphome_addon_climate_dual.yaml
+  # addon_climate_cold: !include ../nspanel_esphome_addon_climate_cold.yaml
+  # addon_climate_dual: !include ../nspanel_esphome_addon_climate_dual.yaml
 
 ##### Customizations from Wiki #####
 api:
@@ -175,12 +176,6 @@ time:
       - europe.pool.ntp.org
       - 0.pool.ntp.org
     on_time:
-      #- hours: 22
-      #  minutes: 0
-      #  seconds: 0
-      #  then:
-      #    - deep_sleep.enter:
-      #        sleep_duration: 7h
     # Scheduled relay
       - hours: 7
         minutes: 30
@@ -249,3 +244,4 @@ wifi:
       priority: 0
   # Set Wi-Fi power save mode to "LIGHT" as required for Bluetooth on ESP32
   power_save_mode: LIGHT
+...
diff --git a/.test/esphome_climate_cool.yaml b/.test/esphome_climate_cool.yaml
index dc5f05f..b7fa11f 100644
--- a/.test/esphome_climate_cool.yaml
+++ b/.test/esphome_climate_cool.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device_name: nspanel
   wifi_ssid: "nspanel"
@@ -5,8 +6,9 @@ substitutions:
   nextion_update_url: "https://github.com/Blackymas/NSPanel_HA_Blueprint/dummy"
 
 packages:
-  core_package: !include ../nspanel_esphome.yaml # Core package
-  #advanced_package: !include ../advanced/esphome/nspanel_esphome_advanced.yaml
-  #addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
+  core_package: !include ../nspanel_esphome.yaml  # Core package
+  # advanced_package: !include ../advanced/esphome/nspanel_esphome_advanced.yaml
+  # addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
   addon_climate_cool: !include ../nspanel_esphome_addon_climate_cool.yaml
-  #addon_climate_dual: !include ../nspanel_esphome_addon_climate_dual.yaml
+  # addon_climate_dual: !include ../nspanel_esphome_addon_climate_dual.yaml
+...
diff --git a/.test/esphome_climate_dual.yaml b/.test/esphome_climate_dual.yaml
index 4f2edf5..bc33831 100644
--- a/.test/esphome_climate_dual.yaml
+++ b/.test/esphome_climate_dual.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device_name: nspanel
   wifi_ssid: "nspanel"
@@ -5,8 +6,9 @@ substitutions:
   nextion_update_url: "https://github.com/Blackymas/NSPanel_HA_Blueprint/dummy"
 
 packages:
-  core_package: !include ../nspanel_esphome.yaml # Core package
-  #advanced_package: !include ../advanced/esphome/nspanel_esphome_advanced.yaml
-  #addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
-  #addon_climate_cool: !include ../nspanel_esphome_addon_climate_cool.yaml
+  core_package: !include ../nspanel_esphome.yaml  # Core package
+  # advanced_package: !include ../advanced/esphome/nspanel_esphome_advanced.yaml
+  # addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
+  # addon_climate_cool: !include ../nspanel_esphome_addon_climate_cool.yaml
   addon_climate_dual: !include ../nspanel_esphome_addon_climate_dual.yaml
+...
diff --git a/.test/esphome_climate_heat.yaml b/.test/esphome_climate_heat.yaml
index 153240e..947b71a 100644
--- a/.test/esphome_climate_heat.yaml
+++ b/.test/esphome_climate_heat.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device_name: nspanel
   wifi_ssid: "nspanel"
diff --git a/.test/esphome_core.yaml b/.test/esphome_core.yaml
index cf0cc6d..cba7fe2 100644
--- a/.test/esphome_core.yaml
+++ b/.test/esphome_core.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   device_name: nspanel
   wifi_ssid: "nspanel"
@@ -5,8 +6,9 @@ substitutions:
   nextion_update_url: "https://github.com/Blackymas/NSPanel_HA_Blueprint/dummy"
 
 packages:
-  core_package: !include ../nspanel_esphome.yaml # Core package
-  #advanced_package: !include ../advanced/esphome/nspanel_esphome_advanced.yaml
-  #addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
-  #addon_climate_cool: !include ../nspanel_esphome_addon_climate_cool.yaml
-  #addon_climate_dual: !include ../nspanel_esphome_addon_climate_dual.yaml
+  core_package: !include ../nspanel_esphome.yaml  # Core package
+  # advanced_package: !include ../advanced/esphome/nspanel_esphome_advanced.yaml
+  # addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
+  # addon_climate_cool: !include ../nspanel_esphome_addon_climate_cool.yaml
+  # addon_climate_dual: !include ../nspanel_esphome_addon_climate_dual.yaml
+...
diff --git a/.test/secrets.yaml b/.test/secrets.yaml
index db7aae0..e6b6199 100644
--- a/.test/secrets.yaml
+++ b/.test/secrets.yaml
@@ -1,3 +1,4 @@
+---
 api_encryption_key: MSANehPIH8kCp/vGcpPcKPSkYnv3zchyxkXCleXJinM=
 mysntpserver: 192.168.0.1
 web_server_password: NotASecret01
@@ -5,3 +6,4 @@ web_server_username: NotASecret01
 wifi_password: NotASecret01
 wifi_password_backup: NotASecret01
 wifi_ssid_backup: NotASecret01
+...