THAI: Fixed everything

2025-01-22 17:36:38 +07:00 · 2025-01-22 17:36:38 +07:00 · ae6619ec35
commit ae6619ec35
parent 3258944cb5
21 changed files with 4465 additions and 2156 deletions
--- a/xml/event/double_promotion_ovaltine_and_red_string.xml
+++ b/xml/event/double_promotion_ovaltine_and_red_string.xml
--- a/xml/event/promotion_ovaltine_school.xml
+++ b/xml/event/promotion_ovaltine_school.xml
--- a/xml/event/promotion_red_string_of_fate.xml
+++ b/xml/event/promotion_red_string_of_fate.xml
--- a/xml/event/promotion_strawberry_series.xml
+++ b/xml/event/promotion_strawberry_series.xml
--- a/xml/page_catalog_group_coffee.xml
+++ b/xml/page_catalog_group_coffee.xml
--- a/xml/page_catalog_group_forkid.xml
+++ b/xml/page_catalog_group_forkid.xml
@ -319,7 +319,7 @@
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "MINI BUS OVANTINE VOLCANO"
+		Var NameDrink = "MINI BUS OVALTINE VOLCANO"
 		Var NameDrinkTH = "โอวัลตินรถโรงเรียน ภูเขาไฟ"
 		Var DrinkDescriptionTH = "โอวัลติน น้ำตาล และ นม"
 		Var DrinkDescription = "Ovaltine, Sugar, milk"
@ -415,7 +415,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "MINI BUS OVANTINE
+	<Value> "MINI BUS OVALTINE
 VOLCANO" </Value>
 	</Text>
 	<Text>
@ -572,7 +572,7 @@ VOLCANO" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "MINI BUS OVANTINE SUPER VOLCANO"
+		Var NameDrink = "MINI BUS OVALTINE SUPER VOLCANO"
 		Var NameDrinkTH = "โอวัลตินรถโรงเรียน ซุปเปอร์ภูเขาไฟ"
 		Var DrinkDescriptionTH = "โอวัลติน น้ำตาล และ นม"
 		Var DrinkDescription = "Ovaltine, Sugar, milk"
@ -668,7 +668,7 @@ VOLCANO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "MINI BUS OVANTINE
+	<Value> "MINI BUS OVALTINE
 SUPER VOLCANO" </Value>
 	</Text>
 	<Text>
