diff --git a/xml/menu_brewing.xml b/xml/menu_brewing.xml
index ff3708ce..7bdf0562 100644
--- a/xml/menu_brewing.xml
+++ b/xml/menu_brewing.xml
@@ -19,6 +19,9 @@
 	;If CountDownBrewing = 40 Then 
 	;	Open "ROOT/taobin_project/xml/menu_drinkok.xml"  
 	;EndIf
+	If CountDownBrewing = 0 Then
+		Open "ROOT/taobin_project/xml/menu_drinkok.xml" 
+	EndIf
 
 	Var ShowCountDownBrewing = CountDownBrewing
 	
@@ -100,7 +103,7 @@
 <Align> Center </Align>
 <Font> RobotoBlack </Font>
 <Color> 0x513C2F </Color>
-<Value> MachineStage </Value>
+<Value> BrewingTextThai </Value>
 </Text>
 ;BrewingTextThai
 
@@ -109,7 +112,15 @@
 <Y> 700 </Y>
 <Filename> GIFShowProcess </Filename>
 </GIF>
+<Text>
 
+<X> 0 </X>
+<Y> 1886 </Y>
+<Size> 20 </Size>
+<Font> RobotoBlack </Font>
+<Color> 0x513C2F </Color>
+<Value> MachineStage </Value>
+</Text>
 
 
 </Popup>
diff --git a/xml/menu_catalog.xml b/xml/menu_catalog.xml
index a1881353..f264bb5e 100644
--- a/xml/menu_catalog.xml
+++ b/xml/menu_catalog.xml
@@ -4,6 +4,7 @@
 <Height> 1920 </Height>
 <Background> "0xeae6e1" </Background>
 <Volume> SoundVolume </Volume>
+<Sound> "ROOT/sounds/selectDrink.wav" </Sound>
 <EventOpen>
 	TopView "show"
 	; On open
diff --git a/xml/menu_catalog_choose_drink1.pml b/xml/menu_catalog_choose_drink1.pml
index 3c93ea2a..3fce0304 100644
--- a/xml/menu_catalog_choose_drink1.pml
+++ b/xml/menu_catalog_choose_drink1.pml
@@ -30,6 +30,7 @@
 <Height> 1920 </Height>
 <Background> "0xeae6e1" </Background>
 <Volume> SoundVolume </Volume>
+<Sound> "ROOT/sounds/selectDrink.wav" </Sound>
 <EventOpen>
 	; On open
 	
diff --git a/xml/menu_catalog_choose_drink1.xml b/xml/menu_catalog_choose_drink1.xml
index 523af815..db10ea80 100644
--- a/xml/menu_catalog_choose_drink1.xml
+++ b/xml/menu_catalog_choose_drink1.xml
@@ -8,6 +8,7 @@
 <Height> 1920 </Height>
 <Background> "0xeae6e1" </Background>
 <Volume> SoundVolume </Volume>
+<Sound> "ROOT/sounds/selectDrink.wav" </Sound>
 <EventOpen>
 	; On open
 	
diff --git a/xml/menu_catalog_choose_drink2.pml b/xml/menu_catalog_choose_drink2.pml
index 47ed3ec2..ddc7176b 100644
--- a/xml/menu_catalog_choose_drink2.pml
+++ b/xml/menu_catalog_choose_drink2.pml
@@ -57,6 +57,7 @@
 <Height> 1920 </Height>
 <Background> "0xeae6e1" </Background>
 <Volume> SoundVolume </Volume>
+<Sound> "ROOT/sounds/selectDrink.wav" </Sound>
 <EventOpen>
 	; On open
 	
diff --git a/xml/menu_catalog_choose_drink2.xml b/xml/menu_catalog_choose_drink2.xml
index 2e458df0..561094c8 100644
--- a/xml/menu_catalog_choose_drink2.xml
+++ b/xml/menu_catalog_choose_drink2.xml
@@ -8,6 +8,7 @@
 <Height> 1920 </Height>
 <Background> "0xeae6e1" </Background>
 <Volume> SoundVolume </Volume>
+<Sound> "ROOT/sounds/selectDrink.wav" </Sound>
 <EventOpen>
 	; On open
 	
diff --git a/xml/menu_catalog_choose_drink6.pml b/xml/menu_catalog_choose_drink6.pml
index 847cdec7..6daecf8e 100644
--- a/xml/menu_catalog_choose_drink6.pml
+++ b/xml/menu_catalog_choose_drink6.pml
@@ -31,6 +31,7 @@
 <Height> 1920 </Height>
 <Background> "0xeae6e1" </Background>
 <Volume> SoundVolume </Volume>
