diff --git a/image/bn_eng_lang.png b/image/bn_eng_lang.png
new file mode 100644
index 00000000..f9fd47dc
Binary files /dev/null and b/image/bn_eng_lang.png differ
diff --git a/image/bn_eng_lang_press.png b/image/bn_eng_lang_press.png
new file mode 100644
index 00000000..b3011c6f
Binary files /dev/null and b/image/bn_eng_lang_press.png differ
diff --git a/image/bn_thai_lang.png b/image/bn_thai_lang.png
new file mode 100644
index 00000000..43690179
Binary files /dev/null and b/image/bn_thai_lang.png differ
diff --git a/image/bn_thai_lang_press.png b/image/bn_thai_lang_press.png
new file mode 100644
index 00000000..e9f1cd79
Binary files /dev/null and b/image/bn_thai_lang_press.png differ
diff --git a/image/page2/text1.png b/image/page2/text1.png
index 15f707fd..d020dac6 100644
Binary files a/image/page2/text1.png and b/image/page2/text1.png differ
diff --git a/image/page2/text2.png b/image/page2/text2.png
index 7a97f3aa..5e0ece26 100644
Binary files a/image/page2/text2.png and b/image/page2/text2.png differ
diff --git a/image/page2_en/page2/text1.png b/image/page2_en/page2/text1.png
index 87a507dc..ae3420f9 100644
Binary files a/image/page2_en/page2/text1.png and b/image/page2_en/page2/text1.png differ
diff --git a/image/page2_en/page2/text2.png b/image/page2_en/page2/text2.png
index 71597e5a..a5b4ee29 100644
Binary files a/image/page2_en/page2/text2.png and b/image/page2_en/page2/text2.png differ
diff --git a/xml/menu_gen.py b/xml/menu_gen.py
index 4a37c118..96a4f595 100644
--- a/xml/menu_gen.py
+++ b/xml/menu_gen.py
@@ -28,9 +28,10 @@
       out_xml( '\t<EventOnClick> \r\n')
   	
       out_xml( '\t\tVar SelectDrink = "'+ product_code[i] +'"\r\n')
-      out_xml( '\t\tVar NameDrink = $' + product_code[i] + '.Name2\r\n')
+      out_xml( '\t\tVar NameDrink = $' + product_code[i] + '.NameE\r\n')
       out_xml( '\t\tVar NameDrinkTH = $' + product_code[i] + '.Name\r\n')
-      out_xml( '\t\tVar DrinkDescription = $' + product_code[i] + '.description\r\n')
+      out_xml( '\t\tVar DrinkDescriptionTH = $' + product_code[i] + '.description\r\n')
+      out_xml( '\t\tVar DrinkDescription = $' + product_code[i] + '.descriptionE\r\n')
       out_xml( '\t\tVar PriceDrink = $' + product_code[i] + '.Price\r\n')
       out_xml( '\t\tVar PictureDrink = "' + default_dir2 + '/' + bt_pic[i].replace('#','n') + '"\r\n')
       out_xml( '\t\tTopping "Load" SelectDrink\r\n')
diff --git a/xml/menu_head.py b/xml/menu_head.py
index 7f834ce9..ac73237a 100644
--- a/xml/menu_head.py
+++ b/xml/menu_head.py
@@ -1,5 +1,5 @@
  
- RoadShow = True
+ RoadShow = False
 
  default_dir = 'ROOT/taobin_project/image/page_drink/'
  default_dir2 = 'ROOT/taobin_project/image/page_drink_select/'
diff --git a/xml/page_board.xml b/xml/page_board.xml
index 4feab857..66478156 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -33,7 +33,7 @@
 
 	Var countClick = 0
 
-	Var RoadShow = "true"
+	Var RoadShow = "false"
 	Var IgnorePoint = "true"
 
 	Var CountDownShowButton = 30
diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml
index 069b92f3..2015b596 100644
--- a/xml/page_catalog.xml
+++ b/xml/page_catalog.xml
@@ -18,7 +18,17 @@
 	; Clear value
 	Topping "clear" "-"
 
-	Var pageImage = "ROOT/taobin_project/image/page2"
+	If show_eng = "true" Then 
+		Var pageImage = "ROOT/taobin_project/image/page2_en/page2"
+		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+
+	Else
+		Var pageImage = "ROOT/taobin_project/image/page2"
+		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+	EndIf
+
 
 </EventOpen>
 <Timeout> 1000 </Timeout>
@@ -80,27 +90,28 @@
 <Button>
 <X> 990 </X>
 <Y> 438 </Y>
-<Filename> "ROOT/taobin_project/image/page2/bn_eng_lang.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page2/bn_eng_lang.png" </FilenamePress>
+<Filename> show_btn </Filename>
+<FilenamePress> show_btp  </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	; eng
+	If show_eng = "true" Then 
+		Var show_eng = "false"
+	Else
+		Var show_eng = "true"
+	EndIf
+	Open CurrentXMLFileName2
 </EventClick>
 </Button>
 
 
-<Image>
-<X> 427 </X>
-<Y> 591 </Y>
-<Filename> "ROOT/taobin_project/image/page2/text2.png" </Filename>
-</Image>
 
 
 <Image>
-<X> 166 </X>
-<Y> 679 </Y>
-<Filename> "ROOT/taobin_project/image/page2/text1.png" </Filename>
+<X> 70 </X>
+<Y> 583 </Y>
+<Filename> Var(pageImage + "/text1.png")  </Filename>
 </Image>
 
 
@@ -109,8 +120,8 @@
 <Button>
 <X> 205 </X>
 <Y> 849 </Y>
