diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml
index 8748b70..3dc39b4 100644
--- a/nspanel_blueprint.yaml
+++ b/nspanel_blueprint.yaml
@@ -6531,6 +6531,18 @@ action:
                         target:
                           entity_id: '{{ nspanel_event.entity }}'
                         continue_on_error: true
+                  - delay:
+                      milliseconds: 500
+                  - service: homeassistant.update_entity
+                    data:
+                      entity_id: '{{ nspanel_event.entity }}'
+                    continue_on_error: true
+                  - delay:
+                      milliseconds: 1500
+                  - service: homeassistant.update_entity
+                    data:
+                      entity_id: '{{ nspanel_event.entity }}'
+                    continue_on_error: true
 
               ##### Page changed #####
               - alias: Page changed
@@ -7603,6 +7615,13 @@ action:
                         sequence: &refresh_page_media_player
                           - variables:
                               media_player_entity: '{{ nspanel_event.entity if nspanel_event is defined and nspanel_event.entity is defined else trigger.entity_id }}'
+                          - service: homeassistant.update_entity
+                            data:
+                              entity_id: '{{ nspanel_event.entity }}'
+                            continue_on_error: true
+                          - delay:
+                              milliseconds: 500
+                          - variables:
                               media_player:
                                 state: '{{ states(media_player_entity) }}'
                                 is_volume_muted: '{{ state_attr(media_player_entity, "is_volume_muted") | default(false) }}'
@@ -7648,20 +7667,25 @@ action:
                               page_title: '{{ media_player.friendly_name }}'
                               track: '{{ media_player.media_title }}'
                               artist: '{{ media_player.media_artist }}'
-                              bt_on_off: '{{ media_player.supported_features | bitwise_and(feature.TURN_ON) > 0 }}' # DEBUG
+                              bt_on_off: '{{ media_player.supported_features | bitwise_and(feature.TURN_ON) > 0 }}'
                               bt_prev: '{{ media_player.supported_features | bitwise_and(feature.PREVIOUS_TRACK) > 0 }}'
-                              bt_play_pause: 1 #DEBUG
+                              bt_play_pause: '{{ 2 if media_player.state == "playing" else (1 if media_player.state == "paused" else 0)}}'
                               bt_stop: '{{ media_player.supported_features | bitwise_and(feature.STOP) > 0 }}'
                               bt_next: '{{ media_player.supported_features | bitwise_and(feature.NEXT_TRACK) > 0 }}'
                               time_current: '{{ media_player.media_position }}'
                               time_total: '{{ media_player.media_duration }}'
                               time_progress: '{{ 0 if media_player.media_duration <= 0 else (100*media_player.media_position/media_player.media_duration) | round(0, default=0) }}'
                               volume: '{{ media_player.volume_level }}'
-                              bt_mute: 1 #DEBUG
+                              bt_mute: '{{ 1 if media_player.is_volume_muted else 2 }}'
                               bt_vol_down: '{{ media_player.supported_features | bitwise_and(feature.VOLUME_SET) > 0 }}'
                               bt_vol_up: '{{ media_player.supported_features | bitwise_and(feature.VOLUME_SET) > 0 }}'
                             continue_on_error: true
-                          - *delay-default
+                          - delay:
+                              milliseconds: 500
+                          - service: homeassistant.update_entity
+                            data:
+                              entity_id: '{{ nspanel_event.entity }}'
+                            continue_on_error: true
 
                       ## PAGE ALARM ##
                       - alias: Alarm settings page
@@ -8527,7 +8551,14 @@ action:
                                     data:
                                       entity_id: '{{ button_context.entity }}'
                                     continue_on_error: true
-                                  - *delay-default
+                                  - delay:
+                                      milliseconds: 500
+                                  - service: homeassistant.update_entity
+                                    data:
+                                      entity_id: '{{ button_context.entity }}'
+                                    continue_on_error: true
+                                  - delay:
+                                      milliseconds: 1500
                                   - service: homeassistant.update_entity
                                     data:
                                       entity_id: '{{ button_context.entity }}'
@@ -8597,7 +8628,14 @@ action:
                                       data:
                                         entity_id: '{{ last_click_button.entity }}'
                                       continue_on_error: true
-                                    - *delay-default
+                                    - delay:
+                                        milliseconds: 500
+                                    - service: homeassistant.update_entity
+                                      data:
+                                        entity_id: '{{ last_click_button.entity }}'
+                                      continue_on_error: true
+                                    - delay:
+                                        milliseconds: 1500
                                     - service: homeassistant.update_entity
                                       data:
                                         entity_id: '{{ last_click_button.entity }}'
@@ -8637,43 +8675,6 @@ action:
                                 - '{{ entity_domain not in ["unknown", "person", "binary_sensor", "sensor"] }}'
                               sequence:
                                 - *service-button_changed
-                      - alias: Media player page
-                        conditions:
-                          - '{{ nspanel_event.page == page.media_player }}'
-                        sequence:
-                          - if: '{{ nspanel_event.component == "bt_mute" }}'
-                            then:
-                              - service: media_player.volume_mute
-                                data:
-                                  is_volume_muted: '{{ not state_attr(media_player_entity, "is_volume_muted") | default(false) }}'
-                                target:
-                                  entity_id: '{{ nspanel_envent.entity }}'
-                                continue_on_error: true
-                            else:
-                              - service: >
-                                  {% if nspanel_event.component == "bt_on_off" %}
-                                    media_player.toggle
-                                  {% elif nspanel_event.component == "bt_play_pause" %}
-                                    media_player.media_play_pause
-                                  {% elif nspanel_event.component == "bt_stop" %}
-                                    media_player.media_stop
-                                  {% elif nspanel_event.component == "bt_prev" %}
-                                    media_player.media_previous_track
-                                  {% elif nspanel_event.component == "bt_next" %}
-                                    media_player.media_next_track
-                                  {% elif nspanel_event.component == "bt_vol_down" %}
-                                    media_player.volume_down
-                                  {% elif nspanel_event.component == "bt_vol_up" %}
-                                    media_player.volume_up
-                                  {% endif %}
-                                target:
-                                  entity_id: '{{ nspanel_envent.entity }}'
-                                continue_on_error: true
-                          - *delay-default
-                          - service: homeassistant.update_entity
-                            data:
-                              entity_id: '{{ nspanel_envent.entity }}'
-                            continue_on_error: true
 
               ##### Versions mismatch #####
               - alias: Versions
@@ -8891,7 +8892,6 @@ action:
             conditions:
               - '{{ page.current in page.buttonpages }}'
               - '{{ page.current in [page.light, page.cover, page.climate, page.fan, page.alarm] }}'
-
         sequence:
           - choose:
               - alias: "Button pages"
@@ -8930,6 +8930,11 @@ action:
                   - '{{ page.current == page.fan }}'
                   - '{{ trigger.entity_id is match "fan." }}'
                 sequence: *refresh_page_fan
+              - alias: 'Media player page'
+                conditions:
+                  - '{{ page.current == page.media_player }}'
+                  - '{{ trigger.entity_id is match "media_player." }}'
+                sequence: *refresh_page_media_player
               #- alias: 'Alarm page'
               #  conditions:
               #    - '{{ page.current == page.alarm }}'
diff --git a/nspanel_esphome.yaml b/nspanel_esphome.yaml
index e6438aa..ea90ab6 100644
--- a/nspanel_esphome.yaml
+++ b/nspanel_esphome.yaml
@@ -378,7 +378,7 @@ api:
               }
             else if (id(current_page).state == "screensaver") id(disp1).send_command_printf("page %s", id(wakeup_page_name).state.c_str());
             id(disp1).send_command_printf("dim=brightness");
-            if (reset_timer) id(page_timer)->execute(int(id(page_timeout).state));
+            if (reset_timer) id(page_timer)->execute();
 
     #### Service to set the entities ####
     - service: set_entity
@@ -495,7 +495,7 @@ api:
                       - text_sensor.state: # Is boot page visible?
                           id: current_page
                           state: 'boot'
-                  timeout: 5s
+                  timeout: 2s
               - if:
                   condition:
                     - text_sensor.state: # Avoid this being called twice by multiple boot triggers
@@ -983,7 +983,16 @@ sensor:
     on_value:
       then:
         - lambda: |-
-            id(page_timer)->execute(int(id(page_timeout).state));
+            id(page_timer)->execute();
+
+  ##### Send current brightness info to Home Assistant
+  - name: ${device_name} Brightness
+    id: brightness
+    platform: nextion
+    variable_name: dim
+    #update_interval: 1s
+    internal: false
+    precision: 0
 
   ##### Uptime Sensors #####
   - name: ${device_name} Uptime seconds
@@ -1124,7 +1133,7 @@ text_sensor:
       then:
         - lambda: |-
             ESP_LOGV("text_sensor.nspanelevent", "Starting");
