diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt
index 653907a4..37e880ee 100644
--- a/HMI/US/landscape/diff-eu-version.txt
+++ b/HMI/US/landscape/diff-eu-version.txt
@@ -1,6 +1,6 @@
 diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
---- HMI/n2t-out/Program.s.txt	2022-07-09 09:14:32.604055011 +0000
-+++ HMI/US/landscape/n2t-out/Program.s.txt	2022-07-09 09:14:33.488043688 +0000
+--- HMI/n2t-out/Program.s.txt	2022-07-12 19:48:18.749451287 +0000
++++ HMI/US/landscape/n2t-out/Program.s.txt	2022-07-12 19:48:19.897452968 +0000
 @@ -11,9 +11,4 @@
      // dim value
      int dimValue=40
@@ -12,8 +12,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
 -    lcd_dev fffb 0002 0000 0020
      page pageStartup
 diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
---- HMI/n2t-out/cardAlarm.txt	2022-07-09 09:14:32.608054957 +0000
-+++ HMI/US/landscape/n2t-out/cardAlarm.txt	2022-07-09 09:14:33.492043637 +0000
+--- HMI/n2t-out/cardAlarm.txt	2022-07-12 19:48:18.753451293 +0000
++++ HMI/US/landscape/n2t-out/cardAlarm.txt	2022-07-12 19:48:19.901452974 +0000
 @@ -12,25 +12,6 @@
      
      Events
