bump version

Update nspanel-lovelace-ui.py
2025-12-20 14:37:01 +01:00 · 2022-04-15 18:20:20 +02:00 · 2022-04-15 18:19:17 +02:00 · 2022-04-15 18:14:28 +02:00 · 2022-04-15 11:15:45 +02:00 · 2022-04-15 11:03:56 +02:00
120 changed files with 51218 additions and 7494 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -0,0 +1,2 @@
 * @joBr99
 /ioBroker @britzelpuf
--- a/.github/auto_assign.yml
+++ b/.github/auto_assign.yml
@@ -0,0 +1,6 @@
 addReviewers: true
 addAssignees: true
 # A list of keywords to be skipped the process that add reviewers if pull requests include it 
 skipKeywords:
  - wip
--- a/.github/workflows/nextion2text.yml
+++ b/.github/workflows/nextion2text.yml
@@ -52,19 +52,25 @@ jobs:
      continue-on-error: true
      run: |
        echo "YXR0cmlidXRlcyA9IHsKICAgICJpZCI6IHsKICAgICAgICAiaWdub3JlIjogVHJ1ZSwKICAgICAgICAibmFtZSI6ICJJRCIsCiAgICAgICAgInN0cnVjdCI6ICJpIiwKICAgIH0KfQ==" | base64 -d > ignore-id.py
-        python Nextion2Text.py -c ignore-id.py -d -i HMI/nspanel.HMI -o HMI/n2t-out
+        python Nextion2Text.py -c ignore-id.py -p font -d -i HMI/nspanel.HMI -o HMI/n2t-out
        echo portrait
-        python Nextion2Text.py -c ignore-id.py -d -i HMI/US/portrait/nspanel_US_P.HMI -o HMI/US/portrait/n2t-out
+        python Nextion2Text.py -c ignore-id.py -p font -d -i HMI/US/portrait/nspanel_US_P.HMI -o HMI/US/portrait/n2t-out
        diff -bur HMI/n2t-out HMI/US/portrait/n2t-out > HMI/US/portrait/diff-eu-version.txt
    - name: Run n2t US P DIFF DIFF
      continue-on-error: true
      run: |
        diff -u HMI/US/portrait/diff-eu-version-known-good.txt HMI/US/portrait/diff-eu-version.txt | grep -E "^\+" > HMI/US/portrait/diff-filtered.txt
    - name: Run n2t US L DIFF
      continue-on-error: true
      run: |      
        echo landscape
-        python Nextion2Text.py -c ignore-id.py -d -i HMI/US/landscape/nspanel_US_L.HMI -o HMI/US/landscape/n2t-out
+        python Nextion2Text.py -c ignore-id.py -p font -d -i HMI/US/landscape/nspanel_US_L.HMI -o HMI/US/landscape/n2t-out
        diff -bur HMI/n2t-out HMI/US/landscape/n2t-out > HMI/US/landscape/diff-eu-version.txt
    - name: Display txt files 
      continue-on-error: true
      run: |      
--- a/HMI/README.md
+++ b/HMI/README.md
@@ -77,6 +77,8 @@ change the page type:
 `weatherUpdate~tMainIcon~tMainText~tForecast1~tF1Icon~tForecast1Val~tForecast2~tF2Icon~tForecast2Val~tForecast3~tF3Icon~tForecast3Val~tForecast4~tF4Icon~tForecast4Val~optionalLayoutIcon~optionalLayoutText`
 `color~background~time~timeAMPM~date~tMainIcon~tMainText~tForecast1~tForecast2~tForecast3~tForecast4~tF1Icon~tF2Icon~tF3Icon~tF4Icon~tForecast1Val~tForecast2Val~tForecast3Val~tForecast4Val~bar~tMainIconAlt~tMainTextAlt~tMRIcon~tMR`
 ### cardEntities Page
 The following message can be used to update the content on the cardEntities Page
@@ -132,83 +134,83 @@ The following message can be used to update the content on the cardEntities Page
 ## Messages from Nextion Display
-`event~buttonPress2~pageName~bNext`
+`event,buttonPress2,pageName,bNext`
-`event~buttonPress2~pageName~bPrev`
+`event,buttonPress2,pageName,bPrev`
-`event~buttonPress2~pageName~bExit~number_of_taps`
+`event,buttonPress2,pageName,bExit,number_of_taps`
-`event~buttonPress2~pageName~sleepReached`
+`event,buttonPress2,pageName,sleepReached`
 ### startup page
-`event~startup~version~model`
+`event,startup,version,model`
 ### screensaver page
-`event~buttonPress2~screensaver~exit` - Touch Event on Screensaver
+`event,buttonPress2,screensaver,exit` - Touch Event on Screensaver
-`event~screensaverOpen` - Screensaver has opened
+`event,screensaverOpen` - Screensaver has opened
 ### cardEntities Page
-`event~*eventName*~*entityName*~*actionName*~*optionalValue*`
+`event,*eventName*,*entityName*,*actionName*,*optionalValue*`
-`event~buttonPress2~internalNameEntity~up`
+`event,buttonPress2,internalNameEntity,up`
-`event~buttonPress2~internalNameEntity~down`
+`event,buttonPress2,internalNameEntity,down`
-`event~buttonPress2~internalNameEntity~stop`
+`event,buttonPress2,internalNameEntity,stop`
-`event~buttonPress2~internalNameEntity~OnOff~1`
+`event,buttonPress2,internalNameEntity,OnOff,1`
-`event~buttonPress2~internalNameEntity~button`
+`event,buttonPress2,internalNameEntity,button`
 ### popupLight Page
-`event~pageOpenDetail~popupLight~internalNameEntity`
+`event,pageOpenDetail,popupLight,internalNameEntity`
-`event~buttonPress2~internalNameEntity~OnOff~1`
+`event,buttonPress2,internalNameEntity,OnOff,1`
-`event~buttonPress2~internalNameEntity~brightnessSlider~50`
+`event,buttonPress2,internalNameEntity,brightnessSlider,50`
-`event~buttonPress2~internalNameEntity~colorTempSlider~50`
+`event,buttonPress2,internalNameEntity,colorTempSlider,50`
-`event~buttonPress2~internalNameEntity~colorWheel~x|y`
+`event,buttonPress2,internalNameEntity,colorWheel,x|y`
 ### popupShutter Page
-`event~pageOpenDetail~popupShutter~internalNameEntity`
+`event,pageOpenDetail,popupShutter,internalNameEntity`
-`event~buttonPress2~internalNameEntity~positionSlider~50`
+`event,buttonPress2,internalNameEntity,positionSlider,50`
 ### popupNotify Page
-`event~buttonPress2~*internalName*~notifyAction~yes`
+`event,buttonPress2,*internalName*,notifyAction,yes`
-`event~buttonPress2~*internalName*~notifyAction~no`
+`event,buttonPress2,*internalName*,notifyAction,no`
 ### cardThermo Page
-`event~buttonPress2~*entityName*~tempUpd~*temperature*`
+`event,buttonPress2,*entityName*,tempUpd,*temperature*`
-`event~buttonPress2~*entityName*~hvac_action~*hvac_action*`
+`event,buttonPress2,*entityName*,hvac_action,*hvac_action*`
 ### cardMedia Page
-`event~buttonPress2~internalNameEntity~media-back`
+`event,buttonPress2,internalNameEntity,media-back`
-`event~buttonPress2~internalNameEntity~media-pause`
+`event,buttonPress2,internalNameEntity,media-pause`
-`event~buttonPress2~internalNameEntity~media-next`
+`event,buttonPress2,internalNameEntity,media-next`
-`event~buttonPress2~internalNameEntity~volumeSlider~75`
+`event,buttonPress2,internalNameEntity,volumeSlider,75`
 ### cardAlarm Page
-`event~buttonPress2~internalNameEntity~actionName~code`
+`event,buttonPress2,internalNameEntity,actionName,code`
 # Icons IDs
@@ -218,7 +220,7 @@ Please see Icon's int the [icons.md file](icons.md)
 # Design Guidelines for Nextion HMI Project
 Background Color is 
- RGB565: 6371 [18e3] (HEX: #1C1C1C~ RGB: 28~28~28)
+- RGB565: 6371 [18e3] (HEX: #1C1C1C, RGB: 28,28,28)
-Source for Icons is the Material Design Font~ used by HASPone
+Source for Icons is the Material Design Font, used by HASPone
 https://github.com/HASwitchPlate/HASPone
--- 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-04-03 07:35:47.898571291 +0000
+--- HMI/n2t-out/Program.s.txt	2022-04-13 20:21:34.698226402 +0000
-+++ HMI/US/landscape/n2t-out/Program.s.txt	2022-04-03 07:35:48.646571620 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt	2022-04-13 20:21:35.478242275 +0000
@@ -11,6 +11,6 @@
     // dim value
     int dimValue=40
@@ -11,8 +11,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/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt	2022-04-03 07:35:47.902571293 +0000
+--- HMI/n2t-out/pageStartup.txt	2022-04-13 20:21:34.698226402 +0000
-+++ HMI/US/landscape/n2t-out/pageStartup.txt	2022-04-03 07:35:48.646571620 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt	2022-04-13 20:21:35.478242275 +0000
@@ -177,7 +177,7 @@
             recmod=1
             bauds=115200
@@ -22,3 +22,105 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
 diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
 --- HMI/n2t-out/popupLight.txt	2022-04-13 20:21:34.698226402 +0000
 +++ HMI/US/landscape/n2t-out/popupLight.txt	2022-04-13 20:21:35.478242275 +0000
@@ -570,43 +570,25 @@
                                         //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")
 +                                        if(tId.txt=="cardMedia")
                                         {
 -                                            pageIcons.tTmp1.txt=tTmp.txt
 -                                            page popupLight
 +                                            page cardMedia
                                         }
 -                                        if(tId.txt=="popupShutter")
 +                                        if(tId.txt=="pageStartup")
                                         {
 -                                            pageIcons.tTmp1.txt=tTmp.txt
 -                                            page popupShutter
 +                                            page pageStartup
                                         }
                                         if(tId.txt=="popupNotify")
                                         {
                                             page popupNotify
                                         }
 -                                        if(tId.txt=="cardThermo")
 -                                        {
 -                                            page cardThermo
 -                                        }
 -                                        if(tId.txt=="cardMedia")
 +                                        if(tId.txt=="cardGrid")
                                         {
 -                                            page cardMedia
 +                                            page cardGrid
                                         }
                                         if(tId.txt=="cardAlarm")
                                         {
 diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
 --- HMI/n2t-out/screensaver.txt	2022-04-13 20:21:34.698226402 +0000
 +++ HMI/US/landscape/n2t-out/screensaver.txt	2022-04-13 20:21:35.478242275 +0000
@@ -48,18 +48,6 @@
         Scope: local
         Value: 0
 -Variable (string) tInstruction
 -    Attributes
 -        Scope         : local
 -        Text          : 
 -        Max. Text Size: 50
 -    
 -Variable (string) tTmp
 -    Attributes
 -        Scope         : local
 -        Text          : 
 -        Max. Text Size: 50
 -    
 Text tTime
     Attributes
         Scope                               : local
@@ -290,6 +278,26 @@
         Text                                : 
         Max. Text Size                      : 10
 +Text tTmp
 +    Attributes
 +        Scope                               : local
 +        Dragging                            : 0
 +        Disable release event after dragging: 0
 +        Send Component ID                   : disabled
 +        Associated Keyboard                 : none
 +        Text                                : 
 +        Max. Text Size                      : 50
 +    
 +Text tInstruction
 +    Attributes
 +        Scope                               : local
 +        Dragging                            : 0
 +        Disable release event after dragging: 0
 +        Send Component ID                   : disabled
 +        Associated Keyboard                 : none
 +        Text                                : 
 +        Max. Text Size                      : 50
 +    
 Picture p0
     Attributes
         Scope                               : local
--- a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt
+++ b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt
@@ -199,7 +199,7 @@ Text tCode
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 0
+        Font ID                             : 2
        Back. Color                         : 10565
        Font Color                          : 40179
        Horizontal Alignment                : center
@@ -229,7 +229,7 @@ Text tIcon
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Font Color                          : 65535
        Horizontal Alignment                : center
@@ -275,7 +275,7 @@ Button bNext
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -322,7 +322,7 @@ Button bPrev
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -378,7 +378,7 @@ Button b0
        Style                               : border
        Border Color                        : 6371
        Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -416,7 +416,7 @@ Button b1
        Style                               : border
        Border Color                        : 6371
        Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -454,7 +454,7 @@ Button b2
        Style                               : border
        Border Color                        : 6371
        Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -492,7 +492,7 @@ Button b3
        Style                               : border
        Border Color                        : 6371
        Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -530,7 +530,7 @@ Button b4
        Style                               : border
        Border Color                        : 6371
        Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -568,7 +568,7 @@ Button b5
        Style                               : border
        Border Color                        : 6371
        Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -606,7 +606,7 @@ Button b6
        Style                               : border
        Border Color                        : 6371
        Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -644,7 +644,7 @@ Button b7
        Style                               : border
        Border Color                        : 6371
        Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -682,7 +682,7 @@ Button b8
        Style                               : border
        Border Color                        : 6371
        Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -720,7 +720,7 @@ Button b9
        Style                               : border
        Border Color                        : 6371
        Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -758,7 +758,7 @@ Button b10
        Style                               : border
        Border Color                        : 6371
        Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -1073,7 +1073,7 @@ Timer tmSerial
                                        }
                                        if(tTmp.txt=="1")
                                        {
-                                            vis bPrev,1
+                                            vis bNext,1
                                            bNext.txt="î³"
                                        }
                                        //text arm1
@@ -1109,9 +1109,7 @@ Timer tmSerial
                                        //id arm4
                                        spstr strCommand.txt,va4.txt,"~",10
                                        //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",11
+                                        spstr strCommand.txt,tIcon.txt,"~",11
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
                                        //icon color
                                        spstr strCommand.txt,tTmp.txt,"~",12
                                        covx tTmp.txt,sys0,0,0
--- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt
+++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt
@@ -272,7 +272,7 @@ Text tHeading
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
        Back. Color                         : 6371
        Font Color                          : 65535
        Horizontal Alignment                : center
@@ -1414,7 +1414,7 @@ Button bPrev
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -1468,7 +1468,7 @@ Button bNext
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -2096,7 +2096,7 @@ Timer tmSerial
                                        }
                                        if(tTmp.txt=="1")
                                        {
-                                            vis bPrev,1
+                                            vis bNext,1
                                            bNext.txt="î³"
                                        }
                                        // get Type
@@ -2117,9 +2117,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",5
+                                            spstr strCommand.txt,tIcon1.txt,"~",5
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
                                            vis tIcon1,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",6
@@ -2241,9 +2239,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",11
+                                            spstr strCommand.txt,tIcon2.txt,"~",11
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,tIcon2.txt,sys0,1
                                            vis tIcon2,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",12
@@ -2365,9 +2361,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",17
+                                            spstr strCommand.txt,tIcon3.txt,"~",17
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,tIcon3.txt,sys0,1
                                            vis tIcon3,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",18
@@ -2489,9 +2483,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",23
+                                            spstr strCommand.txt,tIcon4.txt,"~",23
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,tIcon4.txt,sys0,1
                                            vis tIcon4,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",24
--- a/HMI/US/landscape/n2t-out-visual/cardGrid.txt
+++ b/HMI/US/landscape/n2t-out-visual/cardGrid.txt
@@ -152,7 +152,7 @@ Text tHeading
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
        Back. Color                         : 6371
        Font Color                          : 65535
        Horizontal Alignment                : center
@@ -232,7 +232,7 @@ Text tTmp
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
-        x coordinate                        : 439
+        x coordinate                        : 415
        y coordinate                        : 290
        Width                               : 34
        Height                              : 30
@@ -498,7 +498,7 @@ Button bPrev
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -552,7 +552,7 @@ Button bNext
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -599,7 +599,7 @@ Button bEntity1
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -657,7 +657,7 @@ Button bEntity2
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -715,7 +715,7 @@ Button bEntity3
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -773,7 +773,7 @@ Button bEntity4
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -831,7 +831,7 @@ Button bEntity5
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -889,7 +889,7 @@ Button bEntity6
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -1036,7 +1036,7 @@ Timer tmSerial
                                        }
                                        if(tTmp.txt=="1")
                                        {
-                                            vis bPrev,1
+                                            vis bNext,1
                                            bNext.txt="î³"
                                        }
                                        // get Type
@@ -1050,9 +1050,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",5
+                                            spstr strCommand.txt,bEntity1.txt,"~",5
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1
                                            vis bEntity1,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",6
@@ -1073,9 +1071,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",11
+                                            spstr strCommand.txt,bEntity2.txt,"~",11
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1
                                            vis bEntity2,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",12
@@ -1096,9 +1092,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",17
+                                            spstr strCommand.txt,bEntity3.txt,"~",17
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1
                                            vis bEntity3,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",18
@@ -1119,9 +1113,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",23
+                                            spstr strCommand.txt,bEntity4.txt,"~",23
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1
                                            vis bEntity4,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",24
@@ -1142,9 +1134,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",29
+                                            spstr strCommand.txt,bEntity5.txt,"~",29
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1
                                            vis bEntity5,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",30
@@ -1165,9 +1155,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",35
+                                            spstr strCommand.txt,bEntity6.txt,"~",35
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1
                                            vis bEntity6,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",36
--- a/HMI/US/landscape/n2t-out-visual/cardMedia.txt
+++ b/HMI/US/landscape/n2t-out-visual/cardMedia.txt
@@ -94,7 +94,7 @@ Text tTmp
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 29
-        y coordinate                        : 144
+        y coordinate                        : 156
        Width                               : 27
        Height                              : 30
        Effect                              : load
@@ -153,8 +153,8 @@ Text tId
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
-        x coordinate                        : 57
+        x coordinate                        : 64
-        y coordinate                        : 157
+        y coordinate                        : 159
        Width                               : 30
        Height                              : 30
        Effect                              : load
@@ -193,7 +193,7 @@ Text tHeading
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
        Back. Color                         : 6371
        Font Color                          : 65535
        Horizontal Alignment                : center
@@ -283,7 +283,7 @@ Text t2
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Font Color                          : 50712
        Horizontal Alignment                : center
@@ -332,7 +332,7 @@ Text tPlayPause
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Font Color                          : 50712
        Horizontal Alignment                : center
@@ -381,7 +381,7 @@ Text t0
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Font Color                          : 50712
        Horizontal Alignment                : center
@@ -430,7 +430,7 @@ Text tIcon
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Font Color                          : 65535
        Horizontal Alignment                : center
@@ -460,7 +460,7 @@ Text t1
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Font Color                          : 50712
        Horizontal Alignment                : center
@@ -510,7 +510,7 @@ Text t3
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Font Color                          : 50712
        Horizontal Alignment                : center
@@ -560,7 +560,7 @@ Text t4
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Font Color                          : 50712
        Horizontal Alignment                : center
@@ -639,7 +639,7 @@ Text t6
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Font Color                          : 50712
        Horizontal Alignment                : center
@@ -681,7 +681,7 @@ Text t5
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Font Color                          : 50712
        Horizontal Alignment                : center
@@ -792,7 +792,7 @@ Button bNext
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -839,7 +839,7 @@ Button bPrev
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -956,15 +956,13 @@ Timer tmSerial
                                        }
                                        if(tTmp.txt=="1")
                                        {
-                                            vis bPrev,1
+                                            vis bNext,1
                                            bNext.txt="î³"
                                        }
                                        //entity name
                                        spstr strCommand.txt,entn.txt,"~",3
                                        //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        spstr strCommand.txt,tIcon.txt,"~",4
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
                                        //title
                                        spstr strCommand.txt,tTitle.txt,"~",5
                                        //author
@@ -974,9 +972,7 @@ Timer tmSerial
                                        covx tTmp.txt,sys0,0,0
                                        hVolume.val=sys0
                                        //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",8
+                                        spstr strCommand.txt,tPlayPause.txt,"~",8
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
                                        //speaker current
                                        spstr strCommand.txt,tSpeaker.txt,"~",9
                                        if(tSpeaker.txt!="")
--- a/HMI/US/landscape/n2t-out-visual/cardThermo.txt
+++ b/HMI/US/landscape/n2t-out-visual/cardThermo.txt
@@ -135,7 +135,7 @@ XFloat xTempCurr
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 3
+        Font ID                             : 4
        Back. Color                         : 6371
        Font Color                          : 65535
        Horizontal Alignment                : center
@@ -405,7 +405,7 @@ Text tHeading
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
        Back. Color                         : 6371
        Font Color                          : 65535
        Horizontal Alignment                : center
@@ -511,7 +511,7 @@ Button bNext
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -666,7 +666,7 @@ Button bPrev
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -1224,7 +1224,7 @@ Timer tmSerial
                                        }
                                        if(tTmp.txt=="1")
                                        {
-                                            vis bPrev,1
+                                            vis bNext,1
                                            bNext.txt="î³"
                                        }
                                        //entity name
@@ -1257,12 +1257,9 @@ Timer tmSerial
                                        vis bt7,0
                                        vis bt8,0
                                        //bt0
-                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        spstr strCommand.txt,bt0.txt,"~",10
-                                        if(tTmp.txt!="")
+                                        if(bt0.txt!="")
                                        {
                                            // set icon
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bt0.txt,sys0,1
                                            // set text color on active state
                                            spstr strCommand.txt,tTmp.txt,"~",11
                                            covx tTmp.txt,bt0.pco2,0,0
@@ -1273,232 +1270,216 @@ Timer tmSerial
                                            spstr strCommand.txt,va0.txt,"~",13
                                            //enable
                                            vis bt0,1
-                                            }              //bt1
+                                        }
-                                            spstr strCommand.txt,tTmp.txt,"~",14
+                                        //bt1
-                                            if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt1.txt,"~",14
-                                            {
+                                        if(bt1.txt!="")
-                                                // set icon
+                                        {
-                                                covx tTmp.txt,sys0,0,0
+                                            // set text color on active state
-                                                substr pageIcons.tIcons.txt,bt1.txt,sys0,1
+                                            spstr strCommand.txt,tTmp.txt,"~",15
-                                                // set text color on active state
+                                            covx tTmp.txt,bt1.pco2,0,0
-                                                spstr strCommand.txt,tTmp.txt,"~",15
+                                            // set state
-                                                covx tTmp.txt,bt1.pco2,0,0
+                                            spstr strCommand.txt,tTmp.txt,"~",16
-                                                // set state
+                                            covx tTmp.txt,bt1.val,0,0
-                                                spstr strCommand.txt,tTmp.txt,"~",16
+                                            // save action
-                                                covx tTmp.txt,bt1.val,0,0
+                                            spstr strCommand.txt,va1.txt,"~",17
-                                                // save action
+                                            //enable
-                                                spstr strCommand.txt,va1.txt,"~",17
+                                            vis bt1,1
-                                                //enable
+                                        }
-                                                vis bt1,1
+                                        //bt2
-                                                }              //bt2
+                                        spstr strCommand.txt,bt2.txt,"~",18
-                                                spstr strCommand.txt,tTmp.txt,"~",18
+                                        if(bt2.txt!="")
-                                                if(tTmp.txt!="")
+                                        {
-                                                {
+                                            // set text color on active state
-                                                    // set icon
+                                            spstr strCommand.txt,tTmp.txt,"~",19
-                                                    covx tTmp.txt,sys0,0,0
+                                            covx tTmp.txt,bt2.pco2,0,0
-                                                    substr pageIcons.tIcons.txt,bt2.txt,sys0,1
+                                            // set state
-                                                    // set text color on active state
+                                            spstr strCommand.txt,tTmp.txt,"~",20
-                                                    spstr strCommand.txt,tTmp.txt,"~",19
+                                            covx tTmp.txt,bt2.val,0,0
-                                                    covx tTmp.txt,bt2.pco2,0,0
+                                            // save action
-                                                    // set state
+                                            spstr strCommand.txt,va2.txt,"~",21
-                                                    spstr strCommand.txt,tTmp.txt,"~",20
+                                            //enable
-                                                    covx tTmp.txt,bt2.val,0,0
+                                            vis bt2,1
-                                                    // save action
+                                        }
-                                                    spstr strCommand.txt,va2.txt,"~",21
+                                        //bt3
-                                                    //enable
+                                        spstr strCommand.txt,bt3.txt,"~",22
-                                                    vis bt2,1
+                                        if(bt3.txt!="")
-                                                    }              //bt3
+                                        {
-                                                    spstr strCommand.txt,tTmp.txt,"~",22
+                                            // set text color on active state
-                                                    if(tTmp.txt!="")
+                                            spstr strCommand.txt,tTmp.txt,"~",23
-                                                    {
+                                            covx tTmp.txt,bt3.pco2,0,0
-                                                        // set icon
+                                            // set state
-                                                        covx tTmp.txt,sys0,0,0
+                                            spstr strCommand.txt,tTmp.txt,"~",24
-                                                        substr pageIcons.tIcons.txt,bt3.txt,sys0,1
+                                            covx tTmp.txt,bt3.val,0,0
-                                                        // set text color on active state
+                                            // save action
-                                                        spstr strCommand.txt,tTmp.txt,"~",23
+                                            spstr strCommand.txt,va3.txt,"~",25
-                                                        covx tTmp.txt,bt3.pco2,0,0
+                                            //enable
-                                                        // set state
+                                            vis bt3,1
-                                                        spstr strCommand.txt,tTmp.txt,"~",24
+                                        }
-                                                        covx tTmp.txt,bt3.val,0,0
+                                        //bt4
-                                                        // save action
+                                        spstr strCommand.txt,bt4.txt,"~",26
-                                                        spstr strCommand.txt,va3.txt,"~",25
+                                        if(bt4.txt!="")
-                                                        //enable
+                                        {
-                                                        vis bt3,1
+                                            // set text color on active state
-                                                        }              //bt4
+                                            spstr strCommand.txt,tTmp.txt,"~",27
-                                                        spstr strCommand.txt,tTmp.txt,"~",26
+                                            covx tTmp.txt,bt4.pco2,0,0
-                                                        if(tTmp.txt!="")
+                                            // set state
-                                                        {
+                                            spstr strCommand.txt,tTmp.txt,"~",28
-                                                            // set icon
+                                            covx tTmp.txt,bt4.val,0,0
-                                                            covx tTmp.txt,sys0,0,0
+                                            // save action
-                                                            substr pageIcons.tIcons.txt,bt4.txt,sys0,1
+                                            spstr strCommand.txt,va4.txt,"~",29
-                                                            // set text color on active state
+                                            //enable
-                                                            spstr strCommand.txt,tTmp.txt,"~",27
+                                            vis bt4,1
-                                                            covx tTmp.txt,bt4.pco2,0,0
+                                        }
-                                                            // set state
+                                        //bt5
-                                                            spstr strCommand.txt,tTmp.txt,"~",28
+                                        spstr strCommand.txt,bt5.txt,"~",30
-                                                            covx tTmp.txt,bt4.val,0,0
+                                        if(bt5.txt!="")
-                                                            // save action
+                                        {
-                                                            spstr strCommand.txt,va4.txt,"~",29
+                                            // set text color on active state
-                                                            //enable
+                                            spstr strCommand.txt,tTmp.txt,"~",31
-                                                            vis bt4,1
+                                            covx tTmp.txt,bt5.pco2,0,0
-                                                            }              //bt5
+                                            // set state
-                                                            spstr strCommand.txt,tTmp.txt,"~",30
+                                            spstr strCommand.txt,tTmp.txt,"~",32
-                                                            if(tTmp.txt!="")
+                                            covx tTmp.txt,bt5.val,0,0
-                                                            {
+                                            // save action
-                                                                // set icon
+                                            spstr strCommand.txt,va5.txt,"~",33
-                                                                covx tTmp.txt,sys0,0,0
+                                            //enable
-                                                                substr pageIcons.tIcons.txt,bt5.txt,sys0,1
+                                            vis bt5,1
-                                                                // set text color on active state
+                                        }
-                                                                spstr strCommand.txt,tTmp.txt,"~",31
+                                        //bt6
-                                                                covx tTmp.txt,bt5.pco2,0,0
+                                        spstr strCommand.txt,bt6.txt,"~",34
-                                                                // set state
+                                        if(bt6.txt!="")
-                                                                spstr strCommand.txt,tTmp.txt,"~",32
+                                        {
-                                                                covx tTmp.txt,bt5.val,0,0
+                                            // set text color on active state
-                                                                // save action
+                                            spstr strCommand.txt,tTmp.txt,"~",35
-                                                                spstr strCommand.txt,va5.txt,"~",33
+                                            covx tTmp.txt,bt6.pco2,0,0
-                                                                //enable
+                                            // set state
-                                                                vis bt5,1
+                                            spstr strCommand.txt,tTmp.txt,"~",36
-                                                                }              //bt6
+                                            covx tTmp.txt,bt6.val,0,0
-                                                                spstr strCommand.txt,tTmp.txt,"~",34
+                                            // save action
-                                                                if(tTmp.txt!="")
+                                            spstr strCommand.txt,va6.txt,"~",37
-                                                                {
+                                            //enable
-                                                                    // set icon
+                                            vis bt6,1
-                                                                    covx tTmp.txt,sys0,0,0
+                                        }
-                                                                    substr pageIcons.tIcons.txt,bt6.txt,sys0,1
+                                        //bt7
-                                                                    // set text color on active state
+                                        spstr strCommand.txt,bt7.txt,"~",38
-                                                                    spstr strCommand.txt,tTmp.txt,"~",35
+                                        if(bt7.txt!="")
-                                                                    covx tTmp.txt,bt6.pco2,0,0
+                                        {
-                                                                    // set state
+                                            // set text color on active state
-                                                                    spstr strCommand.txt,tTmp.txt,"~",36
+                                            spstr strCommand.txt,tTmp.txt,"~",39
-                                                                    covx tTmp.txt,bt6.val,0,0
+                                            covx tTmp.txt,bt7.pco2,0,0
-                                                                    // save action
+                                            // set state
-                                                                    spstr strCommand.txt,va6.txt,"~",37
+                                            spstr strCommand.txt,tTmp.txt,"~",40
-                                                                    //enable
+                                            covx tTmp.txt,bt7.val,0,0
-                                                                    vis bt6,1
+                                            // save action
-                                                                    }              //bt7
+                                            spstr strCommand.txt,va7.txt,"~",41
-                                                                    spstr strCommand.txt,tTmp.txt,"~",38
+                                            //enable
-                                                                    if(tTmp.txt!="")
+                                            vis bt7,1
-                                                                    {
+                                        }
-                                                                        // set icon
+                                        //bt8
-                                                                        covx tTmp.txt,sys0,0,0
+                                        spstr strCommand.txt,bt8.txt,"~",42
-                                                                        substr pageIcons.tIcons.txt,bt7.txt,sys0,1
+                                        if(bt8.txt!="")
-                                                                        // set text color on active state
+                                        {
-                                                                        spstr strCommand.txt,tTmp.txt,"~",39
+                                            // set text color on active state
-                                                                        covx tTmp.txt,bt7.pco2,0,0
+                                            spstr strCommand.txt,tTmp.txt,"~",43
-                                                                        // set state
+                                            covx tTmp.txt,bt8.pco2,0,0
-                                                                        spstr strCommand.txt,tTmp.txt,"~",40
+                                            // set state
-                                                                        covx tTmp.txt,bt7.val,0,0
+                                            spstr strCommand.txt,tTmp.txt,"~",44
-                                                                        // save action
+                                            covx tTmp.txt,bt8.val,0,0
-                                                                        spstr strCommand.txt,va7.txt,"~",41
+                                            // save action
-                                                                        //enable
+                                            spstr strCommand.txt,va8.txt,"~",45
-                                                                        vis bt7,1
+                                            //enable
-                                                                        }              //bt8
+                                            vis bt8,1
-                                                                        spstr strCommand.txt,tTmp.txt,"~",42
+                                        }
-                                                                        if(tTmp.txt!="")
+                                    }
-                                                                        {
+                                    if(tInstruction.txt=="pageType")
-                                                                            // set icon
+                                    {
-                                                                            covx tTmp.txt,sys0,0,0
+                                        //command format pageType,specialPageName
-                                                                            substr pageIcons.tIcons.txt,bt8.txt,sys0,1
+                                        //write name of speical page to tId
-                                                                            // set text color on active state
+                                        spstr strCommand.txt,tId.txt,"~",1
-                                                                            spstr strCommand.txt,tTmp.txt,"~",43
+                                        //save second arg if there's one
-                                                                            covx tTmp.txt,bt8.pco2,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",2
-                                                                            // set state
+                                        //save third arg if there's one
-                                                                            spstr strCommand.txt,tTmp.txt,"~",44
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
-                                                                            covx tTmp.txt,bt8.val,0,0
+                                        //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 ...
-                                                                            // save action
+                                        udelete payloadLength-1
-                                                                            spstr strCommand.txt,va8.txt,"~",45
+                                        bufferPos=0
-                                                                            //enable
+                                        if(tId.txt=="pageStartup")
-                                                                            vis bt8,1
+                                        {
-                                                                        }
+                                            page pageStartup
-                                                                    }
+                                        }
-                                                                    if(tInstruction.txt=="pageType")
+                                        if(tId.txt=="screensaver")
-                                                                    {
+                                        {
-                                                                        //command format pageType,specialPageName
+                                            page screensaver
-                                                                        //write name of speical page to tId
+                                        }
-                                                                        spstr strCommand.txt,tId.txt,"~",1
+                                        if(tId.txt=="cardEntities")
-                                                                        //save second arg if there's one
+                                        {
-                                                                        spstr strCommand.txt,tTmp.txt,"~",2
+                                            page cardEntities
-                                                                        //save third arg if there's one
+                                        }
-                                                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
+                                        if(tId.txt=="cardGrid")
-                                                                        //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
+                                            page cardGrid
-                                                                        bufferPos=0
+                                        }
-                                                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
-                                                                        {
+                                        {
-                                                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
-                                                                        }
+                                            page popupLight
-                                                                        if(tId.txt=="screensaver")
+                                        }
-                                                                        {
+                                        if(tId.txt=="popupShutter")
-                                                                            page screensaver
+                                        {
-                                                                        }
+                                            pageIcons.tTmp1.txt=tTmp.txt
-                                                                        if(tId.txt=="cardEntities")
+                                            page popupShutter
-                                                                        {
+                                        }
-                                                                            page cardEntities
+                                        if(tId.txt=="popupNotify")
-                                                                        }
+                                        {
-                                                                        if(tId.txt=="cardGrid")
+                                            page popupNotify
-                                                                        {
+                                        }
-                                                                            page cardGrid
+                                        if(tId.txt=="cardThermo")
-                                                                        }
+                                        {
-                                                                        if(tId.txt=="popupLight")
+                                            page cardThermo
-                                                                        {
+                                        }
-                                                                            pageIcons.tTmp1.txt=tTmp.txt
+                                        if(tId.txt=="cardMedia")
-                                                                            page popupLight
+                                        {
-                                                                        }
+                                            page cardMedia
-                                                                        if(tId.txt=="popupShutter")
+                                        }
-                                                                        {
+                                        if(tId.txt=="cardAlarm")
-                                                                            pageIcons.tTmp1.txt=tTmp.txt
+                                        {
-                                                                            page popupShutter
+                                            page cardAlarm
-                                                                        }
+                                        }
-                                                                        if(tId.txt=="popupNotify")
+                                    }
-                                                                        {
+                                    if(tInstruction.txt=="time")
-                                                                            page popupNotify
+                                    {
-                                                                        }
+                                        // get set time to global variable
-                                                                        if(tId.txt=="cardThermo")
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
-                                                                        {
+                                    }
-                                                                            page cardThermo
+                                    if(tInstruction.txt=="date")
-                                                                        }
+                                    {
-                                                                        if(tId.txt=="cardMedia")
+                                        // get set date to global variable
-                                                                        {
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
-                                                                            page cardMedia
+                                    }
-                                                                        }
+                                    if(tInstruction.txt=="dimmode")
-                                                                        if(tId.txt=="cardAlarm")
+                                    {
-                                                                        {
+                                        // get value
-                                                                            page cardAlarm
+                                        spstr strCommand.txt,tTmp.txt,"~",1
-                                                                        }
+                                        covx tTmp.txt,dimValue,0,0
-                                                                    }
+                                    }
-                                                                    if(tInstruction.txt=="time")
+                                    if(tInstruction.txt=="timeout")
-                                                                    {
+                                    {
-                                                                        // get set time to global variable
+                                        //set timeout to global var
-                                                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
-                                                                    }
+                                        covx tTmp.txt,sleepTimeout,0,0
-                                                                    if(tInstruction.txt=="date")
+                                    }
-                                                                    {
+                                    // end of user code
-                                                                        // get set date to global variable
+                                    udelete payloadLength-1
-                                                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+                                    bufferPos=0
-                                                                    }
+                                }
-                                                                    if(tInstruction.txt=="dimmode")
+                            }
-                                                                    {
+                        }
-                                                                        // get value
+                    }
-                                                                        spstr strCommand.txt,tTmp.txt,"~",1
+                    // next character
-                                                                        covx tTmp.txt,dimValue,0,0
+                    bufferPos++
-                                                                    }
+                }
-                                                                    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++
                                                }
                                            }
 Timer tmSleep
    Attributes
--- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
+++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
@@ -2,61 +2,57 @@ Program.s
 	0    Component(s)
 	10   Line(s) of event code
 	10   Unique line(s) of event code
 pageIcons
 	6    Component(s)
 	0    Line(s) of event code
 	0    Unique line(s) of event code
 pageTest
 	13   Component(s)
 	13   Line(s) of event code
 	13   Unique line(s) of event code
-pageSerialTest
+cardMedia
-	13   Component(s)
+	30   Component(s)
-	48   Line(s) of event code
+	329  Line(s) of event code
-	43   Unique line(s) of event code
+	169  Unique line(s) of event code
 pageIcons
 	7    Component(s)
 	0    Line(s) of event code
 	0    Unique line(s) of event code
 popupNotify
 	17   Component(s)
-	178  Line(s) of event code
+	196  Line(s) of event code
-	117  Unique line(s) of event code
+	123  Unique line(s) of event code
 pageStartup
 	19   Component(s)
 	150  Line(s) of event code
 	113  Unique line(s) of event code
 cardAlarm
 	35   Component(s)
 	343  Line(s) of event code
 	214  Unique line(s) of event code
 popupShutter
 	19   Component(s)
-	178  Line(s) of event code
+	191  Line(s) of event code
-	101  Unique line(s) of event code
+	107  Unique line(s) of event code
 cardGrid
 	39   Component(s)
-	430  Line(s) of event code
+	418  Line(s) of event code
-	249  Unique line(s) of event code
+	244  Unique line(s) of event code
 cardThermo
 	41   Component(s)
 	442  Line(s) of event code
 	247  Unique line(s) of event code
 cardEntities
 	62   Component(s)
 	964  Line(s) of event code
 	410  Unique line(s) of event code
 popupLight
 	27   Component(s)
-	322  Line(s) of event code
+	320  Line(s) of event code
 	173  Unique line(s) of event code
 screensaver
 	33   Component(s)
-	207  Line(s) of event code
+	266  Line(s) of event code
-	158  Unique line(s) of event code
+	218  Unique line(s) of event code
 cardMedia
 	30   Component(s)
 	333  Line(s) of event code
 	170  Unique line(s) of event code
 cardAlarm
 	35   Component(s)
 	345  Line(s) of event code
 	214  Unique line(s) of event code
 cardThermo
 	41   Component(s)
 	460  Line(s) of event code
 	284  Unique line(s) of event code
 cardEntities
 	62   Component(s)
 	972  Line(s) of event code
 	413  Unique line(s) of event code
 Total
-	13   Page(s)
+	12   Page(s)
-	355  Component(s)
+	341  Component(s)
-	3646 Line(s) of event code
+	3642 Line(s) of event code
-	1039 Unique line(s) of event code
+	1001 Unique line(s) of event code
--- a/HMI/US/landscape/n2t-out-visual/pageIcons.txt
+++ b/HMI/US/landscape/n2t-out-visual/pageIcons.txt
@@ -20,51 +20,21 @@ Page pageIcons
 Variable (string) vaTime
    Attributes
-        ID            : 5
+        ID            : 4
        Scope         : global
        Text          : 
        Max. Text Size: 15
 Variable (string) vaDate
    Attributes
-        ID            : 6
+        ID            : 5
        Scope         : global
        Text          : 
        Max. Text Size: 35
 Text tIcons
    Attributes
        ID                                  : 2
        Scope                               : global
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 1
        y coordinate                        : 8
        Width                               : 298
        Height                              : 299
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 1
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : left
        Vertical Alignment                  : top
        Input Type                          : character
        Text                                : îî´îï§îîî îî£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîî©±ï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾î¶îïîî¸î¸
        Max. Text Size                      : 170
        Word wrap                           : enabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Text tTmp1
    Attributes
-        ID                                  : 3
+        ID                                  : 2
        Scope                               : global
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -94,7 +64,7 @@ Text tTmp1
 Text tTmp2
    Attributes
-        ID                                  : 4
+        ID                                  : 3
        Scope                               : global
        Dragging                            : 0
        Disable release event after dragging: 0
--- a/HMI/US/landscape/n2t-out-visual/pageSerialTest.txt
+++ b/HMI/US/landscape/n2t-out-visual/pageSerialTest.txt
@@ -1,434 +0,0 @@
 Page pageSerialTest
    Attributes
        ID                                  : 0
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        Width                               : 480
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Locked                              : no
        Swide up page ID                    : disabled
        Swide down page ID                  : disabled
        Swide left page ID                  : disabled
        Swide right page ID                 : disabled
        Fill                                : solid color
        Back. Color                         : 65535
    Events
        Preinitialize Event
            //vis p0,0
            //recmod=1
            //bauds=115200
 Number nCrcRecv
    Attributes
        ID                                  : 5
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 160
        y coordinate                        : 0
        Width                               : 88
        Height                              : 29
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 4
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Value                               : 0
        Significant digits shown            : all
        Format                              : decimal with digit grouping
        Word wrap                           : enabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Number nCrcCalc
    Attributes
        ID                                  : 6
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 159
        y coordinate                        : 31
        Width                               : 90
        Height                              : 30
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 4
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Value                               : 0
        Significant digits shown            : all
        Format                              : decimal with digit grouping
        Word wrap                           : enabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Number nIt
    Attributes
        ID                                  : 11
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 378
        y coordinate                        : 234
        Width                               : 52
        Height                              : 30
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 4
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Value                               : 0
        Significant digits shown            : all
        Format                              : decimal
        Word wrap                           : enabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Number nLength
    Attributes
        ID                                  : 12
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 15
        y coordinate                        : 215
        Width                               : 100
        Height                              : 30
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 0
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Value                               : 0
        Significant digits shown            : all
        Format                              : decimal
        Word wrap                           : enabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Text tStatus
    Attributes
        ID                                  : 3
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 160
        y coordinate                        : 60
        Width                               : 271
        Height                              : 90
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 4
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
        Text                                : newtxt
        Max. Text Size                      : 100
        Word wrap                           : enabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Text tCmd
    Attributes
        ID                                  : 4
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 160
        y coordinate                        : 151
        Width                               : 272
        Height                              : 80
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 4
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
        Text                                : newtxt
        Max. Text Size                      : 500
        Word wrap                           : enabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Text tBuffer
    Attributes
        ID                                  : 7
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 7
        y coordinate                        : 270
        Width                               : 435
        Height                              : 30
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 4
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
        Text                                : newtxt
        Max. Text Size                      : 100
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Text tDesc
    Attributes
        ID                                  : 8
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 0
        y coordinate                        : 0
        Width                               : 159
        Height                              : 204
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 4
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
        Text                                : CRC Recv:\r\nCRC Calc:\r\n\r\nStatus\r\n\r\nCommand
        Max. Text Size                      : 60
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Picture p0
    Attributes
        ID                                  : 1
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 0
        y coordinate                        : 0
        Width                               : 479
        Height                              : 319
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Picture ID                          : 0
 Button b0
    Attributes
        ID                                  : 9
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 334
        y coordinate                        : 9
        Width                               : 46
        Height                              : 46
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
        Font ID                             : 4
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 0
        Back. Color (Pressed)               : 1024
        Font Color (Unpressed)              : 0
        Font Color (Pressed)                : 65535
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        State                               : unpressed
        Text                                : bck
        Max. Text Size                      : 10
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
    Events
        Touch Press Event
            recmod=0
            page pageTest
 Button b1
    Attributes
        ID                                  : 10
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 392
        y coordinate                        : 10
        Width                               : 48
        Height                              : 48
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
        Font ID                             : 4
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 0
        Back. Color (Pressed)               : 1024
        Font Color (Unpressed)              : 0
        Font Color (Pressed)                : 65535
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        State                               : unpressed
        Text                                : ON
        Max. Text Size                      : 10
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
    Events
        Touch Press Event
            recmod=1
            bauds=115200
 Timer tmSerial
    Attributes
        ID         : 2
        Scope      : local
        Period (ms): 400
        Enabled    : yes
    Events
        Timer Event
            // 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
                        }
                        tStatus.txt="init command detected"
                        //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
                            //payloadLength=u[2]
                            ucopy payloadLength,2,2,0
                            nLength.val=payloadLength
                            // 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)
                            {
                                tStatus.txt="reached"
                                // calculate crc
                                crcrest 1,0xFFFF
                                // payload length -1 to exclude crc
                                crcputu 0,payloadLength-1 //u[2]+3
                                // get recived crc to be able to compare it
                                ucopy recvCrc,payloadLength-1,2,0
                                nCrcRecv.val=recvCrc
                                // compare crc with recived value
                                if(crcval==recvCrc)
                                {
                                    tStatus.txt="crc ok"
                                    nIt.val=nIt.val+1
                                    ucopy tCmd.txt,4,payloadLength-5,0
                                    udelete payloadLength-1
                                    bufferPos=0
                                    // here is the location where acual code should be
                                }
                                // copy calculated crc and recived crc to nCrcRecv and nCrcCalc, for debugging
                                nCrcRecv.val=recvCrc
                                nCrcCalc.val=crcval
                                //ucopy nCrcCalc.val,u[2]+3,3,0
                            }
                        }
                    }
                    // next character
                    bufferPos++
                }
                if(bufferPos==usize)
                {
                    // copy whole buffer to tCmd.txt, for debugging
                    //ucopy tBuffer.txt,0,usize,0
                    // ucopy nIt.val,0,usize,0
                    // clear whole buffer
                    //code_c
                    //bufferPos=0
                }
            }
--- a/HMI/US/landscape/n2t-out-visual/pageStartup.txt
+++ b/HMI/US/landscape/n2t-out-visual/pageStartup.txt
@@ -296,7 +296,7 @@ Text tMsg1
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
-        x coordinate                        : 59
+        x coordinate                        : 52
        y coordinate                        : 223
        Width                               : 375
        Height                              : 30
@@ -326,7 +326,7 @@ Text tMsg2
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
-        x coordinate                        : 42
+        x coordinate                        : 35
        y coordinate                        : 256
        Width                               : 408
        Height                              : 25
@@ -356,7 +356,7 @@ Text tMsg3
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
-        x coordinate                        : 42
+        x coordinate                        : 35
        y coordinate                        : 278
        Width                               : 408
        Height                              : 25
@@ -402,7 +402,7 @@ Text tVersion
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
-        Text                                : 28
+        Text                                : 31
        Max. Text Size                      : 10
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
@@ -483,7 +483,7 @@ Hotspot mSpinner
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
-        x coordinate                        : 171
+        x coordinate                        : 164
        y coordinate                        : 49
        Width                               : 140
        Height                              : 140
--- a/HMI/US/landscape/n2t-out-visual/pageTest.txt
+++ b/HMI/US/landscape/n2t-out-visual/pageTest.txt
@@ -56,7 +56,7 @@ Button b0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 1024
@@ -75,7 +75,7 @@ Button b0
        Touch Press Event
            page cardEntities
-Button b1
+Button b3
    Attributes
        ID                                  : 3
        Scope                               : local
@@ -84,43 +84,7 @@ Button b1
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 347
-        y coordinate                        : 262
+        y coordinate                        : 184
        Width                               : 100
        Height                              : 50
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
        Font ID                             : 4
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 1024
        Font Color (Unpressed)              : 0
        Font Color (Pressed)                : 65535
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        State                               : unpressed
        Text                                : serial
        Max. Text Size                      : 10
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
    Events
        Touch Press Event
            page pageSerialTest
 Button b3
    Attributes
        ID                                  : 4
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 345
        y coordinate                        : 195
        Width                               : 102
        Height                              : 63
        Effect                              : load
@@ -128,7 +92,7 @@ Button b3
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 0
        Back. Color (Pressed)               : 1024
@@ -149,7 +113,7 @@ Button b3
 Button b6
    Attributes
-        ID                                  : 5
+        ID                                  : 4
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -164,7 +128,7 @@ Button b6
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 1024
@@ -185,7 +149,7 @@ Button b6
 Button b4
    Attributes
-        ID                                  : 6
+        ID                                  : 5
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -200,7 +164,7 @@ Button b4
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 1024
@@ -221,7 +185,7 @@ Button b4
 Button b5
    Attributes
-        ID                                  : 7
+        ID                                  : 6
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -236,7 +200,7 @@ Button b5
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 1024
@@ -257,7 +221,7 @@ Button b5
 Button b7
    Attributes
-        ID                                  : 8
+        ID                                  : 7
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -272,7 +236,7 @@ Button b7
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 1024
@@ -293,7 +257,7 @@ Button b7
 Button b8
    Attributes
-        ID                                  : 9
+        ID                                  : 8
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -308,7 +272,7 @@ Button b8
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 1024
@@ -330,7 +294,7 @@ Button b8
 Button b9
    Attributes
-        ID                                  : 10
+        ID                                  : 9
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -345,7 +309,7 @@ Button b9
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 1024
@@ -366,7 +330,7 @@ Button b9
 Button b10
    Attributes
-        ID                                  : 11
+        ID                                  : 10
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -381,7 +345,7 @@ Button b10
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 1024
@@ -402,7 +366,7 @@ Button b10
 Button b11
    Attributes
-        ID                                  : 12
+        ID                                  : 11
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -417,7 +381,7 @@ Button b11
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 1024
@@ -436,3 +400,39 @@ Button b11
        Touch Press Event
            page cardGrid
 Button b1
    Attributes
        ID                                  : 12
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 349
        y coordinate                        : 252
        Width                               : 102
        Height                              : 63
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
        Font ID                             : 1
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 0
        Back. Color (Pressed)               : 1024
        Font Color (Unpressed)              : 0
        Font Color (Pressed)                : 65535
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        State                               : unpressed
        Text                                : bauds=115200
        Max. Text Size                      : 20
        Word wrap                           : enabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
    Events
        Touch Press Event
            bauds=115200
--- a/HMI/US/landscape/n2t-out-visual/popupLight.txt
+++ b/HMI/US/landscape/n2t-out-visual/popupLight.txt
@@ -788,9 +788,7 @@ Timer tmSerial
                                    if(tInstruction.txt=="entityUpdateDetail")
                                    {
                                        // change icon
-                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        spstr strCommand.txt,tIcon1.txt,"~",1
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
                                        vis tIcon1,1
                                        // change icon color
                                        spstr strCommand.txt,tTmp.txt,"~",2
--- a/HMI/US/landscape/n2t-out-visual/popupNotify.txt
+++ b/HMI/US/landscape/n2t-out-visual/popupNotify.txt
@@ -184,7 +184,7 @@ Text tHeading
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
        Back. Color                         : 6371
        Font Color                          : 65535
        Horizontal Alignment                : left
@@ -308,7 +308,7 @@ Button b2
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 1
+        Font ID                             : 2
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 9
        Back. Color (Pressed)               : 1024
@@ -357,7 +357,7 @@ Button b1
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 1
+        Font ID                             : 2
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 9
        Back. Color (Pressed)               : 1024
@@ -548,25 +548,43 @@ Timer tmSerial
                                            pageIcons.tTmp1.txt=tTmp.txt
                                            page popupLight
                                        }
                                        if(tId.txt=="pageStartup")
                                        {
                                            page pageStartup
                                        }
                                        if(tId.txt=="screensaver")
                                        {
                                            page screensaver
                                        }
                                        if(tId.txt=="cardEntities")
                                        {
                                            page cardEntities
                                        }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                        {
-                                            page cardMedia
+                                            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=="pageStartup")
+                                        if(tId.txt=="cardMedia")
                                        {
-                                            page pageStartup
+                                            page cardMedia
                                        }
                                        if(tId.txt=="cardGrid")
                                        {
                                            page cardGrid
                                        }
                                        if(tId.txt=="cardAlarm")
                                        {
--- a/HMI/US/landscape/n2t-out-visual/popupShutter.txt
+++ b/HMI/US/landscape/n2t-out-visual/popupShutter.txt
@@ -631,30 +631,43 @@ Timer tmSerial
                                        //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=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                        {
-                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page pageStartup
-                                            page popupLight
+                                        }
                                        if(tId.txt=="screensaver")
                                        {
                                            page screensaver
                                        }
                                        if(tId.txt=="cardEntities")
                                        {
                                            page cardEntities
                                        }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                        {
-                                            page cardMedia
+                                            page cardGrid
                                        }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                        {
-                                            page pageStartup
+                                            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=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                        {
-                                            page cardGrid
+                                            page cardThermo
                                        }
                                        if(tId.txt=="cardMedia")
                                        {
                                            page cardMedia
                                        }
                                        if(tId.txt=="cardAlarm")
                                        {
--- a/HMI/US/landscape/n2t-out-visual/screensaver.txt
+++ b/HMI/US/landscape/n2t-out-visual/screensaver.txt
@@ -48,80 +48,20 @@ Variable (string) strCommand
 Variable (string) tId
    Attributes
-        ID            : 19
+        ID            : 17
        Scope         : local
        Text          : 
        Max. Text Size: 25
 Variable (int32) vaTap
    Attributes
-        ID   : 27
+        ID   : 25
        Scope: local
        Value: 0
 Text tInstruction
    Attributes
        ID                                  : 5
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 450
        y coordinate                        : 186
        Width                               : 27
        Height                              : 30
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 0
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
        Text                                : 
        Max. Text Size                      : 50
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Text tTmp
    Attributes
        ID                                  : 6
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 451
        y coordinate                        : 228
        Width                               : 25
        Height                              : 30
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 0
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
        Text                                : 
        Max. Text Size                      : 50
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Text tTime
    Attributes
-        ID                                  : 7
+        ID                                  : 5
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -151,7 +91,7 @@ Text tTime
 Text tDate
    Attributes
-        ID                                  : 8
+        ID                                  : 6
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -167,7 +107,7 @@ Text tDate
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
        Back. Color                         : 0
        Font Color                          : 65535
        Horizontal Alignment                : center
@@ -181,14 +121,14 @@ Text tDate
 Text tSend
    Attributes
-        ID                                  : 9
+        ID                                  : 7
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
-        x coordinate                        : 451
+        x coordinate                        : 405
-        y coordinate                        : 9
+        y coordinate                        : 2
        Width                               : 29
        Height                              : 30
        Effect                              : load
@@ -211,7 +151,7 @@ Text tSend
 Text tMainIcon
    Attributes
-        ID                                  : 10
+        ID                                  : 8
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -227,6 +167,36 @@ Text tMainIcon
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 4
        Back. Color                         : 0
        Font Color                          : 65535
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
        Text                                : 
        Max. Text Size                      : 10
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Text tMainText
    Attributes
        ID                                  : 9
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 22
        y coordinate                        : 267
        Width                               : 110
        Height                              : 43
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 3
        Back. Color                         : 0
        Font Color                          : 65535
@@ -239,39 +209,9 @@ Text tMainIcon
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Text tMainText
    Attributes
        ID                                  : 11
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 22
        y coordinate                        : 267
        Width                               : 110
        Height                              : 43
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 2
        Back. Color                         : 0
        Font Color                          : 65535
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
        Text                                : 
        Max. Text Size                      : 10
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Text tForecast1
    Attributes
-        ID                                  : 12
+        ID                                  : 10
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -301,7 +241,7 @@ Text tForecast1
 Text tForecast1Val
    Attributes
-        ID                                  : 13
+        ID                                  : 11
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -331,7 +271,7 @@ Text tForecast1Val
 Text tF1Icon
    Attributes
-        ID                                  : 14
+        ID                                  : 12
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -361,7 +301,7 @@ Text tF1Icon
 Text tForecast2
    Attributes
-        ID                                  : 15
+        ID                                  : 13
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -391,7 +331,7 @@ Text tForecast2
 Text tF2Icon
    Attributes
-        ID                                  : 16
+        ID                                  : 14
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -421,7 +361,7 @@ Text tF2Icon
 Text tForecast2Val
    Attributes
-        ID                                  : 17
+        ID                                  : 15
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -451,13 +391,13 @@ Text tForecast2Val
 Text t10
    Attributes
-        ID                                  : 18
+        ID                                  : 16
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
-        x coordinate                        : 62
+        x coordinate                        : 61
        y coordinate                        : 195
        Width                               : 360
        Height                              : 2
@@ -481,7 +421,7 @@ Text t10
 Text tAMPM
    Attributes
-        ID                                  : 20
+        ID                                  : 18
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -497,7 +437,7 @@ Text tAMPM
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 3
+        Font ID                             : 4
        Back. Color                         : 0
        Font Color                          : 65535
        Horizontal Alignment                : center
@@ -511,7 +451,7 @@ Text tAMPM
 Text tForecast3Val
    Attributes
-        ID                                  : 21
+        ID                                  : 19
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -541,7 +481,7 @@ Text tForecast3Val
 Text tF3Icon
    Attributes
-        ID                                  : 22
+        ID                                  : 20
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -571,7 +511,7 @@ Text tF3Icon
 Text tForecast3
    Attributes
-        ID                                  : 23
+        ID                                  : 21
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -601,7 +541,7 @@ Text tForecast3
 Text tForecast4
    Attributes
-        ID                                  : 24
+        ID                                  : 22
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -631,7 +571,7 @@ Text tForecast4
 Text tF4Icon
    Attributes
-        ID                                  : 25
+        ID                                  : 23
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -661,7 +601,7 @@ Text tF4Icon
 Text tForecast4Val
    Attributes
-        ID                                  : 26
+        ID                                  : 24
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -691,7 +631,7 @@ Text tForecast4Val
 Text tMainTextAlt
    Attributes
-        ID                                  : 29
+        ID                                  : 27
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -707,7 +647,7 @@ Text tMainTextAlt
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 0
        Font Color                          : 65535
        Horizontal Alignment                : left
@@ -721,7 +661,7 @@ Text tMainTextAlt
 Text tMainIconAlt
    Attributes
-        ID                                  : 30
+        ID                                  : 28
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -737,7 +677,7 @@ Text tMainIconAlt
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 3
+        Font ID                             : 4
        Back. Color                         : 0
        Font Color                          : 65535
        Horizontal Alignment                : center
@@ -751,7 +691,7 @@ Text tMainIconAlt
 Text tMRIcon
    Attributes
-        ID                                  : 31
+        ID                                  : 29
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -781,7 +721,7 @@ Text tMRIcon
 Text tMR
    Attributes
-        ID                                  : 32
+        ID                                  : 30
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -809,6 +749,66 @@ Text tMR
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Text tTmp
    Attributes
        ID                                  : 31
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 368
        y coordinate                        : 0
        Width                               : 25
        Height                              : 30
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 0
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
        Text                                : 
        Max. Text Size                      : 50
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Text tInstruction
    Attributes
        ID                                  : 32
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 335
        y coordinate                        : 0
        Width                               : 27
        Height                              : 30
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 0
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
        Text                                : 
        Max. Text Size                      : 50
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Picture p0
    Attributes
        ID                                  : 1
@@ -922,9 +922,7 @@ Timer tmSerial
                                        vis tMRIcon,0
                                        vis tMR,0
                                        //tMainIcon
-                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        spstr strCommand.txt,tMainIcon.txt,"~",1
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1
                                        tMainIconAlt.txt=tMainIcon.txt
                                        //tMainText
                                        spstr strCommand.txt,tMainText.txt,"~",2
@@ -932,41 +930,31 @@ Timer tmSerial
                                        //tForecast1
                                        spstr strCommand.txt,tForecast1.txt,"~",3
                                        //tF1Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        spstr strCommand.txt,tF1Icon.txt,"~",4
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1
                                        //tForecast1Val
                                        spstr strCommand.txt,tForecast1Val.txt,"~",5
                                        //tForecast2
                                        spstr strCommand.txt,tForecast2.txt,"~",6
                                        //tF2Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",7
+                                        spstr strCommand.txt,tF2Icon.txt,"~",7
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1
                                        //tForecast2Val
                                        spstr strCommand.txt,tForecast2Val.txt,"~",8
                                        //tForecast3
                                        spstr strCommand.txt,tForecast3.txt,"~",9
                                        //tF3Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        spstr strCommand.txt,tF3Icon.txt,"~",10
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tF3Icon.txt,sys0,1
                                        //tForecast3Val
                                        spstr strCommand.txt,tForecast3Val.txt,"~",11
                                        //tForecast4
                                        spstr strCommand.txt,tForecast4.txt,"~",12
                                        //tF4Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",13
+                                        spstr strCommand.txt,tF4Icon.txt,"~",13
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1
                                        //tForecast4Val
                                        spstr strCommand.txt,tForecast4Val.txt,"~",14
                                        //alternative layout
                                        //tMRIcon
-                                        spstr strCommand.txt,tTmp.txt,"~",15
+                                        spstr strCommand.txt,tMRIcon.txt,"~",15
-                                        covx tTmp.txt,sys0,0,0
+                                        if(tMRIcon.txt!="")
                                        substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1
                                        if(tTmp.txt!="")
                                        {
                                            //value for tMRIcon, activate alternative layout
                                            vis tMainIcon,0
@@ -992,6 +980,77 @@ Timer tmSerial
                                        //tMR
                                        spstr strCommand.txt,tMR.txt,"~",16
                                    }
                                    if(tInstruction.txt=="color")
                                    {
                                        spstr strCommand.txt,tTmp.txt,"~",1
                                        covx tTmp.txt,tTime.bco,0,0
                                        screensaver.bco=tTime.bco
                                        tAMPM.bco=tTime.bco
                                        tDate.bco=tTime.bco
                                        tMainIcon.bco=tTime.bco
                                        tMainText.bco=tTime.bco
                                        tMainIconAlt.bco=tTime.bco
                                        tMainTextAlt.bco=tTime.bco
                                        tMRIcon.bco=tTime.bco
                                        tMR.bco=tTime.bco
                                        tMRIcon.bco=tTime.bco
                                        tForecast1.bco=tTime.bco
                                        tForecast1Val.bco=tTime.bco
                                        tF1Icon.bco=tTime.bco
                                        tForecast2.bco=tTime.bco
                                        tForecast2Val.bco=tTime.bco
                                        tF2Icon.bco=tTime.bco
                                        tForecast3.bco=tTime.bco
                                        tForecast3Val.bco=tTime.bco
                                        tF3Icon.bco=tTime.bco
                                        tForecast4.bco=tTime.bco
                                        tForecast4Val.bco=tTime.bco
                                        tF4Icon.bco=tTime.bco
                                        spstr strCommand.txt,tTmp.txt,"~",2
                                        covx tTmp.txt,tTime.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",3
                                        covx tTmp.txt,tAMPM.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",4
                                        covx tTmp.txt,tDate.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",5
                                        covx tTmp.txt,tMainIcon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",6
                                        covx tTmp.txt,tMainText.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",7
                                        covx tTmp.txt,tForecast1.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",8
                                        covx tTmp.txt,tForecast2.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",9
                                        covx tTmp.txt,tForecast3.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",10
                                        covx tTmp.txt,tForecast4.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",11
                                        covx tTmp.txt,tF1Icon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",12
                                        covx tTmp.txt,tF2Icon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",13
                                        covx tTmp.txt,tF3Icon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",14
                                        covx tTmp.txt,tF4Icon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",15
                                        covx tTmp.txt,tForecast1Val.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",16
                                        covx tTmp.txt,tForecast2Val.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",17
                                        covx tTmp.txt,tForecast3Val.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",18
                                        covx tTmp.txt,tForecast4Val.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",19
                                        covx tTmp.txt,t10.bco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",20
                                        covx tTmp.txt,tMainIconAlt.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",21
                                        covx tTmp.txt,tMainTextAlt.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",22
                                        covx tTmp.txt,tMRIcon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",23
                                        covx tTmp.txt,tMR.pco,0,0
                                    }
                                    if(tInstruction.txt=="pageType")
                                    {
                                        dim=100
@@ -1057,7 +1116,7 @@ Timer tmSerial
 Timer tmSleep
    Attributes
-        ID         : 28
+        ID         : 26
        Scope      : local
        Period (ms): 1000
        Enabled    : yes
--- a/HMI/US/landscape/n2t-out/cardAlarm.txt
+++ b/HMI/US/landscape/n2t-out/cardAlarm.txt
@@ -543,7 +543,7 @@ Timer tmSerial
                                        }
                                        if(tTmp.txt=="1")
                                        {
-                                            vis bPrev,1
+                                            vis bNext,1
                                            bNext.txt="î³"
                                        }
                                        //text arm1
@@ -579,9 +579,7 @@ Timer tmSerial
                                        //id arm4
                                        spstr strCommand.txt,va4.txt,"~",10
                                        //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",11
+                                        spstr strCommand.txt,tIcon.txt,"~",11
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
                                        //icon color
                                        spstr strCommand.txt,tTmp.txt,"~",12
                                        covx tTmp.txt,sys0,0,0
--- a/HMI/US/landscape/n2t-out/cardEntities.txt
+++ b/HMI/US/landscape/n2t-out/cardEntities.txt
@@ -1151,7 +1151,7 @@ Timer tmSerial
                                        }
                                        if(tTmp.txt=="1")
                                        {
-                                            vis bPrev,1
+                                            vis bNext,1
                                            bNext.txt="î³"
                                        }
                                        // get Type
@@ -1172,9 +1172,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",5
+                                            spstr strCommand.txt,tIcon1.txt,"~",5
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
                                            vis tIcon1,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",6
@@ -1296,9 +1294,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",11
+                                            spstr strCommand.txt,tIcon2.txt,"~",11
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,tIcon2.txt,sys0,1
                                            vis tIcon2,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",12
@@ -1420,9 +1416,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",17
+                                            spstr strCommand.txt,tIcon3.txt,"~",17
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,tIcon3.txt,sys0,1
                                            vis tIcon3,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",18
@@ -1544,9 +1538,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",23
+                                            spstr strCommand.txt,tIcon4.txt,"~",23
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,tIcon4.txt,sys0,1
                                            vis tIcon4,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",24
--- a/HMI/US/landscape/n2t-out/cardGrid.txt
+++ b/HMI/US/landscape/n2t-out/cardGrid.txt
@@ -599,7 +599,7 @@ Timer tmSerial
                                        }
                                        if(tTmp.txt=="1")
                                        {
-                                            vis bPrev,1
+                                            vis bNext,1
                                            bNext.txt="î³"
                                        }
                                        // get Type
@@ -613,9 +613,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",5
+                                            spstr strCommand.txt,bEntity1.txt,"~",5
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1
                                            vis bEntity1,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",6
@@ -636,9 +634,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",11
+                                            spstr strCommand.txt,bEntity2.txt,"~",11
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1
                                            vis bEntity2,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",12
@@ -659,9 +655,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",17
+                                            spstr strCommand.txt,bEntity3.txt,"~",17
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1
                                            vis bEntity3,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",18
@@ -682,9 +676,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",23
+                                            spstr strCommand.txt,bEntity4.txt,"~",23
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1
                                            vis bEntity4,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",24
@@ -705,9 +697,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",29
+                                            spstr strCommand.txt,bEntity5.txt,"~",29
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1
                                            vis bEntity5,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",30
@@ -728,9 +718,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",35
+                                            spstr strCommand.txt,bEntity6.txt,"~",35
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1
                                            vis bEntity6,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",36
--- a/HMI/US/landscape/n2t-out/cardMedia.txt
+++ b/HMI/US/landscape/n2t-out/cardMedia.txt
@@ -534,15 +534,13 @@ Timer tmSerial
                                        }
                                        if(tTmp.txt=="1")
                                        {
-                                            vis bPrev,1
+                                            vis bNext,1
                                            bNext.txt="î³"
                                        }
                                        //entity name
                                        spstr strCommand.txt,entn.txt,"~",3
                                        //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        spstr strCommand.txt,tIcon.txt,"~",4
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
                                        //title
                                        spstr strCommand.txt,tTitle.txt,"~",5
                                        //author
@@ -552,9 +550,7 @@ Timer tmSerial
                                        covx tTmp.txt,sys0,0,0
                                        hVolume.val=sys0
                                        //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",8
+                                        spstr strCommand.txt,tPlayPause.txt,"~",8
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
                                        //speaker current
                                        spstr strCommand.txt,tSpeaker.txt,"~",9
                                        if(tSpeaker.txt!="")
--- a/HMI/US/landscape/n2t-out/cardThermo.txt
+++ b/HMI/US/landscape/n2t-out/cardThermo.txt
@@ -671,7 +671,7 @@ Timer tmSerial
                                        }
                                        if(tTmp.txt=="1")
                                        {
-                                            vis bPrev,1
+                                            vis bNext,1
                                            bNext.txt="î³"
                                        }
                                        //entity name
@@ -704,12 +704,9 @@ Timer tmSerial
                                        vis bt7,0
                                        vis bt8,0
                                        //bt0
-                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        spstr strCommand.txt,bt0.txt,"~",10
-                                        if(tTmp.txt!="")
+                                        if(bt0.txt!="")
                                        {
                                            // set icon
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bt0.txt,sys0,1
                                            // set text color on active state
                                            spstr strCommand.txt,tTmp.txt,"~",11
                                            covx tTmp.txt,bt0.pco2,0,0
@@ -720,232 +717,216 @@ Timer tmSerial
                                            spstr strCommand.txt,va0.txt,"~",13
                                            //enable
                                            vis bt0,1
-                                            }              //bt1
+                                        }
-                                            spstr strCommand.txt,tTmp.txt,"~",14
+                                        //bt1
-                                            if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt1.txt,"~",14
-                                            {
+                                        if(bt1.txt!="")
-                                                // set icon
+                                        {
-                                                covx tTmp.txt,sys0,0,0
+                                            // set text color on active state
-                                                substr pageIcons.tIcons.txt,bt1.txt,sys0,1
+                                            spstr strCommand.txt,tTmp.txt,"~",15
-                                                // set text color on active state
+                                            covx tTmp.txt,bt1.pco2,0,0
-                                                spstr strCommand.txt,tTmp.txt,"~",15
+                                            // set state
-                                                covx tTmp.txt,bt1.pco2,0,0
+                                            spstr strCommand.txt,tTmp.txt,"~",16
-                                                // set state
+                                            covx tTmp.txt,bt1.val,0,0
-                                                spstr strCommand.txt,tTmp.txt,"~",16
+                                            // save action
-                                                covx tTmp.txt,bt1.val,0,0
+                                            spstr strCommand.txt,va1.txt,"~",17
-                                                // save action
+                                            //enable
-                                                spstr strCommand.txt,va1.txt,"~",17
+                                            vis bt1,1
-                                                //enable
+                                        }
-                                                vis bt1,1
+                                        //bt2
-                                                }              //bt2
+                                        spstr strCommand.txt,bt2.txt,"~",18
-                                                spstr strCommand.txt,tTmp.txt,"~",18
+                                        if(bt2.txt!="")
-                                                if(tTmp.txt!="")
+                                        {
-                                                {
+                                            // set text color on active state
-                                                    // set icon
+                                            spstr strCommand.txt,tTmp.txt,"~",19
-                                                    covx tTmp.txt,sys0,0,0
+                                            covx tTmp.txt,bt2.pco2,0,0
-                                                    substr pageIcons.tIcons.txt,bt2.txt,sys0,1
+                                            // set state
-                                                    // set text color on active state
+                                            spstr strCommand.txt,tTmp.txt,"~",20
-                                                    spstr strCommand.txt,tTmp.txt,"~",19
+                                            covx tTmp.txt,bt2.val,0,0
-                                                    covx tTmp.txt,bt2.pco2,0,0
+                                            // save action
-                                                    // set state
+                                            spstr strCommand.txt,va2.txt,"~",21
-                                                    spstr strCommand.txt,tTmp.txt,"~",20
+                                            //enable
-                                                    covx tTmp.txt,bt2.val,0,0
+                                            vis bt2,1
-                                                    // save action
+                                        }
-                                                    spstr strCommand.txt,va2.txt,"~",21
+                                        //bt3
-                                                    //enable
+                                        spstr strCommand.txt,bt3.txt,"~",22
-                                                    vis bt2,1
+                                        if(bt3.txt!="")
-                                                    }              //bt3
+                                        {
-                                                    spstr strCommand.txt,tTmp.txt,"~",22
+                                            // set text color on active state
-                                                    if(tTmp.txt!="")
+                                            spstr strCommand.txt,tTmp.txt,"~",23
-                                                    {
+                                            covx tTmp.txt,bt3.pco2,0,0
-                                                        // set icon
+                                            // set state
-                                                        covx tTmp.txt,sys0,0,0
+                                            spstr strCommand.txt,tTmp.txt,"~",24
-                                                        substr pageIcons.tIcons.txt,bt3.txt,sys0,1
+                                            covx tTmp.txt,bt3.val,0,0
-                                                        // set text color on active state
+                                            // save action
-                                                        spstr strCommand.txt,tTmp.txt,"~",23
+                                            spstr strCommand.txt,va3.txt,"~",25
-                                                        covx tTmp.txt,bt3.pco2,0,0
+                                            //enable
-                                                        // set state
+                                            vis bt3,1
-                                                        spstr strCommand.txt,tTmp.txt,"~",24
+                                        }
-                                                        covx tTmp.txt,bt3.val,0,0
+                                        //bt4
-                                                        // save action
+                                        spstr strCommand.txt,bt4.txt,"~",26
-                                                        spstr strCommand.txt,va3.txt,"~",25
+                                        if(bt4.txt!="")
-                                                        //enable
+                                        {
-                                                        vis bt3,1
+                                            // set text color on active state
-                                                        }              //bt4
+                                            spstr strCommand.txt,tTmp.txt,"~",27
-                                                        spstr strCommand.txt,tTmp.txt,"~",26
+                                            covx tTmp.txt,bt4.pco2,0,0
-                                                        if(tTmp.txt!="")
+                                            // set state
-                                                        {
+                                            spstr strCommand.txt,tTmp.txt,"~",28
-                                                            // set icon
+                                            covx tTmp.txt,bt4.val,0,0
-                                                            covx tTmp.txt,sys0,0,0
+                                            // save action
-                                                            substr pageIcons.tIcons.txt,bt4.txt,sys0,1
+                                            spstr strCommand.txt,va4.txt,"~",29
-                                                            // set text color on active state
+                                            //enable
-                                                            spstr strCommand.txt,tTmp.txt,"~",27
+                                            vis bt4,1
-                                                            covx tTmp.txt,bt4.pco2,0,0
+                                        }
-                                                            // set state
+                                        //bt5
-                                                            spstr strCommand.txt,tTmp.txt,"~",28
+                                        spstr strCommand.txt,bt5.txt,"~",30
-                                                            covx tTmp.txt,bt4.val,0,0
+                                        if(bt5.txt!="")
-                                                            // save action
+                                        {
-                                                            spstr strCommand.txt,va4.txt,"~",29
+                                            // set text color on active state
-                                                            //enable
+                                            spstr strCommand.txt,tTmp.txt,"~",31
-                                                            vis bt4,1
+                                            covx tTmp.txt,bt5.pco2,0,0
-                                                            }              //bt5
+                                            // set state
-                                                            spstr strCommand.txt,tTmp.txt,"~",30
+                                            spstr strCommand.txt,tTmp.txt,"~",32
-                                                            if(tTmp.txt!="")
+                                            covx tTmp.txt,bt5.val,0,0
-                                                            {
+                                            // save action
-                                                                // set icon
+                                            spstr strCommand.txt,va5.txt,"~",33
-                                                                covx tTmp.txt,sys0,0,0
+                                            //enable
-                                                                substr pageIcons.tIcons.txt,bt5.txt,sys0,1
+                                            vis bt5,1
-                                                                // set text color on active state
+                                        }
-                                                                spstr strCommand.txt,tTmp.txt,"~",31
+                                        //bt6
-                                                                covx tTmp.txt,bt5.pco2,0,0
+                                        spstr strCommand.txt,bt6.txt,"~",34
-                                                                // set state
+                                        if(bt6.txt!="")
-                                                                spstr strCommand.txt,tTmp.txt,"~",32
+                                        {
-                                                                covx tTmp.txt,bt5.val,0,0
+                                            // set text color on active state
-                                                                // save action
+                                            spstr strCommand.txt,tTmp.txt,"~",35
-                                                                spstr strCommand.txt,va5.txt,"~",33
+                                            covx tTmp.txt,bt6.pco2,0,0
-                                                                //enable
+                                            // set state
-                                                                vis bt5,1
+                                            spstr strCommand.txt,tTmp.txt,"~",36
-                                                                }              //bt6
+                                            covx tTmp.txt,bt6.val,0,0
-                                                                spstr strCommand.txt,tTmp.txt,"~",34
+                                            // save action
-                                                                if(tTmp.txt!="")
+                                            spstr strCommand.txt,va6.txt,"~",37
-                                                                {
+                                            //enable
-                                                                    // set icon
+                                            vis bt6,1
-                                                                    covx tTmp.txt,sys0,0,0
+                                        }
-                                                                    substr pageIcons.tIcons.txt,bt6.txt,sys0,1
+                                        //bt7
-                                                                    // set text color on active state
+                                        spstr strCommand.txt,bt7.txt,"~",38
-                                                                    spstr strCommand.txt,tTmp.txt,"~",35
+                                        if(bt7.txt!="")
-                                                                    covx tTmp.txt,bt6.pco2,0,0
+                                        {
-                                                                    // set state
+                                            // set text color on active state
-                                                                    spstr strCommand.txt,tTmp.txt,"~",36
+                                            spstr strCommand.txt,tTmp.txt,"~",39
-                                                                    covx tTmp.txt,bt6.val,0,0
+                                            covx tTmp.txt,bt7.pco2,0,0
-                                                                    // save action
+                                            // set state
-                                                                    spstr strCommand.txt,va6.txt,"~",37
+                                            spstr strCommand.txt,tTmp.txt,"~",40
-                                                                    //enable
+                                            covx tTmp.txt,bt7.val,0,0
-                                                                    vis bt6,1
+                                            // save action
-                                                                    }              //bt7
+                                            spstr strCommand.txt,va7.txt,"~",41
-                                                                    spstr strCommand.txt,tTmp.txt,"~",38
+                                            //enable
-                                                                    if(tTmp.txt!="")
+                                            vis bt7,1
-                                                                    {
+                                        }
-                                                                        // set icon
+                                        //bt8
-                                                                        covx tTmp.txt,sys0,0,0
+                                        spstr strCommand.txt,bt8.txt,"~",42
-                                                                        substr pageIcons.tIcons.txt,bt7.txt,sys0,1
+                                        if(bt8.txt!="")
-                                                                        // set text color on active state
+                                        {
-                                                                        spstr strCommand.txt,tTmp.txt,"~",39
+                                            // set text color on active state
-                                                                        covx tTmp.txt,bt7.pco2,0,0
+                                            spstr strCommand.txt,tTmp.txt,"~",43
-                                                                        // set state
+                                            covx tTmp.txt,bt8.pco2,0,0
-                                                                        spstr strCommand.txt,tTmp.txt,"~",40
+                                            // set state
-                                                                        covx tTmp.txt,bt7.val,0,0
+                                            spstr strCommand.txt,tTmp.txt,"~",44
-                                                                        // save action
+                                            covx tTmp.txt,bt8.val,0,0
-                                                                        spstr strCommand.txt,va7.txt,"~",41
+                                            // save action
-                                                                        //enable
+                                            spstr strCommand.txt,va8.txt,"~",45
-                                                                        vis bt7,1
+                                            //enable
-                                                                        }              //bt8
+                                            vis bt8,1
-                                                                        spstr strCommand.txt,tTmp.txt,"~",42
+                                        }
-                                                                        if(tTmp.txt!="")
+                                    }
-                                                                        {
+                                    if(tInstruction.txt=="pageType")
-                                                                            // set icon
+                                    {
-                                                                            covx tTmp.txt,sys0,0,0
+                                        //command format pageType,specialPageName
-                                                                            substr pageIcons.tIcons.txt,bt8.txt,sys0,1
+                                        //write name of speical page to tId
-                                                                            // set text color on active state
+                                        spstr strCommand.txt,tId.txt,"~",1
-                                                                            spstr strCommand.txt,tTmp.txt,"~",43
+                                        //save second arg if there's one
-                                                                            covx tTmp.txt,bt8.pco2,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",2
-                                                                            // set state
+                                        //save third arg if there's one
-                                                                            spstr strCommand.txt,tTmp.txt,"~",44
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
-                                                                            covx tTmp.txt,bt8.val,0,0
+                                        //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 ...
-                                                                            // save action
+                                        udelete payloadLength-1
-                                                                            spstr strCommand.txt,va8.txt,"~",45
+                                        bufferPos=0
-                                                                            //enable
+                                        if(tId.txt=="pageStartup")
-                                                                            vis bt8,1
+                                        {
-                                                                        }
+                                            page pageStartup
-                                                                    }
+                                        }
-                                                                    if(tInstruction.txt=="pageType")
+                                        if(tId.txt=="screensaver")
-                                                                    {
+                                        {
-                                                                        //command format pageType,specialPageName
+                                            page screensaver
-                                                                        //write name of speical page to tId
+                                        }
-                                                                        spstr strCommand.txt,tId.txt,"~",1
+                                        if(tId.txt=="cardEntities")
-                                                                        //save second arg if there's one
+                                        {
-                                                                        spstr strCommand.txt,tTmp.txt,"~",2
+                                            page cardEntities
-                                                                        //save third arg if there's one
+                                        }
-                                                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
+                                        if(tId.txt=="cardGrid")
-                                                                        //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
+                                            page cardGrid
-                                                                        bufferPos=0
+                                        }
-                                                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
-                                                                        {
+                                        {
-                                                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
-                                                                        }
+                                            page popupLight
-                                                                        if(tId.txt=="screensaver")
+                                        }
-                                                                        {
+                                        if(tId.txt=="popupShutter")
-                                                                            page screensaver
+                                        {
-                                                                        }
+                                            pageIcons.tTmp1.txt=tTmp.txt
-                                                                        if(tId.txt=="cardEntities")
+                                            page popupShutter
-                                                                        {
+                                        }
-                                                                            page cardEntities
+                                        if(tId.txt=="popupNotify")
-                                                                        }
+                                        {
-                                                                        if(tId.txt=="cardGrid")
+                                            page popupNotify
-                                                                        {
+                                        }
-                                                                            page cardGrid
+                                        if(tId.txt=="cardThermo")
-                                                                        }
+                                        {
-                                                                        if(tId.txt=="popupLight")
+                                            page cardThermo
-                                                                        {
+                                        }
-                                                                            pageIcons.tTmp1.txt=tTmp.txt
+                                        if(tId.txt=="cardMedia")
-                                                                            page popupLight
+                                        {
-                                                                        }
+                                            page cardMedia
-                                                                        if(tId.txt=="popupShutter")
+                                        }
-                                                                        {
+                                        if(tId.txt=="cardAlarm")
-                                                                            pageIcons.tTmp1.txt=tTmp.txt
+                                        {
-                                                                            page popupShutter
+                                            page cardAlarm
-                                                                        }
+                                        }
-                                                                        if(tId.txt=="popupNotify")
+                                    }
-                                                                        {
+                                    if(tInstruction.txt=="time")
-                                                                            page popupNotify
+                                    {
-                                                                        }
+                                        // get set time to global variable
-                                                                        if(tId.txt=="cardThermo")
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
-                                                                        {
+                                    }
-                                                                            page cardThermo
+                                    if(tInstruction.txt=="date")
-                                                                        }
+                                    {
-                                                                        if(tId.txt=="cardMedia")
+                                        // get set date to global variable
-                                                                        {
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
-                                                                            page cardMedia
+                                    }
-                                                                        }
+                                    if(tInstruction.txt=="dimmode")
-                                                                        if(tId.txt=="cardAlarm")
+                                    {
-                                                                        {
+                                        // get value
-                                                                            page cardAlarm
+                                        spstr strCommand.txt,tTmp.txt,"~",1
-                                                                        }
+                                        covx tTmp.txt,dimValue,0,0
-                                                                    }
+                                    }
-                                                                    if(tInstruction.txt=="time")
+                                    if(tInstruction.txt=="timeout")
-                                                                    {
+                                    {
-                                                                        // get set time to global variable
+                                        //set timeout to global var
-                                                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
-                                                                    }
+                                        covx tTmp.txt,sleepTimeout,0,0
-                                                                    if(tInstruction.txt=="date")
+                                    }
-                                                                    {
+                                    // end of user code
-                                                                        // get set date to global variable
+                                    udelete payloadLength-1
-                                                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+                                    bufferPos=0
-                                                                    }
+                                }
-                                                                    if(tInstruction.txt=="dimmode")
+                            }
-                                                                    {
+                        }
-                                                                        // get value
+                    }
-                                                                        spstr strCommand.txt,tTmp.txt,"~",1
+                    // next character
-                                                                        covx tTmp.txt,dimValue,0,0
+                    bufferPos++
-                                                                    }
+                }
-                                                                    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++
                                                }
                                            }
 Timer tmSleep
    Attributes
--- a/HMI/US/landscape/n2t-out/pageIcons.txt
+++ b/HMI/US/landscape/n2t-out/pageIcons.txt
@@ -22,16 +22,6 @@ Variable (string) vaDate
        Text          : 
        Max. Text Size: 35
 Text tIcons
    Attributes
        Scope                               : global
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Text                                : îî´îï§îîî îî£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîî©±ï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾î¶îïîî¸î¸
        Max. Text Size                      : 170
 Text tTmp1
    Attributes
        Scope                               : global
--- a/HMI/US/landscape/n2t-out/pageSerialTest.txt
+++ b/HMI/US/landscape/n2t-out/pageSerialTest.txt
@@ -1,207 +0,0 @@
 Page pageSerialTest
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Locked                              : no
        Swide up page ID                    : disabled
        Swide down page ID                  : disabled
        Swide left page ID                  : disabled
        Swide right page ID                 : disabled
    Events
        Preinitialize Event
            //vis p0,0
            //recmod=1
            //bauds=115200
 Number nCrcRecv
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Value                               : 0
 Number nCrcCalc
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Value                               : 0
 Number nIt
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Value                               : 0
 Number nLength
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Value                               : 0
 Text tStatus
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Text                                : newtxt
        Max. Text Size                      : 100
 Text tCmd
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Text                                : newtxt
        Max. Text Size                      : 500
 Text tBuffer
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Text                                : newtxt
        Max. Text Size                      : 100
 Text tDesc
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Text                                : CRC Recv:\r\nCRC Calc:\r\n\r\nStatus\r\n\r\nCommand
        Max. Text Size                      : 60
 Picture p0
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
 Button b0
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        State                               : unpressed
        Text                                : bck
        Max. Text Size                      : 10
    Events
        Touch Press Event
            recmod=0
            page pageTest
 Button b1
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        State                               : unpressed
        Text                                : ON
        Max. Text Size                      : 10
    Events
        Touch Press Event
            recmod=1
            bauds=115200
 Timer tmSerial
    Attributes
        Scope      : local
        Period (ms): 400
        Enabled    : yes
    Events
        Timer Event
            // 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
                        }
                        tStatus.txt="init command detected"
                        //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
                            //payloadLength=u[2]
                            ucopy payloadLength,2,2,0
                            nLength.val=payloadLength
                            // 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)
                            {
                                tStatus.txt="reached"
                                // calculate crc
                                crcrest 1,0xFFFF
                                // payload length -1 to exclude crc
                                crcputu 0,payloadLength-1 //u[2]+3
                                // get recived crc to be able to compare it
                                ucopy recvCrc,payloadLength-1,2,0
                                nCrcRecv.val=recvCrc
                                // compare crc with recived value
                                if(crcval==recvCrc)
                                {
                                    tStatus.txt="crc ok"
                                    nIt.val=nIt.val+1
                                    ucopy tCmd.txt,4,payloadLength-5,0
                                    udelete payloadLength-1
                                    bufferPos=0
                                    // here is the location where acual code should be
                                }
                                // copy calculated crc and recived crc to nCrcRecv and nCrcCalc, for debugging
                                nCrcRecv.val=recvCrc
                                nCrcCalc.val=crcval
                                //ucopy nCrcCalc.val,u[2]+3,3,0
                            }
                        }
                    }
                    // next character
                    bufferPos++
                }
                if(bufferPos==usize)
                {
                    // copy whole buffer to tCmd.txt, for debugging
                    //ucopy tBuffer.txt,0,usize,0
                    // ucopy nIt.val,0,usize,0
                    // clear whole buffer
                    //code_c
                    //bufferPos=0
                }
            }
--- a/HMI/US/landscape/n2t-out/pageStartup.txt
+++ b/HMI/US/landscape/n2t-out/pageStartup.txt
@@ -152,7 +152,7 @@ Text tVersion
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
-        Text                                : 28
+        Text                                : 31
        Max. Text Size                      : 10
 Picture p0
--- a/HMI/US/landscape/n2t-out/pageTest.txt
+++ b/HMI/US/landscape/n2t-out/pageTest.txt
@@ -35,20 +35,6 @@ Button b0
        Touch Press Event
            page cardEntities
 Button b1
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        State                               : unpressed
        Text                                : serial
        Max. Text Size                      : 10
    Events
        Touch Press Event
            page pageSerialTest
 Button b3
    Attributes
        Scope                               : local
@@ -176,3 +162,17 @@ Button b11
        Touch Press Event
            page cardGrid
 Button b1
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        State                               : unpressed
        Text                                : bauds=115200
        Max. Text Size                      : 20
    Events
        Touch Press Event
            bauds=115200
--- a/HMI/US/landscape/n2t-out/popupLight.txt
+++ b/HMI/US/landscape/n2t-out/popupLight.txt
@@ -442,9 +442,7 @@ Timer tmSerial
                                    if(tInstruction.txt=="entityUpdateDetail")
                                    {
                                        // change icon
-                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        spstr strCommand.txt,tIcon1.txt,"~",1
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
                                        vis tIcon1,1
                                        // change icon color
                                        spstr strCommand.txt,tTmp.txt,"~",2
--- a/HMI/US/landscape/n2t-out/popupNotify.txt
+++ b/HMI/US/landscape/n2t-out/popupNotify.txt
@@ -339,25 +339,43 @@ Timer tmSerial
                                            pageIcons.tTmp1.txt=tTmp.txt
                                            page popupLight
                                        }
                                        if(tId.txt=="pageStartup")
                                        {
                                            page pageStartup
                                        }
                                        if(tId.txt=="screensaver")
                                        {
                                            page screensaver
                                        }
                                        if(tId.txt=="cardEntities")
                                        {
                                            page cardEntities
                                        }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                        {
-                                            page cardMedia
+                                            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=="pageStartup")
+                                        if(tId.txt=="cardMedia")
                                        {
-                                            page pageStartup
+                                            page cardMedia
                                        }
                                        if(tId.txt=="cardGrid")
                                        {
                                            page cardGrid
                                        }
                                        if(tId.txt=="cardAlarm")
                                        {
--- a/HMI/US/landscape/n2t-out/popupShutter.txt
+++ b/HMI/US/landscape/n2t-out/popupShutter.txt
@@ -366,30 +366,43 @@ Timer tmSerial
                                        //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=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                        {
-                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page pageStartup
-                                            page popupLight
+                                        }
                                        if(tId.txt=="screensaver")
                                        {
                                            page screensaver
                                        }
                                        if(tId.txt=="cardEntities")
                                        {
                                            page cardEntities
                                        }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                        {
-                                            page cardMedia
+                                            page cardGrid
                                        }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                        {
-                                            page pageStartup
+                                            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=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                        {
-                                            page cardGrid
+                                            page cardThermo
                                        }
                                        if(tId.txt=="cardMedia")
                                        {
                                            page cardMedia
                                        }
                                        if(tId.txt=="cardAlarm")
                                        {
--- a/HMI/US/landscape/n2t-out/screensaver.txt
+++ b/HMI/US/landscape/n2t-out/screensaver.txt
@@ -48,26 +48,6 @@ Variable (int32) vaTap
        Scope: local
        Value: 0
 Text tInstruction
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Text                                : 
        Max. Text Size                      : 50
 Text tTmp
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Text                                : 
        Max. Text Size                      : 50
 Text tTime
    Attributes
        Scope                               : local
@@ -298,6 +278,26 @@ Text tMR
        Text                                : 
        Max. Text Size                      : 10
 Text tTmp
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Text                                : 
        Max. Text Size                      : 50
 Text tInstruction
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Text                                : 
        Max. Text Size                      : 50
 Picture p0
    Attributes
        Scope                               : local
@@ -400,9 +400,7 @@ Timer tmSerial
                                        vis tMRIcon,0
                                        vis tMR,0
                                        //tMainIcon
-                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        spstr strCommand.txt,tMainIcon.txt,"~",1
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1
                                        tMainIconAlt.txt=tMainIcon.txt
                                        //tMainText
                                        spstr strCommand.txt,tMainText.txt,"~",2
@@ -410,41 +408,31 @@ Timer tmSerial
                                        //tForecast1
                                        spstr strCommand.txt,tForecast1.txt,"~",3
                                        //tF1Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        spstr strCommand.txt,tF1Icon.txt,"~",4
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1
                                        //tForecast1Val
                                        spstr strCommand.txt,tForecast1Val.txt,"~",5
                                        //tForecast2
                                        spstr strCommand.txt,tForecast2.txt,"~",6
                                        //tF2Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",7
+                                        spstr strCommand.txt,tF2Icon.txt,"~",7
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1
                                        //tForecast2Val
                                        spstr strCommand.txt,tForecast2Val.txt,"~",8
                                        //tForecast3
                                        spstr strCommand.txt,tForecast3.txt,"~",9
                                        //tF3Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        spstr strCommand.txt,tF3Icon.txt,"~",10
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tF3Icon.txt,sys0,1
                                        //tForecast3Val
                                        spstr strCommand.txt,tForecast3Val.txt,"~",11
                                        //tForecast4
                                        spstr strCommand.txt,tForecast4.txt,"~",12
                                        //tF4Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",13
+                                        spstr strCommand.txt,tF4Icon.txt,"~",13
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1
                                        //tForecast4Val
                                        spstr strCommand.txt,tForecast4Val.txt,"~",14
                                        //alternative layout
                                        //tMRIcon
-                                        spstr strCommand.txt,tTmp.txt,"~",15
+                                        spstr strCommand.txt,tMRIcon.txt,"~",15
-                                        covx tTmp.txt,sys0,0,0
+                                        if(tMRIcon.txt!="")
                                        substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1
                                        if(tTmp.txt!="")
                                        {
                                            //value for tMRIcon, activate alternative layout
                                            vis tMainIcon,0
@@ -470,6 +458,77 @@ Timer tmSerial
                                        //tMR
                                        spstr strCommand.txt,tMR.txt,"~",16
                                    }
                                    if(tInstruction.txt=="color")
                                    {
                                        spstr strCommand.txt,tTmp.txt,"~",1
                                        covx tTmp.txt,tTime.bco,0,0
                                        screensaver.bco=tTime.bco
                                        tAMPM.bco=tTime.bco
                                        tDate.bco=tTime.bco
                                        tMainIcon.bco=tTime.bco
                                        tMainText.bco=tTime.bco
                                        tMainIconAlt.bco=tTime.bco
                                        tMainTextAlt.bco=tTime.bco
                                        tMRIcon.bco=tTime.bco
                                        tMR.bco=tTime.bco
                                        tMRIcon.bco=tTime.bco
                                        tForecast1.bco=tTime.bco
                                        tForecast1Val.bco=tTime.bco
                                        tF1Icon.bco=tTime.bco
                                        tForecast2.bco=tTime.bco
                                        tForecast2Val.bco=tTime.bco
                                        tF2Icon.bco=tTime.bco
                                        tForecast3.bco=tTime.bco
                                        tForecast3Val.bco=tTime.bco
                                        tF3Icon.bco=tTime.bco
                                        tForecast4.bco=tTime.bco
                                        tForecast4Val.bco=tTime.bco
                                        tF4Icon.bco=tTime.bco
                                        spstr strCommand.txt,tTmp.txt,"~",2
                                        covx tTmp.txt,tTime.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",3
                                        covx tTmp.txt,tAMPM.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",4
                                        covx tTmp.txt,tDate.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",5
                                        covx tTmp.txt,tMainIcon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",6
                                        covx tTmp.txt,tMainText.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",7
                                        covx tTmp.txt,tForecast1.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",8
                                        covx tTmp.txt,tForecast2.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",9
                                        covx tTmp.txt,tForecast3.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",10
                                        covx tTmp.txt,tForecast4.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",11
                                        covx tTmp.txt,tF1Icon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",12
                                        covx tTmp.txt,tF2Icon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",13
                                        covx tTmp.txt,tF3Icon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",14
                                        covx tTmp.txt,tF4Icon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",15
                                        covx tTmp.txt,tForecast1Val.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",16
                                        covx tTmp.txt,tForecast2Val.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",17
                                        covx tTmp.txt,tForecast3Val.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",18
                                        covx tTmp.txt,tForecast4Val.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",19
                                        covx tTmp.txt,t10.bco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",20
                                        covx tTmp.txt,tMainIconAlt.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",21
                                        covx tTmp.txt,tMainTextAlt.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",22
                                        covx tTmp.txt,tMRIcon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",23
                                        covx tTmp.txt,tMR.pco,0,0
                                    }
                                    if(tInstruction.txt=="pageType")
                                    {
                                        dim=100
--- a/HMI/US/landscape/nspanel_US_L.HMI
+++ b/HMI/US/landscape/nspanel_US_L.HMI
--- a/HMI/US/landscape/nspanel_US_L.tft
+++ b/HMI/US/landscape/nspanel_US_L.tft
--- a/HMI/US/portrait/diff-eu-version-known-good.txt
+++ b/HMI/US/portrait/diff-eu-version-known-good.txt
@@ -27,16 +27,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +            vis bText5,0
 +            vis hSlider5,0
 +            vis nNum5,0
-+            //ui e6
+
 +            vis btOnOff6,0
 +            vis bUp6,0
 +            vis bStop6,0
 +            vis bDown6,0
 +            vis tIcon6,0
 +            vis tEntity6,0
 +            vis bText6,0
 +            vis hSlider6,0
 +            vis nNum6,0
 Variable (string) strCommand
     Attributes
@@ -50,23 +41,12 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +        Text          : 
 +        Max. Text Size: 70
 +    
 +Variable (string) entn6
 +    Attributes
 +        Scope         : local
 +        Text          : 
 +        Max. Text Size: 70
 +    
 +Variable (string) type5
 +    Attributes
 +        Scope         : local
 +        Text          : 
 +        Max. Text Size: 10
 +    
 +Variable (string) type6
 +    Attributes
 +        Scope         : local
 +        Text          :  
 +        Max. Text Size: 10
 +    
 Number nNum1
     Attributes
@@ -84,15 +64,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +        Associated Keyboard                 : none
 +        Value                               : 0
 +    
-+Number nNum6
+ 
 +    Attributes
 +        Scope                               : local
 +        Dragging                            : 0
 +        Disable release event after dragging: 0
 +        Send Component ID                   : disabled
 +        Associated Keyboard                 : none
 +        Value                               : 0
 +    
 Text tHeading
     Attributes
         Scope                               : local
@@ -120,26 +92,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +        Text                                : î°
 +        Max. Text Size                      : 5
 +    
-+Text tEntity6
+  
 +    Attributes
 +        Scope                               : local
 +        Dragging                            : 0
 +        Disable release event after dragging: 0
 +        Send Component ID                   : disabled
 +        Associated Keyboard                 : none
 +        Text                                : tEntity6
 +        Max. Text Size                      : 30
 +    
 +Text tIcon6
 +    Attributes
 +        Scope                               : local
 +        Dragging                            : 0
 +        Disable release event after dragging: 0
 +        Send Component ID                   : disabled
 +        Associated Keyboard                 : none
 +        Text                                : î°
 +        Max. Text Size                      : 5
 +    
 Picture p0
     Attributes
         Scope                               : local
@@ -175,34 +128,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +            prints tSend.txt,0
 +            prints crcval,2
 +        
-+Slider hSlider6
+        
 +    Attributes
 +        Scope                               : local
 +        Dragging                            : 0
 +        Disable release event after dragging: 0
 +        Send Component ID                   : disabled
 +        Position                            : 50
 +        Upper range limit                   : 100
 +        Lower range limit                   : 0
 +    
 +    Events
 +        Touch Release Event
 +            nNum6.val=hSlider6.val
 +            tSend.txt="event,buttonPress2,"+entn6.txt+",number-set,"
 +            covx nNum6.val,tTmp.txt,0,0
 +            tSend.txt+=tTmp.txt
 +            //send calc crc
 +            btlen tSend.txt,sys0
 +            crcrest 1,0xffff // reset CRC
 +            crcputh 55 bb
 +            crcputs sys0,1
 +            crcputs tSend.txt,0
 +            //send cmd
 +            printh 55 bb
 +            prints sys0,2
 +            prints tSend.txt,0
 +            prints crcval,2
 +        
 Button bDown1
     Attributes
         Scope                               : local
@@ -310,106 +236,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +            prints tSend.txt,0
 +            prints crcval,2
 +        
-+Button bStop6
+       
 +    Attributes
 +        Scope                               : local
 +        Dragging                            : 0
 +        Disable release event after dragging: 0
 +        Send Component ID                   : disabled
 +        State                               : unpressed
 +        Text                                : î
 +        Max. Text Size                      : 10
 +    
 +    Events
 +        Touch Press Event
 +            tSend.txt="event,buttonPress2,"+entn6.txt+",stop"
 +            //send calc crc
 +            btlen tSend.txt,sys0
 +            crcrest 1,0xffff // reset CRC
 +            crcputh 55 bb
 +            crcputs sys0,1
 +            crcputs tSend.txt,0
 +            //send cmd
 +            printh 55 bb
 +            prints sys0,2
 +            prints tSend.txt,0
 +            prints crcval,2
 +        
 +Button bDown6
 +    Attributes
 +        Scope                               : local
 +        Dragging                            : 0
 +        Disable release event after dragging: 0
 +        Send Component ID                   : disabled
 +        State                               : unpressed
 +        Text                                : î
 +        Max. Text Size                      : 10
 +    
 +    Events
 +        Touch Press Event
 +            tSend.txt="event,buttonPress2,"+entn6.txt+",down"
 +            //send calc crc
 +            btlen tSend.txt,sys0
 +            crcrest 1,0xffff // reset CRC
 +            crcputh 55 bb
 +            crcputs sys0,1
 +            crcputs tSend.txt,0
 +            //send cmd
 +            printh 55 bb
 +            prints sys0,2
 +            prints tSend.txt,0
 +            prints crcval,2
 +        
 +Button bUp6
 +    Attributes
 +        Scope                               : local
 +        Dragging                            : 0
 +        Disable release event after dragging: 0
 +        Send Component ID                   : disabled
 +        State                               : unpressed
 +        Text                                : î
 +        Max. Text Size                      : 10
 +    
 +    Events
 +        Touch Press Event
 +            tSend.txt="event,buttonPress2,"+entn6.txt+",up"
 +            //send calc crc
 +            btlen tSend.txt,sys0
 +            crcrest 1,0xffff // reset CRC
 +            crcputh 55 bb
 +            crcputs sys0,1
 +            crcputs tSend.txt,0
 +            //send cmd
 +            printh 55 bb
 +            prints sys0,2
 +            prints tSend.txt,0
 +            prints crcval,2
 +        
 +Button bText6
 +    Attributes
 +        Scope                               : local
 +        Dragging                            : 0
 +        Disable release event after dragging: 0
 +        Send Component ID                   : disabled
 +        State                               : unpressed
 +        Text                                : newtxt
 +        Max. Text Size                      : 10
 +    
 +    Events
 +        Touch Press Event
 +            tSend.txt="event,buttonPress2,"+entn6.txt+",button"
 +            //send calc crc
 +            btlen tSend.txt,sys0
 +            crcrest 1,0xffff // reset CRC
 +            crcputh 55 bb
 +            crcputs sys0,1
 +            crcputs tSend.txt,0
 +            //send cmd
 +            printh 55 bb
 +            prints sys0,2
 +            prints tSend.txt,0
 +            prints crcval,2
 +        
 Dual-state Button btOnOff1
     Attributes
         Scope                               : local
@@ -444,33 +271,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +            prints tSend.txt,0
 +            prints crcval,2
 +        
-+Dual-state Button btOnOff6
+
 +    Attributes
 +        Scope                               : local
 +        Dragging                            : 0
 +        Disable release event after dragging: 0
 +        Send Component ID                   : disabled
 +        State                               : unpressed
 +        Text                                : 
 +        Max. Text Size                      : 10
 +    
 +    Events
 +        Touch Press Event
 +            tSend.txt="event,buttonPress2,"+entn6.txt+",OnOff,"
 +            covx btOnOff6.val,tTmp.txt,0,0
 +            tSend.txt+=tTmp.txt
 +            //send calc crc
 +            btlen tSend.txt,sys0
 +            crcrest 1,0xffff // reset CRC
 +            crcputh 55 bb
 +            crcputs sys0,1
 +            crcputs tSend.txt,0
 +            //send cmd
 +            printh 55 bb
 +            prints sys0,2
 +            prints tSend.txt,0
 +            prints crcval,2
 +        
 Hotspot mSpecial
     Attributes
         Scope                               : local
@@ -500,39 +301,18 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                page popupLight
 +            }
 +        
-+Hotspot m5
+
 +    Attributes
 +        Scope                               : local
 +        Dragging                            : 0
 +        Disable release event after dragging: 0
 +        Send Component ID                   : disabled
 +    
 +    Events
 +        Touch Press Event
 +            pageIcons.tTmp1.txt=tEntity6.txt
 +            pageIcons.tTmp2.txt=entn6.txt
 +            if(type6.txt=="shutter")
 +            {
 +                //popupShutter.tHeading.txt=tEntity6.txt
 +                page popupShutter
 +            }
 +            if(type6.txt=="light")
 +            {
 +                //popupLight.tEntity.txt=tEntity6.txt
 +                page popupLight
 +            }
 +        
 Timer tmSerial
     Attributes
         Scope      : local
-@@ -1648,6 +2104,254 @@
+@@ -1642,6 +2098,250 @@
                                             covx tTmp.txt,sys0,0,0
                                             hSlider4.maxval=sys0
                                         }
 +                                        // get Type
-+                                        spstr strCommand.txt,type5.txt,",",27
+                                        spstr strCommand.txt,type5.txt,"~",27
 +                                        // get internal name
-+                                        spstr strCommand.txt,entn5.txt,",",28
+                                        spstr strCommand.txt,entn5.txt,"~",28
 +                                        if(type5.txt=="delete"||type5.txt=="")
 +                                        {
 +                                            vis bUp5,0
@@ -547,16 +327,14 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                                        }else
 +                                        {
 +                                            // change icon
-+                                            spstr strCommand.txt,tTmp.txt,",",29
+                                            spstr strCommand.txt,tIcon5.txt,"~",29
 +                                            covx tTmp.txt,sys0,0,0
 +                                            substr pageIcons.tIcons.txt,tIcon5.txt,sys0,1
 +                                            vis tIcon5,1
 +                                            // change icon color
-+                                            spstr strCommand.txt,tTmp.txt,",",30
+                                            spstr strCommand.txt,tTmp.txt,"~",30
 +                                            covx tTmp.txt,sys0,0,0
 +                                            tIcon5.pco=sys0
 +                                            // set name
-+                                            spstr strCommand.txt,tEntity5.txt,",",31
+                                            spstr strCommand.txt,tEntity5.txt,"~",31
 +                                            vis tEntity5,1
 +                                        }
 +                                        if(type5.txt=="shutter")
@@ -579,7 +357,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                                            vis hSlider5,0
 +                                            vis nNum5,0
 +                                            // get Button State (optional Value)
-+                                            spstr strCommand.txt,tTmp.txt,",",32
+                                            spstr strCommand.txt,tTmp.txt,"~",32
 +                                            covx tTmp.txt,sys0,0,0
 +                                            btOnOff5.val=sys0
 +                                        }
@@ -593,7 +371,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                                            vis hSlider5,0
 +                                            vis nNum5,0
 +                                            // get Button State (optional Value)
-+                                            spstr strCommand.txt,tTmp.txt,",",32
+                                            spstr strCommand.txt,tTmp.txt,"~",32
 +                                            covx tTmp.txt,sys0,0,0
 +                                            btOnOff5.val=sys0
 +                                        }
@@ -610,7 +388,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                                            bText5.pco=65535
 +                                            bText5.pco2=65535
 +                                            // get Text (optional Value)
-+                                            spstr strCommand.txt,bText5.txt,",",32
+                                            spstr strCommand.txt,bText5.txt,"~",32
 +                                        }
 +                                        if(type5.txt=="button")
 +                                        {
@@ -625,7 +403,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                                            bText5.pco=1374
 +                                            bText5.pco2=1374
 +                                            // get Text (optional Value)
-+                                            spstr strCommand.txt,bText5.txt,",",32
+                                            spstr strCommand.txt,bText5.txt,"~",32
 +                                        }
 +                                        if(type5.txt=="number")
 +                                        {
@@ -638,7 +416,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                                            vis hSlider5,1
 +                                            vis nNum5,1
 +                                            // get config (optional Value) (use bText as variable)
-+                                            spstr strCommand.txt,bText5.txt,",",32
+                                            spstr strCommand.txt,bText5.txt,"~",32
 +                                            //first value is current value
 +                                            spstr bText5.txt,tTmp.txt,"|",0
 +                                            covx tTmp.txt,sys0,0,0
@@ -653,133 +431,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                                            covx tTmp.txt,sys0,0,0
 +                                            hSlider5.maxval=sys0
 +                                        }
-+                                        // get Type
+
 +                                        spstr strCommand.txt,type6.txt,",",33
 +                                        // get internal name
 +                                        spstr strCommand.txt,entn6.txt,",",34
 +                                        if(type6.txt=="delete"||type6.txt=="")
 +                                        {
 +                                            vis bUp6,0
 +                                            vis bStop6,0
 +                                            vis bDown6,0
 +                                            vis btOnOff6,0
 +                                            vis tEntity6,0
 +                                            vis tIcon6,0
 +                                            vis bText6,0
 +                                            vis hSlider6,0
 +                                            vis nNum6,0
 +                                        }else
 +                                        {
 +                                            // change icon
 +                                            spstr strCommand.txt,tTmp.txt,",",35
 +                                            covx tTmp.txt,sys0,0,0
 +                                            substr pageIcons.tIcons.txt,tIcon6.txt,sys0,1
 +                                            vis tIcon6,1
 +                                            // change icon color
 +                                            spstr strCommand.txt,tTmp.txt,",",36
 +                                            covx tTmp.txt,sys0,0,0
 +                                            tIcon6.pco=sys0
 +                                            // set name
 +                                            spstr strCommand.txt,tEntity6.txt,",",37
 +                                            vis tEntity6,1
 +                                        }
 +                                        if(type6.txt=="shutter")
 +                                        {
 +                                            vis bUp6,1
 +                                            vis bStop6,1
 +                                            vis bDown6,1
 +                                            vis btOnOff6,0
 +                                            vis bText6,0
 +                                            vis hSlider6,0
 +                                            vis nNum6,0
 +                                        }
 +                                        if(type6.txt=="light")
 +                                        {
 +                                            vis bUp6,0
 +                                            vis bStop6,0
 +                                            vis bDown6,0
 +                                            vis btOnOff6,1
 +                                            vis bText6,0
 +                                            vis hSlider6,0
 +                                            vis nNum6,0
 +                                            // get Button State (optional Value)
 +                                            spstr strCommand.txt,tTmp.txt,",",38
 +                                            covx tTmp.txt,sys0,0,0
 +                                            btOnOff6.val=sys0
 +                                        }
 +                                        if(type6.txt=="switch")
 +                                        {
 +                                            vis bUp6,0
 +                                            vis bStop6,0
 +                                            vis bDown6,0
 +                                            vis btOnOff6,1
 +                                            vis bText6,0
 +                                            vis hSlider6,0
 +                                            vis nNum6,0
 +                                            // get Button State (optional Value)
 +                                            spstr strCommand.txt,tTmp.txt,",",38
 +                                            covx tTmp.txt,sys0,0,0
 +                                            btOnOff6.val=sys0
 +                                        }
 +                                        if(type6.txt=="text")
 +                                        {
 +                                            vis bUp6,0
 +                                            vis bStop6,0
 +                                            vis bDown6,0
 +                                            vis btOnOff6,0
 +                                            vis bText6,1
 +                                            tsw bText6,0
 +                                            vis hSlider6,0
 +                                            vis nNum6,0
 +                                            bText6.pco=65535
 +                                            bText6.pco2=65535
 +                                            // get Text (optional Value)
 +                                            spstr strCommand.txt,bText6.txt,",",38
 +                                        }
 +                                        if(type6.txt=="button")
 +                                        {
 +                                            vis bUp6,0
 +                                            vis bStop6,0
 +                                            vis bDown6,0
 +                                            vis btOnOff6,0
 +                                            vis bText6,1
 +                                            tsw bText6,1
 +                                            vis hSlider6,0
 +                                            vis nNum6,0
 +                                            bText6.pco=1374
 +                                            bText6.pco2=1374
 +                                            // get Text (optional Value)
 +                                            spstr strCommand.txt,bText6.txt,",",38
 +                                        }
 +                                        if(type6.txt=="number")
 +                                        {
 +                                            vis bUp6,0
 +                                            vis bStop6,0
 +                                            vis bDown6,0
 +                                            vis btOnOff6,0
 +                                            vis bText6,0
 +                                            tsw bText6,0
 +                                            vis hSlider6,1
 +                                            vis nNum6,1
 +                                            // get config (optional Value) (use bText as variable)
 +                                            spstr strCommand.txt,bText6.txt,",",38
 +                                            //first value is current value
 +                                            spstr bText6.txt,tTmp.txt,"|",0
 +                                            covx tTmp.txt,sys0,0,0
 +                                            hSlider6.val=sys0
 +                                            nNum6.val=sys0
 +                                            //second value is min value
 +                                            spstr bText6.txt,tTmp.txt,"|",1
 +                                            covx tTmp.txt,sys0,0,0
 +                                            hSlider6.minval=sys0
 +                                            //third value is max value
 +                                            spstr bText6.txt,tTmp.txt,"|",2
 +                                            covx tTmp.txt,sys0,0,0
 +                                            hSlider6.maxval=sys0
 +                                        }
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
 --- HMI/n2t-out/pageStartup.txt	2022-04-01 04:54:12.884151859 +0000
 +++ HMI/US/portrait/n2t-out/pageStartup.txt	2022-04-01 04:54:13.372185922 +0000
--- 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-04-03 07:35:47.898571291 +0000
+--- HMI/n2t-out/Program.s.txt	2022-04-13 20:21:34.698226402 +0000
-+++ HMI/US/portrait/n2t-out/Program.s.txt	2022-04-03 07:35:48.266571453 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt	2022-04-13 20:21:35.070233972 +0000
@@ -11,6 +11,6 @@
     // dim value
     int dimValue=40
@@ -11,9 +11,9 @@ 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/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt	2022-04-03 07:35:47.902571293 +0000
+--- HMI/n2t-out/cardEntities.txt	2022-04-13 20:21:34.698226402 +0000
-+++ HMI/US/portrait/n2t-out/cardEntities.txt	2022-04-03 07:35:48.266571453 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt	2022-04-13 20:21:35.070233972 +0000
-@@ -62,6 +62,26 @@
+@@ -62,6 +62,16 @@
             vis bText4,0
             vis hSlider4,0
             vis nNum4,0
@@ -27,20 +27,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +            vis bText5,0
 +            vis hSlider5,0
 +            vis nNum5,0
 +            //ui e6
 +            vis btOnOff6,0
 +            vis bUp6,0
 +            vis bStop6,0
 +            vis bDown6,0
 +            vis tIcon6,0
 +            vis tEntity6,0
 +            vis bText6,0
 +            vis hSlider6,0
 +            vis nNum6,0
 Variable (string) strCommand
     Attributes
-@@ -117,6 +137,30 @@
+@@ -117,6 +127,18 @@
         Text          : 
         Max. Text Size: 70
@@ -50,28 +40,16 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +        Text          : 
 +        Max. Text Size: 70
 +    
 +Variable (string) entn6
 +    Attributes
 +        Scope         : local
 +        Text          : 
 +        Max. Text Size: 70
 +    
 +Variable (string) type5
 +    Attributes
 +        Scope         : local
 +        Text          : 
 +        Max. Text Size: 10
 +    
 +Variable (string) type6
 +    Attributes
 +        Scope         : local
 +        Text          :  
 +        Max. Text Size: 10
 +    
 Number nNum1
     Attributes
         Scope                               : local
-@@ -153,6 +197,24 @@
+@@ -153,6 +175,15 @@
         Associated Keyboard                 : none
         Value                               : 0
@@ -83,20 +61,11 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +        Send Component ID                   : disabled
 +        Associated Keyboard                 : none
 +        Value                               : 0
 +    
 +Number nNum6
 +    Attributes
 +        Scope                               : local
 +        Dragging                            : 0
 +        Disable release event after dragging: 0
 +        Send Component ID                   : disabled
 +        Associated Keyboard                 : none
 +        Value                               : 0
 +    
 Text tHeading
     Attributes
         Scope                               : local
-@@ -283,6 +345,46 @@
+@@ -283,6 +314,26 @@
         Text                                : 
         Max. Text Size                      : 50
@@ -119,31 +88,11 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +        Associated Keyboard                 : none
 +        Text                                : î°
 +        Max. Text Size                      : 5
 +    
 +Text tEntity6
 +    Attributes
 +        Scope                               : local
 +        Dragging                            : 0
 +        Disable release event after dragging: 0
 +        Send Component ID                   : disabled
 +        Associated Keyboard                 : none
 +        Text                                : tEntity6
 +        Max. Text Size                      : 30
 +    
 +Text tIcon6
 +    Attributes
 +        Scope                               : local
 +        Dragging                            : 0
 +        Disable release event after dragging: 0
 +        Send Component ID                   : disabled
 +        Associated Keyboard                 : none
 +        Text                                : î°
 +        Max. Text Size                      : 5
 +    
 Picture p0
     Attributes
         Scope                               : local
-@@ -402,6 +504,62 @@
+@@ -402,6 +453,34 @@
             prints tSend.txt,0
             prints crcval,2
@@ -174,39 +123,11 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +            prints sys0,2
 +            prints tSend.txt,0
 +            prints crcval,2
 +        
 +Slider hSlider6
 +    Attributes
 +        Scope                               : local
 +        Dragging                            : 0
 +        Disable release event after dragging: 0
 +        Send Component ID                   : disabled
 +        Position                            : 50
 +        Upper range limit                   : 100
 +        Lower range limit                   : 0
 +    
 +    Events
 +        Touch Release Event
 +            nNum6.val=hSlider6.val
 +            tSend.txt="event,buttonPress2,"+entn6.txt+",number-set,"
 +            covx nNum6.val,tTmp.txt,0,0
 +            tSend.txt+=tTmp.txt
 +            //send calc crc
 +            btlen tSend.txt,sys0
 +            crcrest 1,0xffff // reset CRC
 +            crcputh 55 bb
 +            crcputs sys0,1
 +            crcputs tSend.txt,0
 +            //send cmd
 +            printh 55 bb
 +            prints sys0,2
 +            prints tSend.txt,0
 +            prints crcval,2
 +        
 Button bDown1
     Attributes
         Scope                               : local
-@@ -859,6 +1017,206 @@
+@@ -859,6 +938,106 @@
             prints tSend.txt,0
             prints crcval,2
@@ -309,111 +230,11 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +            prints sys0,2
 +            prints tSend.txt,0
 +            prints crcval,2
 +        
 +Button bStop6
 +    Attributes
 +        Scope                               : local
 +        Dragging                            : 0
 +        Disable release event after dragging: 0
 +        Send Component ID                   : disabled
 +        State                               : unpressed
 +        Text                                : î
 +        Max. Text Size                      : 10
 +    
 +    Events
 +        Touch Press Event
 +            tSend.txt="event,buttonPress2,"+entn6.txt+",stop"
 +            //send calc crc
 +            btlen tSend.txt,sys0
 +            crcrest 1,0xffff // reset CRC
 +            crcputh 55 bb
 +            crcputs sys0,1
 +            crcputs tSend.txt,0
 +            //send cmd
 +            printh 55 bb
 +            prints sys0,2
 +            prints tSend.txt,0
 +            prints crcval,2
 +        
 +Button bDown6
 +    Attributes
 +        Scope                               : local
 +        Dragging                            : 0
 +        Disable release event after dragging: 0
 +        Send Component ID                   : disabled
 +        State                               : unpressed
 +        Text                                : î
 +        Max. Text Size                      : 10
 +    
 +    Events
 +        Touch Press Event
 +            tSend.txt="event,buttonPress2,"+entn6.txt+",down"
 +            //send calc crc
 +            btlen tSend.txt,sys0
 +            crcrest 1,0xffff // reset CRC
 +            crcputh 55 bb
 +            crcputs sys0,1
 +            crcputs tSend.txt,0
 +            //send cmd
 +            printh 55 bb
 +            prints sys0,2
 +            prints tSend.txt,0
 +            prints crcval,2
 +        
 +Button bUp6
 +    Attributes
 +        Scope                               : local
 +        Dragging                            : 0
 +        Disable release event after dragging: 0
 +        Send Component ID                   : disabled
 +        State                               : unpressed
 +        Text                                : î
 +        Max. Text Size                      : 10
 +    
 +    Events
 +        Touch Press Event
 +            tSend.txt="event,buttonPress2,"+entn6.txt+",up"
 +            //send calc crc
 +            btlen tSend.txt,sys0
 +            crcrest 1,0xffff // reset CRC
 +            crcputh 55 bb
 +            crcputs sys0,1
 +            crcputs tSend.txt,0
 +            //send cmd
 +            printh 55 bb
 +            prints sys0,2
 +            prints tSend.txt,0
 +            prints crcval,2
 +        
 +Button bText6
 +    Attributes
 +        Scope                               : local
 +        Dragging                            : 0
 +        Disable release event after dragging: 0
 +        Send Component ID                   : disabled
 +        State                               : unpressed
 +        Text                                : newtxt
 +        Max. Text Size                      : 10
 +    
 +    Events
 +        Touch Press Event
 +            tSend.txt="event,buttonPress2,"+entn6.txt+",button"
 +            //send calc crc
 +            btlen tSend.txt,sys0
 +            crcrest 1,0xffff // reset CRC
 +            crcputh 55 bb
 +            crcputs sys0,1
 +            crcputs tSend.txt,0
 +            //send cmd
 +            printh 55 bb
 +            prints sys0,2
 +            prints tSend.txt,0
 +            prints crcval,2
 +        
 Dual-state Button btOnOff1
     Attributes
         Scope                               : local
-@@ -967,6 +1325,60 @@
+@@ -967,6 +1146,33 @@
             prints tSend.txt,0
             prints crcval,2
@@ -443,38 +264,11 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +            prints sys0,2
 +            prints tSend.txt,0
 +            prints crcval,2
 +        
 +Dual-state Button btOnOff6
 +    Attributes
 +        Scope                               : local
 +        Dragging                            : 0
 +        Disable release event after dragging: 0
 +        Send Component ID                   : disabled
 +        State                               : unpressed
 +        Text                                : 
 +        Max. Text Size                      : 10
 +    
 +    Events
 +        Touch Press Event
 +            tSend.txt="event,buttonPress2,"+entn6.txt+",OnOff,"
 +            covx btOnOff6.val,tTmp.txt,0,0
 +            tSend.txt+=tTmp.txt
 +            //send calc crc
 +            btlen tSend.txt,sys0
 +            crcrest 1,0xffff // reset CRC
 +            crcputh 55 bb
 +            crcputs sys0,1
 +            crcputs tSend.txt,0
 +            //send cmd
 +            printh 55 bb
 +            prints sys0,2
 +            prints tSend.txt,0
 +            prints crcval,2
 +        
 Hotspot mSpecial
     Attributes
         Scope                               : local
-@@ -1072,6 +1484,50 @@
+@@ -1072,6 +1278,28 @@
                 page popupLight
             }
@@ -499,33 +293,11 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                //popupLight.tEntity.txt=tEntity5.txt
 +                page popupLight
 +            }
 +        
 +Hotspot m5
 +    Attributes
 +        Scope                               : local
 +        Dragging                            : 0
 +        Disable release event after dragging: 0
 +        Send Component ID                   : disabled
 +    
 +    Events
 +        Touch Press Event
 +            pageIcons.tTmp1.txt=tEntity6.txt
 +            pageIcons.tTmp2.txt=entn6.txt
 +            if(type6.txt=="shutter")
 +            {
 +                //popupShutter.tHeading.txt=tEntity6.txt
 +                page popupShutter
 +            }
 +            if(type6.txt=="light")
 +            {
 +                //popupLight.tEntity.txt=tEntity6.txt
 +                page popupLight
 +            }
 +        
 Timer tmSerial
     Attributes
         Scope      : local
-@@ -1650,6 +2106,254 @@
+@@ -1642,6 +1870,128 @@
                                             covx tTmp.txt,sys0,0,0
                                             hSlider4.maxval=sys0
                                         }
@@ -547,9 +319,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                                        }else
 +                                        {
 +                                            // change icon
-+                                            spstr strCommand.txt,tTmp.txt,"~",29
+                                            spstr strCommand.txt,tIcon5.txt,"~",29
 +                                            covx tTmp.txt,sys0,0,0
 +                                            substr pageIcons.tIcons.txt,tIcon5.txt,sys0,1
 +                                            vis tIcon5,1
 +                                            // change icon color
 +                                            spstr strCommand.txt,tTmp.txt,"~",30
@@ -652,137 +422,13 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                                            spstr bText5.txt,tTmp.txt,"|",2
 +                                            covx tTmp.txt,sys0,0,0
 +                                            hSlider5.maxval=sys0
 +                                        }
 +                                        // get Type
 +                                        spstr strCommand.txt,type6.txt,"~",33
 +                                        // get internal name
 +                                        spstr strCommand.txt,entn6.txt,"~",34
 +                                        if(type6.txt=="delete"||type6.txt=="")
 +                                        {
 +                                            vis bUp6,0
 +                                            vis bStop6,0
 +                                            vis bDown6,0
 +                                            vis btOnOff6,0
 +                                            vis tEntity6,0
 +                                            vis tIcon6,0
 +                                            vis bText6,0
 +                                            vis hSlider6,0
 +                                            vis nNum6,0
 +                                        }else
 +                                        {
 +                                            // change icon
 +                                            spstr strCommand.txt,tTmp.txt,"~",35
 +                                            covx tTmp.txt,sys0,0,0
 +                                            substr pageIcons.tIcons.txt,tIcon6.txt,sys0,1
 +                                            vis tIcon6,1
 +                                            // change icon color
 +                                            spstr strCommand.txt,tTmp.txt,"~",36
 +                                            covx tTmp.txt,sys0,0,0
 +                                            tIcon6.pco=sys0
 +                                            // set name
 +                                            spstr strCommand.txt,tEntity6.txt,"~",37
 +                                            vis tEntity6,1
 +                                        }
 +                                        if(type6.txt=="shutter")
 +                                        {
 +                                            vis bUp6,1
 +                                            vis bStop6,1
 +                                            vis bDown6,1
 +                                            vis btOnOff6,0
 +                                            vis bText6,0
 +                                            vis hSlider6,0
 +                                            vis nNum6,0
 +                                        }
 +                                        if(type6.txt=="light")
 +                                        {
 +                                            vis bUp6,0
 +                                            vis bStop6,0
 +                                            vis bDown6,0
 +                                            vis btOnOff6,1
 +                                            vis bText6,0
 +                                            vis hSlider6,0
 +                                            vis nNum6,0
 +                                            // get Button State (optional Value)
 +                                            spstr strCommand.txt,tTmp.txt,"~",38
 +                                            covx tTmp.txt,sys0,0,0
 +                                            btOnOff6.val=sys0
 +                                        }
 +                                        if(type6.txt=="switch")
 +                                        {
 +                                            vis bUp6,0
 +                                            vis bStop6,0
 +                                            vis bDown6,0
 +                                            vis btOnOff6,1
 +                                            vis bText6,0
 +                                            vis hSlider6,0
 +                                            vis nNum6,0
 +                                            // get Button State (optional Value)
 +                                            spstr strCommand.txt,tTmp.txt,"~",38
 +                                            covx tTmp.txt,sys0,0,0
 +                                            btOnOff6.val=sys0
 +                                        }
 +                                        if(type6.txt=="text")
 +                                        {
 +                                            vis bUp6,0
 +                                            vis bStop6,0
 +                                            vis bDown6,0
 +                                            vis btOnOff6,0
 +                                            vis bText6,1
 +                                            tsw bText6,0
 +                                            vis hSlider6,0
 +                                            vis nNum6,0
 +                                            bText6.pco=65535
 +                                            bText6.pco2=65535
 +                                            // get Text (optional Value)
 +                                            spstr strCommand.txt,bText6.txt,"~",38
 +                                        }
 +                                        if(type6.txt=="button")
 +                                        {
 +                                            vis bUp6,0
 +                                            vis bStop6,0
 +                                            vis bDown6,0
 +                                            vis btOnOff6,0
 +                                            vis bText6,1
 +                                            tsw bText6,1
 +                                            vis hSlider6,0
 +                                            vis nNum6,0
 +                                            bText6.pco=1374
 +                                            bText6.pco2=1374
 +                                            // get Text (optional Value)
 +                                            spstr strCommand.txt,bText6.txt,"~",38
 +                                        }
 +                                        if(type6.txt=="number")
 +                                        {
 +                                            vis bUp6,0
 +                                            vis bStop6,0
 +                                            vis bDown6,0
 +                                            vis btOnOff6,0
 +                                            vis bText6,0
 +                                            tsw bText6,0
 +                                            vis hSlider6,1
 +                                            vis nNum6,1
 +                                            // get config (optional Value) (use bText as variable)
 +                                            spstr strCommand.txt,bText6.txt,"~",38
 +                                            //first value is current value
 +                                            spstr bText6.txt,tTmp.txt,"|",0
 +                                            covx tTmp.txt,sys0,0,0
 +                                            hSlider6.val=sys0
 +                                            nNum6.val=sys0
 +                                            //second value is min value
 +                                            spstr bText6.txt,tTmp.txt,"|",1
 +                                            covx tTmp.txt,sys0,0,0
 +                                            hSlider6.minval=sys0
 +                                            //third value is max value
 +                                            spstr bText6.txt,tTmp.txt,"|",2
 +                                            covx tTmp.txt,sys0,0,0
 +                                            hSlider6.maxval=sys0
 +                                        }
                                     }
                                     if(tInstruction.txt=="pageType")
                                     {
 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt	2022-04-03 07:35:47.902571293 +0000
+--- HMI/n2t-out/pageStartup.txt	2022-04-13 20:21:34.698226402 +0000
-+++ HMI/US/portrait/n2t-out/pageStartup.txt	2022-04-03 07:35:48.266571453 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt	2022-04-13 20:21:35.070233972 +0000
@@ -142,7 +142,7 @@
         Disable release event after dragging: 0
         Send Component ID                   : disabled
--- a/HMI/US/portrait/diff-filtered.txt
+++ b/HMI/US/portrait/diff-filtered.txt
@@ -0,0 +1,19 @@
 +++ HMI/US/portrait/diff-eu-version.txt	2022-04-13 20:21:35.094234461 +0000
 +--- HMI/n2t-out/Program.s.txt	2022-04-13 20:21:34.698226402 +0000
 ++++ HMI/US/portrait/n2t-out/Program.s.txt	2022-04-13 20:21:35.070233972 +0000
 +--- HMI/n2t-out/cardEntities.txt	2022-04-13 20:21:34.698226402 +0000
 ++++ HMI/US/portrait/n2t-out/cardEntities.txt	2022-04-13 20:21:35.070233972 +0000
 +@@ -62,6 +62,16 @@
 +@@ -117,6 +127,18 @@
 +@@ -153,6 +175,15 @@
 +@@ -283,6 +314,26 @@
 +@@ -402,6 +453,34 @@
 +@@ -859,6 +938,106 @@
 +@@ -967,6 +1146,33 @@
 +@@ -1072,6 +1278,28 @@
 +@@ -1642,6 +1870,128 @@
 +                                     }
 +                                     if(tInstruction.txt=="pageType")
 +                                     {
 +--- HMI/n2t-out/pageStartup.txt	2022-04-13 20:21:34.698226402 +0000
 ++++ HMI/US/portrait/n2t-out/pageStartup.txt	2022-04-13 20:21:35.070233972 +0000
--- a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt
+++ b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt
@@ -199,7 +199,7 @@ Text tCode
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 0
+        Font ID                             : 2
        Back. Color                         : 10565
        Font Color                          : 40179
        Horizontal Alignment                : center
@@ -229,7 +229,7 @@ Text tIcon
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Font Color                          : 65535
        Horizontal Alignment                : center
@@ -275,7 +275,7 @@ Button bNext
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -322,7 +322,7 @@ Button bPrev
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -1073,7 +1073,7 @@ Timer tmSerial
                                        }
                                        if(tTmp.txt=="1")
                                        {
-                                            vis bPrev,1
+                                            vis bNext,1
                                            bNext.txt="î³"
                                        }
                                        //text arm1
@@ -1109,9 +1109,7 @@ Timer tmSerial
                                        //id arm4
                                        spstr strCommand.txt,va4.txt,"~",10
                                        //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",11
+                                        spstr strCommand.txt,tIcon.txt,"~",11
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
                                        //icon color
                                        spstr strCommand.txt,tTmp.txt,"~",12
                                        covx tTmp.txt,sys0,0,0
--- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt
+++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt
--- a/HMI/US/portrait/n2t-out-visual/cardGrid.txt
+++ b/HMI/US/portrait/n2t-out-visual/cardGrid.txt
@@ -152,7 +152,7 @@ Text tHeading
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
        Back. Color                         : 6371
        Font Color                          : 65535
        Horizontal Alignment                : center
@@ -498,7 +498,7 @@ Button bPrev
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -552,7 +552,7 @@ Button bNext
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -599,7 +599,7 @@ Button bEntity1
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -657,7 +657,7 @@ Button bEntity2
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -715,7 +715,7 @@ Button bEntity3
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -773,7 +773,7 @@ Button bEntity4
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -831,7 +831,7 @@ Button bEntity5
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -889,7 +889,7 @@ Button bEntity6
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -1036,7 +1036,7 @@ Timer tmSerial
                                        }
                                        if(tTmp.txt=="1")
                                        {
-                                            vis bPrev,1
+                                            vis bNext,1
                                            bNext.txt="î³"
                                        }
                                        // get Type
@@ -1050,9 +1050,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",5
+                                            spstr strCommand.txt,bEntity1.txt,"~",5
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1
                                            vis bEntity1,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",6
@@ -1073,9 +1071,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",11
+                                            spstr strCommand.txt,bEntity2.txt,"~",11
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1
                                            vis bEntity2,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",12
@@ -1096,9 +1092,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",17
+                                            spstr strCommand.txt,bEntity3.txt,"~",17
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1
                                            vis bEntity3,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",18
@@ -1119,9 +1113,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",23
+                                            spstr strCommand.txt,bEntity4.txt,"~",23
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1
                                            vis bEntity4,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",24
@@ -1142,9 +1134,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",29
+                                            spstr strCommand.txt,bEntity5.txt,"~",29
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1
                                            vis bEntity5,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",30
@@ -1165,9 +1155,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",35
+                                            spstr strCommand.txt,bEntity6.txt,"~",35
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1
                                            vis bEntity6,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",36
--- a/HMI/US/portrait/n2t-out-visual/cardMedia.txt
+++ b/HMI/US/portrait/n2t-out-visual/cardMedia.txt
@@ -193,7 +193,7 @@ Text tHeading
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
        Back. Color                         : 6371
        Font Color                          : 65535
        Horizontal Alignment                : center
@@ -283,7 +283,7 @@ Text t2
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Font Color                          : 50712
        Horizontal Alignment                : center
@@ -332,7 +332,7 @@ Text tPlayPause
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Font Color                          : 50712
        Horizontal Alignment                : center
@@ -381,7 +381,7 @@ Text t0
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Font Color                          : 50712
        Horizontal Alignment                : center
@@ -430,7 +430,7 @@ Text tIcon
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Font Color                          : 65535
        Horizontal Alignment                : center
@@ -460,7 +460,7 @@ Text t1
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Font Color                          : 50712
        Horizontal Alignment                : center
@@ -510,7 +510,7 @@ Text t3
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Font Color                          : 50712
        Horizontal Alignment                : center
@@ -560,7 +560,7 @@ Text t4
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Font Color                          : 50712
        Horizontal Alignment                : center
@@ -639,7 +639,7 @@ Text t6
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Font Color                          : 50712
        Horizontal Alignment                : center
@@ -681,7 +681,7 @@ Text t5
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Font Color                          : 50712
        Horizontal Alignment                : center
@@ -792,7 +792,7 @@ Button bNext
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -839,7 +839,7 @@ Button bPrev
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -956,15 +956,13 @@ Timer tmSerial
                                        }
                                        if(tTmp.txt=="1")
                                        {
-                                            vis bPrev,1
+                                            vis bNext,1
                                            bNext.txt="î³"
                                        }
                                        //entity name
                                        spstr strCommand.txt,entn.txt,"~",3
                                        //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        spstr strCommand.txt,tIcon.txt,"~",4
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
                                        //title
                                        spstr strCommand.txt,tTitle.txt,"~",5
                                        //author
@@ -974,9 +972,7 @@ Timer tmSerial
                                        covx tTmp.txt,sys0,0,0
                                        hVolume.val=sys0
                                        //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",8
+                                        spstr strCommand.txt,tPlayPause.txt,"~",8
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
                                        //speaker current
                                        spstr strCommand.txt,tSpeaker.txt,"~",9
                                        if(tSpeaker.txt!="")
--- a/HMI/US/portrait/n2t-out-visual/cardThermo.txt
+++ b/HMI/US/portrait/n2t-out-visual/cardThermo.txt
@@ -135,7 +135,7 @@ XFloat xTempCurr
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 3
+        Font ID                             : 4
        Back. Color                         : 6371
        Font Color                          : 65535
        Horizontal Alignment                : center
@@ -405,7 +405,7 @@ Text tHeading
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
        Back. Color                         : 6371
        Font Color                          : 65535
        Horizontal Alignment                : center
@@ -511,7 +511,7 @@ Button bNext
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -666,7 +666,7 @@ Button bPrev
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -1224,7 +1224,7 @@ Timer tmSerial
                                        }
                                        if(tTmp.txt=="1")
                                        {
-                                            vis bPrev,1
+                                            vis bNext,1
                                            bNext.txt="î³"
                                        }
                                        //entity name
@@ -1257,12 +1257,9 @@ Timer tmSerial
                                        vis bt7,0
                                        vis bt8,0
                                        //bt0
-                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        spstr strCommand.txt,bt0.txt,"~",10
-                                        if(tTmp.txt!="")
+                                        if(bt0.txt!="")
                                        {
                                            // set icon
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bt0.txt,sys0,1
                                            // set text color on active state
                                            spstr strCommand.txt,tTmp.txt,"~",11
                                            covx tTmp.txt,bt0.pco2,0,0
@@ -1273,232 +1270,216 @@ Timer tmSerial
                                            spstr strCommand.txt,va0.txt,"~",13
                                            //enable
                                            vis bt0,1
-                                            }              //bt1
+                                        }
-                                            spstr strCommand.txt,tTmp.txt,"~",14
+                                        //bt1
-                                            if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt1.txt,"~",14
-                                            {
+                                        if(bt1.txt!="")
-                                                // set icon
+                                        {
-                                                covx tTmp.txt,sys0,0,0
+                                            // set text color on active state
-                                                substr pageIcons.tIcons.txt,bt1.txt,sys0,1
+                                            spstr strCommand.txt,tTmp.txt,"~",15
-                                                // set text color on active state
+                                            covx tTmp.txt,bt1.pco2,0,0
-                                                spstr strCommand.txt,tTmp.txt,"~",15
+                                            // set state
-                                                covx tTmp.txt,bt1.pco2,0,0
+                                            spstr strCommand.txt,tTmp.txt,"~",16
-                                                // set state
+                                            covx tTmp.txt,bt1.val,0,0
-                                                spstr strCommand.txt,tTmp.txt,"~",16
+                                            // save action
-                                                covx tTmp.txt,bt1.val,0,0
+                                            spstr strCommand.txt,va1.txt,"~",17
-                                                // save action
+                                            //enable
-                                                spstr strCommand.txt,va1.txt,"~",17
+                                            vis bt1,1
-                                                //enable
+                                        }
-                                                vis bt1,1
+                                        //bt2
-                                                }              //bt2
+                                        spstr strCommand.txt,bt2.txt,"~",18
-                                                spstr strCommand.txt,tTmp.txt,"~",18
+                                        if(bt2.txt!="")
-                                                if(tTmp.txt!="")
+                                        {
-                                                {
+                                            // set text color on active state
-                                                    // set icon
+                                            spstr strCommand.txt,tTmp.txt,"~",19
-                                                    covx tTmp.txt,sys0,0,0
+                                            covx tTmp.txt,bt2.pco2,0,0
-                                                    substr pageIcons.tIcons.txt,bt2.txt,sys0,1
+                                            // set state
-                                                    // set text color on active state
+                                            spstr strCommand.txt,tTmp.txt,"~",20
-                                                    spstr strCommand.txt,tTmp.txt,"~",19
+                                            covx tTmp.txt,bt2.val,0,0
-                                                    covx tTmp.txt,bt2.pco2,0,0
+                                            // save action
-                                                    // set state
+                                            spstr strCommand.txt,va2.txt,"~",21
-                                                    spstr strCommand.txt,tTmp.txt,"~",20
+                                            //enable
-                                                    covx tTmp.txt,bt2.val,0,0
+                                            vis bt2,1
-                                                    // save action
+                                        }
-                                                    spstr strCommand.txt,va2.txt,"~",21
+                                        //bt3
-                                                    //enable
+                                        spstr strCommand.txt,bt3.txt,"~",22
-                                                    vis bt2,1
+                                        if(bt3.txt!="")
-                                                    }              //bt3
+                                        {
-                                                    spstr strCommand.txt,tTmp.txt,"~",22
+                                            // set text color on active state
-                                                    if(tTmp.txt!="")
+                                            spstr strCommand.txt,tTmp.txt,"~",23
-                                                    {
+                                            covx tTmp.txt,bt3.pco2,0,0
-                                                        // set icon
+                                            // set state
-                                                        covx tTmp.txt,sys0,0,0
+                                            spstr strCommand.txt,tTmp.txt,"~",24
-                                                        substr pageIcons.tIcons.txt,bt3.txt,sys0,1
+                                            covx tTmp.txt,bt3.val,0,0
-                                                        // set text color on active state
+                                            // save action
-                                                        spstr strCommand.txt,tTmp.txt,"~",23
+                                            spstr strCommand.txt,va3.txt,"~",25
-                                                        covx tTmp.txt,bt3.pco2,0,0
+                                            //enable
-                                                        // set state
+                                            vis bt3,1
-                                                        spstr strCommand.txt,tTmp.txt,"~",24
+                                        }
-                                                        covx tTmp.txt,bt3.val,0,0
+                                        //bt4
-                                                        // save action
+                                        spstr strCommand.txt,bt4.txt,"~",26
-                                                        spstr strCommand.txt,va3.txt,"~",25
+                                        if(bt4.txt!="")
-                                                        //enable
+                                        {
-                                                        vis bt3,1
+                                            // set text color on active state
-                                                        }              //bt4
+                                            spstr strCommand.txt,tTmp.txt,"~",27
-                                                        spstr strCommand.txt,tTmp.txt,"~",26
+                                            covx tTmp.txt,bt4.pco2,0,0
-                                                        if(tTmp.txt!="")
+                                            // set state
-                                                        {
+                                            spstr strCommand.txt,tTmp.txt,"~",28
-                                                            // set icon
+                                            covx tTmp.txt,bt4.val,0,0
-                                                            covx tTmp.txt,sys0,0,0
+                                            // save action
-                                                            substr pageIcons.tIcons.txt,bt4.txt,sys0,1
+                                            spstr strCommand.txt,va4.txt,"~",29
-                                                            // set text color on active state
+                                            //enable
-                                                            spstr strCommand.txt,tTmp.txt,"~",27
+                                            vis bt4,1
-                                                            covx tTmp.txt,bt4.pco2,0,0
+                                        }
-                                                            // set state
+                                        //bt5
-                                                            spstr strCommand.txt,tTmp.txt,"~",28
+                                        spstr strCommand.txt,bt5.txt,"~",30
-                                                            covx tTmp.txt,bt4.val,0,0
+                                        if(bt5.txt!="")
-                                                            // save action
+                                        {
-                                                            spstr strCommand.txt,va4.txt,"~",29
+                                            // set text color on active state
-                                                            //enable
+                                            spstr strCommand.txt,tTmp.txt,"~",31
-                                                            vis bt4,1
+                                            covx tTmp.txt,bt5.pco2,0,0
-                                                            }              //bt5
+                                            // set state
-                                                            spstr strCommand.txt,tTmp.txt,"~",30
+                                            spstr strCommand.txt,tTmp.txt,"~",32
-                                                            if(tTmp.txt!="")
+                                            covx tTmp.txt,bt5.val,0,0
-                                                            {
+                                            // save action
-                                                                // set icon
+                                            spstr strCommand.txt,va5.txt,"~",33
-                                                                covx tTmp.txt,sys0,0,0
+                                            //enable
-                                                                substr pageIcons.tIcons.txt,bt5.txt,sys0,1
+                                            vis bt5,1
-                                                                // set text color on active state
+                                        }
-                                                                spstr strCommand.txt,tTmp.txt,"~",31
+                                        //bt6
-                                                                covx tTmp.txt,bt5.pco2,0,0
+                                        spstr strCommand.txt,bt6.txt,"~",34
-                                                                // set state
+                                        if(bt6.txt!="")
-                                                                spstr strCommand.txt,tTmp.txt,"~",32
+                                        {
-                                                                covx tTmp.txt,bt5.val,0,0
+                                            // set text color on active state
-                                                                // save action
+                                            spstr strCommand.txt,tTmp.txt,"~",35
-                                                                spstr strCommand.txt,va5.txt,"~",33
+                                            covx tTmp.txt,bt6.pco2,0,0
-                                                                //enable
+                                            // set state
-                                                                vis bt5,1
+                                            spstr strCommand.txt,tTmp.txt,"~",36
-                                                                }              //bt6
+                                            covx tTmp.txt,bt6.val,0,0
-                                                                spstr strCommand.txt,tTmp.txt,"~",34
+                                            // save action
-                                                                if(tTmp.txt!="")
+                                            spstr strCommand.txt,va6.txt,"~",37
-                                                                {
+                                            //enable
-                                                                    // set icon
+                                            vis bt6,1
-                                                                    covx tTmp.txt,sys0,0,0
+                                        }
-                                                                    substr pageIcons.tIcons.txt,bt6.txt,sys0,1
+                                        //bt7
-                                                                    // set text color on active state
+                                        spstr strCommand.txt,bt7.txt,"~",38
-                                                                    spstr strCommand.txt,tTmp.txt,"~",35
+                                        if(bt7.txt!="")
-                                                                    covx tTmp.txt,bt6.pco2,0,0
+                                        {
-                                                                    // set state
+                                            // set text color on active state
-                                                                    spstr strCommand.txt,tTmp.txt,"~",36
+                                            spstr strCommand.txt,tTmp.txt,"~",39
-                                                                    covx tTmp.txt,bt6.val,0,0
+                                            covx tTmp.txt,bt7.pco2,0,0
-                                                                    // save action
+                                            // set state
-                                                                    spstr strCommand.txt,va6.txt,"~",37
+                                            spstr strCommand.txt,tTmp.txt,"~",40
-                                                                    //enable
+                                            covx tTmp.txt,bt7.val,0,0
-                                                                    vis bt6,1
+                                            // save action
-                                                                    }              //bt7
+                                            spstr strCommand.txt,va7.txt,"~",41
-                                                                    spstr strCommand.txt,tTmp.txt,"~",38
+                                            //enable
-                                                                    if(tTmp.txt!="")
+                                            vis bt7,1
-                                                                    {
+                                        }
-                                                                        // set icon
+                                        //bt8
-                                                                        covx tTmp.txt,sys0,0,0
+                                        spstr strCommand.txt,bt8.txt,"~",42
-                                                                        substr pageIcons.tIcons.txt,bt7.txt,sys0,1
+                                        if(bt8.txt!="")
-                                                                        // set text color on active state
+                                        {
-                                                                        spstr strCommand.txt,tTmp.txt,"~",39
+                                            // set text color on active state
-                                                                        covx tTmp.txt,bt7.pco2,0,0
+                                            spstr strCommand.txt,tTmp.txt,"~",43
-                                                                        // set state
+                                            covx tTmp.txt,bt8.pco2,0,0
-                                                                        spstr strCommand.txt,tTmp.txt,"~",40
+                                            // set state
-                                                                        covx tTmp.txt,bt7.val,0,0
+                                            spstr strCommand.txt,tTmp.txt,"~",44
-                                                                        // save action
+                                            covx tTmp.txt,bt8.val,0,0
-                                                                        spstr strCommand.txt,va7.txt,"~",41
+                                            // save action
-                                                                        //enable
+                                            spstr strCommand.txt,va8.txt,"~",45
-                                                                        vis bt7,1
+                                            //enable
-                                                                        }              //bt8
+                                            vis bt8,1
-                                                                        spstr strCommand.txt,tTmp.txt,"~",42
+                                        }
-                                                                        if(tTmp.txt!="")
+                                    }
-                                                                        {
+                                    if(tInstruction.txt=="pageType")
-                                                                            // set icon
+                                    {
-                                                                            covx tTmp.txt,sys0,0,0
+                                        //command format pageType,specialPageName
-                                                                            substr pageIcons.tIcons.txt,bt8.txt,sys0,1
+                                        //write name of speical page to tId
-                                                                            // set text color on active state
+                                        spstr strCommand.txt,tId.txt,"~",1
-                                                                            spstr strCommand.txt,tTmp.txt,"~",43
+                                        //save second arg if there's one
-                                                                            covx tTmp.txt,bt8.pco2,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",2
-                                                                            // set state
+                                        //save third arg if there's one
-                                                                            spstr strCommand.txt,tTmp.txt,"~",44
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
-                                                                            covx tTmp.txt,bt8.val,0,0
+                                        //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 ...
-                                                                            // save action
+                                        udelete payloadLength-1
-                                                                            spstr strCommand.txt,va8.txt,"~",45
+                                        bufferPos=0
-                                                                            //enable
+                                        if(tId.txt=="pageStartup")
-                                                                            vis bt8,1
+                                        {
-                                                                        }
+                                            page pageStartup
-                                                                    }
+                                        }
-                                                                    if(tInstruction.txt=="pageType")
+                                        if(tId.txt=="screensaver")
-                                                                    {
+                                        {
-                                                                        //command format pageType,specialPageName
+                                            page screensaver
-                                                                        //write name of speical page to tId
+                                        }
-                                                                        spstr strCommand.txt,tId.txt,"~",1
+                                        if(tId.txt=="cardEntities")
-                                                                        //save second arg if there's one
+                                        {
-                                                                        spstr strCommand.txt,tTmp.txt,"~",2
+                                            page cardEntities
-                                                                        //save third arg if there's one
+                                        }
-                                                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
+                                        if(tId.txt=="cardGrid")
-                                                                        //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
+                                            page cardGrid
-                                                                        bufferPos=0
+                                        }
-                                                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
-                                                                        {
+                                        {
-                                                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
-                                                                        }
+                                            page popupLight
-                                                                        if(tId.txt=="screensaver")
+                                        }
-                                                                        {
+                                        if(tId.txt=="popupShutter")
-                                                                            page screensaver
+                                        {
-                                                                        }
+                                            pageIcons.tTmp1.txt=tTmp.txt
-                                                                        if(tId.txt=="cardEntities")
+                                            page popupShutter
-                                                                        {
+                                        }
-                                                                            page cardEntities
+                                        if(tId.txt=="popupNotify")
-                                                                        }
+                                        {
-                                                                        if(tId.txt=="cardGrid")
+                                            page popupNotify
-                                                                        {
+                                        }
-                                                                            page cardGrid
+                                        if(tId.txt=="cardThermo")
-                                                                        }
+                                        {
-                                                                        if(tId.txt=="popupLight")
+                                            page cardThermo
-                                                                        {
+                                        }
-                                                                            pageIcons.tTmp1.txt=tTmp.txt
+                                        if(tId.txt=="cardMedia")
-                                                                            page popupLight
+                                        {
-                                                                        }
+                                            page cardMedia
-                                                                        if(tId.txt=="popupShutter")
+                                        }
-                                                                        {
+                                        if(tId.txt=="cardAlarm")
-                                                                            pageIcons.tTmp1.txt=tTmp.txt
+                                        {
-                                                                            page popupShutter
+                                            page cardAlarm
-                                                                        }
+                                        }
-                                                                        if(tId.txt=="popupNotify")
+                                    }
-                                                                        {
+                                    if(tInstruction.txt=="time")
-                                                                            page popupNotify
+                                    {
-                                                                        }
+                                        // get set time to global variable
-                                                                        if(tId.txt=="cardThermo")
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
-                                                                        {
+                                    }
-                                                                            page cardThermo
+                                    if(tInstruction.txt=="date")
-                                                                        }
+                                    {
-                                                                        if(tId.txt=="cardMedia")
+                                        // get set date to global variable
-                                                                        {
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
-                                                                            page cardMedia
+                                    }
-                                                                        }
+                                    if(tInstruction.txt=="dimmode")
-                                                                        if(tId.txt=="cardAlarm")
+                                    {
-                                                                        {
+                                        // get value
-                                                                            page cardAlarm
+                                        spstr strCommand.txt,tTmp.txt,"~",1
-                                                                        }
+                                        covx tTmp.txt,dimValue,0,0
-                                                                    }
+                                    }
-                                                                    if(tInstruction.txt=="time")
+                                    if(tInstruction.txt=="timeout")
-                                                                    {
+                                    {
-                                                                        // get set time to global variable
+                                        //set timeout to global var
-                                                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
-                                                                    }
+                                        covx tTmp.txt,sleepTimeout,0,0
-                                                                    if(tInstruction.txt=="date")
+                                    }
-                                                                    {
+                                    // end of user code
-                                                                        // get set date to global variable
+                                    udelete payloadLength-1
-                                                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+                                    bufferPos=0
-                                                                    }
+                                }
-                                                                    if(tInstruction.txt=="dimmode")
+                            }
-                                                                    {
+                        }
-                                                                        // get value
+                    }
-                                                                        spstr strCommand.txt,tTmp.txt,"~",1
+                    // next character
-                                                                        covx tTmp.txt,dimValue,0,0
+                    bufferPos++
-                                                                    }
+                }
-                                                                    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++
                                                }
                                            }
 Timer tmSleep
    Attributes
--- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
+++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
@@ -2,61 +2,57 @@ Program.s
 	0    Component(s)
 	10   Line(s) of event code
 	10   Unique line(s) of event code
 pageSerialTest
 	13   Component(s)
 	48   Line(s) of event code
 	43   Unique line(s) of event code
 pageIcons
 	7    Component(s)
 	0    Line(s) of event code
 	0    Unique line(s) of event code
 pageStartup
 	19   Component(s)
 	150  Line(s) of event code
 	113  Unique line(s) of event code
 popupNotify
 	17   Component(s)
 	178  Line(s) of event code
 	117  Unique line(s) of event code
 pageTest
 	13   Component(s)
 	13   Line(s) of event code
 	13   Unique line(s) of event code
-popupLight
+pageIcons
-	27   Component(s)
+	6    Component(s)
-	322  Line(s) of event code
+	0    Line(s) of event code
-	173  Unique line(s) of event code
+	0    Unique line(s) of event code
-screensaver
+popupNotify
-	33   Component(s)
+	17   Component(s)
-	207  Line(s) of event code
+	196  Line(s) of event code
-	158  Unique line(s) of event code
+	123  Unique line(s) of event code
 cardMedia
 	30   Component(s)
 	333  Line(s) of event code
 	170  Unique line(s) of event code
 popupShutter
 	19   Component(s)
-	178  Line(s) of event code
+	191  Line(s) of event code
-	101  Unique line(s) of event code
+	107  Unique line(s) of event code
 pageStartup
 	19   Component(s)
 	150  Line(s) of event code
 	113  Unique line(s) of event code
 popupLight
 	27   Component(s)
 	338  Line(s) of event code
 	182  Unique line(s) of event code
 screensaver
 	33   Component(s)
 	266  Line(s) of event code
 	218  Unique line(s) of event code
 cardMedia
 	30   Component(s)
 	329  Line(s) of event code
 	169  Unique line(s) of event code
 cardAlarm
 	35   Component(s)
-	345  Line(s) of event code
+	343  Line(s) of event code
 	214  Unique line(s) of event code
 cardGrid
 	39   Component(s)
-	430  Line(s) of event code
+	418  Line(s) of event code
-	249  Unique line(s) of event code
+	244  Unique line(s) of event code
 cardThermo
 	41   Component(s)
-	460  Line(s) of event code
+	442  Line(s) of event code
-	284  Unique line(s) of event code
+	247  Unique line(s) of event code
 cardEntities
-	86   Component(s)
+	74   Component(s)
-	1362 Line(s) of event code
+	1157 Line(s) of event code
-	553  Unique line(s) of event code
+	479  Unique line(s) of event code
 Total
-	13   Page(s)
+	12   Page(s)
-	379  Component(s)
+	353  Component(s)
-	4036 Line(s) of event code
+	3853 Line(s) of event code
-	1153 Unique line(s) of event code
+	1057 Unique line(s) of event code
--- a/HMI/US/portrait/n2t-out-visual/pageIcons.txt
+++ b/HMI/US/portrait/n2t-out-visual/pageIcons.txt
@@ -20,51 +20,21 @@ Page pageIcons
 Variable (string) vaTime
    Attributes
-        ID            : 5
+        ID            : 4
        Scope         : global
        Text          : 
        Max. Text Size: 15
 Variable (string) vaDate
    Attributes
-        ID            : 6
+        ID            : 5
        Scope         : global
        Text          :  
        Max. Text Size: 35
 Text tIcons
    Attributes
        ID                                  : 2
        Scope                               : global
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 15
        y coordinate                        : 161
        Width                               : 295
        Height                              : 285
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 1
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : left
        Vertical Alignment                  : top
        Input Type                          : character
        Text                                : îî´îï§îîî îî£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîî©±ï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾î¶îïîî¸î¸
        Max. Text Size                      : 170
        Word wrap                           : enabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Text tTmp1
    Attributes
-        ID                                  : 3
+        ID                                  : 2
        Scope                               : global
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -94,7 +64,7 @@ Text tTmp1
 Text tTmp2
    Attributes
-        ID                                  : 4
+        ID                                  : 3
        Scope                               : global
        Dragging                            : 0
        Disable release event after dragging: 0
--- a/HMI/US/portrait/n2t-out-visual/pageSerialTest.txt
+++ b/HMI/US/portrait/n2t-out-visual/pageSerialTest.txt
@@ -1,434 +0,0 @@
 Page pageSerialTest
    Attributes
        ID                                  : 0
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        Width                               : 320
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Locked                              : no
        Swide up page ID                    : disabled
        Swide down page ID                  : disabled
        Swide left page ID                  : disabled
        Swide right page ID                 : disabled
        Fill                                : solid color
        Back. Color                         : 65535
    Events
        Preinitialize Event
            //vis p0,0
            //recmod=1
            //bauds=115200
 Number nCrcRecv
    Attributes
        ID                                  : 5
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 5
        y coordinate                        : 205
        Width                               : 88
        Height                              : 29
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 4
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Value                               : 0
        Significant digits shown            : all
        Format                              : decimal with digit grouping
        Word wrap                           : enabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Number nCrcCalc
    Attributes
        ID                                  : 6
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 4
        y coordinate                        : 236
        Width                               : 90
        Height                              : 30
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 4
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Value                               : 0
        Significant digits shown            : all
        Format                              : decimal with digit grouping
        Word wrap                           : enabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Number nIt
    Attributes
        ID                                  : 11
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 181
        y coordinate                        : 168
        Width                               : 52
        Height                              : 30
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 4
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Value                               : 0
        Significant digits shown            : all
        Format                              : decimal
        Word wrap                           : enabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Number nLength
    Attributes
        ID                                  : 12
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 181
        y coordinate                        : 78
        Width                               : 100
        Height                              : 30
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 0
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Value                               : 0
        Significant digits shown            : all
        Format                              : decimal
        Word wrap                           : enabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Text tStatus
    Attributes
        ID                                  : 3
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 5
        y coordinate                        : 267
        Width                               : 271
        Height                              : 90
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 4
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
        Text                                : newtxt
        Max. Text Size                      : 100
        Word wrap                           : enabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Text tCmd
    Attributes
        ID                                  : 4
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 5
        y coordinate                        : 358
        Width                               : 272
        Height                              : 80
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 4
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
        Text                                : newtxt
        Max. Text Size                      : 500
        Word wrap                           : enabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Text tBuffer
    Attributes
        ID                                  : 7
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 5
        y coordinate                        : 443
        Width                               : 310
        Height                              : 30
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 4
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
        Text                                : newtxt
        Max. Text Size                      : 100
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Text tDesc
    Attributes
        ID                                  : 8
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 0
        y coordinate                        : 0
        Width                               : 159
        Height                              : 204
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 4
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
        Text                                : CRC Recv:\r\nCRC Calc:\r\n\r\nStatus\r\n\r\nCommand
        Max. Text Size                      : 60
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Picture p0
    Attributes
        ID                                  : 1
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 0
        y coordinate                        : 0
        Width                               : 319
        Height                              : 479
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Picture ID                          : 0
 Button b0
    Attributes
        ID                                  : 9
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 181
        y coordinate                        : 9
        Width                               : 46
        Height                              : 46
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
        Font ID                             : 4
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 0
        Back. Color (Pressed)               : 1024
        Font Color (Unpressed)              : 0
        Font Color (Pressed)                : 65535
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        State                               : unpressed
        Text                                : bck
        Max. Text Size                      : 10
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
    Events
        Touch Press Event
            recmod=0
            page pageTest
 Button b1
    Attributes
        ID                                  : 10
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 249
        y coordinate                        : 9
        Width                               : 48
        Height                              : 48
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
        Font ID                             : 4
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 0
        Back. Color (Pressed)               : 1024
        Font Color (Unpressed)              : 0
        Font Color (Pressed)                : 65535
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        State                               : unpressed
        Text                                : ON
        Max. Text Size                      : 10
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
    Events
        Touch Press Event
            recmod=1
            bauds=115200
 Timer tmSerial
    Attributes
        ID         : 2
        Scope      : local
        Period (ms): 400
        Enabled    : yes
    Events
        Timer Event
            // 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
                        }
                        tStatus.txt="init command detected"
                        //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
                            //payloadLength=u[2]
                            ucopy payloadLength,2,2,0
                            nLength.val=payloadLength
                            // 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)
                            {
                                tStatus.txt="reached"
                                // calculate crc
                                crcrest 1,0xFFFF
                                // payload length -1 to exclude crc
                                crcputu 0,payloadLength-1 //u[2]+3
                                // get recived crc to be able to compare it
                                ucopy recvCrc,payloadLength-1,2,0
                                nCrcRecv.val=recvCrc
                                // compare crc with recived value
                                if(crcval==recvCrc)
                                {
                                    tStatus.txt="crc ok"
                                    nIt.val=nIt.val+1
                                    ucopy tCmd.txt,4,payloadLength-5,0
                                    udelete payloadLength-1
                                    bufferPos=0
                                    // here is the location where acual code should be
                                }
                                // copy calculated crc and recived crc to nCrcRecv and nCrcCalc, for debugging
                                nCrcRecv.val=recvCrc
                                nCrcCalc.val=crcval
                                //ucopy nCrcCalc.val,u[2]+3,3,0
                            }
                        }
                    }
                    // next character
                    bufferPos++
                }
                if(bufferPos==usize)
                {
                    // copy whole buffer to tCmd.txt, for debugging
                    //ucopy tBuffer.txt,0,usize,0
                    // ucopy nIt.val,0,usize,0
                    // clear whole buffer
                    //code_c
                    //bufferPos=0
                }
            }
--- a/HMI/US/portrait/n2t-out-visual/pageStartup.txt
+++ b/HMI/US/portrait/n2t-out-visual/pageStartup.txt
@@ -402,7 +402,7 @@ Text tVersion
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
-        Text                                : 28
+        Text                                : 31
        Max. Text Size                      : 10
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
--- a/HMI/US/portrait/n2t-out-visual/pageTest.txt
+++ b/HMI/US/portrait/n2t-out-visual/pageTest.txt
@@ -56,7 +56,7 @@ Button b0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 3
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 1024
@@ -75,7 +75,7 @@ Button b0
        Touch Press Event
            page cardEntities
-Button b1
+Button b3
    Attributes
        ID                                  : 3
        Scope                               : local
@@ -83,8 +83,8 @@ Button b1
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
-        x coordinate                        : 190
+        x coordinate                        : 39
-        y coordinate                        : 380
+        y coordinate                        : 395
        Width                               : 100
        Height                              : 50
        Effect                              : load
@@ -92,43 +92,7 @@ Button b1
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 3
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 1024
        Font Color (Unpressed)              : 0
        Font Color (Pressed)                : 65535
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        State                               : unpressed
        Text                                : serial
        Max. Text Size                      : 10
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
    Events
        Touch Press Event
            page pageSerialTest
 Button b3
    Attributes
        ID                                  : 4
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 35
        y coordinate                        : 380
        Width                               : 100
        Height                              : 50
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
        Font ID                             : 4
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 0
        Back. Color (Pressed)               : 1024
@@ -149,7 +113,7 @@ Button b3
 Button b6
    Attributes
-        ID                                  : 5
+        ID                                  : 4
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -164,7 +128,7 @@ Button b6
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 3
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 1024
@@ -185,7 +149,7 @@ Button b6
 Button b4
    Attributes
-        ID                                  : 6
+        ID                                  : 5
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -200,7 +164,7 @@ Button b4
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 3
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 1024
@@ -221,7 +185,7 @@ Button b4
 Button b5
    Attributes
-        ID                                  : 7
+        ID                                  : 6
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -236,7 +200,7 @@ Button b5
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 3
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 1024
@@ -257,7 +221,7 @@ Button b5
 Button b7
    Attributes
-        ID                                  : 8
+        ID                                  : 7
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -272,7 +236,7 @@ Button b7
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 3
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 1024
@@ -293,7 +257,7 @@ Button b7
 Button b8
    Attributes
-        ID                                  : 9
+        ID                                  : 8
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -308,7 +272,7 @@ Button b8
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 3
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 1024
@@ -330,7 +294,7 @@ Button b8
 Button b9
    Attributes
-        ID                                  : 10
+        ID                                  : 9
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -345,7 +309,7 @@ Button b9
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 3
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 1024
@@ -366,7 +330,7 @@ Button b9
 Button b10
    Attributes
-        ID                                  : 11
+        ID                                  : 10
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -381,7 +345,7 @@ Button b10
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 3
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 1024
@@ -402,7 +366,7 @@ Button b10
 Button b11
    Attributes
-        ID                                  : 12
+        ID                                  : 11
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -417,7 +381,7 @@ Button b11
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 3
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 1024
@@ -436,3 +400,39 @@ Button b11
        Touch Press Event
            page cardGrid
 Button b1
    Attributes
        ID                                  : 12
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 175
        y coordinate                        : 402
        Width                               : 100
        Height                              : 50
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
        Font ID                             : 3
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 0
        Back. Color (Pressed)               : 1024
        Font Color (Unpressed)              : 0
        Font Color (Pressed)                : 65535
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        State                               : unpressed
        Text                                : bauds=115200
        Max. Text Size                      : 20
        Word wrap                           : enabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
    Events
        Touch Press Event
            bauds=115200
--- a/HMI/US/portrait/n2t-out-visual/popupLight.txt
+++ b/HMI/US/portrait/n2t-out-visual/popupLight.txt
@@ -788,9 +788,7 @@ Timer tmSerial
                                    if(tInstruction.txt=="entityUpdateDetail")
                                    {
                                        // change icon
-                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        spstr strCommand.txt,tIcon1.txt,"~",1
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
                                        vis tIcon1,1
                                        // change icon color
                                        spstr strCommand.txt,tTmp.txt,"~",2
@@ -918,25 +916,43 @@ Timer tmSerial
                                        //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=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                        {
-                                            page cardMedia
+                                            page cardGrid
                                        }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                        {
-                                            page pageStartup
+                                            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=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                        {
-                                            page cardGrid
+                                            page cardThermo
                                        }
                                        if(tId.txt=="cardMedia")
                                        {
                                            page cardMedia
                                        }
                                        if(tId.txt=="cardAlarm")
                                        {
--- a/HMI/US/portrait/n2t-out-visual/popupNotify.txt
+++ b/HMI/US/portrait/n2t-out-visual/popupNotify.txt
@@ -184,7 +184,7 @@ Text tHeading
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
        Back. Color                         : 6371
        Font Color                          : 65535
        Horizontal Alignment                : left
@@ -308,7 +308,7 @@ Button b2
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 1
+        Font ID                             : 2
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 9
        Back. Color (Pressed)               : 1024
@@ -357,7 +357,7 @@ Button b1
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 1
+        Font ID                             : 2
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 9
        Back. Color (Pressed)               : 1024
@@ -548,25 +548,43 @@ Timer tmSerial
                                            pageIcons.tTmp1.txt=tTmp.txt
                                            page popupLight
                                        }
                                        if(tId.txt=="pageStartup")
                                        {
                                            page pageStartup
                                        }
                                        if(tId.txt=="screensaver")
                                        {
                                            page screensaver
                                        }
                                        if(tId.txt=="cardEntities")
                                        {
                                            page cardEntities
                                        }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                        {
-                                            page cardMedia
+                                            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=="pageStartup")
+                                        if(tId.txt=="cardMedia")
                                        {
-                                            page pageStartup
+                                            page cardMedia
                                        }
                                        if(tId.txt=="cardGrid")
                                        {
                                            page cardGrid
                                        }
                                        if(tId.txt=="cardAlarm")
                                        {
--- a/HMI/US/portrait/n2t-out-visual/popupShutter.txt
+++ b/HMI/US/portrait/n2t-out-visual/popupShutter.txt
@@ -631,30 +631,43 @@ Timer tmSerial
                                        //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=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                        {
-                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page pageStartup
-                                            page popupLight
+                                        }
                                        if(tId.txt=="screensaver")
                                        {
                                            page screensaver
                                        }
                                        if(tId.txt=="cardEntities")
                                        {
                                            page cardEntities
                                        }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                        {
-                                            page cardMedia
+                                            page cardGrid
                                        }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                        {
-                                            page pageStartup
+                                            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=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                        {
-                                            page cardGrid
+                                            page cardThermo
                                        }
                                        if(tId.txt=="cardMedia")
                                        {
                                            page cardMedia
                                        }
                                        if(tId.txt=="cardAlarm")
                                        {
--- a/HMI/US/portrait/n2t-out-visual/screensaver.txt
+++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt
@@ -48,80 +48,34 @@ Variable (string) strCommand
 Variable (string) tId
    Attributes
-        ID            : 19
+        ID            : 17
        Scope         : local
        Text          : 
        Max. Text Size: 25
 Variable (int32) vaTap
    Attributes
-        ID   : 27
+        ID   : 25
        Scope: local
        Value: 0
-Text tInstruction
+Variable (string) tInstruction
    Attributes
-        ID                                  : 5
+        ID            : 31
-        Scope                               : local
+        Scope         : local
-        Dragging                            : 0
+        Text          : 
-        Disable release event after dragging: 0
+        Max. Text Size: 50
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 260
        y coordinate                        : 446
        Width                               : 26
        Height                              : 30
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 0
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
        Text                                : 
        Max. Text Size                      : 50
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
-Text tTmp
+Variable (string) tTmp
    Attributes
-        ID                                  : 6
+        ID            : 32
-        Scope                               : local
+        Scope         : local
-        Dragging                            : 0
+        Text          : 
-        Disable release event after dragging: 0
+        Max. Text Size: 50
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 293
        y coordinate                        : 447
        Width                               : 25
        Height                              : 30
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 0
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
        Text                                : 
        Max. Text Size                      : 50
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Text tTime
    Attributes
-        ID                                  : 7
+        ID                                  : 5
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -151,7 +105,7 @@ Text tTime
 Text tDate
    Attributes
-        ID                                  : 8
+        ID                                  : 6
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -181,7 +135,7 @@ Text tDate
 Text tSend
    Attributes
-        ID                                  : 9
+        ID                                  : 7
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -211,7 +165,7 @@ Text tSend
 Text tMainIcon
    Attributes
-        ID                                  : 10
+        ID                                  : 8
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -227,6 +181,36 @@ Text tMainIcon
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 4
        Back. Color                         : 0
        Font Color                          : 65535
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
        Text                                : 
        Max. Text Size                      : 10
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Text tMainText
    Attributes
        ID                                  : 9
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 111
        y coordinate                        : 305
        Width                               : 110
        Height                              : 42
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 3
        Back. Color                         : 0
        Font Color                          : 65535
@@ -239,39 +223,9 @@ Text tMainIcon
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Text tMainText
    Attributes
        ID                                  : 11
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 111
        y coordinate                        : 305
        Width                               : 110
        Height                              : 42
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 2
        Back. Color                         : 0
        Font Color                          : 65535
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
        Text                                : 
        Max. Text Size                      : 10
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Text tForecast1
    Attributes
-        ID                                  : 12
+        ID                                  : 10
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -301,7 +255,7 @@ Text tForecast1
 Text tForecast1Val
    Attributes
-        ID                                  : 13
+        ID                                  : 11
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -331,7 +285,7 @@ Text tForecast1Val
 Text tF1Icon
    Attributes
-        ID                                  : 14
+        ID                                  : 12
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -361,7 +315,7 @@ Text tF1Icon
 Text tForecast2
    Attributes
-        ID                                  : 15
+        ID                                  : 13
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -391,7 +345,7 @@ Text tForecast2
 Text tF2Icon
    Attributes
-        ID                                  : 16
+        ID                                  : 14
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -421,7 +375,7 @@ Text tF2Icon
 Text tForecast2Val
    Attributes
-        ID                                  : 17
+        ID                                  : 15
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -451,7 +405,7 @@ Text tForecast2Val
 Text t10
    Attributes
-        ID                                  : 18
+        ID                                  : 16
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -481,7 +435,7 @@ Text t10
 Text tAMPM
    Attributes
-        ID                                  : 20
+        ID                                  : 18
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -497,7 +451,7 @@ Text tAMPM
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 3
+        Font ID                             : 4
        Back. Color                         : 0
        Font Color                          : 65535
        Horizontal Alignment                : center
@@ -511,7 +465,7 @@ Text tAMPM
 Text tForecast3Val
    Attributes
-        ID                                  : 21
+        ID                                  : 19
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -541,7 +495,7 @@ Text tForecast3Val
 Text tF3Icon
    Attributes
-        ID                                  : 22
+        ID                                  : 20
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -571,7 +525,7 @@ Text tF3Icon
 Text tForecast3
    Attributes
-        ID                                  : 23
+        ID                                  : 21
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -601,7 +555,7 @@ Text tForecast3
 Text tForecast4
    Attributes
-        ID                                  : 24
+        ID                                  : 22
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -631,7 +585,7 @@ Text tForecast4
 Text tF4Icon
    Attributes
-        ID                                  : 25
+        ID                                  : 23
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -661,7 +615,7 @@ Text tF4Icon
 Text tForecast4Val
    Attributes
-        ID                                  : 26
+        ID                                  : 24
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -691,7 +645,7 @@ Text tForecast4Val
 Text tMainTextAlt
    Attributes
-        ID                                  : 29
+        ID                                  : 27
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -707,7 +661,7 @@ Text tMainTextAlt
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 0
        Font Color                          : 65535
        Horizontal Alignment                : left
@@ -721,7 +675,7 @@ Text tMainTextAlt
 Text tMainIconAlt
    Attributes
-        ID                                  : 30
+        ID                                  : 28
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -737,7 +691,7 @@ Text tMainIconAlt
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 3
+        Font ID                             : 4
        Back. Color                         : 0
        Font Color                          : 65535
        Horizontal Alignment                : center
@@ -751,7 +705,7 @@ Text tMainIconAlt
 Text tMRIcon
    Attributes
-        ID                                  : 31
+        ID                                  : 29
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -781,7 +735,7 @@ Text tMRIcon
 Text tMR
    Attributes
-        ID                                  : 32
+        ID                                  : 30
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -922,9 +876,7 @@ Timer tmSerial
                                        vis tMRIcon,0
                                        vis tMR,0
                                        //tMainIcon
-                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        spstr strCommand.txt,tMainIcon.txt,"~",1
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1
                                        tMainIconAlt.txt=tMainIcon.txt
                                        //tMainText
                                        spstr strCommand.txt,tMainText.txt,"~",2
@@ -932,41 +884,31 @@ Timer tmSerial
                                        //tForecast1
                                        spstr strCommand.txt,tForecast1.txt,"~",3
                                        //tF1Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        spstr strCommand.txt,tF1Icon.txt,"~",4
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1
                                        //tForecast1Val
                                        spstr strCommand.txt,tForecast1Val.txt,"~",5
                                        //tForecast2
                                        spstr strCommand.txt,tForecast2.txt,"~",6
                                        //tF2Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",7
+                                        spstr strCommand.txt,tF2Icon.txt,"~",7
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1
                                        //tForecast2Val
                                        spstr strCommand.txt,tForecast2Val.txt,"~",8
                                        //tForecast3
                                        spstr strCommand.txt,tForecast3.txt,"~",9
                                        //tF3Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        spstr strCommand.txt,tF3Icon.txt,"~",10
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tF3Icon.txt,sys0,1
                                        //tForecast3Val
                                        spstr strCommand.txt,tForecast3Val.txt,"~",11
                                        //tForecast4
                                        spstr strCommand.txt,tForecast4.txt,"~",12
                                        //tF4Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",13
+                                        spstr strCommand.txt,tF4Icon.txt,"~",13
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1
                                        //tForecast4Val
                                        spstr strCommand.txt,tForecast4Val.txt,"~",14
                                        //alternative layout
                                        //tMRIcon
-                                        spstr strCommand.txt,tTmp.txt,"~",15
+                                        spstr strCommand.txt,tMRIcon.txt,"~",15
-                                        covx tTmp.txt,sys0,0,0
+                                        if(tMRIcon.txt!="")
                                        substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1
                                        if(tTmp.txt!="")
                                        {
                                            //value for tMRIcon, activate alternative layout
                                            vis tMainIcon,0
@@ -992,6 +934,77 @@ Timer tmSerial
                                        //tMR
                                        spstr strCommand.txt,tMR.txt,"~",16
                                    }
                                    if(tInstruction.txt=="color")
                                    {
                                        spstr strCommand.txt,tTmp.txt,"~",1
                                        covx tTmp.txt,tTime.bco,0,0
                                        screensaver.bco=tTime.bco
                                        tAMPM.bco=tTime.bco
                                        tDate.bco=tTime.bco
                                        tMainIcon.bco=tTime.bco
                                        tMainText.bco=tTime.bco
                                        tMainIconAlt.bco=tTime.bco
                                        tMainTextAlt.bco=tTime.bco
                                        tMRIcon.bco=tTime.bco
                                        tMR.bco=tTime.bco
                                        tMRIcon.bco=tTime.bco
                                        tForecast1.bco=tTime.bco
                                        tForecast1Val.bco=tTime.bco
                                        tF1Icon.bco=tTime.bco
                                        tForecast2.bco=tTime.bco
                                        tForecast2Val.bco=tTime.bco
                                        tF2Icon.bco=tTime.bco
                                        tForecast3.bco=tTime.bco
                                        tForecast3Val.bco=tTime.bco
                                        tF3Icon.bco=tTime.bco
                                        tForecast4.bco=tTime.bco
                                        tForecast4Val.bco=tTime.bco
                                        tF4Icon.bco=tTime.bco
                                        spstr strCommand.txt,tTmp.txt,"~",2
                                        covx tTmp.txt,tTime.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",3
                                        covx tTmp.txt,tAMPM.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",4
                                        covx tTmp.txt,tDate.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",5
                                        covx tTmp.txt,tMainIcon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",6
                                        covx tTmp.txt,tMainText.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",7
                                        covx tTmp.txt,tForecast1.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",8
                                        covx tTmp.txt,tForecast2.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",9
                                        covx tTmp.txt,tForecast3.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",10
                                        covx tTmp.txt,tForecast4.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",11
                                        covx tTmp.txt,tF1Icon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",12
                                        covx tTmp.txt,tF2Icon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",13
                                        covx tTmp.txt,tF3Icon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",14
                                        covx tTmp.txt,tF4Icon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",15
                                        covx tTmp.txt,tForecast1Val.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",16
                                        covx tTmp.txt,tForecast2Val.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",17
                                        covx tTmp.txt,tForecast3Val.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",18
                                        covx tTmp.txt,tForecast4Val.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",19
                                        covx tTmp.txt,t10.bco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",20
                                        covx tTmp.txt,tMainIconAlt.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",21
                                        covx tTmp.txt,tMainTextAlt.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",22
                                        covx tTmp.txt,tMRIcon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",23
                                        covx tTmp.txt,tMR.pco,0,0
                                    }
                                    if(tInstruction.txt=="pageType")
                                    {
                                        dim=100
@@ -1057,7 +1070,7 @@ Timer tmSerial
 Timer tmSleep
    Attributes
-        ID         : 28
+        ID         : 26
        Scope      : local
        Period (ms): 1000
        Enabled    : yes
--- a/HMI/US/portrait/n2t-out/cardAlarm.txt
+++ b/HMI/US/portrait/n2t-out/cardAlarm.txt
@@ -543,7 +543,7 @@ Timer tmSerial
                                        }
                                        if(tTmp.txt=="1")
                                        {
-                                            vis bPrev,1
+                                            vis bNext,1
                                            bNext.txt="î³"
                                        }
                                        //text arm1
@@ -579,9 +579,7 @@ Timer tmSerial
                                        //id arm4
                                        spstr strCommand.txt,va4.txt,"~",10
                                        //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",11
+                                        spstr strCommand.txt,tIcon.txt,"~",11
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
                                        //icon color
                                        spstr strCommand.txt,tTmp.txt,"~",12
                                        covx tTmp.txt,sys0,0,0
--- a/HMI/US/portrait/n2t-out/cardEntities.txt
+++ b/HMI/US/portrait/n2t-out/cardEntities.txt
@@ -72,16 +72,6 @@ Page cardEntities
            vis bText5,0
            vis hSlider5,0
            vis nNum5,0
            //ui e6
            vis btOnOff6,0
            vis bUp6,0
            vis bStop6,0
            vis bDown6,0
            vis tIcon6,0
            vis tEntity6,0
            vis bText6,0
            vis hSlider6,0
            vis nNum6,0
 Variable (string) strCommand
    Attributes
@@ -143,24 +133,12 @@ Variable (string) entn5
        Text          : 
        Max. Text Size: 70
 Variable (string) entn6
    Attributes
        Scope         : local
        Text          : 
        Max. Text Size: 70
 Variable (string) type5
    Attributes
        Scope         : local
        Text          : 
        Max. Text Size: 10
 Variable (string) type6
    Attributes
        Scope         : local
        Text          :  
        Max. Text Size: 10
 Number nNum1
    Attributes
        Scope                               : local
@@ -206,15 +184,6 @@ Number nNum5
        Associated Keyboard                 : none
        Value                               : 0
 Number nNum6
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Value                               : 0
 Text tHeading
    Attributes
        Scope                               : local
@@ -365,26 +334,6 @@ Text tIcon5
        Text                                : î°
        Max. Text Size                      : 5
 Text tEntity6
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Text                                : tEntity6
        Max. Text Size                      : 30
 Text tIcon6
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Text                                : î°
        Max. Text Size                      : 5
 Picture p0
    Attributes
        Scope                               : local
@@ -532,34 +481,6 @@ Slider hSlider5
            prints tSend.txt,0
            prints crcval,2
 Slider hSlider6
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Position                            : 50
        Upper range limit                   : 100
        Lower range limit                   : 0
    Events
        Touch Release Event
            nNum6.val=hSlider6.val
            tSend.txt="event,buttonPress2,"+entn6.txt+",number-set,"
            covx nNum6.val,tTmp.txt,0,0
            tSend.txt+=tTmp.txt
            //send calc crc
            btlen tSend.txt,sys0
            crcrest 1,0xffff // reset CRC
            crcputh 55 bb
            crcputs sys0,1
            crcputs tSend.txt,0
            //send cmd
            printh 55 bb
            prints sys0,2
            prints tSend.txt,0
            prints crcval,2
 Button bDown1
    Attributes
        Scope                               : local
@@ -1117,106 +1038,6 @@ Button bText5
            prints tSend.txt,0
            prints crcval,2
 Button bStop6
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        State                               : unpressed
        Text                                : î
        Max. Text Size                      : 10
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,"+entn6.txt+",stop"
            //send calc crc
            btlen tSend.txt,sys0
            crcrest 1,0xffff // reset CRC
            crcputh 55 bb
            crcputs sys0,1
            crcputs tSend.txt,0
            //send cmd
            printh 55 bb
            prints sys0,2
            prints tSend.txt,0
            prints crcval,2
 Button bDown6
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        State                               : unpressed
        Text                                : î
        Max. Text Size                      : 10
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,"+entn6.txt+",down"
            //send calc crc
            btlen tSend.txt,sys0
            crcrest 1,0xffff // reset CRC
            crcputh 55 bb
            crcputs sys0,1
            crcputs tSend.txt,0
            //send cmd
            printh 55 bb
            prints sys0,2
            prints tSend.txt,0
            prints crcval,2
 Button bUp6
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        State                               : unpressed
        Text                                : î
        Max. Text Size                      : 10
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,"+entn6.txt+",up"
            //send calc crc
            btlen tSend.txt,sys0
            crcrest 1,0xffff // reset CRC
            crcputh 55 bb
            crcputs sys0,1
            crcputs tSend.txt,0
            //send cmd
            printh 55 bb
            prints sys0,2
            prints tSend.txt,0
            prints crcval,2
 Button bText6
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        State                               : unpressed
        Text                                : newtxt
        Max. Text Size                      : 10
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,"+entn6.txt+",button"
            //send calc crc
            btlen tSend.txt,sys0
            crcrest 1,0xffff // reset CRC
            crcputh 55 bb
            crcputs sys0,1
            crcputs tSend.txt,0
            //send cmd
            printh 55 bb
            prints sys0,2
            prints tSend.txt,0
            prints crcval,2
 Dual-state Button btOnOff1
    Attributes
        Scope                               : local
@@ -1352,33 +1173,6 @@ Dual-state Button btOnOff5
            prints tSend.txt,0
            prints crcval,2
 Dual-state Button btOnOff6
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        State                               : unpressed
        Text                                : 
        Max. Text Size                      : 10
    Events
        Touch Press Event
            tSend.txt="event,buttonPress2,"+entn6.txt+",OnOff,"
            covx btOnOff6.val,tTmp.txt,0,0
            tSend.txt+=tTmp.txt
            //send calc crc
            btlen tSend.txt,sys0
            crcrest 1,0xffff // reset CRC
            crcputh 55 bb
            crcputs sys0,1
            crcputs tSend.txt,0
            //send cmd
            printh 55 bb
            prints sys0,2
            prints tSend.txt,0
            prints crcval,2
 Hotspot mSpecial
    Attributes
        Scope                               : local
@@ -1506,28 +1300,6 @@ Hotspot m4
                page popupLight
            }
 Hotspot m5
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
    Events
        Touch Press Event
            pageIcons.tTmp1.txt=tEntity6.txt
            pageIcons.tTmp2.txt=entn6.txt
            if(type6.txt=="shutter")
            {
                //popupShutter.tHeading.txt=tEntity6.txt
                page popupShutter
            }
            if(type6.txt=="light")
            {
                //popupLight.tEntity.txt=tEntity6.txt
                page popupLight
            }
 Timer tmSerial
    Attributes
        Scope      : local
@@ -1607,7 +1379,7 @@ Timer tmSerial
                                        }
                                        if(tTmp.txt=="1")
                                        {
-                                            vis bPrev,1
+                                            vis bNext,1
                                            bNext.txt="î³"
                                        }
                                        // get Type
@@ -1628,9 +1400,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",5
+                                            spstr strCommand.txt,tIcon1.txt,"~",5
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
                                            vis tIcon1,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",6
@@ -1752,9 +1522,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",11
+                                            spstr strCommand.txt,tIcon2.txt,"~",11
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,tIcon2.txt,sys0,1
                                            vis tIcon2,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",12
@@ -1876,9 +1644,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",17
+                                            spstr strCommand.txt,tIcon3.txt,"~",17
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,tIcon3.txt,sys0,1
                                            vis tIcon3,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",18
@@ -2000,9 +1766,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",23
+                                            spstr strCommand.txt,tIcon4.txt,"~",23
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,tIcon4.txt,sys0,1
                                            vis tIcon4,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",24
@@ -2124,9 +1888,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",29
+                                            spstr strCommand.txt,tIcon5.txt,"~",29
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,tIcon5.txt,sys0,1
                                            vis tIcon5,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",30
@@ -2230,130 +1992,6 @@ Timer tmSerial
                                            covx tTmp.txt,sys0,0,0
                                            hSlider5.maxval=sys0
                                        }
                                        // get Type
                                        spstr strCommand.txt,type6.txt,"~",33
                                        // get internal name
                                        spstr strCommand.txt,entn6.txt,"~",34
                                        if(type6.txt=="delete"||type6.txt=="")
                                        {
                                            vis bUp6,0
                                            vis bStop6,0
                                            vis bDown6,0
                                            vis btOnOff6,0
                                            vis tEntity6,0
                                            vis tIcon6,0
                                            vis bText6,0
                                            vis hSlider6,0
                                            vis nNum6,0
                                        }else
                                        {
                                            // change icon
                                            spstr strCommand.txt,tTmp.txt,"~",35
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,tIcon6.txt,sys0,1
                                            vis tIcon6,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",36
                                            covx tTmp.txt,sys0,0,0
                                            tIcon6.pco=sys0
                                            // set name
                                            spstr strCommand.txt,tEntity6.txt,"~",37
                                            vis tEntity6,1
                                        }
                                        if(type6.txt=="shutter")
                                        {
                                            vis bUp6,1
                                            vis bStop6,1
                                            vis bDown6,1
                                            vis btOnOff6,0
                                            vis bText6,0
                                            vis hSlider6,0
                                            vis nNum6,0
                                        }
                                        if(type6.txt=="light")
                                        {
                                            vis bUp6,0
                                            vis bStop6,0
                                            vis bDown6,0
                                            vis btOnOff6,1
                                            vis bText6,0
                                            vis hSlider6,0
                                            vis nNum6,0
                                            // get Button State (optional Value)
                                            spstr strCommand.txt,tTmp.txt,"~",38
                                            covx tTmp.txt,sys0,0,0
                                            btOnOff6.val=sys0
                                        }
                                        if(type6.txt=="switch")
                                        {
                                            vis bUp6,0
                                            vis bStop6,0
                                            vis bDown6,0
                                            vis btOnOff6,1
                                            vis bText6,0
                                            vis hSlider6,0
                                            vis nNum6,0
                                            // get Button State (optional Value)
                                            spstr strCommand.txt,tTmp.txt,"~",38
                                            covx tTmp.txt,sys0,0,0
                                            btOnOff6.val=sys0
                                        }
                                        if(type6.txt=="text")
                                        {
                                            vis bUp6,0
                                            vis bStop6,0
                                            vis bDown6,0
                                            vis btOnOff6,0
                                            vis bText6,1
                                            tsw bText6,0
                                            vis hSlider6,0
                                            vis nNum6,0
                                            bText6.pco=65535
                                            bText6.pco2=65535
                                            // get Text (optional Value)
                                            spstr strCommand.txt,bText6.txt,"~",38
                                        }
                                        if(type6.txt=="button")
                                        {
                                            vis bUp6,0
                                            vis bStop6,0
                                            vis bDown6,0
                                            vis btOnOff6,0
                                            vis bText6,1
                                            tsw bText6,1
                                            vis hSlider6,0
                                            vis nNum6,0
                                            bText6.pco=1374
                                            bText6.pco2=1374
                                            // get Text (optional Value)
                                            spstr strCommand.txt,bText6.txt,"~",38
                                        }
                                        if(type6.txt=="number")
                                        {
                                            vis bUp6,0
                                            vis bStop6,0
                                            vis bDown6,0
                                            vis btOnOff6,0
                                            vis bText6,0
                                            tsw bText6,0
                                            vis hSlider6,1
                                            vis nNum6,1
                                            // get config (optional Value) (use bText as variable)
                                            spstr strCommand.txt,bText6.txt,"~",38
                                            //first value is current value
                                            spstr bText6.txt,tTmp.txt,"|",0
                                            covx tTmp.txt,sys0,0,0
                                            hSlider6.val=sys0
                                            nNum6.val=sys0
                                            //second value is min value
                                            spstr bText6.txt,tTmp.txt,"|",1
                                            covx tTmp.txt,sys0,0,0
                                            hSlider6.minval=sys0
                                            //third value is max value
                                            spstr bText6.txt,tTmp.txt,"|",2
                                            covx tTmp.txt,sys0,0,0
                                            hSlider6.maxval=sys0
                                        }
                                    }
                                    if(tInstruction.txt=="pageType")
                                    {
--- a/HMI/US/portrait/n2t-out/cardGrid.txt
+++ b/HMI/US/portrait/n2t-out/cardGrid.txt
@@ -599,7 +599,7 @@ Timer tmSerial
                                        }
                                        if(tTmp.txt=="1")
                                        {
-                                            vis bPrev,1
+                                            vis bNext,1
                                            bNext.txt="î³"
                                        }
                                        // get Type
@@ -613,9 +613,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",5
+                                            spstr strCommand.txt,bEntity1.txt,"~",5
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1
                                            vis bEntity1,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",6
@@ -636,9 +634,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",11
+                                            spstr strCommand.txt,bEntity2.txt,"~",11
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1
                                            vis bEntity2,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",12
@@ -659,9 +655,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",17
+                                            spstr strCommand.txt,bEntity3.txt,"~",17
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1
                                            vis bEntity3,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",18
@@ -682,9 +676,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",23
+                                            spstr strCommand.txt,bEntity4.txt,"~",23
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1
                                            vis bEntity4,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",24
@@ -705,9 +697,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",29
+                                            spstr strCommand.txt,bEntity5.txt,"~",29
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1
                                            vis bEntity5,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",30
@@ -728,9 +718,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",35
+                                            spstr strCommand.txt,bEntity6.txt,"~",35
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1
                                            vis bEntity6,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",36
--- a/HMI/US/portrait/n2t-out/cardMedia.txt
+++ b/HMI/US/portrait/n2t-out/cardMedia.txt
@@ -534,15 +534,13 @@ Timer tmSerial
                                        }
                                        if(tTmp.txt=="1")
                                        {
-                                            vis bPrev,1
+                                            vis bNext,1
                                            bNext.txt="î³"
                                        }
                                        //entity name
                                        spstr strCommand.txt,entn.txt,"~",3
                                        //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        spstr strCommand.txt,tIcon.txt,"~",4
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
                                        //title
                                        spstr strCommand.txt,tTitle.txt,"~",5
                                        //author
@@ -552,9 +550,7 @@ Timer tmSerial
                                        covx tTmp.txt,sys0,0,0
                                        hVolume.val=sys0
                                        //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",8
+                                        spstr strCommand.txt,tPlayPause.txt,"~",8
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
                                        //speaker current
                                        spstr strCommand.txt,tSpeaker.txt,"~",9
                                        if(tSpeaker.txt!="")
--- a/HMI/US/portrait/n2t-out/cardThermo.txt
+++ b/HMI/US/portrait/n2t-out/cardThermo.txt
@@ -671,7 +671,7 @@ Timer tmSerial
                                        }
                                        if(tTmp.txt=="1")
                                        {
-                                            vis bPrev,1
+                                            vis bNext,1
                                            bNext.txt="î³"
                                        }
                                        //entity name
@@ -704,12 +704,9 @@ Timer tmSerial
                                        vis bt7,0
                                        vis bt8,0
                                        //bt0
-                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        spstr strCommand.txt,bt0.txt,"~",10
-                                        if(tTmp.txt!="")
+                                        if(bt0.txt!="")
                                        {
                                            // set icon
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bt0.txt,sys0,1
                                            // set text color on active state
                                            spstr strCommand.txt,tTmp.txt,"~",11
                                            covx tTmp.txt,bt0.pco2,0,0
@@ -720,232 +717,216 @@ Timer tmSerial
                                            spstr strCommand.txt,va0.txt,"~",13
                                            //enable
                                            vis bt0,1
-                                            }              //bt1
+                                        }
-                                            spstr strCommand.txt,tTmp.txt,"~",14
+                                        //bt1
-                                            if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt1.txt,"~",14
-                                            {
+                                        if(bt1.txt!="")
-                                                // set icon
+                                        {
-                                                covx tTmp.txt,sys0,0,0
+                                            // set text color on active state
-                                                substr pageIcons.tIcons.txt,bt1.txt,sys0,1
+                                            spstr strCommand.txt,tTmp.txt,"~",15
-                                                // set text color on active state
+                                            covx tTmp.txt,bt1.pco2,0,0
-                                                spstr strCommand.txt,tTmp.txt,"~",15
+                                            // set state
-                                                covx tTmp.txt,bt1.pco2,0,0
+                                            spstr strCommand.txt,tTmp.txt,"~",16
-                                                // set state
+                                            covx tTmp.txt,bt1.val,0,0
-                                                spstr strCommand.txt,tTmp.txt,"~",16
+                                            // save action
-                                                covx tTmp.txt,bt1.val,0,0
+                                            spstr strCommand.txt,va1.txt,"~",17
-                                                // save action
+                                            //enable
-                                                spstr strCommand.txt,va1.txt,"~",17
+                                            vis bt1,1
-                                                //enable
+                                        }
-                                                vis bt1,1
+                                        //bt2
-                                                }              //bt2
+                                        spstr strCommand.txt,bt2.txt,"~",18
-                                                spstr strCommand.txt,tTmp.txt,"~",18
+                                        if(bt2.txt!="")
-                                                if(tTmp.txt!="")
+                                        {
-                                                {
+                                            // set text color on active state
-                                                    // set icon
+                                            spstr strCommand.txt,tTmp.txt,"~",19
-                                                    covx tTmp.txt,sys0,0,0
+                                            covx tTmp.txt,bt2.pco2,0,0
-                                                    substr pageIcons.tIcons.txt,bt2.txt,sys0,1
+                                            // set state
-                                                    // set text color on active state
+                                            spstr strCommand.txt,tTmp.txt,"~",20
-                                                    spstr strCommand.txt,tTmp.txt,"~",19
+                                            covx tTmp.txt,bt2.val,0,0
-                                                    covx tTmp.txt,bt2.pco2,0,0
+                                            // save action
-                                                    // set state
+                                            spstr strCommand.txt,va2.txt,"~",21
-                                                    spstr strCommand.txt,tTmp.txt,"~",20
+                                            //enable
-                                                    covx tTmp.txt,bt2.val,0,0
+                                            vis bt2,1
-                                                    // save action
+                                        }
-                                                    spstr strCommand.txt,va2.txt,"~",21
+                                        //bt3
-                                                    //enable
+                                        spstr strCommand.txt,bt3.txt,"~",22
-                                                    vis bt2,1
+                                        if(bt3.txt!="")
-                                                    }              //bt3
+                                        {
-                                                    spstr strCommand.txt,tTmp.txt,"~",22
+                                            // set text color on active state
-                                                    if(tTmp.txt!="")
+                                            spstr strCommand.txt,tTmp.txt,"~",23
-                                                    {
+                                            covx tTmp.txt,bt3.pco2,0,0
-                                                        // set icon
+                                            // set state
-                                                        covx tTmp.txt,sys0,0,0
+                                            spstr strCommand.txt,tTmp.txt,"~",24
-                                                        substr pageIcons.tIcons.txt,bt3.txt,sys0,1
+                                            covx tTmp.txt,bt3.val,0,0
-                                                        // set text color on active state
+                                            // save action
-                                                        spstr strCommand.txt,tTmp.txt,"~",23
+                                            spstr strCommand.txt,va3.txt,"~",25
-                                                        covx tTmp.txt,bt3.pco2,0,0
+                                            //enable
-                                                        // set state
+                                            vis bt3,1
-                                                        spstr strCommand.txt,tTmp.txt,"~",24
+                                        }
-                                                        covx tTmp.txt,bt3.val,0,0
+                                        //bt4
-                                                        // save action
+                                        spstr strCommand.txt,bt4.txt,"~",26
-                                                        spstr strCommand.txt,va3.txt,"~",25
+                                        if(bt4.txt!="")
-                                                        //enable
+                                        {
-                                                        vis bt3,1
+                                            // set text color on active state
-                                                        }              //bt4
+                                            spstr strCommand.txt,tTmp.txt,"~",27
-                                                        spstr strCommand.txt,tTmp.txt,"~",26
+                                            covx tTmp.txt,bt4.pco2,0,0
-                                                        if(tTmp.txt!="")
+                                            // set state
-                                                        {
+                                            spstr strCommand.txt,tTmp.txt,"~",28
-                                                            // set icon
+                                            covx tTmp.txt,bt4.val,0,0
-                                                            covx tTmp.txt,sys0,0,0
+                                            // save action
-                                                            substr pageIcons.tIcons.txt,bt4.txt,sys0,1
+                                            spstr strCommand.txt,va4.txt,"~",29
-                                                            // set text color on active state
+                                            //enable
-                                                            spstr strCommand.txt,tTmp.txt,"~",27
+                                            vis bt4,1
-                                                            covx tTmp.txt,bt4.pco2,0,0
+                                        }
-                                                            // set state
+                                        //bt5
-                                                            spstr strCommand.txt,tTmp.txt,"~",28
+                                        spstr strCommand.txt,bt5.txt,"~",30
-                                                            covx tTmp.txt,bt4.val,0,0
+                                        if(bt5.txt!="")
-                                                            // save action
+                                        {
-                                                            spstr strCommand.txt,va4.txt,"~",29
+                                            // set text color on active state
-                                                            //enable
+                                            spstr strCommand.txt,tTmp.txt,"~",31
-                                                            vis bt4,1
+                                            covx tTmp.txt,bt5.pco2,0,0
-                                                            }              //bt5
+                                            // set state
-                                                            spstr strCommand.txt,tTmp.txt,"~",30
+                                            spstr strCommand.txt,tTmp.txt,"~",32
-                                                            if(tTmp.txt!="")
+                                            covx tTmp.txt,bt5.val,0,0
-                                                            {
+                                            // save action
-                                                                // set icon
+                                            spstr strCommand.txt,va5.txt,"~",33
-                                                                covx tTmp.txt,sys0,0,0
+                                            //enable
-                                                                substr pageIcons.tIcons.txt,bt5.txt,sys0,1
+                                            vis bt5,1
-                                                                // set text color on active state
+                                        }
-                                                                spstr strCommand.txt,tTmp.txt,"~",31
+                                        //bt6
-                                                                covx tTmp.txt,bt5.pco2,0,0
+                                        spstr strCommand.txt,bt6.txt,"~",34
-                                                                // set state
+                                        if(bt6.txt!="")
-                                                                spstr strCommand.txt,tTmp.txt,"~",32
+                                        {
-                                                                covx tTmp.txt,bt5.val,0,0
+                                            // set text color on active state
-                                                                // save action
+                                            spstr strCommand.txt,tTmp.txt,"~",35
-                                                                spstr strCommand.txt,va5.txt,"~",33
+                                            covx tTmp.txt,bt6.pco2,0,0
-                                                                //enable
+                                            // set state
-                                                                vis bt5,1
+                                            spstr strCommand.txt,tTmp.txt,"~",36
-                                                                }              //bt6
+                                            covx tTmp.txt,bt6.val,0,0
-                                                                spstr strCommand.txt,tTmp.txt,"~",34
+                                            // save action
-                                                                if(tTmp.txt!="")
+                                            spstr strCommand.txt,va6.txt,"~",37
-                                                                {
+                                            //enable
-                                                                    // set icon
+                                            vis bt6,1
-                                                                    covx tTmp.txt,sys0,0,0
+                                        }
-                                                                    substr pageIcons.tIcons.txt,bt6.txt,sys0,1
+                                        //bt7
-                                                                    // set text color on active state
+                                        spstr strCommand.txt,bt7.txt,"~",38
-                                                                    spstr strCommand.txt,tTmp.txt,"~",35
+                                        if(bt7.txt!="")
-                                                                    covx tTmp.txt,bt6.pco2,0,0
+                                        {
-                                                                    // set state
+                                            // set text color on active state
-                                                                    spstr strCommand.txt,tTmp.txt,"~",36
+                                            spstr strCommand.txt,tTmp.txt,"~",39
-                                                                    covx tTmp.txt,bt6.val,0,0
+                                            covx tTmp.txt,bt7.pco2,0,0
-                                                                    // save action
+                                            // set state
-                                                                    spstr strCommand.txt,va6.txt,"~",37
+                                            spstr strCommand.txt,tTmp.txt,"~",40
-                                                                    //enable
+                                            covx tTmp.txt,bt7.val,0,0
-                                                                    vis bt6,1
+                                            // save action
-                                                                    }              //bt7
+                                            spstr strCommand.txt,va7.txt,"~",41
-                                                                    spstr strCommand.txt,tTmp.txt,"~",38
+                                            //enable
-                                                                    if(tTmp.txt!="")
+                                            vis bt7,1
-                                                                    {
+                                        }
-                                                                        // set icon
+                                        //bt8
-                                                                        covx tTmp.txt,sys0,0,0
+                                        spstr strCommand.txt,bt8.txt,"~",42
-                                                                        substr pageIcons.tIcons.txt,bt7.txt,sys0,1
+                                        if(bt8.txt!="")
-                                                                        // set text color on active state
+                                        {
-                                                                        spstr strCommand.txt,tTmp.txt,"~",39
+                                            // set text color on active state
-                                                                        covx tTmp.txt,bt7.pco2,0,0
+                                            spstr strCommand.txt,tTmp.txt,"~",43
-                                                                        // set state
+                                            covx tTmp.txt,bt8.pco2,0,0
-                                                                        spstr strCommand.txt,tTmp.txt,"~",40
+                                            // set state
-                                                                        covx tTmp.txt,bt7.val,0,0
+                                            spstr strCommand.txt,tTmp.txt,"~",44
-                                                                        // save action
+                                            covx tTmp.txt,bt8.val,0,0
-                                                                        spstr strCommand.txt,va7.txt,"~",41
+                                            // save action
-                                                                        //enable
+                                            spstr strCommand.txt,va8.txt,"~",45
-                                                                        vis bt7,1
+                                            //enable
-                                                                        }              //bt8
+                                            vis bt8,1
-                                                                        spstr strCommand.txt,tTmp.txt,"~",42
+                                        }
-                                                                        if(tTmp.txt!="")
+                                    }
-                                                                        {
+                                    if(tInstruction.txt=="pageType")
-                                                                            // set icon
+                                    {
-                                                                            covx tTmp.txt,sys0,0,0
+                                        //command format pageType,specialPageName
-                                                                            substr pageIcons.tIcons.txt,bt8.txt,sys0,1
+                                        //write name of speical page to tId
-                                                                            // set text color on active state
+                                        spstr strCommand.txt,tId.txt,"~",1
-                                                                            spstr strCommand.txt,tTmp.txt,"~",43
+                                        //save second arg if there's one
-                                                                            covx tTmp.txt,bt8.pco2,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",2
-                                                                            // set state
+                                        //save third arg if there's one
-                                                                            spstr strCommand.txt,tTmp.txt,"~",44
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
-                                                                            covx tTmp.txt,bt8.val,0,0
+                                        //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 ...
-                                                                            // save action
+                                        udelete payloadLength-1
-                                                                            spstr strCommand.txt,va8.txt,"~",45
+                                        bufferPos=0
-                                                                            //enable
+                                        if(tId.txt=="pageStartup")
-                                                                            vis bt8,1
+                                        {
-                                                                        }
+                                            page pageStartup
-                                                                    }
+                                        }
-                                                                    if(tInstruction.txt=="pageType")
+                                        if(tId.txt=="screensaver")
-                                                                    {
+                                        {
-                                                                        //command format pageType,specialPageName
+                                            page screensaver
-                                                                        //write name of speical page to tId
+                                        }
-                                                                        spstr strCommand.txt,tId.txt,"~",1
+                                        if(tId.txt=="cardEntities")
-                                                                        //save second arg if there's one
+                                        {
-                                                                        spstr strCommand.txt,tTmp.txt,"~",2
+                                            page cardEntities
-                                                                        //save third arg if there's one
+                                        }
-                                                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
+                                        if(tId.txt=="cardGrid")
-                                                                        //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
+                                            page cardGrid
-                                                                        bufferPos=0
+                                        }
-                                                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
-                                                                        {
+                                        {
-                                                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
-                                                                        }
+                                            page popupLight
-                                                                        if(tId.txt=="screensaver")
+                                        }
-                                                                        {
+                                        if(tId.txt=="popupShutter")
-                                                                            page screensaver
+                                        {
-                                                                        }
+                                            pageIcons.tTmp1.txt=tTmp.txt
-                                                                        if(tId.txt=="cardEntities")
+                                            page popupShutter
-                                                                        {
+                                        }
-                                                                            page cardEntities
+                                        if(tId.txt=="popupNotify")
-                                                                        }
+                                        {
-                                                                        if(tId.txt=="cardGrid")
+                                            page popupNotify
-                                                                        {
+                                        }
-                                                                            page cardGrid
+                                        if(tId.txt=="cardThermo")
-                                                                        }
+                                        {
-                                                                        if(tId.txt=="popupLight")
+                                            page cardThermo
-                                                                        {
+                                        }
-                                                                            pageIcons.tTmp1.txt=tTmp.txt
+                                        if(tId.txt=="cardMedia")
-                                                                            page popupLight
+                                        {
-                                                                        }
+                                            page cardMedia
-                                                                        if(tId.txt=="popupShutter")
+                                        }
-                                                                        {
+                                        if(tId.txt=="cardAlarm")
-                                                                            pageIcons.tTmp1.txt=tTmp.txt
+                                        {
-                                                                            page popupShutter
+                                            page cardAlarm
-                                                                        }
+                                        }
-                                                                        if(tId.txt=="popupNotify")
+                                    }
-                                                                        {
+                                    if(tInstruction.txt=="time")
-                                                                            page popupNotify
+                                    {
-                                                                        }
+                                        // get set time to global variable
-                                                                        if(tId.txt=="cardThermo")
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
-                                                                        {
+                                    }
-                                                                            page cardThermo
+                                    if(tInstruction.txt=="date")
-                                                                        }
+                                    {
-                                                                        if(tId.txt=="cardMedia")
+                                        // get set date to global variable
-                                                                        {
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
-                                                                            page cardMedia
+                                    }
-                                                                        }
+                                    if(tInstruction.txt=="dimmode")
-                                                                        if(tId.txt=="cardAlarm")
+                                    {
-                                                                        {
+                                        // get value
-                                                                            page cardAlarm
+                                        spstr strCommand.txt,tTmp.txt,"~",1
-                                                                        }
+                                        covx tTmp.txt,dimValue,0,0
-                                                                    }
+                                    }
-                                                                    if(tInstruction.txt=="time")
+                                    if(tInstruction.txt=="timeout")
-                                                                    {
+                                    {
-                                                                        // get set time to global variable
+                                        //set timeout to global var
-                                                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
-                                                                    }
+                                        covx tTmp.txt,sleepTimeout,0,0
-                                                                    if(tInstruction.txt=="date")
+                                    }
-                                                                    {
+                                    // end of user code
-                                                                        // get set date to global variable
+                                    udelete payloadLength-1
-                                                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+                                    bufferPos=0
-                                                                    }
+                                }
-                                                                    if(tInstruction.txt=="dimmode")
+                            }
-                                                                    {
+                        }
-                                                                        // get value
+                    }
-                                                                        spstr strCommand.txt,tTmp.txt,"~",1
+                    // next character
-                                                                        covx tTmp.txt,dimValue,0,0
+                    bufferPos++
-                                                                    }
+                }
-                                                                    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++
                                                }
                                            }
 Timer tmSleep
    Attributes
--- a/HMI/US/portrait/n2t-out/pageIcons.txt
+++ b/HMI/US/portrait/n2t-out/pageIcons.txt
@@ -22,16 +22,6 @@ Variable (string) vaDate
        Text          :  
        Max. Text Size: 35
 Text tIcons
    Attributes
        Scope                               : global
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Text                                : îî´îï§îîî îî£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîî©±ï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾î¶îïîî¸î¸
        Max. Text Size                      : 170
 Text tTmp1
    Attributes
        Scope                               : global
--- a/HMI/US/portrait/n2t-out/pageSerialTest.txt
+++ b/HMI/US/portrait/n2t-out/pageSerialTest.txt
@@ -1,207 +0,0 @@
 Page pageSerialTest
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Locked                              : no
        Swide up page ID                    : disabled
        Swide down page ID                  : disabled
        Swide left page ID                  : disabled
        Swide right page ID                 : disabled
    Events
        Preinitialize Event
            //vis p0,0
            //recmod=1
            //bauds=115200
 Number nCrcRecv
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Value                               : 0
 Number nCrcCalc
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Value                               : 0
 Number nIt
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Value                               : 0
 Number nLength
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Value                               : 0
 Text tStatus
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Text                                : newtxt
        Max. Text Size                      : 100
 Text tCmd
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Text                                : newtxt
        Max. Text Size                      : 500
 Text tBuffer
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Text                                : newtxt
        Max. Text Size                      : 100
 Text tDesc
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Text                                : CRC Recv:\r\nCRC Calc:\r\n\r\nStatus\r\n\r\nCommand
        Max. Text Size                      : 60
 Picture p0
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
 Button b0
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        State                               : unpressed
        Text                                : bck
        Max. Text Size                      : 10
    Events
        Touch Press Event
            recmod=0
            page pageTest
 Button b1
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        State                               : unpressed
        Text                                : ON
        Max. Text Size                      : 10
    Events
        Touch Press Event
            recmod=1
            bauds=115200
 Timer tmSerial
    Attributes
        Scope      : local
        Period (ms): 400
        Enabled    : yes
    Events
        Timer Event
            // 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
                        }
                        tStatus.txt="init command detected"
                        //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
                            //payloadLength=u[2]
                            ucopy payloadLength,2,2,0
                            nLength.val=payloadLength
                            // 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)
                            {
                                tStatus.txt="reached"
                                // calculate crc
                                crcrest 1,0xFFFF
                                // payload length -1 to exclude crc
                                crcputu 0,payloadLength-1 //u[2]+3
                                // get recived crc to be able to compare it
                                ucopy recvCrc,payloadLength-1,2,0
                                nCrcRecv.val=recvCrc
                                // compare crc with recived value
                                if(crcval==recvCrc)
                                {
                                    tStatus.txt="crc ok"
                                    nIt.val=nIt.val+1
                                    ucopy tCmd.txt,4,payloadLength-5,0
                                    udelete payloadLength-1
                                    bufferPos=0
                                    // here is the location where acual code should be
                                }
                                // copy calculated crc and recived crc to nCrcRecv and nCrcCalc, for debugging
                                nCrcRecv.val=recvCrc
                                nCrcCalc.val=crcval
                                //ucopy nCrcCalc.val,u[2]+3,3,0
                            }
                        }
                    }
                    // next character
                    bufferPos++
                }
                if(bufferPos==usize)
                {
                    // copy whole buffer to tCmd.txt, for debugging
                    //ucopy tBuffer.txt,0,usize,0
                    // ucopy nIt.val,0,usize,0
                    // clear whole buffer
                    //code_c
                    //bufferPos=0
                }
            }
--- a/HMI/US/portrait/n2t-out/pageStartup.txt
+++ b/HMI/US/portrait/n2t-out/pageStartup.txt
@@ -152,7 +152,7 @@ Text tVersion
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
-        Text                                : 28
+        Text                                : 31
        Max. Text Size                      : 10
 Picture p0
--- a/HMI/US/portrait/n2t-out/pageTest.txt
+++ b/HMI/US/portrait/n2t-out/pageTest.txt
@@ -35,20 +35,6 @@ Button b0
        Touch Press Event
            page cardEntities
 Button b1
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        State                               : unpressed
        Text                                : serial
        Max. Text Size                      : 10
    Events
        Touch Press Event
            page pageSerialTest
 Button b3
    Attributes
        Scope                               : local
@@ -176,3 +162,17 @@ Button b11
        Touch Press Event
            page cardGrid
 Button b1
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        State                               : unpressed
        Text                                : bauds=115200
        Max. Text Size                      : 20
    Events
        Touch Press Event
            bauds=115200
--- a/HMI/US/portrait/n2t-out/popupLight.txt
+++ b/HMI/US/portrait/n2t-out/popupLight.txt
@@ -442,9 +442,7 @@ Timer tmSerial
                                    if(tInstruction.txt=="entityUpdateDetail")
                                    {
                                        // change icon
-                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        spstr strCommand.txt,tIcon1.txt,"~",1
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
                                        vis tIcon1,1
                                        // change icon color
                                        spstr strCommand.txt,tTmp.txt,"~",2
@@ -572,25 +570,43 @@ Timer tmSerial
                                        //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=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                        {
-                                            page cardMedia
+                                            page cardGrid
                                        }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                        {
-                                            page pageStartup
+                                            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=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                        {
-                                            page cardGrid
+                                            page cardThermo
                                        }
                                        if(tId.txt=="cardMedia")
                                        {
                                            page cardMedia
                                        }
                                        if(tId.txt=="cardAlarm")
                                        {
--- a/HMI/US/portrait/n2t-out/popupNotify.txt
+++ b/HMI/US/portrait/n2t-out/popupNotify.txt
@@ -339,25 +339,43 @@ Timer tmSerial
                                            pageIcons.tTmp1.txt=tTmp.txt
                                            page popupLight
                                        }
                                        if(tId.txt=="pageStartup")
                                        {
                                            page pageStartup
                                        }
                                        if(tId.txt=="screensaver")
                                        {
                                            page screensaver
                                        }
                                        if(tId.txt=="cardEntities")
                                        {
                                            page cardEntities
                                        }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                        {
-                                            page cardMedia
+                                            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=="pageStartup")
+                                        if(tId.txt=="cardMedia")
                                        {
-                                            page pageStartup
+                                            page cardMedia
                                        }
                                        if(tId.txt=="cardGrid")
                                        {
                                            page cardGrid
                                        }
                                        if(tId.txt=="cardAlarm")
                                        {
--- a/HMI/US/portrait/n2t-out/popupShutter.txt
+++ b/HMI/US/portrait/n2t-out/popupShutter.txt
@@ -366,30 +366,43 @@ Timer tmSerial
                                        //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=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                        {
-                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page pageStartup
-                                            page popupLight
+                                        }
                                        if(tId.txt=="screensaver")
                                        {
                                            page screensaver
                                        }
                                        if(tId.txt=="cardEntities")
                                        {
                                            page cardEntities
                                        }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                        {
-                                            page cardMedia
+                                            page cardGrid
                                        }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                        {
-                                            page pageStartup
+                                            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=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                        {
-                                            page cardGrid
+                                            page cardThermo
                                        }
                                        if(tId.txt=="cardMedia")
                                        {
                                            page cardMedia
                                        }
                                        if(tId.txt=="cardAlarm")
                                        {
--- a/HMI/US/portrait/n2t-out/screensaver.txt
+++ b/HMI/US/portrait/n2t-out/screensaver.txt
@@ -48,25 +48,17 @@ Variable (int32) vaTap
        Scope: local
        Value: 0
-Text tInstruction
+Variable (string) tInstruction
    Attributes
-        Scope                               : local
+        Scope         : local
-        Dragging                            : 0
+        Text          : 
-        Disable release event after dragging: 0
+        Max. Text Size: 50
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Text                                : 
        Max. Text Size                      : 50
-Text tTmp
+Variable (string) tTmp
    Attributes
-        Scope                               : local
+        Scope         : local
-        Dragging                            : 0
+        Text          : 
-        Disable release event after dragging: 0
+        Max. Text Size: 50
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Text                                : 
        Max. Text Size                      : 50
 Text tTime
    Attributes
@@ -400,9 +392,7 @@ Timer tmSerial
                                        vis tMRIcon,0
                                        vis tMR,0
                                        //tMainIcon
-                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        spstr strCommand.txt,tMainIcon.txt,"~",1
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1
                                        tMainIconAlt.txt=tMainIcon.txt
                                        //tMainText
                                        spstr strCommand.txt,tMainText.txt,"~",2
@@ -410,41 +400,31 @@ Timer tmSerial
                                        //tForecast1
                                        spstr strCommand.txt,tForecast1.txt,"~",3
                                        //tF1Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        spstr strCommand.txt,tF1Icon.txt,"~",4
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1
                                        //tForecast1Val
                                        spstr strCommand.txt,tForecast1Val.txt,"~",5
                                        //tForecast2
                                        spstr strCommand.txt,tForecast2.txt,"~",6
                                        //tF2Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",7
+                                        spstr strCommand.txt,tF2Icon.txt,"~",7
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1
                                        //tForecast2Val
                                        spstr strCommand.txt,tForecast2Val.txt,"~",8
                                        //tForecast3
                                        spstr strCommand.txt,tForecast3.txt,"~",9
                                        //tF3Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        spstr strCommand.txt,tF3Icon.txt,"~",10
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tF3Icon.txt,sys0,1
                                        //tForecast3Val
                                        spstr strCommand.txt,tForecast3Val.txt,"~",11
                                        //tForecast4
                                        spstr strCommand.txt,tForecast4.txt,"~",12
                                        //tF4Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",13
+                                        spstr strCommand.txt,tF4Icon.txt,"~",13
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1
                                        //tForecast4Val
                                        spstr strCommand.txt,tForecast4Val.txt,"~",14
                                        //alternative layout
                                        //tMRIcon
-                                        spstr strCommand.txt,tTmp.txt,"~",15
+                                        spstr strCommand.txt,tMRIcon.txt,"~",15
-                                        covx tTmp.txt,sys0,0,0
+                                        if(tMRIcon.txt!="")
                                        substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1
                                        if(tTmp.txt!="")
                                        {
                                            //value for tMRIcon, activate alternative layout
                                            vis tMainIcon,0
@@ -470,6 +450,77 @@ Timer tmSerial
                                        //tMR
                                        spstr strCommand.txt,tMR.txt,"~",16
                                    }
                                    if(tInstruction.txt=="color")
                                    {
                                        spstr strCommand.txt,tTmp.txt,"~",1
                                        covx tTmp.txt,tTime.bco,0,0
                                        screensaver.bco=tTime.bco
                                        tAMPM.bco=tTime.bco
                                        tDate.bco=tTime.bco
                                        tMainIcon.bco=tTime.bco
                                        tMainText.bco=tTime.bco
                                        tMainIconAlt.bco=tTime.bco
                                        tMainTextAlt.bco=tTime.bco
                                        tMRIcon.bco=tTime.bco
                                        tMR.bco=tTime.bco
                                        tMRIcon.bco=tTime.bco
                                        tForecast1.bco=tTime.bco
                                        tForecast1Val.bco=tTime.bco
                                        tF1Icon.bco=tTime.bco
                                        tForecast2.bco=tTime.bco
                                        tForecast2Val.bco=tTime.bco
                                        tF2Icon.bco=tTime.bco
                                        tForecast3.bco=tTime.bco
                                        tForecast3Val.bco=tTime.bco
                                        tF3Icon.bco=tTime.bco
                                        tForecast4.bco=tTime.bco
                                        tForecast4Val.bco=tTime.bco
                                        tF4Icon.bco=tTime.bco
                                        spstr strCommand.txt,tTmp.txt,"~",2
                                        covx tTmp.txt,tTime.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",3
                                        covx tTmp.txt,tAMPM.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",4
                                        covx tTmp.txt,tDate.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",5
                                        covx tTmp.txt,tMainIcon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",6
                                        covx tTmp.txt,tMainText.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",7
                                        covx tTmp.txt,tForecast1.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",8
                                        covx tTmp.txt,tForecast2.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",9
                                        covx tTmp.txt,tForecast3.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",10
                                        covx tTmp.txt,tForecast4.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",11
                                        covx tTmp.txt,tF1Icon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",12
                                        covx tTmp.txt,tF2Icon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",13
                                        covx tTmp.txt,tF3Icon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",14
                                        covx tTmp.txt,tF4Icon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",15
                                        covx tTmp.txt,tForecast1Val.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",16
                                        covx tTmp.txt,tForecast2Val.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",17
                                        covx tTmp.txt,tForecast3Val.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",18
                                        covx tTmp.txt,tForecast4Val.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",19
                                        covx tTmp.txt,t10.bco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",20
                                        covx tTmp.txt,tMainIconAlt.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",21
                                        covx tTmp.txt,tMainTextAlt.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",22
                                        covx tTmp.txt,tMRIcon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",23
                                        covx tTmp.txt,tMR.pco,0,0
                                    }
                                    if(tInstruction.txt=="pageType")
                                    {
                                        dim=100
--- a/HMI/US/portrait/nspanel_US_P.HMI
+++ b/HMI/US/portrait/nspanel_US_P.HMI
--- a/HMI/US/portrait/nspanel_US_P.tft
+++ b/HMI/US/portrait/nspanel_US_P.tft
--- a/HMI/code_gen/icons/icons.py
+++ b/HMI/code_gen/icons/icons.py
@@ -1,112 +1,62 @@
 import json
 import os
 icons = [
    "alert-circle-outline",
    "lightbulb",
    "thermometer",
    "gesture-tap-button",
    "flash",
    "music",
    "check-circle-outline",
    "close-circle-outline",
    "pause",
    "play",
    "palette",
    "window-open",
    "weather-cloudy",
    "weather-fog",
    "weather-hail",
    "weather-lightning",
    "weather-lightning-rainy",
    "weather-night",
    "weather-partly-cloudy",
    "weather-pouring",
    "weather-rainy",
    "weather-snowy",
    "weather-snowy-rainy",
    "weather-sunny",
    "weather-windy",
    "weather-windy-variant",
    "water-percent",
    "power",
    "fire",
    "calendar-sync",
    "fan",
    "snowflake",
    "solar-power",
    "battery-charging-medium",
    "battery-medium",
    "shield-home",
    "door-open",
    "door-closed",
    "window-closed",
    "shield-off",
    "shield",
    "shield-lock",
    "shield-airplane",
    "bell-ring",
    "ray-vertex",
    "script-text",
    "home-import-outline",
    "home-export-outline",
    "arrow-up-bold",
    "arrow-down-bold",
    "cast-audio",
    "cast",
    "radio",
    "fireplace"
 ]
 __location__ = os.path.realpath(
    os.path.join(os.getcwd(), os.path.dirname(__file__)))
 with open(os.path.join(__location__, "icons.json"),'r') as f:
    icon_metadata = json.load(f)
 icon_nextion_string = ""
 icon_name_list = []
 for icon_name in icons:
    #print(icon_name)
    icon = next((item for item in icon_metadata if item["name"] == icon_name), None)
    if icon is None:
        print(f"WARNING ICON NOT FOUND: {icon_name}")
    else:
        hex = icon['hex']
        s = int(hex, 16)
        #print(chr(s), end = '')
        icon_nextion_string += chr(s)
        icon_name_list.append(icon_name)
 # write mapping lib for python
 with open(os.path.join(__location__, "../../../apps/nspanel-lovelace-ui/luibackend", "icon_mapping.py"), 'w') as f:
    f.write("icons = {\n")
-    for idx, val in enumerate(icon_name_list):
+    for icon in icon_metadata:
-        f.write(f"    '{val}': {idx},\n")
+        iconchar = chr(int(icon['hex'], 16))
        name = icon["name"]
        f.write(f"    '{name}': '{iconchar}',\n")
    f.write("}\n")
    f.write("""
 def get_icon_id(ma_name):
    ma_name = ma_name.replace("mdi:","")
    if ma_name in icons:
        return icons[ma_name]
    else:
        return icons["alert-circle-outline"]
    """)
-# write documentation file
+# write mapping lib for typescript
-with open(os.path.join(__location__, "../..","icons.md"), 'w') as f:
+with open(os.path.join(__location__, "../../../iobroker", "icon_mapping.ts"), 'w') as f:
    f.write("""
-# Icons IDs
+export class IconsSelector {
-This file contains the Icons IDs included in the display firmware, addressable via serial.
+    iconMap = new Map<string, string>([
 ID | MD Icon Name | Icon
 -- | ------------ | ----
 """)
-    for idx, val in enumerate(icon_name_list):
+    for icon in icon_metadata:
-        f.write(f"{idx} | {val} | ![{val}](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/{val}.svg)\n")
+        iconchar = chr(int(icon['hex'], 16))
        name = icon["name"]
        f.write(f"        [\"{name}\", \"{iconchar}\"],\n")
    f.write("]);\n")
    f.write("""
    GetIcon(ma_name:string):string{
        if(this.iconMap.has(ma_name)){
            return this.iconMap.get(ma_name)!;
        }
        return ""; 
    }
 }
 """);
-print("=== STRING for HMI Project ===")
+# write documentation file
-print("=== Put the following string into the txt field in nextion ===")
+#with open(os.path.join(__location__, "../..","icons.md"), 'w') as f:
-print(icon_nextion_string)
+#    f.write("""
 ## Icons IDs
 #This file contains the Icons IDs included in the display firmware, addressable via serial.
 #
 #MD Icon Name | Icon
 #------------ | ----
 #""")
 #    for icon in icon_metadata:
 #        val = icon["name"]
 #        f.write(f"mdi:{val} | ![{val}](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/{val}.svg)\n")
--- a/HMI/code_gen/pages/cardEntitiesSerial.py
+++ b/HMI/code_gen/pages/cardEntitiesSerial.py
@@ -7,7 +7,7 @@ head = sharedhead + """
 """ + navigation
 print(head)
 start = 3
-for i in range(1,7):
+for i in range(1,6):
    idxstart = start + (i-1)*6
    item = f"""
              // get Type
@@ -28,9 +28,7 @@ for i in range(1,7):
              }}else
              {{
                // change icon
-                spstr strCommand.txt,tTmp.txt,"~",{idxstart+2}
+                spstr strCommand.txt,tIcon{i}.txt,"~",{idxstart+2}
                covx tTmp.txt,sys0,0,0
                substr pageIcons.tIcons.txt,tIcon{i}.txt,sys0,1
                vis tIcon{i},1
                // change icon color
                spstr strCommand.txt,tTmp.txt,"~",{idxstart+3}
--- a/HMI/code_gen/pages/cardGridSerial.py
+++ b/HMI/code_gen/pages/cardGridSerial.py
@@ -3,7 +3,7 @@ head = sharedhead + """
            if(tInstruction.txt=="entityUpd")
            {
              // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6
-              spstr strCommand.txt,tHeading.txt,",",1
+              spstr strCommand.txt,tHeading.txt,"~",1
 """ + navigation
 print(head)
 start = 3
@@ -11,9 +11,9 @@ for i in range(1,7):
    idxstart = start + (i-1)*6
    item = f"""
              // get Type
-              spstr strCommand.txt,type{i}.txt,",",{idxstart}
+              spstr strCommand.txt,type{i}.txt,"~",{idxstart}
              // get internal name
-              spstr strCommand.txt,entn{i}.txt,",",{idxstart+1}
+              spstr strCommand.txt,entn{i}.txt,"~",{idxstart+1}
              if(type{i}.txt=="delete"||type{i}.txt=="")
              {{
                vis tEntity{i},0
@@ -21,16 +21,14 @@ for i in range(1,7):
              }}else
              {{
                // change icon
-                spstr strCommand.txt,tTmp.txt,",",{idxstart+2}
+                spstr strCommand.txt,bEntity{i}.txt,"~",{idxstart+2}
                covx tTmp.txt,sys0,0,0
                substr pageIcons.tIcons.txt,bEntity{i}.txt,sys0,1
                vis bEntity{i},1
                // change icon color
-                spstr strCommand.txt,tTmp.txt,",",{idxstart+3}
+                spstr strCommand.txt,tTmp.txt,"~",{idxstart+3}
                covx tTmp.txt,sys0,0,0
                bEntity{i}.pco=sys0
                // set name
-                spstr strCommand.txt,tEntity{i}.txt,",",{idxstart+4}
+                spstr strCommand.txt,tEntity{i}.txt,"~",{idxstart+4}
                vis tEntity{i},1
              }}
 """
--- a/HMI/code_gen/pages/cardThermo.py
+++ b/HMI/code_gen/pages/cardThermo.py
@@ -3,28 +3,28 @@ text = sharedhead + """
            if(tInstruction.txt=="entityUpd")
            {
              //heading
-              spstr strCommand.txt,tHeading.txt,",",1
+              spstr strCommand.txt,tHeading.txt,"~",1
 """ + navigation
 text += """
              //entity name
-              spstr strCommand.txt,entn.txt,",",3
+              spstr strCommand.txt,entn.txt,"~",3
              //currentTemp
-              spstr strCommand.txt,tTmp.txt,",",4
+              spstr strCommand.txt,tTmp.txt,"~",4
              covx tTmp.txt,xTempCurr.val,0,0
              //dstTemp
-              spstr strCommand.txt,tTmp.txt,",",4
+              spstr strCommand.txt,tTmp.txt,"~",5
              covx tTmp.txt,xTempDest.val,0,0
              //status
-              spstr strCommand.txt,tStatus.txt,",",6
+              spstr strCommand.txt,tStatus.txt,"~",6
              //minTemp
-              spstr strCommand.txt,tTmp.txt,",",7
+              spstr strCommand.txt,tTmp.txt,"~",7
              covx tTmp.txt,xTempMin.val,0,0
              //maxTemp
-              spstr strCommand.txt,tTmp.txt,",",8
+              spstr strCommand.txt,tTmp.txt,"~",8
              covx tTmp.txt,xTempMax.val,0,0
              //tempStep
-              spstr strCommand.txt,tTmp.txt,",",9
+              spstr strCommand.txt,tTmp.txt,"~",9
              covx tTmp.txt,xTempStep.val,0,0
              // disable all buttons
              vis bt0,0
@@ -41,21 +41,19 @@ text += """
 start = 10
 for i in range(0,9):
    idxstart = start + i*4
-    text += f"""              //bt{i}
+    text += f"""
-              spstr strCommand.txt,tTmp.txt,",",{idxstart}
+              //bt{i}
-              if(tTmp.txt!="")
+              spstr strCommand.txt,bt{i}.txt,"~",{idxstart}
              if(bt{i}.txt!="")
              {{
                // set icon
                covx tTmp.txt,sys0,0,0
                substr pageIcons.tIcons.txt,bt{i}.txt,sys0,1
                // set text color on active state
-                spstr strCommand.txt,tTmp.txt,",",{idxstart+1}
+                spstr strCommand.txt,tTmp.txt,"~",{idxstart+1}
                covx tTmp.txt,bt{i}.pco2,0,0
                // set state
-                spstr strCommand.txt,tTmp.txt,",",{idxstart+2}
+                spstr strCommand.txt,tTmp.txt,"~",{idxstart+2}
                covx tTmp.txt,bt{i}.val,0,0
                // save action
-                spstr strCommand.txt,va{i}.txt,",",{idxstart+3}
+                spstr strCommand.txt,va{i}.txt,"~",{idxstart+3}
                //enable
                vis bt{i},1
              }}"""
--- a/HMI/code_gen/pages/shared.py
+++ b/HMI/code_gen/pages/shared.py
@@ -160,7 +160,7 @@ navigation = """
              }
              if(tTmp.txt=="1")
              {
-                vis bPrev,1
+                vis bNext,1
                bNext.txt=""
              }
 """
--- a/HMI/icon-cheatsheet.html
+++ b/HMI/icon-cheatsheet.html
--- a/HMI/icons.md
+++ b/HMI/icons.md
@@ -1,60 +0,0 @@
 # Icons IDs
 This file contains the Icons IDs included in the display firmware, addressable via serial.
 ID | MD Icon Name | Icon
 -- | ------------ | ----
 0 | alert-circle-outline | ![alert-circle-outline](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/alert-circle-outline.svg)
 1 | lightbulb | ![lightbulb](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/lightbulb.svg)
 2 | thermometer | ![thermometer](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/thermometer.svg)
 3 | gesture-tap-button | ![gesture-tap-button](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/gesture-tap-button.svg)
 4 | flash | ![flash](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/flash.svg)
 5 | music | ![music](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/music.svg)
 6 | check-circle-outline | ![check-circle-outline](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/check-circle-outline.svg)
 7 | close-circle-outline | ![close-circle-outline](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/close-circle-outline.svg)
 8 | pause | ![pause](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/pause.svg)
 9 | play | ![play](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/play.svg)
 10 | palette | ![palette](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/palette.svg)
 11 | window-open | ![window-open](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/window-open.svg)
 12 | weather-cloudy | ![weather-cloudy](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/weather-cloudy.svg)
 13 | weather-fog | ![weather-fog](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/weather-fog.svg)
 14 | weather-hail | ![weather-hail](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/weather-hail.svg)
 15 | weather-lightning | ![weather-lightning](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/weather-lightning.svg)
 16 | weather-lightning-rainy | ![weather-lightning-rainy](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/weather-lightning-rainy.svg)
 17 | weather-night | ![weather-night](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/weather-night.svg)
 18 | weather-partly-cloudy | ![weather-partly-cloudy](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/weather-partly-cloudy.svg)
 19 | weather-pouring | ![weather-pouring](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/weather-pouring.svg)
 20 | weather-rainy | ![weather-rainy](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/weather-rainy.svg)
 21 | weather-snowy | ![weather-snowy](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/weather-snowy.svg)
 22 | weather-snowy-rainy | ![weather-snowy-rainy](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/weather-snowy-rainy.svg)
 23 | weather-sunny | ![weather-sunny](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/weather-sunny.svg)
 24 | weather-windy | ![weather-windy](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/weather-windy.svg)
 25 | weather-windy-variant | ![weather-windy-variant](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/weather-windy-variant.svg)
 26 | water-percent | ![water-percent](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/water-percent.svg)
 27 | power | ![power](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/power.svg)
 28 | fire | ![fire](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/fire.svg)
 29 | calendar-sync | ![calendar-sync](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/calendar-sync.svg)
 30 | fan | ![fan](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/fan.svg)
 31 | snowflake | ![snowflake](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/snowflake.svg)
 32 | solar-power | ![solar-power](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/solar-power.svg)
 33 | battery-charging-medium | ![battery-charging-medium](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/battery-charging-medium.svg)
 34 | battery-medium | ![battery-medium](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/battery-medium.svg)
 35 | shield-home | ![shield-home](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/shield-home.svg)
 36 | door-open | ![door-open](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/door-open.svg)
 37 | door-closed | ![door-closed](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/door-closed.svg)
 38 | window-closed | ![window-closed](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/window-closed.svg)
 39 | shield-off | ![shield-off](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/shield-off.svg)
 40 | shield | ![shield](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/shield.svg)
 41 | shield-lock | ![shield-lock](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/shield-lock.svg)
 42 | shield-airplane | ![shield-airplane](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/shield-airplane.svg)
 43 | bell-ring | ![bell-ring](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/bell-ring.svg)
 44 | ray-vertex | ![ray-vertex](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/ray-vertex.svg)
 45 | script-text | ![script-text](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/script-text.svg)
 46 | home-import-outline | ![home-import-outline](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/home-import-outline.svg)
 47 | home-export-outline | ![home-export-outline](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/home-export-outline.svg)
 48 | arrow-up-bold | ![arrow-up-bold](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/arrow-up-bold.svg)
 49 | arrow-down-bold | ![arrow-down-bold](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/arrow-down-bold.svg)
 50 | cast-audio | ![cast-audio](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/cast-audio.svg)
 51 | cast | ![cast](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/cast.svg)
 52 | radio | ![radio](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/radio.svg)
 53 | fireplace | ![fireplace](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/fireplace.svg)
--- a/HMI/n2t-out-visual/cardAlarm.txt
+++ b/HMI/n2t-out-visual/cardAlarm.txt
@@ -199,7 +199,7 @@ Text tCode
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 0
+        Font ID                             : 2
        Back. Color                         : 10565
        Font Color                          : 40179
        Horizontal Alignment                : center
@@ -229,7 +229,7 @@ Text tIcon
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Font Color                          : 65535
        Horizontal Alignment                : center
@@ -275,7 +275,7 @@ Button bNext
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -322,7 +322,7 @@ Button bPrev
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -378,7 +378,7 @@ Button b0
        Style                               : border
        Border Color                        : 6371
        Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -416,7 +416,7 @@ Button b1
        Style                               : border
        Border Color                        : 6371
        Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -454,7 +454,7 @@ Button b2
        Style                               : border
        Border Color                        : 6371
        Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -492,7 +492,7 @@ Button b3
        Style                               : border
        Border Color                        : 6371
        Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -530,7 +530,7 @@ Button b4
        Style                               : border
        Border Color                        : 6371
        Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -568,7 +568,7 @@ Button b5
        Style                               : border
        Border Color                        : 6371
        Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -606,7 +606,7 @@ Button b6
        Style                               : border
        Border Color                        : 6371
        Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -644,7 +644,7 @@ Button b7
        Style                               : border
        Border Color                        : 6371
        Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -682,7 +682,7 @@ Button b8
        Style                               : border
        Border Color                        : 6371
        Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -720,7 +720,7 @@ Button b9
        Style                               : border
        Border Color                        : 6371
        Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -758,7 +758,7 @@ Button b10
        Style                               : border
        Border Color                        : 6371
        Border Width                        : 2
-        Font ID                             : 0
+        Font ID                             : 2
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -1073,7 +1073,7 @@ Timer tmSerial
                                        }
                                        if(tTmp.txt=="1")
                                        {
-                                            vis bPrev,1
+                                            vis bNext,1
                                            bNext.txt="î³"
                                        }
                                        //text arm1
@@ -1109,9 +1109,7 @@ Timer tmSerial
                                        //id arm4
                                        spstr strCommand.txt,va4.txt,"~",10
                                        //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",11
+                                        spstr strCommand.txt,tIcon.txt,"~",11
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
                                        //icon color
                                        spstr strCommand.txt,tTmp.txt,"~",12
                                        covx tTmp.txt,sys0,0,0
--- a/HMI/n2t-out-visual/cardEntities.txt
+++ b/HMI/n2t-out-visual/cardEntities.txt
@@ -272,7 +272,7 @@ Text tHeading
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
        Back. Color                         : 6371
        Font Color                          : 65535
        Horizontal Alignment                : center
@@ -1414,7 +1414,7 @@ Button bPrev
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -1468,7 +1468,7 @@ Button bNext
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -2096,7 +2096,7 @@ Timer tmSerial
                                        }
                                        if(tTmp.txt=="1")
                                        {
-                                            vis bPrev,1
+                                            vis bNext,1
                                            bNext.txt="î³"
                                        }
                                        // get Type
@@ -2117,9 +2117,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",5
+                                            spstr strCommand.txt,tIcon1.txt,"~",5
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
                                            vis tIcon1,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",6
@@ -2241,9 +2239,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",11
+                                            spstr strCommand.txt,tIcon2.txt,"~",11
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,tIcon2.txt,sys0,1
                                            vis tIcon2,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",12
@@ -2365,9 +2361,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",17
+                                            spstr strCommand.txt,tIcon3.txt,"~",17
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,tIcon3.txt,sys0,1
                                            vis tIcon3,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",18
@@ -2489,9 +2483,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",23
+                                            spstr strCommand.txt,tIcon4.txt,"~",23
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,tIcon4.txt,sys0,1
                                            vis tIcon4,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",24
--- a/HMI/n2t-out-visual/cardGrid.txt
+++ b/HMI/n2t-out-visual/cardGrid.txt
@@ -152,7 +152,7 @@ Text tHeading
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
        Back. Color                         : 6371
        Font Color                          : 65535
        Horizontal Alignment                : center
@@ -232,7 +232,7 @@ Text tTmp
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
-        x coordinate                        : 424
+        x coordinate                        : 400
        y coordinate                        : 290
        Width                               : 34
        Height                              : 30
@@ -498,7 +498,7 @@ Button bPrev
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -552,7 +552,7 @@ Button bNext
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -599,7 +599,7 @@ Button bEntity1
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -657,7 +657,7 @@ Button bEntity2
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -715,7 +715,7 @@ Button bEntity3
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -773,7 +773,7 @@ Button bEntity4
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -831,7 +831,7 @@ Button bEntity5
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -889,7 +889,7 @@ Button bEntity6
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 3
+        Font ID                             : 4
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -1036,7 +1036,7 @@ Timer tmSerial
                                        }
                                        if(tTmp.txt=="1")
                                        {
-                                            vis bPrev,1
+                                            vis bNext,1
                                            bNext.txt="î³"
                                        }
                                        // get Type
@@ -1050,9 +1050,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",5
+                                            spstr strCommand.txt,bEntity1.txt,"~",5
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1
                                            vis bEntity1,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",6
@@ -1073,9 +1071,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",11
+                                            spstr strCommand.txt,bEntity2.txt,"~",11
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1
                                            vis bEntity2,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",12
@@ -1096,9 +1092,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",17
+                                            spstr strCommand.txt,bEntity3.txt,"~",17
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1
                                            vis bEntity3,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",18
@@ -1119,9 +1113,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",23
+                                            spstr strCommand.txt,bEntity4.txt,"~",23
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1
                                            vis bEntity4,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",24
@@ -1142,9 +1134,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",29
+                                            spstr strCommand.txt,bEntity5.txt,"~",29
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1
                                            vis bEntity5,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",30
@@ -1165,9 +1155,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",35
+                                            spstr strCommand.txt,bEntity6.txt,"~",35
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1
                                            vis bEntity6,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",36
--- a/HMI/n2t-out-visual/cardMedia.txt
+++ b/HMI/n2t-out-visual/cardMedia.txt
@@ -93,8 +93,8 @@ Text tTmp
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
-        x coordinate                        : 450
+        x coordinate                        : 14
-        y coordinate                        : 145
+        y coordinate                        : 156
        Width                               : 27
        Height                              : 30
        Effect                              : load
@@ -153,8 +153,8 @@ Text tId
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
-        x coordinate                        : 449
+        x coordinate                        : 49
-        y coordinate                        : 187
+        y coordinate                        : 159
        Width                               : 30
        Height                              : 30
        Effect                              : load
@@ -193,7 +193,7 @@ Text tHeading
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
        Back. Color                         : 6371
        Font Color                          : 65535
        Horizontal Alignment                : center
@@ -283,7 +283,7 @@ Text t2
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Font Color                          : 50712
        Horizontal Alignment                : center
@@ -332,7 +332,7 @@ Text tPlayPause
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Font Color                          : 50712
        Horizontal Alignment                : center
@@ -381,7 +381,7 @@ Text t0
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Font Color                          : 50712
        Horizontal Alignment                : center
@@ -430,7 +430,7 @@ Text tIcon
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Font Color                          : 65535
        Horizontal Alignment                : center
@@ -460,7 +460,7 @@ Text t1
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Font Color                          : 50712
        Horizontal Alignment                : center
@@ -510,7 +510,7 @@ Text t3
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Font Color                          : 50712
        Horizontal Alignment                : center
@@ -560,7 +560,7 @@ Text t4
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Font Color                          : 50712
        Horizontal Alignment                : center
@@ -639,7 +639,7 @@ Text t6
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Font Color                          : 50712
        Horizontal Alignment                : center
@@ -681,7 +681,7 @@ Text t5
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Font Color                          : 50712
        Horizontal Alignment                : center
@@ -792,7 +792,7 @@ Button bNext
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -839,7 +839,7 @@ Button bPrev
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -956,15 +956,13 @@ Timer tmSerial
                                        }
                                        if(tTmp.txt=="1")
                                        {
-                                            vis bPrev,1
+                                            vis bNext,1
                                            bNext.txt="î³"
                                        }
                                        //entity name
                                        spstr strCommand.txt,entn.txt,"~",3
                                        //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        spstr strCommand.txt,tIcon.txt,"~",4
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
                                        //title
                                        spstr strCommand.txt,tTitle.txt,"~",5
                                        //author
@@ -974,9 +972,7 @@ Timer tmSerial
                                        covx tTmp.txt,sys0,0,0
                                        hVolume.val=sys0
                                        //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",8
+                                        spstr strCommand.txt,tPlayPause.txt,"~",8
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
                                        //speaker current
                                        spstr strCommand.txt,tSpeaker.txt,"~",9
                                        if(tSpeaker.txt!="")
--- a/HMI/n2t-out-visual/cardThermo.txt
+++ b/HMI/n2t-out-visual/cardThermo.txt
@@ -135,7 +135,7 @@ XFloat xTempCurr
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 3
+        Font ID                             : 4
        Back. Color                         : 6371
        Font Color                          : 65535
        Horizontal Alignment                : center
@@ -405,7 +405,7 @@ Text tHeading
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
        Back. Color                         : 6371
        Font Color                          : 65535
        Horizontal Alignment                : center
@@ -511,7 +511,7 @@ Button bNext
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -666,7 +666,7 @@ Button bPrev
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 14823
@@ -1224,7 +1224,7 @@ Timer tmSerial
                                        }
                                        if(tTmp.txt=="1")
                                        {
-                                            vis bPrev,1
+                                            vis bNext,1
                                            bNext.txt="î³"
                                        }
                                        //entity name
@@ -1257,12 +1257,9 @@ Timer tmSerial
                                        vis bt7,0
                                        vis bt8,0
                                        //bt0
-                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        spstr strCommand.txt,bt0.txt,"~",10
-                                        if(tTmp.txt!="")
+                                        if(bt0.txt!="")
                                        {
                                            // set icon
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bt0.txt,sys0,1
                                            // set text color on active state
                                            spstr strCommand.txt,tTmp.txt,"~",11
                                            covx tTmp.txt,bt0.pco2,0,0
@@ -1273,232 +1270,216 @@ Timer tmSerial
                                            spstr strCommand.txt,va0.txt,"~",13
                                            //enable
                                            vis bt0,1
-                                            }              //bt1
+                                        }
-                                            spstr strCommand.txt,tTmp.txt,"~",14
+                                        //bt1
-                                            if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt1.txt,"~",14
-                                            {
+                                        if(bt1.txt!="")
-                                                // set icon
+                                        {
-                                                covx tTmp.txt,sys0,0,0
+                                            // set text color on active state
-                                                substr pageIcons.tIcons.txt,bt1.txt,sys0,1
+                                            spstr strCommand.txt,tTmp.txt,"~",15
-                                                // set text color on active state
+                                            covx tTmp.txt,bt1.pco2,0,0
-                                                spstr strCommand.txt,tTmp.txt,"~",15
+                                            // set state
-                                                covx tTmp.txt,bt1.pco2,0,0
+                                            spstr strCommand.txt,tTmp.txt,"~",16
-                                                // set state
+                                            covx tTmp.txt,bt1.val,0,0
-                                                spstr strCommand.txt,tTmp.txt,"~",16
+                                            // save action
-                                                covx tTmp.txt,bt1.val,0,0
+                                            spstr strCommand.txt,va1.txt,"~",17
-                                                // save action
+                                            //enable
-                                                spstr strCommand.txt,va1.txt,"~",17
+                                            vis bt1,1
-                                                //enable
+                                        }
-                                                vis bt1,1
+                                        //bt2
-                                                }              //bt2
+                                        spstr strCommand.txt,bt2.txt,"~",18
-                                                spstr strCommand.txt,tTmp.txt,"~",18
+                                        if(bt2.txt!="")
-                                                if(tTmp.txt!="")
+                                        {
-                                                {
+                                            // set text color on active state
-                                                    // set icon
+                                            spstr strCommand.txt,tTmp.txt,"~",19
-                                                    covx tTmp.txt,sys0,0,0
+                                            covx tTmp.txt,bt2.pco2,0,0
-                                                    substr pageIcons.tIcons.txt,bt2.txt,sys0,1
+                                            // set state
-                                                    // set text color on active state
+                                            spstr strCommand.txt,tTmp.txt,"~",20
-                                                    spstr strCommand.txt,tTmp.txt,"~",19
+                                            covx tTmp.txt,bt2.val,0,0
-                                                    covx tTmp.txt,bt2.pco2,0,0
+                                            // save action
-                                                    // set state
+                                            spstr strCommand.txt,va2.txt,"~",21
-                                                    spstr strCommand.txt,tTmp.txt,"~",20
+                                            //enable
-                                                    covx tTmp.txt,bt2.val,0,0
+                                            vis bt2,1
-                                                    // save action
+                                        }
-                                                    spstr strCommand.txt,va2.txt,"~",21
+                                        //bt3
-                                                    //enable
+                                        spstr strCommand.txt,bt3.txt,"~",22
-                                                    vis bt2,1
+                                        if(bt3.txt!="")
-                                                    }              //bt3
+                                        {
-                                                    spstr strCommand.txt,tTmp.txt,"~",22
+                                            // set text color on active state
-                                                    if(tTmp.txt!="")
+                                            spstr strCommand.txt,tTmp.txt,"~",23
-                                                    {
+                                            covx tTmp.txt,bt3.pco2,0,0
-                                                        // set icon
+                                            // set state
-                                                        covx tTmp.txt,sys0,0,0
+                                            spstr strCommand.txt,tTmp.txt,"~",24
-                                                        substr pageIcons.tIcons.txt,bt3.txt,sys0,1
+                                            covx tTmp.txt,bt3.val,0,0
-                                                        // set text color on active state
+                                            // save action
-                                                        spstr strCommand.txt,tTmp.txt,"~",23
+                                            spstr strCommand.txt,va3.txt,"~",25
-                                                        covx tTmp.txt,bt3.pco2,0,0
+                                            //enable
-                                                        // set state
+                                            vis bt3,1
-                                                        spstr strCommand.txt,tTmp.txt,"~",24
+                                        }
-                                                        covx tTmp.txt,bt3.val,0,0
+                                        //bt4
-                                                        // save action
+                                        spstr strCommand.txt,bt4.txt,"~",26
-                                                        spstr strCommand.txt,va3.txt,"~",25
+                                        if(bt4.txt!="")
-                                                        //enable
+                                        {
-                                                        vis bt3,1
+                                            // set text color on active state
-                                                        }              //bt4
+                                            spstr strCommand.txt,tTmp.txt,"~",27
-                                                        spstr strCommand.txt,tTmp.txt,"~",26
+                                            covx tTmp.txt,bt4.pco2,0,0
-                                                        if(tTmp.txt!="")
+                                            // set state
-                                                        {
+                                            spstr strCommand.txt,tTmp.txt,"~",28
-                                                            // set icon
+                                            covx tTmp.txt,bt4.val,0,0
-                                                            covx tTmp.txt,sys0,0,0
+                                            // save action
-                                                            substr pageIcons.tIcons.txt,bt4.txt,sys0,1
+                                            spstr strCommand.txt,va4.txt,"~",29
-                                                            // set text color on active state
+                                            //enable
-                                                            spstr strCommand.txt,tTmp.txt,"~",27
+                                            vis bt4,1
-                                                            covx tTmp.txt,bt4.pco2,0,0
+                                        }
-                                                            // set state
+                                        //bt5
-                                                            spstr strCommand.txt,tTmp.txt,"~",28
+                                        spstr strCommand.txt,bt5.txt,"~",30
-                                                            covx tTmp.txt,bt4.val,0,0
+                                        if(bt5.txt!="")
-                                                            // save action
+                                        {
-                                                            spstr strCommand.txt,va4.txt,"~",29
+                                            // set text color on active state
-                                                            //enable
+                                            spstr strCommand.txt,tTmp.txt,"~",31
-                                                            vis bt4,1
+                                            covx tTmp.txt,bt5.pco2,0,0
-                                                            }              //bt5
+                                            // set state
-                                                            spstr strCommand.txt,tTmp.txt,"~",30
+                                            spstr strCommand.txt,tTmp.txt,"~",32
-                                                            if(tTmp.txt!="")
+                                            covx tTmp.txt,bt5.val,0,0
-                                                            {
+                                            // save action
-                                                                // set icon
+                                            spstr strCommand.txt,va5.txt,"~",33
-                                                                covx tTmp.txt,sys0,0,0
+                                            //enable
-                                                                substr pageIcons.tIcons.txt,bt5.txt,sys0,1
+                                            vis bt5,1
-                                                                // set text color on active state
+                                        }
-                                                                spstr strCommand.txt,tTmp.txt,"~",31
+                                        //bt6
-                                                                covx tTmp.txt,bt5.pco2,0,0
+                                        spstr strCommand.txt,bt6.txt,"~",34
-                                                                // set state
+                                        if(bt6.txt!="")
-                                                                spstr strCommand.txt,tTmp.txt,"~",32
+                                        {
-                                                                covx tTmp.txt,bt5.val,0,0
+                                            // set text color on active state
-                                                                // save action
+                                            spstr strCommand.txt,tTmp.txt,"~",35
-                                                                spstr strCommand.txt,va5.txt,"~",33
+                                            covx tTmp.txt,bt6.pco2,0,0
-                                                                //enable
+                                            // set state
-                                                                vis bt5,1
+                                            spstr strCommand.txt,tTmp.txt,"~",36
-                                                                }              //bt6
+                                            covx tTmp.txt,bt6.val,0,0
-                                                                spstr strCommand.txt,tTmp.txt,"~",34
+                                            // save action
-                                                                if(tTmp.txt!="")
+                                            spstr strCommand.txt,va6.txt,"~",37
-                                                                {
+                                            //enable
-                                                                    // set icon
+                                            vis bt6,1
-                                                                    covx tTmp.txt,sys0,0,0
+                                        }
-                                                                    substr pageIcons.tIcons.txt,bt6.txt,sys0,1
+                                        //bt7
-                                                                    // set text color on active state
+                                        spstr strCommand.txt,bt7.txt,"~",38
-                                                                    spstr strCommand.txt,tTmp.txt,"~",35
+                                        if(bt7.txt!="")
-                                                                    covx tTmp.txt,bt6.pco2,0,0
+                                        {
-                                                                    // set state
+                                            // set text color on active state
-                                                                    spstr strCommand.txt,tTmp.txt,"~",36
+                                            spstr strCommand.txt,tTmp.txt,"~",39
-                                                                    covx tTmp.txt,bt6.val,0,0
+                                            covx tTmp.txt,bt7.pco2,0,0
-                                                                    // save action
+                                            // set state
-                                                                    spstr strCommand.txt,va6.txt,"~",37
+                                            spstr strCommand.txt,tTmp.txt,"~",40
-                                                                    //enable
+                                            covx tTmp.txt,bt7.val,0,0
-                                                                    vis bt6,1
+                                            // save action
-                                                                    }              //bt7
+                                            spstr strCommand.txt,va7.txt,"~",41
-                                                                    spstr strCommand.txt,tTmp.txt,"~",38
+                                            //enable
-                                                                    if(tTmp.txt!="")
+                                            vis bt7,1
-                                                                    {
+                                        }
-                                                                        // set icon
+                                        //bt8
-                                                                        covx tTmp.txt,sys0,0,0
+                                        spstr strCommand.txt,bt8.txt,"~",42
-                                                                        substr pageIcons.tIcons.txt,bt7.txt,sys0,1
+                                        if(bt8.txt!="")
-                                                                        // set text color on active state
+                                        {
-                                                                        spstr strCommand.txt,tTmp.txt,"~",39
+                                            // set text color on active state
-                                                                        covx tTmp.txt,bt7.pco2,0,0
+                                            spstr strCommand.txt,tTmp.txt,"~",43
-                                                                        // set state
+                                            covx tTmp.txt,bt8.pco2,0,0
-                                                                        spstr strCommand.txt,tTmp.txt,"~",40
+                                            // set state
-                                                                        covx tTmp.txt,bt7.val,0,0
+                                            spstr strCommand.txt,tTmp.txt,"~",44
-                                                                        // save action
+                                            covx tTmp.txt,bt8.val,0,0
-                                                                        spstr strCommand.txt,va7.txt,"~",41
+                                            // save action
-                                                                        //enable
+                                            spstr strCommand.txt,va8.txt,"~",45
-                                                                        vis bt7,1
+                                            //enable
-                                                                        }              //bt8
+                                            vis bt8,1
-                                                                        spstr strCommand.txt,tTmp.txt,"~",42
+                                        }
-                                                                        if(tTmp.txt!="")
+                                    }
-                                                                        {
+                                    if(tInstruction.txt=="pageType")
-                                                                            // set icon
+                                    {
-                                                                            covx tTmp.txt,sys0,0,0
+                                        //command format pageType,specialPageName
-                                                                            substr pageIcons.tIcons.txt,bt8.txt,sys0,1
+                                        //write name of speical page to tId
-                                                                            // set text color on active state
+                                        spstr strCommand.txt,tId.txt,"~",1
-                                                                            spstr strCommand.txt,tTmp.txt,"~",43
+                                        //save second arg if there's one
-                                                                            covx tTmp.txt,bt8.pco2,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",2
-                                                                            // set state
+                                        //save third arg if there's one
-                                                                            spstr strCommand.txt,tTmp.txt,"~",44
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
-                                                                            covx tTmp.txt,bt8.val,0,0
+                                        //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 ...
-                                                                            // save action
+                                        udelete payloadLength-1
-                                                                            spstr strCommand.txt,va8.txt,"~",45
+                                        bufferPos=0
-                                                                            //enable
+                                        if(tId.txt=="pageStartup")
-                                                                            vis bt8,1
+                                        {
-                                                                        }
+                                            page pageStartup
-                                                                    }
+                                        }
-                                                                    if(tInstruction.txt=="pageType")
+                                        if(tId.txt=="screensaver")
-                                                                    {
+                                        {
-                                                                        //command format pageType,specialPageName
+                                            page screensaver
-                                                                        //write name of speical page to tId
+                                        }
-                                                                        spstr strCommand.txt,tId.txt,"~",1
+                                        if(tId.txt=="cardEntities")
-                                                                        //save second arg if there's one
+                                        {
-                                                                        spstr strCommand.txt,tTmp.txt,"~",2
+                                            page cardEntities
-                                                                        //save third arg if there's one
+                                        }
-                                                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
+                                        if(tId.txt=="cardGrid")
-                                                                        //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
+                                            page cardGrid
-                                                                        bufferPos=0
+                                        }
-                                                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
-                                                                        {
+                                        {
-                                                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
-                                                                        }
+                                            page popupLight
-                                                                        if(tId.txt=="screensaver")
+                                        }
-                                                                        {
+                                        if(tId.txt=="popupShutter")
-                                                                            page screensaver
+                                        {
-                                                                        }
+                                            pageIcons.tTmp1.txt=tTmp.txt
-                                                                        if(tId.txt=="cardEntities")
+                                            page popupShutter
-                                                                        {
+                                        }
-                                                                            page cardEntities
+                                        if(tId.txt=="popupNotify")
-                                                                        }
+                                        {
-                                                                        if(tId.txt=="cardGrid")
+                                            page popupNotify
-                                                                        {
+                                        }
-                                                                            page cardGrid
+                                        if(tId.txt=="cardThermo")
-                                                                        }
+                                        {
-                                                                        if(tId.txt=="popupLight")
+                                            page cardThermo
-                                                                        {
+                                        }
-                                                                            pageIcons.tTmp1.txt=tTmp.txt
+                                        if(tId.txt=="cardMedia")
-                                                                            page popupLight
+                                        {
-                                                                        }
+                                            page cardMedia
-                                                                        if(tId.txt=="popupShutter")
+                                        }
-                                                                        {
+                                        if(tId.txt=="cardAlarm")
-                                                                            pageIcons.tTmp1.txt=tTmp.txt
+                                        {
-                                                                            page popupShutter
+                                            page cardAlarm
-                                                                        }
+                                        }
-                                                                        if(tId.txt=="popupNotify")
+                                    }
-                                                                        {
+                                    if(tInstruction.txt=="time")
-                                                                            page popupNotify
+                                    {
-                                                                        }
+                                        // get set time to global variable
-                                                                        if(tId.txt=="cardThermo")
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
-                                                                        {
+                                    }
-                                                                            page cardThermo
+                                    if(tInstruction.txt=="date")
-                                                                        }
+                                    {
-                                                                        if(tId.txt=="cardMedia")
+                                        // get set date to global variable
-                                                                        {
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
-                                                                            page cardMedia
+                                    }
-                                                                        }
+                                    if(tInstruction.txt=="dimmode")
-                                                                        if(tId.txt=="cardAlarm")
+                                    {
-                                                                        {
+                                        // get value
-                                                                            page cardAlarm
+                                        spstr strCommand.txt,tTmp.txt,"~",1
-                                                                        }
+                                        covx tTmp.txt,dimValue,0,0
-                                                                    }
+                                    }
-                                                                    if(tInstruction.txt=="time")
+                                    if(tInstruction.txt=="timeout")
-                                                                    {
+                                    {
-                                                                        // get set time to global variable
+                                        //set timeout to global var
-                                                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
-                                                                    }
+                                        covx tTmp.txt,sleepTimeout,0,0
-                                                                    if(tInstruction.txt=="date")
+                                    }
-                                                                    {
+                                    // end of user code
-                                                                        // get set date to global variable
+                                    udelete payloadLength-1
-                                                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+                                    bufferPos=0
-                                                                    }
+                                }
-                                                                    if(tInstruction.txt=="dimmode")
+                            }
-                                                                    {
+                        }
-                                                                        // get value
+                    }
-                                                                        spstr strCommand.txt,tTmp.txt,"~",1
+                    // next character
-                                                                        covx tTmp.txt,dimValue,0,0
+                    bufferPos++
-                                                                    }
+                }
-                                                                    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++
                                                }
                                            }
 Timer tmSleep
    Attributes
--- a/HMI/n2t-out-visual/nspanel_Stats.txt
+++ b/HMI/n2t-out-visual/nspanel_Stats.txt
@@ -2,61 +2,57 @@ Program.s
 	0    Component(s)
 	11   Line(s) of event code
 	11   Unique line(s) of event code
 pageIcons
 	6    Component(s)
 	0    Line(s) of event code
 	0    Unique line(s) of event code
 pageTest
 	13   Component(s)
 	13   Line(s) of event code
 	13   Unique line(s) of event code
 pageSerialTest
 	13   Component(s)
 	48   Line(s) of event code
 	43   Unique line(s) of event code
 pageIcons
 	7    Component(s)
 	0    Line(s) of event code
 	0    Unique line(s) of event code
 popupNotify
 	17   Component(s)
 	178  Line(s) of event code
 	117  Unique line(s) of event code
 popupShutter
 	19   Component(s)
 	178  Line(s) of event code
 	101  Unique line(s) of event code
 popupLight
 	27   Component(s)
 	322  Line(s) of event code
 	173  Unique line(s) of event code
 pageStartup
 	19   Component(s)
 	150  Line(s) of event code
 	113  Unique line(s) of event code
-cardThermo
+popupLight
-	41   Component(s)
+	27   Component(s)
-	460  Line(s) of event code
+	338  Line(s) of event code
-	284  Unique line(s) of event code
+	182  Unique line(s) of event code
 popupShutter
 	19   Component(s)
 	191  Line(s) of event code
 	107  Unique line(s) of event code
 popupNotify
 	17   Component(s)
 	196  Line(s) of event code
 	123  Unique line(s) of event code
 cardMedia
 	30   Component(s)
-	333  Line(s) of event code
+	329  Line(s) of event code
-	170  Unique line(s) of event code
+	169  Unique line(s) of event code
-screensaver
+cardThermo
-	33   Component(s)
+	41   Component(s)
-	207  Line(s) of event code
+	442  Line(s) of event code
-	158  Unique line(s) of event code
+	247  Unique line(s) of event code
 cardAlarm
 	35   Component(s)
 	345  Line(s) of event code
 	214  Unique line(s) of event code
 cardGrid
 	39   Component(s)
-	430  Line(s) of event code
+	418  Line(s) of event code
-	249  Unique line(s) of event code
+	244  Unique line(s) of event code
 screensaver
 	33   Component(s)
 	266  Line(s) of event code
 	218  Unique line(s) of event code
 cardAlarm
 	35   Component(s)
 	343  Line(s) of event code
 	214  Unique line(s) of event code
 cardEntities
 	62   Component(s)
-	972  Line(s) of event code
+	964  Line(s) of event code
-	413  Unique line(s) of event code
+	410  Unique line(s) of event code
 Total
-	13   Page(s)
+	12   Page(s)
-	355  Component(s)
+	341  Component(s)
-	3647 Line(s) of event code
+	3661 Line(s) of event code
-	1040 Unique line(s) of event code
+	1002 Unique line(s) of event code
--- a/HMI/n2t-out-visual/pageIcons.txt
+++ b/HMI/n2t-out-visual/pageIcons.txt
@@ -20,51 +20,21 @@ Page pageIcons
 Variable (string) vaTime
    Attributes
-        ID            : 5
+        ID            : 4
        Scope         : global
        Text          : 
        Max. Text Size: 15
 Variable (string) vaDate
    Attributes
-        ID            : 6
+        ID            : 5
        Scope         : global
        Text          : 
        Max. Text Size: 35
 Text tIcons
    Attributes
        ID                                  : 2
        Scope                               : global
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 1
        y coordinate                        : 8
        Width                               : 298
        Height                              : 299
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 1
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : left
        Vertical Alignment                  : top
        Input Type                          : character
        Text                                : îî´îï§îîî îî£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîî©±ï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾î¶îïîî¸î¸
        Max. Text Size                      : 170
        Word wrap                           : enabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Text tTmp1
    Attributes
-        ID                                  : 3
+        ID                                  : 2
        Scope                               : global
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -94,7 +64,7 @@ Text tTmp1
 Text tTmp2
    Attributes
-        ID                                  : 4
+        ID                                  : 3
        Scope                               : global
        Dragging                            : 0
        Disable release event after dragging: 0
--- a/HMI/n2t-out-visual/pageSerialTest.txt
+++ b/HMI/n2t-out-visual/pageSerialTest.txt
@@ -1,434 +0,0 @@
 Page pageSerialTest
    Attributes
        ID                                  : 0
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        Width                               : 480
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Locked                              : no
        Swide up page ID                    : disabled
        Swide down page ID                  : disabled
        Swide left page ID                  : disabled
        Swide right page ID                 : disabled
        Fill                                : solid color
        Back. Color                         : 65535
    Events
        Preinitialize Event
            //vis p0,0
            //recmod=1
            //bauds=115200
 Number nCrcRecv
    Attributes
        ID                                  : 5
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 160
        y coordinate                        : 0
        Width                               : 88
        Height                              : 29
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 4
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Value                               : 0
        Significant digits shown            : all
        Format                              : decimal with digit grouping
        Word wrap                           : enabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Number nCrcCalc
    Attributes
        ID                                  : 6
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 159
        y coordinate                        : 31
        Width                               : 90
        Height                              : 30
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 4
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Value                               : 0
        Significant digits shown            : all
        Format                              : decimal with digit grouping
        Word wrap                           : enabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Number nIt
    Attributes
        ID                                  : 11
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 378
        y coordinate                        : 234
        Width                               : 52
        Height                              : 30
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 4
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Value                               : 0
        Significant digits shown            : all
        Format                              : decimal
        Word wrap                           : enabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Number nLength
    Attributes
        ID                                  : 12
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 15
        y coordinate                        : 215
        Width                               : 100
        Height                              : 30
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 0
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Value                               : 0
        Significant digits shown            : all
        Format                              : decimal
        Word wrap                           : enabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Text tStatus
    Attributes
        ID                                  : 3
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 160
        y coordinate                        : 60
        Width                               : 271
        Height                              : 90
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 4
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
        Text                                : newtxt
        Max. Text Size                      : 100
        Word wrap                           : enabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Text tCmd
    Attributes
        ID                                  : 4
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 160
        y coordinate                        : 151
        Width                               : 272
        Height                              : 80
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 4
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
        Text                                : newtxt
        Max. Text Size                      : 500
        Word wrap                           : enabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Text tBuffer
    Attributes
        ID                                  : 7
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 7
        y coordinate                        : 270
        Width                               : 435
        Height                              : 30
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 4
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
        Text                                : newtxt
        Max. Text Size                      : 100
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Text tDesc
    Attributes
        ID                                  : 8
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 0
        y coordinate                        : 0
        Width                               : 159
        Height                              : 204
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 4
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
        Text                                : CRC Recv:\r\nCRC Calc:\r\n\r\nStatus\r\n\r\nCommand
        Max. Text Size                      : 60
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Picture p0
    Attributes
        ID                                  : 1
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 0
        y coordinate                        : 0
        Width                               : 479
        Height                              : 319
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Picture ID                          : 0
 Button b0
    Attributes
        ID                                  : 9
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 334
        y coordinate                        : 9
        Width                               : 46
        Height                              : 46
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
        Font ID                             : 4
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 0
        Back. Color (Pressed)               : 1024
        Font Color (Unpressed)              : 0
        Font Color (Pressed)                : 65535
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        State                               : unpressed
        Text                                : bck
        Max. Text Size                      : 10
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
    Events
        Touch Press Event
            recmod=0
            page pageTest
 Button b1
    Attributes
        ID                                  : 10
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 392
        y coordinate                        : 10
        Width                               : 48
        Height                              : 48
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
        Font ID                             : 4
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 0
        Back. Color (Pressed)               : 1024
        Font Color (Unpressed)              : 0
        Font Color (Pressed)                : 65535
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        State                               : unpressed
        Text                                : ON
        Max. Text Size                      : 10
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
    Events
        Touch Press Event
            recmod=1
            bauds=115200
 Timer tmSerial
    Attributes
        ID         : 2
        Scope      : local
        Period (ms): 400
        Enabled    : yes
    Events
        Timer Event
            // 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
                        }
                        tStatus.txt="init command detected"
                        //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
                            //payloadLength=u[2]
                            ucopy payloadLength,2,2,0
                            nLength.val=payloadLength
                            // 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)
                            {
                                tStatus.txt="reached"
                                // calculate crc
                                crcrest 1,0xFFFF
                                // payload length -1 to exclude crc
                                crcputu 0,payloadLength-1 //u[2]+3
                                // get recived crc to be able to compare it
                                ucopy recvCrc,payloadLength-1,2,0
                                nCrcRecv.val=recvCrc
                                // compare crc with recived value
                                if(crcval==recvCrc)
                                {
                                    tStatus.txt="crc ok"
                                    nIt.val=nIt.val+1
                                    ucopy tCmd.txt,4,payloadLength-5,0
                                    udelete payloadLength-1
                                    bufferPos=0
                                    // here is the location where acual code should be
                                }
                                // copy calculated crc and recived crc to nCrcRecv and nCrcCalc, for debugging
                                nCrcRecv.val=recvCrc
                                nCrcCalc.val=crcval
                                //ucopy nCrcCalc.val,u[2]+3,3,0
                            }
                        }
                    }
                    // next character
                    bufferPos++
                }
                if(bufferPos==usize)
                {
                    // copy whole buffer to tCmd.txt, for debugging
                    //ucopy tBuffer.txt,0,usize,0
                    // ucopy nIt.val,0,usize,0
                    // clear whole buffer
                    //code_c
                    //bufferPos=0
                }
            }
--- a/HMI/n2t-out-visual/pageStartup.txt
+++ b/HMI/n2t-out-visual/pageStartup.txt
@@ -402,7 +402,7 @@ Text tVersion
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
-        Text                                : 28
+        Text                                : 31
        Max. Text Size                      : 10
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
--- a/HMI/n2t-out-visual/pageTest.txt
+++ b/HMI/n2t-out-visual/pageTest.txt
@@ -56,7 +56,7 @@ Button b0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 1024
@@ -75,7 +75,7 @@ Button b0
        Touch Press Event
            page cardEntities
-Button b1
+Button b3
    Attributes
        ID                                  : 3
        Scope                               : local
@@ -84,43 +84,7 @@ Button b1
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 347
-        y coordinate                        : 262
+        y coordinate                        : 184
        Width                               : 100
        Height                              : 50
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
        Font ID                             : 4
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 1024
        Font Color (Unpressed)              : 0
        Font Color (Pressed)                : 65535
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        State                               : unpressed
        Text                                : serial
        Max. Text Size                      : 10
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
    Events
        Touch Press Event
            page pageSerialTest
 Button b3
    Attributes
        ID                                  : 4
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 345
        y coordinate                        : 195
        Width                               : 102
        Height                              : 63
        Effect                              : load
@@ -128,7 +92,7 @@ Button b3
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 0
        Back. Color (Pressed)               : 1024
@@ -149,7 +113,7 @@ Button b3
 Button b6
    Attributes
-        ID                                  : 5
+        ID                                  : 4
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -164,7 +128,7 @@ Button b6
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 1024
@@ -185,7 +149,7 @@ Button b6
 Button b4
    Attributes
-        ID                                  : 6
+        ID                                  : 5
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -200,7 +164,7 @@ Button b4
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 1024
@@ -221,7 +185,7 @@ Button b4
 Button b5
    Attributes
-        ID                                  : 7
+        ID                                  : 6
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -236,7 +200,7 @@ Button b5
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 1024
@@ -257,7 +221,7 @@ Button b5
 Button b7
    Attributes
-        ID                                  : 8
+        ID                                  : 7
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -272,7 +236,7 @@ Button b7
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 1024
@@ -293,7 +257,7 @@ Button b7
 Button b8
    Attributes
-        ID                                  : 9
+        ID                                  : 8
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -308,7 +272,7 @@ Button b8
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 1024
@@ -330,7 +294,7 @@ Button b8
 Button b9
    Attributes
-        ID                                  : 10
+        ID                                  : 9
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -345,7 +309,7 @@ Button b9
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 1024
@@ -366,7 +330,7 @@ Button b9
 Button b10
    Attributes
-        ID                                  : 11
+        ID                                  : 10
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -381,7 +345,7 @@ Button b10
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 1024
@@ -402,7 +366,7 @@ Button b10
 Button b11
    Attributes
-        ID                                  : 12
+        ID                                  : 11
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -417,7 +381,7 @@ Button b11
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
-        Font ID                             : 4
+        Font ID                             : 1
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 65535
        Back. Color (Pressed)               : 1024
@@ -436,3 +400,39 @@ Button b11
        Touch Press Event
            page cardGrid
 Button b1
    Attributes
        ID                                  : 12
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 349
        y coordinate                        : 252
        Width                               : 102
        Height                              : 63
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : 3D auto
        Font ID                             : 1
        Back. Color                         : 50712
        Back. Picture ID (Pressed)          : 0
        Back. Color (Pressed)               : 1024
        Font Color (Unpressed)              : 0
        Font Color (Pressed)                : 65535
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        State                               : unpressed
        Text                                : bauds=115200
        Max. Text Size                      : 20
        Word wrap                           : enabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
    Events
        Touch Press Event
            bauds=115200
--- a/HMI/n2t-out-visual/popupLight.txt
+++ b/HMI/n2t-out-visual/popupLight.txt
@@ -788,9 +788,7 @@ Timer tmSerial
                                    if(tInstruction.txt=="entityUpdateDetail")
                                    {
                                        // change icon
-                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        spstr strCommand.txt,tIcon1.txt,"~",1
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
                                        vis tIcon1,1
                                        // change icon color
                                        spstr strCommand.txt,tTmp.txt,"~",2
@@ -918,25 +916,43 @@ Timer tmSerial
                                        //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=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                        {
-                                            page cardMedia
+                                            page cardGrid
                                        }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                        {
-                                            page pageStartup
+                                            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=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                        {
-                                            page cardGrid
+                                            page cardThermo
                                        }
                                        if(tId.txt=="cardMedia")
                                        {
                                            page cardMedia
                                        }
                                        if(tId.txt=="cardAlarm")
                                        {
--- a/HMI/n2t-out-visual/popupNotify.txt
+++ b/HMI/n2t-out-visual/popupNotify.txt
@@ -184,7 +184,7 @@ Text tHeading
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
        Back. Color                         : 6371
        Font Color                          : 65535
        Horizontal Alignment                : left
@@ -308,7 +308,7 @@ Button b2
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 1
+        Font ID                             : 2
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 9
        Back. Color (Pressed)               : 1024
@@ -357,7 +357,7 @@ Button b1
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
-        Font ID                             : 1
+        Font ID                             : 2
        Back. Color                         : 6371
        Back. Picture ID (Pressed)          : 9
        Back. Color (Pressed)               : 1024
@@ -548,25 +548,43 @@ Timer tmSerial
                                            pageIcons.tTmp1.txt=tTmp.txt
                                            page popupLight
                                        }
                                        if(tId.txt=="pageStartup")
                                        {
                                            page pageStartup
                                        }
                                        if(tId.txt=="screensaver")
                                        {
                                            page screensaver
                                        }
                                        if(tId.txt=="cardEntities")
                                        {
                                            page cardEntities
                                        }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                        {
-                                            page cardMedia
+                                            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=="pageStartup")
+                                        if(tId.txt=="cardMedia")
                                        {
-                                            page pageStartup
+                                            page cardMedia
                                        }
                                        if(tId.txt=="cardGrid")
                                        {
                                            page cardGrid
                                        }
                                        if(tId.txt=="cardAlarm")
                                        {
--- a/HMI/n2t-out-visual/popupShutter.txt
+++ b/HMI/n2t-out-visual/popupShutter.txt
@@ -631,30 +631,43 @@ Timer tmSerial
                                        //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=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                        {
-                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page pageStartup
-                                            page popupLight
+                                        }
                                        if(tId.txt=="screensaver")
                                        {
                                            page screensaver
                                        }
                                        if(tId.txt=="cardEntities")
                                        {
                                            page cardEntities
                                        }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                        {
-                                            page cardMedia
+                                            page cardGrid
                                        }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                        {
-                                            page pageStartup
+                                            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=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                        {
-                                            page cardGrid
+                                            page cardThermo
                                        }
                                        if(tId.txt=="cardMedia")
                                        {
                                            page cardMedia
                                        }
                                        if(tId.txt=="cardAlarm")
                                        {
--- a/HMI/n2t-out-visual/screensaver.txt
+++ b/HMI/n2t-out-visual/screensaver.txt
@@ -48,80 +48,34 @@ Variable (string) strCommand
 Variable (string) tId
    Attributes
-        ID            : 19
+        ID            : 17
        Scope         : local
        Text          : 
        Max. Text Size: 25
 Variable (int32) vaTap
    Attributes
-        ID   : 27
+        ID   : 25
        Scope: local
        Value: 0
-Text tInstruction
+Variable (string) tInstruction
    Attributes
-        ID                                  : 5
+        ID            : 31
-        Scope                               : local
+        Scope         : local
-        Dragging                            : 0
+        Text          : 
-        Disable release event after dragging: 0
+        Max. Text Size: 50
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 450
        y coordinate                        : 186
        Width                               : 27
        Height                              : 30
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 0
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
        Text                                : 
        Max. Text Size                      : 50
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
-Text tTmp
+Variable (string) tTmp
    Attributes
-        ID                                  : 6
+        ID            : 32
-        Scope                               : local
+        Scope         : local
-        Dragging                            : 0
+        Text          : 
-        Disable release event after dragging: 0
+        Max. Text Size: 50
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 451
        y coordinate                        : 228
        Width                               : 25
        Height                              : 30
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 0
        Back. Color                         : 65535
        Font Color                          : 0
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
        Text                                : 
        Max. Text Size                      : 50
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Text tTime
    Attributes
-        ID                                  : 7
+        ID                                  : 5
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -151,7 +105,7 @@ Text tTime
 Text tDate
    Attributes
-        ID                                  : 8
+        ID                                  : 6
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -167,7 +121,7 @@ Text tDate
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 1
+        Font ID                             : 2
        Back. Color                         : 0
        Font Color                          : 65535
        Horizontal Alignment                : center
@@ -181,14 +135,14 @@ Text tDate
 Text tSend
    Attributes
-        ID                                  : 9
+        ID                                  : 7
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
-        x coordinate                        : 451
+        x coordinate                        : 405
-        y coordinate                        : 9
+        y coordinate                        : 2
        Width                               : 29
        Height                              : 30
        Effect                              : load
@@ -211,7 +165,7 @@ Text tSend
 Text tMainIcon
    Attributes
-        ID                                  : 10
+        ID                                  : 8
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -227,6 +181,36 @@ Text tMainIcon
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 4
        Back. Color                         : 0
        Font Color                          : 65535
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
        Text                                : 
        Max. Text Size                      : 10
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Text tMainText
    Attributes
        ID                                  : 9
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 7
        y coordinate                        : 267
        Width                               : 110
        Height                              : 43
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 3
        Back. Color                         : 0
        Font Color                          : 65535
@@ -239,39 +223,9 @@ Text tMainIcon
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Text tMainText
    Attributes
        ID                                  : 11
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Opacity                             : 127
        x coordinate                        : 7
        y coordinate                        : 267
        Width                               : 110
        Height                              : 43
        Effect                              : load
        Effect Priority                     : 0
        Effect Time                         : 300
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
        Font ID                             : 2
        Back. Color                         : 0
        Font Color                          : 65535
        Horizontal Alignment                : center
        Vertical Alignment                  : center
        Input Type                          : character
        Text                                : 
        Max. Text Size                      : 10
        Word wrap                           : disabled
        Horizontal Spacing                  : 0
        Vertical Spacing                    : 0
 Text tForecast1
    Attributes
-        ID                                  : 12
+        ID                                  : 10
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -301,7 +255,7 @@ Text tForecast1
 Text tForecast1Val
    Attributes
-        ID                                  : 13
+        ID                                  : 11
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -331,7 +285,7 @@ Text tForecast1Val
 Text tF1Icon
    Attributes
-        ID                                  : 14
+        ID                                  : 12
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -361,7 +315,7 @@ Text tF1Icon
 Text tForecast2
    Attributes
-        ID                                  : 15
+        ID                                  : 13
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -391,7 +345,7 @@ Text tForecast2
 Text tF2Icon
    Attributes
-        ID                                  : 16
+        ID                                  : 14
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -421,7 +375,7 @@ Text tF2Icon
 Text tForecast2Val
    Attributes
-        ID                                  : 17
+        ID                                  : 15
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -451,7 +405,7 @@ Text tForecast2Val
 Text t10
    Attributes
-        ID                                  : 18
+        ID                                  : 16
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -481,7 +435,7 @@ Text t10
 Text tAMPM
    Attributes
-        ID                                  : 20
+        ID                                  : 18
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -497,7 +451,7 @@ Text tAMPM
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 3
+        Font ID                             : 4
        Back. Color                         : 0
        Font Color                          : 65535
        Horizontal Alignment                : center
@@ -511,7 +465,7 @@ Text tAMPM
 Text tForecast3Val
    Attributes
-        ID                                  : 21
+        ID                                  : 19
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -541,7 +495,7 @@ Text tForecast3Val
 Text tF3Icon
    Attributes
-        ID                                  : 22
+        ID                                  : 20
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -571,7 +525,7 @@ Text tF3Icon
 Text tForecast3
    Attributes
-        ID                                  : 23
+        ID                                  : 21
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -601,7 +555,7 @@ Text tForecast3
 Text tForecast4
    Attributes
-        ID                                  : 24
+        ID                                  : 22
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -631,7 +585,7 @@ Text tForecast4
 Text tF4Icon
    Attributes
-        ID                                  : 25
+        ID                                  : 23
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -661,7 +615,7 @@ Text tF4Icon
 Text tForecast4Val
    Attributes
-        ID                                  : 26
+        ID                                  : 24
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -691,7 +645,7 @@ Text tForecast4Val
 Text tMainTextAlt
    Attributes
-        ID                                  : 29
+        ID                                  : 27
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -707,7 +661,7 @@ Text tMainTextAlt
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 2
+        Font ID                             : 3
        Back. Color                         : 0
        Font Color                          : 65535
        Horizontal Alignment                : left
@@ -721,7 +675,7 @@ Text tMainTextAlt
 Text tMainIconAlt
    Attributes
-        ID                                  : 30
+        ID                                  : 28
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -737,7 +691,7 @@ Text tMainIconAlt
        Fill                                : solid color
        Style                               : flat
        Associated Keyboard                 : none
-        Font ID                             : 3
+        Font ID                             : 4
        Back. Color                         : 0
        Font Color                          : 65535
        Horizontal Alignment                : center
@@ -751,7 +705,7 @@ Text tMainIconAlt
 Text tMRIcon
    Attributes
-        ID                                  : 31
+        ID                                  : 29
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -781,7 +735,7 @@ Text tMRIcon
 Text tMR
    Attributes
-        ID                                  : 32
+        ID                                  : 30
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
@@ -922,9 +876,7 @@ Timer tmSerial
                                        vis tMRIcon,0
                                        vis tMR,0
                                        //tMainIcon
-                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        spstr strCommand.txt,tMainIcon.txt,"~",1
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1
                                        tMainIconAlt.txt=tMainIcon.txt
                                        //tMainText
                                        spstr strCommand.txt,tMainText.txt,"~",2
@@ -932,41 +884,31 @@ Timer tmSerial
                                        //tForecast1
                                        spstr strCommand.txt,tForecast1.txt,"~",3
                                        //tF1Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        spstr strCommand.txt,tF1Icon.txt,"~",4
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1
                                        //tForecast1Val
                                        spstr strCommand.txt,tForecast1Val.txt,"~",5
                                        //tForecast2
                                        spstr strCommand.txt,tForecast2.txt,"~",6
                                        //tF2Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",7
+                                        spstr strCommand.txt,tF2Icon.txt,"~",7
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1
                                        //tForecast2Val
                                        spstr strCommand.txt,tForecast2Val.txt,"~",8
                                        //tForecast3
                                        spstr strCommand.txt,tForecast3.txt,"~",9
                                        //tF3Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        spstr strCommand.txt,tF3Icon.txt,"~",10
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tF3Icon.txt,sys0,1
                                        //tForecast3Val
                                        spstr strCommand.txt,tForecast3Val.txt,"~",11
                                        //tForecast4
                                        spstr strCommand.txt,tForecast4.txt,"~",12
                                        //tF4Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",13
+                                        spstr strCommand.txt,tF4Icon.txt,"~",13
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1
                                        //tForecast4Val
                                        spstr strCommand.txt,tForecast4Val.txt,"~",14
                                        //alternative layout
                                        //tMRIcon
-                                        spstr strCommand.txt,tTmp.txt,"~",15
+                                        spstr strCommand.txt,tMRIcon.txt,"~",15
-                                        covx tTmp.txt,sys0,0,0
+                                        if(tMRIcon.txt!="")
                                        substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1
                                        if(tTmp.txt!="")
                                        {
                                            //value for tMRIcon, activate alternative layout
                                            vis tMainIcon,0
@@ -992,6 +934,77 @@ Timer tmSerial
                                        //tMR
                                        spstr strCommand.txt,tMR.txt,"~",16
                                    }
                                    if(tInstruction.txt=="color")
                                    {
                                        spstr strCommand.txt,tTmp.txt,"~",1
                                        covx tTmp.txt,tTime.bco,0,0
                                        screensaver.bco=tTime.bco
                                        tAMPM.bco=tTime.bco
                                        tDate.bco=tTime.bco
                                        tMainIcon.bco=tTime.bco
                                        tMainText.bco=tTime.bco
                                        tMainIconAlt.bco=tTime.bco
                                        tMainTextAlt.bco=tTime.bco
                                        tMRIcon.bco=tTime.bco
                                        tMR.bco=tTime.bco
                                        tMRIcon.bco=tTime.bco
                                        tForecast1.bco=tTime.bco
                                        tForecast1Val.bco=tTime.bco
                                        tF1Icon.bco=tTime.bco
                                        tForecast2.bco=tTime.bco
                                        tForecast2Val.bco=tTime.bco
                                        tF2Icon.bco=tTime.bco
                                        tForecast3.bco=tTime.bco
                                        tForecast3Val.bco=tTime.bco
                                        tF3Icon.bco=tTime.bco
                                        tForecast4.bco=tTime.bco
                                        tForecast4Val.bco=tTime.bco
                                        tF4Icon.bco=tTime.bco
                                        spstr strCommand.txt,tTmp.txt,"~",2
                                        covx tTmp.txt,tTime.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",3
                                        covx tTmp.txt,tAMPM.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",4
                                        covx tTmp.txt,tDate.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",5
                                        covx tTmp.txt,tMainIcon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",6
                                        covx tTmp.txt,tMainText.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",7
                                        covx tTmp.txt,tForecast1.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",8
                                        covx tTmp.txt,tForecast2.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",9
                                        covx tTmp.txt,tForecast3.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",10
                                        covx tTmp.txt,tForecast4.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",11
                                        covx tTmp.txt,tF1Icon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",12
                                        covx tTmp.txt,tF2Icon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",13
                                        covx tTmp.txt,tF3Icon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",14
                                        covx tTmp.txt,tF4Icon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",15
                                        covx tTmp.txt,tForecast1Val.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",16
                                        covx tTmp.txt,tForecast2Val.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",17
                                        covx tTmp.txt,tForecast3Val.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",18
                                        covx tTmp.txt,tForecast4Val.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",19
                                        covx tTmp.txt,t10.bco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",20
                                        covx tTmp.txt,tMainIconAlt.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",21
                                        covx tTmp.txt,tMainTextAlt.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",22
                                        covx tTmp.txt,tMRIcon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",23
                                        covx tTmp.txt,tMR.pco,0,0
                                    }
                                    if(tInstruction.txt=="pageType")
                                    {
                                        dim=100
@@ -1057,7 +1070,7 @@ Timer tmSerial
 Timer tmSleep
    Attributes
-        ID         : 28
+        ID         : 26
        Scope      : local
        Period (ms): 1000
        Enabled    : yes
--- a/HMI/n2t-out/cardAlarm.txt
+++ b/HMI/n2t-out/cardAlarm.txt
@@ -543,7 +543,7 @@ Timer tmSerial
                                        }
                                        if(tTmp.txt=="1")
                                        {
-                                            vis bPrev,1
+                                            vis bNext,1
                                            bNext.txt="î³"
                                        }
                                        //text arm1
@@ -579,9 +579,7 @@ Timer tmSerial
                                        //id arm4
                                        spstr strCommand.txt,va4.txt,"~",10
                                        //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",11
+                                        spstr strCommand.txt,tIcon.txt,"~",11
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
                                        //icon color
                                        spstr strCommand.txt,tTmp.txt,"~",12
                                        covx tTmp.txt,sys0,0,0
--- a/HMI/n2t-out/cardEntities.txt
+++ b/HMI/n2t-out/cardEntities.txt
@@ -1151,7 +1151,7 @@ Timer tmSerial
                                        }
                                        if(tTmp.txt=="1")
                                        {
-                                            vis bPrev,1
+                                            vis bNext,1
                                            bNext.txt="î³"
                                        }
                                        // get Type
@@ -1172,9 +1172,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",5
+                                            spstr strCommand.txt,tIcon1.txt,"~",5
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
                                            vis tIcon1,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",6
@@ -1296,9 +1294,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",11
+                                            spstr strCommand.txt,tIcon2.txt,"~",11
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,tIcon2.txt,sys0,1
                                            vis tIcon2,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",12
@@ -1420,9 +1416,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",17
+                                            spstr strCommand.txt,tIcon3.txt,"~",17
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,tIcon3.txt,sys0,1
                                            vis tIcon3,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",18
@@ -1544,9 +1538,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",23
+                                            spstr strCommand.txt,tIcon4.txt,"~",23
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,tIcon4.txt,sys0,1
                                            vis tIcon4,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",24
--- a/HMI/n2t-out/cardGrid.txt
+++ b/HMI/n2t-out/cardGrid.txt
@@ -599,7 +599,7 @@ Timer tmSerial
                                        }
                                        if(tTmp.txt=="1")
                                        {
-                                            vis bPrev,1
+                                            vis bNext,1
                                            bNext.txt="î³"
                                        }
                                        // get Type
@@ -613,9 +613,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",5
+                                            spstr strCommand.txt,bEntity1.txt,"~",5
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1
                                            vis bEntity1,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",6
@@ -636,9 +634,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",11
+                                            spstr strCommand.txt,bEntity2.txt,"~",11
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1
                                            vis bEntity2,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",12
@@ -659,9 +655,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",17
+                                            spstr strCommand.txt,bEntity3.txt,"~",17
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1
                                            vis bEntity3,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",18
@@ -682,9 +676,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",23
+                                            spstr strCommand.txt,bEntity4.txt,"~",23
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1
                                            vis bEntity4,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",24
@@ -705,9 +697,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",29
+                                            spstr strCommand.txt,bEntity5.txt,"~",29
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1
                                            vis bEntity5,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",30
@@ -728,9 +718,7 @@ Timer tmSerial
                                        }else
                                        {
                                            // change icon
-                                            spstr strCommand.txt,tTmp.txt,"~",35
+                                            spstr strCommand.txt,bEntity6.txt,"~",35
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1
                                            vis bEntity6,1
                                            // change icon color
                                            spstr strCommand.txt,tTmp.txt,"~",36
--- a/HMI/n2t-out/cardMedia.txt
+++ b/HMI/n2t-out/cardMedia.txt
@@ -534,15 +534,13 @@ Timer tmSerial
                                        }
                                        if(tTmp.txt=="1")
                                        {
-                                            vis bPrev,1
+                                            vis bNext,1
                                            bNext.txt="î³"
                                        }
                                        //entity name
                                        spstr strCommand.txt,entn.txt,"~",3
                                        //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        spstr strCommand.txt,tIcon.txt,"~",4
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
                                        //title
                                        spstr strCommand.txt,tTitle.txt,"~",5
                                        //author
@@ -552,9 +550,7 @@ Timer tmSerial
                                        covx tTmp.txt,sys0,0,0
                                        hVolume.val=sys0
                                        //icon
-                                        spstr strCommand.txt,tTmp.txt,"~",8
+                                        spstr strCommand.txt,tPlayPause.txt,"~",8
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
                                        //speaker current
                                        spstr strCommand.txt,tSpeaker.txt,"~",9
                                        if(tSpeaker.txt!="")
--- a/HMI/n2t-out/cardThermo.txt
+++ b/HMI/n2t-out/cardThermo.txt
@@ -671,7 +671,7 @@ Timer tmSerial
                                        }
                                        if(tTmp.txt=="1")
                                        {
-                                            vis bPrev,1
+                                            vis bNext,1
                                            bNext.txt="î³"
                                        }
                                        //entity name
@@ -704,12 +704,9 @@ Timer tmSerial
                                        vis bt7,0
                                        vis bt8,0
                                        //bt0
-                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        spstr strCommand.txt,bt0.txt,"~",10
-                                        if(tTmp.txt!="")
+                                        if(bt0.txt!="")
                                        {
                                            // set icon
                                            covx tTmp.txt,sys0,0,0
                                            substr pageIcons.tIcons.txt,bt0.txt,sys0,1
                                            // set text color on active state
                                            spstr strCommand.txt,tTmp.txt,"~",11
                                            covx tTmp.txt,bt0.pco2,0,0
@@ -720,232 +717,216 @@ Timer tmSerial
                                            spstr strCommand.txt,va0.txt,"~",13
                                            //enable
                                            vis bt0,1
-                                            }              //bt1
+                                        }
-                                            spstr strCommand.txt,tTmp.txt,"~",14
+                                        //bt1
-                                            if(tTmp.txt!="")
+                                        spstr strCommand.txt,bt1.txt,"~",14
-                                            {
+                                        if(bt1.txt!="")
-                                                // set icon
+                                        {
-                                                covx tTmp.txt,sys0,0,0
+                                            // set text color on active state
-                                                substr pageIcons.tIcons.txt,bt1.txt,sys0,1
+                                            spstr strCommand.txt,tTmp.txt,"~",15
-                                                // set text color on active state
+                                            covx tTmp.txt,bt1.pco2,0,0
-                                                spstr strCommand.txt,tTmp.txt,"~",15
+                                            // set state
-                                                covx tTmp.txt,bt1.pco2,0,0
+                                            spstr strCommand.txt,tTmp.txt,"~",16
-                                                // set state
+                                            covx tTmp.txt,bt1.val,0,0
-                                                spstr strCommand.txt,tTmp.txt,"~",16
+                                            // save action
-                                                covx tTmp.txt,bt1.val,0,0
+                                            spstr strCommand.txt,va1.txt,"~",17
-                                                // save action
+                                            //enable
-                                                spstr strCommand.txt,va1.txt,"~",17
+                                            vis bt1,1
-                                                //enable
+                                        }
-                                                vis bt1,1
+                                        //bt2
-                                                }              //bt2
+                                        spstr strCommand.txt,bt2.txt,"~",18
-                                                spstr strCommand.txt,tTmp.txt,"~",18
+                                        if(bt2.txt!="")
-                                                if(tTmp.txt!="")
+                                        {
-                                                {
+                                            // set text color on active state
-                                                    // set icon
+                                            spstr strCommand.txt,tTmp.txt,"~",19
-                                                    covx tTmp.txt,sys0,0,0
+                                            covx tTmp.txt,bt2.pco2,0,0
-                                                    substr pageIcons.tIcons.txt,bt2.txt,sys0,1
+                                            // set state
-                                                    // set text color on active state
+                                            spstr strCommand.txt,tTmp.txt,"~",20
-                                                    spstr strCommand.txt,tTmp.txt,"~",19
+                                            covx tTmp.txt,bt2.val,0,0
-                                                    covx tTmp.txt,bt2.pco2,0,0
+                                            // save action
-                                                    // set state
+                                            spstr strCommand.txt,va2.txt,"~",21
-                                                    spstr strCommand.txt,tTmp.txt,"~",20
+                                            //enable
-                                                    covx tTmp.txt,bt2.val,0,0
+                                            vis bt2,1
-                                                    // save action
+                                        }
-                                                    spstr strCommand.txt,va2.txt,"~",21
+                                        //bt3
-                                                    //enable
+                                        spstr strCommand.txt,bt3.txt,"~",22
-                                                    vis bt2,1
+                                        if(bt3.txt!="")
-                                                    }              //bt3
+                                        {
-                                                    spstr strCommand.txt,tTmp.txt,"~",22
+                                            // set text color on active state
-                                                    if(tTmp.txt!="")
+                                            spstr strCommand.txt,tTmp.txt,"~",23
-                                                    {
+                                            covx tTmp.txt,bt3.pco2,0,0
-                                                        // set icon
+                                            // set state
-                                                        covx tTmp.txt,sys0,0,0
+                                            spstr strCommand.txt,tTmp.txt,"~",24
-                                                        substr pageIcons.tIcons.txt,bt3.txt,sys0,1
+                                            covx tTmp.txt,bt3.val,0,0
-                                                        // set text color on active state
+                                            // save action
-                                                        spstr strCommand.txt,tTmp.txt,"~",23
+                                            spstr strCommand.txt,va3.txt,"~",25
-                                                        covx tTmp.txt,bt3.pco2,0,0
+                                            //enable
-                                                        // set state
+                                            vis bt3,1
-                                                        spstr strCommand.txt,tTmp.txt,"~",24
+                                        }
-                                                        covx tTmp.txt,bt3.val,0,0
+                                        //bt4
-                                                        // save action
+                                        spstr strCommand.txt,bt4.txt,"~",26
-                                                        spstr strCommand.txt,va3.txt,"~",25
+                                        if(bt4.txt!="")
-                                                        //enable
+                                        {
-                                                        vis bt3,1
+                                            // set text color on active state
-                                                        }              //bt4
+                                            spstr strCommand.txt,tTmp.txt,"~",27
-                                                        spstr strCommand.txt,tTmp.txt,"~",26
+                                            covx tTmp.txt,bt4.pco2,0,0
-                                                        if(tTmp.txt!="")
+                                            // set state
-                                                        {
+                                            spstr strCommand.txt,tTmp.txt,"~",28
-                                                            // set icon
+                                            covx tTmp.txt,bt4.val,0,0
-                                                            covx tTmp.txt,sys0,0,0
+                                            // save action
-                                                            substr pageIcons.tIcons.txt,bt4.txt,sys0,1
+                                            spstr strCommand.txt,va4.txt,"~",29
-                                                            // set text color on active state
+                                            //enable
-                                                            spstr strCommand.txt,tTmp.txt,"~",27
+                                            vis bt4,1
-                                                            covx tTmp.txt,bt4.pco2,0,0
+                                        }
-                                                            // set state
+                                        //bt5
-                                                            spstr strCommand.txt,tTmp.txt,"~",28
+                                        spstr strCommand.txt,bt5.txt,"~",30
-                                                            covx tTmp.txt,bt4.val,0,0
+                                        if(bt5.txt!="")
-                                                            // save action
+                                        {
-                                                            spstr strCommand.txt,va4.txt,"~",29
+                                            // set text color on active state
-                                                            //enable
+                                            spstr strCommand.txt,tTmp.txt,"~",31
-                                                            vis bt4,1
+                                            covx tTmp.txt,bt5.pco2,0,0
-                                                            }              //bt5
+                                            // set state
-                                                            spstr strCommand.txt,tTmp.txt,"~",30
+                                            spstr strCommand.txt,tTmp.txt,"~",32
-                                                            if(tTmp.txt!="")
+                                            covx tTmp.txt,bt5.val,0,0
-                                                            {
+                                            // save action
-                                                                // set icon
+                                            spstr strCommand.txt,va5.txt,"~",33
-                                                                covx tTmp.txt,sys0,0,0
+                                            //enable
-                                                                substr pageIcons.tIcons.txt,bt5.txt,sys0,1
+                                            vis bt5,1
-                                                                // set text color on active state
+                                        }
-                                                                spstr strCommand.txt,tTmp.txt,"~",31
+                                        //bt6
-                                                                covx tTmp.txt,bt5.pco2,0,0
+                                        spstr strCommand.txt,bt6.txt,"~",34
-                                                                // set state
+                                        if(bt6.txt!="")
-                                                                spstr strCommand.txt,tTmp.txt,"~",32
+                                        {
-                                                                covx tTmp.txt,bt5.val,0,0
+                                            // set text color on active state
-                                                                // save action
+                                            spstr strCommand.txt,tTmp.txt,"~",35
-                                                                spstr strCommand.txt,va5.txt,"~",33
+                                            covx tTmp.txt,bt6.pco2,0,0
-                                                                //enable
+                                            // set state
-                                                                vis bt5,1
+                                            spstr strCommand.txt,tTmp.txt,"~",36
-                                                                }              //bt6
+                                            covx tTmp.txt,bt6.val,0,0
-                                                                spstr strCommand.txt,tTmp.txt,"~",34
+                                            // save action
-                                                                if(tTmp.txt!="")
+                                            spstr strCommand.txt,va6.txt,"~",37
-                                                                {
+                                            //enable
-                                                                    // set icon
+                                            vis bt6,1
-                                                                    covx tTmp.txt,sys0,0,0
+                                        }
-                                                                    substr pageIcons.tIcons.txt,bt6.txt,sys0,1
+                                        //bt7
-                                                                    // set text color on active state
+                                        spstr strCommand.txt,bt7.txt,"~",38
-                                                                    spstr strCommand.txt,tTmp.txt,"~",35
+                                        if(bt7.txt!="")
-                                                                    covx tTmp.txt,bt6.pco2,0,0
+                                        {
-                                                                    // set state
+                                            // set text color on active state
-                                                                    spstr strCommand.txt,tTmp.txt,"~",36
+                                            spstr strCommand.txt,tTmp.txt,"~",39
-                                                                    covx tTmp.txt,bt6.val,0,0
+                                            covx tTmp.txt,bt7.pco2,0,0
-                                                                    // save action
+                                            // set state
-                                                                    spstr strCommand.txt,va6.txt,"~",37
+                                            spstr strCommand.txt,tTmp.txt,"~",40
-                                                                    //enable
+                                            covx tTmp.txt,bt7.val,0,0
-                                                                    vis bt6,1
+                                            // save action
-                                                                    }              //bt7
+                                            spstr strCommand.txt,va7.txt,"~",41
-                                                                    spstr strCommand.txt,tTmp.txt,"~",38
+                                            //enable
-                                                                    if(tTmp.txt!="")
+                                            vis bt7,1
-                                                                    {
+                                        }
-                                                                        // set icon
+                                        //bt8
-                                                                        covx tTmp.txt,sys0,0,0
+                                        spstr strCommand.txt,bt8.txt,"~",42
-                                                                        substr pageIcons.tIcons.txt,bt7.txt,sys0,1
+                                        if(bt8.txt!="")
-                                                                        // set text color on active state
+                                        {
-                                                                        spstr strCommand.txt,tTmp.txt,"~",39
+                                            // set text color on active state
-                                                                        covx tTmp.txt,bt7.pco2,0,0
+                                            spstr strCommand.txt,tTmp.txt,"~",43
-                                                                        // set state
+                                            covx tTmp.txt,bt8.pco2,0,0
-                                                                        spstr strCommand.txt,tTmp.txt,"~",40
+                                            // set state
-                                                                        covx tTmp.txt,bt7.val,0,0
+                                            spstr strCommand.txt,tTmp.txt,"~",44
-                                                                        // save action
+                                            covx tTmp.txt,bt8.val,0,0
-                                                                        spstr strCommand.txt,va7.txt,"~",41
+                                            // save action
-                                                                        //enable
+                                            spstr strCommand.txt,va8.txt,"~",45
-                                                                        vis bt7,1
+                                            //enable
-                                                                        }              //bt8
+                                            vis bt8,1
-                                                                        spstr strCommand.txt,tTmp.txt,"~",42
+                                        }
-                                                                        if(tTmp.txt!="")
+                                    }
-                                                                        {
+                                    if(tInstruction.txt=="pageType")
-                                                                            // set icon
+                                    {
-                                                                            covx tTmp.txt,sys0,0,0
+                                        //command format pageType,specialPageName
-                                                                            substr pageIcons.tIcons.txt,bt8.txt,sys0,1
+                                        //write name of speical page to tId
-                                                                            // set text color on active state
+                                        spstr strCommand.txt,tId.txt,"~",1
-                                                                            spstr strCommand.txt,tTmp.txt,"~",43
+                                        //save second arg if there's one
-                                                                            covx tTmp.txt,bt8.pco2,0,0
+                                        spstr strCommand.txt,tTmp.txt,"~",2
-                                                                            // set state
+                                        //save third arg if there's one
-                                                                            spstr strCommand.txt,tTmp.txt,"~",44
+                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
-                                                                            covx tTmp.txt,bt8.val,0,0
+                                        //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 ...
-                                                                            // save action
+                                        udelete payloadLength-1
-                                                                            spstr strCommand.txt,va8.txt,"~",45
+                                        bufferPos=0
-                                                                            //enable
+                                        if(tId.txt=="pageStartup")
-                                                                            vis bt8,1
+                                        {
-                                                                        }
+                                            page pageStartup
-                                                                    }
+                                        }
-                                                                    if(tInstruction.txt=="pageType")
+                                        if(tId.txt=="screensaver")
-                                                                    {
+                                        {
-                                                                        //command format pageType,specialPageName
+                                            page screensaver
-                                                                        //write name of speical page to tId
+                                        }
-                                                                        spstr strCommand.txt,tId.txt,"~",1
+                                        if(tId.txt=="cardEntities")
-                                                                        //save second arg if there's one
+                                        {
-                                                                        spstr strCommand.txt,tTmp.txt,"~",2
+                                            page cardEntities
-                                                                        //save third arg if there's one
+                                        }
-                                                                        spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
+                                        if(tId.txt=="cardGrid")
-                                                                        //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
+                                            page cardGrid
-                                                                        bufferPos=0
+                                        }
-                                                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
-                                                                        {
+                                        {
-                                                                            page pageStartup
+                                            pageIcons.tTmp1.txt=tTmp.txt
-                                                                        }
+                                            page popupLight
-                                                                        if(tId.txt=="screensaver")
+                                        }
-                                                                        {
+                                        if(tId.txt=="popupShutter")
-                                                                            page screensaver
+                                        {
-                                                                        }
+                                            pageIcons.tTmp1.txt=tTmp.txt
-                                                                        if(tId.txt=="cardEntities")
+                                            page popupShutter
-                                                                        {
+                                        }
-                                                                            page cardEntities
+                                        if(tId.txt=="popupNotify")
-                                                                        }
+                                        {
-                                                                        if(tId.txt=="cardGrid")
+                                            page popupNotify
-                                                                        {
+                                        }
-                                                                            page cardGrid
+                                        if(tId.txt=="cardThermo")
-                                                                        }
+                                        {
-                                                                        if(tId.txt=="popupLight")
+                                            page cardThermo
-                                                                        {
+                                        }
-                                                                            pageIcons.tTmp1.txt=tTmp.txt
+                                        if(tId.txt=="cardMedia")
-                                                                            page popupLight
+                                        {
-                                                                        }
+                                            page cardMedia
-                                                                        if(tId.txt=="popupShutter")
+                                        }
-                                                                        {
+                                        if(tId.txt=="cardAlarm")
-                                                                            pageIcons.tTmp1.txt=tTmp.txt
+                                        {
-                                                                            page popupShutter
+                                            page cardAlarm
-                                                                        }
+                                        }
-                                                                        if(tId.txt=="popupNotify")
+                                    }
-                                                                        {
+                                    if(tInstruction.txt=="time")
-                                                                            page popupNotify
+                                    {
-                                                                        }
+                                        // get set time to global variable
-                                                                        if(tId.txt=="cardThermo")
+                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
-                                                                        {
+                                    }
-                                                                            page cardThermo
+                                    if(tInstruction.txt=="date")
-                                                                        }
+                                    {
-                                                                        if(tId.txt=="cardMedia")
+                                        // get set date to global variable
-                                                                        {
+                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
-                                                                            page cardMedia
+                                    }
-                                                                        }
+                                    if(tInstruction.txt=="dimmode")
-                                                                        if(tId.txt=="cardAlarm")
+                                    {
-                                                                        {
+                                        // get value
-                                                                            page cardAlarm
+                                        spstr strCommand.txt,tTmp.txt,"~",1
-                                                                        }
+                                        covx tTmp.txt,dimValue,0,0
-                                                                    }
+                                    }
-                                                                    if(tInstruction.txt=="time")
+                                    if(tInstruction.txt=="timeout")
-                                                                    {
+                                    {
-                                                                        // get set time to global variable
+                                        //set timeout to global var
-                                                                        spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+                                        spstr strCommand.txt,tTmp.txt,"~",1
-                                                                    }
+                                        covx tTmp.txt,sleepTimeout,0,0
-                                                                    if(tInstruction.txt=="date")
+                                    }
-                                                                    {
+                                    // end of user code
-                                                                        // get set date to global variable
+                                    udelete payloadLength-1
-                                                                        spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
+                                    bufferPos=0
-                                                                    }
+                                }
-                                                                    if(tInstruction.txt=="dimmode")
+                            }
-                                                                    {
+                        }
-                                                                        // get value
+                    }
-                                                                        spstr strCommand.txt,tTmp.txt,"~",1
+                    // next character
-                                                                        covx tTmp.txt,dimValue,0,0
+                    bufferPos++
-                                                                    }
+                }
-                                                                    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++
                                                }
                                            }
 Timer tmSleep
    Attributes
--- a/HMI/n2t-out/pageIcons.txt
+++ b/HMI/n2t-out/pageIcons.txt
@@ -22,16 +22,6 @@ Variable (string) vaDate
        Text          : 
        Max. Text Size: 35
 Text tIcons
    Attributes
        Scope                               : global
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Text                                : îî´îï§îîî îî£îîî°îîîîî½îîîîîî¾îîîîî¤î·îºîîî©±ï¤ï¡îî î îî¦îî¦îºîîî¯î¾î¾î¶îïîî¸î¸
        Max. Text Size                      : 170
 Text tTmp1
    Attributes
        Scope                               : global
--- a/HMI/n2t-out/pageSerialTest.txt
+++ b/HMI/n2t-out/pageSerialTest.txt
@@ -1,207 +0,0 @@
 Page pageSerialTest
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Locked                              : no
        Swide up page ID                    : disabled
        Swide down page ID                  : disabled
        Swide left page ID                  : disabled
        Swide right page ID                 : disabled
    Events
        Preinitialize Event
            //vis p0,0
            //recmod=1
            //bauds=115200
 Number nCrcRecv
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Value                               : 0
 Number nCrcCalc
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Value                               : 0
 Number nIt
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Value                               : 0
 Number nLength
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Value                               : 0
 Text tStatus
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Text                                : newtxt
        Max. Text Size                      : 100
 Text tCmd
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Text                                : newtxt
        Max. Text Size                      : 500
 Text tBuffer
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Text                                : newtxt
        Max. Text Size                      : 100
 Text tDesc
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Text                                : CRC Recv:\r\nCRC Calc:\r\n\r\nStatus\r\n\r\nCommand
        Max. Text Size                      : 60
 Picture p0
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
 Button b0
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        State                               : unpressed
        Text                                : bck
        Max. Text Size                      : 10
    Events
        Touch Press Event
            recmod=0
            page pageTest
 Button b1
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        State                               : unpressed
        Text                                : ON
        Max. Text Size                      : 10
    Events
        Touch Press Event
            recmod=1
            bauds=115200
 Timer tmSerial
    Attributes
        Scope      : local
        Period (ms): 400
        Enabled    : yes
    Events
        Timer Event
            // 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
                        }
                        tStatus.txt="init command detected"
                        //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
                            //payloadLength=u[2]
                            ucopy payloadLength,2,2,0
                            nLength.val=payloadLength
                            // 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)
                            {
                                tStatus.txt="reached"
                                // calculate crc
                                crcrest 1,0xFFFF
                                // payload length -1 to exclude crc
                                crcputu 0,payloadLength-1 //u[2]+3
                                // get recived crc to be able to compare it
                                ucopy recvCrc,payloadLength-1,2,0
                                nCrcRecv.val=recvCrc
                                // compare crc with recived value
                                if(crcval==recvCrc)
                                {
                                    tStatus.txt="crc ok"
                                    nIt.val=nIt.val+1
                                    ucopy tCmd.txt,4,payloadLength-5,0
                                    udelete payloadLength-1
                                    bufferPos=0
                                    // here is the location where acual code should be
                                }
                                // copy calculated crc and recived crc to nCrcRecv and nCrcCalc, for debugging
                                nCrcRecv.val=recvCrc
                                nCrcCalc.val=crcval
                                //ucopy nCrcCalc.val,u[2]+3,3,0
                            }
                        }
                    }
                    // next character
                    bufferPos++
                }
                if(bufferPos==usize)
                {
                    // copy whole buffer to tCmd.txt, for debugging
                    //ucopy tBuffer.txt,0,usize,0
                    // ucopy nIt.val,0,usize,0
                    // clear whole buffer
                    //code_c
                    //bufferPos=0
                }
            }
--- a/HMI/n2t-out/pageStartup.txt
+++ b/HMI/n2t-out/pageStartup.txt
@@ -152,7 +152,7 @@ Text tVersion
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        Associated Keyboard                 : none
-        Text                                : 28
+        Text                                : 31
        Max. Text Size                      : 10
 Picture p0
--- a/HMI/n2t-out/pageTest.txt
+++ b/HMI/n2t-out/pageTest.txt
@@ -35,20 +35,6 @@ Button b0
        Touch Press Event
            page cardEntities
 Button b1
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        State                               : unpressed
        Text                                : serial
        Max. Text Size                      : 10
    Events
        Touch Press Event
            page pageSerialTest
 Button b3
    Attributes
        Scope                               : local
@@ -176,3 +162,17 @@ Button b11
        Touch Press Event
            page cardGrid
 Button b1
    Attributes
        Scope                               : local
        Dragging                            : 0
        Disable release event after dragging: 0
        Send Component ID                   : disabled
        State                               : unpressed
        Text                                : bauds=115200
        Max. Text Size                      : 20
    Events
        Touch Press Event
            bauds=115200
--- a/HMI/n2t-out/popupLight.txt
+++ b/HMI/n2t-out/popupLight.txt
@@ -442,9 +442,7 @@ Timer tmSerial
                                    if(tInstruction.txt=="entityUpdateDetail")
                                    {
                                        // change icon
-                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        spstr strCommand.txt,tIcon1.txt,"~",1
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
                                        vis tIcon1,1
                                        // change icon color
                                        spstr strCommand.txt,tTmp.txt,"~",2
@@ -572,25 +570,43 @@ Timer tmSerial
                                        //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=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                        {
-                                            page cardMedia
+                                            page cardGrid
                                        }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                        {
-                                            page pageStartup
+                                            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=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                        {
-                                            page cardGrid
+                                            page cardThermo
                                        }
                                        if(tId.txt=="cardMedia")
                                        {
                                            page cardMedia
                                        }
                                        if(tId.txt=="cardAlarm")
                                        {
--- a/HMI/n2t-out/popupNotify.txt
+++ b/HMI/n2t-out/popupNotify.txt
@@ -339,25 +339,43 @@ Timer tmSerial
                                            pageIcons.tTmp1.txt=tTmp.txt
                                            page popupLight
                                        }
                                        if(tId.txt=="pageStartup")
                                        {
                                            page pageStartup
                                        }
                                        if(tId.txt=="screensaver")
                                        {
                                            page screensaver
                                        }
                                        if(tId.txt=="cardEntities")
                                        {
                                            page cardEntities
                                        }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                        {
-                                            page cardMedia
+                                            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=="pageStartup")
+                                        if(tId.txt=="cardMedia")
                                        {
-                                            page pageStartup
+                                            page cardMedia
                                        }
                                        if(tId.txt=="cardGrid")
                                        {
                                            page cardGrid
                                        }
                                        if(tId.txt=="cardAlarm")
                                        {
--- a/HMI/n2t-out/popupShutter.txt
+++ b/HMI/n2t-out/popupShutter.txt
@@ -366,30 +366,43 @@ Timer tmSerial
                                        //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=="popupLight")
+                                        if(tId.txt=="pageStartup")
                                        {
-                                            pageIcons.tTmp1.txt=tTmp.txt
+                                            page pageStartup
-                                            page popupLight
+                                        }
                                        if(tId.txt=="screensaver")
                                        {
                                            page screensaver
                                        }
                                        if(tId.txt=="cardEntities")
                                        {
                                            page cardEntities
                                        }
-                                        if(tId.txt=="cardMedia")
+                                        if(tId.txt=="cardGrid")
                                        {
-                                            page cardMedia
+                                            page cardGrid
                                        }
-                                        if(tId.txt=="pageStartup")
+                                        if(tId.txt=="popupLight")
                                        {
-                                            page pageStartup
+                                            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=="cardGrid")
+                                        if(tId.txt=="cardThermo")
                                        {
-                                            page cardGrid
+                                            page cardThermo
                                        }
                                        if(tId.txt=="cardMedia")
                                        {
                                            page cardMedia
                                        }
                                        if(tId.txt=="cardAlarm")
                                        {
--- a/HMI/n2t-out/screensaver.txt
+++ b/HMI/n2t-out/screensaver.txt
@@ -48,25 +48,17 @@ Variable (int32) vaTap
        Scope: local
        Value: 0
-Text tInstruction
+Variable (string) tInstruction
    Attributes
-        Scope                               : local
+        Scope         : local
-        Dragging                            : 0
+        Text          : 
-        Disable release event after dragging: 0
+        Max. Text Size: 50
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Text                                : 
        Max. Text Size                      : 50
-Text tTmp
+Variable (string) tTmp
    Attributes
-        Scope                               : local
+        Scope         : local
-        Dragging                            : 0
+        Text          : 
-        Disable release event after dragging: 0
+        Max. Text Size: 50
        Send Component ID                   : disabled
        Associated Keyboard                 : none
        Text                                : 
        Max. Text Size                      : 50
 Text tTime
    Attributes
@@ -400,9 +392,7 @@ Timer tmSerial
                                        vis tMRIcon,0
                                        vis tMR,0
                                        //tMainIcon
-                                        spstr strCommand.txt,tTmp.txt,"~",1
+                                        spstr strCommand.txt,tMainIcon.txt,"~",1
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1
                                        tMainIconAlt.txt=tMainIcon.txt
                                        //tMainText
                                        spstr strCommand.txt,tMainText.txt,"~",2
@@ -410,41 +400,31 @@ Timer tmSerial
                                        //tForecast1
                                        spstr strCommand.txt,tForecast1.txt,"~",3
                                        //tF1Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",4
+                                        spstr strCommand.txt,tF1Icon.txt,"~",4
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1
                                        //tForecast1Val
                                        spstr strCommand.txt,tForecast1Val.txt,"~",5
                                        //tForecast2
                                        spstr strCommand.txt,tForecast2.txt,"~",6
                                        //tF2Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",7
+                                        spstr strCommand.txt,tF2Icon.txt,"~",7
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1
                                        //tForecast2Val
                                        spstr strCommand.txt,tForecast2Val.txt,"~",8
                                        //tForecast3
                                        spstr strCommand.txt,tForecast3.txt,"~",9
                                        //tF3Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",10
+                                        spstr strCommand.txt,tF3Icon.txt,"~",10
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tF3Icon.txt,sys0,1
                                        //tForecast3Val
                                        spstr strCommand.txt,tForecast3Val.txt,"~",11
                                        //tForecast4
                                        spstr strCommand.txt,tForecast4.txt,"~",12
                                        //tF4Icon
-                                        spstr strCommand.txt,tTmp.txt,"~",13
+                                        spstr strCommand.txt,tF4Icon.txt,"~",13
                                        covx tTmp.txt,sys0,0,0
                                        substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1
                                        //tForecast4Val
                                        spstr strCommand.txt,tForecast4Val.txt,"~",14
                                        //alternative layout
                                        //tMRIcon
-                                        spstr strCommand.txt,tTmp.txt,"~",15
+                                        spstr strCommand.txt,tMRIcon.txt,"~",15
-                                        covx tTmp.txt,sys0,0,0
+                                        if(tMRIcon.txt!="")
                                        substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1
                                        if(tTmp.txt!="")
                                        {
                                            //value for tMRIcon, activate alternative layout
                                            vis tMainIcon,0
@@ -470,6 +450,77 @@ Timer tmSerial
                                        //tMR
                                        spstr strCommand.txt,tMR.txt,"~",16
                                    }
                                    if(tInstruction.txt=="color")
                                    {
                                        spstr strCommand.txt,tTmp.txt,"~",1
                                        covx tTmp.txt,tTime.bco,0,0
                                        screensaver.bco=tTime.bco
                                        tAMPM.bco=tTime.bco
                                        tDate.bco=tTime.bco
                                        tMainIcon.bco=tTime.bco
                                        tMainText.bco=tTime.bco
                                        tMainIconAlt.bco=tTime.bco
                                        tMainTextAlt.bco=tTime.bco
                                        tMRIcon.bco=tTime.bco
                                        tMR.bco=tTime.bco
                                        tMRIcon.bco=tTime.bco
                                        tForecast1.bco=tTime.bco
                                        tForecast1Val.bco=tTime.bco
                                        tF1Icon.bco=tTime.bco
                                        tForecast2.bco=tTime.bco
                                        tForecast2Val.bco=tTime.bco
                                        tF2Icon.bco=tTime.bco
                                        tForecast3.bco=tTime.bco
                                        tForecast3Val.bco=tTime.bco
                                        tF3Icon.bco=tTime.bco
                                        tForecast4.bco=tTime.bco
                                        tForecast4Val.bco=tTime.bco
                                        tF4Icon.bco=tTime.bco
                                        spstr strCommand.txt,tTmp.txt,"~",2
                                        covx tTmp.txt,tTime.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",3
                                        covx tTmp.txt,tAMPM.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",4
                                        covx tTmp.txt,tDate.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",5
                                        covx tTmp.txt,tMainIcon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",6
                                        covx tTmp.txt,tMainText.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",7
                                        covx tTmp.txt,tForecast1.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",8
                                        covx tTmp.txt,tForecast2.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",9
                                        covx tTmp.txt,tForecast3.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",10
                                        covx tTmp.txt,tForecast4.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",11
                                        covx tTmp.txt,tF1Icon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",12
                                        covx tTmp.txt,tF2Icon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",13
                                        covx tTmp.txt,tF3Icon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",14
                                        covx tTmp.txt,tF4Icon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",15
                                        covx tTmp.txt,tForecast1Val.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",16
                                        covx tTmp.txt,tForecast2Val.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",17
                                        covx tTmp.txt,tForecast3Val.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",18
                                        covx tTmp.txt,tForecast4Val.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",19
                                        covx tTmp.txt,t10.bco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",20
                                        covx tTmp.txt,tMainIconAlt.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",21
                                        covx tTmp.txt,tMainTextAlt.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",22
                                        covx tTmp.txt,tMRIcon.pco,0,0
                                        spstr strCommand.txt,tTmp.txt,"~",23
                                        covx tTmp.txt,tMR.pco,0,0
                                    }
                                    if(tInstruction.txt=="pageType")
                                    {
                                        dim=100
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Johannes	ac832e5f6e	bump version	2022-04-15 18:20:20 +02:00
Johannes	0808074e85	bump version	2022-04-15 18:19:17 +02:00
Johannes	c7f4d4ed78	Update nspanel-lovelace-ui.py	2022-04-15 18:14:28 +02:00
Johannes	92f172c4bc	Create auto_assign.yml	2022-04-15 11:15:45 +02:00
britzelpuf	3b3810cf0d	Merge pull request #149 from britzelpuf/patch-hwbutton Fix HW Button pages	2022-04-15 11:03:56 +02:00
britzelpuf	5b72676c11	Fix HW Button pages	2022-04-15 11:00:06 +02:00
britzelpuf	559e0bfa9f	Merge pull request #147 from MacSchlack/patch-4 Added unit in type PageItem	2022-04-15 08:31:57 +02:00
britzelpuf	7581f4fc47	Merge pull request #148 from MacSchlack/patch-5 Update README.md	2022-04-15 08:31:26 +02:00
MacSchlack	979e52d1f5	Update README.md	2022-04-15 07:05:07 +02:00
MacSchlack	ba2abef465	Added unit in type PageItem example unit on Page "Müllkalender"	2022-04-14 16:44:03 +02:00
britzelpuf	58da8efc0c	Merge pull request #146 from MacSchlack/patch-3 Added socket as posible device	2022-04-14 16:30:42 +02:00
MacSchlack	ed77f897b4	Added socket as posible device	2022-04-14 16:11:56 +02:00
Johannes	4cd5fa9d6d	Create CODEOWNERS	2022-04-13 23:25:39 +02:00
joBr99	cc40d38c41	Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)	2022-04-13 20:21:36 +00:00
Johannes	d215029319	Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui	2022-04-13 22:21:11 +02:00
Johannes	38a615f7a0	synced screensaver serial code	2022-04-13 22:21:05 +02:00
joBr99	ab18effc7b	Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)	2022-04-13 20:17:08 +00:00
Johannes	e5d1afe5e1	Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui	2022-04-13 22:16:46 +02:00
Johannes	c9f305c1ed	synced light popup serial code	2022-04-13 22:16:39 +02:00
joBr99	d3f6a8d6ad	Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)	2022-04-13 20:14:00 +00:00
Johannes	dc96fea0f2	Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui	2022-04-13 22:13:37 +02:00
Johannes	e59dcae711	implemented color cmd	2022-04-13 22:13:31 +02:00
joBr99	1a74a99347	synced us-p (add nextion2text)	2022-04-13 19:28:24 +00:00
Johannes	5b62ef0d27	synced us-p	2022-04-13 21:27:54 +02:00
joBr99	533db201a8	syned serial fix to us versions (add nextion2text)	2022-04-12 19:23:44 +00:00
Johannes	e86e1f6fb4	syned serial fix to us versions	2022-04-12 21:23:18 +02:00
Johannes	78b3da8843	Merge pull request #140 from jmbinette/main Changed known diff	2022-04-12 21:17:34 +02:00
Johannes	e79a0634ca	Fix berry message	2022-04-12 21:09:18 +02:00
joBr99	bac8e96932	fix exit from popup pages to screensaver (add nextion2text)	2022-04-12 19:02:34 +00:00
Johannes	188323a5cc	fix exit from popup pages to screensaver	2022-04-12 21:02:13 +02:00
jmbinette	fa4417d913	Changed known diff	2022-04-12 14:55:28 -04:00
Johannes	95757691bd	Update mqttListener.py	2022-04-12 20:52:35 +02:00
Johannes	80208e42ed	Update mqttListener.py	2022-04-12 20:50:51 +02:00
Johannes	b7e4cf647c	Update updater.py	2022-04-12 20:43:00 +02:00
Johannes	263889737d	Update nspanel-lovelace-ui.py	2022-04-12 20:35:33 +02:00
Johannes	756e212d34	Update mqttListener.py	2022-04-12 20:23:00 +02:00
Johannes	c923f7058b	Update updater.py	2022-04-12 20:19:13 +02:00
Johannes	f9e8f6513c	Update autoexec.be	2022-04-12 20:14:51 +02:00
Johannes	211db1ddf4	Update nspanel-lovelace-ui.py	2022-04-12 20:12:41 +02:00
Johannes	562ce8ce48	Update autoexec.be	2022-04-12 20:12:31 +02:00
Johannes	da1da082e9	Update autoexec.be	2022-04-12 20:09:48 +02:00
Johannes	f8ff39fe67	Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui	2022-04-12 20:07:36 +02:00
Johannes	8283c0939c	move beta to current version	2022-04-12 20:07:29 +02:00
Johannes	0c13622d76	move current berry driver to oldstable	2022-04-12 20:07:06 +02:00
Johannes	01b4aac715	bump version	2022-04-12 20:02:40 +02:00
joBr99	5693ec21a8	Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)	2022-04-12 16:33:02 +00:00
Johannes	9903b394fe	Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui	2022-04-12 18:32:32 +02:00
Johannes	c5dc53fd84	bump firmware version us-p	2022-04-12 18:32:24 +02:00
joBr99	7649537c62	bump firmware version for next release (add nextion2text)	2022-04-12 16:30:15 +00:00
Johannes	cca8477b36	bump firmware version for next release	2022-04-12 18:29:26 +02:00
joBr99	b7a965f3ef	Merge pull request #138 from jmbinette/main (add nextion2text)	2022-04-12 16:20:52 +00:00
Johannes	da0376c8f0	Merge pull request #138 from jmbinette/main Changed Entities page	2022-04-12 18:20:33 +02:00
jmbinette	125ebee23b	Changed entities layout for 5 only (add nextion2text)	2022-04-12 16:15:31 +00:00
jmbinette	72314db002	Changed entities layout for 5 only	2022-04-12 12:14:57 -04:00
Johannes	73abbd8ea4	Merge pull request #137 from britzelpuf/main Changes for panel version 30	2022-04-12 12:07:48 +02:00
britzelpuf	6b82d5715b	Added fix suggested by Armilar https://forum.iobroker.net/topic/50888/sonoff-nspanel/151	2022-04-11 23:08:47 +02:00
britzelpuf	ad31b90128	Remove navigation items on hardware button pages	2022-04-11 22:37:36 +02:00
britzelpuf	d31ff9dde5	Update Readme for name extension	2022-04-11 22:30:51 +02:00
britzelpuf	50328fc386	Fix CardThermo, added names	2022-04-11 22:28:42 +02:00
britzelpuf	147e08aa5f	Update for Panel version 30	2022-04-11 15:38:13 +02:00
britzelpuf	9da519dce9	Documentation for display version 30	2022-04-11 15:35:06 +02:00
Johannes	ff569829fc	Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui	2022-04-11 00:20:58 +02:00
Johannes	e2fabe9eb4	fix lightup on callback	2022-04-11 00:20:52 +02:00
Johannes	1097a9c6bb	Update README.md	2022-04-10 23:20:56 +02:00
Johannes	2f7189eca5	some changes to screensaver navigation #123	2022-04-10 21:53:55 +02:00
joBr99	51cb0956a6	Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)	2022-04-10 15:53:54 +00:00
Johannes	cca413a761	Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui	2022-04-10 17:53:31 +02:00
Johannes	fc9520f2d6	.	2022-04-10 17:53:23 +02:00
joBr99	49f483c5c6	added diff between diffs (add nextion2text)	2022-04-10 15:50:49 +00:00
Johannes	3fa99fbc72	added diff between diffs	2022-04-10 17:50:29 +02:00
Johannes	f3f7de9210	add known good change	2022-04-10 17:47:47 +02:00
Johannes	66afb2d5a4	cleanup	2022-04-10 17:21:05 +02:00
Johannes	19c512b5ea	change speed during flashing	2022-04-10 17:10:52 +02:00
Johannes	62e4333024	added time elapsed	2022-04-10 16:32:50 +02:00
Johannes	e53407caaa	cleanup, remove old skipping	2022-04-10 16:03:22 +02:00
Johannes	66f69cf21f	fix for inital flash	2022-04-10 15:38:03 +02:00
Johannes	1a0e9c6357	skip to end with http range	2022-04-10 15:08:02 +02:00
Johannes	06894b21ec	added iobroker icon gen to hmi icon script	2022-04-10 14:56:21 +02:00
Johannes	0a7dd91860	add 206 to http code check	2022-04-10 14:55:32 +02:00
Johannes	a7c9184561	removed couting	2022-04-10 14:38:18 +02:00
Johannes	4567d7e63c	improved error handling on non 200 answer	2022-04-10 14:28:55 +02:00
Johannes	92383695df	Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui	2022-04-10 14:20:42 +02:00
Johannes	ab70eb52fc	added iobroker IconSelector	2022-04-10 14:20:36 +02:00
joBr99	a8ea56e461	Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)	2022-04-10 11:25:51 +00:00
Johannes	9b928832cc	Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui	2022-04-10 13:25:25 +02:00
Johannes	4710b3733d	synced us versions	2022-04-10 13:25:17 +02:00
joBr99	fcaa4faae7	fix nav button in eu version (add nextion2text)	2022-04-10 11:19:06 +00:00
Johannes	9436514c71	fix nav button in eu version	2022-04-10 13:18:39 +02:00
Johannes	3c418d4c98	remove test version	2022-04-09 23:11:37 +02:00
Johannes	cd1c03fbb6	added berry driver with higher serial speed during flashing	2022-04-09 22:25:15 +02:00
Johannes	fa1b41d137	Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui	2022-04-08 22:34:29 +02:00
Johannes	1ce084162a	bumped version	2022-04-08 22:34:21 +02:00
joBr99	6db0319f70	synced changes from eu version (add nextion2text)	2022-04-08 20:30:55 +00:00
Johannes	c20e9b98ea	synced changes from eu version	2022-04-08 22:30:28 +02:00
joBr99	513dd25281	Update nextion2text.yml (add nextion2text)	2022-04-08 20:20:21 +00:00
Johannes	6a29f26154	Update nextion2text.yml	2022-04-08 22:20:01 +02:00
Johannes	3e9a24b2bd	fix typo	2022-04-07 21:05:06 +02:00
Johannes	1abeb20943	Update localization.py	2022-04-07 21:00:56 +02:00
Johannes	74709d6609	added a bunch of new languages	2022-04-07 20:19:09 +02:00
joBr99	66ff43f1d6	removed pre-filled code from cardAlarm in us-l version (add nextion2text)	2022-04-07 16:14:07 +00:00
Johannes	a4529a34d9	removed pre-filled code from cardAlarm in us-l version	2022-04-07 18:13:41 +02:00
Johannes	2fb46d087a	removed pre-filled code from cardAlarm	2022-04-07 18:12:35 +02:00
Johannes	0937b78643	Update README.md	2022-04-07 18:05:20 +02:00
Johannes	ee98936e05	Fix lgtm Recommendation	2022-04-07 15:58:15 +02:00
joBr99	620659c6c2	synced serial code and fonts to us portrait version (add nextion2text)	2022-04-06 21:34:52 +00:00
Johannes	83f3ba14c6	synced serial code and fonts to us portrait version	2022-04-06 23:32:13 +02:00
Johannes	55ec259ea3	updated heading	2022-04-06 15:57:30 +02:00
Johannes	66e37e113c	Update README.md	2022-04-06 15:56:13 +02:00
Johannes	72dde603a3	added font cheetsheet	2022-04-06 15:19:57 +02:00
joBr99	18acf894f1	update python test script to support utf8 (add nextion2text)	2022-04-05 21:14:11 +00:00
Johannes	d8e11553cc	update python test script to support utf8	2022-04-05 23:13:47 +02:00
Johannes	bb9e9b6417	fix alt layout on screensaver	2022-04-05 23:13:26 +02:00
Johannes	3177942288	fix icon on alt layout	2022-04-05 22:57:11 +02:00
joBr99	9e1b6044f5	Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)	2022-04-05 20:30:08 +00:00
Johannes	ac9ea168f3	Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui	2022-04-05 22:29:39 +02:00
Johannes	0742b7d124	fixed bug on thermostat page	2022-04-05 22:29:35 +02:00
joBr99	576c9281e1	Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)	2022-04-04 21:26:10 +00:00
Johannes	4eb5493cbb	Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui	2022-04-04 23:25:40 +02:00
Johannes	4b864bf126	fixed serial cardGrid	2022-04-04 23:25:34 +02:00
joBr99	3435830fc4	fixed thermo page (add nextion2text)	2022-04-04 21:08:16 +00:00
Johannes	a39ddd2e4e	fixed thermo page	2022-04-04 23:07:52 +02:00
joBr99	db9ecff3b7	Add support for Unicode over serial (#122 ) (add nextion2text)	2022-04-04 19:12:55 +00:00
Johannes	9a19bd9395	Add support for Unicode over serial (#122 ) * added utf8 fonts with multi lang charset * removed icon substring stuff * synced US-L version	2022-04-04 21:12:37 +02:00
Johannes	43d0a95b31	Fix Shutter Detail Page	2022-04-04 15:51:02 +02:00
Johannes	547404eff1	fix detail page command	2022-04-03 22:57:21 +02:00
Johannes	eed5a40fd9	Update config.py	2022-04-03 22:06:30 +02:00
Johannes	b85cdff932	Improve error handling for Entity Parsing	2022-04-03 22:04:01 +02:00
Johannes	6e6d72577a	Update pages.py	2022-04-03 20:53:28 +02:00
Johannes	49c4ee4c2a	Update example flow with new messgae format	2022-04-03 19:43:21 +02:00
joBr99	7ee16ef2e6	added some icons #120 (add nextion2text)	2022-04-03 16:02:25 +00:00
Johannes	22b4b7ccf1	added some icons #120	2022-04-03 18:01:57 +02:00
Johannes	7196dbd90e	Update README.md	2022-04-03 16:28:18 +02:00
Johannes	9ba4d04ccc	change date parser	2022-04-03 14:30:32 +02:00
Johannes	2f072a4e68	Update pages.py	2022-04-03 14:09:56 +02:00
joBr99	06ed5d721e	Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)	2022-04-03 11:36:29 +00:00
Johannes	3b2db021f8	Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui	2022-04-03 13:36:05 +02:00
Johannes	33c7b8850a	added some icons	2022-04-03 13:35:46 +02:00
Johannes	e1bc46f26e	Update README.md	2022-04-03 12:55:25 +02:00
Johannes	8f520f1bc9	Update README.md	2022-04-03 12:41:14 +02:00
Johannes	95905e18cb	Create README.md	2022-04-03 12:12:23 +02:00
Johannes	8b7d196721	fix doubletap config location	2022-04-03 11:46:25 +02:00
Johannes	aadebf801a	added default card after screensaver exit	2022-04-03 11:28:11 +02:00