-            id(page_timer)->execute(int(id(page_timeout).state));
+            id(page_timer)->execute();
             DynamicJsonDocument doc(1024);
             deserializeJson(doc, x);
             std::string page = doc["page"];
@@ -1262,7 +1271,7 @@ text_sensor:
       then:
         - lambda: |-
             ESP_LOGV("text_sensor.localevent", "Starting");
-            id(page_timer)->execute(int(id(page_timeout).state));
+            id(page_timer)->execute();
             DynamicJsonDocument doc(1024);
             deserializeJson(doc, x);
             std::string page = doc["page"];
@@ -1300,7 +1309,7 @@ text_sensor:
                 ESP_LOGV("text_sensor.localevent", "Construct new page");
               }
             else if (event=="short_click" or event=="long_click") id(ha_button)->execute(page.c_str(), component.c_str(), event.c_str());
-            else if (page == "light" or page == "climate" or page == "notification")// Generic event
+            else if (page == "light" or page == "climate" or page == "notification" or page == "media_player")// Generic event
               {
                 ha_event->fire_homeassistant_event("esphome.nspanel_ha_blueprint",
                   {
@@ -1390,6 +1399,12 @@ text_sensor:
                 id(disp1).send_command_printf("page %s", base_domain.c_str());
               }
             else if (page == "light") id(ha_call_service)->execute("light.turn_on", key.c_str(), value.c_str(), entity.c_str());
+            else if (page == "media_player")
+              {
+                if (key == "volume_mute") id(ha_call_service)->execute("media_player.volume_mute", "is_volume_muted", value.c_str(), entity.c_str());
+                else if (key == "volume_set") id(ha_call_service)->execute("media_player.volume_set", "volume_level", to_string(stof(value) / 100), entity.c_str());
+                else id(ha_call_service)->execute((std::string("media_player.") + key.c_str()), "", "", entity.c_str());
+              }
 
             ESP_LOGV("text_sensor.localevent", "Finished");
 
@@ -1574,12 +1589,24 @@ number:
 
   ##### page-timeout #####
   - platform: template
-    name: ${device_name} Page Timeout
+    name: ${device_name} Page timeout
     id: page_timeout
     entity_category: config
     min_value: 0
     max_value: 60
-    initial_value: 10
+    initial_value: 5
+    step: 1
+    restore_value: true
+    optimistic: true
+
+  ##### 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
@@ -1643,10 +1670,14 @@ display:
             then: *sleep_mode-turn_off
             else: *sleep_mode-turn_on
         - lambda: |-
+            // Set dimming values
             id(display_brightness).publish_state(id(display_brightness_global));
             id(display_dim_brightness).publish_state(id(display_dim_brightness_global));
+            id(disp1).send_command_printf("brightness=%i", id(display_brightness_global));
             id(disp1).send_command_printf("settings.brightslider.val=%i", id(display_brightness_global));
+            id(disp1).send_command_printf("brightness_dim=%i", id(display_dim_brightness_global));
             id(disp1).send_command_printf("settings.dimslider.val=%i", id(display_dim_brightness_global));
+
             id(nextion_init).publish_state(true);
             auto ha_event = new esphome::api::CustomAPIDevice();
             ha_event->fire_homeassistant_event("esphome.nspanel_ha_blueprint",
@@ -1664,11 +1695,9 @@ display:
 script:
   - id: page_timer
     mode: restart
-    parameters:
-      delay: int
     then:
-      - lambda: ESP_LOGV("script.page_timer", "start page-timer delay %i", int(id(page_timeout).state));
-      - delay: !lambda return delay *1000;
+      - lambda: ESP_LOGV("script.page_timer", "start page-timer delay %i", delay);
+      - delay: !lambda return int(id(page_timeout).state *1000);
       - lambda: |-
           if (id(current_page).state == "home" or id(current_page).state == "screensaver" or id(current_page).state == "boot" or int(id(page_timeout).state) == 0)
             ESP_LOGD("script.page_timer", "no page-jump");
diff --git a/nspanel_eu.HMI b/nspanel_eu.HMI
index 7aa2763..5db184d 100644
Binary files a/nspanel_eu.HMI and b/nspanel_eu.HMI differ
diff --git a/nspanel_eu.tft b/nspanel_eu.tft
index d5861b8..b64f172 100644
Binary files a/nspanel_eu.tft and b/nspanel_eu.tft differ
diff --git a/nspanel_eu_code/Program.s.txt b/nspanel_eu_code/Program.s.txt
index 66022c1..627811f 100644
--- a/nspanel_eu_code/Program.s.txt
+++ b/nspanel_eu_code/Program.s.txt
@@ -4,6 +4,7 @@ Program.s
     int r=0,g=0,b=0
     int h=0,s=0,v=0
     int p=0,q=0,t=0,f=0
+    int dimdelta=0
     int api=0 // 0 = disconnected from HA, 1 = connected to HA
     int sleep_mode=0
     int is_alarm=0,is_entities=0,is_qrcode=0,is_notification=0
diff --git a/nspanel_eu_code/alarm.txt b/nspanel_eu_code/alarm.txt
index e4c8112..e931c94 100644
--- a/nspanel_eu_code/alarm.txt
+++ b/nspanel_eu_code/alarm.txt
@@ -12,7 +12,6 @@ Page alarm
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -436,3 +435,26 @@ Hotspot bt_disarm
             printh 00
             printh FF FF FF
         
+Timer wakeup_timer
+    Attributes
+        ID         : 33
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
diff --git a/nspanel_eu_code/boot.txt b/nspanel_eu_code/boot.txt
index 9651ca7..3bf8717 100644
--- a/nspanel_eu_code/boot.txt
+++ b/nspanel_eu_code/boot.txt
@@ -12,8 +12,8 @@ Page boot
     
     Events
         Preinitialize Event
+            dim=0
             vis bt_reboot,0
-            dim=100
             covx display_mode,aux2.txt,0,0
             nspanelevent.txt="{\"page\": \"boot\", \"event\": \"pagechanged\", \"version\": \""+tft_version.txt+"\", \"display_mode\": \""+aux2.txt+"\"}"
             printh 92
@@ -37,6 +37,9 @@ Page boot
             prints rand,0
             printh FF FF FF
         
+        Page Exit Event
+            dim=0
+        
 Variable (int32) counter
     Attributes
         ID   : 12
@@ -185,3 +188,26 @@ Timer timer
             printh 00
             printh FF FF FF
         
+Timer wakeup_timer
+    Attributes
+        ID         : 16
+        Scope      : local
+        Period (ms): 50
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<100)
+            {
+                dimdelta=100-dim
+                dimdelta/=25
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
diff --git a/nspanel_eu_code/buttonpage01.txt b/nspanel_eu_code/buttonpage01.txt
index fef0928..c4e36a2 100644
--- a/nspanel_eu_code/buttonpage01.txt
+++ b/nspanel_eu_code/buttonpage01.txt
@@ -12,7 +12,6 @@ Page buttonpage01
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -752,6 +751,29 @@ Timer click_timer
             printh FF FF FF
             click_timer.en=0
         
+Timer wakeup_timer
+    Attributes
+        ID         : 58
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_eu_code/buttonpage02.txt b/nspanel_eu_code/buttonpage02.txt
index e68be8b..2dbc205 100644
--- a/nspanel_eu_code/buttonpage02.txt
+++ b/nspanel_eu_code/buttonpage02.txt
@@ -12,7 +12,6 @@ Page buttonpage02
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -752,6 +751,29 @@ Timer click_timer
             printh FF FF FF
             click_timer.en=0
         
+Timer wakeup_timer
+    Attributes
+        ID         : 58
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_eu_code/buttonpage03.txt b/nspanel_eu_code/buttonpage03.txt
index 56340e3..64ea985 100644
--- a/nspanel_eu_code/buttonpage03.txt
+++ b/nspanel_eu_code/buttonpage03.txt
@@ -12,7 +12,6 @@ Page buttonpage03
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -752,6 +751,29 @@ Timer click_timer
             printh FF FF FF
             click_timer.en=0
         
+Timer wakeup_timer
+    Attributes
+        ID         : 58
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_eu_code/buttonpage04.txt b/nspanel_eu_code/buttonpage04.txt
index 1906ad0..3e4c608 100644
--- a/nspanel_eu_code/buttonpage04.txt
+++ b/nspanel_eu_code/buttonpage04.txt
@@ -12,7 +12,6 @@ Page buttonpage04
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -752,6 +751,29 @@ Timer click_timer
             printh FF FF FF
             click_timer.en=0
         
+Timer wakeup_timer
+    Attributes
+        ID         : 58
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_eu_code/climate.txt b/nspanel_eu_code/climate.txt
index 6cef254..6f26a24 100644
--- a/nspanel_eu_code/climate.txt
+++ b/nspanel_eu_code/climate.txt
@@ -12,7 +12,6 @@ Page climate
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==1||entity.txt=="embedded_climate")
             {
                 climatesetting.txt="{\"page\": \"climate\", \"component\": \"currentpage\", \"value\": \"pagechange\", \"entity\": \""+entity.txt+"\"}"
@@ -706,6 +705,29 @@ Timer click_timer
             printh FF FF FF
             click_timer.en=0
         
+Timer wakeup_timer
+    Attributes
+        ID         : 52
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_eu_code/confirm.txt b/nspanel_eu_code/confirm.txt
index 71c5c80..a6a1dcd 100644
--- a/nspanel_eu_code/confirm.txt
+++ b/nspanel_eu_code/confirm.txt
@@ -12,7 +12,6 @@ Page confirm
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -146,3 +145,26 @@ Button bt_clear
         Touch Release Event
             page page_id.val
         
+Timer wakeup_timer
+    Attributes
+        ID         : 11
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
diff --git a/nspanel_eu_code/cover.txt b/nspanel_eu_code/cover.txt
index 2ff6df7..e0ea749 100644
--- a/nspanel_eu_code/cover.txt
+++ b/nspanel_eu_code/cover.txt
@@ -12,7 +12,6 @@ Page cover
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -230,3 +229,26 @@ Button button_back
                 page home
             }
         
+Timer wakeup_timer
+    Attributes
+        ID         : 15
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
diff --git a/nspanel_eu_code/entitypage01.txt b/nspanel_eu_code/entitypage01.txt
index f78650d..39af2f3 100644
--- a/nspanel_eu_code/entitypage01.txt
+++ b/nspanel_eu_code/entitypage01.txt
@@ -12,7 +12,6 @@ Page entitypage01
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -326,6 +325,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 30
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_eu_code/entitypage02.txt b/nspanel_eu_code/entitypage02.txt
index 7e38687..f31f131 100644
--- a/nspanel_eu_code/entitypage02.txt
+++ b/nspanel_eu_code/entitypage02.txt
@@ -326,6 +326,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 30
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_eu_code/entitypage03.txt b/nspanel_eu_code/entitypage03.txt
index 8f9fd7d..64284dd 100644
--- a/nspanel_eu_code/entitypage03.txt
+++ b/nspanel_eu_code/entitypage03.txt
@@ -12,7 +12,6 @@ Page entitypage03
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -326,6 +325,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 30
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_eu_code/entitypage04.txt b/nspanel_eu_code/entitypage04.txt
index 6f2ea80..951e421 100644
--- a/nspanel_eu_code/entitypage04.txt
+++ b/nspanel_eu_code/entitypage04.txt
@@ -12,7 +12,6 @@ Page entitypage04
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -326,6 +325,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 30
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_eu_code/fan.txt b/nspanel_eu_code/fan.txt
index d783070..53c173e 100644
--- a/nspanel_eu_code/fan.txt
+++ b/nspanel_eu_code/fan.txt
@@ -12,7 +12,6 @@ Page fan
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -362,6 +361,29 @@ Timer timer0
             printh 00
             printh FF FF FF
         
+Timer wakeup_timer
+    Attributes
+        ID         : 17
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 4
diff --git a/nspanel_eu_code/home.txt b/nspanel_eu_code/home.txt
index 2f0d655..70944d5 100644
--- a/nspanel_eu_code/home.txt
+++ b/nspanel_eu_code/home.txt
@@ -12,7 +12,6 @@ Page home
     
     Events
         Preinitialize Event
-            dim=brightness
             dimtimer.en=1
             sleeptimer.en=1
             printh 92
@@ -566,7 +565,7 @@ Timer dimtimer
         Timer Event
             if(disdim.val==0)
             {
-                dim=brightness_dim // Dim down screen to val set from HA
+                dims=brightness_dim // Dim down screen to val set from HA
             }
         
 Timer swipestore
@@ -608,6 +607,29 @@ Timer settings_timer
         Timer Event
             page settings
         
+Timer wakeup_timer
+    Attributes
+        ID         : 50
+        Scope      : local
+        Period (ms): 50
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=25
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 3
diff --git a/nspanel_eu_code/keyb_num.txt b/nspanel_eu_code/keyb_num.txt
index ee1755e..e31ddd0 100644
--- a/nspanel_eu_code/keyb_num.txt
+++ b/nspanel_eu_code/keyb_num.txt
@@ -12,7 +12,6 @@ Page keyb_num
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page page_id.val
@@ -375,3 +374,26 @@ Button bview
                 pin.pw=1
             }
         
+Timer wakeup_timer
+    Attributes
+        ID         : 24
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
diff --git a/nspanel_eu_code/light.txt b/nspanel_eu_code/light.txt
index fbd0852..9fd2c3f 100644
--- a/nspanel_eu_code/light.txt
+++ b/nspanel_eu_code/light.txt
@@ -12,7 +12,6 @@ Page light
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -648,6 +647,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 34
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 20
diff --git a/nspanel_eu_code/media_player.txt b/nspanel_eu_code/media_player.txt
index bade873..70a3b7e 100644
--- a/nspanel_eu_code/media_player.txt
+++ b/nspanel_eu_code/media_player.txt
@@ -12,7 +12,6 @@ Page media_player
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -62,6 +61,19 @@ Variable (string) lastclick
         Text          : 
         Max. Text Size: 255
     
+Variable (string) va0
+    Attributes
+        ID            : 24
+        Scope         : local
+        Text          : 
+        Max. Text Size: 10
+    
+Variable (int32) is_muted
+    Attributes
+        ID   : 25
+        Scope: local
+        Value: 0
+    
 Text page_label
     Attributes
         ID                 : 1
@@ -104,7 +116,13 @@ Text bt_vol_down
     
     Events
         Touch Release Event
-            lastclick.txt="{\"page\": \"media_player\", \"event\": \"short_click\", \"component\": \"bt_vol_down\", \"entity\": \""+entity.txt+"\"}"
+            if(vol_slider.val>0)
+            {
+                vol_slider.val--
+                covx vol_slider.val,va0.txt,0,0
+                vol_text.txt=va0.txt+"%"
+                timer0.en=1
+            }
             printh 92
             prints "localevent",0
             printh 00
@@ -124,7 +142,13 @@ Text bt_vol_up
     
     Events
         Touch Release Event
-            lastclick.txt="{\"page\": \"media_player\", \"event\": \"short_click\", \"component\": \"bt_vol_up\", \"entity\": \""+entity.txt+"\"}"
+            if(vol_slider.val<100)
+            {
+                vol_slider.val++
+                covx vol_slider.val,va0.txt,0,0
+                vol_text.txt=va0.txt+"%"
+                timer0.en=1
+            }
             printh 92
             prints "localevent",0
             printh 00
@@ -144,7 +168,14 @@ Text bt_mute
     
     Events
         Touch Release Event
-            lastclick.txt="{\"page\": \"media_player\", \"event\": \"short_click\", \"component\": \"bt_mute\", \"entity\": \""+entity.txt+"\"}"
+            if(is_muted.val==1)
+            {
+                va0.txt="true"
+            }else
+            {
+                va0.txt="false"
+            }
+            lastclick.txt="{\"page\": \"media_player\", \"key\": \"volume_mute\", \"value\": \""+va0.txt+"\", \"entity\": \""+entity.txt+"\"}"
             printh 92
             prints "localevent",0
             printh 00
@@ -204,7 +235,7 @@ Text bt_prev
     
     Events
         Touch Release Event
-            lastclick.txt="{\"page\": \"media_player\", \"event\": \"short_click\", \"component\": \"bt_prev\", \"entity\": \""+entity.txt+"\"}"
+            lastclick.txt="{\"page\": \"media_player\", \"key\": \"media_previous_track\", \"value\": \"\", \"entity\": \""+entity.txt+"\"}"
             printh 92
             prints "localevent",0
             printh 00
@@ -224,7 +255,7 @@ Text bt_play_pause
     
     Events
         Touch Release Event
-            lastclick.txt="{\"page\": \"media_player\", \"event\": \"short_click\", \"component\": \"bt_play_pause\", \"entity\": \""+entity.txt+"\"}"
+            lastclick.txt="{\"page\": \"media_player\", \"key\": \"media_play_pause\", \"value\": \"\", \"entity\": \""+entity.txt+"\"}"
             printh 92
             prints "localevent",0
             printh 00
@@ -244,7 +275,7 @@ Text bt_stop
     
     Events
         Touch Release Event
-            lastclick.txt="{\"page\": \"media_player\", \"event\": \"short_click\", \"component\": \"bt_stop\", \"entity\": \""+entity.txt+"\"}"
+            lastclick.txt="{\"page\": \"media_player\", \"key\": \"media_stop\", \"value\": \"\", \"entity\": \""+entity.txt+"\"}"
             printh 92
             prints "localevent",0
             printh 00
@@ -264,7 +295,7 @@ Text bt_next
     
     Events
         Touch Release Event
-            lastclick.txt="{\"page\": \"media_player\", \"event\": \"short_click\", \"component\": \"bt_next\", \"entity\": \""+entity.txt+"\"}"
+            lastclick.txt="{\"page\": \"media_player\", \"key\": \"media_next_track\", \"value\": \"\", \"entity\": \""+entity.txt+"\"}"
             printh 92
             prints "localevent",0
             printh 00
@@ -284,7 +315,7 @@ Text bt_on_off
     
     Events
         Touch Release Event
-            lastclick.txt="{\"page\": \"media_player\", \"event\": \"short_click\", \"component\": \"bt_on_off\", \"entity\": \""+entity.txt+"\"}"
+            lastclick.txt="{\"page\": \"media_player\", \"key\": \"toggle\", \"value\": \"\", \"entity\": \""+entity.txt+"\"}"
             printh 92
             prints "localevent",0
             printh 00
@@ -312,6 +343,9 @@ Slider vol_slider
     
     Events
         Touch Release Event
+            covx vol_slider.val,va0.txt,0,0
+            vol_text.txt=va0.txt+"%"
+            timer0.en=1
             printh 91
             prints "touchevent",0
             printh 00
@@ -347,3 +381,46 @@ Button button_back
                 page home
             }
         
