diff --git a/inter/sgp/xml/page_brewing3.lxml b/inter/sgp/xml/page_brewing3.lxml
index 0e01c76c..f82e18f7 100644
--- a/inter/sgp/xml/page_brewing3.lxml
+++ b/inter/sgp/xml/page_brewing3.lxml
@@ -2,9 +2,14 @@
 <Cache> "Enable" </Cache>
 <Width> 1080 </Width>
 <Height> 1920 </Height>
-<Background> "0xeae6e1" </Background>
+<Background> BackgroundColor </Background>
 <Volume> SoundVolume </Volume>
 <EventOpen>
+
+	If UsePepsiTheme = 1 Then
+		Open "ROOT/taobin_project/inter/sgp/xml/page_brewing3_blue.lxml"
+	EndIf
+
 	Var SendNotiPaySuccess = 2
 
 	Var GetMoreStrawCount = 2
@@ -27,6 +32,12 @@
 
 	Var DirImageDoing = CountryRootPath + "/image/page_doing"
 
+	If UsePepsiTheme = 1 Then
+		Var DirImageDoing = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_doing"
+	EndIf
+
+	DEBUGVAR BackgroundColor
+
 	Var SelectDrink = Seeker.selected_a_drink
 	Var ExtendData = Seeker.ExtendData
 
@@ -56,7 +67,6 @@
 		Var IMG_CNT = DirImageDoing + "/img2_eng.png"
 
 		Play "ROOT/taobin_project/sound_eng/Wait_a_moment.mp3"
-
 		Var bnGetMoreStrawFileName = DirImageDoing + "/bn_get_more_straw_en.png"
 		Var bpGetMoreStrawFileName = DirImageDoing + "/bp_get_more_straw_en.png"
 
@@ -73,6 +83,19 @@
 		Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv3_en.png"
 		Var brew_txt1 = "ROOT/taobin_project/video/brewing_txt_adv1_en.png"
 
+		DEBUGVAR bnGetMoreStrawFileName
+		DEBUGVAR bnStrawProblemReport
+		DEBUGVAR bnLidProblemReport
+		DEBUGVAR bn_get_lid_image
+
+		;If UsePepsiTheme = 1 Then
+		;	Var brew_txt2 = "ROOT/taobin_project/inter/whatthecup/sgp/video/brewing_txt_adv3_en.png"
+		;	Var brew_txt1 = "ROOT/taobin_project/inter/whatthecup/sgp/video/brewing_txt_adv1_en.png"
+		;EndIf
+
+		DEBUGVAR EnableGetMoreStrawFileName
+		DEBUGVAR GetLidButtonState
+
 		Var XStraw = 274
 	Else
 		Var PlaySoundLag = "ROOT/taobin_project/sound_thai/thankyou.mp3"
@@ -232,6 +255,11 @@
 	If show_eng = "true" Then 
 		Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
 		Var DirImage2 = "ROOT/taobin_project/image/topping2_en"
+
+		If UsePepsiTheme = 1 Then
+			Var DirImage = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_payment_en/page_payment"
+			Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en"
+		EndIf
 	Else
 		Var DirImage = "ROOT/taobin_project/image/page_payment"
 		Var DirImage2 = "ROOT/taobin_project/image/topping2"
@@ -436,6 +464,10 @@
 		Var ShowCountdown = "Invisible"
 
 		Var IMG_CNT = "ROOT/taobin_project/inter/sgp/image/page_doing/img2_percent_eng.png"
+
+		If UsePepsiTheme = 1 Then
+			Var IMG_CNT = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_doing/img2_percent_eng.png"
+		EndIf
 	EndIf
 
 	If XPercent = 0 Then
@@ -1585,7 +1617,7 @@
 <Width> 153 </Width>
 <Size> 88 </Size>
 <Font> RobotoBold </Font>
-<Color> 0x513C2F </Color>
+<Color> BodyTextColor </Color>
 <Value> XPercent </Value>
 </Text>
 