+<Sound> "ROOT/sounds/selectDrink.wav" </Sound>
 <EventOpen>
 	; On open
 	
diff --git a/xml/menu_catalog_choose_drink6.xml b/xml/menu_catalog_choose_drink6.xml
index 21ac731d..687c0426 100644
--- a/xml/menu_catalog_choose_drink6.xml
+++ b/xml/menu_catalog_choose_drink6.xml
@@ -7,6 +7,7 @@
 <Height> 1920 </Height>
 <Background> "0xeae6e1" </Background>
 <Volume> SoundVolume </Volume>
+<Sound> "ROOT/sounds/selectDrink.wav" </Sound>
 <EventOpen>
 	; On open
 	
diff --git a/xml/menu_drinkok.xml b/xml/menu_drinkok.xml
index fbfc3099..37badaf5 100644
--- a/xml/menu_drinkok.xml
+++ b/xml/menu_drinkok.xml
@@ -4,6 +4,7 @@
 <Height> 1920 </Height>
 <Background> "0xeae6e1" </Background>
 <Volume> SoundVolume </Volume>
+<Sound> "ROOT/sounds/Ding-dong.wav" </Sound>
 <EventOpen>
 	; On open
 	Var LidState = "Enable"
diff --git a/xml/menu_lid_straw.xml b/xml/menu_lid_straw.xml
index e951bb1c..f24c1d13 100644
--- a/xml/menu_lid_straw.xml
+++ b/xml/menu_lid_straw.xml
@@ -4,6 +4,7 @@
 <Height> 1920 </Height>
 <Background> "0xeae6e1" </Background>
 <Volume> SoundVolume </Volume>
+<Sound> "ROOT/sounds/pleaseWait.wav" </Sound>
 <EventOpen>
 	; On open
 	Var LidState = "Enable"
diff --git a/xml/menu_list_original2.xml b/xml/menu_list_original2.xml
index 6bb3e625..3890e15a 100644
--- a/xml/menu_list_original2.xml
+++ b/xml/menu_list_original2.xml
@@ -4,233 +4,8 @@
 
 <EventOpen>
 	
-	Var menu_status = "run"
-
-    If VendingClass = "coffeeInthanin01" Then
-        Open "ROOT/xml/menu_list_inthanin.xml" 
-    EndIf
-
-	If Menu_list_LN = "TH" Then
-		Var Menu1BN_FN = "ROOT/image/BN_Drink.bmp"
-		Var Menu1BP_FN = "ROOT/image/BP_Drink.bmp"
-		Var Menu2BN_FN = "ROOT/image/BN_Member.bmp"
-		Var Menu2BP_FN = "ROOT/image/BP_Member.bmp"
-		Var Menu3BN_FN = "ROOT/image/BN_Topup.bmp"
-		Var Menu3BP_FN = "ROOT/image/BP_Topup.bmp"
-		Var Menu4BN_FN = "ROOT/image/BN_Product.bmp"
-		Var Menu4BP_FN = "ROOT/image/BP_Product.bmp"
-		Var Menu5BN_FN = "ROOT/image/BN_Etc.bmp"
-		Var Menu5BP_FN = "ROOT/image/BP_Etc.bmp"
-		Var Menu6BN_FN = "ROOT/image/BN_Problem.bmp"
-		Var Menu6BP_FN = "ROOT/image/BP_Problem.bmp"
-	Else
-		Var Menu1BN_FN = "ROOT/image/BN_Drink_ENG.bmp"
-		Var Menu1BP_FN = "ROOT/image/BP_Drink_ENG.bmp"
-		Var Menu2BN_FN = "ROOT/image/BN_Member_ENG.bmp"
-		Var Menu2BP_FN = "ROOT/image/BP_Member_ENG.bmp"
-		Var Menu3BN_FN = "ROOT/image/BN_Topup_ENG.bmp"
-		Var Menu3BP_FN = "ROOT/image/BP_Topup_ENG.bmp"
-		Var Menu4BN_FN = "ROOT/image/BN_Product_ENG.bmp"
-		Var Menu4BP_FN = "ROOT/image/BP_Product_ENG.bmp"
-		Var Menu5BN_FN = "ROOT/image/BN_Etc_ENG.bmp"
-		Var Menu5BP_FN = "ROOT/image/BP_Etc_ENG.bmp"
-		Var Menu6BN_FN = "ROOT/image/BN_Problem_ENG.bmp"
-		Var Menu6BP_FN = "ROOT/image/BP_Problem_ENG.bmp"
-	EndIf
-
 	
 </EventOpen>
