diff --git a/inter/aus/animation01/play_list.tsv b/inter/aus/animation01/play_list.tsv
index eb75a8e5..d40c4f68 100644
--- a/inter/aus/animation01/play_list.tsv
+++ b/inter/aus/animation01/play_list.tsv
@@ -940,3 +940,29 @@ Plum Highball	51-99-05-0027	1	27	28							24	120	17:00	23
 Hot  VANILLA latte	51-21-81-0060	1	2	3	4	5	63	6	70		24	120	17:00	23
 Iced  VANILLA latte	51-21-82-0060	1	2	3	4	5	63	6	70	23	24	120	17:00	23
 VANILLA latte frappe	51-21-83-0060	1	2	3	4	5	63	6	70	41	24	120	17:00	23
+
+
+ICED COCONUT AMERICANO	51-01-02-0068	1	2	3	4	5	62	23			24	120	17:00	23
+ICED COCONUT AMERICANO	51-21-02-0068	1	2	3	4	5	62	23			24	120	17:00	23
+COCONUT FRAPPE	51-05-03-0092	1	62	23	41						24	120	17:00	23
+ICED COCONUT MILK	51-03-02-0058	1	7	62	23						24	120	17:00	23
+COCONUT MILK FRAPPE	51-03-03-0058	1	7	62	23	41					24	120	17:00	23
+ICED COCONUT CHOCOLATE MILK	51-03-02-0059	1	7	15	62	23					24	120	17:00	23
+COCONUT CHOCOLATE MILK FRAPPE	51-03-03-0059	1	7	15	62	23					24	120	17:00	23
+ICED COCONUT MATCHA LATTE	51-02-02-0060	1	8	9	7	62	23				24	120	17:00	23
+COCONUT MATCHA LATTE FRAPEE	51-02-03-0060	1	8	9	7	62	23	41			24	120	17:00	23
+ICED COCONUT MATCHA	51-02-02-0061	1	8	9	62	23					24	120	17:00	23
+COCONUT MATCHA FRAPPE	51-02-03-0061	1	8	9	62	23	41				24	120	17:00	23
+ICED COCONUT THAI MILK TEA	51-02-02-0062	1	10	7	62	23					24	120	17:00	23
+COCONUT THAI MILK TEA FRAPPE	51-02-03-0062	1	10	7	62	23	41				24	120	17:00	23
+ICED COCONUT THAI BLACK TEA	51-02-02-0063	1	10	62	23						24	120	17:00	23
+COCONUT THAI BLACK TEA FRAPPE	51-02-03-0063	1	10	62	23	41					24	120	17:00	23
+ICED COCONUT JASMINE MILK TEA	51-02-02-0064	1	10	7	62	23					24	120	17:00	23
+COCONUT JASMINE MILK TEA FRAPPE	51-02-03-0064	1	10	7	62	23	41				24	120	17:00	23
+ICED COCONUT JASMINE TEA	51-02-02-0065	1	10	62	23						24	120	17:00	23
+COCONUT JASMINE TEA FRAPPE	51-02-03-0065	1	10	62	23	41					24	120	17:00	23
+ICED COCONUT SODA	51-05-02-0090	1	62	13	23						24	120	17:00	23
+ICED COCONUT PEPSI	51-05-02-0091	1	62	14	13	23					24	120	17:00	23
+COCONUT PEPSI FRAPPE	51-05-03-0091	1	23	62	14	41					24	120	17:00	23
+ICED COCONUT LYCHEE SODA	51-05-02-0093	1	62	11	13	23					24	120	17:00	23
+ICED COCONUT PEPSI MAX	51-05-02-0117	1	62	14	13	23					24	120	17:00	23
diff --git a/inter/aus/xml/page_catalog_group_cocktail.lxml b/inter/aus/xml/page_catalog_group_cocktail.lxml
index 3c8171c2..6477bd69 100644
--- a/inter/aus/xml/page_catalog_group_cocktail.lxml
+++ b/inter/aus/xml/page_catalog_group_cocktail.lxml
@@ -91,17 +91,17 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
-		Var NameLang[1][1] = ""
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][0] = "STX On The Beach"
+		Var NameLang[1][1] = "-"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "-"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
-		Var DescLang[1][1] = ""
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][0] = "Pineapple juice, Limeade, \nSoda, Ice, Malibu"
+		Var DescLang[1][1] = "-"
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -361,17 +361,17 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
-		Var NameLang[1][1] = ""
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][0] = "Noxious Nitrous"
+		Var NameLang[1][1] = "-"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "-"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
-		Var DescLang[1][1] = ""
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][0] = "Mint syrup, Limeade, Ice, Rum"
+		Var DescLang[1][1] = "-"
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -631,17 +631,17 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
-		Var NameLang[1][1] = ""
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][0] = "Sea Level RISE"
+		Var NameLang[1][1] = "-"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "-"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
-		Var DescLang[1][1] = ""
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][0] = "Strawberry syrup, Limeade, \nSoda, Malibu"
+		Var DescLang[1][1] = "-"
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -901,17 +901,17 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
-		Var NameLang[1][1] = ""
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][0] = "Methane Bubbles"
+		Var NameLang[1][1] = "-"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "-"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
-		Var DescLang[1][1] = ""
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][0] = "Lychee, Limeade, Soda, \nMount Gay Rum"
+		Var DescLang[1][1] = "-"
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -1171,17 +1171,17 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
-		Var NameLang[1][1] = ""
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][0] = "My Carbon\nFootprint"
+		Var NameLang[1][1] = "-"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "-"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
-		Var DescLang[1][1] = ""
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][0] = "Pineapple juice, Limeade, \nSoda, Ice, Mount Gay Rum"
+		Var DescLang[1][1] = "-"
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -1441,17 +1441,17 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
-		Var NameLang[1][1] = ""
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][0] = "Fossil Fuel"
+		Var NameLang[1][1] = "-"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "-"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
-		Var DescLang[1][1] = ""
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][0] = "Coffee, Milk Ice, Rum"
+		Var DescLang[1][1] = "-"
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -1711,17 +1711,17 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
-		Var NameLang[1][1] = ""
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][0] = "Stinky Sulphur"
+		Var NameLang[1][1] = "-"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "-"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
-		Var DescLang[1][1] = ""
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][0] = "Melon, Rum"
+		Var DescLang[1][1] = "-"
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -1981,17 +1981,17 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
-		Var NameLang[1][1] = ""
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][0] = "Biofuel"
+		Var NameLang[1][1] = "-"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "-"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
-		Var DescLang[1][1] = ""
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][0] = "Strawberry syrup, Pineaple \njuice Ice, Malibu"
+		Var DescLang[1][1] = "-"
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -2251,17 +2251,17 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
-		Var NameLang[1][1] = ""
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][0] = "Coal Story Bro"
+		Var NameLang[1][1] = "-"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "-"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
-		Var DescLang[1][1] = ""
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][0] = "Black sugar syrup, Milk, Ice, \nMount Gay Rum"
+		Var DescLang[1][1] = "-"
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -2521,17 +2521,17 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
-		Var NameLang[1][1] = ""
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][0] = "Bangkok\nUnderwater"
+		Var NameLang[1][1] = "-"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "-"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
-		Var DescLang[1][1] = ""
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][0] = "Lychee juice, Pineaple juice, \nIce, Mount Gay Rum"
+		Var DescLang[1][1] = "-"
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -2791,17 +2791,17 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
-		Var NameLang[1][1] = ""
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][0] = "Druzhba Pipe"
+		Var NameLang[1][1] = "-"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "-"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
-		Var DescLang[1][1] = ""
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][0] = "Blue lable, soda"
+		Var DescLang[1][1] = "-"
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -3061,17 +3061,17 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
-		Var NameLang[1][1] = ""
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][0] = "2050"
+		Var NameLang[1][1] = "-"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "-"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
-		Var DescLang[1][1] = ""
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][0] = "Blue lable, soda"
+		Var DescLang[1][1] = "-"
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -3331,17 +3331,17 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
-		Var NameLang[1][1] = ""
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][0] = "Greenwash"
+		Var NameLang[1][1] = "-"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "-"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
-		Var DescLang[1][1] = ""
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][0] = "Black lable, soda"
+		Var DescLang[1][1] = "-"
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -3601,17 +3601,17 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
-		Var NameLang[1][1] = ""
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][0] = "Tailpipe Emissions"
+		Var NameLang[1][1] = "-"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "-"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
-		Var DescLang[1][1] = ""
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][0] = "Black lable, soda"
+		Var DescLang[1][1] = "-"
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -3871,17 +3871,17 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
-		Var NameLang[1][1] = ""
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][0] = "Petrol Fumes"
+		Var NameLang[1][1] = "-"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "-"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
-		Var DescLang[1][1] = ""
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][0] = "Gold lable, soda"
+		Var DescLang[1][1] = "-"
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -4141,17 +4141,17 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
-		Var NameLang[1][1] = ""
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][0] = "Big Kid"
+		Var NameLang[1][1] = "-"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "-"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
-		Var DescLang[1][1] = ""
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][0] = "Gold lable, water"
+		Var DescLang[1][1] = "-"
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -4411,17 +4411,17 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
-		Var NameLang[1][1] = ""
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][0] = "Peach Smash"
+		Var NameLang[1][1] = "-"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "-"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
-		Var DescLang[1][1] = ""
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][0] = "Peach Syrup, Limenade ,\nSoda, Ice, Gin"
+		Var DescLang[1][1] = "-"
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -4681,17 +4681,17 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
-		Var NameLang[1][1] = ""
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][0] = "Melon Fizz"
+		Var NameLang[1][1] = "-"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "-"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
-		Var DescLang[1][1] = ""
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][0] = "Melon Syrup, Limenade ,\nSoda, Ice, Gin"
+		Var DescLang[1][1] = "-"
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -4951,17 +4951,17 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
-		Var NameLang[1][1] = ""
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][0] = "Yuzu Collins"
+		Var NameLang[1][1] = "-"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "-"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
-		Var DescLang[1][1] = ""
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][0] = "Yuzu Syrup, Limenade ,\nSoda, Ice, Gin"
+		Var DescLang[1][1] = "-"
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -5221,17 +5221,17 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
-		Var NameLang[1][1] = ""
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][0] = "Gin Collins"
+		Var NameLang[1][1] = "-"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "-"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
-		Var DescLang[1][1] = ""
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][0] = "Gin, Limenade, Sugar, Soda and Ice"
+		Var DescLang[1][1] = "-"
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -5491,17 +5491,17 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
-		Var NameLang[1][1] = ""
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][0] = "The Floral"
+		Var NameLang[1][1] = "-"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "-"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
-		Var DescLang[1][1] = ""
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][0] = "Peach Syrup, Jasmine Tea ,\nWater, Ice, Gin"
+		Var DescLang[1][1] = "-"
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -5761,17 +5761,17 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
-		Var NameLang[1][1] = ""
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][0] = "Combination"
+		Var NameLang[1][1] = "-"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "-"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
-		Var DescLang[1][1] = ""
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][0] = "Melon Syrup, Limenade ,\nSoda, Ice, Vodka"
+		Var DescLang[1][1] = "-"
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -6031,17 +6031,17 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
-		Var NameLang[1][1] = ""
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][0] = "Ume Ume"
+		Var NameLang[1][1] = "-"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "-"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
-		Var DescLang[1][1] = ""
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][0] = "Yuzu Syrup, Plum Syrup, Limenade ,\nSoda, Ice, Vodka"
+		Var DescLang[1][1] = "-"
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -6301,17 +6301,17 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
-		Var NameLang[1][1] = ""
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][0] = "Like Sex\non The Beach"
+		Var NameLang[1][1] = "-"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "-"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
-		Var DescLang[1][1] = ""
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][0] = "Peach Syrup, Limenade ,\nPineapple juice ,Soda, Ice, Vodka"
+		Var DescLang[1][1] = "-"
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
@@ -6571,17 +6571,17 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
-		Var NameLang[1][1] = ""
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
+		Var NameLang[1][0] = "Plum Highball"
+		Var NameLang[1][1] = "-"
+		Var NameLang[1][2] = "-"
+		Var NameLang[1][3] = "-"
+		Var NameLang[1][4] = "-"
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
-		Var DescLang[1][1] = ""
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = ""
+		Var DescLang[1][0] = "Yuzu Syrup, Limenade ,\nSoda, Ice, Gold label"
+		Var DescLang[1][1] = "-"
+		Var DescLang[1][2] = "-"
+		Var DescLang[1][3] = "-"
+		Var DescLang[1][4] = "-"
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
diff --git a/inter/aus/xml/page_catalog_group_coffee.lxml b/inter/aus/xml/page_catalog_group_coffee.lxml
index 4f803e8f..18aaee27 100644
--- a/inter/aus/xml/page_catalog_group_coffee.lxml
+++ b/inter/aus/xml/page_catalog_group_coffee.lxml
@@ -24108,7 +24108,7 @@
 		Var PD_CODE2 = "51-01-02-0068"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "COCONUT AMERICANO"