diff --git a/inter/sgp/xml/page_brewing3_blue.lxml b/inter/sgp/xml/page_brewing3_blue.lxml
new file mode 100644
index 00000000..bf650efb
--- /dev/null
+++ b/inter/sgp/xml/page_brewing3_blue.lxml
@@ -0,0 +1,1952 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> BackgroundColor </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+
+	Var SendNotiPaySuccess = 2
+
+	Var GetMoreStrawCount = 2
+
+	Var CountUpWhenBREW_CNT = 0
+	DEBUGVAR TxRef1
+
+	SAVELOG "SGP page_brewing3.lxml"
+	DEBUGVAR MachineStage
+
+	Var PictureFileTextDesctionState = "Enable"
+
+
+	If CART_COUNT >= 1 Then
+		 Open "ROOT/taobin_project/xml/page_brewing3Multi.xml"  
+	Else
+       	Var PayReference = ""
+		Var PayType = "newpay"
+    EndIf
+
+	Var DirImageDoing = CountryRootPath + "/image/page_doing"
+
+	If UsePepsiTheme = 1 Then
+		Var DirImageDoing = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_doing"
+	EndIf
+
+	DEBUGVAR BackgroundColor
+
+	Var SelectDrink = Seeker.selected_a_drink
+	Var ExtendData = Seeker.ExtendData
+
+	Var ServiceAmount2 = Seeker.ServiceAmount2
+
+	DEBUGVAR Seeker
+	DEBUGVAR Seeker.selected_a_drink
+	DEBUGVAR Seeker.ServiceAmount2
+
+	DEBUGVAR Seeker.CodeNumber
+
+	Var SessionID2 = SelectSlot + ":"
+	Var SessionID2 = SessionID2 + ExtendData
+
+	; On open move from page_brewing3.xml
+	Var countClick2 = 0
+
+	Var Timeout = 0
+
+	Var PrintCoinAmount = 0
+
+	WRITE_FILE "/mnt/sdcard/coffeevending/log/drink-success" "--"
+
+
+    If show_eng = "true" Then 
+		
+		Var IMG_CNT = DirImageDoing + "/img2_eng.png"
+
+		Play "ROOT/taobin_project/sound_eng/Wait_a_moment.mp3"
+		Var bnGetMoreStrawFileName = DirImageDoing + "/bn_get_more_straw_en.png"
+		Var bpGetMoreStrawFileName = DirImageDoing + "/bp_get_more_straw_en.png"
+
+		Var bnStrawProblemReport = DirImageDoing + "/bn_send_report_straw_en.png"
+		Var bpStrawProblemReport = DirImageDoing + "/bp_send_report_straw_en.png"
+
+		Var bnLidProblemReport = DirImageDoing + "/bn_send_report_lid_en.png"
+		Var bpLidProblemReport = DirImageDoing + "/bp_send_report_lid_en.png"
+		
+
+		Var bn_get_lid_image = DirImageDoing + "/bn_get_lid_en.png"
+		Var bp_get_lid_image = DirImageDoing + "/bp_get_lid_en.png"
+
+		Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv3_en.png"
+		Var brew_txt1 = "ROOT/taobin_project/video/brewing_txt_adv1_en.png"
+
+		DEBUGVAR bnGetMoreStrawFileName
+		DEBUGVAR bnStrawProblemReport
+		DEBUGVAR bnLidProblemReport
+		DEBUGVAR bn_get_lid_image
+
+		;If UsePepsiTheme = 1 Then
+		;	Var brew_txt2 = "ROOT/taobin_project/inter/whatthecup/sgp/video/brewing_txt_adv3_en.png"
+		;	Var brew_txt1 = "ROOT/taobin_project/inter/whatthecup/sgp/video/brewing_txt_adv1_en.png"
+		;EndIf
+
+		DEBUGVAR EnableGetMoreStrawFileName
+		DEBUGVAR GetLidButtonState
+
+		Var XStraw = 274
+	Else
+		Var PlaySoundLag = "ROOT/taobin_project/sound_thai/thankyou.mp3"
+		
+		
+		Play PlaySoundLag
+
+		Var IMG_CNT = DirImageDoing + "/img2.png"
+	
+
+		Var bnGetMoreStrawFileName = DirImageDoing + "/bn_get_more_straw.png"
+		Var bpGetMoreStrawFileName = DirImageDoing + "/bp_get_more_straw.png"
+
+		Var bnStrawProblemReport = DirImageDoing + "/bn_send_report_straw.png"
+		Var bpStrawProblemReport = DirImageDoing + "/bp_send_report_straw.png"
+
+		Var bnLidProblemReport = DirImageDoing + "/bn_send_report_lid.png"
+		Var bpLidProblemReport = DirImageDoing + "/bp_send_report_lid.png"		
+
+		
+		Var bn_get_lid_image = DirImageDoing + "/bn_get_lid.png"
+		Var bp_get_lid_image = DirImageDoing + "/bp_get_lid.png"
+
+		Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv3.png"
+		Var brew_txt1 = "ROOT/taobin_project/video/brewing_txt_adv1.png"
+
+		Var XStraw = 274
+	EndIf
+
+	Var waitAckPay = 0
+	Var VendingTSIDTmp = ""
+	Var VendingTSIDProblem = ""
+	Var CreditReference = ""
+	Var PayCredit = 0
+
+	
+
+	If Seeker.PayWithQR = 1 Then
+		Var VendingTSIDTmp = Seeker.VendingTSID
+
+		If Seeker.TNumberTaobinCredit = "" Then
+			Var TelephoneNumber = "0899999999"
+			Var PayO2 = ""
+		Else
+			Var TelephoneNumber = Seeker.TNumberTaobinCredit
+			Var PayO2 = Seeker.CoffeePinNumber
+		EndIf
+
+
+		If ChangeFlag2 = 1 Then
+					Var TelephoneNumber = "0899999999"
+					Var PayO2 = ""
+					Var VendingDiscount = 0
+					Var VendingCampaign = 0
+					Var ServiceType = "credit"
+					Var SessionID2 = SelectDrink
+					Var ServiceCredit = "coffee"
+					Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+					
+		Else
+
+					If Seeker.StoreCreditFlag = 1 Then
+						Var VendingDiscount = 0
+						Var VendingCampaign = 0
+						Var ServiceType = "credit"
+						Var SessionID2 = SelectDrink
+						Var ServiceCredit = "coffee"
+						Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+						
+
+					EndIf
+		EndIf
+	EndIf
+
+	If Seeker.TNumberTaobinCredit = "" Then
+
+		If Seeker.TNumberTaobinMember = "" Then
+			Var TelephoneNumberProblem = ""
+		Else
+			Var TelephoneNumberProblem = Seeker.TNumberTaobinMember
+		EndIf
+				
+	Else
+		Var TelephoneNumberProblem = Seeker.TNumberTaobinCredit
+	EndIf
+
+	If TelephoneNumberProblem = "" Then
+		;Var TelephoneNumberProblem = ""
+    	Var ShowTextNumber = "Enable"
+    	Var Tel_Confirm_State = "Disable"
+	Else
+		Var ShowTextNumber = "Invisible"
+    	Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var AddData = 0
+
+	DEBUGVAR Seeker.TNumberTaobinMember 
+	DEBUGVAR Seeker.PointTaobinStr
+	
+
+	If Seeker.TNumberTaobinMember = "" Then
+
+	Else
+		If Seeker.PayWithQR = 1 Then
+			Var VendingTSID = VendingTSIDTmp
+		Else
+			Var VendingTSID = ""
+		EndIf 	
+
+
+		Var BmiYear = Seeker.PointTaobinStr
+		Var PointCrm = ""
+		If Seeker.FromConsent = 1 Then 
+			Var PointCrm = "pdpa1"
+		EndIf
+		Var GetScore = VendingTSID
+		If Seeker.TaobinErrorNetwork = 0 Then
+			Var Cid = 11
+			Var AddData = 1
+			;AddData Cid Seeker.TNumberTaobinMember  BmiYear PointCrm GetScore
+		Else
+			Var PointCrm = ""
+			Var Cid = 14
+			Var AddData = 1
+			;AddData Cid Seeker.TNumberTaobinMember  BmiYear PointCrm GetScore
+		EndIf
+		
+		Var VendingTSID = ""
+	EndIf
+
+	If Seeker.VendingCode = "MKFOO" Then
+		Var AddData = 0
+	EndIf 
+
+
+	If GetFreeFromError = 1 Then
+		;Var GetFreeFromError = 0
+		Var TelephoneNumberProblem = TelephoneNumberGOTFree
+		
+	EndIf
+
+
+	If LedLidBlink = "true" Then
+		Var LedLidBlink = "no"
+		LED LedDoorLid Blink 255 255 255 255
+	EndIf
+
+
+	Var CreditReference = Seeker.CreditReferenceTmp
+	Var VendingDiscount = Seeker.VendingDiscount
+	Var VendingCampaign = Seeker.VendingCampaign
+	Var TxReference = Seeker.TxRef1
+	DEBUGVAR TxReference
+
+
+	If show_eng = "true" Then 
+		Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
+		Var DirImage2 = "ROOT/taobin_project/image/topping2_en"
+
+		If UsePepsiTheme = 1 Then
+			Var DirImage = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_payment_en/page_payment"
+			Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en"
+		EndIf
+	Else
+		Var DirImage = "ROOT/taobin_project/image/page_payment"
+		Var DirImage2 = "ROOT/taobin_project/image/topping2"
+	EndIf
+
+	DEBUGVAR show_eng 
+
+	Var next_pic_bn = DirImage + "/bn_add_order.png"
+	Var next_pic_bp = DirImage + "/bp_add_order.png"
+	Var text_next_order = DirImage + "/text_next_order.png"
+	Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png"
+	
+
+	Var Seeker.strawAction = 0
+	Var Seeker.lidAction = 0
+
+	If Seeker.thankLidFlag = 1 Then
+		Var bg_strawlid = DirImage2 + "/bg_strawSmall.png"
+		Var LidStateX = "Invisible"
+		Var Seeker.lidAction = 2
+	EndIf
+
+	
+	DEBUGVAR LastMakeDrinkResult
+
+	If LastMakeDrinkResult = "success" Then
+		Var MachineState_Result = 1
+	EndIf
+
+	If LastMakeDrinkResult = "fail" Then
+		SAVELOG "LastMakeDrinkResult is 2"
+		Var MachineState_Result = 2
+	EndIf
+
+
+	DEBUGVAR VendingCampaign
+
+
+	If MachineState_Result > 0 Then
+		Var SelectMenuBetweenBrewEnable1 = "Invisible"
+	Else
+		Var SelectMenuBetweenBrewEnable1 = "Enable"
+	EndIf
+
+	If GetFreeFromError = 1 Then
+		Var SelectMenuBetweenBrewEnable1 = "Invisible"
+	EndIf
+
+	If SelectMenuBetweenBrewEnable1 = "Enable" Then 
+		Var EnableGetMoreStrawFileName = "Enable"
+		Var SelectMenuBetweenBrewEnable1Blink = "Enable"
+	Else
+		Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
+
+		Var EnableGetMoreStrawFileName = "Invisible"
+	EndIf
+
+
+	; Hide
+	Var bg_strawProblem_ST = "Invisible"
+	Var StrawProblemStatus = 1
+	Var StrawStateX = "Invisible"
+	Var LidStateX = "Invisible"
+
+	; Override from config
+	If StrawGetMoreState = "Invisible" Then 
+		Var bg_strawProblem_ST = "Enable"
+		Var EnableGetMoreStrawFileName = "Invisible"
+	EndIf
+
+	If RoadShow = "true" Then
+		Var SelectMenuBetweenBrewEnable1Blink = "Invisible"  
+	EndIf
+
+	If Seeker.CreditCard = 1 Then
+		Var SelectMenuBetweenBrewEnable1Blink = "Enable"  
+		Var SelectMenuBetweenBrewEnable1 = "Enable"
+	EndIf
+
+	If NeedUpgrade = "true" Then
+		Var SelectMenuBetweenBrewEnable1Blink = "Invisible"  
+		Var SelectMenuBetweenBrewEnable1 = "Invisible"  
+	EndIf
+
+	If NeedReboot = "true" Then
+		Var SelectMenuBetweenBrewEnable1Blink = "Invisible"  
+		Var SelectMenuBetweenBrewEnable1 = "Invisible"  
+	EndIf
+
+	Var SelectMenuBetweenBrewEnable1Blink = "Invisible"  
+	Var SelectMenuBetweenBrewEnable1 = "Invisible"
+
+	DEBUGVAR NeedUpgrade
+	DEBUGVAR NeedReboot
+
+	; copy stage
+	Var bg_lidProblem_ST2 = bg_lidProblem_ST
+	DEBUGVAR bg_lidProblem_ST2
+	
+	; zone Language
+	If LanguageObjectShow = "Enable" Then
+		Var XStraw = 350
+		Var SelectMenuBetweenBrewEnable2 = SelectMenuBetweenBrewEnable1
+		Var SelectMenuBetweenBrewEnable1 = "Invisible"
+
+		Var IMG_CNT = DirImageDoing + "/bg_show_time_remaining.png"
+
+		Var bg_lidProblem_ST = "Invisible"
+		Var GetLidButtonState = "Invisible"
+		Var bg_strawProblem_ST = "Invisible"
+		var EnableGetMoreStrawFileName = "Invisible"
+		var EnableGetMoreStrawFileName2 = "Enable"
+
+		Var bg_strawProblem_ST2 = "Invisible"
+
+		If bg_lidProblem_ST2 = "Invisible" Then 
+			Var GetLidButtonState2 = "Enable"
+		Else
+			Var GetLidButtonState2 = "Invisible"
+		EndIf
+
+	EndIf
+	
+
+	
+	If NoLangObjectShow = "Enable" Then
+		Var SelectMenuBetweenBrewEnable2 = "Invisible"
+
+		Var bg_lidProblem_ST2 = "Invisible"
+		Var GetLidButtonState2 = "Invisible"
+		Var bg_strawProblem_ST2 = "Invisible"
+		var EnableGetMoreStrawFileName2 = "Invisible"
+
+
+		DEBUGVAR bg_lidProblem_ST
+
+
+		If bg_lidProblem_ST = "Invisible" Then 
+			Var GetLidButtonState = "Enable"
+			;Var XStraw = 265
+		EndIf
+
+
+	EndIf
+
+	DEBUGVAR LanguageObjectShow
+	DEBUGVAR NoLangObjectShow
+
+
+	Var CreditCardVoid = 0
+	If InternationalEnable = 1 Then
+		Var adver_brewing_en = 0
+		RootLayoutVisible 3 "hide"
+	EndIf
+
+	If adver_brewing_en = 1 Then
+		Var adver_brewing_playing = 1
+		Var adver_brewing_play_index = 2
+		Var adver_brewing_count_down = 10
+		Var VideoPlayFile = DirImageDoing + "/tao_adv1.png"
+		Var PictureFile = brew_txt1
+	EndIf
+	
+
+	Var CampaignEnable = 0
+
+
+	Var GetLidButtonCountDown = 0
+
+	; language instance
+
+
+
+	DEBUGVAR SelectMenuBetweenBrewEnable1
+	DEBUGVAR SelectMenuBetweenBrewEnable2
+
+	Var SelectMenuBetweenBrewEnable1Text = SelectMenuBetweenBrewEnable1
+	
+
+	DEBUGVAR GameEnableFromTrickerEv
+	DEBUGVAR GameOverrideDisable
+	
+	DEBUGVAR Seeker
+	
+	DEBUGVAR Game01Enable
+	DEBUGVAR BREW_CNT
+	
+	Var ButtonGameCountDown = 0
+	Var ButtonGameCountDownState = "Invisible"
+	
+	Var ButtonGameCountDown = 0
+	Var ButtonGameCountDownState = "Invisible"
+	Var ButtonGamePressToPlayState = "Invisible"
+
+	Var InitCNT = BREW_CNT
+
+	Var ShowPercent = "Invisible"
+	Var ShowCountdown = "Enable"
+
+	If ShowCountDownAsPercent = 1 Then
+		Var ShowPercent = "Enable"
+		Var ShowCountdown = "Invisible"
+
+		Var IMG_CNT = "ROOT/taobin_project/inter/sgp/image/page_doing/img2_percent_eng.png"
+
+		If UsePepsiTheme = 1 Then
+			Var IMG_CNT = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_doing/img2_percent_eng.png"
+		EndIf
+	EndIf
+
+	If XPercent = 0 Then
+
+	Else
+		Var XPercent = 0
+	EndIf
+
+	CashlessReq SUCCESS
+	
+</EventOpen>
+<EventLanguageOnChange>
+	Var XPosiShowCountDownBrew = 768
+	Refresh
+</EventLanguageOnChange>
+
+<EventActionOk>
+
+	If CreditCardVoid = 1 Then
+		Var ChangeOK = 2
+	EndIf
+
+	
+	If ActionOKCase = 1 Then
+		If Seeker.CodeChannel = 1 Then 
+			Var SessionID2 = SelectSlot + ":"
+			Var SessionID2 = SessionID2 + ExtendData
+			DEBUGVAR SessionID2
+
+			DEBUGVAR SessionID2
+
+			Var CreditAmount1 = ""
+			Var ServiceAmountFlow = ""
+			Var TelephoneNumber = "0899999999"
+			Var ServiceType = "coffee"
+			Var ECommerce = ""
+			Var ECommerce = ECommerce + PriceDrink
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + DiscountDrink 
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + SessionID2 
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + SelectDrink 
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + Seeker.VendingCode
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + Seeker.CodeNumber
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + "C:"
+			Var ECommerce =	ECommerce + Seeker.IntVendingCampaign
+			Var ServiceParameter = "max"
+			Var ServiceCharge = 0
+			Var AccountType = "new"
+			Var testservice = "kbank"
+			Var tc = ""
+			Var GetScore = ""
+			Var OperatorName = ""
+			Var SessionID = ""
+
+			GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
+			;Var Timeout = 0
+			Var ActionOKCase = 2
+
+			SAVELOG "back_to_main from line  > 142."
+			Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+			
+		Else 
+
+			SAVELOG "back_to_main from line  > 147."
+			Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+		EndIf
+       
+    Else
+
+		
+
+	EndIf
+
+	If waitAckPay = 1 Then	
+		SAVELOG "waitAckPay = 1"
+		Open "ROOT/taobin_project/xml/page_drinkok.xml" 
+		
+	EndIf
+
+</EventActionOk>
+
+<EventActionError>
+   If ActionOKCase = 1 Then
+		If Seeker.CodeChannel = 1 Then 
+			Var SessionID2 = SelectSlot + ":"
+			Var SessionID2 = SessionID2 + ExtendData
+			DEBUGVAR SessionID2
+
+			Var CreditAmount1 = ""
+			Var ServiceAmountFlow = ""
+			Var TelephoneNumber = "0899999999"
+			Var ServiceType = "coffee"
+			Var ECommerce = ""
+			Var ECommerce = ECommerce + PriceDrink
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + DiscountDrink 
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + SessionID2 
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + SelectDrink 
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + Seeker.VendingCode
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + Seeker.CodeNumber
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + "C:"
+			Var ECommerce =	ECommerce + Seeker.IntVendingCampaign
+			Var ServiceParameter = "max"
+			Var ServiceCharge = 0
+			Var AccountType = "new"
+			Var testservice = "kbank"
+			Var tc = ""
+			Var GetScore = ""
+			Var OperatorName = ""
+			Var SessionID = ""
+
+			GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
+			Var ActionOKCase = 2
+
+			SAVELOG "back_to_main from line  > 204."
+			Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+			
+		Else 
+			SAVELOG "back_to_main from line  > 173."
+			Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+		EndIf
+       
+    Else
+
+		
+
+	EndIf
+</EventActionError>
+
+
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+
+	
+	Var Timeout = Timeout + 1
+	
+
+	DEBUGVAR MachineState_Result
+	DEBUGVAR BREW_COUNT_DOWN_FROM_APP
+
+
+	If MOVE_CUP_TO_DOOR = "true" Then
+		Var MOVE_CUP_TO_DOOR = "false"
+		Var SetPercent100 = 1
+	EndIf
+
+	If BREW_COUNT_DOWN_FROM_APP = "on" Then
+		Var CountDownBrewing = BREW_CNT
+	Else
+
+		If CountDownBrewing > 0 Then
+			Var CountDownBrewing = CountDownBrewing - 1
+		EndIf
+	Endif
+
+	DEBUGVAR BREW_CNT
+
+	
+	If SelectMenuBetweenBrewEnable1 = "Enable" Then
+		If Timeout = 5 Then
+			If show_eng = "true" Then 
+				PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/next_drink.mp3"
+			Else
+
+				Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/next_drink.mp3"
+			
+				
+				PlayLong PlaySoundLag
+			EndIf
+		EndIf
+		If Timeout = 9 Then
+			If OpenFromCollectPoint3 = 0 Then
+				PlayLong "/mnt/sdcard/coffeevending/taobin_project/sounds/music1.mp3"
+			EndIf
+		EndIf
+	Else
+		If Timeout = 4 Then
+			If OpenFromCollectPoint3 = 0 Then
+				PlayLong "/mnt/sdcard/coffeevending/taobin_project/sounds/music1.mp3"
+			EndIf
+		EndIf
+	EndIf
+	
+	Var ShowCountDownBrewing = CountDownBrewing
+
+	; percent
+	If ShowCountDownAsPercent = 1 Then
+		Var XPercent = InitCNT - ShowCountDownBrewing
+		If ShowCountDownBrewing <= 5 Then
+			Var XPercent = 95
+			If SetPercent100 = 1 Then
+				Var XPercent = 100
+			EndIf
+		Else
+			Var XPercent = XPercent * 100
+			DEBUGVAR XPercent
+			Var XPercent = XPercent / InitCNT
+		EndIf
+		
+		DEBUGVAR XPercent
+	EndIf
+
+
+	If Timeout > 540 Then
+		SAVELOG "back_to_main from line  > 217."
+		Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+	EndIf
+	
+
+	If BREW_CNT = 0 Then
+		If CountUpWhenBREW_CNT > 56 Then
+			Var CountUpWhenBREW_CNT = 0
+			Var drink_success_set = "-"
+			READ_FILE "/mnt/sdcard/coffeevending/log/drink-success" drink_success_set
+			DEBUGVAR drink_success_set
+			If drink_success_set = "1" Then
+				Var MachineState_Result = 1
+			EndIf
+
+		EndIf
+
+		Var CountUpWhenBREW_CNT = CountUpWhenBREW_CNT + 1
+
+	EndIf
+
+	If Timeout > 480 Then
+		SAVELOG " Timeout > 480"
+		Var MachineState_Result = 2
+	EndIf
+
+	If ChangeFlag = 1 Then
+		Var ChangeTimeout = ChangeTimeout + 1
+	EndIf
+
+	If  waitAckPay = 1 Then  
+		If Timeout > 60 Then
+			Var VendingTSID = ""
+			SAVELOG "TIMEOUT=60"
+			Open "ROOT/taobin_project/xml/page_drinkok.xml" 
+
+		EndIf
+	EndIf
+
+	If  waitAckPay = 2 Then  
+		If Timeout > 10 Then
+
+			If Seeker.CodeChannel = 1 Then 
+				Var SessionID2 = SelectSlot + ":"
+				Var SessionID2 = SessionID2 + ExtendData
+				DEBUGVAR SessionID2
+
+				Var CreditAmount1 = ""
+				Var ServiceAmountFlow = ""
+				Var TelephoneNumber = "0899999999"
+				Var ServiceType = "coffee"
+				Var ECommerce = ""
+				Var ECommerce = ECommerce + PriceDrink
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + DiscountDrink 
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + SessionID2 
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + SelectDrink 
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + Seeker.VendingCode
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + Seeker.CodeNumber
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + "C:"
+				Var ECommerce =	ECommerce + Seeker.IntVendingCampaign
+				Var ServiceParameter = "max"
+				Var ServiceCharge = 0
+				Var AccountType = "new"
+				Var testservice = "kbank"
+				Var tc = ""
+				Var GetScore = ""
+				Var OperatorName = ""
+				Var SessionID = ""
+
+				GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
+				;Var Timeout = 0
+			EndIf
+				
+			SAVELOG "back_to_main from line  > 309."
+			Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+		EndIf
+	EndIf
+
+
+	If  ChangeOK = 2 Then
+		If ActionOKCase = 0 Then
+
+			If Seeker.TNumberTaobinCredit = "" Then
+				Var TelephoneNumber = "0899999999"
+				Var PayO2 = ""
+
+				If Seeker.TNumberTaobinMember = "" Then
+				Else
+					Var TelephoneNumber = Seeker.TNumberTaobinMember
+				EndIf
+
+			Else
+				Var TelephoneNumber = Seeker.TNumberTaobinCredit
+				Var PayO2 = Seeker.CoffeePinNumber
+			EndIf
+
+
+			If NextOrderStatus = "Disable" Then
+				Var PayDetail="2/F:1221/0/"
+				Var PayDetail = PayDetail + "/XML|"
+				Var PayDetail = PayDetail +  Seeker.OrderChanel
+			Else
+
+
+				If HURR_FOREVER = "S:0" Then
+					Var HURR_FOREVER = "F:1303"
+				EndIf
+
+
+				Var PayDetail = "2/" + HURR_FOREVER
+				Var PayDetail = PayDetail + "/"  
+				Var PayDetail = PayDetail + SAMESALARY
+				Var PayDetail = PayDetail + "/"
+				Var PayDetail = PayDetail + NOBONUS
+				Var PayDetail = PayDetail + "/XML|"
+				Var PayDetail = PayDetail +  Seeker.OrderChanel
+
+			EndIf
+
+
+
+			;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
+
+			Var ServiceType = "coffee"
+			Var ServiceCredit = SelectDrink
+			Var SuggestID  = ""
+			Var SessionID2 = ""
+
+			
+			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+
+
+			;If Seeker.CodeChannel = 0 Then 
+			;	SAVELOG "back_to_main from line  > 315."
+			;	Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+			;EndIf
+
+			Var waitAckPay = 2
+			Var Timeout = 5
+			Var ActionOKCase = 1
+			SAVELOG "ActionOKCase = change OK 2"
+
+		EndIf
+	EndIf
+
+	If  ChangeTimeout > 30 Then
+		If ActionOKCase = 0 Then
+			If Seeker.TNumberTaobinCredit = "" Then
+				Var TelephoneNumber = "0899999999"
+				Var PayO2 = ""
+
+				If Seeker.TNumberTaobinMember = "" Then
+				Else
+					Var TelephoneNumber = Seeker.TNumberTaobinMember
+				EndIf
+
+			Else
+				Var TelephoneNumber = Seeker.TNumberTaobinCredit
+				Var PayO2 = Seeker.CoffeePinNumber
+			EndIf
+
+
+			If NextOrderStatus = "Disable" Then
+				Var PayDetail="2/F:1221/0/"
+				Var PayDetail = PayDetail + "/XML|"
+				Var PayDetail = PayDetail +  Seeker.OrderChanel
+			Else
+
+
+				If HURR_FOREVER = "S:0" Then
+					Var HURR_FOREVER = "F:1303"
+				EndIf
+
+				Var PayDetail = "2/" + HURR_FOREVER
+				Var PayDetail = PayDetail + "/"  
+				Var PayDetail = PayDetail + SAMESALARY
+				Var PayDetail = PayDetail + "/"
+				Var PayDetail = PayDetail + NOBONUS
+				Var PayDetail = PayDetail + "/XML|"
+				Var PayDetail = PayDetail +  Seeker.OrderChanel
+
+			EndIf
+
+			Var ServiceType = "coffee"
+			Var ServiceCredit = SelectDrink
+			Var SuggestID  = ""
+			Var SessionID2 = ""
+
+			
+
+			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+
+			Var waitAckPay = 2
+			Var Timeout = 5
+			Var ActionOKCase = 1
+			SAVELOG "ActionOKCase = change time out"
+
+		EndIf
+	EndIf
+
+	If ChangeOK = 3 Then
+		If ActionOKCase = 0 Then
+
+			Var SVT = "coffee"
+			Var ACC = "0899999999"
+
+			If Seeker.TNumberTaobinMember = "" Then
+			Else
+				Var ACC = Seeker.TNumberTaobinMember
+			EndIf
+
+
+			If NextOrderStatus = "Disable" Then
+				Var PayDetail="2/F:1221/0/"
+				Var PayDetail = PayDetail + "/XML|"
+				Var PayDetail = PayDetail +  Seeker.OrderChanel
+			Else
+
+				If HURR_FOREVER = "S:0" Then
+					Var HURR_FOREVER = "F:1303"
+				EndIf
+
+				Var PayDetail = "2/" + HURR_FOREVER
+				Var PayDetail = PayDetail + "/"  
+				Var PayDetail = PayDetail + SAMESALARY
+				Var PayDetail = PayDetail + "/"
+				Var PayDetail = PayDetail + NOBONUS
+				Var PayDetail = PayDetail + "/XML|"
+				Var PayDetail = PayDetail +  Seeker.OrderChanel
+				
+			EndIf
+
+
+
+
+			Var DEE = PayDetail
+
+			PAYEXT SVT ACC VendingTSIDTmp DEE
+		
+			Var ActionOKCase = 1
+			SAVELOG "ActionOKCase = change OK 3"
+			If Seeker.CodeChannel = 0 Then 
+				SAVELOG "back_to_main from line  > 391."
+				Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+			EndIf
+
+			Var waitAckPay = 2
+			Var Timeout = 5
+
+
+
+
+		EndIf
+	EndIf
+
+
+	If MachineState_Result = 1 Then
+		DEBUGVAR PaySuccessWithDaemonTask
+
+		If  waitAckPay = 0 Then 
+
+			Var waitAckPay = 0 
+			Var Timeout = 0
+
+			Var ProcessText = "" 
+
+			If Seeker.TNumberTaobinCredit = "" Then
+				Var TelephoneNumber = "0899999999"
+				Var PayO2 = ""
+
+				If Seeker.TNumberTaobinMember = "" Then
+				Else
+					Var TelephoneNumber = Seeker.TNumberTaobinMember
+				EndIf
+				
+			Else
+				Var TelephoneNumber = Seeker.TNumberTaobinCredit
+				Var PayO2 = Seeker.CoffeePinNumber
+			EndIf
+
+
+
+			If AddData = 1 Then
+				Var Cid = 26
+
+				If UseSGPCollectFlag = 1 Then
+					Var Cid = 46
+					Var Seeker.PointTaobinStr = "SG/" + Seeker.PointTaobinStr
+				EndIf
+
+				AddData Cid Seeker.TNumberTaobinMember  Seeker.PointTaobinStr PointCrm GetScore
+			EndIf
+			
+			Var ServiceType = "coffee"
+			Var ServiceCredit = SelectDrink
+			Var SuggestID  = ""
+
+			Var PayDetail = "2/" + HURR_FOREVER
+			Var PayDetail = PayDetail + "/"  
+			Var PayDetail = PayDetail + SAMESALARY
+			Var PayDetail = PayDetail + "/"
+			Var PayDetail = PayDetail + NOBONUS
+			Var PayDetail = PayDetail + "/XML|"
+			Var PayDetail = PayDetail +  Seeker.OrderChanel
+
+			
+ 			;Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
+
+			If GetFreeFromError = 1 Then
+				Var Seeker.CodeChannel = 1 
+				Var Seeker.VendingCode = "FAU"
+				Var Seeker.CodeNumber = "0000000000"
+				Var VendingCampaign = ServiceAmount2
+			EndIf
+
+			If Seeker.PayWithQR = 0 Then
+				If Seeker.CodeChannel = 1 Then
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + ""
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + Seeker.VendingCode
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + SelectDrink
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + BoxID
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + "S"
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + Seeker.CodeNumber
+					Var SessionID2 = SessionID2 + "/"
+
+					If Seeker.CreditCard = 1 Then
+					
+							;CashlessReq SUCCESS
+							;CashlessReq FAIL
+
+					EndIf
+
+					Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+				Else
+					
+						If Seeker.CreditCard = 1 Then
+					
+							;CashlessReq SUCCESS
+							;CashlessReq FAIL
+
+						EndIf
+						
+						Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+					
+
+				EndIf
+
+			
+			Else
+
+				;no wait ack pay
+				Var waitAckPay = 0 
+
+				Var SVT = "coffee"
+				Var ACC = "0899999999"
+				Var DEE = PayDetail
+
+				If Seeker.TNumberTaobinMember = "" Then
+				Else
+					Var ACC = Seeker.TNumberTaobinMember
+				EndIf
+
+				PAYEXT SVT ACC VendingTSIDTmp DEE
+
+			EndIf
+			
+		EndIf
+
+		__CMD "clear-stock-data" 0 "-" "-"
+
+
+		Var ServiceSuccess = "yes"
+		If  waitAckPay = 0 Then
+			SAVELOG "waitAckPay=0"
+			Open "ROOT/taobin_project/xml/page_drinkok.xml" 
+		EndIf
+
+	EndIf
+
+	If MachineState_Result = 2 Then
+
+		SAVELOG MachineStage
+
+		If ErrTimeout = 0 Then
+			Var ErrTimeout = 1
+
+			If AddData = 1 Then
+				Var Cid = 26
+
+				If UseSGPCollectFlag = 1 Then
+					Var Cid = 46
+					Var Seeker.PointTaobinStr = "SG/" + Seeker.PointTaobinStr
+				EndIf
+
+				AddData Cid Seeker.TNumberTaobinMember  Seeker.PointTaobinStr PointCrm GetScore
+			EndIf
+
+
+			If Seeker.PayWithQR = 0 Then 
+
+				If Seeker.CreditCard = 1 Then
+					;CashlessReq FAIL
+					Var ChangeFlag = 1 
+					Var CreditCardVoid = 1
+				Else
+
+					If Seeker.CodeChannel = 0 Then
+						If ChangeFlag = 0 Then
+							Var ChangeFlag = 1 
+
+							If Seeker.StoreCreditFlag = 1 Then
+								Var ChangeOK = 2
+							Else
+								If GetFreeFromError = 1 Then
+									Var ChangeOK = 2
+								Else
+									Change ServiceAmount2
+								EndIf
+								
+							EndIf
+								
+						EndIf
+
+					Else
+
+
+						If Seeker.VendingCode = "MKFOO" Then
+							Var Cid = 33
+    						Var PointCrm = "0"
+    						Var GetScore = "1"
+							Var TelephoneNumberx = "0899999999"
+							AddData Cid Seeker.TNumberTaobinMember Seeker.CodeNumber PointCrm GetScore
+							Var Seeker.CodeChannel = 0
+						EndIf
+
+						If CoinAmount > 0 Then
+						
+							If ChangeFlag = 0 Then
+								Var ChangeFlag = 1 
+								Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign
+
+								If Seeker.StoreCreditFlag = 1 Then
+									Var ChangeOK = 2
+								Else
+									Change ServiceAmount3
+								EndIf
+								
+							EndIf
+						Else
+							Var ChangeOK = 2
+						EndIf
+
+
+					EndIf
+
+				EndIf
+
+			Else
+				Var ChangeOK = 3
+			EndIf
+
+			
+
+			
+			
+		EndIf
+	EndIf
+
+	
+	If MachineStage = "close-maintenance" Then
+		If MachineState_Result = 0 Then
+			SAVELOG "back_to_main from line  > 1087."
+			Var MachineState_Result = 2
+		EndIf
+	EndIf
+	
+	If MachineStage = "drink-success" Then
+		;Var SetPercent100 = 1
+		Var MachineState_Result = 1
+	EndIf
+
+	If MachineStage = "drink-failed" Then
+		If RoadShow = "true" Then
+			Open "ROOT/taobin_project/xml/page_back_to_error.xml"
+		Else
+			SAVELOG " drink-failed...."
+			Var MachineState_Result = 2
+		EndIf
+	EndIf
+
+	If MachineState_Result > 0 Then
+		Var SelectMenuBetweenBrewEnable1 = "Invisible"
+		Var SelectMenuBetweenBrewEnable1Text = "Invisible"
+	EndIf
+
+	If SelectMenuBetweenBrewEnable1 = "Enable" Then 
+		If SelectMenuBetweenBrewEnable1Blink = "Enable" Then 
+			Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
+		Else
+			Var SelectMenuBetweenBrewEnable1Blink = "Enable"
+		EndIf
+		
+	Else
+		If SelectMenuBetweenBrewEnable2 = "Enable" Then 
+			If SelectMenuBetweenBrewEnable1Blink = "Enable" Then 
+				Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
+			Else
+				Var SelectMenuBetweenBrewEnable1Blink = "Enable"
+			EndIf
+			
+		Else
+			Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
+		EndIf
+	EndIf
+	
+	DEBUGVAR CountUpBrewing
+
+	; animation video loop
+	If AnimationOn = "true" Then
+
+
+		If adver_brewing_playing = 1 Then
+		
+			DEBUGVAR adver_brewing_play_index
+			If adver_brewing_play_index = 2 Then
+				DEBUGVAR adver_brewing_count_down
+
+				If adver_brewing_count_down > 0 Then
+					Var adver_brewing_count_down = adver_brewing_count_down - 1
+					
+					
+					Var PictureFile = brew_txt1
+
+				EndIf
+
+				If adver_brewing_count_down = 0 Then
+
+
+					Var adver_brewing_play_index = 1
+					Var adver_brewing_count_down = 0
+
+					; Next video follow script.
+					TRY "ROOT/taobin_project/video/script3_brew.ev"	
+
+				 
+				EndIf
+			EndIf
+
+			If adver_brewing_play_index = 1 Then
+				DEBUGVAR adver_brewing_count_down
+				DEBUGVAR brew_vdo2
+
+				If adver_brewing_count_down > 0 Then
+					Var adver_brewing_count_down = adver_brewing_count_down - 1
+		
+					If brew_vdo2 = "" Then
+						Var VideoPlayFile = "ROOT/taobin_project/video/brewing_adv3.mp4"
+					Else
+						Var VideoPlayFile = brew_vdo2
+					EndIf
+					Var PictureFile = brew_txt2
+
+				EndIf
+
+				If adver_brewing_count_down = 0 Then
+					Var adver_brewing_play_index = 0
+					If adver_brewing_video_full_file_name = "" Then
+						Var adver_brewing_playing = 0
+					Else
+						Var adver_brewing_playing = 2
+					EndIf
+				EndIf
+			EndIf
+
+			
+
+		Else
+			If adver_brewing_playing = 2 Then
+				DEBUGVAR adver_brewing_video_full_file_name
+				If adver_brewing_video_full_file_name = "" Then
+					Var adver_brewing_playing = 0
+				Else
+					Var VideoPlayFile = adver_brewing_video_full_file_name
+					Var PictureFile = brew_txt2
+					Var PictureFileTextDesctionState = "Invisible"
+
+					Var SelectMenuBetweenBrewEnable1Blink = "Invisible" 
+					Var SelectMenuBetweenBrewEnable1Text = "Invisible" 
+				EndIf
+
+				
+				
+
+			Else
+
+				Var CountUpBrewing = CountUpBrewing + 1
+
+				;CampaignEnable
+				Var SlotVideo = CountUpBrewing / AnimationVideoPlayTime
+				
+				If PreviseStepVideo = SlotVideo Then
+					;SAVELOG SlotVideo
+				Else
+					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
+
+						Else
+
+							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
+	; AnimationOn = true
+
+
+	If IgnoreNetCore = "true" Then 
+		If CountDownBrewing = 0 Then
+			SAVELOG "CountDownBrewing=0"
+			Open "ROOT/taobin_project/xml/page_drinkok.xml"
+		EndIf
+	EndIf
+	
+
+	If RoadShow = "true" Then
+		Var SelectMenuBetweenBrewEnable1Blink = "Invisible"  
+	EndIf
+
+
+	DEBUGVAR EnableGetMoreStrawFileName
+
+	If EnableGetMoreStrawFileName = "PressForever" Then
+		DEBUGVAR GetMoreStrawCount
+		If GetMoreStrawCount > 0 Then 
+			If EnableGetMoreStrawFileNameCountDown > 0 Then
+				Var EnableGetMoreStrawFileNameCountDown = EnableGetMoreStrawFileNameCountDown - 1
+
+				If EnableGetMoreStrawFileNameCountDown = 0 Then
+					Var EnableGetMoreStrawFileName = "Enable"
+				EndIf
+			EndIf
+
+		EndIf
+	EndIf
+
+	If EnableGetMoreStrawFileName2 = "PressForever" Then
+		DEBUGVAR GetMoreStrawCount
+		If GetMoreStrawCount > 0 Then 
+			If EnableGetMoreStrawFileNameCountDown > 0 Then
+				Var EnableGetMoreStrawFileNameCountDown = EnableGetMoreStrawFileNameCountDown - 1
+
+				If EnableGetMoreStrawFileNameCountDown = 0 Then
+					Var EnableGetMoreStrawFileName2 = "Enable"
+				EndIf
+			EndIf
+
+		EndIf
+	EndIf
+		
+	If GetMoreStrawCount <= 0 Then
+		If StrawProblemStatus = 1 Then
+			Var StrawProblemStatus = 2
+			
+			If NoLangObjectShow = "Enable" Then
+				Var bg_strawProblem_ST = "Enable"
+			Else
+				Var bg_strawProblem_ST2 = "Enable"
+			EndIf
+		EndIf
+
+	EndIf
+	DEBUGVAR bg_lidProblem_ST2
+	
+
+	If GetLidButtonCountDown > 0 Then
+		Var GetLidButtonCountDown = GetLidButtonCountDown - 1
+		DEBUGVAR GetLidButtonCountDown
+	EndIf
+
+	If DoorLidSensorDetect = "true" Then
+		Var DoorLidSensorDetect = "-"
+		Var GetLidButtonState = "Invisible"
+		Var bg_lidProblem_ST = "Invisible"
+		Var GetLidButtonCountDown = 0
+	EndIf
+	
+	If NoLangObjectShow = "Enable" Then
+
+		If GetLidButtonCountDown = 1 Then
+			Var GetLidButtonState = "Invisible"
+			Var bg_lidProblem_ST = "Enable"
+			;Var XStraw = 356
+
+		EndIf
+	EndIf
+
+	Var bg_lidProblem_ST = "Invisible"
+		
+	If LanguageObjectShow = "Enable" Then
+		
+		If GetLidButtonCountDown = 1 Then
+			Var GetLidButtonState2 = "Invisible"
+			Var bg_lidProblem_ST2 = "Enable"
+			Var XStraw = 365
+
+		EndIf
+	EndIf
+
+	If ButtonGameCountDown > 0 Then
+		If ButtonGameCountDown = 1 Then
+			Var ButtonGameCountDownState = "Invisible"
+			Var ButtonGamePressToPlayState = "Enable"
+		EndIf
+		Var ButtonGameCountDown = ButtonGameCountDown - 1
+
+	EndIf
+
+		
+	If ButtonGameCountDownState = "Enable" Then
+		If BREW_CNT < 85 Then
+			If Game01Enable = 1 Then
+				SAVELOG "Game01Enable set zero event timeout 2"
+			EndIf
+			Var Game01Enable = 0
+			Var ButtonGameCountDownState = "Invisible"
+			Var ButtonGamePressToPlayState = "Invisible"
+		EndIf
+	EndIf
+
+
+	DEBUGVAR ButtonGamePressToPlayState
+	DEBUGVAR BREW_CNT
+	If BREW_CNT > 60 Then
+
+	Else
+		Var ButtonGamePressToPlayState = "Invisible"
+		If Game01Enable = 1 Then
+			SAVELOG "Game01Enable set zero event timeout"
+		EndIf
+		Var Game01Enable = 0
+	EndIf
+	
+
+
+	Refresh
+	TimerReset
+
+</EventTimeout> 
+
+<EventMachine>
+	
+	;If MachineStage = "drink-success" Then
+	;	Open "ROOT/taobin_project/xml/page_drinkok.xml" 
+	;EndIf
+	;If MachineStage = "drink-failed" Then
+	;	Open "ROOT/taobin_project/xml/page_drinkfail.xml" 
+	;EndIf
+
+	If MachineStage = "drink-success" Then
+		Var MachineState_Result = 1
+		;Var SetPercent100 = 1
+	EndIf
+
+	
+	DEBUGVAR MachineStage
+
+	If MachineStage = "drink-failed" Then
+		If RoadShow = "true" Then
+			Open "ROOT/taobin_project/xml/page_back_to_error.xml"
+		Else
+			SAVELOG "Event Machine drink fail"
+			Var MachineState_Result = 2
+		EndIf
+	EndIf
+
+	Refresh
+	
+</EventMachine>
+
+; this copy in file menu_brew2.xml and menu_lid_straw.xml
+<EventChangeStatus>
+	If ChangeStatus = "payout-end" Then 
+		If ChangeFlag = 1 Then
+			Var ChangeOK = 2
+		EndIf
+	EndIf
+</EventChangeStatus>
+
+
+
+<Image>
+<X> 60 </X>
+<Y> 1290 </Y>
+<State> PictureFileTextDesctionState </State>
+<Filename> PictureFile</Filename>
+</Image>
+
+
+<Video>
+<X> 0 </X>
+<Y> 380 </Y>
+<Refresh> "Reload" </Refresh>
+<Loop> "true" </Loop>
+<Filename> VideoPlayFile </Filename>
+</Video>
+
+
+;include="ROOT/taobin_project/inc/video.inc"
+
+
+
+
+<Image>
+<X> 0 </X>
+<Y> 1655 </Y>
+<State> SelectMenuBetweenBrewEnable1Text </State>
+<Filename> text_next_order </Filename>
+</Image>
+
+<Text>
+<X> 0 </X>
+<Y> 1655 </Y>
+<Width> 1080 </Width>
+<State> SelectMenuBetweenBrewEnable2 </State>
+<Language>
+	<ID> 000408 </ID>
+</Language>
+</Text>
+
+
+<Image>
+<X> 835 </X>
+<Y> 1735 </Y>
+<State>SelectMenuBetweenBrewEnable1Blink</State>
+<Filename> "ROOT/taobin_project/image/page_payment/arrow_1.png" </Filename>
+<Image>
+
+
+
+; zone show time remaining
+<Image>
+<X> 751 </X>
+<Y> 413 </Y>
+<Filename> IMG_CNT </Filename>
+</Image>
+;
+<Text>
+<X> XPosiShowCountDownBrew </X>
+<Y> 470 </Y>
+<State> ShowCountdown </State>
+<Align> End </Align>
+<Width> 153 </Width>
+<Size> 88 </Size>
+<Font> RobotoBold </Font>
+<Color> 0x513C2F </Color>
+<Value> ShowCountDownBrewing </Value>
+</Text>
+;
+<Text>
+<X> XPosiShowCountDownBrew </X>
+<Y> 470 </Y>
+<State> ShowPercent </State>
+<Align> End </Align>
+<Width> 153 </Width>
+<Size> 88 </Size>
+<Font> RobotoBold </Font>
+<Color> HeadlineColor </Color>
+<Value> XPercent </Value>
+</Text>
+
+<Text>
+<X> 816 </X>
+<Y> 429 </Y>
+<State> ShowCountdown </State>
+<Language>
+	<ID> 000405 </ID>
+</Language>
+</Text>
+<Text>
+<X> 941 </X>
+<Y> 518 </Y>
+<State> ShowCountdown </State>
+<Language>
+	<ID> 000406 </ID>
+</Language>
+</Text>
+
+<EventUnitTest1>
+	Var BREW_COUNT_DOWN_FROM_APP = "off"
+	Var CountDownBrewing = 121
+</EventUnitTest1>
+<EventUnitTest2>
+	Var BREW_COUNT_DOWN_FROM_APP = "off"
+	Var CountDownBrewing = 2
+</EventUnitTest2>
+<EventUnitTest3>
+	Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+</EventUnitTest3>
+<EventUnitTest4>
+	; test drinkfail with phone number
+	Var TelephoneNumberProblem = "12345678"
+	Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+</EventUnitTest4>
+;
+;
+;
+;
+;
+;
+; Next Order
+;
+<Button>
+<X> 792 </X>
+<Y> 1787 </Y>
+<State>SelectMenuBetweenBrewEnable1</State>
+<Filename> next_pic_bn </Filename>
+<FilenamePress> next_pic_bp </FilenamePress>
+<EventClick> 
+	If MachineState_Result = 0 Then
+	
+		SAVELOG "User click next button"
+
+		Var Seeker = "next"
+		Var MultiPayEnable = "false"
+		CoinPause
+
+		Open "ROOT/taobin_project/xml/page_catalog.xml" 
+	EndIf
+</EventClick> 
+</Button>
+<Button>
+<X> 733 </X>
+<Y> 1787 </Y>
+<State>SelectMenuBetweenBrewEnable2</State>
+<Filename> Var( DirImageDoing + "/bn_next_order.png" ) </Filename>
+<FilenamePress> Var( DirImageDoing + "/bp_next_order.png" )"/bp_next_order.png" </FilenamePress>
+<EventClick> 
+	If MachineState_Result = 0 Then
+	
+		SAVELOG "User click next button"
+
+		Var Seeker = "next"
+		Var MultiPayEnable = "false"
+		CoinPause
+
+		Open "ROOT/taobin_project/xml/page_catalog.xml" 
+	EndIf
+</EventClick> 
+<Language>
+	<X> 0 </X>
+	<Y> 20 </Y>
+	<Width> 297 </Width>
+	<Height> 96 </Height>
+	<ID> 000407 </ID>
+</Language>
+</Button>
+
+;
+;
+;
+;
+;
+;
+; Button Straw, More request and report.
+;
+<Button>
+<X> XStraw </X>
+<Y> 1787 </Y>
+<State> EnableGetMoreStrawFileName </State>
+<Filename> bnGetMoreStrawFileName </Filename>
+<FilenamePress> bpGetMoreStrawFileName </FilenamePress>
+<Mode> "No" </Mode>
+<EventClick> 
+	Var EnableGetMoreStrawFileNameCountDown = 5
+	Var EnableGetMoreStrawFileName = "PressForever"
+	Var GetMoreStrawCount = GetMoreStrawCount - 1
+
+	DEBUGVAR GetMoreStrawCount
+
+	If GetMoreStrawCount > 0 Then
+		Machine Straw
+	EndIf
+</EventClick> 
+</Button>
+
+<Button>
+<X> XStraw </X>
+<Y> 1787 </Y>
+<State>bg_strawProblem_ST</State>
+<Filename>  bnStrawProblemReport </Filename>
+<FilenamePress> bpStrawProblemReport </FilenamePress>
+<EventClick> 
+
+	Var strawStr = "แจ้งปัญหาไม่ได้รับหลอด"
+	
+	__CMD "straw-alert-disable" 0 strawStr "-"
+ 	__CMD "send-error-code" 1231 "-" "-"
+	Var bg_strawProblem_ST = "Invisible"
+
+	Refresh
+</EventClick> 
+</Button>
+
+
+<Button>
+<X> 526 </X>
+<Y> 1787 </Y>
+<State> ButtonGameCountDownState </State>
+<Filename>  Var( DirImageDoing + "/bn_game_cnt_down.png") </Filename>
+<FilenamePress> Var( DirImageDoing + "/bn_game_cnt_down.png") </FilenamePress>
+<EventClick> 
+
+</EventClick>
+<Text>
+	<X> 0 </X>
+	<Y> 0 </Y>
+	<Size> 64 </Size>
+	<Align> Center </Align>
+	<Width> 240 </Width>
+	<Font> KanitBoldTTF </Font>
+	<Color> 0xFFFFFF </Color>
+	<State> ButtonGameCountDownState </State>
+	<Value> ButtonGameCountDown </Value>
+</Text>
+</Button>
+
+<GIF>
+<X> 526 </X>
+<Y> 1680 </Y>
+<Width> 241 </Width>
+<Height> 204 </Height>
+<State> ButtonGamePressToPlayState </State>
+<Filename> "ROOT/taobin_project/app/game/TAMATIAN-01.gif" </Filename>
+</GIF>
+
+<Image>
+<X> 526 </X>
+<Y> 1680 </Y>
+<Width> 241 </Width>
+<Height> 204 </Height>	
+<State> ButtonGamePressToPlayState </State>
+<EventClick>
+	DEBUGVAR Game01Enable
+	SAVELOG "Press play game"
+		Var Game01Enable = 0
+		Var ButtonGamePressToPlayState = "Invisible"
+		RunApp "com.NDF.taobin"
+</EventClick>
+</Image>
+
+;
+;
+;
+;
+;
+;
+; Lid button, Get one and report
+;
+<Button>
+<X> 14 </X>
+<Y> 1787 </Y>
+<State>bg_lidProblem_ST</State>
+<Filename>  bnLidProblemReport </Filename>
+<FilenamePress> bpLidProblemReport </FilenamePress>
+<EventClick> 
+
+	Var lidStr = "แจ้งปัญหาไม่ได้รับฝา"
+	
+	__CMD "lid-alert-disable" 0 lidStr "-"
+ 	__CMD "send-error-code" 1343 "-" "-"
+	Var bg_lidProblem_ST = "Invisible"
+
+	Refresh
+</EventClick> 
+</Button>
+
+<Button>
+<X> 14 </X>
+<Y> 1787 </Y>
+<State>GetLidButtonState</State>
+<Mode> "No" </Mode>
+<Filename>  bn_get_lid_image </Filename>
+<FilenamePress> bp_get_lid_image </FilenamePress>
+<EventClick> 
+
+	If GetLidButtonState = "Enable" Then
+		Machine Lid
+		Var GetLidButtonCountDown = 12
+	EndIf
+
+	Var GetLidButtonState = "Press"
+
+	Refresh
+</EventClick> 
+</Button>
+
+;====================================================================
+<Button>
+<X> XStraw </X>
+<Y> 1787 </Y>
+<State> EnableGetMoreStrawFileName2 </State>
+<Filename> Var( DirImageDoing + "/bn_get_more_straw.png" ) </Filename>
+<FilenamePress> Var( DirImageDoing + "/bp_get_more_straw.png" ) </FilenamePress>
+<Mode> "No" </Mode>
+<EventClick> 
+	Var EnableGetMoreStrawFileNameCountDown = 5
+	Var EnableGetMoreStrawFileName2 = "PressForever"
+	Var GetMoreStrawCount = GetMoreStrawCount - 1
+
+	DEBUGVAR GetMoreStrawCount
+
+	If GetMoreStrawCount > 0 Then
+		Machine Straw
+	Else
+		Var EnableGetMoreStrawFileName2 = "Invisible"
+	EndIf
+</EventClick> 
+</Button>
+
+<Button>
+<X> XStraw </X>
+<Y> 1787 </Y>
+<Height> 96 </Height>
+<State>bg_strawProblem_ST2</State>
+<Filename> Var( DirImageDoing + "/bn_send_report.png" ) </Filename>
+<FilenamePress> Var( DirImageDoing + "/bn_send_report.png" ) </FilenamePress>
+<EventClick> 
+
+	Var strawStr = "แจ้งปัญหาไม่ได้รับหลอด"
+	
+	__CMD "straw-alert-disable" 0 strawStr "-"
+ 	__CMD "send-error-code" 1231 "-" "-"
+	Var bg_strawProblem_ST2 = "Invisible"
+
+	Refresh
+</EventClick> 
+<Language>
+	<X> 0 </X>
+	<Y> 12 </Y>
+	<Width> 331 </Width>
+	<Height> 96 </Height>
+	<ID> 000401 </ID>
+</Language>
+</Button>
+;-------------------------
+<Button>
+<X> 14 </X>
+<Y> 1787 </Y>
+<Height> 96 </Height>
+<State>bg_lidProblem_ST2</State>
+<Filename> Var( DirImageDoing + "/bn_send_report.png" ) </Filename>
+<FilenamePress> Var( DirImageDoing + "/bn_send_report.png" ) </FilenamePress>
+<EventClick> 
+
+	Var lidStr = "แจ้งปัญหาไม่ได้รับฝา"
+	
+	__CMD "lid-alert-disable" 0 lidStr "-"
+ 	__CMD "send-error-code" 1343 "-" "-"
+	Var bg_lidProblem_ST2 = "Invisible"
+
+	Refresh
+</EventClick> 
+<Language>
+	<X> 0 </X>
+	<Y> 12 </Y>
+	<Width> 331 </Width>
+	<Height> 96 </Height>
+	<ID> 000400 </ID>
+</Language>
+</Button>
+
+<Button>
+<X> 14 </X>
+<Y> 1787 </Y>
+<State>GetLidButtonState2</State>
+<Mode> "No" </Mode>
+<Filename>   Var( DirImageDoing + "/bn_get_lid.png" ) </Filename>
+<FilenamePress> Var( DirImageDoing + "/bp_get_lid.png" ) </FilenamePress>
+<EventClick> 
+
+	If GetLidButtonState2 = "Enable" Then
+		Machine Lid
+		Var GetLidButtonCountDown = 12
+	EndIf
+
+	Var GetLidButtonState2 = "Press"
+
+	Refresh
+</EventClick>
+</Button>
+
+<EventUnitTest3>
+	; test drinkfail
+	Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+</EventUnitTest3>
+
+<EventUnitTest4>
+	; test drinkfail with phone number
+	Var TelephoneNumberProblem = "1234567890"
+	Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+</EventUnitTest4>
+
+</Popup>
diff --git a/inter/sgp/xml/page_collect_point_1.lxml b/inter/sgp/xml/page_collect_point_1.lxml
index 6afe0be5..8f200edb 100644
--- a/inter/sgp/xml/page_collect_point_1.lxml
+++ b/inter/sgp/xml/page_collect_point_1.lxml
@@ -2,7 +2,7 @@
 <Cache> "Enable" </Cache>
 <Width> 1080 </Width>
 <Height> 1920 </Height>
