diff --git a/image/page_campaign/text_desc.png b/image/page_campaign/text_desc.png
new file mode 100644
index 00000000..8003f281
Binary files /dev/null and b/image/page_campaign/text_desc.png differ
diff --git a/image/page_campaign/video_desc.mp4 b/image/page_campaign/video_desc.mp4
new file mode 100644
index 00000000..34c75087
Binary files /dev/null and b/image/page_campaign/video_desc.mp4 differ
diff --git a/image/page_campaign_en/text_desc.png b/image/page_campaign_en/text_desc.png
new file mode 100644
index 00000000..667f0b8d
Binary files /dev/null and b/image/page_campaign_en/text_desc.png differ
diff --git a/image/topping2_en/text8.png b/image/topping2_en/text8.png
new file mode 100644
index 00000000..0fe9d506
Binary files /dev/null and b/image/topping2_en/text8.png differ
diff --git a/xml/menu_new_layout_gen.py b/xml/menu_new_layout_gen.py
index 703e37fc..983ac6f7 100644
--- a/xml/menu_new_layout_gen.py
+++ b/xml/menu_new_layout_gen.py
@@ -331,7 +331,7 @@
       #out_xml( '\t<Value> Var( "฿" + $' + spl[4] + '.Price ) </Value>\r\n')
       
       if "inter" in param:
-        out_xml( '\t<Value> IntFormat(  $' + spl[4] + '.Price , DisplayFormat, /100) </Value>; test\r\n')
+        out_xml( '\t<Value> IntFormat(  $' + spl[4] + '.Price , DisplayFormat, PreScaleConvert) </Value>; test\r\n')
       else:
         out_xml( '\t<Value> Var( "฿" + $' + spl[4] + '.Price ) </Value>\r\n')
       out_xml( '\t</Text>\r\n')
@@ -373,7 +373,7 @@
       out_xml( '\t<ColorDisable> 0xEAE6E1 </ColorDisable>\r\n')
       out_xml( '\t<State> ' + shw + ' </State>\r\n')
       if "inter" in param:
-        out_xml( '\t<Value> IntFormat( $' + spl[5] + '.Price , DisplayFormat, /100) </Value>; test\r\n')
+        out_xml( '\t<Value> IntFormat( $' + spl[5] + '.Price , DisplayFormat, PreScaleConvert) </Value>; test\r\n')
       else:
         out_xml( '\t<Value> Var( "฿" + $' + spl[5] + '.Price ) </Value>\r\n')
       out_xml( '\t</Text>\r\n')
@@ -417,7 +417,7 @@
       out_xml( '\t<ColorDisable> 0xEAE6E1 </ColorDisable>\r\n')
       out_xml( '\t<State> ' + shw + ' </State>\r\n')
       if "inter" in param:
-        out_xml( '\t<Value> IntFormat(  $' + spl[6] + '.Price , DisplayFormat, /100) </Value>; test\r\n')
+        out_xml( '\t<Value> IntFormat(  $' + spl[6] + '.Price , DisplayFormat, PreScaleConvert) </Value>; test\r\n')
       else:
         out_xml( '\t<Value> Var( "฿" + $' + spl[6] + '.Price ) </Value>\r\n')
       out_xml( '\t</Text>\r\n')
@@ -773,7 +773,7 @@
         out_xml( '\t<State> ' + shw + ' </State>\r\n')
         
         if "inter" in param:
-          out_xml( '\t<Value> IntFormat( $' + spl[8] + '.Price , DisplayFormat, /100) </Value>; test\r\n')
+          out_xml( '\t<Value> IntFormat( $' + spl[8] + '.Price , DisplayFormat, PreScaleConvert) </Value>; test\r\n')
         else:
           out_xml( '\t<Value> Var( "฿" + $' + spl[8] + '.Price ) </Value>\r\n')
 
@@ -817,7 +817,7 @@
         out_xml( '\t<ColorDisable> 0xEAE6E1 </ColorDisable>\r\n')
         out_xml( '\t<State> ' + shw + ' </State>\r\n')
         if "inter" in param:
-          out_xml( '\t<Value> IntFormat( $' + spl[9] + '.Price , DisplayFormat, /100) </Value>; test\r\n')
+          out_xml( '\t<Value> IntFormat( $' + spl[9] + '.Price , DisplayFormat, PreScaleConvert) </Value>; test\r\n')
         else:
           out_xml( '\t<Value> Var( "฿" + $' + spl[9] + '.Price ) </Value>\r\n')
         
@@ -860,7 +860,7 @@
         out_xml( '\t<ColorDisable> 0xEAE6E1 </ColorDisable>\r\n')
         out_xml( '\t<State> ' + shw + ' </State>\r\n')
         if "inter" in param:
-          out_xml( '\t<Value> IntFormat( $' + spl[10] + '.Price , DisplayFormat, /100) </Value>; test\r\n')
+          out_xml( '\t<Value> IntFormat( $' + spl[10] + '.Price , DisplayFormat, PreScaleConvert) </Value>; test\r\n')
         else:
           out_xml( '\t<Value> Var( "฿" + $' + spl[10] + '.Price ) </Value>\r\n')
         
diff --git a/xml/page_board.xml b/xml/page_board.xml
index 3e1e00e7..ff915298 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -214,7 +214,11 @@
 		EndIf
 
 