-<Timeout> 60000 </Timeout>
-<EventTimeout> 
-	;Var menu_status = "stop"
-	
-	Open "/mnt/sdcard/coffeevending/xml/menu_list_original.xml" 
-
-	TimerReset
-	Refresh
-</EventTimeout> 
-
-
-<Button>
-<X> 10 </X>
-<Y> 618 </Y>
-<state>buttonState1</state>
-<Filename> Menu1BN_FN </Filename>
-<FilenamePress> Menu1BP_FN </FilenamePress>
-<FilenameDisable> Menu1BD_FN </FilenameDisable>
-<Sound> "ROOT/sounds/Mainbuttom.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-	;MainOpen "ROOT/xml/menu_board.xml" 
-	Var MenuLangTH = 0
-	OpenInst 0 "/mnt/sdcard/coffeevending/xml/menu_main_blank.xml"
-	OpenInst 1 "/mnt/sdcard/coffeevending/xml/menu_advert.xml"
-
-	Open "/mnt/sdcard/coffeevending/xml/menu_list_show_less.xml"
-</EventClick>
-</Button>
-
-
-
-<Button>
-<X> 163 </X>
-<Y> 618 </Y>
-<state>buttonState2</state>
-<Filename> Menu2BN_FN </Filename>
-<FilenamePress> Menu2BP_FN </FilenamePress>
-<Sound> "ROOT/sounds/Mainbuttom.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-
-	;Var TelephoneNumber	= ""
-	;Var Tel_Confirm_State = "Disable"
-	;MainOpen "ROOT/xml/menu_CollectPoint_Page1.xml" 
-	MainOpen "/var/menu_board_original.xml"	
-</EventClick>
-</Button>
-
-<Button>
-<X> 317 </X>
-<Y> 618 </Y>
-<Filename> Menu3BN_FN </Filename>
-<FilenamePress> Menu3BP_FN </FilenamePress>
-<Sound> "ROOT/sounds/Mainbuttom.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-	Var ServiceAmountLine = ""
-	Var CheckTypeLine = "o/"
-	Var SalePackage = 0
-	Var ServiceGroup = ""
-	Var AccTeleNumber = ""
-	Var Donate = "L1"
-	Var GetScore = ""
-	Var AccountType = ""
-	Var SuggestID = ""
-	Var ServiceType = "" 
-	Var SessionID = ""
-	Var ServiceParameter = ""
-	Var OperatorName = ""
-	Var TelephoneNumber	= ""
-
-	
-
-	If Menu_list_LN = "TH" Then
-		MainOpen "ROOT/xml/service_menu.xml" 
-	Else
-		MainOpen "ROOT/xml/eng_mobile_telnum.xml" 
-	EndIf
-	
-</EventClick>
-</Button>
-
-<Button>
-<X> 470 </X>
-<Y> 618 </Y>
-<Filename> Menu4BN_FN </Filename>
-<FilenamePress> Menu4BP_FN </FilenamePress>
-<Sound> "ROOT/sounds/Mainbuttom.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-	
-</EventClick>
-</Button>
-
-<Button>
-<X> 623 </X>
-<Y> 618 </Y>
-<Filename> Menu5BN_FN </Filename>
-<FilenamePress> Menu5BP_FN </FilenamePress>
-<Sound> "ROOT/sounds/Mainbuttom.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-	
-</EventClick>
-</Button>
-
-<Button>
-<X> 775 </X>
-<Y> 618 </Y>
-<Filename> "ROOT/image/BN_Thai.bmp" </Filename>
-<FilenamePress> "ROOT/image/BP_Thai.bmp" </FilenamePress>
-<Sound> "ROOT/sounds/Mainbuttom.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-
-	Var Menu_list_LN = "TH" 
-
-	Var Menu1BN_FN = "ROOT/image/BN_Drink.bmp"
-	Var Menu1BP_FN = "ROOT/image/BP_Drink.bmp"
-	Var Menu1BD_FN = "ROOT/image/BD_Drink.bmp"
-	Var Menu2BN_FN = "ROOT/image/BN_Member.bmp"
-	Var Menu2BP_FN = "ROOT/image/BP_Member.bmp"
-	Var Menu3BN_FN = "ROOT/image/BN_Topup.bmp"
-	Var Menu3BP_FN = "ROOT/image/BP_Topup.bmp"
-	Var Menu4BN_FN = "ROOT/image/BN_Product.bmp"
-	Var Menu4BP_FN = "ROOT/image/BP_Product.bmp"
-	Var Menu5BN_FN = "ROOT/image/BN_Etc.bmp"
-	Var Menu5BP_FN = "ROOT/image/BP_Etc.bmp"
-	Var Menu6BN_FN = "ROOT/image/BN_Problem.bmp"
-	Var Menu6BP_FN = "ROOT/image/BP_Problem.bmp"
-
-	Open "ROOT/xml/menu_list.xml" 
-	
-</EventClick>
-</Button>
-
-<Button>
-<X> 853 </X>
-<Y> 618 </Y>
-<Filename> "ROOT/image/BN_ENG.bmp" </Filename>
-<FilenamePress> "ROOT/image/BP_ENG.bmp" </FilenamePress>
-<Sound> "ROOT/sounds/Mainbuttom.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-
-
-	Var Menu_list_LN = "ENG" 
-
-	Var Menu1BN_FN = "ROOT/image/BN_Drink_ENG.bmp"
-	Var Menu1BP_FN = "ROOT/image/BP_Drink_ENG.bmp"
-	Var Menu1BD_FN = "ROOT/image/BD_Drink_ENG.bmp"
-	Var Menu2BN_FN = "ROOT/image/BN_Member_ENG.bmp"
-	Var Menu2BP_FN = "ROOT/image/BP_Member_ENG.bmp"
-	Var Menu3BN_FN = "ROOT/image/BN_Topup_ENG.bmp"
-	Var Menu3BP_FN = "ROOT/image/BP_Topup_ENG.bmp"
-	Var Menu4BN_FN = "ROOT/image/BN_Product_ENG.bmp"
-	Var Menu4BP_FN = "ROOT/image/BP_Product_ENG.bmp"
-	Var Menu5BN_FN = "ROOT/image/BN_Etc_ENG.bmp"
-	Var Menu5BP_FN = "ROOT/image/BP_Etc_ENG.bmp"
-	Var Menu6BN_FN = "ROOT/image/BN_Problem_ENG.bmp"
-	Var Menu6BP_FN = "ROOT/image/BP_Problem_ENG.bmp"
-
-	Open "ROOT/xml/menu_list.xml" 
-	
-</EventClick>
-</Button>
-
-<Button>
-<X> 930 </X>
-<Y> 618 </Y>
-<Filename> Menu6BN_FN </Filename>
-<FilenamePress> Menu6BP_FN </FilenamePress>
-<Sound> "ROOT/sounds/Mainbuttom.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClickLong> 
-	;MainOpen "ROOT/xml/test_font.xml" 
-	VendingAccess
-</EventClickLong>
-<EventClick> 
-	;MainOpen "ROOT/xml/test_font.xml" 
-	Var TelephoneNumber = ""
-	If Menu_list_LN = "TH" Then
-		MainOpen "ROOT/xml/tellproblem_telnum.xml" 
-	Else
-		MainOpen "ROOT/xml/eng_tellproblem_telnum.xml" 
-	EndIf
-	;MainOpen "ROOT/xml/menu_problem.xml" 
-</EventClick>
-</Button>
-
 
 
 </Popup>
