diff --git a/image/page2/bn_protein.png b/image/page2/bn_protein.png
index 5b398d9f..76ce6c35 100644
Binary files a/image/page2/bn_protein.png and b/image/page2/bn_protein.png differ
diff --git a/image/page2/bp_protein.png b/image/page2/bp_protein.png
index 9e271a4c..41e0d0b8 100644
Binary files a/image/page2/bp_protein.png and b/image/page2/bp_protein.png differ
diff --git a/image/page2_en/page2/bn_protein.png b/image/page2_en/page2/bn_protein.png
index ce958892..bb6724fd 100644
Binary files a/image/page2_en/page2/bn_protein.png and b/image/page2_en/page2/bn_protein.png differ
diff --git a/image/page2_en/page2/bp_protein.png b/image/page2_en/page2/bp_protein.png
index 4b22481d..9c79e41c 100644
Binary files a/image/page2_en/page2/bp_protein.png and b/image/page2_en/page2/bp_protein.png differ
diff --git a/image/page_drink_n/bn_dirty_light_pure_beauty.png b/image/page_drink_n/bn_dirty_light_pure_beauty.png
index 9407af6b..f96f5d5a 100644
Binary files a/image/page_drink_n/bn_dirty_light_pure_beauty.png and b/image/page_drink_n/bn_dirty_light_pure_beauty.png differ
diff --git a/image/page_drink_n/bn_hot_americano_light_pure_beauty.png b/image/page_drink_n/bn_hot_americano_light_pure_beauty.png
index 9f3c45f7..7b1199eb 100644
Binary files a/image/page_drink_n/bn_hot_americano_light_pure_beauty.png and b/image/page_drink_n/bn_hot_americano_light_pure_beauty.png differ
diff --git a/image/page_drink_n/bn_hot_espresso_light_pure_beauty.png b/image/page_drink_n/bn_hot_espresso_light_pure_beauty.png
index 99de8982..349c09ac 100644
Binary files a/image/page_drink_n/bn_hot_espresso_light_pure_beauty.png and b/image/page_drink_n/bn_hot_espresso_light_pure_beauty.png differ
diff --git a/xml/page_camera.xml b/xml/page_camera.xml
index dc39d064..e0e7ea80 100644
--- a/xml/page_camera.xml
+++ b/xml/page_camera.xml
@@ -7,45 +7,8 @@
 <EventOpen>
 	TopView "show"
 	; On open
-	
-	If CocktailShow = "true" Then 
-		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"	
-	EndIf
-	
-	If TermTemOnline = "true" Then
-		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_tt_catalog.xml"
-	EndIf
-	 	
-
-	Var GetPayInfoFlag = 0
-	Var countDownRetrun = 30
-
-	CoinVending OFF
-	
-	; Clear value
-	Topping "clear" "-"
-
-	If show_eng = "true" Then 
-		Var DirImage = "ROOT/taobin_project/image/page2_en/page2"
-		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
-		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
-		Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/What_would_you_like_to_drink_today.mp3"
-		Play PlaySoundLag
-	
-	Else
-		Var DirImage = "ROOT/taobin_project/image/page2"
-		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
-		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
-		Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/taobin_sawade.mp3"
-		Play PlaySoundLag
-	EndIf
-
-
-	Var StrawAutoRelease1 = "false"
-	Var StrawAutoRelease2 = "false"
-
-	Machine DoorClose
-
+	Var Timeout = 0
+		
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -60,6 +23,12 @@
 		Open "ROOT/taobin_project/xml/page_back_to_main.xml"
 	EndIf
 
+	Var Timeout = Timeout + 1
+
+	DEBUGVAR Timeout
+	If Timeout = 5 Then
+		ShutterInSide
+	EndIf
 	
 	Refresh
 	TimerReset
@@ -111,11 +80,11 @@
 </Button>
 
 <Camera> 
-<X> 10 </X>
-<Y> 480 </Y>
+<X> 40 </X>
+<Y> 520 </Y>
 <Rotation>90</Rotation>
-<Width> 600 </Width>
-<Height> 1024 </Height>
+<Width> 1280 </Width>
+<Height> 720 </Height>
 </Camera>
 
 
diff --git a/xml/page_catalog2.xml b/xml/page_catalog2.xml
index d6ddf1c3..7b7eb9e5 100644
--- a/xml/page_catalog2.xml
+++ b/xml/page_catalog2.xml
@@ -444,6 +444,12 @@
 <Color> "0xFF0000" </Color>
 <Width> 1080 </Width>
 <Height> 60 </Height>
+<EventClick> 
+	
+
+	Open  "/mnt/sdcard/coffeevending/taobin_project/xml/page_camera.xml"
+
+</EventClick>
 </Button>
 
 <Text>
diff --git a/xml/page_payment.xml b/xml/page_payment.xml
index 2e36bd55..b6dbd031 100644
--- a/xml/page_payment.xml
+++ b/xml/page_payment.xml
@@ -40,6 +40,16 @@
 		Var AdultFlag = 1
 	EndIf
 
+	If SelectDrink = "12-02-01-0017" Then
+		Var AdultFlag = 1
+	EndIf
+	If SelectDrink = "12-05-02-0027" Then
+		Var AdultFlag = 1
+	EndIf
+	If SelectDrink = "12-05-03-0027" Then
+		Var AdultFlag = 1
+	EndIf
+
 	Var QRCODE1 = "A000000677010112"
     Var QRCODE2 = "010755600066301"
     Var QRCODE3 = "VDGN"
diff --git a/xml/page_topping_select4.xml b/xml/page_topping_select4.xml
index 7cc283b9..eb848dad 100644
--- a/xml/page_topping_select4.xml
+++ b/xml/page_topping_select4.xml
@@ -557,7 +557,15 @@
 					Var StrawState = MAT_ID_9701
 				EndIf
 			EndIf
-		
+			DEBUGVAR StrawState
+
+			If StrawState = "Press" Then
+				Var Seeker.thankStrawFlag = 1
+			Else
+				Var Seeker.thankStrawFlag = 0
+			EndIf
+
+
 			If LidState = "Enable" Then
 				If MAT_ID_9601 = "Enable" Then
 					Var LidState = MAT_ID_9601