diff --git a/image/collectiing/bn_confirm.png b/image/collectiing/bn_confirm.png
index e63dae5d..0b38cde8 100644
Binary files a/image/collectiing/bn_confirm.png and b/image/collectiing/bn_confirm.png differ
diff --git a/image/collectiing/bp_confirm.png b/image/collectiing/bp_confirm.png
index 0c3916b3..a6a70635 100644
Binary files a/image/collectiing/bp_confirm.png and b/image/collectiing/bp_confirm.png differ
diff --git a/image/consent/bp_accept.png b/image/consent/bp_accept.png
index 6439ca90..5d487cc7 100644
Binary files a/image/consent/bp_accept.png and b/image/consent/bp_accept.png differ
diff --git a/image/consent/bp_decline.png b/image/consent/bp_decline.png
index 8a713d29..b3b17bf5 100644
Binary files a/image/consent/bp_decline.png and b/image/consent/bp_decline.png differ
diff --git a/image/page_lid_straw/bn_ok.png b/image/page_lid_straw/bn_ok.png
index b4fb0f80..96958fe5 100644
Binary files a/image/page_lid_straw/bn_ok.png and b/image/page_lid_straw/bn_ok.png differ
diff --git a/image/page_lid_straw/bp_ok.png b/image/page_lid_straw/bp_ok.png
index 2eeb4c21..91f5cc56 100644
Binary files a/image/page_lid_straw/bp_ok.png and b/image/page_lid_straw/bp_ok.png differ
diff --git a/image/page_lid_straw/img3.png b/image/page_lid_straw/img3.png
index d5b4af84..98184c4d 100644
Binary files a/image/page_lid_straw/img3.png and b/image/page_lid_straw/img3.png differ
diff --git a/xml/page_lid_straw.xml b/xml/page_lid_straw.xml
index f4f9ad46..9ffaf466 100644
--- a/xml/page_lid_straw.xml
+++ b/xml/page_lid_straw.xml
@@ -10,6 +10,15 @@
 	Var LidState = Lid1Status
 	Var StarwState = "Enable"
 	Var LidStrawCountDown = 15
+
+	
+	If show_eng = "true" Then 
+		Var DirImage = "ROOT/taobin_project/image/page_lid_straw_en"
+
+	Else
+		Var DirImage = "ROOT/taobin_project/image/page_lid_straw"
+	EndIf
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -52,24 +61,24 @@
 
 
 <Image>
-<X> 112 </X>
-<Y> 1286 </Y>
-<Filename> "ROOT/taobin_project/image/page_lid_straw/text1.png" </Filename>
+<X> 0 </X>
+<Y> 1289 </Y>
+<Filename> Var( DirImage + "/text2.png" ) </Filename>
 </Image>
 
 
 <Image>
 <X> 78 </X>
 <Y> 1425 </Y>
-<Filename> "ROOT/taobin_project/image/page_lid_straw/img3.png" </Filename>
+<Filename> Var( DirImage + "/img3.png" ) </Filename>
 </Image>
 
 
 <Button>
 <X> 750 </X>
 <Y> 1783 </Y>
-<Filename> "ROOT/taobin_project/image/page_lid_straw/bn_ok.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page_lid_straw/bn_ok.png" </FilenamePress>
+<Filename> Var( DirImage + "/bn_ok.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bn_ok.png" )</FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml
index bd4b92c2..93e2a382 100644
--- a/xml/page_payment_cash.xml
+++ b/xml/page_payment_cash.xml
@@ -431,18 +431,6 @@
 <X> 0 </X>
 <Y> 0 </Y>
 <Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
-<EventClick>
-	Var MachineStage = "make-drink"
-	Var CountDownBrewing = 120
-
-	;Var BrewingTextThai = "เตรียมแก้ว"
-	;MakeDrinkV1  SelectDrink SelectSugarID
-	
-	;Open "ROOT/taobin_project/xml/page_thankyou.xml" 
-	
-	Open "ROOT/taobin_project/xml/page_payment_code.xml" 
-
-</EventClick>
 </Image>
 
 
