diff --git a/esphome/nspanel_esphome_core_boot.yaml b/esphome/nspanel_esphome_core_boot.yaml
index d2796823..884cf34f 100644
--- a/esphome/nspanel_esphome_core_boot.yaml
+++ b/esphome/nspanel_esphome_core_boot.yaml
@@ -154,8 +154,8 @@ script:
               if (boot_steps[i].registered) {
                 // Calculate padding based on the actual length of the name
                 const int8_t padding = std::max(0, 21 - static_cast<int>(strlen(boot_steps[i].name)));
-                ESP_LOGI("script", " - %s:%*s%s", boot_steps[i].name, padding, "", 
-                                boot_steps[i].completed ? "Completed" : "PENDING");
+                ESP_LOGI("script", " - %s:%*s%s", boot_steps[i].name, padding, "",
+                                    boot_steps[i].completed ? "Completed" : "PENDING");
               }
             }
           } else {
diff --git a/esphome/nspanel_esphome_core_page_screensaver.yaml b/esphome/nspanel_esphome_core_page_screensaver.yaml
index 826c1de2..a66b5950 100644
--- a/esphome/nspanel_esphome_core_page_screensaver.yaml
+++ b/esphome/nspanel_esphome_core_page_screensaver.yaml
@@ -49,7 +49,8 @@ script:
 
   - id: !extend boot_package_register
     then:
-      - lambda: boot_package_register_add->execute(${BOOT_STEP_PAGE_SCREENSAVER}, "PAGE_SCREENSAVER", "Page Screensaver");
+      - lambda: boot_package_register_add->execute(${BOOT_STEP_PAGE_SCREENSAVER},
+                                                    "PAGE_SCREENSAVER", "Page Screensaver");
 
   - id: !extend display_component_action  # Defined by nspanel_esphome_core_hw_display.yaml
     then:
diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml
index 37f19632..8400f99a 100644
--- a/nspanel_blueprint.yaml
+++ b/nspanel_blueprint.yaml
@@ -10351,7 +10351,9 @@ actions:
                                 continue_on_error: true
 
                       - alias: BOOT_STEP_PAGE_SETTINGS
-                        if: '{{ nspanel_event.BOOT_STEP_PAGE_SETTINGS is defined and nspanel_event.BOOT_STEP_PAGE_SETTINGS }}'
+                        if: >
+                          - '{{ nspanel_event.BOOT_STEP_PAGE_SETTINGS is defined }}'
+                          - '{{ nspanel_event.BOOT_STEP_PAGE_SETTINGS }}'
                         then:
                           - *boot_delay
                           - *delay_default
@@ -10405,7 +10407,9 @@ actions:
                                 continue_on_error: true
 
                       - alias: BOOT_STEP_PAGE_UTILITIES
-                        if: '{{ nspanel_event.BOOT_STEP_PAGE_UTILITIES is defined and nspanel_event.BOOT_STEP_PAGE_UTILITIES }}'
+                        if: >
+                          - '{{ nspanel_event.BOOT_STEP_PAGE_UTILITIES is defined }}'
+                          - '{{ nspanel_event.BOOT_STEP_PAGE_UTILITIES }}'
                         then:
                           - *boot_delay
 
@@ -10443,7 +10447,9 @@ actions:
                                 continue_on_error: true
 
                       - alias: BOOT_STEP_PAGE_WEATHER
-                        if: '{{ nspanel_event.BOOT_STEP_PAGE_WEATHER is defined and nspanel_event.BOOT_STEP_PAGE_WEATHER }}'
+                        if: >
+                          - '{{ nspanel_event.BOOT_STEP_PAGE_WEATHER is defined }}'
+                          - '{{ nspanel_event.BOOT_STEP_PAGE_WEATHER }}'
                         then:
                           - *boot_delay
                           - alias: Set BOOT_STEP_PAGE_WEATHER