-<Background> "0xeae6e1" </Background>
+<Background> BackgroundColor </Background>
 <Volume> SoundVolume </Volume>
 ;<Refresh> "Partial" </Refresh>
 <EventOpen>
diff --git a/inter/sgp/xml/page_member_prompt.lxml b/inter/sgp/xml/page_member_prompt.lxml
index bb907fef..7f9cb82c 100644
--- a/inter/sgp/xml/page_member_prompt.lxml
+++ b/inter/sgp/xml/page_member_prompt.lxml
@@ -2,7 +2,7 @@
 <Cache> "Enable" </Cache>
 <Width> 1080 </Width>
 <Height> 1920 </Height>
-;<Background> "0xeae6e1" </Background>
+<Background> BackgroundColor </Background>
 <Volume> SoundVolume </Volume>
 <EventOpen>
 
@@ -22,12 +22,20 @@
 
     ; img
     Var ImgDir = CountryRootPath + "/image/page_member/"
+    Var ImgDirStatic = CountryRootPath + "/image/page_member/"
+
+    If UsePepsiTheme = 1 Then
+        Var ImgDir = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+        Var ImgDir = ImgDir + "/image/page_member/"
+    EndIf
+
+
     Var PromptDialogImg = ImgDir + "ask_member_dialog.png"
     Var YesButton = ImgDir + "bn_yes.png"
     Var NoButton = ImgDir + "bn_no.png"
     Var YesPressButton = ImgDir + "bp_yes.png"
     Var NoPressButton = ImgDir + "bp_no.png"