+Timer wakeup_timer
+    Attributes
+        ID         : 22
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
+Timer timer0
+    Attributes
+        ID         : 23
+        Scope      : local
+        Period (ms): 1000
+        Enabled    : no
+    
+    Events
+        Timer Event
+            timer0.en=0
+            covx vol_slider.val,va0.txt,0,0
+            vol_text.txt=va0.txt+"%"
+            lastclick.txt="{\"page\": \"media_player\", \"key\": \"volume_set\", \"value\": "+va0.txt+", \"entity\": \""+entity.txt+"\"}"
+            printh 92
+            prints "localevent",0
+            printh 00
+            prints lastclick.txt,0
+            printh 00
+            printh FF FF FF
+        
diff --git a/nspanel_eu_code/notification.txt b/nspanel_eu_code/notification.txt
index da05f62..341bf53 100644
--- a/nspanel_eu_code/notification.txt
+++ b/nspanel_eu_code/notification.txt
@@ -12,7 +12,6 @@ Page notification
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -133,6 +132,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 9
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 3
diff --git a/nspanel_eu_code/qrcode.txt b/nspanel_eu_code/qrcode.txt
index ca7abdf..b5ccbea 100644
--- a/nspanel_eu_code/qrcode.txt
+++ b/nspanel_eu_code/qrcode.txt
@@ -12,7 +12,6 @@ Page qrcode
     
     Events
         Preinitialize Event