+		Var aliasName[0] = "COCONUT\nAMERICANO"
 		Var aliasDesc[0] = "Espresso, Coconut Syrup,\nSugar, Water"
 		Var aliasName[1] = ""
 		Var aliasDesc[1] = ""
@@ -24132,13 +24132,13 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
+		Var NameLang[1][0] = "COCONUT AMERICANO"
 		Var NameLang[1][1] = ""
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
+		Var DescLang[1][0] = "Espresso, Coconut Syrup,\nSugar, Water"
 		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
@@ -24203,9 +24203,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>COCONUT AMERICANO</LanguageSlot1>
+		<LanguageSlot1>COCONUT\nAMERICANO</LanguageSlot1>
 		<LanguageSlot2></LanguageSlot2>
-		<LanguageSlot3>COCONUT AMERICANO</LanguageSlot3>
+		<LanguageSlot3>COCONUT\nAMERICANO</LanguageSlot3>
 		<LanguageSlot4></LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6></LanguageSlot6>
@@ -24378,7 +24378,7 @@
 		Var PD_CODE2 = "51-21-02-0068"
 		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
-		Var aliasName[0] = "COCONUT AMERICANO"
+		Var aliasName[0] = "COCONUT\nAMERICANO"
 		Var aliasDesc[0] = "Espresso, Coconut Syrup,\nSugar, Water"
 		Var aliasName[1] = ""
 		Var aliasDesc[1] = ""