-    Var QRImg = ImgDir + "qr_regis.png"
+    Var QRImg = ImgDirStatic + "qr_regis.png"
     
     Var UseSGPCollectFlag = 0
 
@@ -35,6 +43,7 @@
     DEBUGVAR ChangeFlag2
 
     Var IMG_CNT = ImgDir + "img2_sp_eng.png"
+    DEBUGVAR IMG_CNT
 
 </EventOpen>
 
@@ -123,7 +132,7 @@
 <Width> 153 </Width>
 <Size> 88 </Size>
 <Font> RobotoBold </Font>
-<Color> 0x513C2F </Color>
+<Color> HeadlineColor </Color>
 <Value> RemainingInThisPage </Value>
 </Text>
 
@@ -136,7 +145,7 @@
 <Width> 1080 </Width>
 <Font> KanitRegularTTF </Font>
 <State> DisplayQR </State>
-<Color> 0xDE794E </Color>
+<Color> HeadlineColor </Color>
 <Value> "Please scan QR to register" </Value>
 </Text>
 
diff --git a/inter/whatthecup/color_settings.ev b/inter/whatthecup/common/color_settings.ev
similarity index 98%
rename from inter/whatthecup/color_settings.ev
rename to inter/whatthecup/common/color_settings.ev
index ac06af6e..044a7b76 100644
--- a/inter/whatthecup/color_settings.ev
+++ b/inter/whatthecup/common/color_settings.ev
@@ -68,6 +68,7 @@ If TargetThemeNum = 2 Then
     Var HeadlineColor = HeadlineColor2
     Var SubHeadlineColor = BodyTextColor2
     Var PopupBodyTextColor = WTCSemiMediumBlueColor
