diff --git a/advanced/hmi/nspanel_CJK_eu.HMI b/advanced/hmi/nspanel_CJK_eu.HMI
index 23fa4ca..efdbbcd 100644
Binary files a/advanced/hmi/nspanel_CJK_eu.HMI and b/advanced/hmi/nspanel_CJK_eu.HMI differ
diff --git a/advanced/hmi/nspanel_CJK_eu.tft b/advanced/hmi/nspanel_CJK_eu.tft
index 349dc13..fb243fe 100644
Binary files a/advanced/hmi/nspanel_CJK_eu.tft and b/advanced/hmi/nspanel_CJK_eu.tft differ
diff --git a/advanced/hmi/nspanel_CJK_eu_code/Program.s.txt b/advanced/hmi/nspanel_CJK_eu_code/Program.s.txt
index 8a395f0..a51664a 100644
--- a/advanced/hmi/nspanel_CJK_eu_code/Program.s.txt
+++ b/advanced/hmi/nspanel_CJK_eu_code/Program.s.txt
@@ -6,7 +6,7 @@ Program.s
     int p=0,q=0,t=0,f=0
     int dimdelta=0
     int api=0 // 0 = disconnected from HA, 1 = connected to HA
-    int is_alarm=0,is_entities=0,is_qrcode=0,is_notification=0
+    int is_entities=0,is_qrcode=0,is_notification=0
     int brightness=100,brightness_dim=40
     int display_mode=1 // 1 = EU, 2 = US, 3 = US landscape
     int charset=2 // 1 = International (original), 2 = CJK
diff --git a/advanced/hmi/nspanel_CJK_eu_code/home.txt b/advanced/hmi/nspanel_CJK_eu_code/home.txt
index 426d60f..9dbd03f 100644
--- a/advanced/hmi/nspanel_CJK_eu_code/home.txt
+++ b/advanced/hmi/nspanel_CJK_eu_code/home.txt
@@ -16,7 +16,6 @@ Page home
             vis bt_notific,is_notification
             vis bt_qrcode,is_qrcode
             vis bt_entities,is_entities
-            vis bt_alarm,is_alarm
             if(display_mode==3)
             {
                 vis left_bt_text,0
@@ -364,7 +363,7 @@ Text bt_entities
                 page entitypage01
             }
         
-Text bt_alarm
+Text button07
     Attributes
         ID                 : 31
         Scope              : global
@@ -375,10 +374,21 @@ Text bt_alarm
         Max. Text Size     : 3
     
     Events
+        Touch Press Event
+            click_comp.txt="button07"
+            click_timer.en=1
+        
         Touch Release Event
-            if(api==1)
+            if(click_timer.en==1)
             {
-                page alarm
+                click_timer.en=0
+                lastclick.txt="{\"page\": \"home\", \"event\": \"short_click\", \"component\": \""+click_comp.txt+"\"}"
+                printh 92
+                prints "localevent",0
+                printh 00
+                prints lastclick.txt,0
+                printh 00
+                printh FF FF FF
             }
         
 Text meridiem
diff --git a/advanced/hmi/nspanel_CJK_us.HMI b/advanced/hmi/nspanel_CJK_us.HMI
index 4933ca9..670a32c 100644
Binary files a/advanced/hmi/nspanel_CJK_us.HMI and b/advanced/hmi/nspanel_CJK_us.HMI differ
diff --git a/advanced/hmi/nspanel_CJK_us.tft b/advanced/hmi/nspanel_CJK_us.tft
index 2c023f3..d9d0acc 100644
Binary files a/advanced/hmi/nspanel_CJK_us.tft and b/advanced/hmi/nspanel_CJK_us.tft differ
diff --git a/advanced/hmi/nspanel_CJK_us_code/Program.s.txt b/advanced/hmi/nspanel_CJK_us_code/Program.s.txt
index a9e675d..ecccb99 100644
--- a/advanced/hmi/nspanel_CJK_us_code/Program.s.txt
+++ b/advanced/hmi/nspanel_CJK_us_code/Program.s.txt
@@ -6,7 +6,7 @@ Program.s
     int p=0,q=0,t=0,f=0
     int dimdelta=0
     int api=0 // 0 = disconnected from HA, 1 = connected to HA