@ -4612,6 +4612,261 @@ BANANA MILK" </Value>
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
 	; - - - 
 	; ==================> Len = 15
 	; - - 12-03-03-0061 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
 	<State> Flag( 12-03-03-0061.Button,$Sum1203030061) </State> 
 	<Button>
 	<State> $Sum1203030061 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_cocoa_MILK_BISCOFF.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_cocoa_MILK_BISCOFF.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_cocoa_MILK_BISCOFF.png" </FilenameDisable>
 	<OverlayImage> xmlpro( 12-03-03-0061, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var NameDrink = "Cocoa Milk  Biscoff Smoothie"
 		Var NameDrinkTH = "โกโก้ บิสคอฟ"
 		Var DrinkDescriptionTH = "โกโก้ นม น้ำตาล   บิสคอฟ"
 		Var DrinkDescription = "Cocoa, Milk, Sugar, Biscoff"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_cocoa_MILK_BISCOFF.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $-.Price
 		Var PriceD3 = $12-03-03-0061.Price
 		Var PD_CODE1 = "##-##-##-####"
 		Var PD_CODE2 = "##-##-##-####"
 		Var PD_CODE3 = "12-03-03-0061"
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = "Disable2"
 		Var PD_STAGE_3 = $12-03-03-0061.Button
 		Var OverlayMenuFilter !assigned xmlpro( 12-03-03-0061, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
 		DEBUGVAR OverlayMenuFilter
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
 		If PD_STAGE_1 = "Enable" Then
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 1
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 2
 		EndIf
 		If PD_STAGE_3 = "Enable" Then
 			Var SelectCountDrinkType = SelectCountDrinkType + 1
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
 			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
 			Else
 			Topping "Load" "12-03-03-0061"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
 		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
 		Var menu_name_thai_hot = $##-##-##-####.Name
 		Var menu_desc_thai_hot = $##-##-##-####.description
 		Var menu_name_eng_cold = $##-##-##-####.NameE
 		Var menu_desc_eng_cold = $##-##-##-####.descriptionE
 		Var menu_name_thai_cold = $##-##-##-####.Name
 		Var menu_desc_thai_cold = $##-##-##-####.description
 		Var menu_name_eng_blender = $12-03-03-0061.NameE
 		Var menu_desc_eng_blender = $12-03-03-0061.descriptionE
 		Var menu_name_thai_blender = $12-03-03-0061.Name
 		Var menu_desc_thai_blender = $12-03-03-0061.description
 		DEBUGVAR PD_STAGE_1
 		DEBUGVAR PD_STAGE_2
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
 	<X>  16   </X>
 	<Y>  164  </Y>
 	<Size> 24 </Size>
 	<Width>220</Width>
 	<Mode> "multi2" </Mode>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
 	<Value> "โกโก้
 บิสคอฟ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
 	<Y> 220 </Y>
 	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
 	<Value> "โกโก้ นม น้ำตาล 
 บิสคอฟ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
 	<Y> 164 </Y>
 	<Size> 22 </Size>
 	<Width>220</Width>
 	<Mode> "multi2" </Mode>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
 	<Value> "Cocoa Milk 
 Biscoff Smoothie" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
 	<Y> 220 </Y>
 	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
 	<Value> "Cocoa, Milk,
 Sugar, Biscoff" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
 	</Image>
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
 	<State> "Invisible" </State>
 	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
 	</Image>
 	<Text>
 	<X> 50 </X>
 	<Y> TextPriceMenuY </Y>
 	<Size> TextPriceMenuSize </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
 	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
 	<State> "Invisible" </State>
 	</Image>
 	<Text>
 	<X> 115 </X>
 	<Y> TextPriceMenuY </Y>
 	<Size> TextPriceMenuSize </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
 	<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 146 </X>
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
 	<State> $12-03-03-0061.Button </State>
 	</Image>
 	<Text>
 	<X> 180 </X>
 	<Y> TextPriceMenuY </Y>
 	<Size> TextPriceMenuSize </Size>
 	<Width>220</Width>
 	<Font> KanitRegularTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-03-03-0061.Button </State>
 	<Value> StringFmt(  $12-03-03-0061.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
 	<Y> 264 </Y>
 	<State> 
 		eval( 
 		If ICE_PROCESS_STATUS = 2 Then
 			Var ice_tab_process_show = "Invisible"
 		Else
 			Var ice_tab_process_show = "Invisible"
 		EndIf
 		Var return = ice_tab_process_show
 		)
 	</State>
 	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
 	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
 	</Image>
 	<Image>
 	<X> 49 </X>
 	<Y> 117 </Y>
 	<State> 
 		eval( 
 			If $Sum1203030061 = "Disable" Then
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
 				STRCONTAIN "ERR" $12-03-03-0061.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
 					Var return = "Enable"
 				EndIf
 				If tag2_is_disable = "true" Then
 					Var return = "Enable"
 				EndIf
 				If tag3_is_disable = "true" Then
 					Var return = "Enable"
 				EndIf
 			Else
 					Var return = "Invisible"
 			EndIf
 		)
 	</State>
 	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
 	</Image>
 	<Text>
 	<X> 84 </X>
 	<Y> 266 </Y>
 	<Size> 10 </Size>
 	<Font> OpunMediumTTF </Font>
 	<Color> 0xDE794E </Color>
 	<State> ice_tab_process_show </State>
 	<Value> ice_show_open </Value>
 	</Text>
 	<Text>
 	<X> 48 </X>
 	<Y> 116 </Y>
 	<Size> 32 </Size>
 	<Width>128</Width>
 	<Height>64</Height>
 	<Font> MITRegularTTF </Font>
 	<Color> 0x5A5A5A </Color>
 	<Mode> "disable-show" </Mode>
 	<State> $Sum1203030061 </State> 
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
 </Block>
 	; - - - 
 </FrameScroll>
--- a/xml/page_catalog_group_health.xml
+++ b/xml/page_catalog_group_health.xml
@ -5921,7 +5921,7 @@ SODA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "BLACK TEA  LIMENADE"
+		Var NameDrink = "BLACK TEA LIMENADE"
 		Var NameDrinkTH = "ชาดำมะนาว"
 		Var DrinkDescriptionTH = "ชาไทย ผงมะนาว และน้ำ"
 		Var DrinkDescription = "Thai tea, Limenade and Water"
@ -6016,7 +6016,8 @@ SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "BLACK TEA  LIMENADE" </Value>
+	<Value> "BLACK TEA
 LIMENADE" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
--- a/xml/page_catalog_group_milk.xml
+++ b/xml/page_catalog_group_milk.xml
--- a/xml/page_catalog_group_oreo.xml
+++ b/xml/page_catalog_group_oreo.xml
@ -53,7 +53,7 @@
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "OREO SMOOTHIE  VOLCANO"
+		Var NameDrink = "Oreo Smoothie  Volcano"
 		Var NameDrinkTH = "โอรีโอปั่นภูเขาไฟ"
 		Var DrinkDescriptionTH = "นม น้ำตาล โอรีโอ   "
 		Var DrinkDescription = "Milk, Sugar, Oreo, Ice"
@ -149,8 +149,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "OREO SMOOTHIE 
+	<Value> "Oreo Smoothie 
-VOLCANO" </Value>
+Volcano" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -306,7 +306,7 @@ VOLCANO" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "STRAWBERRY MILK  OREO VOLCANO"
+		Var NameDrink = "Strawberry Milk  Oreo Volcano"
 		Var NameDrinkTH = "สตอเบอร์รี่ปั่น โอรีโอภูเขาไฟ"
 		Var DrinkDescriptionTH = "สตอเบอร์รี่ นม น้ำตาล   Oreo"
 		Var DrinkDescription = "Strawberry, Milk, Sugar, Oreo"
@ -403,8 +403,8 @@ VOLCANO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "STRAWBERRY MILK 
+	<Value> "Strawberry Milk 
-OREO VOLCANO" </Value>
+Oreo Volcano" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -561,7 +561,7 @@ Sugar, Oreo" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "MELON MILK OREO VOLCANO"
+		Var NameDrink = "Melon Milk Oreo Volcano"
 		Var NameDrinkTH = "เมล่อนปั่น โอรีโอภูเขาไฟ"
 		Var DrinkDescriptionTH = "เมล่อน นม น้ำตาล   Oreo"
 		Var DrinkDescription = "Melon, Milk, Sugar, Oreo"
@ -658,7 +658,7 @@ Sugar, Oreo" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "MELON MILK OREO VOLCANO" </Value>
+	<Value> "Melon Milk Oreo Volcano" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -815,7 +815,7 @@ Sugar, Oreo" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "BANANA MILK OREO  VOLCANO"
+		Var NameDrink = "Banana Mlik Oreo  Volcano"
 		Var NameDrinkTH = "นมกล้วยปั่น โอรีโอภูเขาไฟ"
 		Var DrinkDescriptionTH = "กล้วย นม น้ำตาล Oreo"
 		Var DrinkDescription = "Banana, Milk, Sugar, Oreo"
@ -911,8 +911,8 @@ Sugar, Oreo" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "BANANA MILK OREO 
+	<Value> "Banana Mlik Oreo 
-VOLCANO" </Value>
+Volcano" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1069,7 +1069,7 @@ Sugar, Oreo" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "CHOCO OREO VOLCANO"
+		Var NameDrink = "Choco Oreo Volcano"
 		Var NameDrinkTH = "โกโก้ปั่น โอรีโอภูเขาไฟ"
 		Var DrinkDescriptionTH = "โกโก้ นม น้ำตาล   Oreo"
 		Var DrinkDescription = "Cocoa, Milk, Sugar, Oreo"
@ -1166,7 +1166,7 @@ Sugar, Oreo" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "CHOCO OREO VOLCANO" </Value>
+	<Value> "Choco Oreo Volcano" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1323,7 +1323,7 @@ Sugar, Oreo" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "CARAMEL MILK  OREO VOLCANO"
+		Var NameDrink = "Caramel Milk  Oreo Volcano"
 		Var NameDrinkTH = "นมคาราเมลปั่น โอรีโอภูเขาไฟ"
 		Var DrinkDescriptionTH = "คาราเมล นม น้ำตาล   Oreo"
 		Var DrinkDescription = "Caramel, Milk, Sugar, Oreo"
@ -1420,8 +1420,8 @@ Sugar, Oreo" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "CARAMEL MILK 
+	<Value> "Caramel Milk 
-OREO VOLCANO" </Value>
+Oreo Volcano" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1578,7 +1578,7 @@ Sugar, Oreo" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "HOJICHA OREO VOLCANO"
+		Var NameDrink = "Hojicha Oreo Volcano"
 		Var NameDrinkTH = "โฮจิฉะ โอรีโอภูเขาไฟ"
 		Var DrinkDescriptionTH = "โฮจิฉะ นม น้ำตาล   Oreo"
 		Var DrinkDescription = "Hojicha, Milk, Sugar, Oreo"
@ -1675,7 +1675,7 @@ Sugar, Oreo" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "HOJICHA OREO VOLCANO" </Value>
+	<Value> "Hojicha Oreo Volcano" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1832,7 +1832,7 @@ Sugar, Oreo" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "THAI MILK TEA OREO VOLCANO"
+		Var NameDrink = "Thai Milk Tea Oreo Volcano"
 		Var NameDrinkTH = "ชานมไทย โอรีโอภูเขาไฟ"
 		Var DrinkDescriptionTH = "ชาไทย นม น้ำตาล   Oreo"
 		Var DrinkDescription = "Thai Tea, Milk, Sugar, Oreo"
@ -1929,7 +1929,7 @@ Sugar, Oreo" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "THAI MILK TEA OREO VOLCANO" </Value>
+	<Value> "Thai Milk Tea Oreo Volcano" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2086,7 +2086,7 @@ Sugar, Oreo" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "CAFE LATTE OREO VOLCANO"
+		Var NameDrink = "Cafe Latte Oreo Volcano"
 		Var NameDrinkTH = "ลาเต้ปั่น  โอรีโอภูเขาไฟ"
 		Var DrinkDescriptionTH = "กาแฟ นม น้ำตาล   Oero"
 		Var DrinkDescription = "Coffee, Milk,  Sugar, Oreo"
@ -2183,7 +2183,7 @@ Sugar, Oreo" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "CAFE LATTE OREO VOLCANO" </Value>
+	<Value> "Cafe Latte Oreo Volcano" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2340,7 +2340,7 @@ Sugar, Oreo" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "PINK MILK OREO VOLCANO"
+		Var NameDrink = "Pink Milk Oreo Volcano"
 		Var NameDrinkTH = "นมชมพูปั่น โอรีโอภูเขาไฟ"
 		Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ นม น้ำตาล   Oreo"
 		Var DrinkDescription = "Salak , Milk, Sugar Oreo"
@ -2437,8 +2437,8 @@ Sugar, Oreo" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "PINK MILK
+	<Value> "Pink Milk
-OREO VOLCANO" </Value>
+Oreo Volcano" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2595,7 +2595,7 @@ Sugar Oreo" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "THAI MILK TEA OREO VOLCANO"
+		Var NameDrink = "Thai Milk Tea Oreo Volcano"
 		Var NameDrinkTH = "ชานมไทย โอรีโอภูเขาไฟ"
 		Var DrinkDescriptionTH = "ชาไทย นม น้ำตาล   Oreo"
 		Var DrinkDescription = "Thai Tea, Milk, Sugar, Oreo"
@ -2692,7 +2692,7 @@ Sugar Oreo" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "THAI MILK TEA OREO VOLCANO" </Value>
+	<Value> "Thai Milk Tea Oreo Volcano" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2849,7 +2849,7 @@ Sugar, Oreo" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "MINT OREO VOLCANO"
+		Var NameDrink = "Mint Oreo Volcano"
 		Var NameDrinkTH = "มินต์โอรีโอภูเขาไฟ"
 		Var DrinkDescriptionTH = "มินต์ นม น้ำตาล   Oreo"
 		Var DrinkDescription = "Mint, Milk, Sugar, Oreo"
@ -2945,7 +2945,7 @@ Sugar, Oreo" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "MINT OREO VOLCANO" </Value>
+	<Value> "Mint Oreo Volcano" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -3102,7 +3102,7 @@ Sugar, Oreo" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "PEACH OREO"
+		Var NameDrink = "Peach Oreo"
 		Var NameDrinkTH = "พีชโอรีโอภูเขาไฟ"
 		Var DrinkDescriptionTH = "พีช นม น้ำตาล   Oreo"
 		Var DrinkDescription = "Peach, Milk, Sugar, Oreo"
@ -3198,7 +3198,7 @@ Sugar, Oreo" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "PEACH OREO" </Value>
+	<Value> "Peach Oreo" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -3353,7 +3353,7 @@ Sugar, Oreo" </Value>
 	<Volume> SoundVolume </Volume>
 	<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<EventOnClick> 
-		Var NameDrink = "PEACH OREO"
+		Var NameDrink = "Peach Oreo"
 		Var NameDrinkTH = "พีชโอรีโอภูเขาไฟ"
 		Var DrinkDescriptionTH = "พีช นม น้ำตาล   Oreo"
 		Var DrinkDescription = "Peach, Milk, Sugar, Oreo"
@ -3449,7 +3449,7 @@ Sugar, Oreo" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "PEACH OREO" </Value>
+	<Value> "Peach Oreo" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
--- a/xml/page_catalog_group_other.xml
+++ b/xml/page_catalog_group_other.xml
--- a/xml/page_catalog_group_other_other.xml
+++ b/xml/page_catalog_group_other_other.xml
@ -3865,7 +3865,7 @@ SODA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "MELON SODA"
+		Var NameDrink = "Melon Soda"
 		Var NameDrinkTH = "เมล่อนโซดา"
 		Var DrinkDescriptionTH = "เมล่อน โซดา  และน้ำแข็ง"
 		Var DrinkDescription = "Melon, Soda, Ice"
@ -3961,7 +3961,7 @@ SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "MELON SODA" </Value>
+	<Value> "Melon Soda" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -4117,7 +4117,7 @@ SODA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "YUZU SODA"
+		Var NameDrink = "Yuzu Soda"
 		Var NameDrinkTH = "ยูซุโซดา"
 		Var DrinkDescriptionTH = "ยูซุ โซดา  และน้ำแข็ง"
 		Var DrinkDescription = "Yuzu, Soda, Ice"
@ -4213,7 +4213,7 @@ SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "YUZU SODA" </Value>
+	<Value> "Yuzu Soda" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -4369,7 +4369,7 @@ SODA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "LIMENADE  SODA"
+		Var NameDrink = "Limenade  Soda"
 		Var NameDrinkTH = "น้ำมะนาวโซดา"
 		Var DrinkDescriptionTH = "มะนาว โซดา  "
 		Var DrinkDescription = "Limenade, Sugar, Soda & Ice"
@ -4464,8 +4464,8 @@ SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "LIMENADE 
+	<Value> "Limenade 
-SODA" </Value>
+Soda" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -4621,7 +4621,7 @@ SODA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "LYCHEE SODA"
+		Var NameDrink = "Lychee Soda"
 		Var NameDrinkTH = "น้ำลิ้นจี่โซดา"
 		Var DrinkDescriptionTH = "ลิ้นจี่ โซดา  "
 		Var DrinkDescription = "Lychee, Soda & Ice"
@ -4716,7 +4716,7 @@ SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "LYCHEE SODA" </Value>
+	<Value> "Lychee Soda" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -4872,7 +4872,7 @@ SODA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "LYCHEE  LIMENADE SODA"
+		Var NameDrink = "Lychee  Limenade Soda"
 		Var NameDrinkTH = "ลิ้นจี่มะนาวโซดา "
 		Var DrinkDescriptionTH = "ลิ้นจี่ มะนาว  โซดา  "
 		Var DrinkDescription = "Lychee, Limenade, Soda & Ice"
@ -4968,8 +4968,8 @@ SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "LYCHEE 
+	<Value> "Lychee 
-LIMENADE SODA" </Value>
+Limenade Soda" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -5126,7 +5126,7 @@ Limenade, Soda & Ice" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "SALAK SODA"
+		Var NameDrink = "Salak Soda"
 		Var NameDrinkTH = "น้ำแดงโซดา"
 		Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ โซดา "
 		Var DrinkDescription = "Salak, Soda & Ice"
@ -5221,7 +5221,7 @@ Limenade, Soda & Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "SALAK SODA" </Value>
+	<Value> "Salak Soda" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -5377,7 +5377,7 @@ Limenade, Soda & Ice" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "LIME SALAK SODA"
+		Var NameDrink = "Lime Salak Soda"
 		Var NameDrinkTH = "น้ำแดงมะนาวโซดา"
 		Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ มะนาว โซดา "
 		Var DrinkDescription = "Salak, Limenade,  Soda & Ice"
@ -5472,8 +5472,8 @@ Limenade, Soda & Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "LIME
+	<Value> "Lime
-SALAK SODA" </Value>
+Salak Soda" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -5630,7 +5630,7 @@ Soda & Ice" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "PLUM SODA"
+		Var NameDrink = "Plum Soda"
 		Var NameDrinkTH = "บ๊วยโซดา"
 		Var DrinkDescriptionTH = "บ๊วย โซดา  "
 		Var DrinkDescription = "Ume, Soda & Ice"
@ -5725,7 +5725,7 @@ Soda & Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "PLUM SODA" </Value>
+	<Value> "Plum Soda" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -5881,7 +5881,7 @@ Soda & Ice" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "PLUM  LIMENADE SODA"
+		Var NameDrink = "Plum  Limenade Soda"
 		Var NameDrinkTH = "บ๊วยมะนาวโซดา"
 		Var DrinkDescriptionTH = "บ๊วย มะนาว โซดา "
 		Var DrinkDescription = "Ume, Limenade,  Soda & Ice"
@ -5976,8 +5976,8 @@ Soda & Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "PLUM 
+	<Value> "Plum 
-LIMENADE SODA" </Value>
+Limenade Soda" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -6134,7 +6134,7 @@ Soda & Ice" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "GINGER SODA"
+		Var NameDrink = "Ginger Soda"
 		Var NameDrinkTH = "ขิงโซดา"
 		Var DrinkDescriptionTH = "ขิง โซดา  "
 		Var DrinkDescription = "Ginger, Soda & Ice"
@ -6229,7 +6229,7 @@ Soda & Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "GINGER SODA" </Value>
+	<Value> "Ginger Soda" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -6385,7 +6385,7 @@ Soda & Ice" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "GINGER LIME  SODA"
+		Var NameDrink = "Ginger Lime  Soda"
 		Var NameDrinkTH = "ขิงมะนาวโซดา"
 		Var DrinkDescriptionTH = "ขิง มะนาว โซดา  "
 		Var DrinkDescription = "Ginger, Lime, Soda & Ice"
@ -6480,8 +6480,8 @@ Soda & Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "GINGER LIME 
+	<Value> "Ginger Lime 
-SODA" </Value>
+Soda" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -6637,7 +6637,7 @@ SODA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "GINGER SODA"
+		Var NameDrink = "Ginger Soda"
 		Var NameDrinkTH = "ขิงโซดา"
 		Var DrinkDescriptionTH = "ขิง โซดา  "
 		Var DrinkDescription = "Ginger, Soda & Ice"
@ -6732,7 +6732,7 @@ SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "GINGER SODA" </Value>
+	<Value> "Ginger Soda" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -6888,7 +6888,7 @@ SODA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "GINGER LIME  SODA"
+		Var NameDrink = "Ginger Lime  Soda"
 		Var NameDrinkTH = "ขิงมะนาวโซดา"
 		Var DrinkDescriptionTH = "ขิง มะนาว โซดา  "
 		Var DrinkDescription = "Ginger, Lime, Soda & Ice"
@ -6983,8 +6983,8 @@ SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "GINGER LIME 
+	<Value> "Ginger Lime 
-SODA" </Value>
+Soda" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -7140,7 +7140,7 @@ SODA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "MINT LIME SODA"
+		Var NameDrink = "Mint Lime Soda"
 		Var NameDrinkTH = "มินต์มะนาวโซดา"
 		Var DrinkDescriptionTH = "มินต์ มะนาว และโซดา"
 		Var DrinkDescription = "Mint , Lime, Soda & Ice"
@ -7235,7 +7235,7 @@ SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "MINT LIME SODA" </Value>
+	<Value> "Mint Lime Soda" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -7391,7 +7391,7 @@ SODA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "STRAWBERRY MINT SODA"
+		Var NameDrink = "Strawbbery Mint Soda"
 		Var NameDrinkTH = "สตรอเบอร์รี่ มินต์โซดา"
 		Var DrinkDescriptionTH = "มินต์ สตรอเบอร์รี่ มะนาว และโซดา"
 		Var DrinkDescription = "Mint, Strawberry, Lime, Soda & Ice"
@ -7487,8 +7487,8 @@ SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "STRAWBERRY
+	<Value> "Strawbbery
-MINT SODA" </Value>
+Mint Soda" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -7644,7 +7644,7 @@ MINT SODA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "YUZU MINT SODA"
+		Var NameDrink = "Yuzu Mint Soda"
 		Var NameDrinkTH = "ยูซุมินต์โซดา"
 		Var DrinkDescriptionTH = "มินต์ ยูซุ  และโซดา"
 		Var DrinkDescription = "Mint, Yuzu Soda & Ice"
@ -7739,7 +7739,7 @@ MINT SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "YUZU MINT SODA" </Value>
+	<Value> "Yuzu Mint Soda" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -7895,7 +7895,7 @@ MINT SODA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "PLUM LIMENADE MINT SODA"
+		Var NameDrink = "Plum Limenade Mint Soda"
 		Var NameDrinkTH = "บ๊วยมะนาว มินต์โซดา"
 		Var DrinkDescriptionTH = "มินต์ บ๊วย มะนาว และโซดา"
 		Var DrinkDescription = "Mint, Ume, Lime, Soda & Ice"
@ -7991,8 +7991,8 @@ MINT SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "PLUM LIMENADE
+	<Value> "Plum Limenade
-MINT SODA" </Value>
+Mint Soda" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -8148,7 +8148,7 @@ MINT SODA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "MINT LYCHEE LEMON SODA"
+		Var NameDrink = "Mint Lychee Lemon Soda"
 		Var NameDrinkTH = "มินต์ลิ้นจี่ มะนาวโซดา"
 		Var DrinkDescriptionTH = "มินต์ ลิ้นจี่ มะนาว และโซดา"
 		Var DrinkDescription = "Mint,Lychee , Lime, Soda & Ice"
@ -8244,8 +8244,8 @@ MINT SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "MINT LYCHEE
+	<Value> "Mint Lychee
-LEMON SODA" </Value>
+Lemon Soda" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -8401,7 +8401,7 @@ LEMON SODA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "PEACH SODA"
+		Var NameDrink = "Peach Soda"
 		Var NameDrinkTH = "พีชโซดา"
 		Var DrinkDescriptionTH = "พีช และโซดา"
 		Var DrinkDescription = "Peach & Ice"
@ -8496,7 +8496,7 @@ LEMON SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "PEACH SODA" </Value>
+	<Value> "Peach Soda" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -8652,7 +8652,7 @@ LEMON SODA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "PEACH MINT SODA"
+		Var NameDrink = "Peach Mint Soda"
 		Var NameDrinkTH = "พีชมินต์โซดา"
 		Var DrinkDescriptionTH = "พีช มินต์ และโซดา"
 		Var DrinkDescription = "Peach, Mint Soda& Ice"
@ -8747,7 +8747,7 @@ LEMON SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "PEACH MINT SODA" </Value>
+	<Value> "Peach Mint Soda" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -8903,7 +8903,7 @@ LEMON SODA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "PEACH LIME SODA"
+		Var NameDrink = "Peach Lime Soda"
 		Var NameDrinkTH = "พีชมะนาวโซดา"
 		Var DrinkDescriptionTH = "พีช มะนาว และโซดา  "
 		Var DrinkDescription = "Peach , Lime, Soda & Ice"
@ -8998,7 +8998,7 @@ LEMON SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "PEACH LIME SODA" </Value>
+	<Value> "Peach Lime Soda" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -9154,7 +9154,7 @@ LEMON SODA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "PEACH STRAWBERRY  SODA"
+		Var NameDrink = "Peach Strawberry Soda"
 		Var NameDrinkTH = "พีชสตรอเบอร์รี่โซดา"
 		Var DrinkDescriptionTH = "พีช สตรอเบอร์รี่  และโซดา"
 		Var DrinkDescription = "Peach, Strawberry,Soda & Ice"
@ -9249,7 +9249,7 @@ LEMON SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "PEACH STRAWBERRY  SODA" </Value>
+	<Value> "Peach Strawberry Soda" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -10160,7 +10160,7 @@ Lychee Soda" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "SODA"
+		Var NameDrink = "Soda"
 		Var NameDrinkTH = "โซดา"
 		Var DrinkDescriptionTH = "โซดา"
 		Var DrinkDescription = "Soda"
@ -10255,7 +10255,7 @@ Lychee Soda" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "SODA" </Value>
+	<Value> "Soda" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -10411,7 +10411,7 @@ Lychee Soda" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "ICE & SODA"
+		Var NameDrink = "Ice & Soda"
 		Var NameDrinkTH = "โซดาน้ำแข็ง"
 		Var DrinkDescriptionTH = "โซดา  "
 		Var DrinkDescription = "Soda & Ice"
@ -10506,7 +10506,7 @@ Lychee Soda" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "ICE & SODA" </Value>
+	<Value> "Ice & Soda" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -10914,7 +10914,7 @@ Lychee Soda" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "LIME SALAK"
+		Var NameDrink = "Lime Salak"
 		Var NameDrinkTH = "น้ำแดงมะนาว "
 		Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ น้ำมะนาว   "
 		Var DrinkDescription = "Salak, Limenade, Water & Ice"
@ -11010,7 +11010,7 @@ Lychee Soda" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "LIME SALAK" </Value>
+	<Value> "Lime Salak" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -11167,7 +11167,7 @@ Water & Ice" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "LYCHEE DRINK"
+		Var NameDrink = "Lychee Drink"
 		Var NameDrinkTH = "น้ำลิ้นจี่ "
 		Var DrinkDescriptionTH = "ลิ้นจี่ น้ำ  "
 		Var DrinkDescription = "Lychee, Sugar, Water & Ice"
@ -11262,7 +11262,7 @@ Water & Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "LYCHEE DRINK" </Value>
+	<Value> "Lychee Drink" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -11419,7 +11419,7 @@ Water & Ice" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "SALAK DRINK"
+		Var NameDrink = "Salak Drink"
 		Var NameDrinkTH = "น้ำแดง"
 		Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ   "
 		Var DrinkDescription = "Salak & Ice"
@ -11515,7 +11515,7 @@ Water & Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "SALAK DRINK" </Value>
+	<Value> "Salak Drink" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -11671,7 +11671,7 @@ Water & Ice" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "LIMENADE"
+		Var NameDrink = "Limenade"
 		Var NameDrinkTH = "น้ำมะนาว "
 		Var DrinkDescriptionTH = "น้ำมะนาว น้ำตาล"
 		Var DrinkDescription = "Limenade, Sugar "
@ -11766,7 +11766,7 @@ Water & Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "LIMENADE" </Value>
+	<Value> "Limenade" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -11926,7 +11926,7 @@ Water & Ice" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "PLUM DRINK"
+		Var NameDrink = "Plum Drink"
 		Var NameDrinkTH = "น้ำบ๊วย "
 		Var DrinkDescriptionTH = "บ๊วย น้ำ  "
 		Var DrinkDescription = "Ume, Water & Ice"
@ -12021,7 +12021,7 @@ Water & Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "PLUM DRINK" </Value>
+	<Value> "Plum Drink" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -12177,7 +12177,7 @@ Water & Ice" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "LYCHEE DRINK"
+		Var NameDrink = "Lychee Drink"
 		Var NameDrinkTH = "น้ำลิ้นจี่ "
 		Var DrinkDescriptionTH = "ลิ้นจี่ น้ำ  "
 		Var DrinkDescription = "Lychee, Sugar, Water & Ice"
@ -12272,7 +12272,7 @@ Water & Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "LYCHEE DRINK" </Value>
+	<Value> "Lychee Drink" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -12429,7 +12429,7 @@ Water & Ice" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "PEACH DRINK"
+		Var NameDrink = "Peach Drink"
 		Var NameDrinkTH = "น้ำพีช"
 		Var DrinkDescriptionTH = "พีช น้ำ  "
 		Var DrinkDescription = "Peach, Water & Ice"
@ -12524,7 +12524,7 @@ Water & Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "PEACH DRINK" </Value>
+	<Value> "Peach Drink" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -12680,7 +12680,7 @@ Water & Ice" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "CONGEE WITH  PLANT PROTEIN"
+		Var NameDrink = "Congee With  Plant Protein"
 		Var NameDrinkTH = "โจ๊กใส่โปรตีนจากพืช"
 		Var DrinkDescriptionTH = "ข้าว ผัก โปรตีนจากพืช น้ำ"
 		Var DrinkDescription = "Rice, Plant-based protein, Water"
@ -12775,8 +12775,8 @@ Water & Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "CONGEE WITH 
+	<Value> "Congee With 
-PLANT PROTEIN" </Value>
+Plant Protein" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -12936,7 +12936,7 @@ PLANT PROTEIN" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "HONGKONG CONGEE "
+		Var NameDrink = "Hongkong Congee"
 		Var NameDrinkTH = "โจ๊กผักฮ้องกง"
 		Var DrinkDescriptionTH = "ข้าว ผัก โปรตีนจากพืช น้ำ"
 		Var DrinkDescription = "Rice, Plant-based protein, Water"
@ -13031,7 +13031,7 @@ PLANT PROTEIN" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "HONGKONG CONGEE " </Value>
+	<Value> "Hongkong Congee" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -13191,7 +13191,7 @@ PLANT PROTEIN" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "ICE"
+		Var NameDrink = "Ice"
 		Var NameDrinkTH = "น้ำแข็ง"
 		Var DrinkDescriptionTH = "น้ำแข็ง"
 		Var DrinkDescription = "Ice"
@ -13286,7 +13286,7 @@ PLANT PROTEIN" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "ICE" </Value>
+	<Value> "Ice" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -13442,7 +13442,7 @@ PLANT PROTEIN" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "DRINKING WATER"
+		Var NameDrink = "Drinking Water"
 		Var NameDrinkTH = "น้ำดื่ม"
 		Var DrinkDescriptionTH = "น้ำ"
 		Var DrinkDescription = "Water"
@ -13537,7 +13537,7 @@ PLANT PROTEIN" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "DRINKING WATER" </Value>
+	<Value> "Drinking Water" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -13693,7 +13693,7 @@ PLANT PROTEIN" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "WATER (HOT WATER / WATER WITH ICED)"
+		Var NameDrink = "Water (Hot Water / Water With Iced)"
 		Var NameDrinkTH = "น้ำ (น้ำร้อน / น้ำเย็น)"
 		Var DrinkDescriptionTH = "น้ำ (น้ำร้อน / น้ำ และน้ำแข็ง)"
 		Var DrinkDescription = "Water (HOT WATER / WATER WITH ICED)"
@ -13788,7 +13788,8 @@ PLANT PROTEIN" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "WATER (HOT WATER / WATER WITH ICED)" </Value>
+	<Value> "Water (Hot Water
 / Water With Iced)" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -13798,7 +13799,8 @@ PLANT PROTEIN" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Water (HOT WATER / WATER WITH ICED)" </Value>
+	<Value> "Water (HOT WATER
 / WATER WITH ICED)" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
--- a/xml/page_catalog_group_pepsi_7up.xml
+++ b/xml/page_catalog_group_pepsi_7up.xml
--- a/xml/page_catalog_group_pro_banana_mint_lucky_draw_x3.xml
+++ b/xml/page_catalog_group_pro_banana_mint_lucky_draw_x3.xml
@ -1145,7 +1145,8 @@ Sugar, Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "MATCHA LATTE MINT" </Value>
+	<Value> "MATCHA LATTE
 MINT" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
--- a/xml/page_catalog_group_pro_buble_tea.xml
+++ b/xml/page_catalog_group_pro_buble_tea.xml
@ -50,7 +50,7 @@
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "LATTE"
+		Var NameDrink = "Latte"
 		Var NameDrinkTH = "ลาเต้"
 		Var DrinkDescriptionTH = "กาแฟ นม และ ฟองนม"
 		Var DrinkDescription = "Espresso, Milk, Foamed milk"
@ -145,7 +145,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "LATTE" </Value>
+	<Value> "Latte" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -299,7 +299,7 @@
 	<Volume> SoundVolume </Volume>
 	<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_.png") </OverlayImage>
 	<EventOnClick> 
-		Var NameDrink = "LATTE"
+		Var NameDrink = "Latte"
 		Var NameDrinkTH = "ลาเต้"
 		Var DrinkDescriptionTH = "กาแฟ นม และ ฟองนม"
 		Var DrinkDescription = "Espresso, Milk, Foamed milk"
@ -394,7 +394,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "LATTE" </Value>
+	<Value> "Latte" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -549,7 +549,7 @@
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "MOCHA"
+		Var NameDrink = "Mocha"
 		Var NameDrinkTH = "มอคค่า"
 		Var DrinkDescriptionTH = "กาแฟ นม โกโก้ และ น้ำตาล"
 		Var DrinkDescription = "Espresso, Cocoa, Milk, Sugar"
@ -644,7 +644,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "MOCHA" </Value>
+	<Value> "Mocha" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -798,7 +798,7 @@
 	<Volume> SoundVolume </Volume>
 	<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_.png") </OverlayImage>
 	<EventOnClick> 
-		Var NameDrink = "MOCHA"
+		Var NameDrink = "Mocha"
 		Var NameDrinkTH = "มอคค่า"
 		Var DrinkDescriptionTH = "กาแฟ นม โกโก้ และ น้ำตาล"
 		Var DrinkDescription = "Espresso, Cocoa, Milk, Sugar"
@ -893,7 +893,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "MOCHA" </Value>
+	<Value> "Mocha" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1048,7 +1048,7 @@
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "CARAMEL LATTE"
+		Var NameDrink = "Caramel Latte"
 		Var NameDrinkTH = "คาราเมลลาเต้"
 		Var DrinkDescriptionTH = "กาแฟ นม และ นม คาราเมล"
 		Var DrinkDescription = "Espresso, Milk, Caramel "
@ -1144,7 +1144,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "CARAMEL LATTE" </Value>
+	<Value> "Caramel Latte" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1299,7 +1299,7 @@ Caramel " </Value>
 	<Volume> SoundVolume </Volume>
 	<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_.png") </OverlayImage>
 	<EventOnClick> 
-		Var NameDrink = "CARAMEL LATTE"
+		Var NameDrink = "Caramel Latte"
 		Var NameDrinkTH = "คาราเมลลาเต้"
 		Var DrinkDescriptionTH = "กาแฟ นม และ นม คาราเมล"
 		Var DrinkDescription = "Espresso, Milk, Caramel "
@ -1395,7 +1395,7 @@ Caramel " </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "CARAMEL LATTE" </Value>
+	<Value> "Caramel Latte" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1551,7 +1551,7 @@ Caramel " </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "COCOA"
+		Var NameDrink = "Cocoa"
 		Var NameDrinkTH = "โกโก้ "
 		Var DrinkDescriptionTH = "โกโก้ นมและน้ำตาล"
 		Var DrinkDescription = "Milk, Cocoa, Sugar"
@ -1646,7 +1646,7 @@ Caramel " </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "COCOA" </Value>
+	<Value> "Cocoa" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1800,7 +1800,7 @@ Caramel " </Value>
 	<Volume> SoundVolume </Volume>
 	<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_.png") </OverlayImage>
 	<EventOnClick> 
-		Var NameDrink = "COCOA"
+		Var NameDrink = "Cocoa"
 		Var NameDrinkTH = "โกโก้ "
 		Var DrinkDescriptionTH = "โกโก้ นมและน้ำตาล"
 		Var DrinkDescription = "Milk, Cocoa, Sugar"
@ -1895,7 +1895,7 @@ Caramel " </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "COCOA" </Value>
+	<Value> "Cocoa" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2050,7 +2050,7 @@ Caramel " </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "MILK"
+		Var NameDrink = "Milk"
 		Var NameDrinkTH = "นม "
 		Var DrinkDescriptionTH = "นม"
 		Var DrinkDescription = "Milk"
@ -2145,7 +2145,7 @@ Caramel " </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "MILK" </Value>
+	<Value> "Milk" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2299,7 +2299,7 @@ Caramel " </Value>
 	<Volume> SoundVolume </Volume>
 	<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_.png") </OverlayImage>
 	<EventOnClick> 
-		Var NameDrink = "MILK"
+		Var NameDrink = "Milk"
 		Var NameDrinkTH = "นม "
 		Var DrinkDescriptionTH = "นม"
 		Var DrinkDescription = "Milk"
@ -2394,7 +2394,7 @@ Caramel " </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "MILK" </Value>
+	<Value> "Milk" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2549,7 +2549,7 @@ Caramel " </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "PINK MILK"
+		Var NameDrink = "Pink Milk"
 		Var NameDrinkTH = "นมชมพู "
 		Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ นม  น้ำตาล "
 		Var DrinkDescription = "Salak , Milk, Sugar"
@ -2645,7 +2645,7 @@ Caramel " </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "PINK MILK" </Value>
+	<Value> "Pink Milk" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2800,7 +2800,7 @@ Sugar" </Value>
 	<Volume> SoundVolume </Volume>
 	<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_.png") </OverlayImage>
 	<EventOnClick> 
-		Var NameDrink = "PINK MILK"
+		Var NameDrink = "Pink Milk"
 		Var NameDrinkTH = "นมชมพู "
 		Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ นม  น้ำตาล "
 		Var DrinkDescription = "Salak , Milk, Sugar"
@ -2896,7 +2896,7 @@ Sugar" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "PINK MILK" </Value>
+	<Value> "Pink Milk" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -3052,7 +3052,7 @@ Sugar" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "PEPSI"
+		Var NameDrink = "Pepsi"
 		Var NameDrinkTH = "เป๊ปซี่น้ำแข็ง"
 		Var DrinkDescriptionTH = "เป๊ปซี่  "
 		Var DrinkDescription = "Pepsi, Ice"
@ -3147,7 +3147,7 @@ Sugar" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "PEPSI" </Value>
+	<Value> "Pepsi" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -3301,7 +3301,7 @@ Sugar" </Value>
 	<Volume> SoundVolume </Volume>
 	<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_.png") </OverlayImage>
 	<EventOnClick> 
-		Var NameDrink = "PEPSI"
+		Var NameDrink = "Pepsi"
 		Var NameDrinkTH = "เป๊ปซี่น้ำแข็ง"
 		Var DrinkDescriptionTH = "เป๊ปซี่  "
 		Var DrinkDescription = "Pepsi, Ice"
@ -3396,7 +3396,7 @@ Sugar" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "PEPSI" </Value>
+	<Value> "Pepsi" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -3551,7 +3551,7 @@ Sugar" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "LIME SALAK SODA"
+		Var NameDrink = "Lime Salak Soda"
 		Var NameDrinkTH = "น้ำแดงมะนาวโซดา"
 		Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ มะนาว โซดา "
 		Var DrinkDescription = "Salak , Limenade,  Soda & Ice"
@ -3646,8 +3646,7 @@ Sugar" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "LIME
+	<Value> "Lime Salak Soda" </Value>
 SALAK SODA" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -3802,7 +3801,7 @@ Soda & Ice" </Value>
 	<Volume> SoundVolume </Volume>
 	<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_.png") </OverlayImage>
 	<EventOnClick> 
-		Var NameDrink = "LIME SALAK SODA"
+		Var NameDrink = "Lime Salak Soda"
 		Var NameDrinkTH = "น้ำแดงมะนาวโซดา"
 		Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ มะนาว โซดา "
 		Var DrinkDescription = "Salak , Limenade,  Soda & Ice"
@ -3897,8 +3896,7 @@ Soda & Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "LIME
+	<Value> "Lime Salak Soda" </Value>
 SALAK SODA" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -4054,7 +4052,7 @@ Soda & Ice" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "PLUM  LIMENADE SODA"
+		Var NameDrink = "Plum Limenade Soda"
 		Var NameDrinkTH = "บ๊วยมะนาวโซดา"
 		Var DrinkDescriptionTH = "บ๊วย มะนาว โซดา"
 		Var DrinkDescription = "Ume , Limenade, Soda"
@ -4149,8 +4147,7 @@ Soda & Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "PLUM 
+	<Value> "Plum Limenade Soda" </Value>
 LIMENADE SODA" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -4304,7 +4301,7 @@ LIMENADE SODA" </Value>
 	<Volume> SoundVolume </Volume>
 	<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_.png") </OverlayImage>
 	<EventOnClick> 
-		Var NameDrink = "PLUM  LIMENADE SODA"
+		Var NameDrink = "Plum Limenade Soda"
 		Var NameDrinkTH = "บ๊วยมะนาวโซดา"
 		Var DrinkDescriptionTH = "บ๊วย มะนาว โซดา"
 		Var DrinkDescription = "Ume , Limenade, Soda"
@ -4399,8 +4396,7 @@ LIMENADE SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "PLUM 
+	<Value> "Plum Limenade Soda" </Value>
 LIMENADE SODA" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -4555,7 +4551,7 @@ LIMENADE SODA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "TAO POWER  DRINK SODA"
+		Var NameDrink = "Tao Power Drink Soda"
 		Var NameDrinkTH = "เต่าทรงพลังโซดา"
 		Var DrinkDescriptionTH = "เครื่องดื่มเต่าทรงพลัง  โซดา  "
 		Var DrinkDescription = "Medicine drink, Soda"
@ -4650,8 +4646,7 @@ LIMENADE SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "TAO POWER 
+	<Value> "Tao Power Drink Soda" </Value>
 DRINK SODA" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -4805,7 +4800,7 @@ DRINK SODA" </Value>
 	<Volume> SoundVolume </Volume>
 	<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_.png") </OverlayImage>
 	<EventOnClick> 
-		Var NameDrink = "TAO POWER  DRINK SODA"
+		Var NameDrink = "Tao Power Drink Soda"
 		Var NameDrinkTH = "เต่าทรงพลังโซดา"
 		Var DrinkDescriptionTH = "เครื่องดื่มเต่าทรงพลัง  โซดา  "
 		Var DrinkDescription = "Medicine drink, Soda"
@ -4900,8 +4895,7 @@ DRINK SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "TAO POWER 
+	<Value> "Tao Power Drink Soda" </Value>
 DRINK SODA" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -5056,7 +5050,7 @@ DRINK SODA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "PEPSI PLUM"
+		Var NameDrink = "Pepsi Plum"
 		Var NameDrinkTH = "เป๊ปซี่บ๊วย"
 		Var DrinkDescriptionTH = "เป๊ปซี่ บ๊วย โซดา  "
 		Var DrinkDescription = "Pepsi, Ume & Ice"
@ -5151,7 +5145,7 @@ DRINK SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "PEPSI PLUM" </Value>
+	<Value> "Pepsi Plum" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -5305,7 +5299,7 @@ DRINK SODA" </Value>
 	<Volume> SoundVolume </Volume>
 	<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_.png") </OverlayImage>
 	<EventOnClick> 
-		Var NameDrink = "PEPSI PLUM"
+		Var NameDrink = "Pepsi Plum"
 		Var NameDrinkTH = "เป๊ปซี่บ๊วย"
 		Var DrinkDescriptionTH = "เป๊ปซี่ บ๊วย โซดา  "
 		Var DrinkDescription = "Pepsi, Ume & Ice"
@ -5400,7 +5394,7 @@ DRINK SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "PEPSI PLUM" </Value>
+	<Value> "Pepsi Plum" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -5555,7 +5549,7 @@ DRINK SODA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "MATCHA LATTE"
+		Var NameDrink = "Matcha Latte"
 		Var NameDrinkTH = "มัทฉะลาเต้ "
 		Var DrinkDescriptionTH = "ชาเชียว นม  "
 		Var DrinkDescription = "Green Tea, Milk, Sugar, Ice"
@ -5650,7 +5644,7 @@ DRINK SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "MATCHA LATTE" </Value>
+	<Value> "Matcha Latte" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -5804,7 +5798,7 @@ DRINK SODA" </Value>
 	<Volume> SoundVolume </Volume>
 	<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_.png") </OverlayImage>
 	<EventOnClick> 
-		Var NameDrink = "MATCHA LATTE"
+		Var NameDrink = "Matcha Latte"
 		Var NameDrinkTH = "มัทฉะลาเต้ "
 		Var DrinkDescriptionTH = "ชาเชียว นม  "
 		Var DrinkDescription = "Green Tea, Milk, Sugar, Ice"
@ -5899,7 +5893,7 @@ DRINK SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "MATCHA LATTE" </Value>
+	<Value> "Matcha Latte" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -6054,7 +6048,7 @@ DRINK SODA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "THAI MILK TEA"
+		Var NameDrink = "Thai Milk Tea"
 		Var NameDrinkTH = "ชานมไทย "
 		Var DrinkDescriptionTH = "ชาไทย และ นม"
 		Var DrinkDescription = "Thai tea, Sugar, milk"
@ -6149,7 +6143,7 @@ DRINK SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "THAI MILK TEA" </Value>
+	<Value> "Thai Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -6303,7 +6297,7 @@ DRINK SODA" </Value>
 	<Volume> SoundVolume </Volume>
 	<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_.png") </OverlayImage>
 	<EventOnClick> 
-		Var NameDrink = "THAI MILK TEA"
+		Var NameDrink = "Thai Milk Tea"
 		Var NameDrinkTH = "ชานมไทย "
 		Var DrinkDescriptionTH = "ชาไทย และ นม"
 		Var DrinkDescription = "Thai tea, Sugar, milk"
@ -6398,7 +6392,7 @@ DRINK SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "THAI MILK TEA" </Value>
+	<Value> "Thai Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -6553,7 +6547,7 @@ DRINK SODA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "JASMINE MILK TEA"
+		Var NameDrink = "Jasmine Milk Tea"
 		Var NameDrinkTH = "ชานมมะลิ"
 		Var DrinkDescriptionTH = "ชามะลิ และนม"
 		Var DrinkDescription = "Jasmine & Milk"
@ -6648,7 +6642,7 @@ DRINK SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "JASMINE MILK TEA" </Value>
+	<Value> "Jasmine Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -6802,7 +6796,7 @@ DRINK SODA" </Value>
 	<Volume> SoundVolume </Volume>
 	<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_.png") </OverlayImage>
 	<EventOnClick> 
-		Var NameDrink = "JASMINE MILK TEA"
+		Var NameDrink = "Jasmine Milk Tea"
 		Var NameDrinkTH = "ชานมมะลิ"
 		Var DrinkDescriptionTH = "ชามะลิ และนม"
 		Var DrinkDescription = "Jasmine & Milk"
@ -6897,7 +6891,7 @@ DRINK SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "JASMINE MILK TEA" </Value>
+	<Value> "Jasmine Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -7052,7 +7046,7 @@ DRINK SODA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "TAIWANESE TEA"
+		Var NameDrink = "Taiwanese Tea"
 		Var NameDrinkTH = "ชานมไต้หวัน"
 		Var DrinkDescriptionTH = "ชาไต้หวัน นม"
 		Var DrinkDescription = "Taiwan Tea, Milk, Sugar"
@ -7147,7 +7141,7 @@ DRINK SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "TAIWANESE TEA" </Value>
+	<Value> "Taiwanese Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -7301,7 +7295,7 @@ DRINK SODA" </Value>
 	<Volume> SoundVolume </Volume>
 	<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_.png") </OverlayImage>
 	<EventOnClick> 
-		Var NameDrink = "TAIWANESE TEA"
+		Var NameDrink = "Taiwanese Tea"
 		Var NameDrinkTH = "ชานมไต้หวัน"
 		Var DrinkDescriptionTH = "ชาไต้หวัน นม"
 		Var DrinkDescription = "Taiwan Tea, Milk, Sugar"
@ -7396,7 +7390,7 @@ DRINK SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "TAIWANESE TEA" </Value>
+	<Value> "Taiwanese Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -7551,7 +7545,7 @@ DRINK SODA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "TAO TIM BUBBLE TEA"
+		Var NameDrink = "Tao Tim Bubble Tea"
 		Var NameDrinkTH = "เต่าติมไข่มุก"
 		Var DrinkDescriptionTH = "ไอศครีมนม คาราเมล และบุกไข่มุก"
 		Var DrinkDescription = "Icecream, Caramel and Pearl carrageenan"
@ -7646,7 +7640,7 @@ DRINK SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "TAO TIM BUBBLE TEA" </Value>
+	<Value> "Tao Tim Bubble Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -7800,7 +7794,7 @@ DRINK SODA" </Value>
 	<Volume> SoundVolume </Volume>
 	<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_.png") </OverlayImage>
 	<EventOnClick> 
-		Var NameDrink = "TAO TIM BUBBLE TEA"
+		Var NameDrink = "Tao Tim Bubble Tea"
 		Var NameDrinkTH = "เต่าติมไข่มุก"
 		Var DrinkDescriptionTH = "ไอศครีมนม คาราเมล และบุกไข่มุก"
 		Var DrinkDescription = "Icecream, Caramel and Pearl carrageenan"
@ -7895,7 +7889,7 @@ DRINK SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "TAO TIM BUBBLE TEA" </Value>
+	<Value> "Tao Tim Bubble Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
--- a/xml/page_catalog_group_pro_mymint.xml
+++ b/xml/page_catalog_group_pro_mymint.xml
@ -1175,7 +1175,8 @@ Sugar, Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showengText </State>
-	<Value> "MATCHA LATTE MINT" </Value>
+	<Value> "MATCHA LATTE
 MINT" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
--- a/xml/page_catalog_group_pro_ovaltine_school.xml
+++ b/xml/page_catalog_group_pro_ovaltine_school.xml
@ -309,7 +309,7 @@ AND SUGAR" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "MINI BUS OVANTINE VOLCANO"
+		Var NameDrink = "MINI BUS OVALTINE VOLCANO"
 		Var NameDrinkTH = "โอวันติลรถโรงเรียน ภูเขาไฟ"
 		Var DrinkDescriptionTH = "โอวัลติน นม โกโก้ และน้ำตาล "
 		Var DrinkDescription = "OVALTINE, MILK, COCOA, AND SUGAR"
@ -405,7 +405,7 @@ AND SUGAR" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "MINI BUS OVANTINE
+	<Value> "MINI BUS OVALTINE
 VOLCANO" </Value>
 	</Text>
 	<Text>
@ -563,7 +563,7 @@ AND SUGAR" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "MINI BUS OVANTINE SUPER VOLCANO"
+		Var NameDrink = "MINI BUS OVALTINE SUPER VOLCANO"
 		Var NameDrinkTH = "โอวันติลรถโรงเรียน ซุปเปอร์ภูเขาไฟ"
 		Var DrinkDescriptionTH = "โอวัลติน นม โกโก้ และน้ำตาล "
 		Var DrinkDescription = "OVALTINE, MILK, COCOA, AND SUGAR"
@ -659,7 +659,7 @@ AND SUGAR" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "MINI BUS OVANTINE
+	<Value> "MINI BUS OVALTINE
 SUPER VOLCANO" </Value>
 	</Text>
 	<Text>
--- a/xml/page_catalog_group_pro_passion_mint.xml
+++ b/xml/page_catalog_group_pro_passion_mint.xml
@ -1166,7 +1166,8 @@ Sugar, Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "MATCHA LATTE MINT" </Value>
+	<Value> "MATCHA LATTE
 MINT" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
--- a/xml/page_catalog_group_pro_thick_tea_by_brewer.xml
+++ b/xml/page_catalog_group_pro_thick_tea_by_brewer.xml
@ -404,7 +404,8 @@ TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "TRADITIONAL MATCHA" </Value>
+	<Value> "TRADITIONAL
 MATCHA" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
--- a/xml/page_catalog_group_recommend.xml
+++ b/xml/page_catalog_group_recommend.xml
--- a/xml/page_catalog_group_songkran.xml
+++ b/xml/page_catalog_group_songkran.xml
@ -691,7 +691,7 @@ AMERICANO" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "MINI VAN OVANTINE"
+		Var NameDrink = "MINI VAN OVALTINE"
 		Var NameDrinkTH = "โอวัลตินรถโรงเรียน"
 		Var DrinkDescriptionTH = "โอวัลติน น้ำตาล และ นม"
 		Var DrinkDescription = "Ovaltine, Sugar, milk"
@ -786,7 +786,7 @@ AMERICANO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "MINI VAN OVANTINE" </Value>
+	<Value> "MINI VAN OVALTINE" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
--- a/xml/page_catalog_group_tea.xml
+++ b/xml/page_catalog_group_tea.xml
@ -61,10 +61,10 @@
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "STRAWBERRY TEA"
+		Var NameDrink = "Strawbeery Tea"
 		Var NameDrinkTH = "ชาสตรอเบอร์รี่"
 		Var DrinkDescriptionTH = "สตรอเบอร์รี่ ชามะลิ และน้ำตาล"
-		Var DrinkDescription = "STRAWBERRY, JASMINE TEA, SUGAR"
+		Var DrinkDescription = "Strawberry, Jasmine Tea, Sugar"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_strawberry_tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-01-0022.Price
@ -157,7 +157,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "STRAWBERRY TEA" </Value>
+	<Value> "Strawbeery Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -167,8 +167,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "STRAWBERRY,
+	<Value> "Strawberry,
-JASMINE TEA, SUGAR" </Value>
+Jasmine Tea, Sugar" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -318,10 +318,10 @@ JASMINE TEA, SUGAR" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "SOUTHERN FUSION TEA"
+		Var NameDrink = "Southern Fusion Tea"
 		Var NameDrinkTH = "ชาผสานปักษ์ใต้"
 		Var DrinkDescriptionTH = "มัทฉะ ชาไทย นม และคาราเมล"
-		Var DrinkDescription = "MATCHA , THAI TEA,  MILK CARAMEL"
+		Var DrinkDescription = "Matcha , Thai Tea,  Milk Caramel"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_southern_fusion_tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-01-0083.Price
@ -413,8 +413,8 @@ JASMINE TEA, SUGAR" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "SOUTHERN FUSION
+	<Value> "Southern Fusion
-TEA" </Value>
+Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -424,7 +424,7 @@ TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "MATCHA , THAI TEA,  MILK CARAMEL" </Value>
+	<Value> "Matcha , Thai Tea,  Milk Caramel" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -574,10 +574,10 @@ TEA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "TRADITIONAL MATCHA"
+		Var NameDrink = "Traditional Matcha"
 		Var NameDrinkTH = "มัทฉะโบราณ"
 		Var DrinkDescriptionTH = "ชามะลิ มัทฉะ นม และคาราเมล"
-		Var DrinkDescription = "JASMINE TEA,  MATCHA, MILK, CARAMEL"
+		Var DrinkDescription = "Jasmine Tea,  Matcha, Milk, Caramel"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_traditional_green_tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-01-0084.Price
@ -669,7 +669,8 @@ TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "TRADITIONAL MATCHA" </Value>
+	<Value> "Traditional
 Matcha" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -679,7 +680,7 @@ TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "JASMINE TEA,  MATCHA, MILK, CARAMEL" </Value>
+	<Value> "Jasmine Tea,  Matcha, Milk, Caramel" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -829,10 +830,10 @@ TEA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "ROYAL MILK TEA"
+		Var NameDrink = "Royal Milk Tea"
 		Var NameDrinkTH = "ชานมชาววัง"
 		Var DrinkDescriptionTH = "ชาไทย ชามะลิ นม และคาราเมล"
-		Var DrinkDescription = "THAI TEA, JASMINE TEA, MILK, CARAMEL "
+		Var DrinkDescription = "Thai Tea, Jasmine Tea, Milk, Caramel"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_royal_milk_tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-01-0085.Price
@ -924,7 +925,7 @@ TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "ROYAL MILK TEA" </Value>
+	<Value> "Royal Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -934,7 +935,7 @@ TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "THAI TEA, JASMINE TEA, MILK, CARAMEL " </Value>
+	<Value> "Thai Tea, Jasmine Tea, Milk, Caramel" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -1084,7 +1085,7 @@ TEA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "CHRYSANTHS TEA"
+		Var NameDrink = "Chrysanths Tea"
 		Var NameDrinkTH = "เก็กฮวย "
 		Var DrinkDescriptionTH = "น้ำเก๊กฮวย น้ำตาล"
 		Var DrinkDescription = "Chrysanthemum & Water "
@ -1179,7 +1180,7 @@ TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "CHRYSANTHS TEA" </Value>
+	<Value> "Chrysanths Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1339,7 +1340,7 @@ TEA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "GINGER TEA"
+		Var NameDrink = "Ginger Tea"
 		Var NameDrinkTH = "น้ำขิง "
 		Var DrinkDescriptionTH = "ขิง และ น้ำ "
 		Var DrinkDescription = "Ginger & Water "
@ -1434,7 +1435,7 @@ TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "GINGER TEA" </Value>
+	<Value> "Ginger Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1594,7 +1595,7 @@ TEA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "GINGER TEA"
+		Var NameDrink = "Ginger Tea"
 		Var NameDrinkTH = "น้ำขิง "
 		Var DrinkDescriptionTH = "ขิง และ น้ำ "
 		Var DrinkDescription = "Ginger & Water "
@ -1689,7 +1690,7 @@ TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "GINGER TEA" </Value>
+	<Value> "Ginger Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1849,7 +1850,7 @@ TEA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "CANNABIS DRINK"
+		Var NameDrink = "Cannabis Drink"
 		Var NameDrinkTH = "น้ำกัญชา "
 		Var DrinkDescriptionTH = "กัญชา (อายุมากกว่า 20+ เท่านั้น)"
 		Var DrinkDescription = "Cannabis & Water "
@ -1944,7 +1945,7 @@ TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "CANNABIS DRINK" </Value>
+	<Value> "Cannabis Drink" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2104,7 +2105,7 @@ TEA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "LIME TEA"
+		Var NameDrink = "Lime Tea"
 		Var NameDrinkTH = "ชามะนาว "
 		Var DrinkDescriptionTH = "ชาไทย มะนาว"
 		Var DrinkDescription = "Thai Tea, Limenade, Sugar & Water "
@ -2199,7 +2200,7 @@ TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "LIME TEA" </Value>
+	<Value> "Lime Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2359,7 +2360,7 @@ TEA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "LIME  GINGER TEA"
+		Var NameDrink = "Lime  Ginger Tea"
 		Var NameDrinkTH = "ชาขิงมะนาว "
 		Var DrinkDescriptionTH = "ขิง มะนาว และน้ำ "
 		Var DrinkDescription = "Ginger, Lime & Water "
@ -2454,8 +2455,8 @@ TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "LIME 
+	<Value> "Lime 
-GINGER TEA" </Value>
+Ginger Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2615,7 +2616,7 @@ GINGER TEA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "LIME  GINGER TEA"
+		Var NameDrink = "Lime  Ginger Tea"
 		Var NameDrinkTH = "ชาขิงมะนาว "
 		Var DrinkDescriptionTH = "ขิง มะนาว และน้ำ "
 		Var DrinkDescription = "Ginger, Lime & Water "
@ -2710,8 +2711,8 @@ GINGER TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "LIME 
+	<Value> "Lime 
-GINGER TEA" </Value>
+Ginger Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2871,7 +2872,7 @@ GINGER TEA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "THAI MILK TEA"
+		Var NameDrink = "Thai Milk Tea"
 		Var NameDrinkTH = "ชานมไทย "
 		Var DrinkDescriptionTH = "ชาไทย และ นม"
 		Var DrinkDescription = "Thai tea, Sugar, milk"
@ -2966,7 +2967,7 @@ GINGER TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "THAI MILK TEA" </Value>
+	<Value> "Thai Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -3126,7 +3127,7 @@ GINGER TEA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "LIME TEA"
+		Var NameDrink = "Lime Tea"
 		Var NameDrinkTH = "ชามะนาว "
 		Var DrinkDescriptionTH = "ชาไทย มะนาว"
 		Var DrinkDescription = "Thai Tea, Limenade, Sugar & Water "
@ -3221,7 +3222,7 @@ GINGER TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "LIME TEA" </Value>
+	<Value> "Lime Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -3381,7 +3382,7 @@ GINGER TEA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "THAI BLACK TEA"
+		Var NameDrink = "Thai Black Tea"
 		Var NameDrinkTH = "ชาดำ"
 		Var DrinkDescriptionTH = "ชาไทย และน้ำ"
 		Var DrinkDescription = "Thai Tea & Water "
@ -3476,7 +3477,7 @@ GINGER TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "THAI BLACK TEA" </Value>
+	<Value> "Thai Black Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -3636,7 +3637,7 @@ GINGER TEA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "THAI MILK TEA"
+		Var NameDrink = "Thai Milk Tea"
 		Var NameDrinkTH = "ชานมไทย "
 		Var DrinkDescriptionTH = "ชาไทย และ นมอุ่น"
 		Var DrinkDescription = "Thai tea, Sugar, Warm milk"
@ -3731,7 +3732,7 @@ GINGER TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "THAI MILK TEA" </Value>
+	<Value> "Thai Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -3891,7 +3892,7 @@ GINGER TEA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "TAIWANESE TEA"
+		Var NameDrink = "Taiwanese Tea"
 		Var NameDrinkTH = "ชานมไต้หวัน"
 		Var DrinkDescriptionTH = "ชาไต้หวัน และ นมอุ่น"
 		Var DrinkDescription = "Taiwanese Tea, Sugar, Milk"
@ -3986,7 +3987,7 @@ GINGER TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "TAIWANESE TEA" </Value>
+	<Value> "Taiwanese Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -4146,7 +4147,7 @@ GINGER TEA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "TAIWANESE TEA"
+		Var NameDrink = "Taiwanese Tea"
 		Var NameDrinkTH = "ชานมไต้หวัน"
 		Var DrinkDescriptionTH = "ชาไต้หวัน นม"
 		Var DrinkDescription = "Taiwan Tea, Milk, Sugar"
@ -4241,7 +4242,7 @@ GINGER TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "TAIWANESE TEA" </Value>
+	<Value> "Taiwanese Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -4401,7 +4402,7 @@ GINGER TEA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "MATCHA LATTE"
+		Var NameDrink = "Matcha Latte"
 		Var NameDrinkTH = "มัทฉะลาเต้ "
 		Var DrinkDescriptionTH = "ชาเชียว นม  "
 		Var DrinkDescription = "Green Tea, Milk, Sugar"
@ -4496,7 +4497,7 @@ GINGER TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "MATCHA LATTE" </Value>
+	<Value> "Matcha Latte" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -4656,7 +4657,7 @@ GINGER TEA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "MATCHA LATTE"
+		Var NameDrink = "Matcha Latte"
 		Var NameDrinkTH = "มัทฉะลาเต้ "
 		Var DrinkDescriptionTH = "ชาเขียวมัทฉะ และ นมอุ่น"
 		Var DrinkDescription = "Matcha, Milk"
@ -4751,7 +4752,7 @@ GINGER TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "MATCHA LATTE" </Value>
+	<Value> "Matcha Latte" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -4911,7 +4912,7 @@ GINGER TEA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "HOJICHA LATTE"
+		Var NameDrink = "Hojicha Latte"
 		Var NameDrinkTH = "โฮจิฉะลาเต้"
 		Var DrinkDescriptionTH = "ชาเขียวคั่ว และ นม"
 		Var DrinkDescription = "Hojicha and milk"
@ -5006,7 +5007,7 @@ GINGER TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "HOJICHA LATTE" </Value>
+	<Value> "Hojicha Latte" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -5166,7 +5167,7 @@ GINGER TEA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "MATCHA"
+		Var NameDrink = "Matcha"
 		Var NameDrinkTH = "ชาเขียวญี่ปุ่น "
 		Var DrinkDescriptionTH = "ชาเชียว และน้ำ"
 		Var DrinkDescription = "Matcha & Water "
@ -5261,7 +5262,7 @@ GINGER TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "MATCHA" </Value>
+	<Value> "Matcha" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -5421,7 +5422,7 @@ GINGER TEA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "MATCHA  LIMENADE"
+		Var NameDrink = "Matcha  Limenade"
 		Var NameDrinkTH = "ชาเขียวญี่ปุ่นมะนาว  "
 		Var DrinkDescriptionTH = "ชาเชียว มะนาว "
 		Var DrinkDescription = "Matcha, Limenade, Water"
@ -5517,8 +5518,8 @@ GINGER TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "MATCHA 
+	<Value> "Matcha 
-LIMENADE" </Value>
+Limenade" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -5678,7 +5679,7 @@ LIMENADE" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "MATCHA"
+		Var NameDrink = "Matcha"
 		Var NameDrinkTH = "ชาเขียวญี่ปุ่น "
 		Var DrinkDescriptionTH = "ชาเชียว และน้ำ"
 		Var DrinkDescription = "Matcha & Water "
@ -5773,7 +5774,7 @@ LIMENADE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "MATCHA" </Value>
+	<Value> "Matcha" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -5933,7 +5934,7 @@ LIMENADE" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "MATCHA  LIMENADE"
+		Var NameDrink = "Matcha  Limenade"
 		Var NameDrinkTH = "ชาเขียวญี่ปุ่นมะนาว  "
 		Var DrinkDescriptionTH = "ชาเชียว น้ำ มะนาว  "
 		Var DrinkDescription = "Matcha, Limenade, Water"
@ -6029,8 +6030,8 @@ LIMENADE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "MATCHA 
+	<Value> "Matcha 
-LIMENADE" </Value>
+Limenade" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -6190,7 +6191,7 @@ LIMENADE" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "JASMINE TEA"
+		Var NameDrink = "Jasmine Tea"
 		Var NameDrinkTH = "ชามะลิ"
 		Var DrinkDescriptionTH = "ชามะลิ น้ำ "
 		Var DrinkDescription = "Jasmine Tea ,Water"
@ -6285,7 +6286,7 @@ LIMENADE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "JASMINE TEA" </Value>
+	<Value> "Jasmine Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -6445,7 +6446,7 @@ LIMENADE" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "JASMINE MILK TEA"
+		Var NameDrink = "Jasmine Milk Tea"
 		Var NameDrinkTH = "ชานมมะลิ"
 		Var DrinkDescriptionTH = "ชามะลิ และนม"
 		Var DrinkDescription = "Jasmine Tea & Milk"
@ -6540,7 +6541,7 @@ LIMENADE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "JASMINE MILK TEA" </Value>
+	<Value> "Jasmine Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -6700,7 +6701,7 @@ LIMENADE" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = " MATCHA LATTE MINT"
+		Var NameDrink = "Matcha Latte Mint"
 		Var NameDrinkTH = "มัทฉะลาเต้มินต์"
 		Var DrinkDescriptionTH = "ชาเขียวมัทฉะ มินต์ และนมอุ่น"
 		Var DrinkDescription = "Matcha, Mint &Milk"
@ -6795,7 +6796,8 @@ LIMENADE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> " MATCHA LATTE MINT" </Value>
+	<Value> "Matcha Latte
 Mint" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -6955,7 +6957,7 @@ LIMENADE" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "PEACH TEA"
+		Var NameDrink = "Peach Tea"
 		Var NameDrinkTH = "ชาพีช"
 		Var DrinkDescriptionTH = "ชาไทย และพีช"
 		Var DrinkDescription = "Thai Tea, Peach & Water"
@ -7050,7 +7052,7 @@ LIMENADE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "PEACH TEA" </Value>
+	<Value> "Peach Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -7210,7 +7212,7 @@ LIMENADE" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "PEACH JASMINE TEA"
+		Var NameDrink = "Peach Jasmine Tea"
 		Var NameDrinkTH = "ชามะลิพีช"
 		Var DrinkDescriptionTH = "ชามะลิ และพีช"
 		Var DrinkDescription = "Jasmine Tea, Peach &Milk"
@ -7305,7 +7307,7 @@ LIMENADE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "PEACH JASMINE TEA" </Value>
+	<Value> "Peach Jasmine Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -8980,7 +8982,7 @@ Water" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "CHRYSANTHS TEA"
+		Var NameDrink = "Chrysanthis Tea"
 		Var NameDrinkTH = "เก็กฮวย "
 		Var DrinkDescriptionTH = "น้ำเก๊กฮวย น้ำตาล"
 		Var DrinkDescription = "Chrysanthemum & Water "
@ -9075,7 +9077,7 @@ Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "CHRYSANTHS TEA" </Value>
+	<Value> "Chrysanthis Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -9235,7 +9237,7 @@ Water" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "BROWN SUGAR   TEA"
+		Var NameDrink = "Brown Sugar   Tea"
 		Var NameDrinkTH = "ชาบราวน์ชูการ์ "
 		Var DrinkDescriptionTH = "ชาไทย น้ำตาลแดง  นม  "
 		Var DrinkDescription = "Thai tea, Milk, Kokuto"
@ -9331,8 +9333,8 @@ Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "BROWN SUGAR  
+	<Value> "Brown Sugar  
-TEA" </Value>
+Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -9492,7 +9494,7 @@ TEA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "LYCHEE TEA"
+		Var NameDrink = "Lychee Tea"
 		Var NameDrinkTH = "ชาลิ้นจี่ "
 		Var DrinkDescriptionTH = "ชาไทย ลิ้นจี่  "
 		Var DrinkDescription = "Thai tea, Lychee, Sugar, Water"
@ -9587,7 +9589,7 @@ TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "LYCHEE TEA" </Value>
+	<Value> "Lychee Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -9747,7 +9749,7 @@ TEA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "LYCHEE TEA"
+		Var NameDrink = "Lychee Tea"
 		Var NameDrinkTH = "ชาลิ้นจี่ "
 		Var DrinkDescriptionTH = "ชาไทย ลิ้นจี่"
 		Var DrinkDescription = "Thai tea, Lychee, Sugar, Water"
@ -9842,7 +9844,7 @@ TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "LYCHEE TEA" </Value>
+	<Value> "Lychee Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -10002,7 +10004,7 @@ TEA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "STRAWBERRY TEA"
+		Var NameDrink = "Strawberry Tea"
 		Var NameDrinkTH = "ชาสตอเบอร์รี่ "
 		Var DrinkDescriptionTH = "ชาไทย สตอเบอร์รี่   "
 		Var DrinkDescription = "Thai tea, Strawberry,  Water"
@ -10098,7 +10100,7 @@ TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "STRAWBERRY TEA" </Value>
+	<Value> "Strawberry Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -10259,7 +10261,7 @@ Water" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "PLUM TEA"
+		Var NameDrink = "Plum Tea"
 		Var NameDrinkTH = "ชาบ๊วย "
 		Var DrinkDescriptionTH = "ชาไทย บ๊วย"
 		Var DrinkDescription = "Thai tea, Ume, Water"
@ -10354,7 +10356,7 @@ Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "PLUM TEA" </Value>
+	<Value> "Plum Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -10514,7 +10516,7 @@ Water" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "THAI TEA"
+		Var NameDrink = "Thai Tea"
 		Var NameDrinkTH = "ชาดำ "
 		Var DrinkDescriptionTH = "ชาไทย น้ำ  "
 		Var DrinkDescription = "Thai tea, Water, & Ice"
@ -10609,7 +10611,7 @@ Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "THAI TEA" </Value>
+	<Value> "Thai Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -10769,7 +10771,7 @@ Water" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "THAI TEA  LIMENADE"
+		Var NameDrink = "Thai Tea  Limenade"
 		Var NameDrinkTH = "ชาดำมะนาว"
 		Var DrinkDescriptionTH = "ชาไทย น้ำ มะนาว  "
 		Var DrinkDescription = "Thai tea, Limenade, Water"
@ -10864,8 +10866,8 @@ Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "THAI TEA 
+	<Value> "Thai Tea 
-LIMENADE" </Value>
+Limenade" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -11025,7 +11027,7 @@ LIMENADE" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "TAIWANESE   BLACK TEA"
+		Var NameDrink = "Taiwanese   Black Tea"
 		Var NameDrinkTH = "ชาดำไต้หวัน"
 		Var DrinkDescriptionTH = "ชาไต้หวัน น้ำ "
 		Var DrinkDescription = "Taiwanese tea, Water"
@ -11120,8 +11122,8 @@ LIMENADE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "TAIWANESE 
+	<Value> "Taiwanese 
- BLACK TEA" </Value>
+ Black Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -11281,7 +11283,7 @@ LIMENADE" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "TAIWANESE  LIME TEA"
+		Var NameDrink = "Taiwanese  Lime Tea"
 		Var NameDrinkTH = "ชาดำไต้หวันมะนาว"
 		Var DrinkDescriptionTH = "ชาไต้หวัน น้ำ มะนาว "
 		Var DrinkDescription = "Taiwanese tea, Limenade,  Water"
@ -11376,8 +11378,8 @@ LIMENADE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "TAIWANESE 
+	<Value> "Taiwanese 
-LIME TEA" </Value>
+Lime Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -11538,7 +11540,7 @@ Water" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "YUZU TEA"
+		Var NameDrink = "Yuzu Tea"
 		Var NameDrinkTH = "ชายูซุ"
 		Var DrinkDescriptionTH = "ชาไต้หวัน ยูซุ"
 		Var DrinkDescription = "Yuzu, Taiwanese tea, Water"
@ -11633,7 +11635,7 @@ Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "YUZU TEA" </Value>
+	<Value> "Yuzu Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>