@@ -24402,13 +24402,13 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
+		Var NameLang[1][0] = "COCONUT AMERICANO"
 		Var NameLang[1][1] = ""
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
+		Var DescLang[1][0] = "Espresso, Coconut Syrup,\nSugar, Water"
 		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
@@ -24473,9 +24473,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>COCONUT AMERICANO</LanguageSlot1>
+		<LanguageSlot1>COCONUT\nAMERICANO</LanguageSlot1>
 		<LanguageSlot2></LanguageSlot2>
-		<LanguageSlot3>COCONUT AMERICANO</LanguageSlot3>
+		<LanguageSlot3>COCONUT\nAMERICANO</LanguageSlot3>
 		<LanguageSlot4></LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6></LanguageSlot6>
diff --git a/inter/aus/xml/page_catalog_group_milk.lxml b/inter/aus/xml/page_catalog_group_milk.lxml
index 122c92ef..059dc180 100644
--- a/inter/aus/xml/page_catalog_group_milk.lxml
+++ b/inter/aus/xml/page_catalog_group_milk.lxml
@@ -10413,25 +10413,25 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
+		Var NameLang[1][0] = "COCONUT MILK"
 		Var NameLang[1][1] = ""
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
+		Var DescLang[1][0] = "Coconut syrup, Milk,\nWater"
 		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
-		Var NameLang[2][0] = ""
+		Var NameLang[2][0] = "COCONUT MILK FRAPPE"
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
 		Var NameLang[2][4] = ""
 		Var NameLang[2][5] = ""
-		Var DescLang[2][0] = ""
+		Var DescLang[2][0] = "Coconut syrup, Milk,\nWater"
 		Var DescLang[2][1] = ""
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
@@ -10683,25 +10683,25 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
+		Var NameLang[1][0] = "COCONUT CHOCOLATE MILK"
 		Var NameLang[1][1] = ""
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
+		Var DescLang[1][0] = "Coconut syrup, Cocoa, Milk,\nWater"
 		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
-		Var NameLang[2][0] = ""
+		Var NameLang[2][0] = "COCONUT CHOCOLATE MILK FRAPPE"
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
 		Var NameLang[2][4] = ""
 		Var NameLang[2][5] = ""
-		Var DescLang[2][0] = ""
+		Var DescLang[2][0] = "Coconut syrup, Cocoa, Milk,\nWater"
 		Var DescLang[2][1] = ""
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
diff --git a/inter/aus/xml/page_catalog_group_other.lxml b/inter/aus/xml/page_catalog_group_other.lxml
index 263b6070..c65e23b9 100644
--- a/inter/aus/xml/page_catalog_group_other.lxml
+++ b/inter/aus/xml/page_catalog_group_other.lxml
@@ -2259,13 +2259,13 @@
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
-		Var NameLang[2][0] = ""
+		Var NameLang[2][0] = "COCONUT FRAPPE"
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
 		Var NameLang[2][4] = ""
 		Var NameLang[2][5] = ""
-		Var DescLang[2][0] = ""
+		Var DescLang[2][0] = "Coconut Syrup and Water"
 		Var DescLang[2][1] = ""
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
@@ -2517,13 +2517,13 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
+		Var NameLang[1][0] = "COCONUT SODA"
 		Var NameLang[1][1] = ""
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
+		Var DescLang[1][0] = "Coconut Syrup and Soda"
 		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
@@ -2787,25 +2787,25 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
+		Var NameLang[1][0] = "ICED COCONUT PEPSI"
 		Var NameLang[1][1] = ""
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
+		Var DescLang[1][0] = "Coconut Syrup, Pepsi and Soda"
 		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
-		Var NameLang[2][0] = ""
+		Var NameLang[2][0] = "ICED COCONUT PEPSI"
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
 		Var NameLang[2][4] = ""
 		Var NameLang[2][5] = ""
-		Var DescLang[2][0] = ""
+		Var DescLang[2][0] = "Coconut Syrup, Pepsi and Soda"
 		Var DescLang[2][1] = ""
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
@@ -3007,6 +3007,276 @@
 	</Language>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