-
+		If SystemDateMonth = 1 Then
+			If SystemDateDay = 1 Then
+				WRITE_FILE "/mnt/sdcard/coffeevending/CampaignEnable" "off"
+			EndIf
+		EndIf
 
 
 		If EventTurnOn = 1 Then 
@@ -228,6 +232,7 @@
 			Var VideoMainPage = "ROOT/taobin_project/video/main_page_event_alter.mp4"
 		EndIf
 
+
 	EndIf
 	If TermTemOnline = "true" Then
 		Var CountDownShowButton = 28
@@ -601,6 +606,7 @@
 	DEBUGVAR LanguageShow
 	DEBUGVAR DisplayFormat
 	DEBUGVAR PreScaleConvert
+	DEBUGVAR UnitPostDisplay
 	
 </EventOpen>
 
@@ -862,6 +868,7 @@
 ;<Loop>"true"</Loop>
 ;<Volume> 80 </Volume>
 <Filename> VideoMainPage </Filename>
+<FilenameAlternate> "ROOT/taobin_project/video/main_page.mp4" </FilenameAlternate>
 </Video>
 
 
diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml
index 77a7444b..ab11e062 100644
--- a/xml/page_brewing3.xml
+++ b/xml/page_brewing3.xml
@@ -58,6 +58,8 @@
 		Var bnStrawProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_straw_en.png"
 		Var bpStrawProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_straw_en.png"
 
+		Var CampaingFilename = "ROOT/taobin_project/image/page_campaign_en"
+
 		Var XStraw = 336
 	Else
 		;Var DirImage = "ROOT/taobin_project/image/collect_point1"
@@ -72,6 +74,8 @@
 		Var bnStrawProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_straw.png"
 		Var bpStrawProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_straw.png"
 
+		Var CampaingFilename = "ROOT/taobin_project/image/page_campaign"
+
 		Var XStraw = 382
 	EndIf
 
@@ -278,6 +282,18 @@
 
 	Var CreditCardVoid = 0
 
+
+	READ_FILE "/mnt/sdcard/coffeevending/CampaignEnable" CampaignEnableStr
+	If CampaignEnableStr = "true" Then
+		Var CampaignEnable = 1
+		Var CampaignVideoTimeCountDown = 14
+		Var PictureFile = CampaingFilename + "/text_desc.png"
+		Var VideoPlayFile =  "ROOT/taobin_project/image/page_campaign/video_desc.mp4"
+	Else
+		Var CampaignEnable = 0
+	EndIf
+	
+
 </EventOpen>
 
 
@@ -971,76 +987,87 @@
 	DEBUGVAR CountUpBrewing
 	; animation video loop
 	If AnimationOn = "true" Then
-		Var CountUpBrewing = CountUpBrewing + 1
-
-		Var SlotVideo = CountUpBrewing / AnimationVideoPlayTime
-		
-		If PreviseStepVideo = SlotVideo Then
-			;SAVELOG SlotVideo
+		If CampaignEnable = 1 Then
+			If CampaignVideoTimeCountDown > 0 Then
+				Var CampaignVideoTimeCountDown = CampaignVideoTimeCountDown - 1
+			EndIf
+			If CampaignVideoTimeCountDown = 0 Then
+				Var CampaignEnable = 0
+			EndIf
 		Else
-			Var PreviseStepVideo = SlotVideo
-			;SAVELOG PreviseStepVideo
-			;SAVELOG SlotVideo
-			;SAVELOG CountUpBrewing
+			Var CountUpBrewing = CountUpBrewing + 1
 
-			;Var CountDownVideoTime = CountDownVideoTimeReload
+			;CampaignEnable
+			Var SlotVideo = CountUpBrewing / AnimationVideoPlayTime
 			
-			Var StepVideo = SlotVideo + 2
-			
-			;SAVELOG StepVideo
-
-			If StepVideo = 1 Then
-				Var videoID = VideoID1
-			EndIf
-			If StepVideo = 2 Then
-				Var videoID = VideoID2
-			EndIf
-			If StepVideo = 3 Then
-				Var videoID = VideoID3
-			EndIf
-			If StepVideo = 4 Then
-				Var videoID = VideoID4
-			EndIf
-			If StepVideo = 5 Then
-				Var videoID = VideoID5
-			EndIf
-			If StepVideo = 6 Then
-				Var videoID = VideoID6
-			EndIf
-			If StepVideo = 7 Then
-				Var videoID = VideoID7
-			EndIf
-			If StepVideo = 8 Then
-				Var videoID = VideoID8
-			EndIf
-			If StepVideo = 9 Then
-				Var videoID = VideoID9
-			EndIf
-
-			;SAVELOG videoID
-
-			If videoID = 0 Then
-
+			If PreviseStepVideo = SlotVideo Then
+				;SAVELOG SlotVideo
 			Else
