diff --git a/HMI/n2t-out/nspanel_Stats.txt b/HMI/n2t-out/nspanel_Stats.txt
index 44a3364c..86e5a297 100644
--- a/HMI/n2t-out/nspanel_Stats.txt
+++ b/HMI/n2t-out/nspanel_Stats.txt
@@ -10,10 +10,14 @@ pageSerialTest
 	13   Component(s)
 	48   Line(s) of event code
 	43   Unique line(s) of event code
+popupShutter
+	19   Component(s)
+	195  Line(s) of event code
+	107  Unique line(s) of event code
 popupNotify
 	17   Component(s)
-	179  Line(s) of event code
-	118  Unique line(s) of event code
+	180  Line(s) of event code
+	119  Unique line(s) of event code
 cardMedia
 	22   Component(s)
 	200  Line(s) of event code
@@ -22,6 +26,10 @@ pageSwipeTest
 	18   Component(s)
 	62   Line(s) of event code
 	44   Unique line(s) of event code
+popupLight
+	26   Component(s)
+	352  Line(s) of event code
+	170  Unique line(s) of event code
 pageTest
 	14   Component(s)
 	14   Line(s) of event code
@@ -30,10 +38,6 @@ pageStartup
 	19   Component(s)
 	146  Line(s) of event code
 	111  Unique line(s) of event code
-popupShutter
-	19   Component(s)
-	194  Line(s) of event code
-	106  Unique line(s) of event code
 screensaver
 	25   Component(s)
 	173  Line(s) of event code
@@ -46,10 +50,6 @@ cardThermo
 	42   Component(s)
 	412  Line(s) of event code
 	221  Unique line(s) of event code
-popupLight
-	26   Component(s)
-	343  Line(s) of event code
-	165  Unique line(s) of event code
 cardEntities
 	54   Component(s)
 	808  Line(s) of event code
@@ -62,5 +62,5 @@ cardAlarm
 Total
 	14   Page(s)
 	349  Component(s)
-	3261 Line(s) of event code
-	823  Unique line(s) of event code
+	3272 Line(s) of event code
+	828  Unique line(s) of event code
diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt
index 45839059..34a84b87 100644
--- a/HMI/n2t-out/popupLight.txt
+++ b/HMI/n2t-out/popupLight.txt
@@ -789,6 +789,7 @@ Timer tmSleep
                     screensaver.originPage.val=dp
                     sleepValue=0
                     click b0,1
+                    click b0,0
                 }
             }
         
@@ -881,6 +882,7 @@ Timer tmSerial
                                             vis hTempSlider,0
                                             vis t3,0
                                             vis t4,0
+                                            mode_temp.val=0
                                             // mode == 1 is temp controls currently shown
                                             if(mode.val==1)
                                             {
@@ -890,6 +892,7 @@ Timer tmSerial
                                             }
                                         }else if(tTmp.txt=="unknown") // temp supported, but not in color mode
                                         {
+                                            mode_temp.val=1
                                             // mode == 1 is temp controls currently shown
                                             if(mode.val==1)
                                             {
@@ -899,6 +902,7 @@ Timer tmSerial
                                             }
                                         }else
                                         {
+                                            mode_temp.val=0
                                             vis hTempSlider,1
                                             vis t3,1
                                             vis t4,1
@@ -917,10 +921,15 @@ Timer tmSerial
                                         {
                                             vis t0,0
                                             vis bColor,0
+                                            vis pColorWheel,0
                                         }else
                                         {
                                             vis t0,1
                                             vis bColor,1
+                                            if(mode.val==0)
+                                            {
+                                                vis pColorWheel,1
+                                            }
                                         }
                                     }
                                     if(tInstruction.txt=="time")
diff --git a/HMI/n2t-out/popupNotify.txt b/HMI/n2t-out/popupNotify.txt
index 362de80f..f9a52be4 100644
--- a/HMI/n2t-out/popupNotify.txt
+++ b/HMI/n2t-out/popupNotify.txt
@@ -411,6 +411,7 @@ Timer tmSleep
                     screensaver.originPage.val=dp
                     sleepValue=0
                     click b0,1
+                    click b0,0
                 }
             }
         
diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt
index 64cce69e..406d734c 100644
--- a/HMI/n2t-out/popupShutter.txt
+++ b/HMI/n2t-out/popupShutter.txt
@@ -564,6 +564,7 @@ Timer tmSleep
                     screensaver.originPage.val=dp
                     sleepValue=0
                     click b0,1
+                    click b0,0
                 }
             }