-            dim=brightness
             printh 92
             prints "nspanelevent",0
             printh 00
@@ -79,6 +78,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 6
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_eu_code/settings.txt b/nspanel_eu_code/settings.txt
index ef27786..6c82859 100644
--- a/nspanel_eu_code/settings.txt
+++ b/nspanel_eu_code/settings.txt
@@ -12,7 +12,6 @@ Page settings
     
     Events
         Preinitialize Event
-            dim=brightness
             covx brightslider.val,bright_text.txt,0,0
             bright_text.txt+="%"
             covx dimslider.val,dim_text.txt,0,0
@@ -282,3 +281,26 @@ Hotspot bt_dim_up
                 printh FF FF FF
             }
         
+Timer wakeup_timer
+    Attributes
+        ID         : 17
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
diff --git a/nspanel_eu_code/weather01.txt b/nspanel_eu_code/weather01.txt
index 9ee902e..d40e612 100644
--- a/nspanel_eu_code/weather01.txt
+++ b/nspanel_eu_code/weather01.txt
@@ -12,7 +12,6 @@ Page weather01
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -223,6 +222,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 20
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_eu_code/weather02.txt b/nspanel_eu_code/weather02.txt
index 454ca3f..fb15059 100644
--- a/nspanel_eu_code/weather02.txt
+++ b/nspanel_eu_code/weather02.txt
@@ -12,7 +12,6 @@ Page weather02
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -223,6 +222,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 20
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_eu_code/weather03.txt b/nspanel_eu_code/weather03.txt
index 2f9c0bb..c24e07e 100644
--- a/nspanel_eu_code/weather03.txt
+++ b/nspanel_eu_code/weather03.txt
@@ -12,7 +12,6 @@ Page weather03
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -223,6 +222,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 20
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_eu_code/weather04.txt b/nspanel_eu_code/weather04.txt
index 003c169..e7e9fc6 100644
--- a/nspanel_eu_code/weather04.txt
+++ b/nspanel_eu_code/weather04.txt
@@ -12,7 +12,6 @@ Page weather04
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -223,6 +222,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 20
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_eu_code/weather05.txt b/nspanel_eu_code/weather05.txt
index 5300a59..52d076c 100644
--- a/nspanel_eu_code/weather05.txt
+++ b/nspanel_eu_code/weather05.txt
@@ -12,7 +12,6 @@ Page weather05
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -223,6 +222,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 20
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_us.HMI b/nspanel_us.HMI
index d715f6b..55bb4c2 100644
Binary files a/nspanel_us.HMI and b/nspanel_us.HMI differ
diff --git a/nspanel_us.tft b/nspanel_us.tft
index 79c9f3e..39d31b8 100644
Binary files a/nspanel_us.tft and b/nspanel_us.tft differ
diff --git a/nspanel_us_code/Program.s.txt b/nspanel_us_code/Program.s.txt
index 9a77f5d..fbee574 100644
--- a/nspanel_us_code/Program.s.txt
+++ b/nspanel_us_code/Program.s.txt
@@ -4,6 +4,7 @@ Program.s
     int r=0,g=0,b=0
     int h=0,s=0,v=0
     int p=0,q=0,t=0,f=0
+    int dimdelta=0
     int api=0 // 0 = disconnected from HA, 1 = connected to HA
     int sleep_mode=0
     int is_alarm=0,is_entities=0,is_qrcode=0,is_notification=0
diff --git a/nspanel_us_code/alarm.txt b/nspanel_us_code/alarm.txt
index 7667542..06c413f 100644
--- a/nspanel_us_code/alarm.txt
+++ b/nspanel_us_code/alarm.txt
@@ -12,7 +12,6 @@ Page alarm
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -436,3 +435,26 @@ Hotspot bt_disarm
             printh 00
             printh FF FF FF
         
+Timer wakeup_timer
+    Attributes
+        ID         : 33
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
diff --git a/nspanel_us_code/boot.txt b/nspanel_us_code/boot.txt
index 9651ca7..3bf8717 100644
--- a/nspanel_us_code/boot.txt
+++ b/nspanel_us_code/boot.txt
@@ -12,8 +12,8 @@ Page boot
     
     Events
         Preinitialize Event
+            dim=0
             vis bt_reboot,0
-            dim=100
             covx display_mode,aux2.txt,0,0
             nspanelevent.txt="{\"page\": \"boot\", \"event\": \"pagechanged\", \"version\": \""+tft_version.txt+"\", \"display_mode\": \""+aux2.txt+"\"}"
             printh 92
@@ -37,6 +37,9 @@ Page boot
             prints rand,0
             printh FF FF FF
         
+        Page Exit Event
+            dim=0
+        
 Variable (int32) counter
     Attributes
         ID   : 12
@@ -185,3 +188,26 @@ Timer timer
             printh 00
             printh FF FF FF
         