-<Filename> "ROOT/taobin_project/image/page2/bn_diy.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page2/bp_diy.png" </FilenamePress>
+<Filename> Var(pageImage + "/bn_diy.png")   </Filename>
+<FilenamePress> Var(pageImage + "/bp_diy.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -136,8 +147,8 @@
 <Button>
 <X> 205 </X>
 <Y> 1191 </Y>
-<Filename> "ROOT/taobin_project/image/page2/bn_tea.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page2/bp_tea.png" </FilenamePress>
+<Filename> Var(pageImage + "/bn_tea.png") </Filename>
+<FilenamePress>  Var(pageImage + "/bp_tea.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -148,8 +159,8 @@
 <Button>
 <X> 579 </X>
 <Y> 1191 </Y>
-<Filename> "ROOT/taobin_project/image/page2/bn_cho_caramel.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page2/bp_cho_caramel.png" </FilenamePress>
+<Filename> Var(pageImage + "/bn_cho_caramel.png") </Filename>
+<FilenamePress> Var(pageImage + "/bp_cho_caramel.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -162,8 +173,8 @@
 <Button>
 <X> 205 </X>
 <Y> 1533 </Y>
-<Filename> "ROOT/taobin_project/image/page2/bn_fruit.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page2/bp_fruit.png" </FilenamePress>
+<Filename> Var(pageImage + "/bn_fruit.png") </Filename>
+<FilenamePress> Var(pageImage + "/bp_fruit.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -174,8 +185,8 @@
 <Button>
 <X> 579 </X>
 <Y> 1533 </Y>
-<Filename> "ROOT/taobin_project/image/page2/bn_soda.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page2/bp_soda.png" </FilenamePress>
+<Filename> Var(pageImage + "/bn_soda.png") </Filename>
+<FilenamePress> Var(pageImage + "/bp_soda.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -198,8 +209,8 @@
 <Button>
 <X> 392 </X>
 <Y> 424 </Y>
-<Filename> "ROOT/taobin_project/image/page2/bn_main_page_member.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page2/bp_main_page_member.png" </FilenamePress>
+<Filename>  Var(pageImage + "/bn_main_page_member.png") </Filename>
+<FilenamePress> Var(pageImage + "/bp_main_page_member.png")  </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -212,8 +223,8 @@
 <Button>
 <X> 696 </X>
 <Y> 424 </Y>
-<Filename> "ROOT/taobin_project/image/page2/bn_main_page_topup.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page2/bp_main_page_topup.png" </FilenamePress>
+<Filename> Var(pageImage + "/bn_main_page_topup.png") </Filename>
+<FilenamePress> Var(pageImage + "/bp_main_page_topup.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
diff --git a/xml/page_catalog_choose_drink1.xml b/xml/page_catalog_choose_drink1.xml
index 910eb5cf..85c8e8e2 100644
--- a/xml/page_catalog_choose_drink1.xml
+++ b/xml/page_catalog_choose_drink1.xml
@@ -169,9 +169,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0006"
-		Var NameDrink = $11-99-02-0006.Name2
+		Var NameDrink = $11-99-02-0006.NameE
 		Var NameDrinkTH = $11-99-02-0006.Name
-		Var DrinkDescription = $11-99-02-0006.description
+		Var DrinkDescriptionTH = $11-99-02-0006.description
+		Var DrinkDescription = $11-99-02-0006.descriptionE
 		Var PriceDrink = $11-99-02-0006.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_epsresso.png"
 		Topping "Load" SelectDrink
@@ -192,9 +193,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0001"
-		Var NameDrink = $11-99-02-0001.Name2
+		Var NameDrink = $11-99-02-0001.NameE
 		Var NameDrinkTH = $11-99-02-0001.Name
-		Var DrinkDescription = $11-99-02-0001.description
+		Var DrinkDescriptionTH = $11-99-02-0001.description
+		Var DrinkDescription = $11-99-02-0001.descriptionE
 		Var PriceDrink = $11-99-02-0001.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_lattle.png"
 		Topping "Load" SelectDrink
@@ -215,9 +217,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0003"
-		Var NameDrink = $11-99-02-0003.Name2
+		Var NameDrink = $11-99-02-0003.NameE
 		Var NameDrinkTH = $11-99-02-0003.Name
-		Var DrinkDescription = $11-99-02-0003.description
+		Var DrinkDescriptionTH = $11-99-02-0003.description
+		Var DrinkDescription = $11-99-02-0003.descriptionE
 		Var PriceDrink = $11-99-02-0003.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_america_no.png"
 		Topping "Load" SelectDrink
@@ -238,9 +241,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0007"
-		Var NameDrink = $11-99-02-0007.Name2
+		Var NameDrink = $11-99-02-0007.NameE
 		Var NameDrinkTH = $11-99-02-0007.Name
-		Var DrinkDescription = $11-99-02-0007.description
+		Var DrinkDescriptionTH = $11-99-02-0007.description
+		Var DrinkDescription = $11-99-02-0007.descriptionE
 		Var PriceDrink = $11-99-02-0007.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_mocha.png"
 		Topping "Load" SelectDrink
@@ -261,9 +265,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0002"
-		Var NameDrink = $11-99-02-0002.Name2
+		Var NameDrink = $11-99-02-0002.NameE
 		Var NameDrinkTH = $11-99-02-0002.Name
-		Var DrinkDescription = $11-99-02-0002.description
+		Var DrinkDescriptionTH = $11-99-02-0002.description
+		Var DrinkDescription = $11-99-02-0002.descriptionE
 		Var PriceDrink = $11-99-02-0002.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_cappuccino.png"
 		Topping "Load" SelectDrink
@@ -284,9 +289,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-01-0004"
-		Var NameDrink = $11-99-01-0004.Name2
+		Var NameDrink = $11-99-01-0004.NameE
 		Var NameDrinkTH = $11-99-01-0004.Name
-		Var DrinkDescription = $11-99-01-0004.description
+		Var DrinkDescriptionTH = $11-99-01-0004.description
+		Var DrinkDescription = $11-99-01-0004.descriptionE
 		Var PriceDrink = $11-99-01-0004.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_hot_america_no.png"
 		Topping "Load" SelectDrink
@@ -307,9 +313,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0020"
-		Var NameDrink = $11-99-02-0020.Name2
+		Var NameDrink = $11-99-02-0020.NameE
 		Var NameDrinkTH = $11-99-02-0020.Name
-		Var DrinkDescription = $11-99-02-0020.description
+		Var DrinkDescriptionTH = $11-99-02-0020.description
+		Var DrinkDescription = $11-99-02-0020.descriptionE
 		Var PriceDrink = $11-99-02-0020.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_sala.png"
 		Topping "Load" SelectDrink
@@ -330,9 +337,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0017"
-		Var NameDrink = $11-99-02-0017.Name2
+		Var NameDrink = $11-99-02-0017.NameE
 		Var NameDrinkTH = $11-99-02-0017.Name
-		Var DrinkDescription = $11-99-02-0017.description
+		Var DrinkDescriptionTH = $11-99-02-0017.description
+		Var DrinkDescription = $11-99-02-0017.descriptionE
 		Var PriceDrink = $11-99-02-0017.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_lemonade_soda.png"
 		Topping "Load" SelectDrink
@@ -353,9 +361,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-01-0017"
-		Var NameDrink = $11-99-01-0017.Name2
+		Var NameDrink = $11-99-01-0017.NameE
 		Var NameDrinkTH = $11-99-01-0017.Name
-		Var DrinkDescription = $11-99-01-0017.description
+		Var DrinkDescriptionTH = $11-99-01-0017.description
+		Var DrinkDescription = $11-99-01-0017.descriptionE
 		Var PriceDrink = $11-99-01-0017.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_hot_milk_caramel.png"
 		Topping "Load" SelectDrink
@@ -376,9 +385,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0018"
-		Var NameDrink = $11-99-02-0018.Name2
+		Var NameDrink = $11-99-02-0018.NameE
 		Var NameDrinkTH = $11-99-02-0018.Name
-		Var DrinkDescription = $11-99-02-0018.description
+		Var DrinkDescriptionTH = $11-99-02-0018.description
+		Var DrinkDescription = $11-99-02-0018.descriptionE
 		Var PriceDrink = $11-99-02-0018.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_cola.png"
 		Topping "Load" SelectDrink
@@ -388,15 +398,24 @@
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0006.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
@@ -417,15 +436,24 @@
 	<Value> $11-99-02-0006.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0001.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
@@ -446,15 +474,24 @@
 	<Value> $11-99-02-0001.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0003.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
@@ -475,15 +512,24 @@
 	<Value> $11-99-02-0003.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0007.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
@@ -504,15 +550,24 @@
 	<Value> $11-99-02-0007.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0002.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 596 </Y>
@@ -533,15 +588,24 @@
 	<Value> $11-99-02-0002.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-01-0004.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 596 </Y>
@@ -562,15 +626,24 @@
 	<Value> $11-99-01-0004.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0020.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 596 </Y>
@@ -591,15 +664,24 @@
 	<Value> $11-99-02-0020.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0017.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 596 </Y>
@@ -620,15 +702,24 @@
 	<Value> $11-99-02-0017.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-01-0017.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 924 </Y>
@@ -649,15 +740,24 @@
 	<Value> $11-99-01-0017.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0018.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 924 </Y>
diff --git a/xml/page_catalog_choose_drink2.xml b/xml/page_catalog_choose_drink2.xml
index 99077027..07d93f03 100644
--- a/xml/page_catalog_choose_drink2.xml
+++ b/xml/page_catalog_choose_drink2.xml
@@ -167,9 +167,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-01-0010"
-		Var NameDrink = $11-99-01-0010.Name2
+		Var NameDrink = $11-99-01-0010.NameE
 		Var NameDrinkTH = $11-99-01-0010.Name
-		Var DrinkDescription = $11-99-01-0010.description
+		Var DrinkDescriptionTH = $11-99-01-0010.description
+		Var DrinkDescription = $11-99-01-0010.descriptionE
 		Var PriceDrink = $11-99-01-0010.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_hot_espresso.png"
 		Topping "Load" SelectDrink
@@ -190,9 +191,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-01-0001"
-		Var NameDrink = $11-99-01-0001.Name2
+		Var NameDrink = $11-99-01-0001.NameE
 		Var NameDrinkTH = $11-99-01-0001.Name
-		Var DrinkDescription = $11-99-01-0001.description
+		Var DrinkDescriptionTH = $11-99-01-0001.description
+		Var DrinkDescription = $11-99-01-0001.descriptionE
 		Var PriceDrink = $11-99-01-0001.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_hot_double_espresso.png"
 		Topping "Load" SelectDrink
@@ -213,9 +215,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-01-0002"
-		Var NameDrink = $11-99-01-0002.Name2
+		Var NameDrink = $11-99-01-0002.NameE
 		Var NameDrinkTH = $11-99-01-0002.Name
-		Var DrinkDescription = $11-99-01-0002.description
+		Var DrinkDescriptionTH = $11-99-01-0002.description
+		Var DrinkDescription = $11-99-01-0002.descriptionE
 		Var PriceDrink = $11-99-01-0002.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_hot_latte.png"
 		Topping "Load" SelectDrink
@@ -236,9 +239,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-01-0004"
-		Var NameDrink = $11-99-01-0004.Name2
+		Var NameDrink = $11-99-01-0004.NameE
 		Var NameDrinkTH = $11-99-01-0004.Name
-		Var DrinkDescription = $11-99-01-0004.description
+		Var DrinkDescriptionTH = $11-99-01-0004.description
+		Var DrinkDescription = $11-99-01-0004.descriptionE
 		Var PriceDrink = $11-99-01-0004.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_hot_america_no.png"
 		Topping "Load" SelectDrink
@@ -259,9 +263,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-01-0007"
-		Var NameDrink = $11-99-01-0007.Name2
+		Var NameDrink = $11-99-01-0007.NameE
 		Var NameDrinkTH = $11-99-01-0007.Name
-		Var DrinkDescription = $11-99-01-0007.description
+		Var DrinkDescriptionTH = $11-99-01-0007.description
+		Var DrinkDescription = $11-99-01-0007.descriptionE
 		Var PriceDrink = $11-99-01-0007.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_hot_mocha.png"
 		Topping "Load" SelectDrink
@@ -282,9 +287,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-01-0017"
-		Var NameDrink = $11-99-01-0017.Name2
+		Var NameDrink = $11-99-01-0017.NameE
 		Var NameDrinkTH = $11-99-01-0017.Name
-		Var DrinkDescription = $11-99-01-0017.description
+		Var DrinkDescriptionTH = $11-99-01-0017.description
+		Var DrinkDescription = $11-99-01-0017.descriptionE
 		Var PriceDrink = $11-99-01-0017.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_hot_caramel_macchiato.png"
 		Topping "Load" SelectDrink
@@ -305,9 +311,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-01-0003"
-		Var NameDrink = $11-99-01-0003.Name2
+		Var NameDrink = $11-99-01-0003.NameE
 		Var NameDrinkTH = $11-99-01-0003.Name
-		Var DrinkDescription = $11-99-01-0003.description
+		Var DrinkDescriptionTH = $11-99-01-0003.description
+		Var DrinkDescription = $11-99-01-0003.descriptionE
 		Var PriceDrink = $11-99-01-0003.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_hot_cappuccino.png"
 		Topping "Load" SelectDrink
@@ -328,9 +335,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0006"
-		Var NameDrink = $11-99-02-0006.Name2
+		Var NameDrink = $11-99-02-0006.NameE
 		Var NameDrinkTH = $11-99-02-0006.Name
-		Var DrinkDescription = $11-99-02-0006.description
+		Var DrinkDescriptionTH = $11-99-02-0006.description
+		Var DrinkDescription = $11-99-02-0006.descriptionE
 		Var PriceDrink = $11-99-02-0006.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_epsresso.png"
 		Topping "Load" SelectDrink
@@ -351,9 +359,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0024"
-		Var NameDrink = $11-99-02-0024.Name2
+		Var NameDrink = $11-99-02-0024.NameE
 		Var NameDrinkTH = $11-99-02-0024.Name
-		Var DrinkDescription = $11-99-02-0024.description
+		Var DrinkDescriptionTH = $11-99-02-0024.description
+		Var DrinkDescription = $11-99-02-0024.descriptionE
 		Var PriceDrink = $11-99-02-0024.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_thai_black_coffee.png"
 		Topping "Load" SelectDrink
@@ -374,9 +383,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0001"
-		Var NameDrink = $11-99-02-0001.Name2
+		Var NameDrink = $11-99-02-0001.NameE
 		Var NameDrinkTH = $11-99-02-0001.Name
-		Var DrinkDescription = $11-99-02-0001.description
+		Var DrinkDescriptionTH = $11-99-02-0001.description
+		Var DrinkDescription = $11-99-02-0001.descriptionE
 		Var PriceDrink = $11-99-02-0001.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_lattle.png"
 		Topping "Load" SelectDrink
@@ -397,9 +407,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0003"
-		Var NameDrink = $11-99-02-0003.Name2
+		Var NameDrink = $11-99-02-0003.NameE
 		Var NameDrinkTH = $11-99-02-0003.Name
-		Var DrinkDescription = $11-99-02-0003.description
+		Var DrinkDescriptionTH = $11-99-02-0003.description
+		Var DrinkDescription = $11-99-02-0003.descriptionE
 		Var PriceDrink = $11-99-02-0003.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_america_no.png"
 		Topping "Load" SelectDrink
@@ -420,9 +431,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0007"
-		Var NameDrink = $11-99-02-0007.Name2
+		Var NameDrink = $11-99-02-0007.NameE
 		Var NameDrinkTH = $11-99-02-0007.Name
-		Var DrinkDescription = $11-99-02-0007.description
+		Var DrinkDescriptionTH = $11-99-02-0007.description
+		Var DrinkDescription = $11-99-02-0007.descriptionE
 		Var PriceDrink = $11-99-02-0007.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_mocha.png"
 		Topping "Load" SelectDrink
@@ -443,9 +455,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0030"
-		Var NameDrink = $11-99-02-0030.Name2
+		Var NameDrink = $11-99-02-0030.NameE
 		Var NameDrinkTH = $11-99-02-0030.Name
-		Var DrinkDescription = $11-99-02-0030.description
+		Var DrinkDescriptionTH = $11-99-02-0030.description
+		Var DrinkDescription = $11-99-02-0030.descriptionE
 		Var PriceDrink = $11-99-02-0030.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_caramel_macchiato.png"
 		Topping "Load" SelectDrink
@@ -466,9 +479,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0002"
-		Var NameDrink = $11-99-02-0002.Name2
+		Var NameDrink = $11-99-02-0002.NameE
 		Var NameDrinkTH = $11-99-02-0002.Name
-		Var DrinkDescription = $11-99-02-0002.description
+		Var DrinkDescriptionTH = $11-99-02-0002.description
+		Var DrinkDescription = $11-99-02-0002.descriptionE
 		Var PriceDrink = $11-99-02-0002.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_cappuccino.png"
 		Topping "Load" SelectDrink
@@ -478,15 +492,24 @@
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-01-0010.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
@@ -507,15 +530,24 @@
 	<Value> $11-99-01-0010.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-01-0001.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
@@ -536,15 +568,24 @@
 	<Value> $11-99-01-0001.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-01-0002.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
@@ -565,15 +606,24 @@
 	<Value> $11-99-01-0002.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-01-0004.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
@@ -594,15 +644,24 @@
 	<Value> $11-99-01-0004.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-01-0007.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 596 </Y>
@@ -623,15 +682,24 @@
 	<Value> $11-99-01-0007.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-01-0017.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 596 </Y>
@@ -652,15 +720,24 @@
 	<Value> $11-99-01-0017.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-01-0003.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 596 </Y>
@@ -681,15 +758,24 @@
 	<Value> $11-99-01-0003.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0006.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 596 </Y>
@@ -710,15 +796,24 @@
 	<Value> $11-99-02-0006.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0024.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 924 </Y>
@@ -739,15 +834,24 @@
 	<Value> $11-99-02-0024.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0001.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 924 </Y>
@@ -768,15 +872,24 @@
 	<Value> $11-99-02-0001.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0003.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 924 </Y>
@@ -797,15 +910,24 @@
 	<Value> $11-99-02-0003.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0007.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 924 </Y>
@@ -826,15 +948,24 @@
 	<Value> $11-99-02-0007.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 1050 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0030.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 1050 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 1252 </Y>
@@ -855,15 +986,24 @@
 	<Value> $11-99-02-0030.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 1050 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0002.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 1050 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 1252 </Y>
diff --git a/xml/page_catalog_choose_drink2_ext.xml b/xml/page_catalog_choose_drink2_ext.xml
index 57f604b0..0864a311 100644
--- a/xml/page_catalog_choose_drink2_ext.xml
+++ b/xml/page_catalog_choose_drink2_ext.xml
@@ -168,9 +168,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-01-0010"
-		Var NameDrink = $11-99-01-0010.Name2
+		Var NameDrink = $11-99-01-0010.NameE
 		Var NameDrinkTH = $11-99-01-0010.Name
-		Var DrinkDescription = $11-99-01-0010.description
+		Var DrinkDescriptionTH = $11-99-01-0010.description
+		Var DrinkDescription = $11-99-01-0010.descriptionE
 		Var PriceDrink = $11-99-01-0010.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_hot_espresso.png"
 		Topping "Load" SelectDrink
@@ -191,9 +192,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-01-0001"
-		Var NameDrink = $11-99-01-0001.Name2
+		Var NameDrink = $11-99-01-0001.NameE
 		Var NameDrinkTH = $11-99-01-0001.Name
-		Var DrinkDescription = $11-99-01-0001.description
+		Var DrinkDescriptionTH = $11-99-01-0001.description
+		Var DrinkDescription = $11-99-01-0001.descriptionE
 		Var PriceDrink = $11-99-01-0001.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_hot_double_espresso.png"
 		Topping "Load" SelectDrink
@@ -214,9 +216,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-01-0002"
-		Var NameDrink = $11-99-01-0002.Name2
+		Var NameDrink = $11-99-01-0002.NameE
 		Var NameDrinkTH = $11-99-01-0002.Name
-		Var DrinkDescription = $11-99-01-0002.description
+		Var DrinkDescriptionTH = $11-99-01-0002.description
+		Var DrinkDescription = $11-99-01-0002.descriptionE
 		Var PriceDrink = $11-99-01-0002.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_hot_latte.png"
 		Topping "Load" SelectDrink
@@ -237,9 +240,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-01-0004"
-		Var NameDrink = $11-99-01-0004.Name2
+		Var NameDrink = $11-99-01-0004.NameE
 		Var NameDrinkTH = $11-99-01-0004.Name
-		Var DrinkDescription = $11-99-01-0004.description
+		Var DrinkDescriptionTH = $11-99-01-0004.description
+		Var DrinkDescription = $11-99-01-0004.descriptionE
 		Var PriceDrink = $11-99-01-0004.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_hot_america_no.png"
 		Topping "Load" SelectDrink
@@ -260,9 +264,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-01-0007"
-		Var NameDrink = $11-99-01-0007.Name2
+		Var NameDrink = $11-99-01-0007.NameE
 		Var NameDrinkTH = $11-99-01-0007.Name
-		Var DrinkDescription = $11-99-01-0007.description
+		Var DrinkDescriptionTH = $11-99-01-0007.description
+		Var DrinkDescription = $11-99-01-0007.descriptionE
 		Var PriceDrink = $11-99-01-0007.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_hot_mocha.png"
 		Topping "Load" SelectDrink
@@ -283,9 +288,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-01-0017"
-		Var NameDrink = $11-99-01-0017.Name2
+		Var NameDrink = $11-99-01-0017.NameE
 		Var NameDrinkTH = $11-99-01-0017.Name
-		Var DrinkDescription = $11-99-01-0017.description
+		Var DrinkDescriptionTH = $11-99-01-0017.description
+		Var DrinkDescription = $11-99-01-0017.descriptionE
 		Var PriceDrink = $11-99-01-0017.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_hot_caramel_macchiato.png"
 		Topping "Load" SelectDrink
@@ -306,9 +312,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-01-0003"
-		Var NameDrink = $11-99-01-0003.Name2
+		Var NameDrink = $11-99-01-0003.NameE
 		Var NameDrinkTH = $11-99-01-0003.Name
-		Var DrinkDescription = $11-99-01-0003.description
+		Var DrinkDescriptionTH = $11-99-01-0003.description
+		Var DrinkDescription = $11-99-01-0003.descriptionE
 		Var PriceDrink = $11-99-01-0003.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_hot_cappuccino.png"
 		Topping "Load" SelectDrink
@@ -329,9 +336,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0006"
-		Var NameDrink = $11-99-02-0006.Name2
+		Var NameDrink = $11-99-02-0006.NameE
 		Var NameDrinkTH = $11-99-02-0006.Name
-		Var DrinkDescription = $11-99-02-0006.description
+		Var DrinkDescriptionTH = $11-99-02-0006.description
+		Var DrinkDescription = $11-99-02-0006.descriptionE
 		Var PriceDrink = $11-99-02-0006.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_epsresso.png"
 		Topping "Load" SelectDrink
@@ -352,9 +360,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0024"
-		Var NameDrink = $11-99-02-0024.Name2
+		Var NameDrink = $11-99-02-0024.NameE
 		Var NameDrinkTH = $11-99-02-0024.Name
-		Var DrinkDescription = $11-99-02-0024.description
+		Var DrinkDescriptionTH = $11-99-02-0024.description
+		Var DrinkDescription = $11-99-02-0024.descriptionE
 		Var PriceDrink = $11-99-02-0024.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_thai_black_coffee.png"
 		Topping "Load" SelectDrink
@@ -375,9 +384,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0001"
-		Var NameDrink = $11-99-02-0001.Name2
+		Var NameDrink = $11-99-02-0001.NameE
 		Var NameDrinkTH = $11-99-02-0001.Name
-		Var DrinkDescription = $11-99-02-0001.description
+		Var DrinkDescriptionTH = $11-99-02-0001.description
+		Var DrinkDescription = $11-99-02-0001.descriptionE
 		Var PriceDrink = $11-99-02-0001.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_lattle.png"
 		Topping "Load" SelectDrink
@@ -398,9 +408,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0003"
-		Var NameDrink = $11-99-02-0003.Name2
+		Var NameDrink = $11-99-02-0003.NameE
 		Var NameDrinkTH = $11-99-02-0003.Name
-		Var DrinkDescription = $11-99-02-0003.description
+		Var DrinkDescriptionTH = $11-99-02-0003.description
+		Var DrinkDescription = $11-99-02-0003.descriptionE
 		Var PriceDrink = $11-99-02-0003.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_america_no.png"
 		Topping "Load" SelectDrink
@@ -421,9 +432,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0006"
-		Var NameDrink = $11-99-02-0006.Name2
+		Var NameDrink = $11-99-02-0006.NameE
 		Var NameDrinkTH = $11-99-02-0006.Name
-		Var DrinkDescription = $11-99-02-0006.description
+		Var DrinkDescriptionTH = $11-99-02-0006.description
+		Var DrinkDescription = $11-99-02-0006.descriptionE
 		Var PriceDrink = $11-99-02-0006.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_epsresso.png"
 		Topping "Load" SelectDrink
@@ -444,9 +456,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0024"
-		Var NameDrink = $11-99-02-0024.Name2
+		Var NameDrink = $11-99-02-0024.NameE
 		Var NameDrinkTH = $11-99-02-0024.Name
-		Var DrinkDescription = $11-99-02-0024.description
+		Var DrinkDescriptionTH = $11-99-02-0024.description
+		Var DrinkDescription = $11-99-02-0024.descriptionE
 		Var PriceDrink = $11-99-02-0024.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_thai_black_coffee.png"
 		Topping "Load" SelectDrink
@@ -467,9 +480,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0001"
-		Var NameDrink = $11-99-02-0001.Name2
+		Var NameDrink = $11-99-02-0001.NameE
 		Var NameDrinkTH = $11-99-02-0001.Name
-		Var DrinkDescription = $11-99-02-0001.description
+		Var DrinkDescriptionTH = $11-99-02-0001.description
+		Var DrinkDescription = $11-99-02-0001.descriptionE
 		Var PriceDrink = $11-99-02-0001.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_lattle.png"
 		Topping "Load" SelectDrink
@@ -490,9 +504,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0003"
-		Var NameDrink = $11-99-02-0003.Name2
+		Var NameDrink = $11-99-02-0003.NameE
 		Var NameDrinkTH = $11-99-02-0003.Name
-		Var DrinkDescription = $11-99-02-0003.description
+		Var DrinkDescriptionTH = $11-99-02-0003.description
+		Var DrinkDescription = $11-99-02-0003.descriptionE
 		Var PriceDrink = $11-99-02-0003.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_america_no.png"
 		Topping "Load" SelectDrink
@@ -513,9 +528,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0007"
-		Var NameDrink = $11-99-02-0007.Name2
+		Var NameDrink = $11-99-02-0007.NameE
 		Var NameDrinkTH = $11-99-02-0007.Name
-		Var DrinkDescription = $11-99-02-0007.description
+		Var DrinkDescriptionTH = $11-99-02-0007.description
+		Var DrinkDescription = $11-99-02-0007.descriptionE
 		Var PriceDrink = $11-99-02-0007.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_mocha.png"
 		Topping "Load" SelectDrink
@@ -536,9 +552,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0030"
-		Var NameDrink = $11-99-02-0030.Name2
+		Var NameDrink = $11-99-02-0030.NameE
 		Var NameDrinkTH = $11-99-02-0030.Name
-		Var DrinkDescription = $11-99-02-0030.description
+		Var DrinkDescriptionTH = $11-99-02-0030.description
+		Var DrinkDescription = $11-99-02-0030.descriptionE
 		Var PriceDrink = $11-99-02-0030.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_caramel_macchiato.png"
 		Topping "Load" SelectDrink
@@ -559,9 +576,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0002"
-		Var NameDrink = $11-99-02-0002.Name2
+		Var NameDrink = $11-99-02-0002.NameE
 		Var NameDrinkTH = $11-99-02-0002.Name
-		Var DrinkDescription = $11-99-02-0002.description
+		Var DrinkDescriptionTH = $11-99-02-0002.description
+		Var DrinkDescription = $11-99-02-0002.descriptionE
 		Var PriceDrink = $11-99-02-0002.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_cappuccino.png"
 		Topping "Load" SelectDrink
@@ -571,15 +589,24 @@
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-01-0010.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
@@ -600,15 +627,24 @@
 	<Value> $11-99-01-0010.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-01-0001.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
@@ -629,15 +665,24 @@
 	<Value> $11-99-01-0001.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-01-0002.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
@@ -658,15 +703,24 @@
 	<Value> $11-99-01-0002.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-01-0004.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
@@ -687,15 +741,24 @@
 	<Value> $11-99-01-0004.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-01-0007.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 596 </Y>
@@ -716,15 +779,24 @@
 	<Value> $11-99-01-0007.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-01-0017.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 596 </Y>
@@ -745,15 +817,24 @@
 	<Value> $11-99-01-0017.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-01-0003.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 596 </Y>
@@ -774,15 +855,24 @@
 	<Value> $11-99-01-0003.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0006.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 596 </Y>
@@ -803,15 +893,24 @@
 	<Value> $11-99-02-0006.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0024.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 924 </Y>
@@ -832,15 +931,24 @@
 	<Value> $11-99-02-0024.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0001.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 924 </Y>
@@ -861,15 +969,24 @@
 	<Value> $11-99-02-0001.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0003.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 924 </Y>
@@ -890,15 +1007,24 @@
 	<Value> $11-99-02-0003.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0006.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 924 </Y>
@@ -919,15 +1045,24 @@
 	<Value> $11-99-02-0006.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 1050 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0024.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 1050 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 1252 </Y>
@@ -948,15 +1083,24 @@
 	<Value> $11-99-02-0024.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 1050 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0001.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 1050 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 1252 </Y>
@@ -977,15 +1121,24 @@
 	<Value> $11-99-02-0001.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 1050 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0003.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 1050 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 1252 </Y>
@@ -1006,15 +1159,24 @@
 	<Value> $11-99-02-0003.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 1050 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0007.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 1050 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 1252 </Y>
@@ -1035,15 +1197,24 @@
 	<Value> $11-99-02-0007.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 1378 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0030.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 1378 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 1580 </Y>
@@ -1064,15 +1235,24 @@
 	<Value> $11-99-02-0030.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 1378 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0002.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 1378 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 1580 </Y>
diff --git a/xml/page_catalog_choose_drink3.xml b/xml/page_catalog_choose_drink3.xml
index ce7b2160..762ae865 100644
--- a/xml/page_catalog_choose_drink3.xml
+++ b/xml/page_catalog_choose_drink3.xml
@@ -169,9 +169,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-01-0014"
-		Var NameDrink = $11-99-01-0014.Name2
+		Var NameDrink = $11-99-01-0014.NameE
 		Var NameDrinkTH = $11-99-01-0014.Name
-		Var DrinkDescription = $11-99-01-0014.description
+		Var DrinkDescriptionTH = $11-99-01-0014.description
+		Var DrinkDescription = $11-99-01-0014.descriptionE
 		Var PriceDrink = $11-99-01-0014.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_hot_ginger_tea.png"
 		Topping "Load" SelectDrink
@@ -192,9 +193,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-01-0012"
-		Var NameDrink = $11-99-01-0012.Name2
+		Var NameDrink = $11-99-01-0012.NameE
 		Var NameDrinkTH = $11-99-01-0012.Name
-		Var DrinkDescription = $11-99-01-0012.description
+		Var DrinkDescriptionTH = $11-99-01-0012.description
+		Var DrinkDescription = $11-99-01-0012.descriptionE
 		Var PriceDrink = $11-99-01-0012.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_hot_lemon_tea.png"
 		Topping "Load" SelectDrink
@@ -215,9 +217,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-01-0011"
-		Var NameDrink = $11-99-01-0011.Name2
+		Var NameDrink = $11-99-01-0011.NameE
 		Var NameDrinkTH = $11-99-01-0011.Name
-		Var DrinkDescription = $11-99-01-0011.description
+		Var DrinkDescriptionTH = $11-99-01-0011.description
+		Var DrinkDescription = $11-99-01-0011.descriptionE
 		Var PriceDrink = $11-99-01-0011.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_hot_taiwan_milk_tea.png"
 		Topping "Load" SelectDrink
@@ -238,9 +241,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0004"
-		Var NameDrink = $11-99-02-0004.Name2
+		Var NameDrink = $11-99-02-0004.NameE
 		Var NameDrinkTH = $11-99-02-0004.Name
-		Var DrinkDescription = $11-99-02-0004.description
+		Var DrinkDescriptionTH = $11-99-02-0004.description
+		Var DrinkDescription = $11-99-02-0004.descriptionE
 		Var PriceDrink = $11-99-02-0004.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_thai_milk_tea.png"
 		Topping "Load" SelectDrink
@@ -261,9 +265,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0014"
-		Var NameDrink = $11-99-02-0014.Name2
+		Var NameDrink = $11-99-02-0014.NameE
 		Var NameDrinkTH = $11-99-02-0014.Name
-		Var DrinkDescription = $11-99-02-0014.description
+		Var DrinkDescriptionTH = $11-99-02-0014.description
+		Var DrinkDescription = $11-99-02-0014.descriptionE
 		Var PriceDrink = $11-99-02-0014.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_coffee_thai_milk_tea.png"
 		Topping "Load" SelectDrink
@@ -284,9 +289,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0010"
-		Var NameDrink = $11-99-02-0010.Name2
+		Var NameDrink = $11-99-02-0010.NameE
 		Var NameDrinkTH = $11-99-02-0010.Name
-		Var DrinkDescription = $11-99-02-0010.description
+		Var DrinkDescriptionTH = $11-99-02-0010.description
+		Var DrinkDescription = $11-99-02-0010.descriptionE
 		Var PriceDrink = $11-99-02-0010.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_taiwan_milk_tea.png"
 		Topping "Load" SelectDrink
@@ -296,15 +302,24 @@
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-01-0014.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
@@ -325,15 +340,24 @@
 	<Value> $11-99-01-0014.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-01-0012.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
@@ -354,15 +378,24 @@
 	<Value> $11-99-01-0012.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-01-0011.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
@@ -383,15 +416,24 @@
 	<Value> $11-99-01-0011.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0004.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
@@ -412,15 +454,24 @@
 	<Value> $11-99-02-0004.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0014.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 596 </Y>
@@ -441,15 +492,24 @@
 	<Value> $11-99-02-0014.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0010.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 596 </Y>
diff --git a/xml/page_catalog_choose_drink4.xml b/xml/page_catalog_choose_drink4.xml
index 7c157195..df11dad5 100644
--- a/xml/page_catalog_choose_drink4.xml
+++ b/xml/page_catalog_choose_drink4.xml
@@ -171,9 +171,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-01-0006"
-		Var NameDrink = $11-99-01-0006.Name2
+		Var NameDrink = $11-99-01-0006.NameE
 		Var NameDrinkTH = $11-99-01-0006.Name
-		Var DrinkDescription = $11-99-01-0006.description
+		Var DrinkDescriptionTH = $11-99-01-0006.description
+		Var DrinkDescription = $11-99-01-0006.descriptionE
 		Var PriceDrink = $11-99-01-0006.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_hot_cocoa.png"
 		Topping "Load" SelectDrink
@@ -194,9 +195,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-01-0017"
-		Var NameDrink = $11-99-01-0017.Name2
+		Var NameDrink = $11-99-01-0017.NameE
 		Var NameDrinkTH = $11-99-01-0017.Name
-		Var DrinkDescription = $11-99-01-0017.description
+		Var DrinkDescriptionTH = $11-99-01-0017.description
+		Var DrinkDescription = $11-99-01-0017.descriptionE
 		Var PriceDrink = $11-99-01-0017.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_hot_milk_caramel.png"
 		Topping "Load" SelectDrink
@@ -217,9 +219,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0005"
-		Var NameDrink = $11-99-02-0005.Name2
+		Var NameDrink = $11-99-02-0005.NameE
 		Var NameDrinkTH = $11-99-02-0005.Name
-		Var DrinkDescription = $11-99-02-0005.description
+		Var DrinkDescriptionTH = $11-99-02-0005.description
+		Var DrinkDescription = $11-99-02-0005.descriptionE
 		Var PriceDrink = $11-99-02-0005.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_cocoa.png"
 		Topping "Load" SelectDrink
@@ -240,9 +243,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0031"
-		Var NameDrink = $11-99-02-0031.Name2
+		Var NameDrink = $11-99-02-0031.NameE
 		Var NameDrinkTH = $11-99-02-0031.Name
-		Var DrinkDescription = $11-99-02-0031.description
+		Var DrinkDescriptionTH = $11-99-02-0031.description
+		Var DrinkDescription = $11-99-02-0031.descriptionE
 		Var PriceDrink = $11-99-02-0031.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_caramel.png"
 		Topping "Load" SelectDrink
@@ -252,15 +256,24 @@
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-01-0006.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
@@ -281,15 +294,24 @@
 	<Value> $11-99-01-0006.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-01-0017.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
@@ -310,15 +332,24 @@
 	<Value> $11-99-01-0017.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0005.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
@@ -339,15 +370,24 @@
 	<Value> $11-99-02-0005.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0031.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
diff --git a/xml/page_catalog_choose_drink5.xml b/xml/page_catalog_choose_drink5.xml
index 086a1b89..e9125945 100644
--- a/xml/page_catalog_choose_drink5.xml
+++ b/xml/page_catalog_choose_drink5.xml
@@ -171,9 +171,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-01-0009"
-		Var NameDrink = $11-99-01-0009.Name2
+		Var NameDrink = $11-99-01-0009.NameE
 		Var NameDrinkTH = $11-99-01-0009.Name
-		Var DrinkDescription = $11-99-01-0009.description
+		Var DrinkDescriptionTH = $11-99-01-0009.description
+		Var DrinkDescription = $11-99-01-0009.descriptionE
 		Var PriceDrink = $11-99-01-0009.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_hot_lemonate.png"
 		Topping "Load" SelectDrink
@@ -194,9 +195,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0016"
-		Var NameDrink = $11-99-02-0016.Name2
+		Var NameDrink = $11-99-02-0016.NameE
 		Var NameDrinkTH = $11-99-02-0016.Name
-		Var DrinkDescription = $11-99-02-0016.description
+		Var DrinkDescriptionTH = $11-99-02-0016.description
+		Var DrinkDescription = $11-99-02-0016.descriptionE
 		Var PriceDrink = $11-99-02-0016.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_lemonade.png"
 		Topping "Load" SelectDrink
@@ -217,9 +219,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0017"
-		Var NameDrink = $11-99-02-0017.Name2
+		Var NameDrink = $11-99-02-0017.NameE
 		Var NameDrinkTH = $11-99-02-0017.Name
-		Var DrinkDescription = $11-99-02-0017.description
+		Var DrinkDescriptionTH = $11-99-02-0017.description
+		Var DrinkDescription = $11-99-02-0017.descriptionE
 		Var PriceDrink = $11-99-02-0017.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_lemonade_soda.png"
 		Topping "Load" SelectDrink
@@ -240,9 +243,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0020"
-		Var NameDrink = $11-99-02-0020.Name2
+		Var NameDrink = $11-99-02-0020.NameE
 		Var NameDrinkTH = $11-99-02-0020.Name
-		Var DrinkDescription = $11-99-02-0020.description
+		Var DrinkDescriptionTH = $11-99-02-0020.description
+		Var DrinkDescription = $11-99-02-0020.descriptionE
 		Var PriceDrink = $11-99-02-0020.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_sala.png"
 		Topping "Load" SelectDrink
@@ -263,9 +267,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0021"
-		Var NameDrink = $11-99-02-0021.Name2
+		Var NameDrink = $11-99-02-0021.NameE
 		Var NameDrinkTH = $11-99-02-0021.Name
-		Var DrinkDescription = $11-99-02-0021.description
+		Var DrinkDescriptionTH = $11-99-02-0021.description
+		Var DrinkDescription = $11-99-02-0021.descriptionE
 		Var PriceDrink = $11-99-02-0021.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_sala_lemon_juice.png"
 		Topping "Load" SelectDrink
@@ -286,9 +291,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0023"
-		Var NameDrink = $11-99-02-0023.Name2
+		Var NameDrink = $11-99-02-0023.NameE
 		Var NameDrinkTH = $11-99-02-0023.Name
-		Var DrinkDescription = $11-99-02-0023.description
+		Var DrinkDescriptionTH = $11-99-02-0023.description
+		Var DrinkDescription = $11-99-02-0023.descriptionE
 		Var PriceDrink = $11-99-02-0023.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_sala_soda.png"
 		Topping "Load" SelectDrink
@@ -309,9 +315,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0022"
-		Var NameDrink = $11-99-02-0022.Name2
+		Var NameDrink = $11-99-02-0022.NameE
 		Var NameDrinkTH = $11-99-02-0022.Name
-		Var DrinkDescription = $11-99-02-0022.description
+		Var DrinkDescriptionTH = $11-99-02-0022.description
+		Var DrinkDescription = $11-99-02-0022.descriptionE
 		Var PriceDrink = $11-99-02-0022.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_sala_lemon_soda.png"
 		Topping "Load" SelectDrink
@@ -332,9 +339,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0011"
-		Var NameDrink = $11-99-02-0011.Name2
+		Var NameDrink = $11-99-02-0011.NameE
 		Var NameDrinkTH = $11-99-02-0011.Name
-		Var DrinkDescription = $11-99-02-0011.description
+		Var DrinkDescriptionTH = $11-99-02-0011.description
+		Var DrinkDescription = $11-99-02-0011.descriptionE
 		Var PriceDrink = $11-99-02-0011.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_pink_milk.png"
 		Topping "Load" SelectDrink
@@ -344,15 +352,24 @@
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-01-0009.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
@@ -373,15 +390,24 @@
 	<Value> $11-99-01-0009.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0016.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
@@ -402,15 +428,24 @@
 	<Value> $11-99-02-0016.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0017.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
@@ -431,15 +466,24 @@
 	<Value> $11-99-02-0017.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0020.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
@@ -460,15 +504,24 @@
 	<Value> $11-99-02-0020.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0021.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 596 </Y>
@@ -489,15 +542,24 @@
 	<Value> $11-99-02-0021.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0023.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 596 </Y>
@@ -518,15 +580,24 @@
 	<Value> $11-99-02-0023.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0022.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 596 </Y>
@@ -547,15 +618,24 @@
 	<Value> $11-99-02-0022.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0011.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 596 </Y>
diff --git a/xml/page_catalog_choose_drink6.xml b/xml/page_catalog_choose_drink6.xml
index 38f62c68..e5a56591 100644
--- a/xml/page_catalog_choose_drink6.xml
+++ b/xml/page_catalog_choose_drink6.xml
@@ -171,9 +171,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0018"
-		Var NameDrink = $11-99-02-0018.Name2
+		Var NameDrink = $11-99-02-0018.NameE
 		Var NameDrinkTH = $11-99-02-0018.Name
-		Var DrinkDescription = $11-99-02-0018.description
+		Var DrinkDescriptionTH = $11-99-02-0018.description
+		Var DrinkDescription = $11-99-02-0018.descriptionE
 		Var PriceDrink = $11-99-02-0018.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_cola.png"
 		Topping "Load" SelectDrink
@@ -194,9 +195,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0018"
-		Var NameDrink = $11-99-02-0018.Name2
+		Var NameDrink = $11-99-02-0018.NameE
 		Var NameDrinkTH = $11-99-02-0018.Name
-		Var DrinkDescription = $11-99-02-0018.description
+		Var DrinkDescriptionTH = $11-99-02-0018.description
+		Var DrinkDescription = $11-99-02-0018.descriptionE
 		Var PriceDrink = $11-99-02-0018.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_cola_zero.png"
 		Topping "Load" SelectDrink
@@ -217,9 +219,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0025"
-		Var NameDrink = $11-99-02-0025.Name2
+		Var NameDrink = $11-99-02-0025.NameE
 		Var NameDrinkTH = $11-99-02-0025.Name
-		Var DrinkDescription = $11-99-02-0025.description
+		Var DrinkDescriptionTH = $11-99-02-0025.description
+		Var DrinkDescription = $11-99-02-0025.descriptionE
 		Var PriceDrink = $11-99-02-0025.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_sprite.png"
 		Topping "Load" SelectDrink
@@ -240,9 +243,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0032"
-		Var NameDrink = $11-99-02-0032.Name2
+		Var NameDrink = $11-99-02-0032.NameE
 		Var NameDrinkTH = $11-99-02-0032.Name
-		Var DrinkDescription = $11-99-02-0032.description
+		Var DrinkDescriptionTH = $11-99-02-0032.description
+		Var DrinkDescription = $11-99-02-0032.descriptionE
 		Var PriceDrink = $11-99-02-0032.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_soda.png"
 		Topping "Load" SelectDrink
@@ -263,9 +267,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0026"
-		Var NameDrink = $11-99-02-0026.Name2
+		Var NameDrink = $11-99-02-0026.NameE
 		Var NameDrinkTH = $11-99-02-0026.Name
-		Var DrinkDescription = $11-99-02-0026.description
+		Var DrinkDescriptionTH = $11-99-02-0026.description
+		Var DrinkDescription = $11-99-02-0026.descriptionE
 		Var PriceDrink = $11-99-02-0026.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced_soda.png"
 		Topping "Load" SelectDrink
@@ -286,9 +291,10 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var SelectDrink = "11-99-02-0009"
-		Var NameDrink = $11-99-02-0009.Name2
+		Var NameDrink = $11-99-02-0009.NameE
 		Var NameDrinkTH = $11-99-02-0009.Name
-		Var DrinkDescription = $11-99-02-0009.description
+		Var DrinkDescriptionTH = $11-99-02-0009.description
+		Var DrinkDescription = $11-99-02-0009.descriptionE
 		Var PriceDrink = $11-99-02-0009.Price
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select//bn_iced.png"
 		Topping "Load" SelectDrink
@@ -298,15 +304,24 @@
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0018.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
@@ -327,16 +342,25 @@
 	<Value> $11-99-02-0018.description </Value>
 	</Text>
 	<Text>
+	<X> 483 </X>
+	<Y> 66 </Y>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $11-99-02-0018.Price </Value>
+	</Text>
+	<Text>
 	<X> 465 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> "฿"" </Value>
 	</Text>
 	<Text>
-	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
@@ -356,15 +380,24 @@
 	<Value> $11-99-02-0018.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0025.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
@@ -385,15 +418,24 @@
 	<Value> $11-99-02-0025.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0032.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
@@ -414,15 +456,24 @@
 	<Value> $11-99-02-0032.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0026.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 596 </Y>
@@ -443,15 +494,24 @@
 	<Value> $11-99-02-0026.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free!" </Value>
+	<Value> $11-99-02-0009.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 596 </Y>
diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml
index 1e345d55..249b2010 100644
--- a/xml/page_payment_code.xml
+++ b/xml/page_payment_code.xml
@@ -148,7 +148,10 @@
 <EventActionError>
     If CodeChannel = 1 Then
 		Var TelephoneNumber = ""
+		
 		Var ShowErrorText = "Enable"
+		SAVELOG ShowErrorText
+
 		Refresh
 	EndIf
 
diff --git a/xml/page_topping_alter.xml b/xml/page_topping_alter.xml
index 47a1208d..34d0d93f 100644
--- a/xml/page_topping_alter.xml
+++ b/xml/page_topping_alter.xml
@@ -35,6 +35,23 @@
 
 	Var topping1 = "1"
 	Var BugFlag = 0
+
+	If show_eng = "true" Then 
+		;Var pageImage = "ROOT/taobin_project/image/page2_en/page2"
+		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+		Var showname = NameDrink
+		Var showdesc = DrinkDescription
+
+	Else
+		;Var pageImage = "ROOT/taobin_project/image/page2"
+		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+		Var showname = NameDrinkTH
+		Var showdesc = DrinkDescriptionTH
+	EndIf
+
+
 </EventOpen>
 <Timeout> 30000 </Timeout>
 <EventTimeout> 
@@ -42,6 +59,41 @@
 </EventTimeout> 
 
 
+<Button>
+<X> 990 </X>
+<Y> 438 </Y>
+<Filename> show_btn </Filename>
+<FilenamePress> show_btp  </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	; eng
+	If show_eng = "true" Then 
+		Var show_eng = "false"
+	Else
+		Var show_eng = "true"
+	EndIf
+
+	If show_eng = "true" Then 
+		;Var pageImage = "ROOT/taobin_project/image/page2_en/page2"
+		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+		Var showname = NameDrink
+		Var showdesc = DrinkDescription
+
+	Else
+		;Var pageImage = "ROOT/taobin_project/image/page2"
+		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+		Var showname = NameDrinkTH
+		Var showdesc = DrinkDescriptionTH
+	EndIf
+
+
+	RefreshAll
+</EventClick>
+</Button>
+
 <Image>
 <X> 0 </X>
 <Y> 0 </Y>
@@ -64,22 +116,7 @@
 </Button>
 
 <EventMachine>
-	;Open "ROOT/xml/page_topping_sugar_only.xml"
-		
-	;SAVELOG TOPPING1
-	;SAVELOG TOPPING2
-	;If TOPPING1 = "Powder Sugar" Then
-	;	If TOPPING2 = "Hot water 3 step" Then
-	;		If SubMenuProductCode1 = "-" Then
-	;			Open "ROOT/xml/page_topping_hot_menu.xml"
-	;		Else
-	;			Open "ROOT/xml/page_topping_hot_menu_coffee.xml"
-	;		EndIf
-	;	Else
-	;		Open "ROOT/xml/page_topping_sugar_only.xml"
-	;	EndIf
-	;EndIf
-	;Open "ROOT/xml/page_page3_alter.xml"
+	
 	
 	SAVELOG TOPPING1
 	SAVELOG MenuCodeName
@@ -141,7 +178,7 @@
 <Size> 72 </Size>
 <Font> KanitMediumTTF </Font>
 <Color> 0x513C2F </Color>
-<Value> NameDrink </Value>
+<Value> showname </Value>
 </Text>
 
 <Text>
@@ -152,7 +189,7 @@
 <Size> 24 </Size>
 <Font> KanitLightTTF </Font>
 <Color> 0x6F5F51 </Color>
-<Value> DrinkDescription </Value>
+<Value> showdesc </Value>
 </Text>