-				If videoID = "---" Then
+				Var PreviseStepVideo = SlotVideo
+				;SAVELOG PreviseStepVideo
+				;SAVELOG SlotVideo
+				;SAVELOG CountUpBrewing
+
+				;Var CountDownVideoTime = CountDownVideoTimeReload
+				
+				Var StepVideo = SlotVideo + 2
+				
+				;SAVELOG StepVideo
+
+				If StepVideo = 1 Then
+					Var videoID = VideoID1
+				EndIf
+				If StepVideo = 2 Then
+					Var videoID = VideoID2
+				EndIf
+				If StepVideo = 3 Then
+					Var videoID = VideoID3
+				EndIf
+				If StepVideo = 4 Then
+					Var videoID = VideoID4
+				EndIf
+				If StepVideo = 5 Then
+					Var videoID = VideoID5
+				EndIf
+				If StepVideo = 6 Then
+					Var videoID = VideoID6
+				EndIf
+				If StepVideo = 7 Then
+					Var videoID = VideoID7
+				EndIf
+				If StepVideo = 8 Then
+					Var videoID = VideoID8
+				EndIf
+				If StepVideo = 9 Then
+					Var videoID = VideoID9
+				EndIf
+
+				;SAVELOG videoID
+
+				If videoID = 0 Then
 
 				Else
+					If videoID = "---" Then
 
-					Var VideoPlayFile = VideoPath
-					Var VideoPlayFile = VideoPlayFile + VideoFileBegin
-					Var VideoPlayFile = VideoPlayFile + videoID
-					Var VideoPlayFile = VideoPlayFile + VideoFileEnd
+					Else
 
-					Var PictureFile = PicturePath
-					Var PictureFile = PictureFile + PictureBegin
-					Var PictureFile = PictureFile + videoID
-					Var PictureFile = PictureFile + PictureEnd
-					
-					DEBUGVAR VideoPlayFile
-					DEBUGVAR PictureFile
+						Var VideoPlayFile = VideoPath
+						Var VideoPlayFile = VideoPlayFile + VideoFileBegin
+						Var VideoPlayFile = VideoPlayFile + videoID
+						Var VideoPlayFile = VideoPlayFile + VideoFileEnd
+
+						Var PictureFile = PicturePath
+						Var PictureFile = PictureFile + PictureBegin
+						Var PictureFile = PictureFile + videoID
+						Var PictureFile = PictureFile + PictureEnd
+						
+						DEBUGVAR VideoPlayFile
+						DEBUGVAR PictureFile
+					EndIf
 				EndIf
 			EndIf
-		EndIf
+		EndIf 
+		; CampaignEnable
 	EndIf
 
 
@@ -1134,12 +1161,6 @@
 <Filename> VideoPlayFile </Filename>
 </Video>
 
-;<Image>
-;<X> 0 </X>
-;<Y> 0 </Y>
-;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
-;</Image>
-
 <Video>
 <X> 0 </X>
 <Y> 0 </Y>
@@ -1197,51 +1218,6 @@
 <Value> ShowCountDownBrewing </Value>
 </Text>
 
-;<Text>
-;<X> 100 </X>
-;<Y> 470 </Y>
-;<Align> End </Align>
-;<Width> 153 </Width>
-;<Size> 30 </Size>
-;<Font> RobotoBold </Font>
-;<Color> 0x513C2F </Color>
-;<Value> MachineStage </Value>
-;</Text>
-;
-
-
-;<Text>
-;<X> 0 </X>
-;<Y> 1880 </Y>
-;<Size> 30 </Size>
-;<Align> Center </Align>
-;<Width> 1080 </Width>
-;<Font> KanitThinTTF </Font>
-;<Color> 0x513C2F </Color>
-;<Value> MachineStage </Value>
-;</Text>
-
-
-;<Button>
-;<X> 0 </X>
-;<Y> 1860 </Y>
-;<Width> 200 </Width>
-;<Height> 50 </Height>
-;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-;<Volume> SoundVolume </Volume>
-;<EventClick> 
-;	Var countClick = countClick + 1
-;	If countClick = 3 Then
-;		
-;	EndIf
-;
-;	If countClick = 5 Then
-;		Var countClick = 0
-;		MainMenu
-;	EndIf
-;	Refresh
-;</EventClick>
-;</Button>
 
 <Button>
 <X> 870 </X>
diff --git a/xml/page_catalog_group_coffee.xml b/xml/page_catalog_group_coffee.xml
index 6cfd4eac..633b6b81 100644
--- a/xml/page_catalog_group_coffee.xml
+++ b/xml/page_catalog_group_coffee.xml
@@ -6849,7 +6849,7 @@ AMERICANO" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "ROSALYN   ROSALYN"
+		Var NameDrink = "ROSALYN   AMERICANO"
 		Var NameDrinkTH = "อเมริกาโน  ROSALYN"
 		Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (washed process)  กลิ่นกุหลาบ และ เบอร์รี่"
 		Var DrinkDescription = "Light Roast (natural process)  Pink​ Rose & Berry"
@@ -6944,7 +6944,7 @@ ROSALYN" </Value>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
 	<Value> "ROSALYN  
-ROSALYN" </Value>
+AMERICANO" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -9855,7 +9855,7 @@ ICED ESPRESSO" </Value>
 	<EventOnClick> 
 		Var NameDrink = "LATTE"
 		Var NameDrinkTH = "ลาเต้"
-		Var DrinkDescriptionTH = "กาแฟ นม และ นม"
+		Var DrinkDescriptionTH = "กาแฟ นม และ ฟองนม"
 		Var DrinkDescription = "Espresso, Milk, Foamed milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_latte.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -9934,7 +9934,7 @@ ICED ESPRESSO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟ นม และ นม" </Value>
+	<Value> "กาแฟ นม และ ฟองนม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -10104,7 +10104,7 @@ ICED ESPRESSO" </Value>
 	<EventOnClick> 
 		Var NameDrink = "LATTE"
 		Var NameDrinkTH = "ลาเต้"