@@ -69,8 +69,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
                                      if(tInstruction.txt=="timeout")
                                      {
 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
---- HMI/n2t-out/cardEntities.txt	2022-07-09 09:14:32.608054957 +0000
-+++ HMI/US/landscape/n2t-out/cardEntities.txt	2022-07-09 09:14:33.488043688 +0000
+--- HMI/n2t-out/cardEntities.txt	2022-07-12 19:48:18.753451293 +0000
++++ HMI/US/landscape/n2t-out/cardEntities.txt	2022-07-12 19:48:19.901452974 +0000
 @@ -12,26 +12,6 @@
      
      Events
@@ -162,8 +162,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
                                      if(tInstruction.txt=="timeout")
                                      {
 diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
---- HMI/n2t-out/cardGrid.txt	2022-07-09 09:14:32.608054957 +0000
-+++ HMI/US/landscape/n2t-out/cardGrid.txt	2022-07-09 09:14:33.488043688 +0000
+--- HMI/n2t-out/cardGrid.txt	2022-07-12 19:48:18.753451293 +0000
++++ HMI/US/landscape/n2t-out/cardGrid.txt	2022-07-12 19:48:19.901452974 +0000
 @@ -12,15 +12,6 @@
      
      Events
@@ -211,8 +211,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
  TouchCap tc0
      Attributes
 diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
---- HMI/n2t-out/cardMedia.txt	2022-07-09 09:14:32.608054957 +0000
-+++ HMI/US/landscape/n2t-out/cardMedia.txt	2022-07-09 09:14:33.488043688 +0000
+--- HMI/n2t-out/cardMedia.txt	2022-07-12 19:48:18.753451293 +0000
++++ HMI/US/landscape/n2t-out/cardMedia.txt	2022-07-12 19:48:19.897452968 +0000
 @@ -12,21 +12,6 @@
      
      Events
@@ -255,8 +255,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
                                      if(tInstruction.txt=="timeout")
                                      {
 diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
---- HMI/n2t-out/cardQR.txt	2022-07-09 09:14:32.608054957 +0000
-+++ HMI/US/landscape/n2t-out/cardQR.txt	2022-07-09 09:14:33.488043688 +0000
+--- HMI/n2t-out/cardQR.txt	2022-07-12 19:48:18.753451293 +0000
++++ HMI/US/landscape/n2t-out/cardQR.txt	2022-07-12 19:48:19.901452974 +0000
 @@ -12,25 +12,6 @@
      
      Events
@@ -303,8 +303,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
                                      if(tInstruction.txt=="timeout")
                                      {
 diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
---- HMI/n2t-out/cardThermo.txt	2022-07-09 09:14:32.608054957 +0000
-+++ HMI/US/landscape/n2t-out/cardThermo.txt	2022-07-09 09:14:33.492043637 +0000
+--- HMI/n2t-out/cardThermo.txt	2022-07-12 19:48:18.753451293 +0000
++++ HMI/US/landscape/n2t-out/cardThermo.txt	2022-07-12 19:48:19.901452974 +0000
 @@ -12,21 +12,6 @@
      
      Events
@@ -347,8 +347,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
                                      if(tInstruction.txt=="timeout")
                                      {
 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
---- HMI/n2t-out/pageStartup.txt	2022-07-09 09:14:32.608054957 +0000
-+++ HMI/US/landscape/n2t-out/pageStartup.txt	2022-07-09 09:14:33.488043688 +0000
+--- HMI/n2t-out/pageStartup.txt	2022-07-12 19:48:18.749451287 +0000
++++ HMI/US/landscape/n2t-out/pageStartup.txt	2022-07-12 19:48:19.901452974 +0000
 @@ -177,7 +177,7 @@
              recmod=1
              bauds=115200
@@ -378,8 +378,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
                                      if(tInstruction.txt=="timeout")
                                      {
 diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
---- HMI/n2t-out/pageTest.txt	2022-07-09 09:14:32.608054957 +0000
-+++ HMI/US/landscape/n2t-out/pageTest.txt	2022-07-09 09:14:33.488043688 +0000
+--- HMI/n2t-out/pageTest.txt	2022-07-12 19:48:18.749451287 +0000
++++ HMI/US/landscape/n2t-out/pageTest.txt	2022-07-12 19:48:19.897452968 +0000
 @@ -13,46 +13,6 @@
      Events
          Preinitialize Event
@@ -429,8 +429,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
      Attributes
 Only in HMI/n2t-out: popupFan.txt
 diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
---- HMI/n2t-out/popupLight.txt	2022-07-09 09:14:32.608054957 +0000
-+++ HMI/US/landscape/n2t-out/popupLight.txt	2022-07-09 09:14:33.488043688 +0000
+--- HMI/n2t-out/popupLight.txt	2022-07-12 19:48:18.753451293 +0000
++++ HMI/US/landscape/n2t-out/popupLight.txt	2022-07-12 19:48:19.901452974 +0000
 @@ -12,29 +12,6 @@
      
      Events
@@ -481,8 +481,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
                                      if(tInstruction.txt=="timeout")
                                      {
 diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
---- HMI/n2t-out/popupNotify.txt	2022-07-09 09:14:32.608054957 +0000
-+++ HMI/US/landscape/n2t-out/popupNotify.txt	2022-07-09 09:14:33.488043688 +0000
+--- HMI/n2t-out/popupNotify.txt	2022-07-12 19:48:18.753451293 +0000
++++ HMI/US/landscape/n2t-out/popupNotify.txt	2022-07-12 19:48:19.901452974 +0000
 @@ -12,24 +12,12 @@
      
      Events
@@ -528,8 +528,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
                                      if(tInstruction.txt=="timeout")
                                      {
 diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
---- HMI/n2t-out/popupShutter.txt	2022-07-09 09:14:32.608054957 +0000
-+++ HMI/US/landscape/n2t-out/popupShutter.txt	2022-07-09 09:14:33.488043688 +0000
+--- HMI/n2t-out/popupShutter.txt	2022-07-12 19:48:18.753451293 +0000
++++ HMI/US/landscape/n2t-out/popupShutter.txt	2022-07-12 19:48:19.901452974 +0000
 @@ -12,40 +12,6 @@
      
      Events
@@ -697,8 +697,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
                                      if(tInstruction.txt=="time")
                                      {
 diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
---- HMI/n2t-out/screensaver.txt	2022-07-09 09:14:32.608054957 +0000
-+++ HMI/US/landscape/n2t-out/screensaver.txt	2022-07-09 09:14:33.488043688 +0000
+--- HMI/n2t-out/screensaver.txt	2022-07-12 19:48:18.753451293 +0000
++++ HMI/US/landscape/n2t-out/screensaver.txt	2022-07-12 19:48:19.901452974 +0000
 @@ -406,22 +406,10 @@
                                          // get value
                                          spstr strCommand.txt,tTmp.txt,"~",1
diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt
index c35f3a7c..2443e0cb 100644
--- a/HMI/US/portrait/diff-eu-version.txt
+++ b/HMI/US/portrait/diff-eu-version.txt
@@ -1,6 +1,6 @@
 diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
---- HMI/n2t-out/Program.s.txt	2022-07-09 09:14:32.604055011 +0000
-+++ HMI/US/portrait/n2t-out/Program.s.txt	2022-07-09 09:14:33.040049343 +0000
+--- HMI/n2t-out/Program.s.txt	2022-07-12 19:48:18.749451287 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt	2022-07-12 19:48:19.285452072 +0000
 @@ -14,6 +14,6 @@
      //color vars
      int defaultFontColor=65535
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
 +    //lcd_dev fffb 0002 0000 0020
      page pageStartup
 diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
---- HMI/n2t-out/cardAlarm.txt	2022-07-09 09:14:32.608054957 +0000
-+++ HMI/US/portrait/n2t-out/cardAlarm.txt	2022-07-09 09:14:33.040049343 +0000
+--- HMI/n2t-out/cardAlarm.txt	2022-07-12 19:48:18.753451293 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt	2022-07-12 19:48:19.285452072 +0000
 @@ -12,15 +12,11 @@
      
      Events
@@ -39,8 +39,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
      
  Text tIcon
 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
---- HMI/n2t-out/cardEntities.txt	2022-07-09 09:14:32.608054957 +0000
-+++ HMI/US/portrait/n2t-out/cardEntities.txt	2022-07-09 09:14:33.040049343 +0000
+--- HMI/n2t-out/cardEntities.txt	2022-07-12 19:48:18.753451293 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt	2022-07-12 19:48:19.289452078 +0000
 @@ -12,14 +12,10 @@
      
      Events
@@ -378,8 +378,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
          
  Hotspot mSwipeNext
 diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
---- HMI/n2t-out/cardGrid.txt	2022-07-09 09:14:32.608054957 +0000
-+++ HMI/US/portrait/n2t-out/cardGrid.txt	2022-07-09 09:14:33.040049343 +0000
+--- HMI/n2t-out/cardGrid.txt	2022-07-12 19:48:18.753451293 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt	2022-07-12 19:48:19.289452078 +0000
 @@ -12,15 +12,11 @@
      
      Events
@@ -409,8 +409,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
  TouchCap tc0
      Attributes
 diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
---- HMI/n2t-out/cardMedia.txt	2022-07-09 09:14:32.608054957 +0000
-+++ HMI/US/portrait/n2t-out/cardMedia.txt	2022-07-09 09:14:33.040049343 +0000
+--- HMI/n2t-out/cardMedia.txt	2022-07-12 19:48:18.753451293 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt	2022-07-12 19:48:19.289452078 +0000
 @@ -12,15 +12,11 @@
      
      Events
@@ -429,8 +429,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
              {
                  hVolume.pic=14
 diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
---- HMI/n2t-out/cardQR.txt	2022-07-09 09:14:32.608054957 +0000
-+++ HMI/US/portrait/n2t-out/cardQR.txt	2022-07-09 09:14:33.040049343 +0000
+--- HMI/n2t-out/cardQR.txt	2022-07-12 19:48:18.753451293 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt	2022-07-12 19:48:19.285452072 +0000
 @@ -12,25 +12,6 @@
      
      Events
@@ -458,8 +458,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
              vis p0,0
              vis tSend,0
 diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
---- HMI/n2t-out/cardThermo.txt	2022-07-09 09:14:32.608054957 +0000
-+++ HMI/US/portrait/n2t-out/cardThermo.txt	2022-07-09 09:14:33.040049343 +0000
+--- HMI/n2t-out/cardThermo.txt	2022-07-12 19:48:18.753451293 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt	2022-07-12 19:48:19.289452078 +0000
 @@ -12,21 +12,6 @@
      
      Events
@@ -483,8 +483,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
              vis p0,0
              vis tSend,0
 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
---- HMI/n2t-out/pageStartup.txt	2022-07-09 09:14:32.608054957 +0000
-+++ HMI/US/portrait/n2t-out/pageStartup.txt	2022-07-09 09:14:33.040049343 +0000
+--- HMI/n2t-out/pageStartup.txt	2022-07-12 19:48:18.749451287 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt	2022-07-12 19:48:19.289452078 +0000
 @@ -142,7 +142,7 @@
          Disable release event after dragging: 0
          Send Component ID                   : disabled
@@ -504,8 +504,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
              btlen tSend.txt,sys0
              crcrest 1,0xffff // reset CRC
 diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
---- HMI/n2t-out/pageTest.txt	2022-07-09 09:14:32.608054957 +0000
-+++ HMI/US/portrait/n2t-out/pageTest.txt	2022-07-09 09:14:33.040049343 +0000
+--- HMI/n2t-out/pageTest.txt	2022-07-12 19:48:18.749451287 +0000
++++ HMI/US/portrait/n2t-out/pageTest.txt	2022-07-12 19:48:19.285452072 +0000
 @@ -13,46 +13,6 @@
      Events
          Preinitialize Event
@@ -555,9 +555,9 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
      Attributes
 Only in HMI/n2t-out: popupFan.txt
 diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
---- HMI/n2t-out/popupLight.txt	2022-07-09 09:14:32.608054957 +0000
-+++ HMI/US/portrait/n2t-out/popupLight.txt	2022-07-09 09:14:33.040049343 +0000
-@@ -12,14 +12,10 @@
+--- HMI/n2t-out/popupLight.txt	2022-07-12 19:48:18.753451293 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt	2022-07-12 19:48:19.285452072 +0000
+@@ -12,29 +12,6 @@
      
      Events
          Preinitialize Event
@@ -565,17 +565,57 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
 -            for(sys0=0;sys0<27;sys0++)
 -            {
 -                if(b[sys0].type==98||b[sys0].type==116)
-+            for(sys0=0;sys0<40;sys0++)
-                 {
-                     b[sys0].bco=defaultBcoColor
-                     b[sys0].pco=defaultFontColor
+-                {
+-                    b[sys0].bco=defaultBcoColor
+-                    b[sys0].pco=defaultFontColor
 -                }
-                 if(b[sys0].type==53&&defaultBcoColor==0)
-                 {
-                     b[sys0].pic=10
+-                if(b[sys0].type==53&&defaultBcoColor==0)
+-                {
+-                    b[sys0].pic=10
+-                    b[sys0].pic2=11
+-                }
+-            }
+-            if(defaultBcoColor==0)
+-            {
+-                hBrightness.pic=14
+-                hBrightness.pic1=13
+-                hBrightness.pic2=15
+-                hTempSlider.pic=16
+-                hTempSlider.pic1=17
+-                hTempSlider.pic2=15
+-            }
+             dim=dimValueNormal
+             //get entitiy name
+             tEntity.txt=pageIcons.tTmp1.txt
+@@ -73,6 +50,25 @@
+             vis t0,0
+             vis pColorWheel,0
+             //vis t0,0
++            for(sys0=0;sys0<40;sys0++)
++            {
++                b[sys0].bco=defaultBcoColor
++                b[sys0].pco=defaultFontColor
++                if(b[sys0].type==53&&defaultBcoColor==0)
++                {
++                    b[sys0].pic=10
++                    b[sys0].pic2=11
++                }
++            }
++            if(defaultBcoColor==0)
++            {
++                hBrightness.pic=14
++                hBrightness.pic1=13
++                hBrightness.pic2=15
++                hTempSlider.pic=16
++                hTempSlider.pic1=17
++                hTempSlider.pic2=15
++            }
+         
+ Variable (string) strCommand
+     Attributes
 diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
---- HMI/n2t-out/popupNotify.txt	2022-07-09 09:14:32.608054957 +0000
-+++ HMI/US/portrait/n2t-out/popupNotify.txt	2022-07-09 09:14:33.040049343 +0000
+--- HMI/n2t-out/popupNotify.txt	2022-07-12 19:48:18.753451293 +0000
++++ HMI/US/portrait/n2t-out/popupNotify.txt	2022-07-12 19:48:19.285452072 +0000
 @@ -12,24 +12,12 @@
      
      Events
@@ -602,8 +642,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
  Variable (string) strCommand
      Attributes
 diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
---- HMI/n2t-out/popupShutter.txt	2022-07-09 09:14:32.608054957 +0000
-+++ HMI/US/portrait/n2t-out/popupShutter.txt	2022-07-09 09:14:33.040049343 +0000
+--- HMI/n2t-out/popupShutter.txt	2022-07-12 19:48:18.753451293 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt	2022-07-12 19:48:19.285452072 +0000
 @@ -143,7 +143,7 @@
          Send Component ID                   : disabled
          Associated Keyboard                 : none
diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt
index af18b21d..39bab6ab 100644
--- a/HMI/US/portrait/diff-filtered.txt
+++ b/HMI/US/portrait/diff-filtered.txt
@@ -1,13 +1,13 @@
-+++ HMI/US/portrait/diff-eu-version.txt	2022-07-09 09:14:33.052049192 +0000
-+--- HMI/n2t-out/Program.s.txt	2022-07-09 09:14:32.604055011 +0000
-++++ HMI/US/portrait/n2t-out/Program.s.txt	2022-07-09 09:14:33.040049343 +0000
++++ HMI/US/portrait/diff-eu-version.txt	2022-07-12 19:48:19.341452154 +0000
++--- HMI/n2t-out/Program.s.txt	2022-07-12 19:48:18.749451287 +0000
+++++ HMI/US/portrait/n2t-out/Program.s.txt	2022-07-12 19:48:19.285452072 +0000
 +@@ -14,6 +14,6 @@
 +     //color vars
 +     int defaultFontColor=65535
 +     int defaultBcoColor=6371
 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
-+--- HMI/n2t-out/cardAlarm.txt	2022-07-09 09:14:32.608054957 +0000
-++++ HMI/US/portrait/n2t-out/cardAlarm.txt	2022-07-09 09:14:33.040049343 +0000
++--- HMI/n2t-out/cardAlarm.txt	2022-07-12 19:48:18.753451293 +0000
+++++ HMI/US/portrait/n2t-out/cardAlarm.txt	2022-07-12 19:48:19.285452072 +0000
 +@@ -12,15 +12,11 @@
 +     
 +     Events
@@ -33,8 +33,8 @@
 +         Max. Text Size                      : 10
 +     
 + Text tIcon
-+--- HMI/n2t-out/cardEntities.txt	2022-07-09 09:14:32.608054957 +0000
-++++ HMI/US/portrait/n2t-out/cardEntities.txt	2022-07-09 09:14:33.040049343 +0000
++--- HMI/n2t-out/cardEntities.txt	2022-07-12 19:48:18.753451293 +0000
+++++ HMI/US/portrait/n2t-out/cardEntities.txt	2022-07-12 19:48:19.289452078 +0000
 +@@ -12,14 +12,10 @@
 +     
 +     Events
@@ -68,10 +68,13 @@
 +@@ -990,6 +1167,33 @@
 +@@ -1028,10 +1232,6 @@
 +                 //popupLight.tEntity.txt=tEntity3.txt
++                 page popupLight
++             }
 +-            if(type3.txt=="fan")
 +-            {
 +-                page popupFan
 +-            }
++         
 + Hotspot m1
 +     Attributes
 +@@ -1054,10 +1254,6 @@
@@ -87,13 +90,10 @@
 +     Attributes
 +@@ -1080,10 +1276,6 @@
 +                 //popupLight.tEntity.txt=tEntity1.txt
-+                 page popupLight
-+             }
 +-            if(type1.txt=="fan")
 +-            {
 +-                page popupFan
 +-            }
-+         
 + Hotspot m3
 +     Attributes
 +@@ -1106,9 +1298,27 @@
@@ -107,8 +107,8 @@
 +             }
 +         
 +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
-+--- HMI/n2t-out/cardGrid.txt	2022-07-09 09:14:32.608054957 +0000
-++++ HMI/US/portrait/n2t-out/cardGrid.txt	2022-07-09 09:14:33.040049343 +0000
++--- HMI/n2t-out/cardGrid.txt	2022-07-12 19:48:18.753451293 +0000
+++++ HMI/US/portrait/n2t-out/cardGrid.txt	2022-07-12 19:48:19.289452078 +0000
 +@@ -12,15 +12,11 @@
 +     
 +     Events
@@ -137,8 +137,8 @@
 +         
 + TouchCap tc0
 +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
-+--- HMI/n2t-out/cardMedia.txt	2022-07-09 09:14:32.608054957 +0000
-++++ HMI/US/portrait/n2t-out/cardMedia.txt	2022-07-09 09:14:33.040049343 +0000
++--- HMI/n2t-out/cardMedia.txt	2022-07-12 19:48:18.753451293 +0000
+++++ HMI/US/portrait/n2t-out/cardMedia.txt	2022-07-12 19:48:19.289452078 +0000
 +@@ -12,15 +12,11 @@
 +     
 +     Events
@@ -156,8 +156,8 @@
 +             if(defaultBcoColor==0)
 +             {
 +                 hVolume.pic=14
-+--- HMI/n2t-out/cardQR.txt	2022-07-09 09:14:32.608054957 +0000
-++++ HMI/US/portrait/n2t-out/cardQR.txt	2022-07-09 09:14:33.040049343 +0000
++--- HMI/n2t-out/cardQR.txt	2022-07-12 19:48:18.753451293 +0000
+++++ HMI/US/portrait/n2t-out/cardQR.txt	2022-07-12 19:48:19.285452072 +0000
 +@@ -12,25 +12,6 @@
 +     Events
 +         Preinitialize Event
@@ -184,8 +184,8 @@
 +             vis p0,0
 +             vis tSend,0
 +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
-+--- HMI/n2t-out/cardThermo.txt	2022-07-09 09:14:32.608054957 +0000
-++++ HMI/US/portrait/n2t-out/cardThermo.txt	2022-07-09 09:14:33.040049343 +0000
++--- HMI/n2t-out/cardThermo.txt	2022-07-12 19:48:18.753451293 +0000
+++++ HMI/US/portrait/n2t-out/cardThermo.txt	2022-07-12 19:48:19.289452078 +0000
 +@@ -12,21 +12,6 @@
 +     
 +     Events
@@ -208,11 +208,11 @@
 +             dim=dimValueNormal
 +             vis p0,0
 +             vis tSend,0
-+--- HMI/n2t-out/pageStartup.txt	2022-07-09 09:14:32.608054957 +0000
-++++ HMI/US/portrait/n2t-out/pageStartup.txt	2022-07-09 09:14:33.040049343 +0000
++--- HMI/n2t-out/pageStartup.txt	2022-07-12 19:48:18.749451287 +0000
+++++ HMI/US/portrait/n2t-out/pageStartup.txt	2022-07-12 19:48:19.289452078 +0000
 +diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
-+--- HMI/n2t-out/pageTest.txt	2022-07-09 09:14:32.608054957 +0000
-++++ HMI/US/portrait/n2t-out/pageTest.txt	2022-07-09 09:14:33.040049343 +0000
++--- HMI/n2t-out/pageTest.txt	2022-07-12 19:48:18.749451287 +0000
+++++ HMI/US/portrait/n2t-out/pageTest.txt	2022-07-12 19:48:19.285452072 +0000
 +@@ -13,46 +13,6 @@
 +     Events
 +         Preinitialize Event
@@ -262,9 +262,9 @@
 +     Attributes
 +Only in HMI/n2t-out: popupFan.txt
 +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
-+--- HMI/n2t-out/popupLight.txt	2022-07-09 09:14:32.608054957 +0000
-++++ HMI/US/portrait/n2t-out/popupLight.txt	2022-07-09 09:14:33.040049343 +0000
-+@@ -12,14 +12,10 @@
++--- HMI/n2t-out/popupLight.txt	2022-07-12 19:48:18.753451293 +0000
+++++ HMI/US/portrait/n2t-out/popupLight.txt	2022-07-12 19:48:19.285452072 +0000
++@@ -12,29 +12,6 @@
 +     
 +     Events
 +         Preinitialize Event
@@ -272,17 +272,57 @@
 +-            for(sys0=0;sys0<27;sys0++)
 +-            {
 +-                if(b[sys0].type==98||b[sys0].type==116)
-++            for(sys0=0;sys0<40;sys0++)
-+                 {
-+                     b[sys0].bco=defaultBcoColor
-+                     b[sys0].pco=defaultFontColor
++-                {
++-                    b[sys0].bco=defaultBcoColor
++-                    b[sys0].pco=defaultFontColor
 +-                }
-+                 if(b[sys0].type==53&&defaultBcoColor==0)
-+                 {
-+                     b[sys0].pic=10
++-                if(b[sys0].type==53&&defaultBcoColor==0)
++-                {
++-                    b[sys0].pic=10
++-                    b[sys0].pic2=11
++-                }
++-            }
++-            if(defaultBcoColor==0)
++-            {
++-                hBrightness.pic=14
++-                hBrightness.pic1=13
++-                hBrightness.pic2=15
++-                hTempSlider.pic=16
++-                hTempSlider.pic1=17
++-                hTempSlider.pic2=15
++-            }
++             dim=dimValueNormal
++             //get entitiy name
++             tEntity.txt=pageIcons.tTmp1.txt
++@@ -73,6 +50,25 @@
++             vis t0,0
++             vis pColorWheel,0
++             //vis t0,0
+++            for(sys0=0;sys0<40;sys0++)
+++            {
+++                b[sys0].bco=defaultBcoColor
+++                b[sys0].pco=defaultFontColor
+++                if(b[sys0].type==53&&defaultBcoColor==0)
+++                {
+++                    b[sys0].pic=10
+++                    b[sys0].pic2=11
+++                }
+++            }
+++            if(defaultBcoColor==0)
+++            {
+++                hBrightness.pic=14
+++                hBrightness.pic1=13
+++                hBrightness.pic2=15
+++                hTempSlider.pic=16
+++                hTempSlider.pic1=17
+++                hTempSlider.pic2=15
+++            }
++         
++ Variable (string) strCommand
++     Attributes
 +diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
-+--- HMI/n2t-out/popupNotify.txt	2022-07-09 09:14:32.608054957 +0000
-++++ HMI/US/portrait/n2t-out/popupNotify.txt	2022-07-09 09:14:33.040049343 +0000
++--- HMI/n2t-out/popupNotify.txt	2022-07-12 19:48:18.753451293 +0000
+++++ HMI/US/portrait/n2t-out/popupNotify.txt	2022-07-12 19:48:19.285452072 +0000
 +@@ -12,24 +12,12 @@
 +     
 +     Events
@@ -309,8 +349,8 @@
 + Variable (string) strCommand
 +     Attributes
 +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
-+--- HMI/n2t-out/popupShutter.txt	2022-07-09 09:14:32.608054957 +0000
-++++ HMI/US/portrait/n2t-out/popupShutter.txt	2022-07-09 09:14:33.040049343 +0000
++--- HMI/n2t-out/popupShutter.txt	2022-07-12 19:48:18.753451293 +0000
+++++ HMI/US/portrait/n2t-out/popupShutter.txt	2022-07-12 19:48:19.285452072 +0000
 +@@ -143,7 +143,7 @@
 +         Send Component ID                   : disabled
 +         Associated Keyboard                 : none
diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
index f4ea6872..f70945f3 100644
--- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
+++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
@@ -18,6 +18,10 @@ popupShutter
 	25   Component(s)
 	388  Line(s) of event code
 	211  Unique line(s) of event code
+popupLight
+	27   Component(s)
+	382  Line(s) of event code
+	209  Unique line(s) of event code
 cardQR
 	32   Component(s)
 	384  Line(s) of event code
@@ -30,10 +34,6 @@ pageStartup
 	19   Component(s)
 	167  Line(s) of event code
 	122  Unique line(s) of event code
-popupLight
-	27   Component(s)
-	382  Line(s) of event code
-	209  Unique line(s) of event code
 cardMedia
 	34   Component(s)
 	384  Line(s) of event code
diff --git a/HMI/US/portrait/n2t-out-visual/popupLight.txt b/HMI/US/portrait/n2t-out-visual/popupLight.txt
index 7da05b3a..4299aac8 100644
--- a/HMI/US/portrait/n2t-out-visual/popupLight.txt
+++ b/HMI/US/portrait/n2t-out-visual/popupLight.txt
@@ -20,25 +20,6 @@ Page popupLight
     
     Events
         Preinitialize Event
-            for(sys0=0;sys0<40;sys0++)
-            {
-                b[sys0].bco=defaultBcoColor
-                b[sys0].pco=defaultFontColor
-                if(b[sys0].type==53&&defaultBcoColor==0)
-                {
-                    b[sys0].pic=10
-                    b[sys0].pic2=11
-                }
-            }
-            if(defaultBcoColor==0)
-            {
-                hBrightness.pic=14
-                hBrightness.pic1=13
-                hBrightness.pic2=15
-                hTempSlider.pic=16
-                hTempSlider.pic1=17
-                hTempSlider.pic2=15
-            }
             dim=dimValueNormal
             //get entitiy name
             tEntity.txt=pageIcons.tTmp1.txt
@@ -77,6 +58,25 @@ Page popupLight
             vis t0,0
             vis pColorWheel,0
             //vis t0,0
+            for(sys0=0;sys0<40;sys0++)
+            {
+                b[sys0].bco=defaultBcoColor
+                b[sys0].pco=defaultFontColor
+                if(b[sys0].type==53&&defaultBcoColor==0)
+                {
+                    b[sys0].pic=10
+                    b[sys0].pic2=11
+                }
+            }
+            if(defaultBcoColor==0)
+            {
+                hBrightness.pic=14
+                hBrightness.pic1=13
+                hBrightness.pic2=15
+                hTempSlider.pic=16
+                hTempSlider.pic1=17
+                hTempSlider.pic2=15
+            }
         
 Variable (string) strCommand
     Attributes
diff --git a/HMI/US/portrait/n2t-out/popupLight.txt b/HMI/US/portrait/n2t-out/popupLight.txt
index 9644f132..4f94af4a 100644
--- a/HMI/US/portrait/n2t-out/popupLight.txt
+++ b/HMI/US/portrait/n2t-out/popupLight.txt
@@ -12,25 +12,6 @@ Page popupLight
     
     Events
         Preinitialize Event
-            for(sys0=0;sys0<40;sys0++)
-            {
-                b[sys0].bco=defaultBcoColor
-                b[sys0].pco=defaultFontColor
-                if(b[sys0].type==53&&defaultBcoColor==0)
-                {
-                    b[sys0].pic=10
-                    b[sys0].pic2=11
-                }
-            }
-            if(defaultBcoColor==0)
-            {
-                hBrightness.pic=14
-                hBrightness.pic1=13
-                hBrightness.pic2=15
-                hTempSlider.pic=16
-                hTempSlider.pic1=17
-                hTempSlider.pic2=15
-            }
             dim=dimValueNormal
             //get entitiy name
             tEntity.txt=pageIcons.tTmp1.txt
@@ -69,6 +50,25 @@ Page popupLight
             vis t0,0
             vis pColorWheel,0
             //vis t0,0
+            for(sys0=0;sys0<40;sys0++)
+            {
+                b[sys0].bco=defaultBcoColor
+                b[sys0].pco=defaultFontColor
+                if(b[sys0].type==53&&defaultBcoColor==0)
+                {
+                    b[sys0].pic=10
+                    b[sys0].pic2=11
+                }
+            }
+            if(defaultBcoColor==0)
+            {
+                hBrightness.pic=14
+                hBrightness.pic1=13
+                hBrightness.pic2=15
+                hTempSlider.pic=16
+                hTempSlider.pic1=17
+                hTempSlider.pic2=15
+            }
         
 Variable (string) strCommand
     Attributes
diff --git a/docs/prepare_nspanel.md b/docs/prepare_nspanel.md
index 6b98a164..d70c4935 100644
--- a/docs/prepare_nspanel.md
+++ b/docs/prepare_nspanel.md
@@ -1,6 +1,6 @@
 # Flash Tasmota to your NSPanel
 
-You need to connect to your nspanel via serial and flash tasmtoa [tasmota32-nspanel.bin](https://tasmota.github.io/install/firmware/development/tasmota32-nspanel.bin) to your NSPanel. 
+You need to connect to your nspanel via serial and flash tasmtoa [tasmota32-nspanel.bin](http://ota.tasmota.com/tasmota32/release/tasmota32-nspanel.bin) to your NSPanel. 
 You can use the Tasmota Web Installer to do so. [Tasmota Web Installer](https://tasmota.github.io/install/)
 
 Checkout Blakadders Template Repo for more information on flashing, do not use the autoexec.be from this page.
diff --git a/docs/prepare_nspanel2.md b/docs/prepare_nspanel2.md
index 8ce777d6..6e9503de 100644
--- a/docs/prepare_nspanel2.md
+++ b/docs/prepare_nspanel2.md
@@ -1,6 +1,6 @@
 # Flash Tasmota to your NSPanel
 
-You need to connect to your nspanel via serial and flash tasmtoa [tasmota32-nspanel.bin](https://tasmota.github.io/install/firmware/development/tasmota32-nspanel.bin) to your NSPanel. 
+You need to connect to your nspanel via serial and flash tasmtoa [tasmota32-nspanel.bin](http://ota.tasmota.com/tasmota32/release/tasmota32-nspanel.bin) to your NSPanel. 
 You can use the Tasmota Web Installer to do so. [Tasmota Web Installer](https://tasmota.github.io/install/)
 
 Checkout Blakadders Template Repo for more information on flashing, do not use the autoexec.be from this page.