diff --git a/animation01/play_list.tsv b/animation01/play_list.tsv
index 5994a2c1..918d8260 100644
--- a/animation01/play_list.tsv
+++ b/animation01/play_list.tsv
@@ -1050,8 +1050,8 @@ PEPSI COCONUT SMOOTHIE	12-05-03-0091	1	23	62	14	41
 
 ไมโลร้อน	12-03-01-0048	1	51	17	16						24	120	18:00	23
 ไมโลเย็น	12-03-02-0048	1	51	17	23						24	120	19:00	23
-ไมโลเย็น	12-03-03-0048	1	51	17	23	41					24	120	20:00	23
-
+ไมโลปั่น	12-03-03-0048	1	51	17	23	41					24	120	20:00	23
+ไมโลปั่น	12-03-03-0049	1	51	17	23	41					24	120	20:00	23
 
 7UP ENERGY PLUM LIME SODA	12-05-02-0096	1	18	12	33	23	13				24	120	19:00	23
 7UP PLUM LIME SODA	12-05-02-0097	1	18	33	23	13					24	120	20:00	23
diff --git a/image/event/energy_drink_1_bath/1_baht_energy_EN.png b/image/event/energy_drink_1_bath/1_baht_energy_EN.png
index 9b904cd1..daa46126 100644
Binary files a/image/event/energy_drink_1_bath/1_baht_energy_EN.png and b/image/event/energy_drink_1_bath/1_baht_energy_EN.png differ
diff --git a/image/event/energy_drink_1_bath/1_baht_energy_TH.png b/image/event/energy_drink_1_bath/1_baht_energy_TH.png
index 6d431bdd..e0061e30 100644
Binary files a/image/event/energy_drink_1_bath/1_baht_energy_TH.png and b/image/event/energy_drink_1_bath/1_baht_energy_TH.png differ
diff --git a/inc/return_condition_when_deative.ev b/inc/return_condition.ev
similarity index 100%
rename from inc/return_condition_when_deative.ev
rename to inc/return_condition.ev
diff --git a/inter/aus/image/close_en/img_error_aus.png b/inter/aus/image/vending_error_en/img_error_aus.png
similarity index 100%
rename from inter/aus/image/close_en/img_error_aus.png
rename to inter/aus/image/vending_error_en/img_error_aus.png
diff --git a/inter/aus/xml/page_show_error.lxml b/inter/aus/xml/page_show_error.lxml
index 9e8e4657..cde27939 100644
--- a/inter/aus/xml/page_show_error.lxml
+++ b/inter/aus/xml/page_show_error.lxml
@@ -372,30 +372,36 @@
 <State> show_error_normal </State>
 <X> 69 </X>
 <Y> 642 </Y>
-<Filename> Var(DirImage + "/img_error_aus.png") </Filename>
-</Image>
-
-
-<Image>
-<State> show_error_sp1 </State>
-<X> 0 </X>
-<Y> 897 </Y>
 <Filename> Var(DirImage + "/img1.png") </Filename>
 </Image>
 
 <Image>
 <State> show_error_sp1 </State>
-<X> 0 </X>
-<Y> 694 </Y>
-<Filename> Var(DirImage + "/text1.png") </Filename>
+<X> 69 </X>
+<Y> 642 </Y>
+<Filename> Var(DirImage + "/img_error_aus.png") </Filename>
 </Image>
 
-<Image>
-<State> show_error_sp1 </State>
-<X> 127 </X>
-<Y> 1685 </Y>
-<Filename> Var(DirImage + "/text2.png") </Filename>
-</Image>
+;<Image>
+;<State> show_error_sp1 </State>
+;<X> 0 </X>
+;<Y> 897 </Y>
+;<Filename> Var(DirImage + "/img1.png") </Filename>
+;</Image>
+;
+;<Image>
+;<State> show_error_sp1 </State>
+;<X> 0 </X>
+;<Y> 694 </Y>
+;<Filename> Var(DirImage + "/text1.png") </Filename>
+;</Image>
+;
+;<Image>
+;<State> show_error_sp1 </State>
+;<X> 127 </X>
+;<Y> 1685 </Y>
+;<Filename> Var(DirImage + "/text2.png") </Filename>
+;</Image>
 
 <Button>
 <X> 0 </X>
