diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml
index e693df2..e167e13 100644
--- a/nspanel_blueprint.yaml
+++ b/nspanel_blueprint.yaml
@@ -7507,6 +7507,10 @@ action:
                                           repeat.item.entity.split(".") | default([]) | count > 0
                                         }}
                                       then:
+                                        #- service: homeassistant.update_entity
+                                        #  data:
+                                        #    entity_id: '{{ repeat.item.entity }}'
+                                        #  continue_on_error: true
                                         - variables:
                                             item_domain: '{{ repeat.item.entity.split(".")[0] | default("unknown") }}'
                                             current_entity_state: '{{ states(repeat.item.entity) | default("unavailable") }}'
@@ -8364,7 +8368,7 @@ action:
                                   page: entitypage04
                                   component: value08
                           - variables:
-                              entity_page_index: '{{ (nspanel_event.page[-2:] | int(-1)) - 1 }}'
+                              entity_page_index: '{{ (page.current[-2:] | int(-1)) - 1 }}'
                               first_entity: '{{ entity_page_index * 8 }}'
                               last_entity: '{{ first_entity + 8 }}'
                           ##### Entity page - Label #####
diff --git a/nspanel_esphome.yaml b/nspanel_esphome.yaml
index 6bbd78f..3fc420c 100644
--- a/nspanel_esphome.yaml
+++ b/nspanel_esphome.yaml
@@ -1818,6 +1818,45 @@ select:
     set_action:
       - script.execute: update_page_screensaver
 
+  ##### dimming-timeout #####
+  #- platform: template
+  #  name: ${device_name} Dimming timeout
+  #  id: dimming_timeout
+  #  entity_category: config
+  #  min_value: 0
+  #  max_value: 60
+  #  initial_value: 15
+  #  step: 1
+  #  restore_value: true
+  #  optimistic: true
+
+select:
+  - id: wakeup_page_name
+    name: ${device_name} Wake-up page
+    platform: template
+    options:
+      - home
+      - buttonpage01
+      - buttonpage02
+      - buttonpage03
+      - buttonpage04
+      - entitypage01
+      - entitypage02
+      - entitypage03
+      - entitypage04
+      - qrcode
+      - alarm
+    initial_option: home
+    optimistic: true
+    restore_value: true
+    internal: false
+    entity_category: config
+    icon: mdi:page-next-outline
+    #set_action:
+    #  - logger.log:
+    #      format: "Wake-up page set: %s"
+    #      args: ["x.c_str()"]
+
 ##### START - DISPLAY START CONFIGURATION #####
 display:
   - id: disp1