diff --git a/nspanel_esphome.yaml b/nspanel_esphome.yaml
index 52b284f..4334269 100644
--- a/nspanel_esphome.yaml
+++ b/nspanel_esphome.yaml
@@ -393,7 +393,7 @@ api:
               id(disp1).send_command_printf("page home");
             } else {
               if (page == "home"){
-                id(disp1).send_command_printf("dim=brightness.val");
+                id(disp1).send_command_printf("dim=brightness");
               }
             }
         - if:
@@ -1337,7 +1337,7 @@ number:
                           state: 'screensaver'
                   then:
                     - lambda: 'id(disp1).set_backlight_brightness(x/100);'
-              - lambda: 'id(disp1).send_command_printf("home.brightness.val=%i", int(x));'
+              - lambda: 'id(disp1).send_command_printf("brightness=%i", int(x));'
         - globals.set:
             id: display_brightness_global
             value: !lambda 'return int(x);'
@@ -1355,7 +1355,7 @@ number:
     optimistic: true
     set_action:
       then:
-        - lambda: 'id(disp1).send_command_printf("home.brightdd.val=%i", int(x));'
+        - lambda: 'id(disp1).send_command_printf("brightness_dim=%i", int(x));'
         - globals.set:
             id: display_dim_brightness_global
             value: !lambda 'return int(x);'
diff --git a/nspanel_eu.HMI b/nspanel_eu.HMI
index 1be727f..db797a9 100644
Binary files a/nspanel_eu.HMI and b/nspanel_eu.HMI differ
diff --git a/nspanel_eu.tft b/nspanel_eu.tft
index 4d224fa..fdcf0fe 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 0f19db6..ad7a6f5 100644
--- a/nspanel_eu_code/Program.s.txt
+++ b/nspanel_eu_code/Program.s.txt
@@ -6,6 +6,7 @@ Program.s
     int p=0,q=0,t=0,f=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 brightness=100,brightness_dim=40
     bauds=115200//Configure baudrat
     recmod=0//Serial data parsing mode:0-Passive mode;1-Active mode
     printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port
