diff --git a/inter/aus/configure.ev b/inter/aus/configure.ev
index e7055067..f43bd992 100644
--- a/inter/aus/configure.ev
+++ b/inter/aus/configure.ev
@@ -1,6 +1,6 @@
 
 	If BoxID = 200027 Then
-	    Var EnableMultiInstanceFromBoxID = 1
+	    Var EnableMultiInstanceFromBoxID = 0
 	EndIf
 
 	READ_FILE "/mnt/sdcard/enable_ui_v3" EnableMultiInstanceFromConfig
diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_Strawberry_Matcha_Latte.png b/inter/aus/image/page_drink_disable_n2/bn_iced_Strawberry_Matcha_Latte.png
index 891b9cdf..712ed7c4 100644
Binary files a/inter/aus/image/page_drink_disable_n2/bn_iced_Strawberry_Matcha_Latte.png and b/inter/aus/image/page_drink_disable_n2/bn_iced_Strawberry_Matcha_Latte.png differ
diff --git a/inter/aus/image/page_drink_n/bn_iced_Strawberry_Matcha_Latte.png b/inter/aus/image/page_drink_n/bn_iced_Strawberry_Matcha_Latte.png
index c1bc61c6..c1dd41e5 100644
Binary files a/inter/aus/image/page_drink_n/bn_iced_Strawberry_Matcha_Latte.png and b/inter/aus/image/page_drink_n/bn_iced_Strawberry_Matcha_Latte.png differ
diff --git a/inter/aus/image/page_drink_press_n/bn_iced_Strawberry_Matcha_Latte.png b/inter/aus/image/page_drink_press_n/bn_iced_Strawberry_Matcha_Latte.png
index 123d6a78..9cea0f32 100644
Binary files a/inter/aus/image/page_drink_press_n/bn_iced_Strawberry_Matcha_Latte.png and b/inter/aus/image/page_drink_press_n/bn_iced_Strawberry_Matcha_Latte.png differ
diff --git a/inter/aus/xml/event/promotion_hug_in_a_cup.lxml b/inter/aus/xml/event/promotion_hug_in_a_cup.lxml
index 7268453d..cdb42180 100644
--- a/inter/aus/xml/event/promotion_hug_in_a_cup.lxml
+++ b/inter/aus/xml/event/promotion_hug_in_a_cup.lxml
@@ -1457,7 +1457,7 @@
 		Var PD_CODE2 = "51-05-02-0045"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "Sprakling Yuzu"
+		Var aliasName[0] = "Sparkling Yuzu"
 		Var aliasDesc[0] = "Yuzu Syrup, Soda, Ice"
 		Var aliasName[1] = "ยูซุโซดา"
 		Var aliasDesc[1] = "น้ำเชื่อมยูซุ โซดา \nและน้ำแข็ง"
@@ -1552,9 +1552,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Sprakling Yuzu</LanguageSlot1>
+		<LanguageSlot1>Sparkling Yuzu</LanguageSlot1>
 		<LanguageSlot2>ยูซุโซดา</LanguageSlot2>
-		<LanguageSlot3>Sprakling Yuzu</LanguageSlot3>
+		<LanguageSlot3>Sparkling Yuzu</LanguageSlot3>
 		<LanguageSlot4>ยูซุโซดา</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>ยูซุโซดา</LanguageSlot6>
@@ -3335,38 +3335,38 @@
 	</Text>
 </Block>
 	; ==================> Len = 3
-	; - 51-04-02-0016 - 
+	; - 51-04-02-0062 - 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 51-04-02-0016.Button,Disable=Invisible,$Sum5104020016) </State> 
+	<State> Flag( 51-04-02-0062.Button,Disable=Invisible,$Sum5104020062) </State> 
 	<Button>
-	<State> $Sum5104020016 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_protein_Matcha.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_protein_Matcha.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_protein_Matcha.png" </FilenameDisable>
+	<State> $Sum5104020062 </State> 
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_protein_Mocha.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_protein_Mocha.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_protein_Mocha.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_protein_Matcha.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_protein_Mocha.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
-		Var PriceD2 = $51-04-02-0016.Price
+		Var PriceD2 = $51-04-02-0062.Price
 		Var PriceD3 = $-.Price
 		Var PD_CODE1 = "##-##-##-####"