diff --git a/inter/sgp/xml/page_catalog_group_milk.lxml b/inter/sgp/xml/page_catalog_group_milk.lxml
index 0ade0c48..1f73d9b1 100644
--- a/inter/sgp/xml/page_catalog_group_milk.lxml
+++ b/inter/sgp/xml/page_catalog_group_milk.lxml
@@ -4726,7 +4726,7 @@
 		Var PD_CODE3 = "52-03-03-0049"
 		; begin lang 
 		Var aliasName[0] = "MILO SMOOTHIE \nVOLCANO"
-		Var aliasDesc[0] = "Milo, Sugar, milk, Oreo"
+		Var aliasDesc[0] = "Milo, Sugar, milk"
 		Var aliasName[1] = "โอวัลตินปั่นภูเขาไฟ"
 		Var aliasDesc[1] = "โอวัลติน น้ำตาล และ นม"
 		Var aliasName[2] = "-"
@@ -4767,7 +4767,7 @@
 		Var NameLang[2][3] = "-"
 		Var NameLang[2][4] = ""
 		Var NameLang[2][5] = ""
-		Var DescLang[2][0] = "Milo, Sugar, milk, Oreo"
+		Var DescLang[2][0] = "Milo, Sugar, milk"
 		Var DescLang[2][1] = ""
 		Var DescLang[2][2] = "-"
 		Var DescLang[2][3] = "-"
@@ -4850,9 +4850,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Milo, Sugar, milk, Oreo</LanguageSlot1>
+		<LanguageSlot1>Milo, Sugar, milk</LanguageSlot1>
 		<LanguageSlot2>โอวัลติน น้ำตาล และ นม</LanguageSlot2>
-		<LanguageSlot3>Milo, Sugar, milk, Oreo</LanguageSlot3>
+		<LanguageSlot3>Milo, Sugar, milk</LanguageSlot3>
 		<LanguageSlot4>โอวัลติน น้ำตาล และ นม</LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6>โอวัลติน น้ำตาล และ นม</LanguageSlot6>
diff --git a/inter/sgp/xml/page_catalog_group_recommend.lxml b/inter/sgp/xml/page_catalog_group_recommend.lxml
index a45da484..516bd949 100644
--- a/inter/sgp/xml/page_catalog_group_recommend.lxml
+++ b/inter/sgp/xml/page_catalog_group_recommend.lxml
@@ -11203,7 +11203,7 @@
 		Var NameLang[2][3] = "-"
 		Var NameLang[2][4] = ""
 		Var NameLang[2][5] = ""
-		Var DescLang[2][0] = "Milo, Sugar, milk, Oreo"
+		Var DescLang[2][0] = "Milo, Sugar, milk"
 		Var DescLang[2][1] = ""
 		Var DescLang[2][2] = "-"
 		Var DescLang[2][3] = "-"
diff --git a/xml/event/promotion_energy_drink_1_bath.xml b/xml/event/promotion_energy_drink_1_bath.xml
index 97e2623d..8b4aca44 100644
--- a/xml/event/promotion_energy_drink_1_bath.xml
+++ b/xml/event/promotion_energy_drink_1_bath.xml
@@ -1970,14 +1970,14 @@
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -1988,14 +1988,14 @@
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -2005,15 +2005,15 @@
 	<State> $12-05-03-0092.Button </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-05-03-0092.Button </State>