-		Var DrinkDescriptionTH = "กาแฟ นม และ นม"
+		Var DrinkDescriptionTH = "กาแฟ นม และ ฟองนม"
 		Var DrinkDescription = "Espresso, Milk, Foamed milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_latte.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -10183,7 +10183,7 @@ ICED ESPRESSO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟ นม และ นม" </Value>
+	<Value> "กาแฟ นม และ ฟองนม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -10354,7 +10354,7 @@ ICED ESPRESSO" </Value>
 	<EventOnClick> 
 		Var NameDrink = "CAPPUCINO"
 		Var NameDrinkTH = "คาปูชิโน่"
-		Var DrinkDescriptionTH = "กาแฟ นม และ นม"
+		Var DrinkDescriptionTH = "กาแฟ นม และ ฟองนม"
 		Var DrinkDescription = "Espresso, Milk, Foamed milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_cappuccino.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -10433,7 +10433,7 @@ ICED ESPRESSO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟ นม และ นม" </Value>
+	<Value> "กาแฟ นม และ ฟองนม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -10603,7 +10603,7 @@ ICED ESPRESSO" </Value>
 	<EventOnClick> 
 		Var NameDrink = "CAPPUCINO"
 		Var NameDrinkTH = "คาปูชิโน่"
-		Var DrinkDescriptionTH = "กาแฟ นม และ นม"
+		Var DrinkDescriptionTH = "กาแฟ นม และ ฟองนม"
 		Var DrinkDescription = "Espresso, Milk, Foamed milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_cappuccino.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -10682,7 +10682,7 @@ ICED ESPRESSO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟ นม และ นม" </Value>
+	<Value> "กาแฟ นม และ ฟองนม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
diff --git a/xml/page_catalog_group_health.xml b/xml/page_catalog_group_health.xml
index 54c5ba6b..486d103a 100644
--- a/xml/page_catalog_group_health.xml
+++ b/xml/page_catalog_group_health.xml
@@ -785,7 +785,7 @@
 	<EventOnClick> 
 		Var NameDrink = "CAFE' LATTE"
 		Var NameDrinkTH = "ลาเต้"
-		Var DrinkDescriptionTH = "กาแฟ นม และ นม"
+		Var DrinkDescriptionTH = "กาแฟ นม และ ฟองนม"
 		Var DrinkDescription = "Espresso, Milk, Foamed milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_latte_Healthy.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -864,7 +864,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟ นม และ นม" </Value>
+	<Value> "กาแฟ นม และ ฟองนม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1290,7 +1290,7 @@ Milk, Sugar" </Value>
 	<EventOnClick> 
 		Var NameDrink = "CAPPUCINO"
 		Var NameDrinkTH = "คาปูชิโน่"
-		Var DrinkDescriptionTH = "กาแฟ นม และ นม"
+		Var DrinkDescriptionTH = "กาแฟ นม และ ฟองนม"
 		Var DrinkDescription = "Espresso, Milk, Foamed milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_Cappu_Healthy.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -1369,7 +1369,7 @@ Milk, Sugar" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟ นม และ นม" </Value>
+	<Value> "กาแฟ นม และ ฟองนม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml
index d90dd4ea..ec7e1912 100644
--- a/xml/page_catalog_group_recommend.xml
+++ b/xml/page_catalog_group_recommend.xml
@@ -6398,7 +6398,7 @@ AMERICANO" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "ROSALYN   ROSALYN"
+		Var NameDrink = "ROSALYN   AMERICANO"
 		Var NameDrinkTH = "อเมริกาโน  ROSALYN"
 		Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (washed process)  กลิ่นกุหลาบ และ เบอร์รี่"
 		Var DrinkDescription = "Light Roast (natural process)  Pink​ Rose & Berry"
@@ -6493,7 +6493,7 @@ ROSALYN" </Value>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
 	<Value> "ROSALYN  
-ROSALYN" </Value>
+AMERICANO" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
diff --git a/xml/page_topping_select5.xml b/xml/page_topping_select5.xml
index 17affb84..26a66e8e 100644
--- a/xml/page_topping_select5.xml
+++ b/xml/page_topping_select5.xml
@@ -1482,93 +1482,93 @@
 
 
 
-<Block>
-<Width> 986 </Width>
-<Height> 160 </Height>
-<MarginTop> 20 </MarginTop>
-<State> blendedStateShow </State> 
-<Image>
-<Filename> Var( DirImage + "/bg_blended.png" )</Filename>
-</Image>
+;<Block>
+;<Width> 986 </Width>
+;<Height> 160 </Height>
+;<MarginTop> 20 </MarginTop>
+;<State> blendedStateShow </State> 
+;<Image>
+;<Filename> Var( DirImage + "/bg_blended.png" )</Filename>
+;</Image>
+;
+;<Button>
+;<X> 40 </X>
+;<Y> 72 </Y>
+;<State> blendedState </State>
+;<Mode> "No" </Mode>
+;<Animation>
+;	<Style> "shake-text" </Style>
+;	<OnEvent> "OnValueChange" </OnEvent>
+;</Animation>
+;<Filename> Var( DirImage + "/bn_blended.png" ) </Filename>
+;<FilenamePress> Var( DirImage + "/bp_blended.png" ) </FilenamePress>
+;<FilenameDisable> Var( DirImage + "/bd_blended.png" ) </FilenameDisable>
+;<FilenameForce> Var( DirImage + "/bp_blended.png" ) </FilenameForce>
+;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+;<Volume> SoundVolume </Volume>
+;<EventClick> 
+;	
+;	SAVELOG "Press Smoothies"
+;	
+;	If blendedState = "Press" Then
+;		Var blendedState = "Enable"
+;	Else
+;		Var blendedState = "Press"
+;	EndIf
+;
+;	Function 1
+;
+;	Refresh
+;</EventClick>
+;</Button>
 