diff --git a/xml/menu_payment_cash.xml b/xml/menu_payment_cash.xml
index fa0c3094..9a1879a5 100644
--- a/xml/menu_payment_cash.xml
+++ b/xml/menu_payment_cash.xml
@@ -199,13 +199,13 @@
 			If ChangeOK = 1 Then	
 				;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
 				MakeDrinkV1  SelectDrink SelectSugarID
-				Open "/media/bt/xml/menu_page4-1.xml" 
+				Open "ROOT/taobin_project/xml/menu_thankyou.xml" 
 
 			Else 
 				If Timeout > 180 Then
 					;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
 					MakeDrinkV1  SelectDrink SelectSugarID
-					Open "/media/bt/xml/menu_page4-1.xml" 
+					Open "ROOT/taobin_project/xml/menu_thankyou.xml" 
 				EndIf
 			EndIf
 		Else
@@ -313,6 +313,7 @@
 
 		Var Timeout = 0
 
+		Var RemainAmount
 	EndIf
 
 	
@@ -512,6 +513,16 @@
 </EventClick>
 </Button>
 
+
+<QRCode>
+<X> 352 </X>
+<Y> 940 </Y>
+<State> alphaState </State>
+<Service> "Herr" </Service>
+</QRCode>
+
+
+
 <EventSecurity> 
 	Open "/media/bt/xml/security_alarm.xml" 
 </EventSecurity>
diff --git a/xml/menu_thankyou.xml b/xml/menu_thankyou.xml
index 6064a2d9..7a4b1c0d 100644
--- a/xml/menu_thankyou.xml
+++ b/xml/menu_thankyou.xml
@@ -3,6 +3,7 @@
 <Width> 1080 </Width>
 <Height> 1920 </Height>
 <Background> "0xeae6e1" </Background>
+<Sound> "ROOT/sounds/cha_ching.mp3" </Sound>
 <Volume> SoundVolume </Volume>
 <EventOpen>
 	; On open