diff --git a/HMI/US/landscape/nspanel_US_L.HMI b/HMI/US/landscape/nspanel_US_L.HMI
index 06ba9a3c..eb0003ef 100644
Binary files a/HMI/US/landscape/nspanel_US_L.HMI and b/HMI/US/landscape/nspanel_US_L.HMI differ
diff --git a/HMI/US/landscape/nspanel_US_L.tft b/HMI/US/landscape/nspanel_US_L.tft
index 77333037..4c01b431 100644
Binary files a/HMI/US/landscape/nspanel_US_L.tft and b/HMI/US/landscape/nspanel_US_L.tft differ
diff --git a/HMI/US/portrait/nspanel_US_P.HMI b/HMI/US/portrait/nspanel_US_P.HMI
index 810a07a1..43032993 100644
Binary files a/HMI/US/portrait/nspanel_US_P.HMI and b/HMI/US/portrait/nspanel_US_P.HMI differ
diff --git a/HMI/US/portrait/nspanel_US_P.tft b/HMI/US/portrait/nspanel_US_P.tft
index b16210db..8d5d5e18 100644
Binary files a/HMI/US/portrait/nspanel_US_P.tft and b/HMI/US/portrait/nspanel_US_P.tft differ
diff --git a/HMI/code_gen/pages/out.txt b/HMI/code_gen/pages/out.txt
deleted file mode 100644
index 42c39fd9..00000000
--- a/HMI/code_gen/pages/out.txt
+++ /dev/null
@@ -1,1034 +0,0 @@
-
-// data available
-if(usize>1)
-{
-  bufferPos=0
-  while(bufferPos<usize)
-  {
-    // check for 0x55 0xBB - Command Init Secuence
-    if(u[bufferPos]==187&&u[bufferPos-1]==85)
-    {
-      //remove garbage at the start of the buffer if there's any to free buffer for command
-      if(u[bufferPos]!=1)
-      {
-        udelete bufferPos-1
-      }
-      //instruction is now aligned with buffer, because we deleted garbage before instrcution
-      //get length after init sequence (check if there are more than to bytes in buffer)
-      if(3<usize)
-      {
-        // check if serial buffer has reached the announced length
-        ucopy payloadLength,2,2,0
-        // we are only checking payload length so we have to skip first 3 bytes (init+payload length) (-1 because of < instead of <=)
-        payloadLength+=3
-        // payload length does also not contain crc, so we are adding another 2 bytes for crc
-        payloadLength+=2
-        if(payloadLength<usize)
-        {
-          // calculate crc
-          crcrest 1,0xFFFF
-          // u[2] contains payload legth at 3rd pos in buffer, we are calculating crc from 3rd pos with number of bytes from payload length
-          //crcputu 3,u[2]
-          // u[2] cotnains payload length, we are calculating a crc over the whole message, so we have to add 3 to the length from u[2]
-          crcputu 0,payloadLength-1
-          // get recived crc to be able to compare it
-          ucopy recvCrc,payloadLength-1,2,0
-          // compare crc with recived value
-          if(crcval==recvCrc)
-          {
-            // crc is okay
-            // here is the location where acual code should be
-            // write command to variable strCommand
-            ucopy strCommand.txt,4,payloadLength-5,0
-            // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
-            spstr strCommand.txt,tInstruction.txt,"~",0
-
-            if(tInstruction.txt=="entityUpd")
-            {
-            // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4
-            spstr strCommand.txt,tHeading.txt,"~",1
-
-              // navigation icons
-              spstr strCommand.txt,tId.txt,"~",2
-              spstr tId.txt,tTmp.txt,"|",0
-              if(tTmp.txt=="0")
-              {
-                vis bPrev,0
-              }
-              if(tTmp.txt=="1")
-              {
-                vis bPrev,1
-                bPrev.txt=""
-              }
-              if(tTmp.txt=="2")
-              {
-                vis bPrev,1
-                bPrev.txt=""
-              }       
-              spstr tId.txt,tTmp.txt,"|",1
-              if(tTmp.txt=="0")
-              {
-                vis bNext,0
-              }
-              if(tTmp.txt=="1")
-              {
-                vis bNext,1
-                bNext.txt=""
-              }
-
-
-              // get Type
-              spstr strCommand.txt,type1.txt,"~",3
-              // get internal name
-              spstr strCommand.txt,entn1.txt,"~",4
-              if(type1.txt=="delete"||type1.txt=="")
-              {
-                vis bUp1,0
-                vis bStop1,0
-                vis bDown1,0
-                vis btOnOff1,0
-                vis tEntity1,0
-                vis tIcon1,0
-                vis bText1,0
-                vis hSlider1,0
-                vis nNum1,0
-              }else
-              {
-                // change icon
-                spstr strCommand.txt,tIcon1.txt,"~",5
-                vis tIcon1,1
-                // change icon color
-                spstr strCommand.txt,tTmp.txt,"~",6
-                covx tTmp.txt,sys0,0,0
-                tIcon1.pco=sys0
-                // set name
-                spstr strCommand.txt,tEntity1.txt,"~",7
-                vis tEntity1,1
-              }
-
-              if(type1.txt=="shutter")
-              {
-                vis bUp1,1
-                vis bStop1,1
-                vis bDown1,1
-                vis btOnOff1,0
-                vis bText1,0
-                vis hSlider1,0
-                vis nNum1,0
-                // get Button State (optional Value)
-                spstr strCommand.txt,tId.txt,"~",8
-
-                // up button
-                spstr tId.txt,tTmp.txt,"|",0
-                if(tTmp.txt=="disable")
-                {
-                  bUp1.pco=27501
-                  tsw bUp1,0
-                }
-                else if(tTmp.txt!="")
-                {
-                  bUp1.pco=65535
-                  bUp1.txt=tTmp.txt
-                  tsw bUp1,1
-                }
-
-                // stop button
-                spstr tId.txt,tTmp.txt,"|",1
-                if(tTmp.txt=="disable")
-                {
-                  bStop1.pco=27501
-                  tsw bStop1,0
-                }
-                else if(tTmp.txt!="")
-                {
-                  bStop1.pco=65535
-                  bStop1.txt=tTmp.txt
-                  tsw bStop1,1
-                }
-
-                // down button
-                spstr tId.txt,tTmp.txt,"|",2
-                if(tTmp.txt=="disable")
-                {
-                  bDown1.pco=27501
-                  tsw bDown1,0
-                }
-                else if(tTmp.txt!="")
-                {
-                  bDown1.pco=65535
-                  bDown1.txt=tTmp.txt
-                  tsw bDown1,1
-                }
-              }
-              if(type1.txt=="light")
-              {
-                vis bUp1,0
-                vis bStop1,0
-                vis bDown1,0
-                vis btOnOff1,1
-                vis bText1,0
-                vis hSlider1,0
-                vis nNum1,0
-                // get Button State (optional Value)
-                spstr strCommand.txt,tTmp.txt,"~",8
-                covx tTmp.txt,sys0,0,0
-                btOnOff1.val=sys0
-              }
-              if(type1.txt=="switch")
-              {
-                vis bUp1,0
-                vis bStop1,0
-                vis bDown1,0
-                vis btOnOff1,1
-                vis bText1,0
-                vis hSlider1,0
-                vis nNum1,0
-                // get Button State (optional Value)
-                spstr strCommand.txt,tTmp.txt,"~",8
-                covx tTmp.txt,sys0,0,0
-                btOnOff1.val=sys0
-              }
-              if(type1.txt=="text")
-              {
-                vis bUp1,0
-                vis bStop1,0
-                vis bDown1,0
-                vis btOnOff1,0
-                vis bText1,1
-                tsw bText1,0
-                vis hSlider1,0
-                vis nNum1,0
-                bText1.pco=65535
-                bText1.pco2=65535
-                // get Text (optional Value)
-                spstr strCommand.txt,bText1.txt,"~",8
-              }
-              if(type1.txt=="button")
-              {
-                vis bUp1,0
-                vis bStop1,0
-                vis bDown1,0
-                vis btOnOff1,0
-                vis bText1,1
-                tsw bText1,1
-                vis hSlider1,0
-                vis nNum1,0
-                bText1.pco=1374
-                bText1.pco2=1374
-                // get Text (optional Value)
-                spstr strCommand.txt,bText1.txt,"~",8
-              }
-              if(type1.txt=="number")
-              {
-                vis bUp1,0
-                vis bStop1,0
-                vis bDown1,0
-                vis btOnOff1,0
-                vis bText1,0
-                tsw bText1,0
-                vis hSlider1,1
-                vis nNum1,1
-                // get config (optional Value) (use bText as variable)
-                spstr strCommand.txt,bText1.txt,"~",8
-                //first value is current value
-                spstr bText1.txt,tTmp.txt,"|",0
-                covx tTmp.txt,sys0,0,0
-                hSlider1.val=sys0
-                nNum1.val=sys0
-                //second value is min value
-                spstr bText1.txt,tTmp.txt,"|",1
-                covx tTmp.txt,sys0,0,0
-                hSlider1.minval=sys0
-                //third value is max value
-                spstr bText1.txt,tTmp.txt,"|",2
-                covx tTmp.txt,sys0,0,0
-                hSlider1.maxval=sys0
-              }
-
-
-
-
-
-              // get Type
-              spstr strCommand.txt,type2.txt,"~",9
-              // get internal name
-              spstr strCommand.txt,entn2.txt,"~",10
-              if(type2.txt=="delete"||type2.txt=="")
-              {
-                vis bUp2,0
-                vis bStop2,0
-                vis bDown2,0
-                vis btOnOff2,0
-                vis tEntity2,0
-                vis tIcon2,0
-                vis bText2,0
-                vis hSlider2,0
-                vis nNum2,0
-              }else
-              {
-                // change icon
-                spstr strCommand.txt,tIcon2.txt,"~",11
-                vis tIcon2,1
-                // change icon color
-                spstr strCommand.txt,tTmp.txt,"~",12
-                covx tTmp.txt,sys0,0,0
-                tIcon2.pco=sys0
-                // set name
-                spstr strCommand.txt,tEntity2.txt,"~",13
-                vis tEntity2,1
-              }
-
-              if(type2.txt=="shutter")
-              {
-                vis bUp2,1
-                vis bStop2,1
-                vis bDown2,1
-                vis btOnOff2,0
-                vis bText2,0
-                vis hSlider2,0
-                vis nNum2,0
-                // get Button State (optional Value)
-                spstr strCommand.txt,tId.txt,"~",14
-
-                // up button
-                spstr tId.txt,tTmp.txt,"|",0
-                if(tTmp.txt=="disable")
-                {
-                  bUp2.pco=27501
-                  tsw bUp2,0
-                }
-                else if(tTmp.txt!="")
-                {
-                  bUp2.pco=65535
-                  bUp2.txt=tTmp.txt
-                  tsw bUp2,1
-                }
-
-                // stop button
-                spstr tId.txt,tTmp.txt,"|",1
-                if(tTmp.txt=="disable")
-                {
-                  bStop2.pco=27501
-                  tsw bStop2,0
-                }
-                else if(tTmp.txt!="")
-                {
-                  bStop2.pco=65535
-                  bStop2.txt=tTmp.txt
-                  tsw bStop2,1
-                }
-
-                // down button
-                spstr tId.txt,tTmp.txt,"|",2
-                if(tTmp.txt=="disable")
-                {
-                  bDown2.pco=27501
-                  tsw bDown2,0
-                }
-                else if(tTmp.txt!="")
-                {
-                  bDown2.pco=65535
-                  bDown2.txt=tTmp.txt
-                  tsw bDown2,1
-                }
-              }
-              if(type2.txt=="light")
-              {
-                vis bUp2,0
-                vis bStop2,0
-                vis bDown2,0
-                vis btOnOff2,1
-                vis bText2,0
-                vis hSlider2,0
-                vis nNum2,0
-                // get Button State (optional Value)
-                spstr strCommand.txt,tTmp.txt,"~",14
-                covx tTmp.txt,sys0,0,0
-                btOnOff2.val=sys0
-              }
-              if(type2.txt=="switch")
-              {
-                vis bUp2,0
-                vis bStop2,0
-                vis bDown2,0
-                vis btOnOff2,1
-                vis bText2,0
-                vis hSlider2,0
-                vis nNum2,0
-                // get Button State (optional Value)
-                spstr strCommand.txt,tTmp.txt,"~",14
-                covx tTmp.txt,sys0,0,0
-                btOnOff2.val=sys0
-              }
-              if(type2.txt=="text")
-              {
-                vis bUp2,0
-                vis bStop2,0
-                vis bDown2,0
-                vis btOnOff2,0
-                vis bText2,1
-                tsw bText2,0
-                vis hSlider2,0
-                vis nNum2,0
-                bText2.pco=65535
-                bText2.pco2=65535
-                // get Text (optional Value)
-                spstr strCommand.txt,bText2.txt,"~",14
-              }
-              if(type2.txt=="button")
-              {
-                vis bUp2,0
-                vis bStop2,0
-                vis bDown2,0
-                vis btOnOff2,0
-                vis bText2,1
-                tsw bText2,1
-                vis hSlider2,0
-                vis nNum2,0
-                bText2.pco=1374
-                bText2.pco2=1374
-                // get Text (optional Value)
-                spstr strCommand.txt,bText2.txt,"~",14
-              }
-              if(type2.txt=="number")
-              {
-                vis bUp2,0
-                vis bStop2,0
-                vis bDown2,0
-                vis btOnOff2,0
-                vis bText2,0
-                tsw bText2,0
-                vis hSlider2,1
-                vis nNum2,1
-                // get config (optional Value) (use bText as variable)
-                spstr strCommand.txt,bText2.txt,"~",14
-                //first value is current value
-                spstr bText2.txt,tTmp.txt,"|",0
-                covx tTmp.txt,sys0,0,0
-                hSlider2.val=sys0
-                nNum2.val=sys0
-                //second value is min value
-                spstr bText2.txt,tTmp.txt,"|",1
-                covx tTmp.txt,sys0,0,0
-                hSlider2.minval=sys0
-                //third value is max value
-                spstr bText2.txt,tTmp.txt,"|",2
-                covx tTmp.txt,sys0,0,0
-                hSlider2.maxval=sys0
-              }
-
-
-
-
-
-              // get Type
-              spstr strCommand.txt,type3.txt,"~",15
-              // get internal name
-              spstr strCommand.txt,entn3.txt,"~",16
-              if(type3.txt=="delete"||type3.txt=="")
-              {
-                vis bUp3,0
-                vis bStop3,0
-                vis bDown3,0
-                vis btOnOff3,0
-                vis tEntity3,0
-                vis tIcon3,0
-                vis bText3,0
-                vis hSlider3,0
-                vis nNum3,0
-              }else
-              {
-                // change icon
-                spstr strCommand.txt,tIcon3.txt,"~",17
-                vis tIcon3,1
-                // change icon color
-                spstr strCommand.txt,tTmp.txt,"~",18
-                covx tTmp.txt,sys0,0,0
-                tIcon3.pco=sys0
-                // set name
-                spstr strCommand.txt,tEntity3.txt,"~",19
-                vis tEntity3,1
-              }
-
-              if(type3.txt=="shutter")
-              {
-                vis bUp3,1
-                vis bStop3,1
-                vis bDown3,1
-                vis btOnOff3,0
-                vis bText3,0
-                vis hSlider3,0
-                vis nNum3,0
-                // get Button State (optional Value)
-                spstr strCommand.txt,tId.txt,"~",20
-
-                // up button
-                spstr tId.txt,tTmp.txt,"|",0
-                if(tTmp.txt=="disable")
-                {
-                  bUp3.pco=27501
-                  tsw bUp3,0
-                }
-                else if(tTmp.txt!="")
-                {
-                  bUp3.pco=65535
-                  bUp3.txt=tTmp.txt
-                  tsw bUp3,1
-                }
-
-                // stop button
-                spstr tId.txt,tTmp.txt,"|",1
-                if(tTmp.txt=="disable")
-                {
-                  bStop3.pco=27501
-                  tsw bStop3,0
-                }
-                else if(tTmp.txt!="")
-                {
-                  bStop3.pco=65535
-                  bStop3.txt=tTmp.txt
-                  tsw bStop3,1
-                }
-
-                // down button
-                spstr tId.txt,tTmp.txt,"|",2
-                if(tTmp.txt=="disable")
-                {
-                  bDown3.pco=27501
-                  tsw bDown3,0
-                }
-                else if(tTmp.txt!="")
-                {
-                  bDown3.pco=65535
-                  bDown3.txt=tTmp.txt
-                  tsw bDown3,1
-                }
-              }
-              if(type3.txt=="light")
-              {
-                vis bUp3,0
-                vis bStop3,0
-                vis bDown3,0
-                vis btOnOff3,1
-                vis bText3,0
-                vis hSlider3,0
-                vis nNum3,0
-                // get Button State (optional Value)
-                spstr strCommand.txt,tTmp.txt,"~",20
-                covx tTmp.txt,sys0,0,0
-                btOnOff3.val=sys0
-              }
-              if(type3.txt=="switch")
-              {
-                vis bUp3,0
-                vis bStop3,0
-                vis bDown3,0
-                vis btOnOff3,1
-                vis bText3,0
-                vis hSlider3,0
-                vis nNum3,0
-                // get Button State (optional Value)
-                spstr strCommand.txt,tTmp.txt,"~",20
-                covx tTmp.txt,sys0,0,0
-                btOnOff3.val=sys0
-              }
-              if(type3.txt=="text")
-              {
-                vis bUp3,0
-                vis bStop3,0
-                vis bDown3,0
-                vis btOnOff3,0
-                vis bText3,1
-                tsw bText3,0
-                vis hSlider3,0
-                vis nNum3,0
-                bText3.pco=65535
-                bText3.pco2=65535
-                // get Text (optional Value)
-                spstr strCommand.txt,bText3.txt,"~",20
-              }
-              if(type3.txt=="button")
-              {
-                vis bUp3,0
-                vis bStop3,0
-                vis bDown3,0
-                vis btOnOff3,0
-                vis bText3,1
-                tsw bText3,1
-                vis hSlider3,0
-                vis nNum3,0
-                bText3.pco=1374
-                bText3.pco2=1374
-                // get Text (optional Value)
-                spstr strCommand.txt,bText3.txt,"~",20
-              }
-              if(type3.txt=="number")
-              {
-                vis bUp3,0
-                vis bStop3,0
-                vis bDown3,0
-                vis btOnOff3,0
-                vis bText3,0
-                tsw bText3,0
-                vis hSlider3,1
-                vis nNum3,1
-                // get config (optional Value) (use bText as variable)
-                spstr strCommand.txt,bText3.txt,"~",20
-                //first value is current value
-                spstr bText3.txt,tTmp.txt,"|",0
-                covx tTmp.txt,sys0,0,0
-                hSlider3.val=sys0
-                nNum3.val=sys0
-                //second value is min value
-                spstr bText3.txt,tTmp.txt,"|",1
-                covx tTmp.txt,sys0,0,0
-                hSlider3.minval=sys0
-                //third value is max value
-                spstr bText3.txt,tTmp.txt,"|",2
-                covx tTmp.txt,sys0,0,0
-                hSlider3.maxval=sys0
-              }
-
-
-
-
-
-              // get Type
-              spstr strCommand.txt,type4.txt,"~",21
-              // get internal name
-              spstr strCommand.txt,entn4.txt,"~",22
-              if(type4.txt=="delete"||type4.txt=="")
-              {
-                vis bUp4,0
-                vis bStop4,0
-                vis bDown4,0
-                vis btOnOff4,0
-                vis tEntity4,0
-                vis tIcon4,0
-                vis bText4,0
-                vis hSlider4,0
-                vis nNum4,0
-              }else
-              {
-                // change icon
-                spstr strCommand.txt,tIcon4.txt,"~",23
-                vis tIcon4,1
-                // change icon color
-                spstr strCommand.txt,tTmp.txt,"~",24
-                covx tTmp.txt,sys0,0,0
-                tIcon4.pco=sys0
-                // set name
-                spstr strCommand.txt,tEntity4.txt,"~",25
-                vis tEntity4,1
-              }
-
-              if(type4.txt=="shutter")
-              {
-                vis bUp4,1
-                vis bStop4,1
-                vis bDown4,1
-                vis btOnOff4,0
-                vis bText4,0
-                vis hSlider4,0
-                vis nNum4,0
-                // get Button State (optional Value)
-                spstr strCommand.txt,tId.txt,"~",26
-
-                // up button
-                spstr tId.txt,tTmp.txt,"|",0
-                if(tTmp.txt=="disable")
-                {
-                  bUp4.pco=27501
-                  tsw bUp4,0
-                }
-                else if(tTmp.txt!="")
-                {
-                  bUp4.pco=65535
-                  bUp4.txt=tTmp.txt
-                  tsw bUp4,1
-                }
-
-                // stop button
-                spstr tId.txt,tTmp.txt,"|",1
-                if(tTmp.txt=="disable")
-                {
-                  bStop4.pco=27501
-                  tsw bStop4,0
-                }
-                else if(tTmp.txt!="")
-                {
-                  bStop4.pco=65535
-                  bStop4.txt=tTmp.txt
-                  tsw bStop4,1
-                }
-
-                // down button
-                spstr tId.txt,tTmp.txt,"|",2
-                if(tTmp.txt=="disable")
-                {
-                  bDown4.pco=27501
-                  tsw bDown4,0
-                }
-                else if(tTmp.txt!="")
-                {
-                  bDown4.pco=65535
-                  bDown4.txt=tTmp.txt
-                  tsw bDown4,1
-                }
-              }
-              if(type4.txt=="light")
-              {
-                vis bUp4,0
-                vis bStop4,0
-                vis bDown4,0
-                vis btOnOff4,1
-                vis bText4,0
-                vis hSlider4,0
-                vis nNum4,0
-                // get Button State (optional Value)
-                spstr strCommand.txt,tTmp.txt,"~",26
-                covx tTmp.txt,sys0,0,0
-                btOnOff4.val=sys0
-              }
-              if(type4.txt=="switch")
-              {
-                vis bUp4,0
-                vis bStop4,0
-                vis bDown4,0
-                vis btOnOff4,1
-                vis bText4,0
-                vis hSlider4,0
-                vis nNum4,0
-                // get Button State (optional Value)
-                spstr strCommand.txt,tTmp.txt,"~",26
-                covx tTmp.txt,sys0,0,0
-                btOnOff4.val=sys0
-              }
-              if(type4.txt=="text")
-              {
-                vis bUp4,0
-                vis bStop4,0
-                vis bDown4,0
-                vis btOnOff4,0
-                vis bText4,1
-                tsw bText4,0
-                vis hSlider4,0
-                vis nNum4,0
-                bText4.pco=65535
-                bText4.pco2=65535
-                // get Text (optional Value)
-                spstr strCommand.txt,bText4.txt,"~",26
-              }
-              if(type4.txt=="button")
-              {
-                vis bUp4,0
-                vis bStop4,0
-                vis bDown4,0
-                vis btOnOff4,0
-                vis bText4,1
-                tsw bText4,1
-                vis hSlider4,0
-                vis nNum4,0
-                bText4.pco=1374
-                bText4.pco2=1374
-                // get Text (optional Value)
-                spstr strCommand.txt,bText4.txt,"~",26
-              }
-              if(type4.txt=="number")
-              {
-                vis bUp4,0
-                vis bStop4,0
-                vis bDown4,0
-                vis btOnOff4,0
-                vis bText4,0
-                tsw bText4,0
-                vis hSlider4,1
-                vis nNum4,1
-                // get config (optional Value) (use bText as variable)
-                spstr strCommand.txt,bText4.txt,"~",26
-                //first value is current value
-                spstr bText4.txt,tTmp.txt,"|",0
-                covx tTmp.txt,sys0,0,0
-                hSlider4.val=sys0
-                nNum4.val=sys0
-                //second value is min value
-                spstr bText4.txt,tTmp.txt,"|",1
-                covx tTmp.txt,sys0,0,0
-                hSlider4.minval=sys0
-                //third value is max value
-                spstr bText4.txt,tTmp.txt,"|",2
-                covx tTmp.txt,sys0,0,0
-                hSlider4.maxval=sys0
-              }
-
-
-
-
-
-              // get Type
-              spstr strCommand.txt,type5.txt,"~",27
-              // get internal name
-              spstr strCommand.txt,entn5.txt,"~",28
-              if(type5.txt=="delete"||type5.txt=="")
-              {
-                vis bUp5,0
-                vis bStop5,0
-                vis bDown5,0
-                vis btOnOff5,0
-                vis tEntity5,0
-                vis tIcon5,0
-                vis bText5,0
-                vis hSlider5,0
-                vis nNum5,0
-              }else
-              {
-                // change icon
-                spstr strCommand.txt,tIcon5.txt,"~",29
-                vis tIcon5,1
-                // change icon color
-                spstr strCommand.txt,tTmp.txt,"~",30
-                covx tTmp.txt,sys0,0,0
-                tIcon5.pco=sys0
-                // set name
-                spstr strCommand.txt,tEntity5.txt,"~",31
-                vis tEntity5,1
-              }
-
-              if(type5.txt=="shutter")
-              {
-                vis bUp5,1
-                vis bStop5,1
-                vis bDown5,1
-                vis btOnOff5,0
-                vis bText5,0
-                vis hSlider5,0
-                vis nNum5,0
-                // get Button State (optional Value)
-                spstr strCommand.txt,tId.txt,"~",32
-
-                // up button
-                spstr tId.txt,tTmp.txt,"|",0
-                if(tTmp.txt=="disable")
-                {
-                  bUp5.pco=27501
-                  tsw bUp5,0
-                }
-                else if(tTmp.txt!="")
-                {
-                  bUp5.pco=65535
-                  bUp5.txt=tTmp.txt
-                  tsw bUp5,1
-                }
-
-                // stop button
-                spstr tId.txt,tTmp.txt,"|",1
-                if(tTmp.txt=="disable")
-                {
-                  bStop5.pco=27501
-                  tsw bStop5,0
-                }
-                else if(tTmp.txt!="")
-                {
-                  bStop5.pco=65535
-                  bStop5.txt=tTmp.txt
-                  tsw bStop5,1
-                }
-
-                // down button
-                spstr tId.txt,tTmp.txt,"|",2
-                if(tTmp.txt=="disable")
-                {
-                  bDown5.pco=27501
-                  tsw bDown5,0
-                }
-                else if(tTmp.txt!="")
-                {
-                  bDown5.pco=65535
-                  bDown5.txt=tTmp.txt
-                  tsw bDown5,1
-                }
-              }
-              if(type5.txt=="light")
-              {
-                vis bUp5,0
-                vis bStop5,0
-                vis bDown5,0
-                vis btOnOff5,1
-                vis bText5,0
-                vis hSlider5,0
-                vis nNum5,0
-                // get Button State (optional Value)
-                spstr strCommand.txt,tTmp.txt,"~",32
-                covx tTmp.txt,sys0,0,0
-                btOnOff5.val=sys0
-              }
-              if(type5.txt=="switch")
-              {
-                vis bUp5,0
-                vis bStop5,0
-                vis bDown5,0
-                vis btOnOff5,1
-                vis bText5,0
-                vis hSlider5,0
-                vis nNum5,0
-                // get Button State (optional Value)
-                spstr strCommand.txt,tTmp.txt,"~",32
-                covx tTmp.txt,sys0,0,0
-                btOnOff5.val=sys0
-              }
-              if(type5.txt=="text")
-              {
-                vis bUp5,0
-                vis bStop5,0
-                vis bDown5,0
-                vis btOnOff5,0
-                vis bText5,1
-                tsw bText5,0
-                vis hSlider5,0
-                vis nNum5,0
-                bText5.pco=65535
-                bText5.pco2=65535
-                // get Text (optional Value)
-                spstr strCommand.txt,bText5.txt,"~",32
-              }
-              if(type5.txt=="button")
-              {
-                vis bUp5,0
-                vis bStop5,0
-                vis bDown5,0
-                vis btOnOff5,0
-                vis bText5,1
-                tsw bText5,1
-                vis hSlider5,0
-                vis nNum5,0
-                bText5.pco=1374
-                bText5.pco2=1374
-                // get Text (optional Value)
-                spstr strCommand.txt,bText5.txt,"~",32
-              }
-              if(type5.txt=="number")
-              {
-                vis bUp5,0
-                vis bStop5,0
-                vis bDown5,0
-                vis btOnOff5,0
-                vis bText5,0
-                tsw bText5,0
-                vis hSlider5,1
-                vis nNum5,1
-                // get config (optional Value) (use bText as variable)
-                spstr strCommand.txt,bText5.txt,"~",32
-                //first value is current value
-                spstr bText5.txt,tTmp.txt,"|",0
-                covx tTmp.txt,sys0,0,0
-                hSlider5.val=sys0
-                nNum5.val=sys0
-                //second value is min value
-                spstr bText5.txt,tTmp.txt,"|",1
-                covx tTmp.txt,sys0,0,0
-                hSlider5.minval=sys0
-                //third value is max value
-                spstr bText5.txt,tTmp.txt,"|",2
-                covx tTmp.txt,sys0,0,0
-                hSlider5.maxval=sys0
-              }
-
-
-
-
-
-            }
-
-            if(tInstruction.txt=="pageType")
-            {
-              //command format pageType,specialPageName
-              //write name of speical page to tId
-              spstr strCommand.txt,tId.txt,"~",1
-              //save second arg if there's one
-              spstr strCommand.txt,tTmp.txt,"~",2
-              //save third arg if there's one
-              spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
-              //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
-              udelete payloadLength-1
-              bufferPos=0
-              if(tId.txt=="pageStartup")
-              {
-                page pageStartup
-              }
-              if(tId.txt=="screensaver")
-              {
-                page screensaver
-              }
-              if(tId.txt=="cardEntities")
-              {
-                page cardEntities
-              }
-              if(tId.txt=="cardGrid")
-              {
-                page cardGrid
-              }
-              if(tId.txt=="popupLight")
-              {
-                pageIcons.tTmp1.txt=tTmp.txt
-                page popupLight
-              }
-              if(tId.txt=="popupShutter")
-              {
-                pageIcons.tTmp1.txt=tTmp.txt
-                page popupShutter
-              }
-              if(tId.txt=="popupNotify")
-              {
-                page popupNotify
-              }
-              if(tId.txt=="cardThermo")
-              {
-                page cardThermo
-              }
-              if(tId.txt=="cardMedia")
-              {
-                page cardMedia
-              }
-              if(tId.txt=="cardAlarm")
-              {
-                page cardAlarm
-              }
-              if(tId.txt=="cardQR")
-              {
-                page cardQR
-              }
-            }
-            if(tInstruction.txt=="time")
-            {
-              // get set time to global variable
-              spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
-            }
-            if(tInstruction.txt=="date")
-            {
-              // get set date to global variable
-              spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
-            }
-            if(tInstruction.txt=="dimmode")
-            {
-              // get value
-              spstr strCommand.txt,tTmp.txt,"~",1
-              covx tTmp.txt,dimValue,0,0
-            }
-            if(tInstruction.txt=="timeout")
-            {
-              //set timeout to global var
-              spstr strCommand.txt,tTmp.txt,"~",1
-              covx tTmp.txt,sleepTimeout,0,0
-            }
-            // end of user code
-            udelete payloadLength-1
-            bufferPos=0
-          }
-        }
-      }
-    }
-    // next character
-    bufferPos++
-  }
-}
-
diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI
index 0eb8b1e6..9b8ff0c2 100644
Binary files a/HMI/nspanel.HMI and b/HMI/nspanel.HMI differ
diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft
index 60cb3509..f65313a2 100644
Binary files a/HMI/nspanel.tft and b/HMI/nspanel.tft differ