-<Button>
-<X> 40 </X>
-<Y> 72 </Y>
-<State> blendedState </State>
-<Mode> "No" </Mode>
-<Animation>
-	<Style> "shake-text" </Style>
-	<OnEvent> "OnValueChange" </OnEvent>
-</Animation>
-<Filename> Var( DirImage + "/bn_blended.png" ) </Filename>
-<FilenamePress> Var( DirImage + "/bp_blended.png" ) </FilenamePress>
-<FilenameDisable> Var( DirImage + "/bd_blended.png" ) </FilenameDisable>
-<FilenameForce> Var( DirImage + "/bp_blended.png" ) </FilenameForce>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-	
-	SAVELOG "Press Smoothies"
-	
-	If blendedState = "Press" Then
-		Var blendedState = "Enable"
-	Else
-		Var blendedState = "Press"
-	EndIf
-
-	Function 1
-
-	Refresh
-</EventClick>
-</Button>
-
-<Button>
-<X> 896 </X>
-<Y> 79 </Y>
-<State> blendedState </State>
-<Mode> "No" </Mode>
-<Animation>
-	<Style> "shake-text" </Style>
-	<OnEvent> "OnValueChange" </OnEvent>
-</Animation>
-<Filename> Var( DirImage + "/cb_notcheck.png" ) </Filename>
-<FilenamePress> Var( DirImage + "/cb_checked.png" ) </FilenamePress>
-<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
-<FilenameForce> Var( DirImage + "/cb_force_checked.png" ) </FilenameForce>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-		
-	SAVELOG "Press Smoothies"
-
-	If blendedState = "Press" Then
-		Var blendedState = "Enable"
-	Else
-		Var blendedState = "Press"
-	EndIf
-
-	Function 1
-
-	Refresh
-
-</EventClick>
-</Button>
-
-<Image>
-<State> showText7 </State>
-<X> 602 </X>
-<Y> 64 </Y>
-<Filename>  Var( DirImage + "/text7.png" ) </Filename>
-</Image>
-
-<Image>
-<State> blendedStateTxt </State>
-<X> 602 </X>
-<Y> 64 </Y>
-<Filename>  Var( DirImage + "/text5.png" ) </Filename>
-</Image>
-
-</Block>
+;<Button>
+;<X> 896 </X>
+;<Y> 79 </Y>
+;<State> blendedState </State>
+;<Mode> "No" </Mode>
+;<Animation>
+;	<Style> "shake-text" </Style>
+;	<OnEvent> "OnValueChange" </OnEvent>
+;</Animation>
+;<Filename> Var( DirImage + "/cb_notcheck.png" ) </Filename>
+;<FilenamePress> Var( DirImage + "/cb_checked.png" ) </FilenamePress>
+;<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
+;<FilenameForce> Var( DirImage + "/cb_force_checked.png" ) </FilenameForce>
+;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+;<Volume> SoundVolume </Volume>
+;<EventClick> 
+;		
+;	SAVELOG "Press Smoothies"
+;
+;	If blendedState = "Press" Then
+;		Var blendedState = "Enable"
+;	Else
+;		Var blendedState = "Press"
+;	EndIf
+;
+;	Function 1
+;
+;	Refresh
+;
+;</EventClick>
+;</Button>
+;
+;<Image>
+;<State> showText7 </State>
+;<X> 602 </X>
+;<Y> 64 </Y>
+;<Filename>  Var( DirImage + "/text7.png" ) </Filename>
+;</Image>
+;
+;<Image>
+;<State> blendedStateTxt </State>
+;<X> 602 </X>
+;<Y> 64 </Y>
+;<Filename>  Var( DirImage + "/text5.png" ) </Filename>
+;</Image>
+;
+;</Block>
 ;
 ;
 ;
diff --git a/xml/page_topping_select6.xml b/xml/page_topping_select6.xml
index fb48b98c..5436dd0f 100644
--- a/xml/page_topping_select6.xml
+++ b/xml/page_topping_select6.xml
@@ -250,22 +250,19 @@
 	If hot_button_state = "Disable2" Then
 		Var text_price_d1 = ""
 	Else
-		Var text_price_d1 = "(฿" + PriceD1
-		Var text_price_d1 = text_price_d1 + ")"
+		Var text_price_d1 !assigned IntFormat( PriceD1 , DisplayFormat, PreScaleConvert) 
 	EndIf
 
 	If cold_button_state = "Disable2" Then
 		Var text_price_d2 = ""
 	Else
-		Var text_price_d2 = "(฿" + PriceD2
-		Var text_price_d2 = text_price_d2 + ")"
+		Var text_price_d2 !assigned IntFormat( PriceD2 , DisplayFormat, PreScaleConvert) 
 	EndIf
 
 	If blend_button_state = "Disable2" Then
 		Var text_price_d3 = ""
 	Else