-    int is_alarm=0,is_entities=0,is_qrcode=0,is_notification=0
+    int is_entities=0,is_qrcode=0,is_notification=0
     int brightness=100,brightness_dim=40
     int display_mode=2 // 1 = EU, 2 = US, 3 = US landscape
     int charset=2 // 1 = International (original), 2 = CJK
diff --git a/advanced/hmi/nspanel_CJK_us_code/home.txt b/advanced/hmi/nspanel_CJK_us_code/home.txt
index 45768a4..bc64bd9 100644
--- a/advanced/hmi/nspanel_CJK_us_code/home.txt
+++ b/advanced/hmi/nspanel_CJK_us_code/home.txt
@@ -16,7 +16,6 @@ Page home
             vis bt_notific,is_notification
             vis bt_qrcode,is_qrcode
             vis bt_entities,is_entities
-            vis bt_alarm,is_alarm
             if(display_mode==3)
             {
                 vis left_bt_text,0
@@ -364,7 +363,7 @@ Text bt_entities
                 page entitypage01
             }
         
-Text bt_alarm
+Text button07
     Attributes
         ID                 : 31
         Scope              : global
@@ -375,10 +374,21 @@ Text bt_alarm
         Max. Text Size     : 3
     
     Events
+        Touch Press Event
+            click_comp.txt="button07"
+            click_timer.en=1
+        
         Touch Release Event
-            if(api==1)
+            if(click_timer.en==1)
             {
-                page alarm
+                click_timer.en=0
+                lastclick.txt="{\"page\": \"home\", \"event\": \"short_click\", \"component\": \""+click_comp.txt+"\"}"
+                printh 92
+                prints "localevent",0
+                printh 00
+                prints lastclick.txt,0
+                printh 00
+                printh FF FF FF
             }
         
 Text meridiem
diff --git a/advanced/hmi/nspanel_CJK_us_land.HMI b/advanced/hmi/nspanel_CJK_us_land.HMI
index 6fd7090..c08af79 100644
Binary files a/advanced/hmi/nspanel_CJK_us_land.HMI and b/advanced/hmi/nspanel_CJK_us_land.HMI differ
diff --git a/advanced/hmi/nspanel_CJK_us_land.tft b/advanced/hmi/nspanel_CJK_us_land.tft
index 76234c4..22235a7 100644
Binary files a/advanced/hmi/nspanel_CJK_us_land.tft and b/advanced/hmi/nspanel_CJK_us_land.tft differ
diff --git a/advanced/hmi/nspanel_CJK_us_land_code/Program.s.txt b/advanced/hmi/nspanel_CJK_us_land_code/Program.s.txt
index aaf15c6..bb9b3f7 100644
--- a/advanced/hmi/nspanel_CJK_us_land_code/Program.s.txt
+++ b/advanced/hmi/nspanel_CJK_us_land_code/Program.s.txt
@@ -6,7 +6,7 @@ Program.s
     int p=0,q=0,t=0,f=0
     int dimdelta=0
     int api=0 // 0 = disconnected from HA, 1 = connected to HA
-    int is_alarm=0,is_entities=0,is_qrcode=0,is_notification=0
+    int is_entities=0,is_qrcode=0,is_notification=0
     int brightness=100,brightness_dim=40
     int display_mode=3 // 1 = EU, 2 = US, 3 = US landscape
     int charset=2 // 1 = International (original), 2 = CJK
diff --git a/advanced/hmi/nspanel_CJK_us_land_code/home.txt b/advanced/hmi/nspanel_CJK_us_land_code/home.txt
index 426d60f..9dbd03f 100644
--- a/advanced/hmi/nspanel_CJK_us_land_code/home.txt
+++ b/advanced/hmi/nspanel_CJK_us_land_code/home.txt
@@ -16,7 +16,6 @@ Page home
             vis bt_notific,is_notification
             vis bt_qrcode,is_qrcode
             vis bt_entities,is_entities
