diff --git a/advanced/hmi/nspanel_us.HMI b/advanced/hmi/nspanel_us.HMI
index 7c881e4..f2a94dd 100644
Binary files a/advanced/hmi/nspanel_us.HMI and b/advanced/hmi/nspanel_us.HMI differ
diff --git a/advanced/hmi/nspanel_us_code/alarm.txt b/advanced/hmi/nspanel_us_code/alarm.txt
index 21f700b..a358203 100644
--- a/advanced/hmi/nspanel_us_code/alarm.txt
+++ b/advanced/hmi/nspanel_us_code/alarm.txt
@@ -278,7 +278,7 @@ Hotspot bt_home
             bt_home_icon.pco=0
         
         Touch Release Event
-            lastclick.txt="{\"page\": \"alarm\", \"key\": \"home\", \"value\": \"click\", \"entity\": \""+entity.txt+"\", \"mui\": \""+bt_home_text.txt+"\", \"code_format\": \""+code_format.txt+"\", \"code_arm_req\": \""+code_arm_req.txt+"\"}"
+            lastclick.txt="{\"page\": \"alarm\", \"key\": \"home\", \"value\": \"click\", \"mui\": \""+bt_home_text.txt+"\", \"code_format\": \""+code_format.txt+"\", \"code_arm_req\": \""+code_arm_req.txt+"\"}"
             printh 92
             prints "localevent",0
             printh 00
@@ -302,7 +302,7 @@ Hotspot bt_away
             bt_away_icon.pco=0
         
         Touch Release Event
-            lastclick.txt="{\"page\": \"alarm\", \"key\": \"away\", \"value\": \"click\", \"entity\": \""+entity.txt+"\", \"mui\": \""+bt_away_text.txt+"\", \"code_format\": \""+code_format.txt+"\", \"code_arm_req\": \""+code_arm_req.txt+"\"}"
+            lastclick.txt="{\"page\": \"alarm\", \"key\": \"away\", \"value\": \"click\", \"mui\": \""+bt_away_text.txt+"\", \"code_format\": \""+code_format.txt+"\", \"code_arm_req\": \""+code_arm_req.txt+"\"}"
             printh 92
             prints "localevent",0
             printh 00
@@ -326,7 +326,7 @@ Hotspot bt_night
             bt_night_icon.pco=0
         
         Touch Release Event
-            lastclick.txt="{\"page\": \"alarm\", \"key\": \"night\", \"value\": \"click\", \"entity\": \""+entity.txt+"\", \"mui\": \""+bt_night_text.txt+"\", \"code_format\": \""+code_format.txt+"\", \"code_arm_req\": \""+code_arm_req.txt+"\"}"
+            lastclick.txt="{\"page\": \"alarm\", \"key\": \"night\", \"value\": \"click\", \"mui\": \""+bt_night_text.txt+"\", \"code_format\": \""+code_format.txt+"\", \"code_arm_req\": \""+code_arm_req.txt+"\"}"
             printh 92
             prints "localevent",0
             printh 00
@@ -350,7 +350,7 @@ Hotspot bt_vacat
             bt_vacat_icon.pco=0
         
         Touch Release Event
-            lastclick.txt="{\"page\": \"alarm\", \"key\": \"vacation\", \"value\": \"click\", \"entity\": \""+entity.txt+"\", \"mui\": \""+bt_vacat_text.txt+"\", \"code_format\": \""+code_format.txt+"\", \"code_arm_req\": \""+code_arm_req.txt+"\"}"
+            lastclick.txt="{\"page\": \"alarm\", \"key\": \"vacation\", \"value\": \"click\", \"mui\": \""+bt_vacat_text.txt+"\", \"code_format\": \""+code_format.txt+"\", \"code_arm_req\": \""+code_arm_req.txt+"\"}"
             printh 92
             prints "localevent",0
             printh 00
@@ -374,7 +374,7 @@ Hotspot bt_bypass
             bt_bypass_icon.pco=0
         
         Touch Release Event
-            lastclick.txt="{\"page\": \"alarm\", \"key\": \"bypass\", \"value\": \"click\", \"entity\": \""+entity.txt+"\", \"mui\": \""+bt_bypass_text.txt+"\", \"code_format\": \""+code_format.txt+"\", \"code_arm_req\": \""+code_arm_req.txt+"\"}"
+            lastclick.txt="{\"page\": \"alarm\", \"key\": \"bypass\", \"value\": \"click\", \"mui\": \""+bt_bypass_text.txt+"\", \"code_format\": \""+code_format.txt+"\", \"code_arm_req\": \""+code_arm_req.txt+"\"}"
             printh 92
             prints "localevent",0
             printh 00
@@ -398,7 +398,7 @@ Hotspot bt_disarm
             bt_disarm_icon.pco=0
         
         Touch Release Event
-            lastclick.txt="{\"page\": \"alarm\", \"key\": \"disarm\", \"value\": \"click\", \"entity\": \""+entity.txt+"\", \"mui\": \""+bt_disarm_text.txt+"\", \"code_format\": \""+code_format.txt+"\", \"code_arm_req\": \""+code_arm_req.txt+"\"}"
+            lastclick.txt="{\"page\": \"alarm\", \"key\": \"disarm\", \"value\": \"click\", \"mui\": \""+bt_disarm_text.txt+"\", \"code_format\": \""+code_format.txt+"\", \"code_arm_req\": \""+code_arm_req.txt+"\"}"
             printh 92
             prints "localevent",0
             printh 00
diff --git a/advanced/hmi/nspanel_us_code/keyb_num.txt b/advanced/hmi/nspanel_us_code/keyb_num.txt
index c2da0b9..aea6a3e 100644
--- a/advanced/hmi/nspanel_us_code/keyb_num.txt
+++ b/advanced/hmi/nspanel_us_code/keyb_num.txt
@@ -276,6 +276,12 @@ Button benter
     Events
         Touch Release Event
             aux.txt="{\"page\": \"keyb_num\", \"key\": \""+key.txt+"\", \"value\": \""+value.txt+"\", \"pin\": \""+pin.txt+"\", \"base_domain\": \""+domain.txt+"\"}"
+            printh 92
+            prints "localevent",0
+            printh 00
+            prints aux.txt,0
+            printh 00
+            printh FF FF FF
         
 Button bview
     Attributes
diff --git a/nspanel_us.tft b/nspanel_us.tft
index cbbeb1f..3e07aa8 100644
Binary files a/nspanel_us.tft and b/nspanel_us.tft differ