-		Var text_price_d3 = "(฿" + PriceD3
-		Var text_price_d3 = text_price_d3 + ")"
+		Var text_price_d3 !assigned IntFormat( PriceD3 , DisplayFormat, PreScaleConvert) 
 	EndIf
 
 	DEBUGVAR PD_CODE1
@@ -423,9 +420,7 @@
 		EndIf
 	EndIf
 
-	If new_layout = "true" Then 
-		Function 2
-	EndIf
+	Function 2
 	
 	
 	RefreshAll
@@ -550,7 +545,19 @@
 		EndIf
 
 		DEBUGVAR SubMenuGroupIDSlot6_1
-		
+
+
+		; i f Hot menu disable away
+		If hot_button_state = "PressForever" Then
+			If showOreoAddEnable = "Enable" Then
+				Var showOreoAddEnable = "Disable"
+			EndIf
+			If showOreoAddEnable = "Press" Then
+				Var showOreoAddEnable = "Disable"
+			EndIf
+		EndIf
+
+		; first time.
 		If blend_button_state = "PressForever" Then
 
 		Else
@@ -665,7 +672,6 @@
 		EndIf
 		
 			
-			
 		If UserSeletedSugar = 0 Then 
 			If SugarModeUpdateWhenChangeDrinkType = 1 Then
 				Var SugarModeUpdateWhenChangeDrinkType = 0
@@ -819,6 +825,8 @@
 				Var SugarState4 = "Enable"
 				Var SugarState5 = "Enable"
 
+				DEBUGVAR "set default Powder Sugar"
+
 				If toppingID1index1 = toppingID1Default Then
 					Var SugarState1 = "PressForever"
 					Var sugar_default_flag = 1
@@ -847,6 +855,9 @@
 				If sugar_default_flag = 0 Then
 					Var SugarState1 = "PressForever"
 				EndIf
+
+				DEBUGVAR toppingID1Default
+				DEBUGVAR SugarState1
 			EndIf
 			
 
@@ -986,6 +997,8 @@
 				EndIf
 			EndIf
 
+			DEBUGVAR SelectDrinkType
+
 			If SelectDrinkType = 0 Then
 				Var SugarState1 = "Enable"
 				Var SugarState2 = "Enable"
@@ -1150,9 +1163,10 @@
 		DEBUGVAR showShotEnable
 		DEBUGVAR showOreoAddEnable
 		DEBUGVAR ShotCoffeePremium
-		SAVELOG toppingID2price1
-		SAVELOG toppingID2price2
-		SAVELOG toppingID2price3
+		DEBUGVAR toppingID2price1
+		DEBUGVAR toppingID2price2
+		DEBUGVAR toppingID2price3
+		Function 2
 	EndIf
 
 
@@ -1281,6 +1295,7 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
+	Var SelectDrinkType = 1
 	
 	SAVELOG "Press hot"
 
@@ -1314,9 +1329,9 @@
 
 	Var high_light_drink_type = "Invisible"
 
-	Function 2
+	;Function 2
 
-	Refresh
+	;Refresh
 
 
 </EventClick>
@@ -1337,6 +1352,7 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
+	Var SelectDrinkType = 1
 	
 	SAVELOG "Press cold"
 
@@ -1366,9 +1382,9 @@
 	Var topping_price_refresh = 0
 	Topping "Load" PD_CODE2
 
-	Function 2
+	;Function 2
 
-	Refresh
+	;Refresh
 </EventClick>
 </Button>
 
@@ -1389,6 +1405,7 @@
 <EventClick> 
 	
 	SAVELOG "Press blend"
+	Var SelectDrinkType = 1
 
 	Var blend_button_state = "PressForever"
 
@@ -1416,9 +1433,9 @@
 	Var topping_price_refresh = 0
 	Topping "Load" PD_CODE3
 
-	Function 2
+	;Function 2
 
-	Refresh
+	;Refresh
 </EventClick>
 </Button>
 
@@ -1462,93 +1479,93 @@
 
 
 