@@ -714,6 +702,11 @@
 	EndIf
 
 	If countClick2 = 5 Then
+		Var MachineStage = "make-drink"
+		;Open "ROOT/taobin_project/xml/page_show_consent.xml"
+		Open "ROOT/taobin_project/xml/page_thankyou.xml"
+
+
 		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_back_to_error.xml"
 	EndIf
 	Refresh
diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml
index c7f3614c..b0b11143 100644
--- a/xml/page_payment_code.xml
+++ b/xml/page_payment_code.xml
@@ -23,6 +23,8 @@
 	
 	Var ShowTextNumber = "Enable"
 	Var ShowErrorText = "Invisible"
+	Var Tel_Confirm_State = "Invisible"
+
 	
     If show_eng = "true" Then 
 		Var DirImage = "ROOT/taobin_project/image/collectiing_en"
@@ -174,9 +176,25 @@
 
 </EventActionError>
 
+
+
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/alpha.png" </Filename>
+</Image>
+
+
+<Image>
+<X> 158 </X>
+<Y> 601 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/img_popup1.png" </Filename>
+</Image>
+
+
 <Button>
 <X> 333 </X>
-<Y> 1086 </Y>
+<Y> 1004 </Y>
 <Filename> "ROOT/taobin_project/image/collectiing/bn_1.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_1.png" </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
@@ -197,7 +215,7 @@
 
 <Button>
 <X> 477 </X>
-<Y> 1086 </Y>
+<Y> 1004 </Y>
 <Filename> "ROOT/taobin_project/image/collectiing/bn_2.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_2.png" </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
@@ -218,7 +236,7 @@
 
 <Button>
 <X> 620 </X>
-<Y> 1086 </Y>
+<Y> 1004 </Y>
 <Filename> "ROOT/taobin_project/image/collectiing/bn_3.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_3.png" </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
@@ -239,7 +257,7 @@
 
 <Button>
 <X> 333 </X>
-<Y> 1230 </Y>
+<Y> 1148 </Y>
 <Filename> "ROOT/taobin_project/image/collectiing/bn_4.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_4.png" </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
@@ -260,7 +278,7 @@
 
 <Button>
 <X> 477 </X>
-<Y> 1230 </Y>
+<Y> 1148 </Y>
 <Filename> "ROOT/taobin_project/image/collectiing/bn_5.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_5.png" </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
@@ -281,7 +299,7 @@
 
 <Button>
 <X> 620 </X>
-<Y> 1230 </Y>
+<Y> 1148 </Y>
 <Filename> "ROOT/taobin_project/image/collectiing/bn_6.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_6.png" </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
@@ -302,7 +320,7 @@
 
 <Button>
 <X> 333 </X>
-<Y> 1373 </Y>
+<Y> 1292 </Y>
 <Filename> "ROOT/taobin_project/image/collectiing/bn_7.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_7.png" </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
@@ -323,7 +341,7 @@
 
 <Button>
 <X> 477 </X>
-<Y> 1373 </Y>
+<Y> 1292 </Y>
 <Filename> "ROOT/taobin_project/image/collectiing/bn_8.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_8.png" </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
@@ -344,7 +362,7 @@
 
 <Button>
 <X> 620 </X>
-<Y> 1373 </Y>
+<Y> 1292 </Y>
 <Filename> "ROOT/taobin_project/image/collectiing/bn_9.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_9.png" </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
@@ -365,7 +383,7 @@
 
 <Button>
 <X> 477 </X>
-<Y> 1517 </Y>
+<Y> 1432 </Y>
 <Filename> "ROOT/taobin_project/image/collectiing/bn_0.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_0.png" </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
@@ -389,7 +407,7 @@
 
 <Button>
 <X> 620 </X>
-<Y> 1517 </Y>
+<Y> 1432 </Y>
 <Filename> "ROOT/taobin_project/image/collectiing/bn_back-1.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_back-1.png" </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
@@ -414,8 +432,8 @@
 
 
 <Button>