+Timer wakeup_timer
+    Attributes
+        ID         : 16
+        Scope      : local
+        Period (ms): 50
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<100)
+            {
+                dimdelta=100-dim
+                dimdelta/=25
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
diff --git a/nspanel_us_code/buttonpage01.txt b/nspanel_us_code/buttonpage01.txt
index fef0928..c4e36a2 100644
--- a/nspanel_us_code/buttonpage01.txt
+++ b/nspanel_us_code/buttonpage01.txt
@@ -12,7 +12,6 @@ Page buttonpage01
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -752,6 +751,29 @@ Timer click_timer
             printh FF FF FF
             click_timer.en=0
         
+Timer wakeup_timer
+    Attributes
+        ID         : 58
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_us_code/buttonpage02.txt b/nspanel_us_code/buttonpage02.txt
index 8dd658a..f9e152d 100644
--- a/nspanel_us_code/buttonpage02.txt
+++ b/nspanel_us_code/buttonpage02.txt
@@ -12,7 +12,6 @@ Page buttonpage02
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -752,6 +751,29 @@ Timer click_timer
             printh FF FF FF
             click_timer.en=0
         
+Timer wakeup_timer
+    Attributes
+        ID         : 58
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_us_code/buttonpage03.txt b/nspanel_us_code/buttonpage03.txt
index 4cb8399..b0dbb68 100644
--- a/nspanel_us_code/buttonpage03.txt
+++ b/nspanel_us_code/buttonpage03.txt
@@ -12,7 +12,6 @@ Page buttonpage03
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -752,6 +751,29 @@ Timer click_timer
             printh FF FF FF
             click_timer.en=0
         
+Timer wakeup_timer
+    Attributes
+        ID         : 58
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_us_code/buttonpage04.txt b/nspanel_us_code/buttonpage04.txt
index c6832b3..f34210d 100644
--- a/nspanel_us_code/buttonpage04.txt
+++ b/nspanel_us_code/buttonpage04.txt
@@ -12,7 +12,6 @@ Page buttonpage04
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -752,6 +751,29 @@ Timer click_timer
             printh FF FF FF
             click_timer.en=0
         
+Timer wakeup_timer
+    Attributes
+        ID         : 58
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_us_code/climate.txt b/nspanel_us_code/climate.txt
index 1be13d0..70d4b27 100644
--- a/nspanel_us_code/climate.txt
+++ b/nspanel_us_code/climate.txt
@@ -12,7 +12,6 @@ Page climate
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==1||entity.txt=="embedded_climate")
             {
                 climatesetting.txt="{\"page\": \"climate\", \"component\": \"currentpage\", \"value\": \"pagechange\", \"entity\": \""+entity.txt+"\"}"
@@ -702,6 +701,29 @@ Timer click_timer
             printh FF FF FF
             click_timer.en=0
         
+Timer wakeup_timer
+    Attributes
+        ID         : 52
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_us_code/confirm.txt b/nspanel_us_code/confirm.txt
index 71c5c80..a6a1dcd 100644
--- a/nspanel_us_code/confirm.txt
+++ b/nspanel_us_code/confirm.txt
@@ -12,7 +12,6 @@ Page confirm
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -146,3 +145,26 @@ Button bt_clear
         Touch Release Event
             page page_id.val
         
+Timer wakeup_timer
+    Attributes
+        ID         : 11
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
diff --git a/nspanel_us_code/cover.txt b/nspanel_us_code/cover.txt
index 2ff6df7..e0ea749 100644
--- a/nspanel_us_code/cover.txt
+++ b/nspanel_us_code/cover.txt
@@ -12,7 +12,6 @@ Page cover
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -230,3 +229,26 @@ Button button_back
                 page home
             }
         
+Timer wakeup_timer
+    Attributes
+        ID         : 15
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
diff --git a/nspanel_us_code/entitypage01.txt b/nspanel_us_code/entitypage01.txt
index f78650d..39af2f3 100644
--- a/nspanel_us_code/entitypage01.txt
+++ b/nspanel_us_code/entitypage01.txt
@@ -12,7 +12,6 @@ Page entitypage01
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -326,6 +325,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 30
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_us_code/entitypage02.txt b/nspanel_us_code/entitypage02.txt
index 7e38687..0134141 100644
--- a/nspanel_us_code/entitypage02.txt
+++ b/nspanel_us_code/entitypage02.txt
@@ -12,7 +12,6 @@ Page entitypage02
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -326,6 +325,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 30
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_us_code/entitypage03.txt b/nspanel_us_code/entitypage03.txt
index 580a001..7d7dc5c 100644
--- a/nspanel_us_code/entitypage03.txt
+++ b/nspanel_us_code/entitypage03.txt
@@ -12,7 +12,6 @@ Page entitypage03
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -326,6 +325,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 30
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_us_code/entitypage04.txt b/nspanel_us_code/entitypage04.txt
index 6f2ea80..951e421 100644
--- a/nspanel_us_code/entitypage04.txt
+++ b/nspanel_us_code/entitypage04.txt
@@ -12,7 +12,6 @@ Page entitypage04
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -326,6 +325,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 30
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_us_code/fan.txt b/nspanel_us_code/fan.txt
index efccc2e..820dc59 100644
--- a/nspanel_us_code/fan.txt
+++ b/nspanel_us_code/fan.txt
@@ -12,7 +12,6 @@ Page fan
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -357,6 +356,29 @@ Timer timer0
             printh 00
             printh FF FF FF
         
+Timer wakeup_timer
+    Attributes
+        ID         : 17
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 4
diff --git a/nspanel_us_code/home.txt b/nspanel_us_code/home.txt
index cd2f1ad..77d9314 100644
--- a/nspanel_us_code/home.txt
+++ b/nspanel_us_code/home.txt
@@ -12,7 +12,6 @@ Page home
     
     Events
         Preinitialize Event
-            dim=brightness
             dimtimer.en=1
             sleeptimer.en=1
             printh 92
@@ -566,7 +565,7 @@ Timer dimtimer
         Timer Event
             if(disdim.val==0)
             {
-                dim=brightness_dim // Dim down screen to val set from HA
+                dims=brightness_dim // Dim down screen to val set from HA
             }
         
 Timer swipestore
@@ -608,6 +607,29 @@ Timer settings_timer
         Timer Event
             page settings
         
+Timer wakeup_timer
+    Attributes
+        ID         : 50
+        Scope      : local
+        Period (ms): 50
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=25
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 3
diff --git a/nspanel_us_code/keyb_num.txt b/nspanel_us_code/keyb_num.txt
index 1750a18..2d8afe8 100644
--- a/nspanel_us_code/keyb_num.txt
+++ b/nspanel_us_code/keyb_num.txt
@@ -12,7 +12,6 @@ Page keyb_num
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page page_id.val
@@ -375,3 +374,26 @@ Button bview
                 pin.pw=1
             }
         
+Timer wakeup_timer
+    Attributes
+        ID         : 24
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
diff --git a/nspanel_us_code/light.txt b/nspanel_us_code/light.txt
index fbd0852..9fd2c3f 100644
--- a/nspanel_us_code/light.txt
+++ b/nspanel_us_code/light.txt
@@ -12,7 +12,6 @@ Page light
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -648,6 +647,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 34
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 20
diff --git a/nspanel_us_code/media_player.txt b/nspanel_us_code/media_player.txt
index cc1ba65..70a3b7e 100644
--- a/nspanel_us_code/media_player.txt
+++ b/nspanel_us_code/media_player.txt
@@ -12,7 +12,6 @@ Page media_player
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -62,15 +61,16 @@ Variable (string) lastclick
         Text          : 
         Max. Text Size: 255
     
-Variable (int32) va_current
+Variable (string) va0
     Attributes
-        ID   : 23
-        Scope: local
-        Value: 0
+        ID            : 24
+        Scope         : local
+        Text          : 
+        Max. Text Size: 10
     
-Variable (int32) va_total
+Variable (int32) is_muted
     Attributes
-        ID   : 24
+        ID   : 25
         Scope: local
         Value: 0
     
@@ -116,7 +116,13 @@ Text bt_vol_down
     
     Events
         Touch Release Event
-            lastclick.txt="{\"page\": \"media_player\", \"event\": \"short_click\", \"component\": \"bt_vol_down\", \"entity\": \""+entity.txt+"\"}"
+            if(vol_slider.val>0)
+            {
+                vol_slider.val--
+                covx vol_slider.val,va0.txt,0,0
+                vol_text.txt=va0.txt+"%"
+                timer0.en=1
+            }
             printh 92
             prints "localevent",0
             printh 00
@@ -136,7 +142,13 @@ Text bt_vol_up
     
     Events
         Touch Release Event
-            lastclick.txt="{\"page\": \"media_player\", \"event\": \"short_click\", \"component\": \"bt_vol_up\", \"entity\": \""+entity.txt+"\"}"
+            if(vol_slider.val<100)
+            {
+                vol_slider.val++
+                covx vol_slider.val,va0.txt,0,0
+                vol_text.txt=va0.txt+"%"
+                timer0.en=1
+            }
             printh 92
             prints "localevent",0
             printh 00
@@ -156,7 +168,14 @@ Text bt_mute
     
     Events
         Touch Release Event
-            lastclick.txt="{\"page\": \"media_player\", \"event\": \"short_click\", \"component\": \"bt_mute\", \"entity\": \""+entity.txt+"\"}"
+            if(is_muted.val==1)
+            {
+                va0.txt="true"
+            }else
+            {
+                va0.txt="false"
+            }
+            lastclick.txt="{\"page\": \"media_player\", \"key\": \"volume_mute\", \"value\": \""+va0.txt+"\", \"entity\": \""+entity.txt+"\"}"
             printh 92
             prints "localevent",0
             printh 00
@@ -216,7 +235,7 @@ Text bt_prev
     
     Events
         Touch Release Event