+    Var BodyTextColor = BodyTextColor2
 EndIf
 
 If TargetThemeNum = 3 Then
diff --git a/inter/whatthecup/sgp/image/collectiing_en/img2_sp_eng.png b/inter/whatthecup/sgp/image/page_member/img2_sp_eng.png
similarity index 100%
rename from inter/whatthecup/sgp/image/collectiing_en/img2_sp_eng.png
rename to inter/whatthecup/sgp/image/page_member/img2_sp_eng.png
diff --git a/xml/default_color_settings.ev b/xml/default_color_settings.ev
new file mode 100644
index 00000000..621ab5d3
--- /dev/null
+++ b/xml/default_color_settings.ev
@@ -0,0 +1,7 @@
+Var WelcomeColor = "0xEE8C62"
+
+
+Var BackgroundColor = "0xeae6e1"
+Var HeadlineColor = "0x513C2F"
+Var SubHeadlineColor = "0x6F5F51"
+Var PopupBodyTextColor = "0xB78F24"
\ No newline at end of file
diff --git a/xml/page_board.xml b/xml/page_board.xml
index bcd16f85..221799a2 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -1207,7 +1207,7 @@
 	If UsePepsiTheme = 1 Then
 		If InternationalEnable = 1 Then
 			; enable-color
-			TRY "ROOT/taobin_project/inter/whatthecup/color_settings.ev"
+			TRY "ROOT/taobin_project/inter/whatthecup/common/color_settings.ev"
 
 			Var MainStartPepsiThemeDir = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
 			Var MainStartPepsiThemeDir = MainStartPepsiThemeDir + "/image/main_page/"