-<X> 44 </X>
-<Y> 1783 </Y>
+<X> 218 </X>
+<Y> 1607 </Y>
 <Filename> Var( DirImage + "/bn_back.png") </Filename>
 <FilenamePress> Var( DirImage + "/bn_back.png") </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
@@ -431,8 +449,8 @@
 
 
 <Button>
-<X> 751 </X>
-<Y> 1783 </Y>
+<X> 577 </X>
+<Y> 1607 </Y>
 <State> Tel_Confirm_State </State>
 <Filename> Var( DirImage + "/bn_confirm.png" ) </Filename>
 <FilenamePress> Var( DirImage + "/bp_confirm.png" )</FilenamePress>
@@ -514,13 +532,13 @@
 
 <Image>
 <X> 217 </X>
-<Y> 422 </Y>
+<Y> 802 </Y>
 <Filename> Var( DirImage + "/img3.png" ) </Filename>
 </Image>
 
 <Image>
-<X> 224 </X>
-<Y> 437 </Y>
+<X> 244 </X>
+<Y> 817 </Y>
 <State> ShowTextNumber </State>
 <Filename> Var( DirImage + "/text_12.png" )</Filename>
 </Image>
@@ -528,7 +546,7 @@
 
 <Text>
 <X> 0 </X>
-<Y> 873 </Y>
+<Y> 817 </Y>
 <Width> 1080 </Width>
 <Align> Center </Align>
 <Size> 62 </Size>
@@ -537,6 +555,7 @@
 <Value> TelephoneNumber </Value>
 </Text>
 
+
 	
 
 <Image>
diff --git a/xml/page_show_consent.xml b/xml/page_show_consent.xml
index cbefb10e..150ad78c 100644
--- a/xml/page_show_consent.xml
+++ b/xml/page_show_consent.xml
@@ -10,9 +10,18 @@
 	
 
 	Var Timeout = 0
-
+	SAVELOG show_eng
 	
-    
+    If show_eng = "true" Then 
+		Var DirImage = "ROOT/taobin_project/image/consent_en/"
+		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+
+	Else
+		Var DirImage = "ROOT/taobin_project/image/consent/"
+		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+	EndIf
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -50,12 +59,27 @@
 
 
 
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/alpha.png" </Filename>
+</Image>
+
+
+
+
+<Image>
+<X> 158 </X>
+<Y> 665 </Y>
+<Filename> Var( DirImage + "/img_popup1.png") </Filename>
+</Image>
+
 
 <Button>
-<X> 750 </X>
-<Y> 1782 </Y>
-<Filename> "ROOT/taobin_project/image/consent/bn_accept.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/consent/bp_accept.png" </FilenamePress>
+<X> 577 </X>
+<Y> 1679 </Y>
+<Filename> Var( DirImage + "/bn_accept.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bp_accept.png" ) </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -69,10 +93,10 @@
 </Button>
 
 <Button>
-<X> 44 </X>
-<Y> 1782 </Y>
-<Filename> "ROOT/taobin_project/image/consent/bn_decline.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/consent/bย_decline.png" </FilenamePress>
+<X> 218 </X>
+<Y> 1679 </Y>
+<Filename> Var( DirImage + "/bn_decline.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/bp_decline.png" ) </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -83,33 +107,20 @@
 
 
 
+
 <Image>
 <X> 0 </X>
 <Y> 0 </Y>
 <Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
 </Image>
-			
-
-
-<Image>
-<X> 59 </X>
-<Y> 1290 </Y>
-<Filename> "ROOT/taobin_project/image/consent/img1.png" </Filename>
-</Image>
-
-<Image>
-<X> 106 </X>
-<Y> 469 </Y>
-<Filename> "ROOT/taobin_project/image/consent/img3.png" </Filename>
-</Image>
-
-
+		
+;
 <Image>
 <X> 751 </X>
 <Y> 413 </Y>
 <Filename> "ROOT/taobin_project/image/page_doing/img2.png" </Filename>
 </Image>
-
+;
 <Text>
 <X> 808 </X>
 <Y> 480 </Y>