+</Block>
+	; ==================> Len = 3
+	; - 51-05-02-0117 - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 51-05-02-0117.Button,$Sum5105020117) </State> 
+	<Button>
+	<State> $Sum5105020117 </State> 
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_PEPSI.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_PEPSI.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_PEPSI.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_PEPSI.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $51-05-02-0117.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "51-05-02-0117"
+		Var PD_CODE3 = "##-##-##-####"
+		; begin lang 
+		Var aliasName[0] = "COCONUT PEPSI\nMAX"
+		Var aliasDesc[0] = "Coconut Syrup, Pepsi  max and Soda"
+		Var aliasName[1] = "เมล่อนโซดา"
+		Var aliasDesc[1] = "น้ำเชื่อมเมล่อน โซดา \nและน้ำแข็ง"
+		Var aliasName[2] = "-"
+		Var aliasDesc[2] = "-"
+		Var aliasName[3] = "-"
+		Var aliasDesc[3] = "-"
+		Var aliasName[4] = ""
+		Var aliasDesc[4] = ""
+		Var aliasName[5] = ""
+		Var aliasDesc[5] = ""
+		Var NameLang[0][0] = ""
+		Var NameLang[0][1] = ""
+		Var NameLang[0][2] = ""
+		Var NameLang[0][3] = ""
+		Var NameLang[0][4] = ""
+		Var NameLang[0][5] = ""
+		Var DescLang[0][0] = ""
+		Var DescLang[0][1] = ""
+		Var DescLang[0][2] = ""
+		Var DescLang[0][3] = ""
+		Var DescLang[0][4] = ""
+		Var DescLang[0][5] = ""
+		Var NameLang[1][0] = "ICED COCONUT PEPSI MAX"
+		Var NameLang[1][1] = ""
+		Var NameLang[1][2] = ""
+		Var NameLang[1][3] = ""
+		Var NameLang[1][4] = ""
+		Var NameLang[1][5] = ""
+		Var DescLang[1][0] = "Coconut Syrup, Pepsi max and Soda"
+		Var DescLang[1][1] = ""
+		Var DescLang[1][2] = ""
+		Var DescLang[1][3] = ""
+		Var DescLang[1][4] = ""
+		Var DescLang[1][5] = ""
+		Var NameLang[2][0] = ""
+		Var NameLang[2][1] = ""
+		Var NameLang[2][2] = ""
+		Var NameLang[2][3] = ""
+		Var NameLang[2][4] = ""
+		Var NameLang[2][5] = ""
+		Var DescLang[2][0] = ""
+		Var DescLang[2][1] = ""
+		Var DescLang[2][2] = ""
+		Var DescLang[2][3] = ""
+		Var DescLang[2][4] = ""
+		Var DescLang[2][5] = ""
+		; end lang 
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = $51-05-02-0117.Button
+		Var PD_STAGE_3 = "Disable2"
+		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" "51-05-02-0117"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 22 </Size>
+	<Width>222</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>COCONUT PEPSI\nMAX</LanguageSlot1>
+		<LanguageSlot2>เมล่อนโซดา</LanguageSlot2>
+		<LanguageSlot3>COCONUT PEPSI\nMAX</LanguageSlot3>
+		<LanguageSlot4>เมล่อนโซดา</LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6>เมล่อนโซดา</LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>222</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>Coconut Syrup, Pepsi  max and Soda</LanguageSlot1>
+		<LanguageSlot2>น้ำเชื่อมเมล่อน โซดา \nและน้ำแข็ง</LanguageSlot2>
+		<LanguageSlot3>Coconut Syrup, Pepsi  max and Soda</LanguageSlot3>
+		<LanguageSlot4>น้ำเชื่อมเมล่อน โซดา \nและน้ำแข็ง</LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6>น้ำเชื่อมเมล่อน โซดา \nและน้ำแข็ง</LanguageSlot6>
+	</LanguageGroup>
+	</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> TextPriceMenuHotX </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> $51-05-02-0117.Button </State>
+	</Image>
+	<Text>
+	<X> 113 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $51-05-02-0117.Button </State>
+	<Value> StringFmt( $51-05-02-0117.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> "Invisible" </State>
+	</Image>
+	<Text>
+	<X> TextPriceMenuBlendX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </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>
+	<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 $Sum5105020117 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $51-05-02-0117.TAG tag2_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.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>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum5105020117 </State> 
+	<Language>
+		<ID> 000013 </ID> 
+	</Language>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
 </Block>
 	; ==================> Len = 3
 	; - 51-05-02-0093 - 
@@ -3057,13 +3327,13 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
+		Var NameLang[1][0] = "COCONUT LYCHEE SODA"
 		Var NameLang[1][1] = ""
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
+		Var DescLang[1][0] = "Coconut Syrup, Lychee Syrup and Soda"
 		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
diff --git a/inter/aus/xml/page_catalog_group_tea.lxml b/inter/aus/xml/page_catalog_group_tea.lxml
index 12ac2790..e8ba2818 100644
--- a/inter/aus/xml/page_catalog_group_tea.lxml
+++ b/inter/aus/xml/page_catalog_group_tea.lxml
@@ -12936,25 +12936,25 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
+		Var NameLang[1][0] = "ICED COCONUT MATCHA LATTE"
 		Var NameLang[1][1] = ""
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
+		Var DescLang[1][0] = "Coconut Syrup, Matcha Milk \nWater"
 		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
-		Var NameLang[2][0] = ""
+		Var NameLang[2][0] = "COCONUT MATCHA LATTE FRAPPE"
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
 		Var NameLang[2][4] = ""
 		Var NameLang[2][5] = ""
-		Var DescLang[2][0] = ""
+		Var DescLang[2][0] = "Coconut Syrup, Matcha Milk \nWater"
 		Var DescLang[2][1] = ""
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
@@ -13206,25 +13206,25 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
+		Var NameLang[1][0] = "ICED COCONUT MATCHA"
 		Var NameLang[1][1] = ""
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
+		Var DescLang[1][0] = "Coconut Syrup, Matcha \nWater"
 		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
-		Var NameLang[2][0] = ""
+		Var NameLang[2][0] = "COCONUT MATCHA FRAPPE"
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
 		Var NameLang[2][4] = ""
 		Var NameLang[2][5] = ""
-		Var DescLang[2][0] = ""
+		Var DescLang[2][0] = "Coconut Syrup, Matcha \nWater"
 		Var DescLang[2][1] = ""
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
@@ -13476,25 +13476,25 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
+		Var NameLang[1][0] = "ICED COCONUT THAI MILK TEA"
 		Var NameLang[1][1] = ""
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
+		Var DescLang[1][0] = "Coconut Syrup, Thai Tea,  Milk \nWater"
 		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
-		Var NameLang[2][0] = ""
+		Var NameLang[2][0] = "COCONUT THAI MILK TEA FRAPPE"
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
 		Var NameLang[2][4] = ""
 		Var NameLang[2][5] = ""
-		Var DescLang[2][0] = ""
+		Var DescLang[2][0] = "Coconut Syrup, Thai Tea,  Milk \nWater"
 		Var DescLang[2][1] = ""
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
@@ -13746,25 +13746,25 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
+		Var NameLang[1][0] = "ICED COCONUT THAI BLACK TEA"
 		Var NameLang[1][1] = ""
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
+		Var DescLang[1][0] = "Coconut Syrup, Thai Tea and Water"
 		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
-		Var NameLang[2][0] = ""
+		Var NameLang[2][0] = "COCONUT THAI BLACK TEA FRAPPE"
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
 		Var NameLang[2][4] = ""
 		Var NameLang[2][5] = ""
-		Var DescLang[2][0] = ""
+		Var DescLang[2][0] = "Coconut Syrup, Thai Tea and Water"
 		Var DescLang[2][1] = ""
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
@@ -13993,7 +13993,7 @@
 		Var PD_CODE3 = "51-02-03-0064"
 		; begin lang 
 		Var aliasName[0] = "COCONUT JASMINE\nMILK TEA"
-		Var aliasDesc[0] = "Coconut Syrup, Jasmine Tea,  Milk \nWater"
+		Var aliasDesc[0] = "Coconut Syrup, Jasmine Tea, \nMilk Water"
 		Var aliasName[1] = ""
 		Var aliasDesc[1] = ""
 		Var aliasName[2] = ""
@@ -14016,25 +14016,25 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
+		Var NameLang[1][0] = "ICED COCONUT JASMINE MILK TEA"
 		Var NameLang[1][1] = ""
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
+		Var DescLang[1][0] = "Coconut Syrup, Jasmine Tea,  Milk \nWater"
 		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
-		Var NameLang[2][0] = ""
+		Var NameLang[2][0] = "COCONUT JASMINE MILK TEA FRAPPE"
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
 		Var NameLang[2][4] = ""
 		Var NameLang[2][5] = ""
-		Var DescLang[2][0] = ""
+		Var DescLang[2][0] = "Coconut Syrup, Jasmine Tea,  Milk \nWater"
 		Var DescLang[2][1] = ""
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
@@ -14103,9 +14103,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Coconut Syrup, Jasmine Tea,  Milk \nWater</LanguageSlot1>
+		<LanguageSlot1>Coconut Syrup, Jasmine Tea, \nMilk Water</LanguageSlot1>
 		<LanguageSlot2></LanguageSlot2>
-		<LanguageSlot3>Coconut Syrup, Jasmine Tea,  Milk \nWater</LanguageSlot3>
+		<LanguageSlot3>Coconut Syrup, Jasmine Tea, \nMilk Water</LanguageSlot3>
 		<LanguageSlot4></LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6></LanguageSlot6>
@@ -14263,7 +14263,7 @@
 		Var PD_CODE3 = "51-02-03-0065"
 		; begin lang 
 		Var aliasName[0] = "COCONUT JASMINE\nTEA"
-		Var aliasDesc[0] = "Coconut Syrup, Jasmine Tea,  and Water"
+		Var aliasDesc[0] = "Coconut Syrup, Jasmine Tea,\nand Water"
 		Var aliasName[1] = ""
 		Var aliasDesc[1] = ""
 		Var aliasName[2] = ""
@@ -14286,25 +14286,25 @@
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
+		Var NameLang[1][0] = "ICED COCONUT JASMINE TEA"
 		Var NameLang[1][1] = ""
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
+		Var DescLang[1][0] = "Coconut Syrup, Jasmine Tea,  and Water"
 		Var DescLang[1][1] = ""
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
-		Var NameLang[2][0] = ""
+		Var NameLang[2][0] = "COCONUT JASMINE TEA FRAPPE"
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
 		Var NameLang[2][4] = ""
 		Var NameLang[2][5] = ""
-		Var DescLang[2][0] = ""
+		Var DescLang[2][0] = "Coconut Syrup, Jasmine Tea,  and Water"
 		Var DescLang[2][1] = ""
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
@@ -14373,9 +14373,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Coconut Syrup, Jasmine Tea,  and Water</LanguageSlot1>
+		<LanguageSlot1>Coconut Syrup, Jasmine Tea,\nand Water</LanguageSlot1>
 		<LanguageSlot2></LanguageSlot2>
-		<LanguageSlot3>Coconut Syrup, Jasmine Tea,  and Water</LanguageSlot3>
+		<LanguageSlot3>Coconut Syrup, Jasmine Tea,\nand Water</LanguageSlot3>
 		<LanguageSlot4></LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6></LanguageSlot6>
diff --git a/xml/page_catalog_group_pro_oreo_11.xml b/xml/page_catalog_group_pro_oreo_11.xml
index 2fbbd0de..bdaac7ce 100644
--- a/xml/page_catalog_group_pro_oreo_11.xml
+++ b/xml/page_catalog_group_pro_oreo_11.xml
@@ -53,7 +53,7 @@
 	<EventOnClick> 
 		Var NameDrink = "Iced Cafe Latte Oreo Smoothie"
 		Var NameDrinkTH = "ลาเต้ปั่นโอริโอ้ภูเขาไฟ"
-		Var DrinkDescriptionTH = "กาแฟ นม น้ำตาล   Oero"
+		Var DrinkDescriptionTH = "กาแฟ นม น้ำตาล และโอรีโอ้"
 		Var DrinkDescription = "Coffee, Milk,  Sugar, Oreo"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Cafe_Latte_Oreo_smoothie_oreo_11"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -136,8 +136,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟ นม น้ำตาล 
- Oero" </Value>
+	<Value> "กาแฟ นม น้ำตาล และโอรีโอ้" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -308,7 +307,7 @@ Sugar, Oreo" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Thai Milk tea Oreo Smoothie"
 		Var NameDrinkTH = "ชานมไทยโอริโอ้ภูเขาไฟ"
-		Var DrinkDescriptionTH = "ชาไทย นม น้ำตาล   Oreo"
+		Var DrinkDescriptionTH = "ชาไทย นม น้ำตาล และโอรีโอ้"
 		Var DrinkDescription = "Thai Tea, Milk, Sugar, Oreo"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_ThaiTeaOreo_smoothie_oreo_11"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -391,8 +390,7 @@ Sugar, Oreo" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "ชาไทย นม น้ำตาล 
- Oreo" </Value>
+	<Value> "ชาไทย นม น้ำตาล และโอรีโอ้" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -817,7 +815,7 @@ VOLCANO " </Value>
 	<EventOnClick> 
 		Var NameDrink = "Pink Oreo volcano "
 		Var NameDrinkTH = "นมชมพูปั่นโอริโอ้ ภูเขาไฟ"
-		Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ นม น้ำตาล   Oreo"
+		Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ นม น้ำตาล  โอรีโอ้"
 		Var DrinkDescription = "Salak Syrup, Milk, Sugar Oreo"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_PinkOreo_smoothie_oreo_11"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -902,7 +900,7 @@ VOLCANO " </Value>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
 	<Value> "น้ำแดงกลิ่นสละ นม น้ำตาล 
- Oreo" </Value>
+โอรีโอ้" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1073,7 +1071,7 @@ Sugar Oreo" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Strawberry Milk Oreo Smoothie"
 		Var NameDrinkTH = "สตอเบอร์รี่ปั่นโอริโอ้ ภูเขาไฟ"
-		Var DrinkDescriptionTH = "น้ำเชื่อมสตอเบอร์รี่ นม น้ำตาล   Oreo"
+		Var DrinkDescriptionTH = "น้ำเชื่อมสตอเบอร์รี่ นม น้ำตาล  โอรีโอ้"
 		Var DrinkDescription = "Strawberry Syrup, Milk, Sugar, Oreo"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_StrawberrOreo_smoothie_oreo_11"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -1158,7 +1156,7 @@ Sugar Oreo" </Value>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
 	<Value> "น้ำเชื่อมสตอเบอร์รี่ นม น้ำตาล 
- Oreo" </Value>
+โอรีโอ้" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1329,7 +1327,7 @@ Sugar, Oreo" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Choco Oreo Smoothie"
 		Var NameDrinkTH = "โกโก้ปั่นโอริโอ้ ภูเขาไฟ"
-		Var DrinkDescriptionTH = "โกโก้ นม น้ำตาล   Oreo"
+		Var DrinkDescriptionTH = "โกโก้ นม น้ำตาล  โอรีโอ้"
 		Var DrinkDescription = "Cocoa, Milk, Sugar, Oreo"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_ChocoOreo_smoothie_oreo_11"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -1414,7 +1412,7 @@ Sugar, Oreo" </Value>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
 	<Value> "โกโก้ นม น้ำตาล 
- Oreo" </Value>
+โอรีโอ้" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1585,7 +1583,7 @@ Sugar, Oreo" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Caramel Milk Oreo Smoothie"
 		Var NameDrinkTH = "นมคาราเมลปั่นโอริโอ้ ภูเขาไฟ"
-		Var DrinkDescriptionTH = "น้ำเชื่อมคาราเมล นม น้ำตาล   Oreo"
+		Var DrinkDescriptionTH = "น้ำเชื่อมคาราเมล นม น้ำตาล  โอรีโอ้"
 		Var DrinkDescription = "Caramel Syrup, Milk, Sugar, Oreo"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_CaramelOreo_smoothie_oreo_11"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -1670,7 +1668,7 @@ Sugar, Oreo" </Value>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
 	<Value> "น้ำเชื่อมคาราเมล นม น้ำตาล 
- Oreo" </Value>
+โอรีโอ้" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2094,7 +2092,7 @@ Sugar, Oreo" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Jasmine Milk Tea  oreo smoothie"
 		Var NameDrinkTH = "ชานมมะลิปั่นโอริโอ้ ภูเขาไฟ"
-		Var DrinkDescriptionTH = "ชามะลิ นม น้ำตาล   Oreo"
+		Var DrinkDescriptionTH = "ชามะลิ นม น้ำตาล  โอรีโอ้"
 		Var DrinkDescription = "Jasmine Tea, Milk, Sugar, Oreo"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_jasmine_Oreo_smoothie_oreo_11"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -2179,7 +2177,7 @@ Sugar, Oreo" </Value>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
 	<Value> "ชามะลิ นม น้ำตาล 
- Oreo" </Value>
+โอรีโอ้" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2350,7 +2348,7 @@ Sugar, Oreo" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Hojicha Oreo Smoothie"
 		Var NameDrinkTH = "ชานมโฮจิฉะโอริโอ้ ภูเขาไฟ"
-		Var DrinkDescriptionTH = "โฮจิฉะ นม น้ำตาล   Oreo"
+		Var DrinkDescriptionTH = "โฮจิฉะ นม น้ำตาล  โอรีโอ้"
 		Var DrinkDescription = "Hojicha, Milk, Sugar, Oreo"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_HojichaOreo_smoothie_oreo_11"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -2435,7 +2433,7 @@ Sugar, Oreo" </Value>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
 	<Value> "โฮจิฉะ นม น้ำตาล 
- Oreo" </Value>
+โอรีโอ้" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2606,7 +2604,7 @@ Sugar, Oreo" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Melon Milk Oreo Smoothie"
 		Var NameDrinkTH = "เมล่อนปั่นโอริโอ้ ภูเขาไฟ"
-		Var DrinkDescriptionTH = "น้ำเชื่อมเมล่อน นม น้ำตาล   Oreo"
+		Var DrinkDescriptionTH = "น้ำเชื่อมเมล่อน นม น้ำตาล  โอรีโอ้"
 		Var DrinkDescription = "Melon Syrup, Milk, Sugar, Oreo"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_MelonOreo_smoothie_oreo_11"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -2691,7 +2689,7 @@ Sugar, Oreo" </Value>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
 	<Value> "น้ำเชื่อมเมล่อน นม น้ำตาล 
- Oreo" </Value>
+โอรีโอ้" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2862,7 +2860,7 @@ Sugar, Oreo" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Banana Milk Oreo Smoothie"
 		Var NameDrinkTH = "นมกล้วยปั่นภูเขาไฟ"
-		Var DrinkDescriptionTH = "น้ำเชื่อมกล้วย นม น้ำตาล Oreo"
+		Var DrinkDescriptionTH = "น้ำเชื่อมกล้วย นม น้ำตาล  โอรีโอ้"
 		Var DrinkDescription = "Banana Syrup, Milk, Sugar, Oreo"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_BananaOreo_smoothie_oreo_11"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -2945,7 +2943,8 @@ Sugar, Oreo" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมกล้วย นม น้ำตาล Oreo" </Value>
+	<Value> "น้ำเชื่อมกล้วย นม น้ำตาล 
+โอรีโอ้" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3116,7 +3115,7 @@ Sugar, Oreo" </Value>
 	<EventOnClick> 
 		Var NameDrink = "MINT OREO VOLCANO"
 		Var NameDrinkTH = "มินต์โอริโอ้ภูเขาไฟ"
-		Var DrinkDescriptionTH = "น้ำเชื่อมมินต์ นม น้ำตาล   Oreo"
+		Var DrinkDescriptionTH = "น้ำเชื่อมมินต์ นม น้ำตาล  โอรีโอ้"
 		Var DrinkDescription = "Mint Syrup, Milk, Sugar, Oreo"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Mint_Oreo_smoothie_oreo_11"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -3200,7 +3199,7 @@ Sugar, Oreo" </Value>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
 	<Value> "น้ำเชื่อมมินต์ นม น้ำตาล 
- Oreo" </Value>
+โอรีโอ้" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3370,7 +3369,7 @@ Sugar, Oreo" </Value>
 	<EventOnClick> 
 		Var NameDrink = "GINGER MILK TEA OREO SMOOTHIE"
 		Var NameDrinkTH = "ชานมขิงโอริโอ้ปั่น"
-		Var DrinkDescriptionTH = "ขิง นม น้ำตาล   Oreo"
+		Var DrinkDescriptionTH = "ขิง นม น้ำตาล  โอรีโอ้"
 		Var DrinkDescription = "Hojicha, Milk, Sugar, Oreo"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ginger_milk_Oreo_smoothie_oreo_11"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -3454,7 +3453,7 @@ Sugar, Oreo" </Value>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
 	<Value> "ขิง นม น้ำตาล 
- Oreo" </Value>
+โอรีโอ้" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3625,7 +3624,7 @@ Sugar, Oreo" </Value>
 	<EventOnClick> 
 		Var NameDrink = "coconut milk oreo smoothie"
 		Var NameDrinkTH = "นมมะพร้าวปั่นโอริโอ้ ภูเขาไฟ"
-		Var DrinkDescriptionTH = "น้ำเชื่อมมะพร้าว นม น้ำตาล Oreo"
+		Var DrinkDescriptionTH = "น้ำเชื่อมมะพร้าว นม น้ำตาล  โอรีโอ้"
 		Var DrinkDescription = "Coconut Syrup, Milk, Sugar, Oreo"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Coconut_Oreo_smoothie_oreo_11"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -3709,7 +3708,8 @@ Sugar, Oreo" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมมะพร้าว นม น้ำตาล Oreo" </Value>
+	<Value> "น้ำเชื่อมมะพร้าว นม น้ำตาล 
+โอรีโอ้" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3880,7 +3880,7 @@ Sugar, Oreo" </Value>
 	<EventOnClick> 
 		Var NameDrink = "Yuzu Milk Oreo Smoothie"
 		Var NameDrinkTH = "นมยูสุปั่นโอริโอ้ภูเขาไฟ"
-		Var DrinkDescriptionTH = "น้ำเชื่อมยูซุ นม น้ำตาล Oreo"
+		Var DrinkDescriptionTH = "น้ำเชื่อมยูซุ นม น้ำตาล  โอรีโอ้"
 		Var DrinkDescription = "Yuzu Syrup, Milk, Sugar, Oreo"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_YUZU_Oreo_smoothie_oreo_11"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -3963,7 +3963,8 @@ Sugar, Oreo" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมยูซุ นม น้ำตาล Oreo" </Value>
+	<Value> "น้ำเชื่อมยูซุ นม น้ำตาล 
+โอรีโอ้" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -4134,7 +4135,7 @@ Sugar, Oreo" </Value>
 	<EventOnClick> 
 		Var NameDrink = "PREMIUM ESPRESSO CARAMEL OREO"
 		Var NameDrinkTH = "พรีเมียมเอสเพรสโซ่ คาราเมลโอริโอ้"
-		Var DrinkDescriptionTH = "กาแฟ นม คาลาเมล และ Oreo"
+		Var DrinkDescriptionTH = "กาแฟ นม คาราเมล และโอรีโอ้"
 		Var DrinkDescription = "Coffee, Milk, Caramel Syrup, Oreo"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Caramel_Cafe_Latte_Oreo_smoothie_oreo_11"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -4218,7 +4219,7 @@ Sugar, Oreo" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟ นม คาลาเมล และ Oreo" </Value>
+	<Value> "กาแฟ นม คาราเมล และโอรีโอ้" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -4388,7 +4389,7 @@ CARAMEL OREO" </Value>
 	<EventOnClick> 
 		Var NameDrink = "PREMIUM GREEN TEA CARAMEL OREO"
 		Var NameDrinkTH = "พรีเมียมมัทฉะ คาราเมลโอริโอ้"
-		Var DrinkDescriptionTH = "มัทฉะ นม คาลาเมล และ Oreo"
+		Var DrinkDescriptionTH = "มัทฉะ นม คาราเมล และโอรีโอ้"
 		Var DrinkDescription = "Matcha, Milk, Caramel Syrup, Oreo"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Caramel_Matcha_Oreo_smoothie_oreo_11"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -4472,7 +4473,7 @@ CARAMEL OREO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "มัทฉะ นม คาลาเมล และ Oreo" </Value>
+	<Value> "มัทฉะ นม คาราเมล และโอรีโอ้" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -4642,7 +4643,7 @@ CARAMEL OREO" </Value>
 	<EventOnClick> 
 		Var NameDrink = "PREMIUM THAI TEA CARAMEL OREO"
 		Var NameDrinkTH = "พรีเมียมชาไทย คาราเมลโอริโอ้"
-		Var DrinkDescriptionTH = "ชาไทย นม คาลาเมล และ Oreo"
+		Var DrinkDescriptionTH = "ชาไทย นม คาราเมล และโอรีโอ้"
 		Var DrinkDescription = "Thai Tea, Milk, Caramel Syrup, Oreo"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Caramel_ThaiTea_Oreo_smoothie_oreo_11"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -4726,7 +4727,7 @@ CARAMEL OREO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "ชาไทย นม คาลาเมล และ Oreo" </Value>
+	<Value> "ชาไทย นม คาราเมล และโอรีโอ้" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
diff --git a/xml/page_catalog_group_pro_weekday_discount.xml b/xml/page_catalog_group_pro_weekday_discount.xml
index 1a93cd7d..637aac7d 100644
--- a/xml/page_catalog_group_pro_weekday_discount.xml
+++ b/xml/page_catalog_group_pro_weekday_discount.xml
@@ -53,7 +53,7 @@
 	<EventOnClick> 
 		Var NameDrink = "PREMIUM ESPRESSO CARAMEL OREO"
 		Var NameDrinkTH = "พรีเมียมเอสเพรสโซ่ คาราเมลโอริโอ้"
-		Var DrinkDescriptionTH = "กาแฟ นม คาลาเมล และ Oreo"
+		Var DrinkDescriptionTH = "กาแฟ นม คาราเมล และโอรีโอ้"
 		Var DrinkDescription = "Coffee, Milk, Caramel Syrup, Oreo"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -136,7 +136,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟ นม คาลาเมล และ Oreo" </Value>
+	<Value> "กาแฟ นม คาราเมล และโอรีโอ้" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -304,7 +304,7 @@ CARAMEL OREO" </Value>
 	<EventOnClick> 
 		Var NameDrink = "PREMIUM ESPRESSO CARAMEL OREO"
 		Var NameDrinkTH = "พรีเมียมเอสเพรสโซ่ คาราเมลโอริโอ้"
-		Var DrinkDescriptionTH = "กาแฟ นม คาลาเมล และ Oreo"
+		Var DrinkDescriptionTH = "กาแฟ นม คาราเมล และโอรีโอ้"
 		Var DrinkDescription = "Coffee, Milk, Caramel Syrup, Oreo"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -387,7 +387,7 @@ CARAMEL OREO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟ นม คาลาเมล และ Oreo" </Value>
+	<Value> "กาแฟ นม คาราเมล และโอรีโอ้" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -556,7 +556,7 @@ CARAMEL OREO" </Value>
 	<EventOnClick> 
 		Var NameDrink = "PREMIUM GREEN TEA CARAMEL OREO"
 		Var NameDrinkTH = "พรีเมียมมัทฉะ คาราเมลโอริโอ้"
-		Var DrinkDescriptionTH = "มัทฉะ นม คาลาเมล และ Oreo"
+		Var DrinkDescriptionTH = "มัทฉะ นม คาราเมล และโอรีโอ้"
 		Var DrinkDescription = "Matcha, Milk, Caramel Syrup, Oreo"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -639,7 +639,7 @@ CARAMEL OREO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "มัทฉะ นม คาลาเมล และ Oreo" </Value>
+	<Value> "มัทฉะ นม คาราเมล และโอรีโอ้" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -809,7 +809,7 @@ CARAMEL OREO" </Value>
 	<EventOnClick> 
 		Var NameDrink = "PREMIUM THAI TEA CARAMEL OREO"
 		Var NameDrinkTH = "พรีเมียมชาไทย คาราเมลโอริโอ้"
-		Var DrinkDescriptionTH = "ชาไทย นม คาลาเมล และ Oreo"
+		Var DrinkDescriptionTH = "ชาไทย นม คาราเมล และโอรีโอ้"
 		Var DrinkDescription = "Thai Tea, Milk, Caramel Syrup, Oreo"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -892,7 +892,7 @@ CARAMEL OREO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "ชาไทย นม คาลาเมล และ Oreo" </Value>
+	<Value> "ชาไทย นม คาราเมล และโอรีโอ้" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1062,7 +1062,7 @@ CARAMEL OREO" </Value>
 	<EventOnClick> 
 		Var NameDrink = "COCONUT MILK SMOOTHIE"
 		Var NameDrinkTH = "มะพร้าวน้ำหอมปั่น นมนิวซีแลนด์"
-		Var DrinkDescriptionTH = "มะพร้าวน้ำหอมปั่น นมนิวซีแลนด์"
+		Var DrinkDescriptionTH = "มะพร้าวน้ำหอมปั่น นม"
 		Var DrinkDescription = "Coconut syrup, Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_coconut_weekday_discount.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -1146,7 +1146,7 @@ CARAMEL OREO" </Value>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
 	<Value> "มะพร้าวน้ำหอมปั่น
-นมนิวซีแลนด์" </Value>
+นม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
diff --git a/xml/page_catalog_group_pro_weekday_discount_event_on.xml b/xml/page_catalog_group_pro_weekday_discount_event_on.xml
index d0f0b315..1e55e3fb 100644
--- a/xml/page_catalog_group_pro_weekday_discount_event_on.xml
+++ b/xml/page_catalog_group_pro_weekday_discount_event_on.xml
@@ -53,7 +53,7 @@
 	<EventOnClick> 
 		Var NameDrink = "PREMIUM ESPRESSO CARAMEL OREO"
 		Var NameDrinkTH = "พรีเมียมเอสเพรสโซ่ คาราเมลโอริโอ้"
-		Var DrinkDescriptionTH = "กาแฟ นม คาลาเมล และ Oreo"
+		Var DrinkDescriptionTH = "กาแฟ นม คาราเมล และโอรีโอ้"
 		Var DrinkDescription = "Coffee, Milk, Caramel Syrup, Oreo"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -136,7 +136,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟ นม คาลาเมล และ Oreo" </Value>
+	<Value> "กาแฟ นม คาราเมล และโอรีโอ้" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -304,7 +304,7 @@ CARAMEL OREO" </Value>
 	<EventOnClick> 
 		Var NameDrink = "PREMIUM ESPRESSO CARAMEL OREO"
 		Var NameDrinkTH = "พรีเมียมเอสเพรสโซ่ คาราเมลโอริโอ้"
-		Var DrinkDescriptionTH = "กาแฟ นม คาลาเมล และ Oreo"
+		Var DrinkDescriptionTH = "กาแฟ นม คาราเมล และโอรีโอ้"
 		Var DrinkDescription = "Coffee, Milk, Caramel Syrup, Oreo"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -387,7 +387,7 @@ CARAMEL OREO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟ นม คาลาเมล และ Oreo" </Value>
+	<Value> "กาแฟ นม คาราเมล และโอรีโอ้" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -556,7 +556,7 @@ CARAMEL OREO" </Value>
 	<EventOnClick> 
 		Var NameDrink = "PREMIUM GREEN TEA CARAMEL OREO"
 		Var NameDrinkTH = "พรีเมียมมัทฉะ คาราเมลโอริโอ้"
-		Var DrinkDescriptionTH = "มัทฉะ นม คาลาเมล และ Oreo"
+		Var DrinkDescriptionTH = "มัทฉะ นม คาราเมล และโอรีโอ้"
 		Var DrinkDescription = "Matcha, Milk, Caramel Syrup, Oreo"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -639,7 +639,7 @@ CARAMEL OREO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "มัทฉะ นม คาลาเมล และ Oreo" </Value>
+	<Value> "มัทฉะ นม คาราเมล และโอรีโอ้" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -809,7 +809,7 @@ CARAMEL OREO" </Value>
 	<EventOnClick> 
 		Var NameDrink = "PREMIUM THAI TEA CARAMEL OREO"
 		Var NameDrinkTH = "พรีเมียมชาไทย คาราเมลโอริโอ้"
-		Var DrinkDescriptionTH = "ชาไทย นม คาลาเมล และ Oreo"
+		Var DrinkDescriptionTH = "ชาไทย นม คาราเมล และโอรีโอ้"
 		Var DrinkDescription = "Thai Tea, Milk, Caramel Syrup, Oreo"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -892,7 +892,7 @@ CARAMEL OREO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "ชาไทย นม คาลาเมล และ Oreo" </Value>
+	<Value> "ชาไทย นม คาราเมล และโอรีโอ้" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1062,7 +1062,7 @@ CARAMEL OREO" </Value>
 	<EventOnClick> 
 		Var NameDrink = "COCONUT MILK SMOOTHIE"
 		Var NameDrinkTH = "มะพร้าวน้ำหอมปั่น นมนิวซีแลนด์"
-		Var DrinkDescriptionTH = "มะพร้าวน้ำหอมปั่น นมนิวซีแลนด์"
+		Var DrinkDescriptionTH = "มะพร้าวน้ำหอมปั่น นม"
 		Var DrinkDescription = "Coconut syrup, Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_coconut_weekday_discount_event_on.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -1146,7 +1146,7 @@ CARAMEL OREO" </Value>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
 	<Value> "มะพร้าวน้ำหอมปั่น
-นมนิวซีแลนด์" </Value>
+นม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1822,7 +1822,7 @@ SMOOTHIE" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED THAI MILK TEA COCONUT"
 		Var NameDrinkTH = "มะพร้าวชาไทย นมนิวซีแลนด์"
-		Var DrinkDescriptionTH = "มะพร้าว ชาไทย นมนิวซีแลนด์"
+		Var DrinkDescriptionTH = "มะพร้าว ชาไทย นม"
 		Var DrinkDescription = "Coconut syrup, Thai tea, Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -1905,7 +1905,7 @@ SMOOTHIE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "มะพร้าว ชาไทย นมนิวซีแลนด์" </Value>
+	<Value> "มะพร้าว ชาไทย นม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>