diff --git a/nspanel_eu_code/alarm.txt b/nspanel_eu_code/alarm.txt
index cb1f7b9..d356169 100644
--- a/nspanel_eu_code/alarm.txt
+++ b/nspanel_eu_code/alarm.txt
@@ -12,7 +12,7 @@ Page alarm
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_eu_code/buttonpage01.txt b/nspanel_eu_code/buttonpage01.txt
index e997046..28fb901 100644
--- a/nspanel_eu_code/buttonpage01.txt
+++ b/nspanel_eu_code/buttonpage01.txt
@@ -12,7 +12,7 @@ Page buttonpage01
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_eu_code/buttonpage02.txt b/nspanel_eu_code/buttonpage02.txt
index 8f17faf..847deb4 100644
--- a/nspanel_eu_code/buttonpage02.txt
+++ b/nspanel_eu_code/buttonpage02.txt
@@ -12,7 +12,7 @@ Page buttonpage02
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_eu_code/buttonpage03.txt b/nspanel_eu_code/buttonpage03.txt
index bad65c9..254c2a9 100644
--- a/nspanel_eu_code/buttonpage03.txt
+++ b/nspanel_eu_code/buttonpage03.txt
@@ -12,7 +12,7 @@ Page buttonpage03
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_eu_code/buttonpage04.txt b/nspanel_eu_code/buttonpage04.txt
index 24c6110..d037c3e 100644
--- a/nspanel_eu_code/buttonpage04.txt
+++ b/nspanel_eu_code/buttonpage04.txt
@@ -12,7 +12,7 @@ Page buttonpage04
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_eu_code/climate.txt b/nspanel_eu_code/climate.txt
index 12ab8a4..fe93b64 100644
--- a/nspanel_eu_code/climate.txt
+++ b/nspanel_eu_code/climate.txt
@@ -12,7 +12,7 @@ Page climate
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==1||home.entity.txt=="embedded_climate")
             {
                 climatesetting.txt="{\"page\": \"climate\", \"component\": \"currentpage\", \"value\": \"pagechange\", \"entity\": \""+home.entity.txt+"\"}"
diff --git a/nspanel_eu_code/cover.txt b/nspanel_eu_code/cover.txt
index 32a10e6..9f7dc2c 100644
--- a/nspanel_eu_code/cover.txt
+++ b/nspanel_eu_code/cover.txt
@@ -12,7 +12,7 @@ Page cover
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_eu_code/entitypage01.txt b/nspanel_eu_code/entitypage01.txt
index 3c33d52..7fd8d83 100644
--- a/nspanel_eu_code/entitypage01.txt
+++ b/nspanel_eu_code/entitypage01.txt
@@ -12,7 +12,7 @@ Page entitypage01
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_eu_code/entitypage02.txt b/nspanel_eu_code/entitypage02.txt
index c0473b9..49b7213 100644
--- a/nspanel_eu_code/entitypage02.txt
+++ b/nspanel_eu_code/entitypage02.txt
@@ -12,7 +12,7 @@ Page entitypage02
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_eu_code/entitypage03.txt b/nspanel_eu_code/entitypage03.txt
index b110583..5597f89 100644
--- a/nspanel_eu_code/entitypage03.txt
+++ b/nspanel_eu_code/entitypage03.txt
@@ -12,7 +12,7 @@ Page entitypage03
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_eu_code/entitypage04.txt b/nspanel_eu_code/entitypage04.txt
index 26916c3..53ed51e 100644
--- a/nspanel_eu_code/entitypage04.txt
+++ b/nspanel_eu_code/entitypage04.txt
@@ -12,7 +12,7 @@ Page entitypage04
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_eu_code/fan.txt b/nspanel_eu_code/fan.txt
index 4b68f1f..663b581 100644
--- a/nspanel_eu_code/fan.txt
+++ b/nspanel_eu_code/fan.txt
@@ -12,7 +12,7 @@ Page fan
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_eu_code/home.txt b/nspanel_eu_code/home.txt
index 710608c..c63e8cd 100644
--- a/nspanel_eu_code/home.txt
+++ b/nspanel_eu_code/home.txt
@@ -12,7 +12,7 @@ Page home
     
     Events
         Preinitialize Event
-            dim=brightness.val
+            dim=brightness
             dimtimer.en=1
             sleeptimer.en=1
             printh 92
@@ -26,47 +26,35 @@ Page home
             vis bt_entities,is_entities
             vis bt_alarm,is_alarm
         
-Variable (int32) brightness
-    Attributes
-        ID   : 2
-        Scope: global
-        Value: 100
-    
-Variable (int32) brightdd
-    Attributes
-        ID   : 3
-        Scope: global
-        Value: 40
-    
 Variable (int32) disdim
     Attributes
-        ID   : 4
+        ID   : 2
         Scope: global
         Value: 0
     
 Variable (int32) sleepmodus
     Attributes
-        ID   : 16
+        ID   : 14
         Scope: global
         Value: 0
     
 Variable (string) lastclick
     Attributes
-        ID            : 50
+        ID            : 48
         Scope         : local
         Text          : 
         Max. Text Size: 100
     
 Variable (string) entity
     Attributes
-        ID            : 51
+        ID            : 49
         Scope         : global
         Text          : 
         Max. Text Size: 100
     
 Text time
     Attributes
-        ID                 : 7
+        ID                 : 5
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -76,7 +64,7 @@ Text time
     
 Text current_temp
     Attributes
-        ID                 : 8
+        ID                 : 6
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -86,7 +74,7 @@ Text current_temp
     
 Text outdoor_temp
     Attributes
-        ID                 : 9
+        ID                 : 7
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -96,7 +84,7 @@ Text outdoor_temp
     
 Text date
     Attributes
-        ID                 : 10
+        ID                 : 8
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -106,7 +94,7 @@ Text date
     
 Text value01_state
     Attributes
-        ID                 : 12
+        ID                 : 10
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -116,7 +104,7 @@ Text value01_state
     
 Text left_bt_text
     Attributes
-        ID                 : 17
+        ID                 : 15
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -126,7 +114,7 @@ Text left_bt_text
     
 Text right_bt_text
     Attributes
-        ID                 : 18
+        ID                 : 16
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -136,7 +124,7 @@ Text right_bt_text
     
 Text icon_top_01
     Attributes
-        ID                 : 21
+        ID                 : 19
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -146,7 +134,7 @@ Text icon_top_01
     
 Text icon_top_02
     Attributes
-        ID                 : 22
+        ID                 : 20
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -156,7 +144,7 @@ Text icon_top_02
     
 Text icon_top_03
     Attributes
-        ID                 : 23
+        ID                 : 21
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -166,7 +154,7 @@ Text icon_top_03
     
 Text icon_top_04
     Attributes
-        ID                 : 24
+        ID                 : 22
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -176,7 +164,7 @@ Text icon_top_04
     
 Text icon_top_05
     Attributes
-        ID                 : 25
+        ID                 : 23
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -186,7 +174,7 @@ Text icon_top_05
     
 Text icon_top_06
     Attributes
-        ID                 : 26
+        ID                 : 24
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -196,7 +184,7 @@ Text icon_top_06
     
 Text icon_top_07
     Attributes
-        ID                 : 27
+        ID                 : 25
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -206,7 +194,7 @@ Text icon_top_07
     
 Text icon_top_08
     Attributes
-        ID                 : 28
+        ID                 : 26
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -216,7 +204,7 @@ Text icon_top_08
     
 Text icon_top_09
     Attributes
-        ID                 : 29
+        ID                 : 27
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -226,7 +214,7 @@ Text icon_top_09
     
 Text icon_top_10
     Attributes
-        ID                 : 30
+        ID                 : 28
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -236,7 +224,7 @@ Text icon_top_10
     
 Text value01_icon
     Attributes
-        ID                 : 31
+        ID                 : 29
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -246,7 +234,7 @@ Text value01_icon
     
 Text value03_state
     Attributes
-        ID                 : 32
+        ID                 : 30
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -256,7 +244,7 @@ Text value03_state
     
 Text value03_icon
     Attributes
-        ID                 : 33
+        ID                 : 31
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -266,7 +254,7 @@ Text value03_icon
     
 Text value02_icon
     Attributes
-        ID                 : 34
+        ID                 : 32
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -276,7 +264,7 @@ Text value02_icon
     
 Text value02_state
     Attributes
-        ID                 : 35
+        ID                 : 33
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -286,7 +274,7 @@ Text value02_state
     
 Text wifi_icon
     Attributes
-        ID                 : 36
+        ID                 : 34
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -296,7 +284,7 @@ Text wifi_icon
     
 Text indoortempicon
     Attributes
-        ID                 : 37
+        ID                 : 35
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -306,7 +294,7 @@ Text indoortempicon
     
 Text button01_icon
     Attributes
-        ID                 : 38
+        ID                 : 36
         Scope              : local
         Dragging           : 0
         Send Component ID  : disabled
@@ -316,7 +304,7 @@ Text button01_icon
     
 Text button02_icon
     Attributes
-        ID                 : 39
+        ID                 : 37
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -326,7 +314,7 @@ Text button02_icon
     
 Text button03_icon
     Attributes
-        ID                 : 40
+        ID                 : 38
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -336,7 +324,7 @@ Text button03_icon
     
 Text bt_notific
     Attributes
-        ID                 : 41
+        ID                 : 39
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -353,7 +341,7 @@ Text bt_notific
         
 Text bt_qrcode
     Attributes
-        ID                 : 42
+        ID                 : 40
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -367,7 +355,7 @@ Text bt_qrcode
         
 Text bt_entities
     Attributes
-        ID                 : 43
+        ID                 : 41
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -384,7 +372,7 @@ Text bt_entities
         
 Text bt_alarm
     Attributes
-        ID                 : 44
+        ID                 : 42
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -402,7 +390,7 @@ Text bt_alarm
         
 Text meridiem
     Attributes
-        ID                 : 49
+        ID                 : 47
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -412,28 +400,28 @@ Text meridiem
     
 Picture weather
     Attributes
-        ID               : 11
+        ID               : 9
         Scope            : global
         Dragging         : 0
         Send Component ID: disabled
     
 Picture left_bt_pic
     Attributes
-        ID               : 19
+        ID               : 17
         Scope            : global
         Dragging         : 0
         Send Component ID: disabled
     
 Picture right_bt_pic
     Attributes
-        ID               : 20
+        ID               : 18
         Scope            : global
         Dragging         : 0
         Send Component ID: disabled
     
 Hotspot fc_weather
     Attributes
-        ID               : 13
+        ID               : 11
         Scope            : global
         Dragging         : 0
         Send Component ID: on press and release
@@ -447,7 +435,7 @@ Hotspot fc_weather
         
 Hotspot jump_climate
     Attributes
-        ID               : 14
+        ID               : 12
         Scope            : local
         Dragging         : 0
         Send Component ID: on press and release
@@ -485,7 +473,7 @@ Hotspot jump_climate
         
 Hotspot button01
     Attributes
-        ID               : 45
+        ID               : 43
         Scope            : local
         Dragging         : 0
         Send Component ID: disabled
@@ -502,7 +490,7 @@ Hotspot button01
         
 Hotspot button02
     Attributes
-        ID               : 46
+        ID               : 44
         Scope            : local
         Dragging         : 0
         Send Component ID: disabled
@@ -519,7 +507,7 @@ Hotspot button02
         
 Hotspot button03
     Attributes
-        ID               : 47
+        ID               : 45
         Scope            : local
         Dragging         : 0
         Send Component ID: disabled
@@ -536,7 +524,7 @@ Hotspot button03
         
 Hotspot settings_click
     Attributes
-        ID               : 48
+        ID               : 46
         Scope            : local
         Dragging         : 0
         Send Component ID: disabled
@@ -559,12 +547,12 @@ Timer dimtimer
         Timer Event
             if(disdim.val==0)
             {
-                dim=brightdd.val // Dim down screen to val set from HA
+                dim=brightness_dim // Dim down screen to val set from HA
             }
         
 Timer swipestore
     Attributes
-        ID         : 6
+        ID         : 4
         Scope      : local
         Period (ms): 50
         Enabled    : no
@@ -576,7 +564,7 @@ Timer swipestore
         
 Timer sleeptimer
     Attributes
-        ID         : 15
+        ID         : 13
         Scope      : local
         Period (ms): 65000
         Enabled    : no
@@ -592,7 +580,7 @@ Timer sleeptimer
         
 Timer settings_timer
     Attributes
-        ID         : 52
+        ID         : 50
         Scope      : local
         Period (ms): 1000
         Enabled    : no
@@ -603,14 +591,14 @@ Timer settings_timer
         
 TouchCap swipe
     Attributes
-        ID   : 5
+        ID   : 3
         Scope: local
         Value: 0
     
     Events
         Touch Press Event
             swipestore.en=1 // Start swipestore timer
-            dim=brightness.val // Set brightness to saved value (from HA)
+            dim=brightness // Set brightness to saved value (from HA)
             dimtimer.en=1 // Enable timer to calc down for dimming screen
             sleeptimer.en=1
         
diff --git a/nspanel_eu_code/keyb_num.txt b/nspanel_eu_code/keyb_num.txt
index 73ba313..e57f52e 100644
--- a/nspanel_eu_code/keyb_num.txt
+++ b/nspanel_eu_code/keyb_num.txt
@@ -12,7 +12,7 @@ Page keyb_num
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page page_id.val
diff --git a/nspanel_eu_code/light.txt b/nspanel_eu_code/light.txt
index 9a30cd1..ce6883a 100644
--- a/nspanel_eu_code/light.txt
+++ b/nspanel_eu_code/light.txt
@@ -12,7 +12,7 @@ Page light
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_eu_code/notification.txt b/nspanel_eu_code/notification.txt
index 2ceff2a..20b1a35 100644
--- a/nspanel_eu_code/notification.txt
+++ b/nspanel_eu_code/notification.txt
@@ -12,7 +12,7 @@ Page notification
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_eu_code/qrcode.txt b/nspanel_eu_code/qrcode.txt
index 66ce761..cde5cdf 100644
--- a/nspanel_eu_code/qrcode.txt
+++ b/nspanel_eu_code/qrcode.txt
@@ -12,7 +12,7 @@ Page qrcode
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             printh 92
             prints "nspanelevent",0
             printh 00
diff --git a/nspanel_eu_code/settings.txt b/nspanel_eu_code/settings.txt
index d672d90..02ff5e9 100644
--- a/nspanel_eu_code/settings.txt
+++ b/nspanel_eu_code/settings.txt
@@ -12,7 +12,7 @@ Page settings
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             printh 92
             prints "nspanelevent",0
             printh 00
diff --git a/nspanel_eu_code/weather01.txt b/nspanel_eu_code/weather01.txt
index 8b12957..07cefd7 100644
--- a/nspanel_eu_code/weather01.txt
+++ b/nspanel_eu_code/weather01.txt
@@ -12,7 +12,7 @@ Page weather01
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_eu_code/weather02.txt b/nspanel_eu_code/weather02.txt
index 52f4f34..a42a449 100644
--- a/nspanel_eu_code/weather02.txt
+++ b/nspanel_eu_code/weather02.txt
@@ -12,7 +12,7 @@ Page weather02
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_eu_code/weather03.txt b/nspanel_eu_code/weather03.txt
index 05a083c..24d8597 100644
--- a/nspanel_eu_code/weather03.txt
+++ b/nspanel_eu_code/weather03.txt
@@ -12,7 +12,7 @@ Page weather03
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_eu_code/weather04.txt b/nspanel_eu_code/weather04.txt
index 8c34b9a..4da44a1 100644
--- a/nspanel_eu_code/weather04.txt
+++ b/nspanel_eu_code/weather04.txt
@@ -12,7 +12,7 @@ Page weather04
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_eu_code/weather05.txt b/nspanel_eu_code/weather05.txt
index 0165675..e8d787a 100644
--- a/nspanel_eu_code/weather05.txt
+++ b/nspanel_eu_code/weather05.txt
@@ -12,7 +12,7 @@ Page weather05
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us.HMI b/nspanel_us.HMI
index 615da02..9841e46 100644
Binary files a/nspanel_us.HMI and b/nspanel_us.HMI differ
diff --git a/nspanel_us.tft b/nspanel_us.tft
index 2b29cc9..bc265b2 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 379172e..86bee6e 100644
--- a/nspanel_us_code/Program.s.txt
+++ b/nspanel_us_code/Program.s.txt
@@ -6,6 +6,7 @@ Program.s
     int p=0,q=0,t=0,f=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 brightness=100,brightness_dim=40
     bauds=115200//Configure baudrat
     recmod=0//Serial data parsing mode:0-Passive mode;1-Active mode
     printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port
diff --git a/nspanel_us_code/alarm.txt b/nspanel_us_code/alarm.txt
index cb1f7b9..d356169 100644
--- a/nspanel_us_code/alarm.txt
+++ b/nspanel_us_code/alarm.txt
@@ -12,7 +12,7 @@ Page alarm
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_code/buttonpage01.txt b/nspanel_us_code/buttonpage01.txt
index e997046..28fb901 100644
--- a/nspanel_us_code/buttonpage01.txt
+++ b/nspanel_us_code/buttonpage01.txt
@@ -12,7 +12,7 @@ Page buttonpage01
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_code/buttonpage02.txt b/nspanel_us_code/buttonpage02.txt
index 8f17faf..847deb4 100644
--- a/nspanel_us_code/buttonpage02.txt
+++ b/nspanel_us_code/buttonpage02.txt
@@ -12,7 +12,7 @@ Page buttonpage02
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_code/buttonpage03.txt b/nspanel_us_code/buttonpage03.txt
index bad65c9..254c2a9 100644
--- a/nspanel_us_code/buttonpage03.txt
+++ b/nspanel_us_code/buttonpage03.txt
@@ -12,7 +12,7 @@ Page buttonpage03
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_code/buttonpage04.txt b/nspanel_us_code/buttonpage04.txt
index 24c6110..d037c3e 100644
--- a/nspanel_us_code/buttonpage04.txt
+++ b/nspanel_us_code/buttonpage04.txt
@@ -12,7 +12,7 @@ Page buttonpage04
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_code/climate.txt b/nspanel_us_code/climate.txt
index 56716cf..d7ced3d 100644
--- a/nspanel_us_code/climate.txt
+++ b/nspanel_us_code/climate.txt
@@ -12,7 +12,7 @@ Page climate
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==1||home.entity.txt=="embedded_climate")
             {
                 climatesetting.txt="{\"page\": \"climate\", \"component\": \"currentpage\", \"value\": \"pagechange\", \"entity\": \""+home.entity.txt+"\"}"
diff --git a/nspanel_us_code/cover.txt b/nspanel_us_code/cover.txt
index 32a10e6..9f7dc2c 100644
--- a/nspanel_us_code/cover.txt
+++ b/nspanel_us_code/cover.txt
@@ -12,7 +12,7 @@ Page cover
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_code/entitypage01.txt b/nspanel_us_code/entitypage01.txt
index 3c33d52..7fd8d83 100644
--- a/nspanel_us_code/entitypage01.txt
+++ b/nspanel_us_code/entitypage01.txt
@@ -12,7 +12,7 @@ Page entitypage01
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_code/entitypage02.txt b/nspanel_us_code/entitypage02.txt
index c0473b9..49b7213 100644
--- a/nspanel_us_code/entitypage02.txt
+++ b/nspanel_us_code/entitypage02.txt
@@ -12,7 +12,7 @@ Page entitypage02
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_code/entitypage03.txt b/nspanel_us_code/entitypage03.txt
index b110583..5597f89 100644
--- a/nspanel_us_code/entitypage03.txt
+++ b/nspanel_us_code/entitypage03.txt
@@ -12,7 +12,7 @@ Page entitypage03
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_code/entitypage04.txt b/nspanel_us_code/entitypage04.txt
index 26916c3..53ed51e 100644
--- a/nspanel_us_code/entitypage04.txt
+++ b/nspanel_us_code/entitypage04.txt
@@ -12,7 +12,7 @@ Page entitypage04
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_code/fan.txt b/nspanel_us_code/fan.txt
index 4b68f1f..663b581 100644
--- a/nspanel_us_code/fan.txt
+++ b/nspanel_us_code/fan.txt
@@ -12,7 +12,7 @@ Page fan
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_code/home.txt b/nspanel_us_code/home.txt
index 8eaf163..eb7f4cc 100644
--- a/nspanel_us_code/home.txt
+++ b/nspanel_us_code/home.txt
@@ -12,7 +12,7 @@ Page home
     
     Events
         Preinitialize Event
-            dim=brightness.val
+            dim=brightness
             dimtimer.en=1
             sleeptimer.en=1
             printh 92
@@ -26,47 +26,35 @@ Page home
             vis bt_entities,is_entities
             vis bt_alarm,is_alarm
         
-Variable (int32) brightness
-    Attributes
-        ID   : 2
-        Scope: global
-        Value: 100
-    
-Variable (int32) brightdd
-    Attributes
-        ID   : 3
-        Scope: global
-        Value: 40
-    
 Variable (int32) disdim
     Attributes
-        ID   : 4
+        ID   : 2
         Scope: global
         Value: 0
     
 Variable (int32) sleepmodus
     Attributes
-        ID   : 16
+        ID   : 14
         Scope: global
         Value: 0
     
 Variable (string) lastclick
     Attributes
-        ID            : 50
+        ID            : 48
         Scope         : local
         Text          : 
         Max. Text Size: 100
     
 Variable (string) entity
     Attributes
-        ID            : 51
+        ID            : 49
         Scope         : global
         Text          : 
         Max. Text Size: 100
     
 Text time
     Attributes
-        ID                 : 7
+        ID                 : 5
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -76,7 +64,7 @@ Text time
     
 Text current_temp
     Attributes
-        ID                 : 8
+        ID                 : 6
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -86,7 +74,7 @@ Text current_temp
     
 Text outdoor_temp
     Attributes
-        ID                 : 9
+        ID                 : 7
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -96,7 +84,7 @@ Text outdoor_temp
     
 Text date
     Attributes
-        ID                 : 10
+        ID                 : 8
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -106,7 +94,7 @@ Text date
     
 Text value01_state
     Attributes
-        ID                 : 12
+        ID                 : 10
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -116,7 +104,7 @@ Text value01_state
     
 Text left_bt_text
     Attributes
-        ID                 : 17
+        ID                 : 15
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -126,7 +114,7 @@ Text left_bt_text
     
 Text right_bt_text
     Attributes
-        ID                 : 18
+        ID                 : 16
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -136,7 +124,7 @@ Text right_bt_text
     
 Text icon_top_01
     Attributes
-        ID                 : 21
+        ID                 : 19
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -146,7 +134,7 @@ Text icon_top_01
     
 Text icon_top_02
     Attributes
-        ID                 : 22
+        ID                 : 20
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -156,7 +144,7 @@ Text icon_top_02
     
 Text icon_top_03
     Attributes
-        ID                 : 23
+        ID                 : 21
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -166,7 +154,7 @@ Text icon_top_03
     
 Text icon_top_04
     Attributes
-        ID                 : 24
+        ID                 : 22
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -176,7 +164,7 @@ Text icon_top_04
     
 Text icon_top_05
     Attributes
-        ID                 : 25
+        ID                 : 23
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -186,7 +174,7 @@ Text icon_top_05
     
 Text icon_top_06
     Attributes
-        ID                 : 26
+        ID                 : 24
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -196,7 +184,7 @@ Text icon_top_06
     
 Text icon_top_07
     Attributes
-        ID                 : 27
+        ID                 : 25
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -206,7 +194,7 @@ Text icon_top_07
     
 Text icon_top_08
     Attributes
-        ID                 : 28
+        ID                 : 26
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -216,7 +204,7 @@ Text icon_top_08
     
 Text icon_top_09
     Attributes
-        ID                 : 29
+        ID                 : 27
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -226,7 +214,7 @@ Text icon_top_09
     
 Text icon_top_10
     Attributes
-        ID                 : 30
+        ID                 : 28
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -236,7 +224,7 @@ Text icon_top_10
     
 Text value01_icon
     Attributes
-        ID                 : 31
+        ID                 : 29
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -246,7 +234,7 @@ Text value01_icon
     
 Text value03_state
     Attributes
-        ID                 : 32
+        ID                 : 30
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -256,7 +244,7 @@ Text value03_state
     
 Text value03_icon
     Attributes
-        ID                 : 33
+        ID                 : 31
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -266,7 +254,7 @@ Text value03_icon
     
 Text value02_icon
     Attributes
-        ID                 : 34
+        ID                 : 32
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -276,7 +264,7 @@ Text value02_icon
     
 Text value02_state
     Attributes
-        ID                 : 35
+        ID                 : 33
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -286,7 +274,7 @@ Text value02_state
     
 Text wifi_icon
     Attributes
-        ID                 : 36
+        ID                 : 34
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -296,7 +284,7 @@ Text wifi_icon
     
 Text indoortempicon
     Attributes
-        ID                 : 37
+        ID                 : 35
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -306,7 +294,7 @@ Text indoortempicon
     
 Text button01_icon
     Attributes
-        ID                 : 38
+        ID                 : 36
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -316,7 +304,7 @@ Text button01_icon
     
 Text button02_icon
     Attributes
-        ID                 : 39
+        ID                 : 37
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -326,7 +314,7 @@ Text button02_icon
     
 Text button03_icon
     Attributes
-        ID                 : 40
+        ID                 : 38
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -336,7 +324,7 @@ Text button03_icon
     
 Text bt_notific
     Attributes
-        ID                 : 41
+        ID                 : 39
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -353,7 +341,7 @@ Text bt_notific
         
 Text bt_qrcode
     Attributes
-        ID                 : 42
+        ID                 : 40
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -367,7 +355,7 @@ Text bt_qrcode
         
 Text bt_entities
     Attributes
-        ID                 : 43
+        ID                 : 41
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -384,7 +372,7 @@ Text bt_entities
         
 Text bt_alarm
     Attributes
-        ID                 : 44
+        ID                 : 42
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -402,7 +390,7 @@ Text bt_alarm
         
 Text meridiem
     Attributes
-        ID                 : 49
+        ID                 : 47
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -412,28 +400,28 @@ Text meridiem
     
 Picture weather
     Attributes
-        ID               : 11
+        ID               : 9
         Scope            : global
         Dragging         : 0
         Send Component ID: disabled
     
 Picture left_bt_pic
     Attributes
-        ID               : 19
+        ID               : 17
         Scope            : global
         Dragging         : 0
         Send Component ID: disabled
     
 Picture right_bt_pic
     Attributes
-        ID               : 20
+        ID               : 18
         Scope            : global
         Dragging         : 0
         Send Component ID: disabled
     
 Hotspot fc_weather
     Attributes
-        ID               : 13
+        ID               : 11
         Scope            : global
         Dragging         : 0
         Send Component ID: on press and release
@@ -447,7 +435,7 @@ Hotspot fc_weather
         
 Hotspot jump_climate
     Attributes
-        ID               : 14
+        ID               : 12
         Scope            : local
         Dragging         : 0
         Send Component ID: on press and release
@@ -485,7 +473,7 @@ Hotspot jump_climate
         
 Hotspot button01
     Attributes
-        ID               : 45
+        ID               : 43
         Scope            : local
         Dragging         : 0
         Send Component ID: disabled
@@ -502,7 +490,7 @@ Hotspot button01
         
 Hotspot button02
     Attributes
-        ID               : 46
+        ID               : 44
         Scope            : local
         Dragging         : 0
         Send Component ID: disabled
@@ -519,7 +507,7 @@ Hotspot button02
         
 Hotspot button03
     Attributes
-        ID               : 47
+        ID               : 45
         Scope            : local
         Dragging         : 0
         Send Component ID: disabled
@@ -536,7 +524,7 @@ Hotspot button03
         
 Hotspot settings_click
     Attributes
-        ID               : 48
+        ID               : 46
         Scope            : local
         Dragging         : 0
         Send Component ID: disabled
@@ -559,12 +547,12 @@ Timer dimtimer
         Timer Event
             if(disdim.val==0)
             {
-                dim=brightdd.val // Dim down screen to val set from HA
+                dim=brightness_dim // Dim down screen to val set from HA
             }
         
 Timer swipestore
     Attributes
-        ID         : 6
+        ID         : 4
         Scope      : local
         Period (ms): 50
         Enabled    : no
@@ -576,7 +564,7 @@ Timer swipestore
         
 Timer sleeptimer
     Attributes
-        ID         : 15
+        ID         : 13
         Scope      : local
         Period (ms): 65000
         Enabled    : no
@@ -592,7 +580,7 @@ Timer sleeptimer
         
 Timer settings_timer
     Attributes
-        ID         : 52
+        ID         : 50
         Scope      : local
         Period (ms): 1000
         Enabled    : no
@@ -603,14 +591,14 @@ Timer settings_timer
         
 TouchCap swipe
     Attributes
-        ID   : 5
+        ID   : 3
         Scope: local
         Value: 0
     
     Events
         Touch Press Event
             swipestore.en=1 // Start swipestore timer
-            dim=brightness.val // Set brightness to saved value (from HA)
+            dim=brightness // Set brightness to saved value (from HA)
             dimtimer.en=1 // Enable timer to calc down for dimming screen
             sleeptimer.en=1
         
diff --git a/nspanel_us_code/keyb_num.txt b/nspanel_us_code/keyb_num.txt
index 73ba313..e57f52e 100644
--- a/nspanel_us_code/keyb_num.txt
+++ b/nspanel_us_code/keyb_num.txt
@@ -12,7 +12,7 @@ Page keyb_num
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page page_id.val
diff --git a/nspanel_us_code/light.txt b/nspanel_us_code/light.txt
index 9a30cd1..ce6883a 100644
--- a/nspanel_us_code/light.txt
+++ b/nspanel_us_code/light.txt
@@ -12,7 +12,7 @@ Page light
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_code/notification.txt b/nspanel_us_code/notification.txt
index 01a4fe5..61c4b0e 100644
--- a/nspanel_us_code/notification.txt
+++ b/nspanel_us_code/notification.txt
@@ -12,7 +12,7 @@ Page notification
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_code/qrcode.txt b/nspanel_us_code/qrcode.txt
index 66ce761..cde5cdf 100644
--- a/nspanel_us_code/qrcode.txt
+++ b/nspanel_us_code/qrcode.txt
@@ -12,7 +12,7 @@ Page qrcode
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             printh 92
             prints "nspanelevent",0
             printh 00
diff --git a/nspanel_us_code/settings.txt b/nspanel_us_code/settings.txt
index 2816b14..65d5af8 100644
--- a/nspanel_us_code/settings.txt
+++ b/nspanel_us_code/settings.txt
@@ -12,7 +12,7 @@ Page settings
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             printh 92
             prints "nspanelevent",0
             printh 00
diff --git a/nspanel_us_code/weather01.txt b/nspanel_us_code/weather01.txt
index 0e9bc13..65310ca 100644
--- a/nspanel_us_code/weather01.txt
+++ b/nspanel_us_code/weather01.txt
@@ -12,7 +12,7 @@ Page weather01
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_code/weather02.txt b/nspanel_us_code/weather02.txt
index 52f4f34..a42a449 100644
--- a/nspanel_us_code/weather02.txt
+++ b/nspanel_us_code/weather02.txt
@@ -12,7 +12,7 @@ Page weather02
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_code/weather03.txt b/nspanel_us_code/weather03.txt
index 05a083c..24d8597 100644
--- a/nspanel_us_code/weather03.txt
+++ b/nspanel_us_code/weather03.txt
@@ -12,7 +12,7 @@ Page weather03
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_code/weather04.txt b/nspanel_us_code/weather04.txt
index 8c34b9a..4da44a1 100644
--- a/nspanel_us_code/weather04.txt
+++ b/nspanel_us_code/weather04.txt
@@ -12,7 +12,7 @@ Page weather04
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_code/weather05.txt b/nspanel_us_code/weather05.txt
index 0165675..e8d787a 100644
--- a/nspanel_us_code/weather05.txt
+++ b/nspanel_us_code/weather05.txt
@@ -12,7 +12,7 @@ Page weather05
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_land.HMI b/nspanel_us_land.HMI
index 512e7ca..49686db 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 0ba0d87..663748a 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 deb5261..4ac7622 100644
--- a/nspanel_us_land_code/Program.s.txt
+++ b/nspanel_us_land_code/Program.s.txt
@@ -6,6 +6,7 @@ Program.s
     int p=0,q=0,t=0,f=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 brightness=100,brightness_dim=40
     bauds=115200//Configure baudrat
     recmod=0//Serial data parsing mode:0-Passive mode;1-Active mode
     printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port
diff --git a/nspanel_us_land_code/alarm.txt b/nspanel_us_land_code/alarm.txt
index cb1f7b9..d356169 100644
--- a/nspanel_us_land_code/alarm.txt
+++ b/nspanel_us_land_code/alarm.txt
@@ -12,7 +12,7 @@ Page alarm
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_land_code/buttonpage01.txt b/nspanel_us_land_code/buttonpage01.txt
index c893e02..3174492 100644
--- a/nspanel_us_land_code/buttonpage01.txt
+++ b/nspanel_us_land_code/buttonpage01.txt
@@ -12,7 +12,7 @@ Page buttonpage01
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_land_code/buttonpage02.txt b/nspanel_us_land_code/buttonpage02.txt
index ca0d67e..10576c9 100644
--- a/nspanel_us_land_code/buttonpage02.txt
+++ b/nspanel_us_land_code/buttonpage02.txt
@@ -12,7 +12,7 @@ Page buttonpage02
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_land_code/buttonpage03.txt b/nspanel_us_land_code/buttonpage03.txt
index 836693a..aea316c 100644
--- a/nspanel_us_land_code/buttonpage03.txt
+++ b/nspanel_us_land_code/buttonpage03.txt
@@ -12,7 +12,7 @@ Page buttonpage03
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_land_code/buttonpage04.txt b/nspanel_us_land_code/buttonpage04.txt
index 2cd3cb5..e445afb 100644
--- a/nspanel_us_land_code/buttonpage04.txt
+++ b/nspanel_us_land_code/buttonpage04.txt
@@ -12,7 +12,7 @@ Page buttonpage04
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_land_code/climate.txt b/nspanel_us_land_code/climate.txt
index 12ab8a4..fe93b64 100644
--- a/nspanel_us_land_code/climate.txt
+++ b/nspanel_us_land_code/climate.txt
@@ -12,7 +12,7 @@ Page climate
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==1||home.entity.txt=="embedded_climate")
             {
                 climatesetting.txt="{\"page\": \"climate\", \"component\": \"currentpage\", \"value\": \"pagechange\", \"entity\": \""+home.entity.txt+"\"}"
diff --git a/nspanel_us_land_code/cover.txt b/nspanel_us_land_code/cover.txt
index 32a10e6..9f7dc2c 100644
--- a/nspanel_us_land_code/cover.txt
+++ b/nspanel_us_land_code/cover.txt
@@ -12,7 +12,7 @@ Page cover
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_land_code/entitypage01.txt b/nspanel_us_land_code/entitypage01.txt
index 3f04fae..893be3a 100644
--- a/nspanel_us_land_code/entitypage01.txt
+++ b/nspanel_us_land_code/entitypage01.txt
@@ -12,7 +12,7 @@ Page entitypage01
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_land_code/entitypage02.txt b/nspanel_us_land_code/entitypage02.txt
index 8e8008e..7552d56 100644
--- a/nspanel_us_land_code/entitypage02.txt
+++ b/nspanel_us_land_code/entitypage02.txt
@@ -12,7 +12,7 @@ Page entitypage02
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_land_code/entitypage03.txt b/nspanel_us_land_code/entitypage03.txt
index f5c4557..eb0a090 100644
--- a/nspanel_us_land_code/entitypage03.txt
+++ b/nspanel_us_land_code/entitypage03.txt
@@ -12,7 +12,7 @@ Page entitypage03
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_land_code/entitypage04.txt b/nspanel_us_land_code/entitypage04.txt
index d28a3a8..b6d4723 100644
--- a/nspanel_us_land_code/entitypage04.txt
+++ b/nspanel_us_land_code/entitypage04.txt
@@ -12,7 +12,7 @@ Page entitypage04
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_land_code/fan.txt b/nspanel_us_land_code/fan.txt
index 4b68f1f..663b581 100644
--- a/nspanel_us_land_code/fan.txt
+++ b/nspanel_us_land_code/fan.txt
@@ -12,7 +12,7 @@ Page fan
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_land_code/home.txt b/nspanel_us_land_code/home.txt
index fbf0d89..2ef0801 100644
--- a/nspanel_us_land_code/home.txt
+++ b/nspanel_us_land_code/home.txt
@@ -12,7 +12,7 @@ Page home
     
     Events
         Preinitialize Event
-            dim=brightness.val
+            dim=brightness
             dimtimer.en=1
             sleeptimer.en=1
             printh 92
@@ -28,47 +28,35 @@ Page home
             vis left_bt_text,0
             vis right_bt_text,0
         
-Variable (int32) brightness
-    Attributes
-        ID   : 2
-        Scope: global
-        Value: 100
-    
-Variable (int32) brightdd
-    Attributes
-        ID   : 3
-        Scope: global
-        Value: 40
-    
 Variable (int32) disdim
     Attributes
-        ID   : 4
+        ID   : 2
         Scope: global
         Value: 0
     
 Variable (int32) sleepmodus
     Attributes
-        ID   : 16
+        ID   : 14
         Scope: global
         Value: 0
     
 Variable (string) lastclick
     Attributes
-        ID            : 50
+        ID            : 48
         Scope         : local
         Text          : 
         Max. Text Size: 100
     
 Variable (string) entity
     Attributes
-        ID            : 51
+        ID            : 49
         Scope         : global
         Text          : 
         Max. Text Size: 100
     
 Text time
     Attributes
-        ID                 : 7
+        ID                 : 5
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -78,7 +66,7 @@ Text time
     
 Text current_temp
     Attributes
-        ID                 : 8
+        ID                 : 6
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -88,7 +76,7 @@ Text current_temp
     
 Text outdoor_temp
     Attributes
-        ID                 : 9
+        ID                 : 7
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -98,7 +86,7 @@ Text outdoor_temp
     
 Text date
     Attributes
-        ID                 : 10
+        ID                 : 8
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -108,7 +96,7 @@ Text date
     
 Text value01_state
     Attributes
-        ID                 : 12
+        ID                 : 10
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -118,7 +106,7 @@ Text value01_state
     
 Text left_bt_text
     Attributes
-        ID                 : 17
+        ID                 : 15
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -128,7 +116,7 @@ Text left_bt_text
     
 Text right_bt_text
     Attributes
-        ID                 : 18
+        ID                 : 16
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -138,7 +126,7 @@ Text right_bt_text
     
 Text icon_top_01
     Attributes
-        ID                 : 21
+        ID                 : 19
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -148,7 +136,7 @@ Text icon_top_01
     
 Text icon_top_02
     Attributes
-        ID                 : 22
+        ID                 : 20
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -158,7 +146,7 @@ Text icon_top_02
     
 Text icon_top_03
     Attributes
-        ID                 : 23
+        ID                 : 21
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -168,7 +156,7 @@ Text icon_top_03
     
 Text icon_top_04
     Attributes
-        ID                 : 24
+        ID                 : 22
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -178,7 +166,7 @@ Text icon_top_04
     
 Text icon_top_05
     Attributes
-        ID                 : 25
+        ID                 : 23
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -188,7 +176,7 @@ Text icon_top_05
     
 Text icon_top_06
     Attributes
-        ID                 : 26
+        ID                 : 24
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -198,7 +186,7 @@ Text icon_top_06
     
 Text icon_top_07
     Attributes
-        ID                 : 27
+        ID                 : 25
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -208,7 +196,7 @@ Text icon_top_07
     
 Text icon_top_08
     Attributes
-        ID                 : 28
+        ID                 : 26
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -218,7 +206,7 @@ Text icon_top_08
     
 Text icon_top_09
     Attributes
-        ID                 : 29
+        ID                 : 27
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -228,7 +216,7 @@ Text icon_top_09
     
 Text icon_top_10
     Attributes
-        ID                 : 30
+        ID                 : 28
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -238,7 +226,7 @@ Text icon_top_10
     
 Text value01_icon
     Attributes
-        ID                 : 31
+        ID                 : 29
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -248,7 +236,7 @@ Text value01_icon
     
 Text value03_state
     Attributes
-        ID                 : 32
+        ID                 : 30
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -258,7 +246,7 @@ Text value03_state
     
 Text value03_icon
     Attributes
-        ID                 : 33
+        ID                 : 31
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -268,7 +256,7 @@ Text value03_icon
     
 Text value02_icon
     Attributes
-        ID                 : 34
+        ID                 : 32
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -278,7 +266,7 @@ Text value02_icon
     
 Text value02_state
     Attributes
-        ID                 : 35
+        ID                 : 33
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -288,7 +276,7 @@ Text value02_state
     
 Text wifi_icon
     Attributes
-        ID                 : 36
+        ID                 : 34
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -298,7 +286,7 @@ Text wifi_icon
     
 Text indoortempicon
     Attributes
-        ID                 : 37
+        ID                 : 35
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -308,7 +296,7 @@ Text indoortempicon
     
 Text button01_icon
     Attributes
-        ID                 : 38
+        ID                 : 36
         Scope              : local
         Dragging           : 0
         Send Component ID  : disabled
@@ -318,7 +306,7 @@ Text button01_icon
     
 Text button02_icon
     Attributes
-        ID                 : 39
+        ID                 : 37
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -328,7 +316,7 @@ Text button02_icon
     
 Text button03_icon
     Attributes
-        ID                 : 40
+        ID                 : 38
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -338,7 +326,7 @@ Text button03_icon
     
 Text bt_notific
     Attributes
-        ID                 : 41
+        ID                 : 39
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -355,7 +343,7 @@ Text bt_notific
         
 Text bt_qrcode
     Attributes
-        ID                 : 42
+        ID                 : 40
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -369,7 +357,7 @@ Text bt_qrcode
         
 Text bt_entities
     Attributes
-        ID                 : 43
+        ID                 : 41
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -386,7 +374,7 @@ Text bt_entities
         
 Text bt_alarm
     Attributes
-        ID                 : 44
+        ID                 : 42
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -404,7 +392,7 @@ Text bt_alarm
         
 Text meridiem
     Attributes
-        ID                 : 49
+        ID                 : 47
         Scope              : global
         Dragging           : 0
         Send Component ID  : disabled
@@ -414,28 +402,28 @@ Text meridiem
     
 Picture weather
     Attributes
-        ID               : 11
+        ID               : 9
         Scope            : global
         Dragging         : 0
         Send Component ID: disabled
     
 Picture left_bt_pic
     Attributes
-        ID               : 19
+        ID               : 17
         Scope            : global
         Dragging         : 0
         Send Component ID: disabled
     
 Picture right_bt_pic
     Attributes
-        ID               : 20
+        ID               : 18
         Scope            : global
         Dragging         : 0
         Send Component ID: disabled
     
 Hotspot fc_weather
     Attributes
-        ID               : 13
+        ID               : 11
         Scope            : global
         Dragging         : 0
         Send Component ID: on press and release
@@ -449,7 +437,7 @@ Hotspot fc_weather
         
 Hotspot jump_climate
     Attributes
-        ID               : 14
+        ID               : 12
         Scope            : local
         Dragging         : 0
         Send Component ID: on press and release
@@ -487,7 +475,7 @@ Hotspot jump_climate
         
 Hotspot button01
     Attributes
-        ID               : 45
+        ID               : 43
         Scope            : local
         Dragging         : 0
         Send Component ID: disabled
@@ -504,7 +492,7 @@ Hotspot button01
         
 Hotspot button02
     Attributes
-        ID               : 46
+        ID               : 44
         Scope            : local
         Dragging         : 0
         Send Component ID: disabled
@@ -521,7 +509,7 @@ Hotspot button02
         
 Hotspot button03
     Attributes
-        ID               : 47
+        ID               : 45
         Scope            : local
         Dragging         : 0
         Send Component ID: disabled
@@ -538,7 +526,7 @@ Hotspot button03
         
 Hotspot settings_click
     Attributes
-        ID               : 48
+        ID               : 46
         Scope            : local
         Dragging         : 0
         Send Component ID: disabled
@@ -561,12 +549,12 @@ Timer dimtimer
         Timer Event
             if(disdim.val==0)
             {
-                dim=brightdd.val // Dim down screen to val set from HA
+                dim=brightness_dim // Dim down screen to val set from HA
             }
         
 Timer swipestore
     Attributes
-        ID         : 6
+        ID         : 4
         Scope      : local
         Period (ms): 50
         Enabled    : no
@@ -578,7 +566,7 @@ Timer swipestore
         
 Timer sleeptimer
     Attributes
-        ID         : 15
+        ID         : 13
         Scope      : local
         Period (ms): 65000
         Enabled    : no
@@ -594,7 +582,7 @@ Timer sleeptimer
         
 Timer settings_timer
     Attributes
-        ID         : 52
+        ID         : 50
         Scope      : local
         Period (ms): 1000
         Enabled    : no
@@ -605,14 +593,14 @@ Timer settings_timer
         
 TouchCap swipe
     Attributes
-        ID   : 5
+        ID   : 3
         Scope: local
         Value: 0
     
     Events
         Touch Press Event
             swipestore.en=1 // Start swipestore timer
-            dim=brightness.val // Set brightness to saved value (from HA)
+            dim=brightness // Set brightness to saved value (from HA)
             dimtimer.en=1 // Enable timer to calc down for dimming screen
             sleeptimer.en=1
         
diff --git a/nspanel_us_land_code/keyb_num.txt b/nspanel_us_land_code/keyb_num.txt
index 73ba313..e57f52e 100644
--- a/nspanel_us_land_code/keyb_num.txt
+++ b/nspanel_us_land_code/keyb_num.txt
@@ -12,7 +12,7 @@ Page keyb_num
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page page_id.val
diff --git a/nspanel_us_land_code/light.txt b/nspanel_us_land_code/light.txt
index 9a30cd1..ce6883a 100644
--- a/nspanel_us_land_code/light.txt
+++ b/nspanel_us_land_code/light.txt
@@ -12,7 +12,7 @@ Page light
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_land_code/notification.txt b/nspanel_us_land_code/notification.txt
index 2ceff2a..20b1a35 100644
--- a/nspanel_us_land_code/notification.txt
+++ b/nspanel_us_land_code/notification.txt
@@ -12,7 +12,7 @@ Page notification
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_land_code/qrcode.txt b/nspanel_us_land_code/qrcode.txt
index 66ce761..cde5cdf 100644
--- a/nspanel_us_land_code/qrcode.txt
+++ b/nspanel_us_land_code/qrcode.txt
@@ -12,7 +12,7 @@ Page qrcode
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             printh 92
             prints "nspanelevent",0
             printh 00
diff --git a/nspanel_us_land_code/settings.txt b/nspanel_us_land_code/settings.txt
index 2fc9ab0..750602f 100644
--- a/nspanel_us_land_code/settings.txt
+++ b/nspanel_us_land_code/settings.txt
@@ -12,7 +12,7 @@ Page settings
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             printh 92
             prints "nspanelevent",0
             printh 00
diff --git a/nspanel_us_land_code/weather01.txt b/nspanel_us_land_code/weather01.txt
index fd05b26..93dd503 100644
--- a/nspanel_us_land_code/weather01.txt
+++ b/nspanel_us_land_code/weather01.txt
@@ -12,7 +12,7 @@ Page weather01
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_land_code/weather02.txt b/nspanel_us_land_code/weather02.txt
index 1a459ff..4ba2f7a 100644
--- a/nspanel_us_land_code/weather02.txt
+++ b/nspanel_us_land_code/weather02.txt
@@ -12,7 +12,7 @@ Page weather02
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_land_code/weather03.txt b/nspanel_us_land_code/weather03.txt
index c572fac..a42bcce 100644
--- a/nspanel_us_land_code/weather03.txt
+++ b/nspanel_us_land_code/weather03.txt
@@ -12,7 +12,7 @@ Page weather03
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_land_code/weather04.txt b/nspanel_us_land_code/weather04.txt
index 21b204f..4881a0c 100644
--- a/nspanel_us_land_code/weather04.txt
+++ b/nspanel_us_land_code/weather04.txt
@@ -12,7 +12,7 @@ Page weather04
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home
diff --git a/nspanel_us_land_code/weather05.txt b/nspanel_us_land_code/weather05.txt
index a45db11..08cef20 100644
--- a/nspanel_us_land_code/weather05.txt
+++ b/nspanel_us_land_code/weather05.txt
@@ -12,7 +12,7 @@ Page weather05
     
     Events
         Preinitialize Event
-            dim=home.brightness.val
+            dim=brightness
             if(api==0)
             {
                 page home