diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml
index 5e855aa..aab92f9 100644
--- a/nspanel_blueprint.yaml
+++ b/nspanel_blueprint.yaml
@@ -4204,15 +4204,6 @@ action:
             data:
               cmd: page home
 
-      ##### BOOT NSPANEL - automation reload #####
-      - conditions:
-          - condition: trigger
-            id: automation_reloaded
-        sequence:
-          - service: button.press
-            target:
-              entity_id: "{{ reboot_button }}"
-
       ##### PAGE CHANGED - changes when page changed #####
       - conditions:
           - condition: trigger
@@ -4242,7 +4233,7 @@ action:
               ## PAGE HOME ##
               - conditions: '{{ trigger.event.data.new_state.state == page_home }}'
                 alias: 'home page'
-                sequence:
+                sequence: &refresh_page_home
                   - service: '{{ command_set_settings_entity }}'
                     data:
                       entity: 'unknown'
@@ -4712,10 +4703,10 @@ action:
                       milliseconds: "{{ delay_value }}"
                   - service: "{{ command_show_all }}"
 
-             ## PAGE BUTTONPAGE01 ##
+              ## PAGE BUTTONPAGE01 ##
               - conditions: '{{ trigger.event.data.new_state.state == page_buttonpage01 }}'
                 alias: 'buttonpage01 page'
-                sequence:
+                sequence: &refresh_page_buttonpage01
                   - service: '{{ command_set_settings_entity }}'
                     data:
                       entity: 'unknown'
@@ -4966,7 +4957,7 @@ action:
               ## PAGE BUTTONPAGE02 ##
               - conditions: '{{ trigger.event.data.new_state.state == page_buttonpage02 }}'
                 alias: 'buttonpage02 page'
-                sequence:
+                sequence: &refresh_page_buttonpage02
                   - service: '{{ command_set_settings_entity }}'
                     data:
                       entity: 'unknown'
@@ -5217,7 +5208,7 @@ action:
               ## PAGE BUTTONPAGE03 ##
               - conditions: '{{ trigger.event.data.new_state.state == page_buttonpage03 }}'
                 alias: 'buttonpage03 page'
-                sequence:
+                sequence: &refresh_page_buttonpage03
                   - service: '{{ command_set_settings_entity }}'
                     data:
                       entity: 'unknown'
@@ -5468,7 +5459,7 @@ action:
               ## PAGE BUTTONPAGE04 ##
               - conditions: '{{ trigger.event.data.new_state.state == page_buttonpage04 }}'
                 alias: 'buttonpage04 page'
-                sequence:
+                sequence: &refresh_page_buttonpage04
                   - service: '{{ command_set_settings_entity }}'
                     data:
                       entity: 'unknown'
@@ -5885,7 +5876,7 @@ action:
               ## ENTITY PAGE 01 ##
               - conditions: '{{ trigger.event.data.new_state.state == page_entitypage01 }}'
                 alias: 'entity01 page'
-                sequence:
+                sequence: &refresh_page_entitypage01
                   ##### ENTITY Page Label #####
                   - if:
                     - condition: template
@@ -5974,7 +5965,7 @@ action:
               ## ENTITY PAGE 02 ##
               - conditions: '{{ trigger.event.data.new_state.state == page_entitypage02 }}'
                 alias: 'entity02 page'
-                sequence:
+                sequence: &refresh_page_entitypage02
                   ##### ENTITY Page Label #####
                   - if:
                     - condition: template
@@ -6063,7 +6054,7 @@ action:
               ## ENTITY PAGE 03 ##
               - conditions: '{{ trigger.event.data.new_state.state == page_entitypage03 }}'
                 alias: 'entity03 page'
-                sequence:
+                sequence: &refresh_page_entitypage03
                   ##### ENTITY Page Label #####
                   - if:
                     - condition: template
@@ -6146,7 +6137,7 @@ action:
               ## ENTITY PAGE 04 ##
               - conditions: '{{ trigger.event.data.new_state.state == page_entitypage04 }}'
                 alias: 'entity04 page'
-                sequence:
+                sequence: &refresh_page_entitypage04
                   ##### ENTITY Page Label #####
                   - if:
                     - condition: template
@@ -7595,6 +7586,48 @@ action:
                 alias: 'screensaver page'
                 sequence:
 
+      ##### BOOT NSPANEL - automation reload #####
+      - conditions:
+          - condition: trigger
+            id: automation_reloaded
+        sequence:
+          - choose:
+            ## PAGE HOME ##
+            - conditions: '{{ states(current_page) == page_home }}'
+              sequence: *refresh_page_home
+            
+            ## PAGE BUTTONPAGE01 ##
+            - conditions: '{{ states(current_page) == page_buttonpage01 }}'
+              sequence: *refresh_page_buttonpage01
+
+            ## PAGE BUTTONPAGE02 ##
+            - conditions: '{{ states(current_page) == page_buttonpage02 }}'
+              sequence: *refresh_page_buttonpage02
+
+            ## PAGE BUTTONPAGE03 ##
+            - conditions: '{{ states(current_page) == page_buttonpage03 }}'
+              sequence: *refresh_page_buttonpage03
+
+            ## PAGE BUTTONPAGE04 ##
+            - conditions: '{{ states(current_page) == page_buttonpage04 }}'
+              sequence: *refresh_page_buttonpage04
+
+            ## ENTITY PAGE 01 ##
+            - conditions: '{{ states(current_page) == page_entitypage01 }}'
+              sequence: *refresh_page_entitypage01
+
+            ## ENTITY PAGE 02 ##
+            - conditions: '{{ states(current_page) == page_entitypage02 }}'
+              sequence: *refresh_page_entitypage02
+
+            ## ENTITY PAGE 03 ##
+            - conditions: '{{ states(current_page) == page_entitypage03 }}'
+              sequence: *refresh_page_entitypage03
+
+            ## ENTITY PAGE 04 ##
+            - conditions: '{{ states(current_page) == page_entitypage04 }}'
+              sequence: *refresh_page_entitypage04
+
       ##### UPDATE BUTTONS AND PAGES -  button page / lightsettings page / coversettings page  #####
       - conditions:
           - condition: trigger