-            lastclick.txt="{\"page\": \"media_player\", \"event\": \"short_click\", \"component\": \"bt_prev\", \"entity\": \""+entity.txt+"\"}"
+            lastclick.txt="{\"page\": \"media_player\", \"key\": \"media_previous_track\", \"value\": \"\", \"entity\": \""+entity.txt+"\"}"
             printh 92
             prints "localevent",0
             printh 00
@@ -236,7 +255,7 @@ Text bt_play_pause
     
     Events
         Touch Release Event
-            lastclick.txt="{\"page\": \"media_player\", \"event\": \"short_click\", \"component\": \"bt_play_pause\", \"entity\": \""+entity.txt+"\"}"
+            lastclick.txt="{\"page\": \"media_player\", \"key\": \"media_play_pause\", \"value\": \"\", \"entity\": \""+entity.txt+"\"}"
             printh 92
             prints "localevent",0
             printh 00
@@ -256,7 +275,7 @@ Text bt_stop
     
     Events
         Touch Release Event
-            lastclick.txt="{\"page\": \"media_player\", \"event\": \"short_click\", \"component\": \"bt_stop\", \"entity\": \""+entity.txt+"\"}"
+            lastclick.txt="{\"page\": \"media_player\", \"key\": \"media_stop\", \"value\": \"\", \"entity\": \""+entity.txt+"\"}"
             printh 92
             prints "localevent",0
             printh 00
@@ -276,7 +295,7 @@ Text bt_next
     
     Events
         Touch Release Event
-            lastclick.txt="{\"page\": \"media_player\", \"event\": \"short_click\", \"component\": \"bt_next\", \"entity\": \""+entity.txt+"\"}"
+            lastclick.txt="{\"page\": \"media_player\", \"key\": \"media_next_track\", \"value\": \"\", \"entity\": \""+entity.txt+"\"}"
             printh 92
             prints "localevent",0
             printh 00
@@ -296,7 +315,7 @@ Text bt_on_off
     
     Events
         Touch Release Event
-            lastclick.txt="{\"page\": \"media_player\", \"event\": \"short_click\", \"component\": \"bt_on_off\", \"entity\": \""+entity.txt+"\"}"
+            lastclick.txt="{\"page\": \"media_player\", \"key\": \"toggle\", \"value\": \"\", \"entity\": \""+entity.txt+"\"}"
             printh 92
             prints "localevent",0
             printh 00
@@ -324,6 +343,9 @@ Slider vol_slider
     
     Events
         Touch Release Event
+            covx vol_slider.val,va0.txt,0,0
+            vol_text.txt=va0.txt+"%"
+            timer0.en=1
             printh 91
             prints "touchevent",0
             printh 00
@@ -359,18 +381,46 @@ Button button_back
                 page home
             }
         
-Timer tm_progress
+Timer wakeup_timer
     Attributes
         ID         : 22
         Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
+Timer timer0
+    Attributes
+        ID         : 23
+        Scope      : local
         Period (ms): 1000
         Enabled    : no
     
     Events
         Timer Event
-            if(va_current.val<va_total.val)
-            {
-                va_current.val++
-                //covx time_progress.val,target_temp.txt,0,0
-            }
+            timer0.en=0
+            covx vol_slider.val,va0.txt,0,0
+            vol_text.txt=va0.txt+"%"
+            lastclick.txt="{\"page\": \"media_player\", \"key\": \"volume_set\", \"value\": "+va0.txt+", \"entity\": \""+entity.txt+"\"}"
+            printh 92
+            prints "localevent",0
+            printh 00
+            prints lastclick.txt,0
+            printh 00
+            printh FF FF FF
         
diff --git a/nspanel_us_code/notification.txt b/nspanel_us_code/notification.txt
index ebc776b..99cb4b8 100644
--- a/nspanel_us_code/notification.txt
+++ b/nspanel_us_code/notification.txt
@@ -12,7 +12,6 @@ Page notification
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -143,6 +142,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 10
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 3
diff --git a/nspanel_us_code/qrcode.txt b/nspanel_us_code/qrcode.txt
index ca7abdf..b5ccbea 100644
--- a/nspanel_us_code/qrcode.txt
+++ b/nspanel_us_code/qrcode.txt
@@ -12,7 +12,6 @@ Page qrcode
     
     Events
         Preinitialize Event
-            dim=brightness
             printh 92
             prints "nspanelevent",0
             printh 00
@@ -79,6 +78,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 6
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_us_code/settings.txt b/nspanel_us_code/settings.txt
index f7be7c1..baa0c25 100644
--- a/nspanel_us_code/settings.txt
+++ b/nspanel_us_code/settings.txt
@@ -12,7 +12,6 @@ Page settings
     
     Events
         Preinitialize Event
-            dim=brightness
             covx brightslider.val,bright_text.txt,0,0
             bright_text.txt+="%"
             covx dimslider.val,dim_text.txt,0,0
@@ -388,3 +387,26 @@ Hotspot bt_dim_up
                 printh FF FF FF
             }
         
+Timer wakeup_timer
+    Attributes
+        ID         : 21
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
diff --git a/nspanel_us_code/weather01.txt b/nspanel_us_code/weather01.txt
index 2c5d790..6e8bb83 100644
--- a/nspanel_us_code/weather01.txt
+++ b/nspanel_us_code/weather01.txt
@@ -12,7 +12,6 @@ Page weather01
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -223,6 +222,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 20
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_us_code/weather02.txt b/nspanel_us_code/weather02.txt
index 454ca3f..fb15059 100644
--- a/nspanel_us_code/weather02.txt
+++ b/nspanel_us_code/weather02.txt
@@ -12,7 +12,6 @@ Page weather02
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -223,6 +222,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 20
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_us_code/weather03.txt b/nspanel_us_code/weather03.txt
index 2f9c0bb..c24e07e 100644
--- a/nspanel_us_code/weather03.txt
+++ b/nspanel_us_code/weather03.txt
@@ -12,7 +12,6 @@ Page weather03
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -223,6 +222,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 20
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_us_code/weather04.txt b/nspanel_us_code/weather04.txt
index 003c169..e7e9fc6 100644
--- a/nspanel_us_code/weather04.txt
+++ b/nspanel_us_code/weather04.txt
@@ -12,7 +12,6 @@ Page weather04
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -223,6 +222,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 20
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_us_code/weather05.txt b/nspanel_us_code/weather05.txt
index 5300a59..52d076c 100644
--- a/nspanel_us_code/weather05.txt
+++ b/nspanel_us_code/weather05.txt
@@ -12,7 +12,6 @@ Page weather05
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -223,6 +222,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 20
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_us_land.HMI b/nspanel_us_land.HMI
index ff4bcf0..328de8f 100644
Binary files a/nspanel_us_land.HMI and b/nspanel_us_land.HMI differ
diff --git a/nspanel_us_land.tft b/nspanel_us_land.tft
index 50fcf59..920fd6a 100644
Binary files a/nspanel_us_land.tft and b/nspanel_us_land.tft differ
diff --git a/nspanel_us_land_code/Program.s.txt b/nspanel_us_land_code/Program.s.txt
index 5312bf1..9bed1b0 100644
--- a/nspanel_us_land_code/Program.s.txt
+++ b/nspanel_us_land_code/Program.s.txt
@@ -4,6 +4,7 @@ Program.s
     int r=0,g=0,b=0
     int h=0,s=0,v=0
     int p=0,q=0,t=0,f=0
+    int dimdelta=0
     int api=0 // 0 = disconnected from HA, 1 = connected to HA
     int sleep_mode=0
     int is_alarm=0,is_entities=0,is_qrcode=0,is_notification=0
diff --git a/nspanel_us_land_code/alarm.txt b/nspanel_us_land_code/alarm.txt
index e4c8112..e931c94 100644
--- a/nspanel_us_land_code/alarm.txt
+++ b/nspanel_us_land_code/alarm.txt
@@ -12,7 +12,6 @@ Page alarm
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -436,3 +435,26 @@ Hotspot bt_disarm
             printh 00
             printh FF FF FF
         
+Timer wakeup_timer
+    Attributes
+        ID         : 33
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
diff --git a/nspanel_us_land_code/boot.txt b/nspanel_us_land_code/boot.txt
index 9651ca7..3bf8717 100644
--- a/nspanel_us_land_code/boot.txt
+++ b/nspanel_us_land_code/boot.txt
@@ -12,8 +12,8 @@ Page boot
     
     Events
         Preinitialize Event
+            dim=0
             vis bt_reboot,0
-            dim=100
             covx display_mode,aux2.txt,0,0
             nspanelevent.txt="{\"page\": \"boot\", \"event\": \"pagechanged\", \"version\": \""+tft_version.txt+"\", \"display_mode\": \""+aux2.txt+"\"}"
             printh 92