-            vis bt_alarm,is_alarm
             if(display_mode==3)
             {
                 vis left_bt_text,0
@@ -364,7 +363,7 @@ Text bt_entities
                 page entitypage01
             }
         
-Text bt_alarm
+Text button07
     Attributes
         ID                 : 31
         Scope              : global
@@ -375,10 +374,21 @@ Text bt_alarm
         Max. Text Size     : 3
     
     Events
+        Touch Press Event
+            click_comp.txt="button07"
+            click_timer.en=1
+        
         Touch Release Event
-            if(api==1)
+            if(click_timer.en==1)
             {
-                page alarm
+                click_timer.en=0
+                lastclick.txt="{\"page\": \"home\", \"event\": \"short_click\", \"component\": \""+click_comp.txt+"\"}"
+                printh 92
+                prints "localevent",0
+                printh 00
+                prints lastclick.txt,0
+                printh 00
+                printh FF FF FF
             }
         
 Text meridiem
diff --git a/advanced/hmi/nspanel_us.HMI b/advanced/hmi/nspanel_us.HMI
index 339d646..7018fc3 100644
Binary files a/advanced/hmi/nspanel_us.HMI and b/advanced/hmi/nspanel_us.HMI differ
diff --git a/advanced/hmi/nspanel_us_land.HMI b/advanced/hmi/nspanel_us_land.HMI
index b230d13..e0d8703 100644
Binary files a/advanced/hmi/nspanel_us_land.HMI and b/advanced/hmi/nspanel_us_land.HMI differ
diff --git a/advanced/hmi/nspanel_us_land_code/Program.s.txt b/advanced/hmi/nspanel_us_land_code/Program.s.txt
index e5261a2..32d9900 100644
--- a/advanced/hmi/nspanel_us_land_code/Program.s.txt
+++ b/advanced/hmi/nspanel_us_land_code/Program.s.txt
@@ -6,7 +6,7 @@ Program.s
     int p=0,q=0,t=0,f=0
     int dimdelta=0
     int api=0 // 0 = disconnected from HA, 1 = connected to HA
-    int is_alarm=0,is_entities=0,is_qrcode=0,is_notification=0
+    int is_entities=0,is_qrcode=0,is_notification=0
     int brightness=100,brightness_dim=40
     int display_mode=3 // 1 = EU, 2 = US, 3 = US landscape
     int charset=1 // 1 = International (original), 2 = CJK
diff --git a/advanced/hmi/nspanel_us_land_code/home.txt b/advanced/hmi/nspanel_us_land_code/home.txt
index 426d60f..9dbd03f 100644
--- a/advanced/hmi/nspanel_us_land_code/home.txt
+++ b/advanced/hmi/nspanel_us_land_code/home.txt
@@ -16,7 +16,6 @@ Page home
             vis bt_notific,is_notification
             vis bt_qrcode,is_qrcode
             vis bt_entities,is_entities
-            vis bt_alarm,is_alarm
             if(display_mode==3)
             {
                 vis left_bt_text,0
@@ -364,7 +363,7 @@ Text bt_entities
                 page entitypage01
             }
         
-Text bt_alarm
+Text button07
     Attributes
         ID                 : 31
         Scope              : global
@@ -375,10 +374,21 @@ Text bt_alarm
         Max. Text Size     : 3
     
     Events
+        Touch Press Event
+            click_comp.txt="button07"
+            click_timer.en=1
+        
         Touch Release Event
-            if(api==1)
+            if(click_timer.en==1)
             {
-                page alarm
+                click_timer.en=0
+                lastclick.txt="{\"page\": \"home\", \"event\": \"short_click\", \"component\": \""+click_comp.txt+"\"}"
+                printh 92
+                prints "localevent",0
+                printh 00
+                prints lastclick.txt,0
+                printh 00
+                printh FF FF FF
             }
         
 Text meridiem
diff --git a/nspanel_us_land.tft b/nspanel_us_land.tft
index c9c78e7..1d94095 100644
Binary files a/nspanel_us_land.tft and b/nspanel_us_land.tft differ