-		Var PD_CODE2 = "51-04-02-0016"
+		Var PD_CODE2 = "51-04-02-0062"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "Matcha Protein\nShake"
-		Var aliasDesc[0] = "Whey protein,\nMatcha, & Milk"
-		Var aliasName[1] = "มัทฉะโปรตีน"
-		Var aliasDesc[1] = "เวย์โปรตีน ชาเชียว นม"
-		Var aliasName[2] = "-"
-		Var aliasDesc[2] = "-"
-		Var aliasName[3] = "-"
-		Var aliasDesc[3] = "-"
+		Var aliasName[0] = "Mocha Shake"
+		Var aliasDesc[0] = "Whey protein, Espresso\n& Milk, Chocolate"
+		Var aliasName[1] = ""
+		Var aliasDesc[1] = ""
+		Var aliasName[2] = ""
+		Var aliasDesc[2] = ""
+		Var aliasName[3] = ""
+		Var aliasDesc[3] = ""
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
 		Var aliasName[5] = ""
@@ -3383,17 +3383,17 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = "MATCHA SHAKE"
-		Var NameLang[1][1] = "มัทฉะโปรตีน"
+		Var NameLang[1][0] = "CAFE MOCHA PROTEIN"
+		Var NameLang[1][1] = ""
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = "SHAKE MATCHA"
+		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = "Whey protein,Matcha, and Milk"
-		Var DescLang[1][1] = "เวย์โปรตีน ชาเชียว นม"
+		Var DescLang[1][0] = "Coffee, Chocolate, Whey"
+		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = "Protein Whey, Matcha, Susu"
+		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -3409,7 +3409,7 @@
 		Var DescLang[2][5] = ""
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
-		Var PD_STAGE_2 = $51-04-02-0016.Button
+		Var PD_STAGE_2 = $51-04-02-0062.Button
 		Var PD_STAGE_3 = "Disable2"
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
@@ -3426,7 +3426,7 @@
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "51-04-02-0016"
+			Topping "Load" "51-04-02-0062"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -3454,12 +3454,12 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Matcha Protein\nShake</LanguageSlot1>
-		<LanguageSlot2>มัทฉะโปรตีน</LanguageSlot2>
-		<LanguageSlot3>Matcha Protein\nShake</LanguageSlot3>
-		<LanguageSlot4>มัทฉะโปรตีน</LanguageSlot4>
+		<LanguageSlot1>Mocha Shake</LanguageSlot1>
+		<LanguageSlot2></LanguageSlot2>
+		<LanguageSlot3>Mocha Shake</LanguageSlot3>
+		<LanguageSlot4></LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>มัทฉะโปรตีน</LanguageSlot6>
+		<LanguageSlot6></LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Text>
@@ -3470,12 +3470,12 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Whey protein,\nMatcha, & Milk</LanguageSlot1>
-		<LanguageSlot2>เวย์โปรตีน ชาเชียว นม</LanguageSlot2>
-		<LanguageSlot3>Whey protein,\nMatcha, & Milk</LanguageSlot3>
-		<LanguageSlot4>เวย์โปรตีน ชาเชียว นม</LanguageSlot4>
+		<LanguageSlot1>Whey protein, Espresso\n& Milk, Chocolate</LanguageSlot1>
+		<LanguageSlot2></LanguageSlot2>
+		<LanguageSlot3>Whey protein, Espresso\n& Milk, Chocolate</LanguageSlot3>
+		<LanguageSlot4></LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>เวย์โปรตีน ชาเชียว นม</LanguageSlot6>
+		<LanguageSlot6></LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Image>
@@ -3506,7 +3506,7 @@
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
-	<State> $51-04-02-0016.Button </State>
+	<State> $51-04-02-0062.Button </State>
 	</Image>
 	<Text>
 	<X> 113 </X>