-<Block>
-<Width> 986 </Width>
-<Height> 160 </Height>
-<MarginTop> 20 </MarginTop>
-<State> blendedStateShow </State> 
-<Image>
-<Filename> Var( DirImage + "/bg_blended.png" )</Filename>
-</Image>
-
-<Button>
-<X> 40 </X>
-<Y> 72 </Y>
-<State> blendedState </State>
-<Mode> "No" </Mode>
-<Animation>
-	<Style> "shake-text" </Style>
-	<OnEvent> "OnValueChange" </OnEvent>
-</Animation>
-<Filename> Var( DirImage + "/bn_blended.png" ) </Filename>
-<FilenamePress> Var( DirImage + "/bp_blended.png" ) </FilenamePress>
-<FilenameDisable> Var( DirImage + "/bd_blended.png" ) </FilenameDisable>
-<FilenameForce> Var( DirImage + "/bp_blended.png" ) </FilenameForce>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-	
-	SAVELOG "Press Smoothies"
-	
-	If blendedState = "Press" Then
-		Var blendedState = "Enable"
-	Else
-		Var blendedState = "Press"
-	EndIf
-
-	Function 1
-
-	Refresh
-</EventClick>
-</Button>
-
-<Button>
-<X> 896 </X>
-<Y> 79 </Y>
-<State> blendedState </State>
-<Mode> "No" </Mode>
-<Animation>
-	<Style> "shake-text" </Style>
-	<OnEvent> "OnValueChange" </OnEvent>
-</Animation>
-<Filename> Var( DirImage + "/cb_notcheck.png" ) </Filename>
-<FilenamePress> Var( DirImage + "/cb_checked.png" ) </FilenamePress>
-<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
-<FilenameForce> Var( DirImage + "/cb_force_checked.png" ) </FilenameForce>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-		
-	SAVELOG "Press Smoothies"
-
-	If blendedState = "Press" Then
-		Var blendedState = "Enable"
-	Else
-		Var blendedState = "Press"
-	EndIf
-
-	Function 1
-
-	Refresh
-
-</EventClick>
-</Button>
-
-<Image>
-<State> showText7 </State>
-<X> 602 </X>
-<Y> 64 </Y>
-<Filename>  Var( DirImage + "/text7.png" ) </Filename>
-</Image>
-
-<Image>
-<State> blendedStateTxt </State>
-<X> 602 </X>
-<Y> 64 </Y>
-<Filename>  Var( DirImage + "/text5.png" ) </Filename>
-</Image>
-
-</Block>
+;<Block>
+;<Width> 986 </Width>
+;<Height> 160 </Height>
+;<MarginTop> 20 </MarginTop>
+;<State> blendedStateShow </State> 
+;<Image>
+;<Filename> Var( DirImage + "/bg_blended.png" )</Filename>
+;</Image>
+;
+;<Button>
+;<X> 40 </X>
+;<Y> 72 </Y>
+;<State> blendedState </State>
+;<Mode> "No" </Mode>
+;<Animation>
+;	<Style> "shake-text" </Style>
+;	<OnEvent> "OnValueChange" </OnEvent>
+;</Animation>
+;<Filename> Var( DirImage + "/bn_blended.png" ) </Filename>
+;<FilenamePress> Var( DirImage + "/bp_blended.png" ) </FilenamePress>
+;<FilenameDisable> Var( DirImage + "/bd_blended.png" ) </FilenameDisable>
+;<FilenameForce> Var( DirImage + "/bp_blended.png" ) </FilenameForce>
+;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+;<Volume> SoundVolume </Volume>
+;<EventClick> 
+;	
+;	SAVELOG "Press Smoothies"
+;	
+;	If blendedState = "Press" Then
+;		Var blendedState = "Enable"
+;	Else
+;		Var blendedState = "Press"
+;	EndIf
+;
+;	Function 1
+;
+;	Refresh
+;</EventClick>
+;</Button>
+;
+;<Button>
+;<X> 896 </X>
+;<Y> 79 </Y>
+;<State> blendedState </State>
+;<Mode> "No" </Mode>
+;<Animation>
+;	<Style> "shake-text" </Style>
+;	<OnEvent> "OnValueChange" </OnEvent>
+;</Animation>
+;<Filename> Var( DirImage + "/cb_notcheck.png" ) </Filename>
+;<FilenamePress> Var( DirImage + "/cb_checked.png" ) </FilenamePress>
+;<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
+;<FilenameForce> Var( DirImage + "/cb_force_checked.png" ) </FilenameForce>
+;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+;<Volume> SoundVolume </Volume>
+;<EventClick> 
+;		
+;	SAVELOG "Press Smoothies"
+;
+;	If blendedState = "Press" Then
+;		Var blendedState = "Enable"
+;	Else
+;		Var blendedState = "Press"
+;	EndIf
+;
+;	Function 1
+;
+;	Refresh
+;
+;</EventClick>
+;</Button>
+;
+;<Image>
+;<State> showText7 </State>
+;<X> 602 </X>
+;<Y> 64 </Y>
+;<Filename>  Var( DirImage + "/text7.png" ) </Filename>
+;</Image>
+;
+;<Image>
+;<State> blendedStateTxt </State>
+;<X> 602 </X>
+;<Y> 64 </Y>
+;<Filename>  Var( DirImage + "/text5.png" ) </Filename>
+;</Image>
+;
+;</Block>
 ;
 ;
 ;
@@ -2524,7 +2541,7 @@
 	<Height> 64 </Height>
 	<State> ExtraTopping </State>
 	<Image>
-		<Filename> "ROOT/taobin_project/image/topping2/bg_top.png" </Filename>
+		<Filename> Var( DirImage + "/bg_top.png" ) </Filename>
 	</Image>
 </Row1>
 ;
@@ -2553,27 +2570,16 @@
 <EventClick> 
 	SAVELOG "premium shot press"
 	
+
 	If ShotCoffeePremium = "Press" Then
 		Var ShotCoffeePremium = "Enable"
-		Var PriceDrinkTmp = PriceDrinkTmp - toppingID2price2
-		Var topping2 = toppingID2index1
-		Var DisableUsingCode = "false"
-		SAVELOG "Deselect add premium shot"
 	Else
 		Var ShotCoffeePremium = "Press"
-		Var PriceDrinkTmp = PriceDrinkTmp + toppingID2price2
-		Var topping2 = toppingID2index2
-		Var DisableUsingCode = "true"
-		SAVELOG "Select add premium shot"
 	EndIf
 
-	Var PriceDrinkNoTop = PriceDrinkTmp
+	Function 2
 
-	Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
-
-	SAVELOG PriceDrinkTmp
 	Refresh
-
 </EventClick>
 </Button>
 
@@ -2590,25 +2596,15 @@
 <EventClick> 
 	SAVELOG "premium shot press"
 	