-	<Value> StringFmt(  $12-05-03-0092.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-05-03-0092.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -2223,14 +2223,14 @@ Water" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -2241,14 +2241,14 @@ Water" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-03-02-0058.Button </State>
-	<Value> StringFmt( $12-03-02-0058.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-03-02-0058.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -2258,15 +2258,15 @@ Water" </Value>
 	<State> $12-03-03-0058.Button </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-03-03-0058.Button </State>
-	<Value> StringFmt(  $12-03-03-0058.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-03-03-0058.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -2476,14 +2476,14 @@ VOLCANO" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -2494,14 +2494,14 @@ VOLCANO" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -2511,15 +2511,15 @@ VOLCANO" </Value>
 	<State> $12-03-03-0009.Button </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-03-03-0009.Button </State>
-	<Value> StringFmt(  $12-03-03-0009.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-03-03-0009.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -2727,14 +2727,14 @@ VOLCANO" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-03-01-0002.Button </State>
-	<Value> StringFmt(  $12-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-03-01-0002.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -2745,14 +2745,14 @@ VOLCANO" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-03-02-0002.Button </State>
-	<Value> StringFmt( $12-03-02-0002.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-03-02-0002.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -2762,15 +2762,15 @@ VOLCANO" </Value>
 	<State> $12-03-03-0002.Button </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-03-03-0002.Button </State>
-	<Value> StringFmt(  $12-03-03-0002.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-03-03-0002.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -2985,14 +2985,14 @@ Sugar, Oreo" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -3003,14 +3003,14 @@ Sugar, Oreo" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -3020,15 +3020,15 @@ Sugar, Oreo" </Value>
 	<State> $12-03-03-0029.Button </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-03-03-0029.Button </State>
-	<Value> StringFmt(  $12-03-03-0029.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-03-03-0029.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -3238,14 +3238,14 @@ BANANA MILK" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-03-01-0024.Button </State>
-	<Value> StringFmt(  $12-03-01-0024.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-03-01-0024.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -3256,14 +3256,14 @@ BANANA MILK" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-03-02-0024.Button </State>
-	<Value> StringFmt( $12-03-02-0024.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-03-02-0024.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -3273,15 +3273,15 @@ BANANA MILK" </Value>
 	<State> $12-03-03-0024.Button </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-03-03-0024.Button </State>
-	<Value> StringFmt(  $12-03-03-0024.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-03-03-0024.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -3497,14 +3497,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -3515,14 +3515,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -3532,15 +3532,15 @@ Sugar, Biscof" </Value>
 	<State> $12-03-03-0041.Button </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-03-03-0041.Button </State>
-	<Value> StringFmt(  $12-03-03-0041.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-03-03-0041.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -3752,14 +3752,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -3770,14 +3770,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -3787,15 +3787,15 @@ Sugar, Biscof" </Value>
 	<State> $12-03-03-0042.Button </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-03-03-0042.Button </State>
-	<Value> StringFmt(  $12-03-03-0042.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-03-03-0042.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -4007,14 +4007,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -4025,14 +4025,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -4042,15 +4042,15 @@ Sugar, Biscof" </Value>
 	<State> $12-03-03-0043.Button </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-03-03-0043.Button </State>
-	<Value> StringFmt(  $12-03-03-0043.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-03-03-0043.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -4258,14 +4258,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -4276,14 +4276,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-02-62-0026.Button </State>
-	<Value> StringFmt( $12-02-62-0026.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-02-62-0026.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -4293,15 +4293,15 @@ Sugar, Biscof" </Value>
 	<State> $12-02-63-0026.Button </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-02-63-0026.Button </State>
-	<Value> StringFmt(  $12-02-63-0026.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-02-63-0026.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -4509,14 +4509,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -4527,14 +4527,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-02-62-0039.Button </State>
-	<Value> StringFmt( $12-02-62-0039.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-02-62-0039.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -4544,15 +4544,15 @@ Sugar, Biscof" </Value>
 	<State> $12-02-63-0039.Button </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-02-63-0039.Button </State>
-	<Value> StringFmt(  $12-02-63-0039.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-02-63-0039.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -4760,14 +4760,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -4778,14 +4778,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-02-62-0047.Button </State>
-	<Value> StringFmt( $12-02-62-0047.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-02-62-0047.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -4795,15 +4795,15 @@ Sugar, Biscof" </Value>
 	<State> $12-02-63-0047.Button </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-02-63-0047.Button </State>
-	<Value> StringFmt(  $12-02-63-0047.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-02-63-0047.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -5011,14 +5011,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -5029,14 +5029,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-02-62-0025.Button </State>
-	<Value> StringFmt( $12-02-62-0025.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-02-62-0025.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -5046,15 +5046,15 @@ Sugar, Biscof" </Value>
 	<State> $12-02-63-0025.Button </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-02-63-0025.Button </State>
-	<Value> StringFmt(  $12-02-63-0025.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-02-63-0025.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -5257,14 +5257,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $TAOTIM.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $TAOTIM.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -5275,14 +5275,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -5292,15 +5292,15 @@ Sugar, Biscof" </Value>
 	<State> $12-41-03-0028.Button </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-41-03-0028.Button </State>
-	<Value> StringFmt(  $12-41-03-0028.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-41-03-0028.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -5509,14 +5509,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -5527,14 +5527,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-03-82-0011.Button </State>
-	<Value> StringFmt( $12-03-82-0011.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-03-82-0011.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -5544,15 +5544,15 @@ Sugar, Biscof" </Value>
 	<State> $12-03-83-0011.Button </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-03-83-0011.Button </State>
-	<Value> StringFmt(  $12-03-83-0011.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-03-83-0011.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -5761,14 +5761,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -5779,14 +5779,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-03-82-0041.Button </State>
-	<Value> StringFmt( $12-03-82-0041.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-03-82-0041.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -5796,15 +5796,15 @@ Sugar, Biscof" </Value>
 	<State> $12-03-83-0041.Button </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-03-83-0041.Button </State>
-	<Value> StringFmt(  $12-03-83-0041.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-03-83-0041.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -6013,14 +6013,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -6031,14 +6031,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-03-82-0042.Button </State>
-	<Value> StringFmt( $12-03-82-0042.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-03-82-0042.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -6048,15 +6048,15 @@ Sugar, Biscof" </Value>
 	<State> $12-03-83-0042.Button </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-03-83-0042.Button </State>
-	<Value> StringFmt(  $12-03-83-0042.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-03-83-0042.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -6265,14 +6265,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -6283,14 +6283,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-03-82-0043.Button </State>
-	<Value> StringFmt( $12-03-82-0043.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-03-82-0043.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -6300,15 +6300,15 @@ Sugar, Biscof" </Value>
 	<State> $12-03-83-0043.Button </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-03-83-0043.Button </State>
-	<Value> StringFmt(  $12-03-83-0043.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-03-83-0043.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -6516,14 +6516,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-02-01-0037.Button </State>
-	<Value> StringFmt(  $12-02-01-0037.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-02-01-0037.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -6534,14 +6534,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-02-02-0037.Button </State>
-	<Value> StringFmt( $12-02-02-0037.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-02-02-0037.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -6551,15 +6551,15 @@ Sugar, Biscof" </Value>
 	<State> $12-02-03-0037.Button </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-02-03-0037.Button </State>
-	<Value> StringFmt(  $12-02-03-0037.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-02-03-0037.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -6771,14 +6771,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-02-01-0026.Button </State>
-	<Value> StringFmt(  $12-02-01-0026.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-02-01-0026.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -6789,14 +6789,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-02-02-0026.Button </State>
-	<Value> StringFmt( $12-02-02-0026.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-02-02-0026.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -6806,15 +6806,15 @@ Sugar, Biscof" </Value>
 	<State> $12-02-03-0026.Button </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-02-03-0026.Button </State>
-	<Value> StringFmt(  $12-02-03-0026.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-02-03-0026.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -7026,14 +7026,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-03-01-0022.Button </State>
-	<Value> StringFmt(  $12-03-01-0022.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-03-01-0022.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -7044,14 +7044,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-03-02-0022.Button </State>
-	<Value> StringFmt( $12-03-02-0022.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-03-02-0022.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -7061,15 +7061,15 @@ Sugar, Biscof" </Value>
 	<State> $12-03-03-0022.Button </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-03-03-0022.Button </State>
-	<Value> StringFmt(  $12-03-03-0022.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-03-03-0022.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -7281,14 +7281,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-01-01-0003.Button </State>
-	<Value> StringFmt(  $12-01-01-0003.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-01-01-0003.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -7299,14 +7299,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-01-02-0001.Button </State>
-	<Value> StringFmt( $12-01-02-0001.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-01-02-0001.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -7316,15 +7316,15 @@ Sugar, Biscof" </Value>
 	<State> "Invisible" </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -7536,14 +7536,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-21-01-0003.Button </State>
-	<Value> StringFmt(  $12-21-01-0003.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-21-01-0003.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -7554,14 +7554,14 @@ Sugar, Biscof" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-21-02-0001.Button </State>
-	<Value> StringFmt( $12-21-02-0001.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-21-02-0001.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -7571,15 +7571,15 @@ Sugar, Biscof" </Value>
 	<State> "Invisible" </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -7795,14 +7795,14 @@ ETHIOPAI GUJI" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-01-01-0014.Button </State>
-	<Value> StringFmt(  $12-01-01-0014.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-01-01-0014.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -7813,14 +7813,14 @@ ETHIOPAI GUJI" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-01-02-0011.Button </State>
-	<Value> StringFmt( $12-01-02-0011.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-01-02-0011.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -7830,15 +7830,15 @@ ETHIOPAI GUJI" </Value>
 	<State> "Invisible" </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -8054,14 +8054,14 @@ Note: Blue Berry & Floral" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-01-01-0019.Button </State>
-	<Value> StringFmt(  $12-01-01-0019.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-01-01-0019.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -8072,14 +8072,14 @@ Note: Blue Berry & Floral" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-01-02-0019.Button </State>
-	<Value> StringFmt( $12-01-02-0019.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-01-02-0019.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -8089,15 +8089,15 @@ Note: Blue Berry & Floral" </Value>
 	<State> "Invisible" </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -8313,14 +8313,14 @@ Note: Strawberry & Floral" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-01-01-0021.Button </State>
-	<Value> StringFmt(  $12-01-01-0021.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-01-01-0021.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -8331,14 +8331,14 @@ Note: Strawberry & Floral" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-01-02-0021.Button </State>
-	<Value> StringFmt( $12-01-02-0021.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-01-02-0021.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -8348,15 +8348,15 @@ Note: Strawberry & Floral" </Value>
 	<State> "Invisible" </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -8572,14 +8572,14 @@ Note: Whisky & Vanilla" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-01-01-0025.Button </State>
-	<Value> StringFmt(  $12-01-01-0025.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-01-01-0025.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -8590,14 +8590,14 @@ Note: Whisky & Vanilla" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-01-02-0025.Button </State>
-	<Value> StringFmt( $12-01-02-0025.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-01-02-0025.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -8607,15 +8607,15 @@ Note: Whisky & Vanilla" </Value>
 	<State> "Invisible" </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -8831,14 +8831,14 @@ Note: Jasmine & Honey" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-01-01-0023.Button </State>
-	<Value> StringFmt(  $12-01-01-0023.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-01-01-0023.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -8849,14 +8849,14 @@ Note: Jasmine & Honey" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-01-02-0023.Button </State>
-	<Value> StringFmt( $12-01-02-0023.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-01-02-0023.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -8866,15 +8866,15 @@ Note: Jasmine & Honey" </Value>
 	<State> "Invisible" </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -9090,14 +9090,14 @@ Note: Peach, tea, chocolate" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-01-01-0027.Button </State>
-	<Value> StringFmt(  $12-01-01-0027.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-01-01-0027.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -9108,14 +9108,14 @@ Note: Peach, tea, chocolate" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-01-02-0027.Button </State>
-	<Value> StringFmt( $12-01-02-0027.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-01-02-0027.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -9125,15 +9125,15 @@ Note: Peach, tea, chocolate" </Value>
 	<State> "Invisible" </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -9348,14 +9348,14 @@ AMERICANO" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-01-01-0032.Button </State>
-	<Value> StringFmt(  $12-01-01-0032.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-01-01-0032.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -9366,14 +9366,14 @@ AMERICANO" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-01-02-0032.Button </State>
-	<Value> StringFmt( $12-01-02-0032.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-01-02-0032.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -9383,15 +9383,15 @@ AMERICANO" </Value>
 	<State> "Invisible" </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -9605,14 +9605,14 @@ AMERICANO" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-01-01-0035.Button </State>
-	<Value> StringFmt(  $12-01-01-0035.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-01-01-0035.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -9623,14 +9623,14 @@ AMERICANO" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-01-02-0035.Button </State>
-	<Value> StringFmt( $12-01-02-0035.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-01-02-0035.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -9640,15 +9640,15 @@ AMERICANO" </Value>
 	<State> "Invisible" </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -9864,14 +9864,14 @@ Pink​ Rose & Berry" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-01-01-0038.Button </State>
-	<Value> StringFmt(  $12-01-01-0038.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-01-01-0038.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -9882,14 +9882,14 @@ Pink​ Rose & Berry" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-01-02-0038.Button </State>
-	<Value> StringFmt( $12-01-02-0038.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-01-02-0038.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -9899,15 +9899,15 @@ Pink​ Rose & Berry" </Value>
 	<State> "Invisible" </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -10123,14 +10123,14 @@ Note: Strawberry & Floral" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-01-01-0044.Button </State>
-	<Value> StringFmt(  $12-01-01-0044.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-01-01-0044.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -10141,14 +10141,14 @@ Note: Strawberry & Floral" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-01-02-0044.Button </State>
-	<Value> StringFmt( $12-01-02-0044.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-01-02-0044.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -10158,15 +10158,15 @@ Note: Strawberry & Floral" </Value>
 	<State> "Invisible" </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -10380,14 +10380,14 @@ AMERICANO" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-01-01-0047.Button </State>
-	<Value> StringFmt(  $12-01-01-0047.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-01-01-0047.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -10398,14 +10398,14 @@ AMERICANO" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-01-02-0047.Button </State>
-	<Value> StringFmt( $12-01-02-0047.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-01-02-0047.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -10415,15 +10415,15 @@ AMERICANO" </Value>
 	<State> "Invisible" </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -10637,14 +10637,14 @@ AMERICANO" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-01-01-0050.Button </State>
-	<Value> StringFmt(  $12-01-01-0050.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-01-01-0050.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -10655,14 +10655,14 @@ AMERICANO" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-01-02-0050.Button </State>
-	<Value> StringFmt( $12-01-02-0050.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-01-02-0050.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -10672,15 +10672,15 @@ AMERICANO" </Value>
 	<State> "Invisible" </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -10892,14 +10892,14 @@ AMERICANO" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-02-01-0045.Button </State>
-	<Value> StringFmt(  $12-02-01-0045.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-02-01-0045.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -10910,14 +10910,14 @@ AMERICANO" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-02-02-0045.Button </State>
-	<Value> StringFmt( $12-02-02-0045.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-02-02-0045.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -10927,15 +10927,15 @@ AMERICANO" </Value>
 	<State> $12-02-03-0046.Button </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-02-03-0046.Button </State>
-	<Value> StringFmt(  $12-02-03-0046.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-02-03-0046.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -11147,14 +11147,14 @@ AMERICANO" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-02-01-0046.Button </State>
-	<Value> StringFmt(  $12-02-01-0046.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-02-01-0046.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -11165,14 +11165,14 @@ AMERICANO" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-02-02-0046.Button </State>
-	<Value> StringFmt( $12-02-02-0046.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-02-02-0046.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -11182,15 +11182,15 @@ AMERICANO" </Value>
 	<State> $12-02-03-0047.Button </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-02-03-0047.Button </State>
-	<Value> StringFmt(  $12-02-03-0047.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-02-03-0047.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -11402,14 +11402,14 @@ AMERICANO" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-03-01-0001.Button </State>
-	<Value> StringFmt(  $12-03-01-0001.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-03-01-0001.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -11420,14 +11420,14 @@ AMERICANO" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-03-02-0001.Button </State>
-	<Value> StringFmt( $12-03-02-0001.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-03-02-0001.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -11437,15 +11437,15 @@ AMERICANO" </Value>
 	<State> $12-03-03-0001.Button </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-03-03-0001.Button </State>
-	<Value> StringFmt(  $12-03-03-0001.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-03-03-0001.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -11659,14 +11659,14 @@ Sugar" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -11677,14 +11677,14 @@ Sugar" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-03-02-0006.Button </State>
-	<Value> StringFmt( $12-03-02-0006.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-03-02-0006.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -11694,15 +11694,15 @@ Sugar" </Value>
 	<State> $12-03-03-0006.Button </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-03-03-0006.Button </State>
-	<Value> StringFmt(  $12-03-03-0006.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-03-03-0006.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -11912,14 +11912,14 @@ SMOOTHIE" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -11930,14 +11930,14 @@ SMOOTHIE" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -11947,15 +11947,15 @@ SMOOTHIE" </Value>
 	<State> $12-03-03-0011.Button </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-03-03-0011.Button </State>
-	<Value> StringFmt(  $12-03-03-0011.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-03-03-0011.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -12163,14 +12163,14 @@ SMOOTHIE" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -12181,14 +12181,14 @@ SMOOTHIE" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-05-02-0007.Button </State>
-	<Value> StringFmt( $12-05-02-0007.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-05-02-0007.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -12198,15 +12198,15 @@ SMOOTHIE" </Value>
 	<State> $12-05-03-0007.Button </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-05-03-0007.Button </State>
-	<Value> StringFmt(  $12-05-03-0007.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-05-03-0007.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -12414,14 +12414,14 @@ SMOOTHIE" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -12432,14 +12432,14 @@ SMOOTHIE" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-05-02-0046.Button </State>
-	<Value> StringFmt( $12-05-02-0046.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-05-02-0046.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -12449,15 +12449,15 @@ SMOOTHIE" </Value>
 	<State> $12-05-03-0046.Button </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-05-03-0046.Button </State>
-	<Value> StringFmt(  $12-05-03-0046.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-05-03-0046.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -12666,14 +12666,14 @@ DRINK SODA" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -12684,14 +12684,14 @@ DRINK SODA" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-05-02-0035.Button </State>
-	<Value> StringFmt( $12-05-02-0035.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-05-02-0035.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -12701,15 +12701,15 @@ DRINK SODA" </Value>
 	<State> $12-05-03-0035.Button </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-05-03-0035.Button </State>
-	<Value> StringFmt(  $12-05-03-0035.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-05-03-0035.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -12918,14 +12918,14 @@ LIMENADE SODA" </Value>
 	</Image>
 	<Text>
 	<X> 50 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -12936,14 +12936,14 @@ LIMENADE SODA" </Value>
 	</Image>
 	<Text>
 	<X> 115 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-05-02-0025.Button </State>
-	<Value> StringFmt( $12-05-02-0025.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-05-02-0025.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -12953,15 +12953,15 @@ LIMENADE SODA" </Value>
 	<State> $12-05-03-0025.Button </State>
 	</Image>
 	<Text>
-	<X> 180 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
+	<X> 183 </X>
+	<Y> 264 </Y>
+	<Size> 14 </Size>
 	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
+	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> $12-05-03-0025.Button </State>
-	<Value> StringFmt(  $12-05-03-0025.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> Var( "฿" + $12-05-03-0025.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -13050,13 +13050,10 @@ LIMENADE SODA" </Value>
 
 
 
-
-
 <Button>
     <X> 42 </X>
     <Y> 518 </Y>
 
-<State> BigButtonEnable </State>
     <Filename>
      eval( 
         If show_eng = "true" Then 
@@ -13085,57 +13082,12 @@ LIMENADE SODA" </Value>
         )
      </FilenameDisable>
 <EventOnClick> 
-        Open "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_check_member.xml"
+
+        Open "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_catalog.xml"
         
 </EventOnClick>
 
 
-<Video>
-    <X> 42 </X>
-    <Y> 518 </Y>
-    <Width> 484 </Width>
-    <Height> 616 </Height>
-    <Loop> "true" </Loop>
-    <State> 
-        eval(
-            If show_eng = "true" Then
-                Var return = "Invisible"
-            Else
-                Var return  = "Enable"
-            EndIf
-        ) 
-    </State>
-    <Filename> "ROOT/taobin_project/image/event/energy_drink_1_bath/energy_drink_1_bath_th.mp4" </Filename>
-</Video>
-
-<Video>
-    <X> 42 </X>
-    <Y> 518 </Y>
-    <Width> 484 </Width>
-    <Height> 616 </Height>
-    <State> 
-        eval(
-            If show_eng = "true" Then
-                Var return = "Enable"
-            Else
-                Var return  = "Invisible"
-            EndIf
-        ) 
-    </State>
-    <Loop> "true" </Loop>
-    <Filename> "ROOT/taobin_project/image/event/energy_drink_1_bath/energy_drink_1_bath_en.mp4" </Filename>
-</Video>
-
-</Button>
-
-<EventUnitTest1>
-    Var BigButtonEnable = "Enable"  
-    Refresh
-</EventUnitTest1>
-<EventUnitTest2>
-    Var BigButtonEnable = "Invisible"
-    Refresh
-</EventUnitTest2>
 
 
 <Button>
diff --git a/xml/page_board.xml b/xml/page_board.xml
index 5044e29d..6de8f9db 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -698,6 +698,8 @@
 
 	;inter-page-board
 	If CountryName = "Australia" Then
+
+		Var SettingVideoBrewingUseCommon = 1
 		
 		TRY "/mnt/sdcard/coffeevending/taobin_project/inter/aus/video/script_video.ev"
 		
diff --git a/xml/page_catalog2.xml b/xml/page_catalog2.xml
index 1a657a8a..d79753c6 100644
--- a/xml/page_catalog2.xml
+++ b/xml/page_catalog2.xml
@@ -109,8 +109,9 @@
 	EndIf
 
 	If SELLSTATUS = "DEACTIVE" Then
-	
-	;include="ROOT/taobin_project/inc/return_condition_when_deative.ev"
+		SAVELOG "DEACTIVE in catalog2.xml"
+
+	;include="ROOT/taobin_project/inc/return_condition.ev"
 	
 	EndIf
 
diff --git a/xml/page_get_yourchange.xml b/xml/page_get_yourchange.xml
index 1346ba8d..87e7a184 100644
--- a/xml/page_get_yourchange.xml
+++ b/xml/page_get_yourchange.xml
@@ -80,7 +80,7 @@
 				DEBUGVAR PayDetail
 				DEBUGVAR PayDetail2
 
-				UpdateTxRef2 TxRef1  ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate PayO2 PdpaAccept VendingDiscount VendingCampaign PayReference PayType CreditReference PayDetail, PayDetail2
+				UpdateTxRef2 TxRef1  ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate PayO2 PdpaAccept VendingDiscount VendingCampaign PayReference PayType CreditReference PayDetail PayDetail2
 			EndIf
 
 
diff --git a/xml/page_payment.xml b/xml/page_payment.xml
index 3ecf7d29..6c4bbfe5 100644
--- a/xml/page_payment.xml
+++ b/xml/page_payment.xml
@@ -458,6 +458,8 @@
 
 	Var CoundDownStillOnPage = 240
 
+	__CMD "CLEAR_TIME_BLINK_DISPLAY" 0 "-" "-"
+
 </EventOpen>
 <Timeout> 900 </Timeout>
 <EventTimeout> 
diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml
index 4fbc173e..60810a40 100644
--- a/xml/page_payment_cash.xml
+++ b/xml/page_payment_cash.xml
@@ -2547,6 +2547,9 @@
 				EndIf
 
 				If  Seeker.IntVendingCredit > 0 Then
+					If Seeker.IntVendingCampaign > 0 Then
+						Var ECommerceQR =	ECommerceQR + ":"
+					EndIf
 					Var ECommerceQR =	ECommerceQR + "CRD"
 					Var ECommerceQR =	ECommerceQR + ":"
 					Var ECommerceQR =	ECommerceQR + Seeker.TNumberTaobinCredit
diff --git a/xml/page_topping_select7.xml b/xml/page_topping_select7.xml
index 1727bb33..384d8353 100644
--- a/xml/page_topping_select7.xml
+++ b/xml/page_topping_select7.xml
@@ -509,6 +509,15 @@
 	DEBUGVAR MenuReady
 	DEBUGVAR CupRemain
 
+	If SELLSTATUS = "DEACTIVE" Then
+		SAVELOG "DEACTIVE in page_topping_select7.xml"
+
+	;include="ROOT/taobin_project/inc/return_condition.ev"
+	
+	EndIf
+
+
+
 	If SelectDrinkType = 1 Then
 		
 
diff --git a/xml_main/startup.xml b/xml_main/startup.xml
index b9098ef9..7ab3b98a 100644
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "8.49"
-	Var XMLPageVersionInt = 849
+	Var XMLPageVersion = "8.50"
+	Var XMLPageVersionInt = 850
 ;Oreo
 Var OreoGuarantee = 0