@@ -37,6 +37,9 @@ Page boot
             prints rand,0
             printh FF FF FF
         
+        Page Exit Event
+            dim=0
+        
 Variable (int32) counter
     Attributes
         ID   : 12
@@ -185,3 +188,26 @@ Timer timer
             printh 00
             printh FF FF FF
         
+Timer wakeup_timer
+    Attributes
+        ID         : 16
+        Scope      : local
+        Period (ms): 50
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<100)
+            {
+                dimdelta=100-dim
+                dimdelta/=25
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
diff --git a/nspanel_us_land_code/buttonpage01.txt b/nspanel_us_land_code/buttonpage01.txt
index dd056b4..ed156b5 100644
--- a/nspanel_us_land_code/buttonpage01.txt
+++ b/nspanel_us_land_code/buttonpage01.txt
@@ -12,7 +12,6 @@ Page buttonpage01
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -752,6 +751,29 @@ Timer click_timer
             printh FF FF FF
             click_timer.en=0
         
+Timer wakeup_timer
+    Attributes
+        ID         : 58
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_us_land_code/buttonpage02.txt b/nspanel_us_land_code/buttonpage02.txt
index af929b3..d23037b 100644
--- a/nspanel_us_land_code/buttonpage02.txt
+++ b/nspanel_us_land_code/buttonpage02.txt
@@ -12,7 +12,6 @@ Page buttonpage02
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -752,6 +751,29 @@ Timer click_timer
             printh FF FF FF
             click_timer.en=0
         
+Timer wakeup_timer
+    Attributes
+        ID         : 58
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_us_land_code/buttonpage03.txt b/nspanel_us_land_code/buttonpage03.txt
index 8e674a7..84f65eb 100644
--- a/nspanel_us_land_code/buttonpage03.txt
+++ b/nspanel_us_land_code/buttonpage03.txt
@@ -12,7 +12,6 @@ Page buttonpage03
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -752,6 +751,29 @@ Timer click_timer
             printh FF FF FF
             click_timer.en=0
         
+Timer wakeup_timer
+    Attributes
+        ID         : 58
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_us_land_code/buttonpage04.txt b/nspanel_us_land_code/buttonpage04.txt
index e377efe..138400a 100644
--- a/nspanel_us_land_code/buttonpage04.txt
+++ b/nspanel_us_land_code/buttonpage04.txt
@@ -12,7 +12,6 @@ Page buttonpage04
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -752,6 +751,29 @@ Timer click_timer
             printh FF FF FF
             click_timer.en=0
         
+Timer wakeup_timer
+    Attributes
+        ID         : 58
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_us_land_code/climate.txt b/nspanel_us_land_code/climate.txt
index 6cef254..6f26a24 100644
--- a/nspanel_us_land_code/climate.txt
+++ b/nspanel_us_land_code/climate.txt
@@ -12,7 +12,6 @@ Page climate
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==1||entity.txt=="embedded_climate")
             {
                 climatesetting.txt="{\"page\": \"climate\", \"component\": \"currentpage\", \"value\": \"pagechange\", \"entity\": \""+entity.txt+"\"}"
@@ -706,6 +705,29 @@ Timer click_timer
             printh FF FF FF
             click_timer.en=0
         
+Timer wakeup_timer
+    Attributes
+        ID         : 52
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_us_land_code/confirm.txt b/nspanel_us_land_code/confirm.txt
index 71c5c80..a6a1dcd 100644
--- a/nspanel_us_land_code/confirm.txt
+++ b/nspanel_us_land_code/confirm.txt
@@ -12,7 +12,6 @@ Page confirm
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -146,3 +145,26 @@ Button bt_clear
         Touch Release Event
             page page_id.val
         
+Timer wakeup_timer
+    Attributes
+        ID         : 11
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
diff --git a/nspanel_us_land_code/cover.txt b/nspanel_us_land_code/cover.txt
index 2ff6df7..e0ea749 100644
--- a/nspanel_us_land_code/cover.txt
+++ b/nspanel_us_land_code/cover.txt
@@ -12,7 +12,6 @@ Page cover
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -230,3 +229,26 @@ Button button_back
                 page home
             }
         
+Timer wakeup_timer
+    Attributes
+        ID         : 15
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
diff --git a/nspanel_us_land_code/entitypage01.txt b/nspanel_us_land_code/entitypage01.txt
index ac057cb..e3baf5b 100644
--- a/nspanel_us_land_code/entitypage01.txt
+++ b/nspanel_us_land_code/entitypage01.txt
@@ -12,7 +12,6 @@ Page entitypage01
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -326,6 +325,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 30
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_us_land_code/entitypage02.txt b/nspanel_us_land_code/entitypage02.txt
index e2dc7e1..ead4a42 100644
--- a/nspanel_us_land_code/entitypage02.txt
+++ b/nspanel_us_land_code/entitypage02.txt
@@ -326,6 +326,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 30
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_us_land_code/entitypage03.txt b/nspanel_us_land_code/entitypage03.txt
index 9a55ad9..3657f11 100644
--- a/nspanel_us_land_code/entitypage03.txt
+++ b/nspanel_us_land_code/entitypage03.txt
@@ -12,7 +12,6 @@ Page entitypage03
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -326,6 +325,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 30
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_us_land_code/entitypage04.txt b/nspanel_us_land_code/entitypage04.txt
index 4c08c8b..1efbf72 100644
--- a/nspanel_us_land_code/entitypage04.txt
+++ b/nspanel_us_land_code/entitypage04.txt
@@ -12,7 +12,6 @@ Page entitypage04
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -326,6 +325,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 30
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_us_land_code/fan.txt b/nspanel_us_land_code/fan.txt
index d783070..53c173e 100644
--- a/nspanel_us_land_code/fan.txt
+++ b/nspanel_us_land_code/fan.txt
@@ -12,7 +12,6 @@ Page fan
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -362,6 +361,29 @@ Timer timer0
             printh 00
             printh FF FF FF
         
+Timer wakeup_timer
+    Attributes
+        ID         : 17
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 4
diff --git a/nspanel_us_land_code/home.txt b/nspanel_us_land_code/home.txt
index fa54c3e..7a24f0a 100644
--- a/nspanel_us_land_code/home.txt
+++ b/nspanel_us_land_code/home.txt
@@ -12,7 +12,6 @@ Page home
     
     Events
         Preinitialize Event
-            dim=brightness
             dimtimer.en=1
             sleeptimer.en=1
             printh 92
@@ -566,7 +565,7 @@ Timer dimtimer
         Timer Event
             if(disdim.val==0)
             {
-                dim=brightness_dim // Dim down screen to val set from HA
+                dims=brightness_dim // Dim down screen to val set from HA
             }
         
 Timer swipestore
@@ -608,6 +607,29 @@ Timer settings_timer
         Timer Event
             page settings
         
+Timer wakeup_timer
+    Attributes
+        ID         : 50
+        Scope      : local
+        Period (ms): 50
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=25
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 3
diff --git a/nspanel_us_land_code/keyb_num.txt b/nspanel_us_land_code/keyb_num.txt
index ee1755e..e31ddd0 100644
--- a/nspanel_us_land_code/keyb_num.txt
+++ b/nspanel_us_land_code/keyb_num.txt
@@ -12,7 +12,6 @@ Page keyb_num
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page page_id.val
@@ -375,3 +374,26 @@ Button bview
                 pin.pw=1
             }
         
+Timer wakeup_timer
+    Attributes
+        ID         : 24
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
diff --git a/nspanel_us_land_code/light.txt b/nspanel_us_land_code/light.txt
index fbd0852..9fd2c3f 100644
--- a/nspanel_us_land_code/light.txt
+++ b/nspanel_us_land_code/light.txt
@@ -12,7 +12,6 @@ Page light
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -648,6 +647,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 34
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 20
diff --git a/nspanel_us_land_code/media_player.txt b/nspanel_us_land_code/media_player.txt
index bade873..afbddc0 100644
--- a/nspanel_us_land_code/media_player.txt
+++ b/nspanel_us_land_code/media_player.txt
@@ -12,7 +12,6 @@ Page media_player
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -62,6 +61,19 @@ Variable (string) lastclick
         Text          : 
         Max. Text Size: 255
     
+Variable (string) va0
+    Attributes
+        ID            : 24
+        Scope         : local
+        Text          : 
+        Max. Text Size: 10
+    
+Variable (int32) is_muted
+    Attributes
+        ID   : 25
+        Scope: local
+        Value: 0
+    
 Text page_label
     Attributes
         ID                 : 1
@@ -104,7 +116,13 @@ Text bt_vol_down
     
     Events
         Touch Release Event