@@ -1215,11 +1215,11 @@
 			;Var img_rest_main_page = MainStartPepsiThemeDir + "bn_main_page_start.png"
 			Var img_press_main_page = MainStartPepsiThemeDir + "bp_main_page_start.png"
 
-			Var VideoMainPage = "ROOT/taobin_project/inter/sgp/video/video_main_wtc.mp4"
+			Var VideoMainPage = "ROOT/taobin_project/inter/whatthecup/common/video/video_main_wtc.mp4"
 		EndIf
 	Else
 		; default-theme
-		TRY "ROOT/taobin_project/inter/whatthecup/default_color_settings.ev"
+		TRY "ROOT/taobin_project/xml/default_color_settings.ev"
 	EndIf
 
 	XMLSaveFileNameForResume 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml"
diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml
index b6adf52b..d051b22e 100644
--- a/xml/page_drinkok.xml
+++ b/xml/page_drinkok.xml
@@ -2,7 +2,7 @@
 <Cache> "Enable" </Cache>
 <Width> 1080 </Width>
 <Height> 1920 </Height>
-<Background> "0xeae6e1" </Background>
+<Background> BackgroundColor </Background>
 <Volume> SoundVolume </Volume>
 <Sound> "ROOT/sounds/Ding-dong.wav" </Sound>
 <EventOpen>