@@ -3516,8 +3516,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $51-04-02-0016.Button </State>
-	<Value> StringFmt( $51-04-02-0016.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<State> $51-04-02-0062.Button </State>
+	<Value> StringFmt( $51-04-02-0062.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -3560,9 +3560,9 @@
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum5104020016 = "Disable" Then
+			If $Sum5104020062 = "Disable" Then
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
-				STRCONTAIN "ERR" $51-04-02-0016.TAG tag2_is_disable
+				STRCONTAIN "ERR" $51-04-02-0062.TAG tag2_is_disable
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
@@ -3597,7 +3597,7 @@
 	<Width>128</Width>
 	<Height>64</Height>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum5104020016 </State> 
+	<State> $Sum5104020062 </State> 
 	<Language>
 		<ID> 000013 </ID> 
 	</Language>
diff --git a/inter/aus/xml/page_catalog_group_other.lxml b/inter/aus/xml/page_catalog_group_other.lxml
index f7c5741f..56bcbb54 100644
--- a/inter/aus/xml/page_catalog_group_other.lxml
+++ b/inter/aus/xml/page_catalog_group_other.lxml
@@ -333,7 +333,7 @@
 		Var PD_CODE2 = "51-05-02-0045"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "Sprakling Yuzu"
+		Var aliasName[0] = "Sparkling Yuzu"
 		Var aliasDesc[0] = "Yuzu Syrup, Soda, Ice"
 		Var aliasName[1] = "ยูซุโซดา"
 		Var aliasDesc[1] = "น้ำเชื่อมยูซุ โซดา \nและน้ำแข็ง"
@@ -428,9 +428,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Sprakling Yuzu</LanguageSlot1>
+		<LanguageSlot1>Sparkling Yuzu</LanguageSlot1>
 		<LanguageSlot2>ยูซุโซดา</LanguageSlot2>
-		<LanguageSlot3>Sprakling Yuzu</LanguageSlot3>
+		<LanguageSlot3>Sparkling Yuzu</LanguageSlot3>
 		<LanguageSlot4>ยูซุโซดา</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>ยูซุโซดา</LanguageSlot6>
diff --git a/inter/aus/xml/page_catalog_group_pro_hug_in_a_cup.lxml b/inter/aus/xml/page_catalog_group_pro_hug_in_a_cup.lxml
index 7d11556c..529a2485 100644
--- a/inter/aus/xml/page_catalog_group_pro_hug_in_a_cup.lxml
+++ b/inter/aus/xml/page_catalog_group_pro_hug_in_a_cup.lxml
@@ -885,7 +885,7 @@
 		Var PD_CODE2 = "51-05-02-0045"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "Sprakling Yuzu"
+		Var aliasName[0] = "Sparkling Yuzu"
 		Var aliasDesc[0] = "Yuzu Syrup, Soda, Ice"
 		Var aliasName[1] = "ยูซุโซดา"
 		Var aliasDesc[1] = "น้ำเชื่อมยูซุ โซดา \nและน้ำแข็ง"
@@ -980,9 +980,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Sprakling Yuzu</LanguageSlot1>
+		<LanguageSlot1>Sparkling Yuzu</LanguageSlot1>
 		<LanguageSlot2>ยูซุโซดา</LanguageSlot2>
-		<LanguageSlot3>Sprakling Yuzu</LanguageSlot3>
+		<LanguageSlot3>Sparkling Yuzu</LanguageSlot3>
 		<LanguageSlot4>ยูซุโซดา</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>ยูซุโซดา</LanguageSlot6>
diff --git a/inter/aus/xml/page_catalog_group_recommend.lxml b/inter/aus/xml/page_catalog_group_recommend.lxml
index 77158aa1..e0e5ce65 100644
--- a/inter/aus/xml/page_catalog_group_recommend.lxml
+++ b/inter/aus/xml/page_catalog_group_recommend.lxml
@@ -1450,7 +1450,7 @@
 		Var PD_CODE2 = "51-05-02-0045"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "Sprakling Yuzu"
+		Var aliasName[0] = "Sparkling Yuzu"
 		Var aliasDesc[0] = "Yuzu Syrup, Soda, Ice"
 		Var aliasName[1] = "ยูซุโซดา"
 		Var aliasDesc[1] = "น้ำเชื่อมยูซุ โซดา \nและน้ำแข็ง"
@@ -1545,9 +1545,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Sprakling Yuzu</LanguageSlot1>
+		<LanguageSlot1>Sparkling Yuzu</LanguageSlot1>
 		<LanguageSlot2>ยูซุโซดา</LanguageSlot2>
-		<LanguageSlot3>Sprakling Yuzu</LanguageSlot3>
+		<LanguageSlot3>Sparkling Yuzu</LanguageSlot3>
 		<LanguageSlot4>ยูซุโซดา</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>ยูซุโซดา</LanguageSlot6>
@@ -3328,38 +3328,38 @@
 	</Text>
 </Block>
 	; ==================> Len = 3
-	; - 51-04-02-0016 - 
+	; - 51-04-02-0062 - 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 51-04-02-0016.Button,Disable=Invisible,$Sum5104020016) </State> 
+	<State> Flag( 51-04-02-0062.Button,Disable=Invisible,$Sum5104020062) </State> 
 	<Button>
-	<State> $Sum5104020016 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_protein_Matcha.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_protein_Matcha.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_protein_Matcha.png" </FilenameDisable>
+	<State> $Sum5104020062 </State> 
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_protein_Mocha.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_protein_Mocha.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_protein_Mocha.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_protein_Matcha.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_protein_Mocha.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
-		Var PriceD2 = $51-04-02-0016.Price
+		Var PriceD2 = $51-04-02-0062.Price
 		Var PriceD3 = $-.Price
 		Var PD_CODE1 = "##-##-##-####"
-		Var PD_CODE2 = "51-04-02-0016"
+		Var PD_CODE2 = "51-04-02-0062"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "Matcha Protein\nShake"
-		Var aliasDesc[0] = "Whey protein,\nMatcha, & Milk"
-		Var aliasName[1] = "มัทฉะโปรตีน"
-		Var aliasDesc[1] = "เวย์โปรตีน ชาเชียว นม"
-		Var aliasName[2] = "-"
-		Var aliasDesc[2] = "-"
-		Var aliasName[3] = "-"
-		Var aliasDesc[3] = "-"
+		Var aliasName[0] = "Mocha Shake"
+		Var aliasDesc[0] = "Whey protein, Espresso\n& Milk, Chocolate"
+		Var aliasName[1] = ""
+		Var aliasDesc[1] = ""
+		Var aliasName[2] = ""
+		Var aliasDesc[2] = ""
+		Var aliasName[3] = ""
+		Var aliasDesc[3] = ""
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
 		Var aliasName[5] = ""
@@ -3376,17 +3376,17 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = "MATCHA SHAKE"
-		Var NameLang[1][1] = "มัทฉะโปรตีน"
+		Var NameLang[1][0] = "CAFE MOCHA PROTEIN"
+		Var NameLang[1][1] = ""
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = "SHAKE MATCHA"
+		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = "Whey protein,Matcha, and Milk"
-		Var DescLang[1][1] = "เวย์โปรตีน ชาเชียว นม"
+		Var DescLang[1][0] = "Coffee, Chocolate, Whey"
+		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = "Protein Whey, Matcha, Susu"
+		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -3402,7 +3402,7 @@
 		Var DescLang[2][5] = ""
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
-		Var PD_STAGE_2 = $51-04-02-0016.Button
+		Var PD_STAGE_2 = $51-04-02-0062.Button
 		Var PD_STAGE_3 = "Disable2"
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
@@ -3419,7 +3419,7 @@
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "51-04-02-0016"
+			Topping "Load" "51-04-02-0062"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -3447,12 +3447,12 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Matcha Protein\nShake</LanguageSlot1>
-		<LanguageSlot2>มัทฉะโปรตีน</LanguageSlot2>
-		<LanguageSlot3>Matcha Protein\nShake</LanguageSlot3>
-		<LanguageSlot4>มัทฉะโปรตีน</LanguageSlot4>
+		<LanguageSlot1>Mocha Shake</LanguageSlot1>
+		<LanguageSlot2></LanguageSlot2>
+		<LanguageSlot3>Mocha Shake</LanguageSlot3>
+		<LanguageSlot4></LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>มัทฉะโปรตีน</LanguageSlot6>
+		<LanguageSlot6></LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Text>
@@ -3463,12 +3463,12 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Whey protein,\nMatcha, & Milk</LanguageSlot1>
-		<LanguageSlot2>เวย์โปรตีน ชาเชียว นม</LanguageSlot2>
-		<LanguageSlot3>Whey protein,\nMatcha, & Milk</LanguageSlot3>
-		<LanguageSlot4>เวย์โปรตีน ชาเชียว นม</LanguageSlot4>
+		<LanguageSlot1>Whey protein, Espresso\n& Milk, Chocolate</LanguageSlot1>
+		<LanguageSlot2></LanguageSlot2>
+		<LanguageSlot3>Whey protein, Espresso\n& Milk, Chocolate</LanguageSlot3>
+		<LanguageSlot4></LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>เวย์โปรตีน ชาเชียว นม</LanguageSlot6>
+		<LanguageSlot6></LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Image>
@@ -3499,7 +3499,7 @@
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
-	<State> $51-04-02-0016.Button </State>
+	<State> $51-04-02-0062.Button </State>
 	</Image>
 	<Text>
 	<X> 113 </X>
@@ -3509,8 +3509,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $51-04-02-0016.Button </State>
-	<Value> StringFmt( $51-04-02-0016.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<State> $51-04-02-0062.Button </State>
+	<Value> StringFmt( $51-04-02-0062.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -3553,9 +3553,9 @@
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum5104020016 = "Disable" Then
+			If $Sum5104020062 = "Disable" Then
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
-				STRCONTAIN "ERR" $51-04-02-0016.TAG tag2_is_disable
+				STRCONTAIN "ERR" $51-04-02-0062.TAG tag2_is_disable
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
@@ -3590,7 +3590,7 @@
 	<Width>128</Width>
 	<Height>64</Height>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum5104020016 </State> 
+	<State> $Sum5104020062 </State> 
 	<Language>
 		<ID> 000013 </ID> 
 	</Language>
diff --git a/inter/aus/xml/page_catalog_group_recommend_multi_pro.lxml b/inter/aus/xml/page_catalog_group_recommend_multi_pro.lxml
index e3f5f63e..83e74b56 100644
--- a/inter/aus/xml/page_catalog_group_recommend_multi_pro.lxml
+++ b/inter/aus/xml/page_catalog_group_recommend_multi_pro.lxml
@@ -1425,7 +1425,7 @@
 		Var PD_CODE2 = "51-05-02-0045"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "Sprakling Yuzu"
+		Var aliasName[0] = "Sparkling Yuzu"
 		Var aliasDesc[0] = "Yuzu Syrup, Soda, Ice"
 		Var aliasName[1] = "ยูซุโซดา"
 		Var aliasDesc[1] = "น้ำเชื่อมยูซุ โซดา \nและน้ำแข็ง"
@@ -1520,9 +1520,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Sprakling Yuzu</LanguageSlot1>
+		<LanguageSlot1>Sparkling Yuzu</LanguageSlot1>
 		<LanguageSlot2>ยูซุโซดา</LanguageSlot2>
-		<LanguageSlot3>Sprakling Yuzu</LanguageSlot3>
+		<LanguageSlot3>Sparkling Yuzu</LanguageSlot3>
 		<LanguageSlot4>ยูซุโซดา</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>ยูซุโซดา</LanguageSlot6>
@@ -3303,38 +3303,38 @@
 	</Text>
 </Block>
 	; ==================> Len = 3
-	; - 51-04-02-0016 - 
+	; - 51-04-02-0062 - 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 51-04-02-0016.Button,$Sum5104020016) </State> 
+	<State> Flag( 51-04-02-0062.Button,$Sum5104020062) </State> 
 	<Button>
-	<State> $Sum5104020016 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_protein_Matcha.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_protein_Matcha.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_protein_Matcha.png" </FilenameDisable>
+	<State> $Sum5104020062 </State> 
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_protein_Mocha.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_protein_Mocha.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_protein_Mocha.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_protein_Matcha.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_protein_Mocha.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
-		Var PriceD2 = $51-04-02-0016.Price
+		Var PriceD2 = $51-04-02-0062.Price
 		Var PriceD3 = $-.Price
 		Var PD_CODE1 = "##-##-##-####"
-		Var PD_CODE2 = "51-04-02-0016"
+		Var PD_CODE2 = "51-04-02-0062"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "Matcha Protein\nShake"
-		Var aliasDesc[0] = "Whey protein,\nMatcha, & Milk"
-		Var aliasName[1] = "มัทฉะโปรตีน"
-		Var aliasDesc[1] = "เวย์โปรตีน ชาเชียว นม"
-		Var aliasName[2] = "-"
-		Var aliasDesc[2] = "-"
-		Var aliasName[3] = "-"
-		Var aliasDesc[3] = "-"
+		Var aliasName[0] = "Mocha Shake"
+		Var aliasDesc[0] = "Whey protein, Espresso\n& Milk, Chocolate"
+		Var aliasName[1] = ""
+		Var aliasDesc[1] = ""
+		Var aliasName[2] = ""
+		Var aliasDesc[2] = ""
+		Var aliasName[3] = ""
+		Var aliasDesc[3] = ""
 		Var aliasName[4] = ""
 		Var aliasDesc[4] = ""
 		Var aliasName[5] = ""
@@ -3351,17 +3351,17 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = "MATCHA SHAKE"
-		Var NameLang[1][1] = "มัทฉะโปรตีน"
+		Var NameLang[1][0] = "CAFE MOCHA PROTEIN"
+		Var NameLang[1][1] = ""
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = "SHAKE MATCHA"
+		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = "Whey protein,Matcha, and Milk"
-		Var DescLang[1][1] = "เวย์โปรตีน ชาเชียว นม"
+		Var DescLang[1][0] = "Coffee, Chocolate, Whey"
+		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = "Protein Whey, Matcha, Susu"
+		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -3377,7 +3377,7 @@
 		Var DescLang[2][5] = ""
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
-		Var PD_STAGE_2 = $51-04-02-0016.Button
+		Var PD_STAGE_2 = $51-04-02-0062.Button
 		Var PD_STAGE_3 = "Disable2"
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
@@ -3394,7 +3394,7 @@
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "51-04-02-0016"
+			Topping "Load" "51-04-02-0062"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@@ -3422,12 +3422,12 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Matcha Protein\nShake</LanguageSlot1>
-		<LanguageSlot2>มัทฉะโปรตีน</LanguageSlot2>
-		<LanguageSlot3>Matcha Protein\nShake</LanguageSlot3>
-		<LanguageSlot4>มัทฉะโปรตีน</LanguageSlot4>
+		<LanguageSlot1>Mocha Shake</LanguageSlot1>
+		<LanguageSlot2></LanguageSlot2>
+		<LanguageSlot3>Mocha Shake</LanguageSlot3>
+		<LanguageSlot4></LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>มัทฉะโปรตีน</LanguageSlot6>
+		<LanguageSlot6></LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Text>
@@ -3438,12 +3438,12 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Whey protein,\nMatcha, & Milk</LanguageSlot1>
-		<LanguageSlot2>เวย์โปรตีน ชาเชียว นม</LanguageSlot2>
-		<LanguageSlot3>Whey protein,\nMatcha, & Milk</LanguageSlot3>
-		<LanguageSlot4>เวย์โปรตีน ชาเชียว นม</LanguageSlot4>
+		<LanguageSlot1>Whey protein, Espresso\n& Milk, Chocolate</LanguageSlot1>
+		<LanguageSlot2></LanguageSlot2>
+		<LanguageSlot3>Whey protein, Espresso\n& Milk, Chocolate</LanguageSlot3>
+		<LanguageSlot4></LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>เวย์โปรตีน ชาเชียว นม</LanguageSlot6>
+		<LanguageSlot6></LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Image>
@@ -3474,7 +3474,7 @@
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
-	<State> $51-04-02-0016.Button </State>
+	<State> $51-04-02-0062.Button </State>
 	</Image>
 	<Text>
 	<X> 113 </X>
@@ -3484,8 +3484,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $51-04-02-0016.Button </State>
-	<Value> StringFmt( $51-04-02-0016.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<State> $51-04-02-0062.Button </State>
+	<Value> StringFmt( $51-04-02-0062.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -3528,9 +3528,9 @@
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum5104020016 = "Disable" Then
+			If $Sum5104020062 = "Disable" Then
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
-				STRCONTAIN "ERR" $51-04-02-0016.TAG tag2_is_disable
+				STRCONTAIN "ERR" $51-04-02-0062.TAG tag2_is_disable
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
@@ -3565,7 +3565,7 @@
 	<Width>128</Width>
 	<Height>64</Height>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum5104020016 </State> 
+	<State> $Sum5104020062 </State> 
 	<Language>
 		<ID> 000013 </ID> 
 	</Language>
diff --git a/inter/aus/xml/page_catalog_group_tea.lxml b/inter/aus/xml/page_catalog_group_tea.lxml
index 8f25f7a0..c803f706 100644
--- a/inter/aus/xml/page_catalog_group_tea.lxml
+++ b/inter/aus/xml/page_catalog_group_tea.lxml
@@ -2802,7 +2802,7 @@
 		Var PD_CODE2 = "51-02-02-0063"
 		Var PD_CODE3 = "51-02-03-0063"
 		; begin lang 
-		Var aliasName[0] = "Coconut Thai Black Tea"
+		Var aliasName[0] = "Coconut Thai\nBlack Tea"
 		Var aliasDesc[0] = "Coconut Syrup, Thai Tea and Water"
 		Var aliasName[1] = ""
 		Var aliasDesc[1] = ""
@@ -2897,9 +2897,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Coconut Thai Black Tea</LanguageSlot1>
+		<LanguageSlot1>Coconut Thai\nBlack Tea</LanguageSlot1>
 		<LanguageSlot2></LanguageSlot2>
-		<LanguageSlot3>Coconut Thai Black Tea</LanguageSlot3>
+		<LanguageSlot3>Coconut Thai\nBlack Tea</LanguageSlot3>
 		<LanguageSlot4></LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6></LanguageSlot6>