+
 	If ShotCoffeePremium = "Press" Then
 		Var ShotCoffeePremium = "Enable"
-		Var PriceDrinkTmp = PriceDrinkTmp - toppingID2price2
-		Var topping2 = toppingID2index1
-		Var DisableUsingCode = "false"
-		SAVELOG "Deselect add premium shot"
 	Else
 		Var ShotCoffeePremium = "Press"
-		Var PriceDrinkTmp = PriceDrinkTmp + toppingID2price2
-		Var topping2 = toppingID2index2
-		Var DisableUsingCode = "true"
-		SAVELOG "Select add premium shot"
 	EndIf
 
-	Var PriceDrinkNoTop = PriceDrinkTmp
+	Function 2
 
-	Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
-
-	SAVELOG PriceDrinkTmp
 	Refresh
 
 
@@ -2639,7 +2635,7 @@
 <Image>
 	<X> 0 </X>
 	<Y> 0 </Y>
-	<Filename> Var( DirImage + "/bg_top_shot2.png") </Filename>
+	<Filename> Var( DirImage + "/bg_top_shot.png") </Filename>
 </Image>
 ; 
 <Button>
@@ -2725,7 +2721,7 @@
 <Image>
 	<X> 0 </X>
 	<Y> 0 </Y>
-	<Filename> Var( DirImage + "/bg_top_oreo2.png") </Filename>
+	<Filename> Var( DirImage + "/bg_top_oreo.png") </Filename>
 </Image>
 ; 
 <Button>
@@ -3590,18 +3586,16 @@
 	DEBUGVAR PriceDrinkNoTop
 	DEBUGVAR PriceDiff
 	DEBUGVAR showShotEnable
+	Var TOPPING_PRICE = 0
 
-
-	If showShotEnable = "Press" Then	
+	If ShotCoffeePremium = "Press" Then
 		If blendedState = "Press" Then
 			Var PriceDrinkTmp = PriceDrinkNoTop
 		EndIf
 
 		Var blendedState = "Disable"
-
 		Var TOPPING_PRICE = 0
 
-		;Var PriceDrinkTmp = PriceDrinkNoTop + toppingID2price2
 		Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2
 		
 		Var topping2 = toppingID2index2
@@ -3610,31 +3604,57 @@
 		
 		Var showText7 = "Enable"
 
-		SAVELOG "Select add normal shot"
+		SAVELOG "Select premi normal shot"
+
 	Else
-		If blendedState = "Disable" Then
-			Var blendedState = "Enable"
+
+		If showShotEnable = "Press" Then	
+			If blendedState = "Press" Then
+				Var PriceDrinkTmp = PriceDrinkNoTop
+			EndIf
+
+			Var blendedState = "Disable"
+
+			Var TOPPING_PRICE = 0
+
+			;Var PriceDrinkTmp = PriceDrinkNoTop + toppingID2price2
+			Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2
+			
+			Var topping2 = toppingID2index2
+			
+			Var DisableUsingCode = "true"
+			
+			Var showText7 = "Enable"
+
+			SAVELOG "Select add normal shot"
+		Else
+			If blendedState = "Disable" Then
+				Var blendedState = "Enable"
+			EndIf
+			
+
+			Var PriceDrinkTmp = PriceDrinkNoTop
+			Var topping2 = toppingID2index1
+			Var DisableUsingCode = "false"
+			SAVELOG "Deselect add normal shot"
+
+			Var showText7 = "Invisible"
+
 		EndIf
-		
-
-		Var PriceDrinkTmp = PriceDrinkNoTop
-		Var topping2 = toppingID2index1
-		Var DisableUsingCode = "false"
-		SAVELOG "Deselect add normal shot"
-
-		Var showText7 = "Invisible"
 
 	EndIf
 
 
 	DEBUGVAR showOreoAddEnable
+	DEBUGVAR TOPPING_PRICE
 
 	If showOreoAddEnable = "Press" Then
 		Var TOPPING_PRICE = TOPPING_PRICE + toppingID6price2
 		Var topping6 = toppingID6index2
 		Var DisableUsingCode = "true"
 	Else
-		Var PriceDrinkTmp = PriceDrinkNoTop
+
+		;Var PriceDrinkTmp = PriceDrinkNoTop
 
 		Var topping6 = toppingID6index1
 
@@ -3646,13 +3666,15 @@
 	DEBUGVAR SelectDrinkType
 
 	DEBUGVAR showShotEnable
-	DEBUGVAR blendedState
+	DEBUGVAR PriceDrinkTmpShow
 
 	Var PriceDrinkTmp = PriceDrinkNoTop + TOPPING_PRICE
 	Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
 
 	If SelectDrinkType = 0 Then
 		Var PriceDrinkTmpShow = "---"
+	Else
+		Var PriceDrinkTmpShow !assigned IntFormat( PriceDrinkTmpShow , DisplayFormat, PreScaleConvert)
 	EndIf
 	SAVELOG PriceDrinkTmp
 
@@ -3664,6 +3686,7 @@
 
 
 	Var Timeout = 0
+	
 	RefreshAll
 
 </Function2>
diff --git a/xml_main/startup.xml b/xml_main/startup.xml
index 9cc6749d..31dfc8fb 100644
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@@ -106,8 +106,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "6.72"
-	Var XMLPageVersionInt = 672
+	Var XMLPageVersion = "6.74"
+	Var XMLPageVersionInt = 674
 </EventOpen>
 
 <Text>