@@ -71,6 +71,13 @@
 		Var text_bottom = DirImage + "text_bottom.png"
 
 	EndIf
+
+	If UsePepsiTheme = 1 Then
+		Var text_bottom = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+		Var text_bottom = text_bottom + "/image/complete_en/text_bottom.png"
+	EndIf
+
+
 	DEBUGVAR text_bottom
 
 	Var VideoPlayFile = VideoPath
@@ -577,7 +584,7 @@
 <Align> Center </Align>
 <Font> KanitLightTTF </Font>
 <Size> 48 </Size>
-<Color> 0x513C2F </Color>
+<Color> HeadlineColor </Color>
 <Value> 
 	eval(
 		STRCONTAIN "size" Seeker.showname SizeFromSheet
diff --git a/xml/page_lid_straw.xml b/xml/page_lid_straw.xml
index 5cbb599a..5ec103c9 100644
--- a/xml/page_lid_straw.xml
+++ b/xml/page_lid_straw.xml
@@ -72,6 +72,18 @@
 
 		EndIf
 
+		If UsePepsiTheme = 1 Then
+
+			Var VideoPath =  CountryRootPath + "/animation01/"
+			Var VideoFileBegin = "TaoBin2_draft02_art"
+			Var VideoFileEnd = ".mp4"
+
+			Var PicturePath = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+			Var PicturePath = PicturePath + "/image/page_doing/"
+			Var PictureBegin = "txt_"
+			Var PictureEnd = "_en.png"
+		EndIf
+
 	Else
 		Var VideoPath = "/mnt/sdcard/coffeevending/taobin_project/animation01/"
 		Var VideoFileBegin = "TaoBin2_draft02_art"
diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml
index 5a12e622..3820b2f1 100644
--- a/xml/page_thankyou.xml
+++ b/xml/page_thankyou.xml
@@ -2,7 +2,7 @@
 <Cache> "Enable" </Cache>
 <Width> 1080 </Width>
 <Height> 1920 </Height>
-<Background> "0xeae6e1" </Background>
+<Background> BackgroundColor </Background>
 <Sound> "ROOT/taobin_project/sounds/chaching.mp3" </Sound>
 <Volume> SoundVolume </Volume>
 <EventOpen>