-            lastclick.txt="{\"page\": \"media_player\", \"event\": \"short_click\", \"component\": \"bt_vol_down\", \"entity\": \""+entity.txt+"\"}"
+            if(vol_slider.val>0)
+            {
+                vol_slider.val++
+                covx vol_slider.val,va0.txt,0,0
+                vol_text.txt=va0.txt+"%"
+                timer0.en=1
+            }
             printh 92
             prints "localevent",0
             printh 00
@@ -124,7 +142,13 @@ Text bt_vol_up
     
     Events
         Touch Release Event
-            lastclick.txt="{\"page\": \"media_player\", \"event\": \"short_click\", \"component\": \"bt_vol_up\", \"entity\": \""+entity.txt+"\"}"
+            if(vol_slider.val<100)
+            {
+                vol_slider.val--
+                covx vol_slider.val,va0.txt,0,0
+                vol_text.txt=va0.txt+"%"
+                timer0.en=1
+            }
             printh 92
             prints "localevent",0
             printh 00
@@ -144,7 +168,14 @@ Text bt_mute
     
     Events
         Touch Release Event
-            lastclick.txt="{\"page\": \"media_player\", \"event\": \"short_click\", \"component\": \"bt_mute\", \"entity\": \""+entity.txt+"\"}"
+            if(is_muted.val==1)
+            {
+                va0.txt="true"
+            }else
+            {
+                va0.txt="false"
+            }
+            lastclick.txt="{\"page\": \"media_player\", \"key\": \"volume_mute\", \"value\": \""+va0.txt+"\", \"entity\": \""+entity.txt+"\"}"
             printh 92
             prints "localevent",0
             printh 00
@@ -204,7 +235,7 @@ Text bt_prev
     
     Events
         Touch Release Event
-            lastclick.txt="{\"page\": \"media_player\", \"event\": \"short_click\", \"component\": \"bt_prev\", \"entity\": \""+entity.txt+"\"}"
+            lastclick.txt="{\"page\": \"media_player\", \"key\": \"media_previous_track\", \"value\": \"\", \"entity\": \""+entity.txt+"\"}"
             printh 92
             prints "localevent",0
             printh 00
@@ -224,7 +255,7 @@ Text bt_play_pause
     
     Events
         Touch Release Event
-            lastclick.txt="{\"page\": \"media_player\", \"event\": \"short_click\", \"component\": \"bt_play_pause\", \"entity\": \""+entity.txt+"\"}"
+            lastclick.txt="{\"page\": \"media_player\", \"key\": \"media_play_pause\", \"value\": \"\", \"entity\": \""+entity.txt+"\"}"
             printh 92
             prints "localevent",0
             printh 00
@@ -244,7 +275,7 @@ Text bt_stop
     
     Events
         Touch Release Event
-            lastclick.txt="{\"page\": \"media_player\", \"event\": \"short_click\", \"component\": \"bt_stop\", \"entity\": \""+entity.txt+"\"}"
+            lastclick.txt="{\"page\": \"media_player\", \"key\": \"media_stop\", \"value\": \"\", \"entity\": \""+entity.txt+"\"}"
             printh 92
             prints "localevent",0
             printh 00
@@ -264,7 +295,7 @@ Text bt_next
     
     Events
         Touch Release Event
-            lastclick.txt="{\"page\": \"media_player\", \"event\": \"short_click\", \"component\": \"bt_next\", \"entity\": \""+entity.txt+"\"}"
+            lastclick.txt="{\"page\": \"media_player\", \"key\": \"media_next_track\", \"value\": \"\", \"entity\": \""+entity.txt+"\"}"
             printh 92
             prints "localevent",0
             printh 00
@@ -284,7 +315,7 @@ Text bt_on_off
     
     Events
         Touch Release Event
-            lastclick.txt="{\"page\": \"media_player\", \"event\": \"short_click\", \"component\": \"bt_on_off\", \"entity\": \""+entity.txt+"\"}"
+            lastclick.txt="{\"page\": \"media_player\", \"key\": \"toggle\", \"value\": \"\", \"entity\": \""+entity.txt+"\"}"
             printh 92
             prints "localevent",0
             printh 00
@@ -312,6 +343,9 @@ Slider vol_slider
     
     Events
         Touch Release Event
+            covx vol_slider.val,va0.txt,0,0
+            vol_text.txt=va0.txt+"%"
+            timer0.en=1
             printh 91
             prints "touchevent",0
             printh 00
@@ -347,3 +381,46 @@ Button button_back
                 page home
             }
         
+Timer wakeup_timer
+    Attributes
+        ID         : 22
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
+Timer timer0
+    Attributes
+        ID         : 23
+        Scope      : local
+        Period (ms): 1000
+        Enabled    : no
+    
+    Events
+        Timer Event
+            timer0.en=0
+            covx vol_slider.val,va0.txt,0,0
+            vol_text.txt=va0.txt+"%"
+            lastclick.txt="{\"page\": \"media_player\", \"key\": \"volume_set\", \"value\": "+va0.txt+", \"entity\": \""+entity.txt+"\"}"
+            printh 92
+            prints "localevent",0
+            printh 00
+            prints lastclick.txt,0
+            printh 00
+            printh FF FF FF
+        
diff --git a/nspanel_us_land_code/notification.txt b/nspanel_us_land_code/notification.txt
index da05f62..341bf53 100644
--- a/nspanel_us_land_code/notification.txt
+++ b/nspanel_us_land_code/notification.txt
@@ -12,7 +12,6 @@ Page notification
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -133,6 +132,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 9
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 3
diff --git a/nspanel_us_land_code/qrcode.txt b/nspanel_us_land_code/qrcode.txt
index ca7abdf..b5ccbea 100644
--- a/nspanel_us_land_code/qrcode.txt
+++ b/nspanel_us_land_code/qrcode.txt
@@ -12,7 +12,6 @@ Page qrcode
     
     Events
         Preinitialize Event
-            dim=brightness
             printh 92
             prints "nspanelevent",0
             printh 00
@@ -79,6 +78,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 6
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_us_land_code/settings.txt b/nspanel_us_land_code/settings.txt
index 67b2251..b7b3241 100644
--- a/nspanel_us_land_code/settings.txt
+++ b/nspanel_us_land_code/settings.txt
@@ -12,7 +12,6 @@ Page settings
     
     Events
         Preinitialize Event
-            dim=brightness
             covx brightslider.val,bright_text.txt,0,0
             bright_text.txt+="%"
             covx dimslider.val,dim_text.txt,0,0
@@ -282,3 +281,26 @@ Hotspot bt_dim_up
                 printh FF FF FF
             }
         
+Timer wakeup_timer
+    Attributes
+        ID         : 17
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
diff --git a/nspanel_us_land_code/weather01.txt b/nspanel_us_land_code/weather01.txt
index 57c8899..e4ba3bf 100644
--- a/nspanel_us_land_code/weather01.txt
+++ b/nspanel_us_land_code/weather01.txt
@@ -12,7 +12,6 @@ Page weather01
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -223,6 +222,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 20
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_us_land_code/weather02.txt b/nspanel_us_land_code/weather02.txt
index 7e16258..cd8f9fe 100644
--- a/nspanel_us_land_code/weather02.txt
+++ b/nspanel_us_land_code/weather02.txt
@@ -12,7 +12,6 @@ Page weather02
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -223,6 +222,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 20
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_us_land_code/weather03.txt b/nspanel_us_land_code/weather03.txt
index 240dc7b..99a33d8 100644
--- a/nspanel_us_land_code/weather03.txt
+++ b/nspanel_us_land_code/weather03.txt
@@ -12,7 +12,6 @@ Page weather03
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -223,6 +222,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 20
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_us_land_code/weather04.txt b/nspanel_us_land_code/weather04.txt
index df421a7..c5348f0 100644
--- a/nspanel_us_land_code/weather04.txt
+++ b/nspanel_us_land_code/weather04.txt
@@ -12,7 +12,6 @@ Page weather04
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -223,6 +222,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 20
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1
diff --git a/nspanel_us_land_code/weather05.txt b/nspanel_us_land_code/weather05.txt
index f554d9c..05c93d8 100644
--- a/nspanel_us_land_code/weather05.txt
+++ b/nspanel_us_land_code/weather05.txt
@@ -12,7 +12,6 @@ Page weather05
     
     Events
         Preinitialize Event
-            dim=brightness
             if(api==0)
             {
                 page home
@@ -223,6 +222,29 @@ Timer swipestore
             swipex=tch0
             swipey=tch1
         
+Timer wakeup_timer
+    Attributes
+        ID         : 20
+        Scope      : local
+        Period (ms): 100
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            if(dim<brightness)
+            {
+                dimdelta=brightness-dim
+                dimdelta/=10
+                if(dimdelta<1)
+                {
+                    dimdelta=1
+                }
+                dim+=dimdelta
+            }else
+            {
+                wakeup_timer.en=0
+            }
+        
 TouchCap swipe
     Attributes
         ID   : 1