diff --git a/image/page_drink/bn_hot_double_espresso.png b/image/page_drink/bn_hot_double_espresso.png
index 850261d3..637bc737 100644
Binary files a/image/page_drink/bn_hot_double_espresso.png and b/image/page_drink/bn_hot_double_espresso.png differ
diff --git a/image/page_drink/bn_iced_Cokecola.png b/image/page_drink/bn_iced_Cokecola.png
new file mode 100644
index 00000000..bb50ca3a
Binary files /dev/null and b/image/page_drink/bn_iced_Cokecola.png differ
diff --git a/image/page_drink/bn_iced_sprite.png b/image/page_drink/bn_iced_sprite.png
index 580ee5ee..723aacc4 100644
Binary files a/image/page_drink/bn_iced_sprite.png and b/image/page_drink/bn_iced_sprite.png differ
diff --git a/image/page_drink_disable/bn_hot_double_espresso.png b/image/page_drink_disable/bn_hot_double_espresso.png
index 46bad73e..edfa8aff 100644
Binary files a/image/page_drink_disable/bn_hot_double_espresso.png and b/image/page_drink_disable/bn_hot_double_espresso.png differ
diff --git a/image/page_drink_disable/bn_iced_Cokecola.png b/image/page_drink_disable/bn_iced_Cokecola.png
new file mode 100644
index 00000000..8d7fa7b0
Binary files /dev/null and b/image/page_drink_disable/bn_iced_Cokecola.png differ
diff --git a/image/page_drink_disable/bn_iced_sprite.png b/image/page_drink_disable/bn_iced_sprite.png
index fb58a6e6..e42d9d45 100644
Binary files a/image/page_drink_disable/bn_iced_sprite.png and b/image/page_drink_disable/bn_iced_sprite.png differ
diff --git a/image/page_drink_press/bn_hot_double_espresso.png b/image/page_drink_press/bn_hot_double_espresso.png
index 598eebd6..1b9a787d 100644
Binary files a/image/page_drink_press/bn_hot_double_espresso.png and b/image/page_drink_press/bn_hot_double_espresso.png differ
diff --git a/image/page_drink_press/bn_iced_Cokecola.png b/image/page_drink_press/bn_iced_Cokecola.png
new file mode 100644
index 00000000..8ff411e3
Binary files /dev/null and b/image/page_drink_press/bn_iced_Cokecola.png differ
diff --git a/image/page_drink_press/bn_iced_sprite.png b/image/page_drink_press/bn_iced_sprite.png
index d9fbd4bc..663b9863 100644
Binary files a/image/page_drink_press/bn_iced_sprite.png and b/image/page_drink_press/bn_iced_sprite.png differ
diff --git a/image/page_drink_select/bn_hot_double_espresso.png b/image/page_drink_select/bn_hot_double_espresso.png
index 842a8fa7..7e608911 100644
Binary files a/image/page_drink_select/bn_hot_double_espresso.png and b/image/page_drink_select/bn_hot_double_espresso.png differ
diff --git a/image/page_drink_select/bn_iced_Cokecola.png b/image/page_drink_select/bn_iced_Cokecola.png
new file mode 100644
index 00000000..6d9b4441
Binary files /dev/null and b/image/page_drink_select/bn_iced_Cokecola.png differ
diff --git a/image/page_drink_select/bn_iced_sprite.png b/image/page_drink_select/bn_iced_sprite.png
index 143704a3..4b64a8af 100644
Binary files a/image/page_drink_select/bn_iced_sprite.png and b/image/page_drink_select/bn_iced_sprite.png differ
diff --git a/image/topping/Group 149.png b/image/topping/Group 149.png
new file mode 100644
index 00000000..24d77e53
Binary files /dev/null and b/image/topping/Group 149.png differ
diff --git a/image/topping/add_shot_img.png b/image/topping/add_shot_img.png
new file mode 100644
index 00000000..3eb1a10d
Binary files /dev/null and b/image/topping/add_shot_img.png differ
diff --git a/image/topping/add_shot_img_2.png b/image/topping/add_shot_img_2.png
new file mode 100644
index 00000000..1f9409c9
Binary files /dev/null and b/image/topping/add_shot_img_2.png differ
diff --git a/image/topping/cb_ch.png b/image/topping/cb_ch.png
new file mode 100644
index 00000000..8e632445
Binary files /dev/null and b/image/topping/cb_ch.png differ
diff --git a/image/topping/cb_nch.png b/image/topping/cb_nch.png
new file mode 100644
index 00000000..e3401d66
Binary files /dev/null and b/image/topping/cb_nch.png differ
diff --git a/image/topping/extra_img_1.png b/image/topping/extra_img_1.png
new file mode 100644
index 00000000..56eb92ca
Binary files /dev/null and b/image/topping/extra_img_1.png differ
diff --git a/image/topping_en/add_shot_img.png b/image/topping_en/add_shot_img.png
new file mode 100644
index 00000000..338f072c
Binary files /dev/null and b/image/topping_en/add_shot_img.png differ
diff --git a/image/topping_en/add_shot_img_2.png b/image/topping_en/add_shot_img_2.png
new file mode 100644
index 00000000..008c7148
Binary files /dev/null and b/image/topping_en/add_shot_img_2.png differ
diff --git a/image/topping_en/cb_ch.png b/image/topping_en/cb_ch.png
new file mode 100644
index 00000000..8e632445
Binary files /dev/null and b/image/topping_en/cb_ch.png differ
diff --git a/image/topping_en/cb_nch.png b/image/topping_en/cb_nch.png
new file mode 100644
index 00000000..e3401d66
Binary files /dev/null and b/image/topping_en/cb_nch.png differ
diff --git a/image/topping_en/extra_img_1.png b/image/topping_en/extra_img_1.png
new file mode 100644
index 00000000..447eea45
Binary files /dev/null and b/image/topping_en/extra_img_1.png differ
diff --git a/xml/menu_catalog.xml b/xml/menu_catalog.xml
index 6d5b982d..39c8cca9 100644
--- a/xml/menu_catalog.xml
+++ b/xml/menu_catalog.xml
@@ -59,6 +59,8 @@
     Else
         Var show_eng = "true"
     EndIf
+    
+
     Open CurrentXMLFileName2
 </EventClick>
 </Button>
diff --git a/xml/menu_gen.py b/xml/menu_gen.py
index 0a7c14dd..099bebf6 100644
--- a/xml/menu_gen.py
+++ b/xml/menu_gen.py
@@ -1,5 +1,5 @@
   if menu_count >= 16:
-    scroll_height = 1650
+    scroll_height = 1670
   else:
     scroll_height = 1400
 
diff --git a/xml/page_board.xml b/xml/page_board.xml
index a1c52f71..8d41eb31 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -12,7 +12,7 @@
 
 
 	Var sub_profile = "whey"
-	Var taobin_version = "1.04"
+	Var taobin_version = "1.05"
 	; 1.00 is 
 
 	; On open
@@ -243,8 +243,8 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	;Open "//mnt/sdcard/coffeevending/taobin_project/xml/vending_info.xml"
-	Open "//mnt/sdcard/coffeevending/taobin_project/xml/page_remove_cup.xml"
+	Open "//mnt/sdcard/coffeevending/taobin_project/xml/vending_info.xml"
+	;Open "//mnt/sdcard/coffeevending/taobin_project/xml/page_remove_cup.xml"
 </EventClick>
 </Button>
 
diff --git a/xml/page_catalog_choose_drink1.xml b/xml/page_catalog_choose_drink1.xml
index 4f4ba15d..89c16411 100644
--- a/xml/page_catalog_choose_drink1.xml
+++ b/xml/page_catalog_choose_drink1.xml
@@ -104,6 +104,8 @@
     Else
         Var show_eng = "true"
     EndIf
+    
+
     Open CurrentXMLFileName2
 </EventClick>
 </Button>
@@ -208,7 +210,7 @@
 <Y> 497 </Y>
 <Width> 1080 </Width>
 <Height> 1500 </Height>
-<ScrollHeight> 1650 </ScrollHeight>
+<ScrollHeight> 1670 </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 	; button i=1 11-99-01-0001 
 	<Button>
diff --git a/xml/page_catalog_choose_drink2.pml b/xml/page_catalog_choose_drink2.pml
index 497e6f5f..f6fd132c 100644
--- a/xml/page_catalog_choose_drink2.pml
+++ b/xml/page_catalog_choose_drink2.pml
@@ -8,6 +8,7 @@
 
  product_code = []
  product_code.append('11-99-01-0001')
+ product_code.append('11-99-01-0101')
  product_code.append('11-99-01-0002')
  product_code.append('11-99-01-0003')
 
diff --git a/xml/page_catalog_choose_drink2.xml b/xml/page_catalog_choose_drink2.xml
index 41336c59..91c723a3 100644
--- a/xml/page_catalog_choose_drink2.xml
+++ b/xml/page_catalog_choose_drink2.xml
@@ -105,6 +105,8 @@
     Else
         Var show_eng = "true"
     EndIf
+    
+
     Open CurrentXMLFileName2
 </EventClick>
 </Button>
@@ -210,7 +212,7 @@
 <Y> 497 </Y>
 <Width> 1080 </Width>
 <Height> 1500 </Height>
-<ScrollHeight> 1650 </ScrollHeight>
+<ScrollHeight> 1670 </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 	; button i=1 11-99-01-0001 
 	<Button>
@@ -235,10 +237,33 @@
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
-	; button i=2 11-99-01-0002 
+	; button i=2 11-99-01-0101 
 	<Button>
 	<X> 301 </X> 
 	<Y> 20 </Y> 
+	<State> $11-99-01-0101.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $11-99-01-0101.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-01-0101.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-01-0101.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = "11-99-01-0101"
+		Var NameDrink = $11-99-01-0101.NameE
+		Var NameDrinkTH = $11-99-01-0101.Name
+		Var DrinkDescriptionTH = $11-99-01-0101.description
+		Var DrinkDescription = $11-99-01-0101.descriptionE
+		Var PriceDrink = $11-99-01-0101.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-01-0101.image
+		Topping "Load" SelectDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+	</EventOnClick>
+	</Button>
+	; button i=3 11-99-01-0002 
+	<Button>
+	<X> 558 </X> 
+	<Y> 20 </Y> 
 	<State> $11-99-01-0002.Button  </State> 
 	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $11-99-01-0002.image ) </Filename>
 	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-01-0002.image ) " </FilenamePress>
@@ -258,9 +283,9 @@
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
-	; button i=3 11-99-01-0003 
+	; button i=4 11-99-01-0003 
 	<Button>
-	<X> 558 </X> 
+	<X> 815 </X> 
 	<Y> 20 </Y> 
 	<State> $11-99-01-0003.Button  </State> 
 	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $11-99-01-0003.image ) </Filename>
@@ -281,10 +306,10 @@
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
-	; button i=4 11-99-01-0004 
+	; button i=5 11-99-01-0004 
 	<Button>
-	<X> 815 </X> 
-	<Y> 20 </Y> 
+	<X> 44 </X> 
+	<Y> 348 </Y> 
 	<State> $11-99-01-0004.Button  </State> 
 	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $11-99-01-0004.image ) </Filename>
 	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-01-0004.image ) " </FilenamePress>
@@ -304,9 +329,9 @@
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
-	; button i=5 11-99-01-0005 
+	; button i=6 11-99-01-0005 
 	<Button>
-	<X> 44 </X> 
+	<X> 301 </X> 
 	<Y> 348 </Y> 
 	<State> $11-99-01-0005.Button  </State> 
 	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $11-99-01-0005.image ) </Filename>
@@ -327,9 +352,9 @@
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
-	; button i=6 11-99-01-0006 
+	; button i=7 11-99-01-0006 
 	<Button>
-	<X> 301 </X> 
+	<X> 558 </X> 
 	<Y> 348 </Y> 
 	<State> $11-99-01-0006.Button  </State> 
 	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $11-99-01-0006.image ) </Filename>
@@ -350,9 +375,9 @@
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
-	; button i=7 11-99-01-0008 
+	; button i=8 11-99-01-0008 
 	<Button>
-	<X> 558 </X> 
+	<X> 815 </X> 
 	<Y> 348 </Y> 
 	<State> $11-99-01-0008.Button  </State> 
 	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $11-99-01-0008.image ) </Filename>
@@ -373,10 +398,10 @@
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
-	; button i=8 11-99-01-0010 
+	; button i=9 11-99-01-0010 
 	<Button>
-	<X> 815 </X> 
-	<Y> 348 </Y> 
+	<X> 44 </X> 
+	<Y> 676 </Y> 
 	<State> $11-99-01-0010.Button  </State> 
 	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $11-99-01-0010.image ) </Filename>
 	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-01-0010.image ) " </FilenamePress>
@@ -396,9 +421,9 @@
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
-	; button i=9 11-99-01-0011 
+	; button i=10 11-99-01-0011 
 	<Button>
-	<X> 44 </X> 
+	<X> 301 </X> 
 	<Y> 676 </Y> 
 	<State> $11-99-01-0011.Button  </State> 
 	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $11-99-01-0011.image ) </Filename>
@@ -419,9 +444,9 @@
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
-	; button i=10 11-99-02-0001 
+	; button i=11 11-99-02-0001 
 	<Button>
-	<X> 301 </X> 
+	<X> 558 </X> 
 	<Y> 676 </Y> 
 	<State> $11-99-02-0001.Button  </State> 
 	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0001.image ) </Filename>
@@ -442,9 +467,9 @@
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
-	; button i=11 11-99-02-0002 
+	; button i=12 11-99-02-0002 
 	<Button>
-	<X> 558 </X> 
+	<X> 815 </X> 
 	<Y> 676 </Y> 
 	<State> $11-99-02-0002.Button  </State> 
 	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0002.image ) </Filename>
@@ -465,10 +490,10 @@
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
-	; button i=12 11-99-02-0003 
+	; button i=13 11-99-02-0003 
 	<Button>
-	<X> 815 </X> 
-	<Y> 676 </Y> 
+	<X> 44 </X> 
+	<Y> 1004 </Y> 
 	<State> $11-99-02-0003.Button  </State> 
 	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0003.image ) </Filename>
 	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-02-0003.image ) " </FilenamePress>
@@ -488,9 +513,9 @@
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
-	; button i=13 11-99-02-0004 
+	; button i=14 11-99-02-0004 
 	<Button>
-	<X> 44 </X> 
+	<X> 301 </X> 
 	<Y> 1004 </Y> 
 	<State> $11-99-02-0004.Button  </State> 
 	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0004.image ) </Filename>
@@ -511,9 +536,9 @@
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
-	; button i=14 11-99-02-0005 
+	; button i=15 11-99-02-0005 
 	<Button>
-	<X> 301 </X> 
+	<X> 558 </X> 
 	<Y> 1004 </Y> 
 	<State> $11-99-02-0005.Button  </State> 
 	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0005.image ) </Filename>
@@ -534,9 +559,9 @@
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
-	; button i=15 11-99-02-0006 
+	; button i=16 11-99-02-0006 
 	<Button>
-	<X> 558 </X> 
+	<X> 815 </X> 
 	<Y> 1004 </Y> 
 	<State> $11-99-02-0006.Button  </State> 
 	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0006.image ) </Filename>
@@ -557,10 +582,10 @@
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
-	; button i=16 11-99-02-0007 
+	; button i=17 11-99-02-0007 
 	<Button>
-	<X> 815 </X> 
-	<Y> 1004 </Y> 
+	<X> 44 </X> 
+	<Y> 1332 </Y> 
 	<State> $11-99-02-0007.Button  </State> 
 	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0007.image ) </Filename>
 	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-02-0007.image ) " </FilenamePress>
@@ -580,9 +605,9 @@
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
-	; button i=17 11-99-02-0009 
+	; button i=18 11-99-02-0009 
 	<Button>
-	<X> 44 </X> 
+	<X> 301 </X> 
 	<Y> 1332 </Y> 
 	<State> $11-99-02-0009.Button  </State> 
 	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0009.image ) </Filename>
@@ -603,9 +628,9 @@
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
-	; button i=18 11-99-02-0011 
+	; button i=19 11-99-02-0011 
 	<Button>
-	<X> 301 </X> 
+	<X> 558 </X> 
 	<Y> 1332 </Y> 
 	<State> $11-99-02-0011.Button  </State> 
 	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0011.image ) </Filename>
@@ -695,7 +720,7 @@
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> $11-99-01-0002.Price </Value>
+	<Value> $11-99-01-0101.Price </Value>
 	</Text>
 	<Text>
 	<X> 465 </X>
@@ -715,10 +740,71 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
+	<Value> $11-99-01-0101.Name </Value>
+	</Text>
+	<Text>
+	<X> 317 </X>
+	<Y> 266 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $11-99-01-0101.description </Value>
+	</Text>
+	<Text>
+	<X> 317 </X>
+	<Y> 210 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $11-99-01-0101.NameE </Value>
+	</Text>
+	<Text>
+	<X> 317 </X>
+	<Y> 266 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> $11-99-01-0101.descriptionE </Value>
+	</Text>
+	<Text>
+	<X> 740 </X>
+	<Y> 32 </Y>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $11-99-01-0002.Price </Value>
+	</Text>
+	<Text>
+	<X> 722 </X>
+	<Y> 32 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X> 574 </X>
+	<Y> 210 </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
 	<Value> $11-99-01-0002.Name </Value>
 	</Text>
 	<Text>
-	<X> 317 </X>
+	<X> 574 </X>
 	<Y> 266 </Y>
 	<Size> 14 </Size>
 	<Width>220</Width>
@@ -728,7 +814,7 @@
 	<Value> $11-99-01-0002.description </Value>
 	</Text>
 	<Text>
-	<X> 317 </X>
+	<X> 574 </X>
 	<Y> 210 </Y>
 	<Size> 22 </Size>
 	<Width>220</Width>
@@ -739,7 +825,7 @@
 	<Value> $11-99-01-0002.NameE </Value>
 	</Text>
 	<Text>
-	<X> 317 </X>
+	<X> 574 </X>
 	<Y> 266 </Y>
 	<Size> 14 </Size>
 	<Width>220</Width>
@@ -749,7 +835,7 @@
 	<Value> $11-99-01-0002.descriptionE </Value>
 	</Text>
 	<Text>
-	<X> 740 </X>
+	<X> 997 </X>
 	<Y> 32 </Y>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
@@ -759,7 +845,7 @@
 	<Value> $11-99-01-0003.Price </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 979 </X>
 	<Y> 32 </Y>
 	<Width>20</Width>
 	<Size> 27 </Size>
@@ -768,7 +854,7 @@
 	<Value> "฿"" </Value>
 	</Text>
 	<Text>
-	<X> 574 </X>
+	<X> 831 </X>
 	<Y> 210 </Y>
 	<Size> 24 </Size>
 	<Width>220</Width>
@@ -779,7 +865,7 @@
 	<Value> $11-99-01-0003.Name </Value>
 	</Text>
 	<Text>
-	<X> 574 </X>
+	<X> 831 </X>
 	<Y> 266 </Y>
 	<Size> 14 </Size>
 	<Width>220</Width>
@@ -789,7 +875,7 @@
 	<Value> $11-99-01-0003.description </Value>
 	</Text>
 	<Text>
-	<X> 574 </X>
+	<X> 831 </X>
 	<Y> 210 </Y>
 	<Size> 22 </Size>
 	<Width>220</Width>
@@ -800,7 +886,7 @@
 	<Value> $11-99-01-0003.NameE </Value>
 	</Text>
 	<Text>
-	<X> 574 </X>
+	<X> 831 </X>
 	<Y> 266 </Y>
 	<Size> 14 </Size>
 	<Width>220</Width>
@@ -810,67 +896,6 @@
 	<Value> $11-99-01-0003.descriptionE </Value>
 	</Text>
 	<Text>
-	<X> 997 </X>
-	<Y> 32 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-01-0004.Price </Value>
-	</Text>
-	<Text>
-	<X> 979 </X>
-	<Y> 32 </Y>
-	<Width>20</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
-	</Text>
-	<Text>
-	<X> 831 </X>
-	<Y> 210 </Y>
-	<Size> 24 </Size>
-	<Width>220</Width>
-	<Mode> "multi2" </Mode>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x322B26 </Color>
-	<State> showthaiText </State>
-	<Value> $11-99-01-0004.Name </Value>
-	</Text>
-	<Text>
-	<X> 831 </X>
-	<Y> 266 </Y>
-	<Size> 14 </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<State> showthaiText </State>
-	<Value> $11-99-01-0004.description </Value>
-	</Text>
-	<Text>
-	<X> 831 </X>
-	<Y> 210 </Y>
-	<Size> 22 </Size>
-	<Width>220</Width>
-	<Mode> "multi2" </Mode>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x322B26 </Color>
-	<State> showengText </State>
-	<Value> $11-99-01-0004.NameE </Value>
-	</Text>
-	<Text>
-	<X> 831 </X>
-	<Y> 266 </Y>
-	<Size> 14 </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<State> showengText </State>
-	<Value> $11-99-01-0004.descriptionE </Value>
-	</Text>
-	<Text>
 	<X> 226 </X>
 	<Y> 360 </Y>
 	<Align> "Hurr" </Align>
@@ -878,7 +903,7 @@
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> $11-99-01-0005.Price </Value>
+	<Value> $11-99-01-0004.Price </Value>
 	</Text>
 	<Text>
 	<X> 208 </X>
@@ -898,10 +923,71 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
+	<Value> $11-99-01-0004.Name </Value>
+	</Text>
+	<Text>
+	<X> 60 </X>
+	<Y> 594 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $11-99-01-0004.description </Value>
+	</Text>
+	<Text>
+	<X> 60 </X>
+	<Y> 538 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $11-99-01-0004.NameE </Value>
+	</Text>
+	<Text>
+	<X> 60 </X>
+	<Y> 594 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> $11-99-01-0004.descriptionE </Value>
+	</Text>
+	<Text>
+	<X> 483 </X>
+	<Y> 360 </Y>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $11-99-01-0005.Price </Value>
+	</Text>
+	<Text>
+	<X> 465 </X>
+	<Y> 360 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X> 317 </X>
+	<Y> 538 </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
 	<Value> $11-99-01-0005.Name </Value>
 	</Text>
 	<Text>
-	<X> 60 </X>
+	<X> 317 </X>
 	<Y> 594 </Y>
 	<Size> 14 </Size>
 	<Width>220</Width>
@@ -911,7 +997,7 @@
 	<Value> $11-99-01-0005.description </Value>
 	</Text>
 	<Text>
-	<X> 60 </X>
+	<X> 317 </X>
 	<Y> 538 </Y>
 	<Size> 22 </Size>
 	<Width>220</Width>
@@ -922,7 +1008,7 @@
 	<Value> $11-99-01-0005.NameE </Value>
 	</Text>
 	<Text>
-	<X> 60 </X>
+	<X> 317 </X>
 	<Y> 594 </Y>
 	<Size> 14 </Size>
 	<Width>220</Width>
@@ -932,7 +1018,7 @@
 	<Value> $11-99-01-0005.descriptionE </Value>
 	</Text>
 	<Text>
-	<X> 483 </X>
+	<X> 740 </X>
 	<Y> 360 </Y>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
@@ -942,7 +1028,7 @@
 	<Value> $11-99-01-0006.Price </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 722 </X>
 	<Y> 360 </Y>
 	<Width>20</Width>
 	<Size> 27 </Size>
@@ -951,7 +1037,7 @@
 	<Value> "฿"" </Value>
 	</Text>
 	<Text>
-	<X> 317 </X>
+	<X> 574 </X>
 	<Y> 538 </Y>
 	<Size> 24 </Size>
 	<Width>220</Width>
@@ -962,7 +1048,7 @@
 	<Value> $11-99-01-0006.Name </Value>
 	</Text>
 	<Text>
-	<X> 317 </X>
+	<X> 574 </X>
 	<Y> 594 </Y>
 	<Size> 14 </Size>
 	<Width>220</Width>
@@ -972,7 +1058,7 @@
 	<Value> $11-99-01-0006.description </Value>
 	</Text>
 	<Text>
-	<X> 317 </X>
+	<X> 574 </X>
 	<Y> 538 </Y>
 	<Size> 22 </Size>
 	<Width>220</Width>
@@ -983,7 +1069,7 @@
 	<Value> $11-99-01-0006.NameE </Value>
 	</Text>
 	<Text>
-	<X> 317 </X>
+	<X> 574 </X>
 	<Y> 594 </Y>
 	<Size> 14 </Size>
 	<Width>220</Width>
@@ -993,7 +1079,7 @@
 	<Value> $11-99-01-0006.descriptionE </Value>
 	</Text>
 	<Text>
-	<X> 740 </X>
+	<X> 997 </X>
 	<Y> 360 </Y>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
@@ -1003,7 +1089,7 @@
 	<Value> $11-99-01-0008.Price </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 979 </X>
 	<Y> 360 </Y>
 	<Width>20</Width>
 	<Size> 27 </Size>
@@ -1012,7 +1098,7 @@
 	<Value> "฿"" </Value>
 	</Text>
 	<Text>
-	<X> 574 </X>
+	<X> 831 </X>
 	<Y> 538 </Y>
 	<Size> 24 </Size>
 	<Width>220</Width>
@@ -1023,7 +1109,7 @@
 	<Value> $11-99-01-0008.Name </Value>
 	</Text>
 	<Text>
-	<X> 574 </X>
+	<X> 831 </X>
 	<Y> 594 </Y>
 	<Size> 14 </Size>
 	<Width>220</Width>
@@ -1033,7 +1119,7 @@
 	<Value> $11-99-01-0008.description </Value>
 	</Text>
 	<Text>
-	<X> 574 </X>
+	<X> 831 </X>
 	<Y> 538 </Y>
 	<Size> 22 </Size>
 	<Width>220</Width>
@@ -1044,7 +1130,7 @@
 	<Value> $11-99-01-0008.NameE </Value>
 	</Text>
 	<Text>
-	<X> 574 </X>
+	<X> 831 </X>
 	<Y> 594 </Y>
 	<Size> 14 </Size>
 	<Width>220</Width>
@@ -1054,67 +1140,6 @@
 	<Value> $11-99-01-0008.descriptionE </Value>
 	</Text>
 	<Text>
-	<X> 997 </X>
-	<Y> 360 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-01-0010.Price </Value>
-	</Text>
-	<Text>
-	<X> 979 </X>
-	<Y> 360 </Y>
-	<Width>20</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
-	</Text>
-	<Text>
-	<X> 831 </X>
-	<Y> 538 </Y>
-	<Size> 24 </Size>
-	<Width>220</Width>
-	<Mode> "multi2" </Mode>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x322B26 </Color>
-	<State> showthaiText </State>
-	<Value> $11-99-01-0010.Name </Value>
-	</Text>
-	<Text>
-	<X> 831 </X>
-	<Y> 594 </Y>
-	<Size> 14 </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<State> showthaiText </State>
-	<Value> $11-99-01-0010.description </Value>
-	</Text>
-	<Text>
-	<X> 831 </X>
-	<Y> 538 </Y>
-	<Size> 22 </Size>
-	<Width>220</Width>
-	<Mode> "multi2" </Mode>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x322B26 </Color>
-	<State> showengText </State>
-	<Value> $11-99-01-0010.NameE </Value>
-	</Text>
-	<Text>
-	<X> 831 </X>
-	<Y> 594 </Y>
-	<Size> 14 </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<State> showengText </State>
-	<Value> $11-99-01-0010.descriptionE </Value>
-	</Text>
-	<Text>
 	<X> 226 </X>
 	<Y> 688 </Y>
 	<Align> "Hurr" </Align>
@@ -1122,7 +1147,7 @@
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> $11-99-01-0011.Price </Value>
+	<Value> $11-99-01-0010.Price </Value>
 	</Text>
 	<Text>
 	<X> 208 </X>
@@ -1142,10 +1167,71 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
+	<Value> $11-99-01-0010.Name </Value>
+	</Text>
+	<Text>
+	<X> 60 </X>
+	<Y> 922 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $11-99-01-0010.description </Value>
+	</Text>
+	<Text>
+	<X> 60 </X>
+	<Y> 866 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $11-99-01-0010.NameE </Value>
+	</Text>
+	<Text>
+	<X> 60 </X>
+	<Y> 922 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> $11-99-01-0010.descriptionE </Value>
+	</Text>
+	<Text>
+	<X> 483 </X>
+	<Y> 688 </Y>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $11-99-01-0011.Price </Value>
+	</Text>
+	<Text>
+	<X> 465 </X>
+	<Y> 688 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X> 317 </X>
+	<Y> 866 </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
 	<Value> $11-99-01-0011.Name </Value>
 	</Text>
 	<Text>
-	<X> 60 </X>
+	<X> 317 </X>
 	<Y> 922 </Y>
 	<Size> 14 </Size>
 	<Width>220</Width>
@@ -1155,7 +1241,7 @@
 	<Value> $11-99-01-0011.description </Value>
 	</Text>
 	<Text>
-	<X> 60 </X>
+	<X> 317 </X>
 	<Y> 866 </Y>
 	<Size> 22 </Size>
 	<Width>220</Width>
@@ -1166,7 +1252,7 @@
 	<Value> $11-99-01-0011.NameE </Value>
 	</Text>
 	<Text>
-	<X> 60 </X>
+	<X> 317 </X>
 	<Y> 922 </Y>
 	<Size> 14 </Size>
 	<Width>220</Width>
@@ -1176,7 +1262,7 @@
 	<Value> $11-99-01-0011.descriptionE </Value>
 	</Text>
 	<Text>
-	<X> 483 </X>
+	<X> 740 </X>
 	<Y> 688 </Y>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
@@ -1186,7 +1272,7 @@
 	<Value> $11-99-02-0001.Price </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 722 </X>
 	<Y> 688 </Y>
 	<Width>20</Width>
 	<Size> 27 </Size>
@@ -1195,7 +1281,7 @@
 	<Value> "฿"" </Value>
 	</Text>
 	<Text>
-	<X> 317 </X>
+	<X> 574 </X>
 	<Y> 866 </Y>
 	<Size> 24 </Size>
 	<Width>220</Width>
@@ -1206,7 +1292,7 @@
 	<Value> $11-99-02-0001.Name </Value>
 	</Text>
 	<Text>
-	<X> 317 </X>
+	<X> 574 </X>
 	<Y> 922 </Y>
 	<Size> 14 </Size>
 	<Width>220</Width>
@@ -1216,7 +1302,7 @@
 	<Value> $11-99-02-0001.description </Value>
 	</Text>
 	<Text>
-	<X> 317 </X>
+	<X> 574 </X>
 	<Y> 866 </Y>
 	<Size> 22 </Size>
 	<Width>220</Width>
@@ -1227,7 +1313,7 @@
 	<Value> $11-99-02-0001.NameE </Value>
 	</Text>
 	<Text>
-	<X> 317 </X>
+	<X> 574 </X>
 	<Y> 922 </Y>
 	<Size> 14 </Size>
 	<Width>220</Width>
@@ -1237,7 +1323,7 @@
 	<Value> $11-99-02-0001.descriptionE </Value>
 	</Text>
 	<Text>
-	<X> 740 </X>
+	<X> 997 </X>
 	<Y> 688 </Y>
 	<Align> "Hurr" </Align>
 	<Width>150</Width>
@@ -1247,7 +1333,7 @@
 	<Value> $11-99-02-0002.Price </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 979 </X>
 	<Y> 688 </Y>
 	<Width>20</Width>
 	<Size> 27 </Size>
@@ -1256,7 +1342,7 @@
 	<Value> "฿"" </Value>
 	</Text>
 	<Text>
-	<X> 574 </X>
+	<X> 831 </X>
 	<Y> 866 </Y>
 	<Size> 24 </Size>
 	<Width>220</Width>
@@ -1267,7 +1353,7 @@
 	<Value> $11-99-02-0002.Name </Value>
 	</Text>
 	<Text>
-	<X> 574 </X>
+	<X> 831 </X>
 	<Y> 922 </Y>
 	<Size> 14 </Size>
 	<Width>220</Width>
@@ -1277,7 +1363,7 @@
 	<Value> $11-99-02-0002.description </Value>
 	</Text>
 	<Text>
-	<X> 574 </X>
+	<X> 831 </X>
 	<Y> 866 </Y>
 	<Size> 22 </Size>
 	<Width>220</Width>
@@ -1288,7 +1374,7 @@
 	<Value> $11-99-02-0002.NameE </Value>
 	</Text>
 	<Text>
-	<X> 574 </X>
+	<X> 831 </X>
 	<Y> 922 </Y>
 	<Size> 14 </Size>
 	<Width>220</Width>
@@ -1298,67 +1384,6 @@
 	<Value> $11-99-02-0002.descriptionE </Value>
 	</Text>
 	<Text>
-	<X> 997 </X>
-	<Y> 688 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0003.Price </Value>
-	</Text>
-	<Text>
-	<X> 979 </X>
-	<Y> 688 </Y>
-	<Width>20</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
-	</Text>
-	<Text>
-	<X> 831 </X>
-	<Y> 866 </Y>
-	<Size> 24 </Size>
-	<Width>220</Width>
-	<Mode> "multi2" </Mode>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x322B26 </Color>
-	<State> showthaiText </State>
-	<Value> $11-99-02-0003.Name </Value>
-	</Text>
-	<Text>
-	<X> 831 </X>
-	<Y> 922 </Y>
-	<Size> 14 </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<State> showthaiText </State>
-	<Value> $11-99-02-0003.description </Value>
-	</Text>
-	<Text>
-	<X> 831 </X>
-	<Y> 866 </Y>
-	<Size> 22 </Size>
-	<Width>220</Width>
-	<Mode> "multi2" </Mode>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x322B26 </Color>
-	<State> showengText </State>
-	<Value> $11-99-02-0003.NameE </Value>
-	</Text>
-	<Text>
-	<X> 831 </X>
-	<Y> 922 </Y>
-	<Size> 14 </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<State> showengText </State>
-	<Value> $11-99-02-0003.descriptionE </Value>
-	</Text>
-	<Text>
 	<X> 226 </X>
 	<Y> 1016 </Y>
 	<Align> "Hurr" </Align>
@@ -1366,7 +1391,7 @@
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0004.Price </Value>
+	<Value> $11-99-02-0003.Price </Value>
 	</Text>
 	<Text>
 	<X> 208 </X>
@@ -1386,7 +1411,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> $11-99-02-0004.Name </Value>
+	<Value> $11-99-02-0003.Name </Value>
 	</Text>
 	<Text>
 	<X> 60 </X>
@@ -1396,7 +1421,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> $11-99-02-0004.description </Value>
+	<Value> $11-99-02-0003.description </Value>
 	</Text>
 	<Text>
 	<X> 60 </X>
@@ -1407,7 +1432,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> $11-99-02-0004.NameE </Value>
+	<Value> $11-99-02-0003.NameE </Value>
 	</Text>
 	<Text>
 	<X> 60 </X>
@@ -1417,7 +1442,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> $11-99-02-0004.descriptionE </Value>
+	<Value> $11-99-02-0003.descriptionE </Value>
 	</Text>
 	<Text>
 	<X> 483 </X>
@@ -1427,7 +1452,7 @@
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0005.Price </Value>
+	<Value> $11-99-02-0004.Price </Value>
 	</Text>
 	<Text>
 	<X> 465 </X>
@@ -1447,7 +1472,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> $11-99-02-0005.Name </Value>
+	<Value> $11-99-02-0004.Name </Value>
 	</Text>
 	<Text>
 	<X> 317 </X>
@@ -1457,7 +1482,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> $11-99-02-0005.description </Value>
+	<Value> $11-99-02-0004.description </Value>
 	</Text>
 	<Text>
 	<X> 317 </X>
@@ -1468,7 +1493,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> $11-99-02-0005.NameE </Value>
+	<Value> $11-99-02-0004.NameE </Value>
 	</Text>
 	<Text>
 	<X> 317 </X>
@@ -1478,7 +1503,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> $11-99-02-0005.descriptionE </Value>
+	<Value> $11-99-02-0004.descriptionE </Value>
 	</Text>
 	<Text>
 	<X> 740 </X>
@@ -1488,7 +1513,7 @@
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0006.Price </Value>
+	<Value> $11-99-02-0005.Price </Value>
 	</Text>
 	<Text>
 	<X> 722 </X>
@@ -1508,7 +1533,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> $11-99-02-0006.Name </Value>
+	<Value> $11-99-02-0005.Name </Value>
 	</Text>
 	<Text>
 	<X> 574 </X>
@@ -1518,7 +1543,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> $11-99-02-0006.description </Value>
+	<Value> $11-99-02-0005.description </Value>
 	</Text>
 	<Text>
 	<X> 574 </X>
@@ -1529,7 +1554,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> $11-99-02-0006.NameE </Value>
+	<Value> $11-99-02-0005.NameE </Value>
 	</Text>
 	<Text>
 	<X> 574 </X>
@@ -1539,7 +1564,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> $11-99-02-0006.descriptionE </Value>
+	<Value> $11-99-02-0005.descriptionE </Value>
 	</Text>
 	<Text>
 	<X> 997 </X>
@@ -1549,7 +1574,7 @@
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0007.Price </Value>
+	<Value> $11-99-02-0006.Price </Value>
 	</Text>
 	<Text>
 	<X> 979 </X>
@@ -1569,7 +1594,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> $11-99-02-0007.Name </Value>
+	<Value> $11-99-02-0006.Name </Value>
 	</Text>
 	<Text>
 	<X> 831 </X>
@@ -1579,7 +1604,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> $11-99-02-0007.description </Value>
+	<Value> $11-99-02-0006.description </Value>
 	</Text>
 	<Text>
 	<X> 831 </X>
@@ -1590,7 +1615,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> $11-99-02-0007.NameE </Value>
+	<Value> $11-99-02-0006.NameE </Value>
 	</Text>
 	<Text>
 	<X> 831 </X>
@@ -1600,7 +1625,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> $11-99-02-0007.descriptionE </Value>
+	<Value> $11-99-02-0006.descriptionE </Value>
 	</Text>
 	<Text>
 	<X> 226 </X>
@@ -1610,7 +1635,7 @@
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0009.Price </Value>
+	<Value> $11-99-02-0007.Price </Value>
 	</Text>
 	<Text>
 	<X> 208 </X>
@@ -1630,7 +1655,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> $11-99-02-0009.Name </Value>
+	<Value> $11-99-02-0007.Name </Value>
 	</Text>
 	<Text>
 	<X> 60 </X>
@@ -1640,7 +1665,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> $11-99-02-0009.description </Value>
+	<Value> $11-99-02-0007.description </Value>
 	</Text>
 	<Text>
 	<X> 60 </X>
@@ -1651,7 +1676,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> $11-99-02-0009.NameE </Value>
+	<Value> $11-99-02-0007.NameE </Value>
 	</Text>
 	<Text>
 	<X> 60 </X>
@@ -1661,7 +1686,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> $11-99-02-0009.descriptionE </Value>
+	<Value> $11-99-02-0007.descriptionE </Value>
 	</Text>
 	<Text>
 	<X> 483 </X>
@@ -1671,7 +1696,7 @@
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0011.Price </Value>
+	<Value> $11-99-02-0009.Price </Value>
 	</Text>
 	<Text>
 	<X> 465 </X>
@@ -1691,7 +1716,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> $11-99-02-0011.Name </Value>
+	<Value> $11-99-02-0009.Name </Value>
 	</Text>
 	<Text>
 	<X> 317 </X>
@@ -1701,7 +1726,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> $11-99-02-0011.description </Value>
+	<Value> $11-99-02-0009.description </Value>
 	</Text>
 	<Text>
 	<X> 317 </X>
@@ -1712,7 +1737,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> $11-99-02-0011.NameE </Value>
+	<Value> $11-99-02-0009.NameE </Value>
 	</Text>
 	<Text>
 	<X> 317 </X>
@@ -1722,6 +1747,67 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
+	<Value> $11-99-02-0009.descriptionE </Value>
+	</Text>
+	<Text>
+	<X> 740 </X>
+	<Y> 1344 </Y>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $11-99-02-0011.Price </Value>
+	</Text>
+	<Text>
+	<X> 722 </X>
+	<Y> 1344 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X> 574 </X>
+	<Y> 1522 </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> $11-99-02-0011.Name </Value>
+	</Text>
+	<Text>
+	<X> 574 </X>
+	<Y> 1578 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $11-99-02-0011.description </Value>
+	</Text>
+	<Text>
+	<X> 574 </X>
+	<Y> 1522 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $11-99-02-0011.NameE </Value>
+	</Text>
+	<Text>
+	<X> 574 </X>
+	<Y> 1578 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
 	<Value> $11-99-02-0011.descriptionE </Value>
 	</Text>
 </FrameScroll>
diff --git a/xml/page_catalog_choose_drink3.xml b/xml/page_catalog_choose_drink3.xml
index 973b6a4f..8e2510ed 100644
--- a/xml/page_catalog_choose_drink3.xml
+++ b/xml/page_catalog_choose_drink3.xml
@@ -102,6 +102,8 @@
     Else
         Var show_eng = "true"
     EndIf
+    
+
     Open CurrentXMLFileName2
 </EventClick>
 </Button>
@@ -207,7 +209,7 @@
 <Y> 497 </Y>
 <Width> 1080 </Width>
 <Height> 1500 </Height>
-<ScrollHeight> 1650 </ScrollHeight>
+<ScrollHeight> 1670 </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 	; button i=1 11-99-01-0017 
 	<Button>
diff --git a/xml/page_catalog_choose_drink4.xml b/xml/page_catalog_choose_drink4.xml
index 02442b8f..342f3cc5 100644
--- a/xml/page_catalog_choose_drink4.xml
+++ b/xml/page_catalog_choose_drink4.xml
@@ -102,6 +102,8 @@
     Else
         Var show_eng = "true"
     EndIf
+    
+
     Open CurrentXMLFileName2
 </EventClick>
 </Button>
diff --git a/xml/page_catalog_choose_drink5.xml b/xml/page_catalog_choose_drink5.xml
index 1beb38ff..37cace31 100644
--- a/xml/page_catalog_choose_drink5.xml
+++ b/xml/page_catalog_choose_drink5.xml
@@ -103,6 +103,8 @@
     Else
         Var show_eng = "true"
     EndIf
+    
+
     Open CurrentXMLFileName2
 </EventClick>
 </Button>
diff --git a/xml/page_catalog_choose_drink6.pml b/xml/page_catalog_choose_drink6.pml
index b0ee5b96..edd868af 100644
--- a/xml/page_catalog_choose_drink6.pml
+++ b/xml/page_catalog_choose_drink6.pml
@@ -8,6 +8,8 @@
  product_code = []
  product_code.append('11-99-02-0033')
  product_code.append('11-99-02-0051')
+ #product_code.append('11-99-02-0045')
+ #product_code.append('11-99-02-0046')
  product_code.append('11-99-02-0036')
  product_code.append('11-99-02-0037')
  
@@ -19,10 +21,20 @@
 
  product_code.append('11-99-02-0040')
  product_code.append('11-99-02-0041')
+
+ product_code.append('11-99-01-0027')
+ product_code.append('11-99-02-0027')
+ product_code.append('11-99-02-0030')
+ product_code.append('11-99-02-0031')
+
+ product_code.append('11-99-02-0032')
+ product_code.append('11-99-02-0028')
+ product_code.append('11-99-02-0029')
  product_code.append('11-99-01-0042')
  product_code.append('11-99-02-0043')
  product_code.append('11-99-02-0044')
- product_code.append('11-99-02-0045')
+ 
+ product_code.append('11-99-01-0045')
 
  menu_count = len( product_code)
 
diff --git a/xml/page_catalog_choose_drink6.xml b/xml/page_catalog_choose_drink6.xml
index 4fc9845a..04f57a55 100644
--- a/xml/page_catalog_choose_drink6.xml
+++ b/xml/page_catalog_choose_drink6.xml
@@ -102,6 +102,8 @@
     Else
         Var show_eng = "true"
     EndIf
+    
+
     Open CurrentXMLFileName2
 </EventClick>
 </Button>
@@ -210,7 +212,7 @@
 <Y> 497 </Y>
 <Width> 1080 </Width>
 <Height> 1500 </Height>
-<ScrollHeight> 1400 </ScrollHeight>
+<ScrollHeight> 1670 </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 	; button i=1 11-99-02-0033 
 	<Button>
@@ -442,10 +444,171 @@
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
-	; button i=11 11-99-01-0042 
+	; button i=11 11-99-01-0027 
 	<Button>
 	<X> 558 </X> 
 	<Y> 676 </Y> 
+	<State> $11-99-01-0027.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $11-99-01-0027.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-01-0027.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-01-0027.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = "11-99-01-0027"
+		Var NameDrink = $11-99-01-0027.NameE
+		Var NameDrinkTH = $11-99-01-0027.Name
+		Var DrinkDescriptionTH = $11-99-01-0027.description
+		Var DrinkDescription = $11-99-01-0027.descriptionE
+		Var PriceDrink = $11-99-01-0027.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-01-0027.image
+		Topping "Load" SelectDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+	</EventOnClick>
+	</Button>
+	; button i=12 11-99-02-0027 
+	<Button>
+	<X> 815 </X> 
+	<Y> 676 </Y> 
+	<State> $11-99-02-0027.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0027.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-02-0027.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-02-0027.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = "11-99-02-0027"
+		Var NameDrink = $11-99-02-0027.NameE
+		Var NameDrinkTH = $11-99-02-0027.Name
+		Var DrinkDescriptionTH = $11-99-02-0027.description
+		Var DrinkDescription = $11-99-02-0027.descriptionE
+		Var PriceDrink = $11-99-02-0027.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-02-0027.image
+		Topping "Load" SelectDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+	</EventOnClick>
+	</Button>
+	; button i=13 11-99-02-0030 
+	<Button>
+	<X> 44 </X> 
+	<Y> 1004 </Y> 
+	<State> $11-99-02-0030.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0030.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-02-0030.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-02-0030.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = "11-99-02-0030"
+		Var NameDrink = $11-99-02-0030.NameE
+		Var NameDrinkTH = $11-99-02-0030.Name
+		Var DrinkDescriptionTH = $11-99-02-0030.description
+		Var DrinkDescription = $11-99-02-0030.descriptionE
+		Var PriceDrink = $11-99-02-0030.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-02-0030.image
+		Topping "Load" SelectDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+	</EventOnClick>
+	</Button>
+	; button i=14 11-99-02-0031 
+	<Button>
+	<X> 301 </X> 
+	<Y> 1004 </Y> 
+	<State> $11-99-02-0031.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0031.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-02-0031.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-02-0031.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = "11-99-02-0031"
+		Var NameDrink = $11-99-02-0031.NameE
+		Var NameDrinkTH = $11-99-02-0031.Name
+		Var DrinkDescriptionTH = $11-99-02-0031.description
+		Var DrinkDescription = $11-99-02-0031.descriptionE
+		Var PriceDrink = $11-99-02-0031.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-02-0031.image
+		Topping "Load" SelectDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+	</EventOnClick>
+	</Button>
+	; button i=15 11-99-02-0032 
+	<Button>
+	<X> 558 </X> 
+	<Y> 1004 </Y> 
+	<State> $11-99-02-0032.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0032.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-02-0032.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-02-0032.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = "11-99-02-0032"
+		Var NameDrink = $11-99-02-0032.NameE
+		Var NameDrinkTH = $11-99-02-0032.Name
+		Var DrinkDescriptionTH = $11-99-02-0032.description
+		Var DrinkDescription = $11-99-02-0032.descriptionE
+		Var PriceDrink = $11-99-02-0032.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-02-0032.image
+		Topping "Load" SelectDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+	</EventOnClick>
+	</Button>
+	; button i=16 11-99-02-0028 
+	<Button>
+	<X> 815 </X> 
+	<Y> 1004 </Y> 
+	<State> $11-99-02-0028.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0028.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-02-0028.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-02-0028.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = "11-99-02-0028"
+		Var NameDrink = $11-99-02-0028.NameE
+		Var NameDrinkTH = $11-99-02-0028.Name
+		Var DrinkDescriptionTH = $11-99-02-0028.description
+		Var DrinkDescription = $11-99-02-0028.descriptionE
+		Var PriceDrink = $11-99-02-0028.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-02-0028.image
+		Topping "Load" SelectDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+	</EventOnClick>
+	</Button>
+	; button i=17 11-99-02-0029 
+	<Button>
+	<X> 44 </X> 
+	<Y> 1332 </Y> 
+	<State> $11-99-02-0029.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0029.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-02-0029.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-02-0029.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = "11-99-02-0029"
+		Var NameDrink = $11-99-02-0029.NameE
+		Var NameDrinkTH = $11-99-02-0029.Name
+		Var DrinkDescriptionTH = $11-99-02-0029.description
+		Var DrinkDescription = $11-99-02-0029.descriptionE
+		Var PriceDrink = $11-99-02-0029.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-02-0029.image
+		Topping "Load" SelectDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+	</EventOnClick>
+	</Button>
+	; button i=18 11-99-01-0042 
+	<Button>
+	<X> 301 </X> 
+	<Y> 1332 </Y> 
 	<State> $11-99-01-0042.Button  </State> 
 	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $11-99-01-0042.image ) </Filename>
 	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-01-0042.image ) " </FilenamePress>
@@ -465,10 +628,10 @@
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
-	; button i=12 11-99-02-0043 
+	; button i=19 11-99-02-0043 
 	<Button>
-	<X> 815 </X> 
-	<Y> 676 </Y> 
+	<X> 558 </X> 
+	<Y> 1332 </Y> 
 	<State> $11-99-02-0043.Button  </State> 
 	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0043.image ) </Filename>
 	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-02-0043.image ) " </FilenamePress>
@@ -488,10 +651,10 @@
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
-	; button i=13 11-99-02-0044 
+	; button i=20 11-99-02-0044 
 	<Button>
-	<X> 44 </X> 
-	<Y> 1004 </Y> 
+	<X> 815 </X> 
+	<Y> 1332 </Y> 
 	<State> $11-99-02-0044.Button  </State> 
 	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0044.image ) </Filename>
 	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-02-0044.image ) " </FilenamePress>
@@ -511,24 +674,24 @@
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
-	; button i=14 11-99-02-0045 
+	; button i=21 11-99-01-0045 
 	<Button>
-	<X> 301 </X> 
-	<Y> 1004 </Y> 
-	<State> $11-99-02-0045.Button  </State> 
-	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0045.image ) </Filename>
-	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-02-0045.image ) " </FilenamePress>
-	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-02-0045.image ) " </FilenameDisable>
+	<X> 44 </X> 
+	<Y> 1660 </Y> 
+	<State> $11-99-01-0045.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $11-99-01-0045.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-01-0045.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-01-0045.image ) " </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var SelectDrink = "11-99-02-0045"
-		Var NameDrink = $11-99-02-0045.NameE
-		Var NameDrinkTH = $11-99-02-0045.Name
-		Var DrinkDescriptionTH = $11-99-02-0045.description
-		Var DrinkDescription = $11-99-02-0045.descriptionE
-		Var PriceDrink = $11-99-02-0045.Price
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-02-0045.image
+		Var SelectDrink = "11-99-01-0045"
+		Var NameDrink = $11-99-01-0045.NameE
+		Var NameDrinkTH = $11-99-01-0045.Name
+		Var DrinkDescriptionTH = $11-99-01-0045.description
+		Var DrinkDescription = $11-99-01-0045.descriptionE
+		Var PriceDrink = $11-99-01-0045.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-01-0045.image
 		Topping "Load" SelectDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
@@ -1152,7 +1315,7 @@
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> $11-99-01-0042.Price </Value>
+	<Value> $11-99-01-0027.Price </Value>
 	</Text>
 	<Text>
 	<X> 722 </X>
@@ -1172,7 +1335,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> $11-99-01-0042.Name </Value>
+	<Value> $11-99-01-0027.Name </Value>
 	</Text>
 	<Text>
 	<X> 574 </X>
@@ -1182,7 +1345,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> $11-99-01-0042.description </Value>
+	<Value> $11-99-01-0027.description </Value>
 	</Text>
 	<Text>
 	<X> 574 </X>
@@ -1193,7 +1356,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> $11-99-01-0042.NameE </Value>
+	<Value> $11-99-01-0027.NameE </Value>
 	</Text>
 	<Text>
 	<X> 574 </X>
@@ -1203,7 +1366,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> $11-99-01-0042.descriptionE </Value>
+	<Value> $11-99-01-0027.descriptionE </Value>
 	</Text>
 	<Text>
 	<X> 997 </X>
@@ -1213,7 +1376,7 @@
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0043.Price </Value>
+	<Value> $11-99-02-0027.Price </Value>
 	</Text>
 	<Text>
 	<X> 979 </X>
@@ -1233,7 +1396,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> $11-99-02-0043.Name </Value>
+	<Value> $11-99-02-0027.Name </Value>
 	</Text>
 	<Text>
 	<X> 831 </X>
@@ -1243,7 +1406,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> $11-99-02-0043.description </Value>
+	<Value> $11-99-02-0027.description </Value>
 	</Text>
 	<Text>
 	<X> 831 </X>
@@ -1254,7 +1417,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> $11-99-02-0043.NameE </Value>
+	<Value> $11-99-02-0027.NameE </Value>
 	</Text>
 	<Text>
 	<X> 831 </X>
@@ -1264,7 +1427,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> $11-99-02-0043.descriptionE </Value>
+	<Value> $11-99-02-0027.descriptionE </Value>
 	</Text>
 	<Text>
 	<X> 226 </X>
@@ -1274,7 +1437,7 @@
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0044.Price </Value>
+	<Value> $11-99-02-0030.Price </Value>
 	</Text>
 	<Text>
 	<X> 208 </X>
@@ -1294,7 +1457,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> $11-99-02-0044.Name </Value>
+	<Value> $11-99-02-0030.Name </Value>
 	</Text>
 	<Text>
 	<X> 60 </X>
@@ -1304,7 +1467,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> $11-99-02-0044.description </Value>
+	<Value> $11-99-02-0030.description </Value>
 	</Text>
 	<Text>
 	<X> 60 </X>
@@ -1315,7 +1478,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> $11-99-02-0044.NameE </Value>
+	<Value> $11-99-02-0030.NameE </Value>
 	</Text>
 	<Text>
 	<X> 60 </X>
@@ -1325,7 +1488,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> $11-99-02-0044.descriptionE </Value>
+	<Value> $11-99-02-0030.descriptionE </Value>
 	</Text>
 	<Text>
 	<X> 483 </X>
@@ -1335,7 +1498,7 @@
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0045.Price </Value>
+	<Value> $11-99-02-0031.Price </Value>
 	</Text>
 	<Text>
 	<X> 465 </X>
@@ -1355,7 +1518,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> $11-99-02-0045.Name </Value>
+	<Value> $11-99-02-0031.Name </Value>
 	</Text>
 	<Text>
 	<X> 317 </X>
@@ -1365,7 +1528,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> $11-99-02-0045.description </Value>
+	<Value> $11-99-02-0031.description </Value>
 	</Text>
 	<Text>
 	<X> 317 </X>
@@ -1376,7 +1539,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> $11-99-02-0045.NameE </Value>
+	<Value> $11-99-02-0031.NameE </Value>
 	</Text>
 	<Text>
 	<X> 317 </X>
@@ -1386,7 +1549,434 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> $11-99-02-0045.descriptionE </Value>
+	<Value> $11-99-02-0031.descriptionE </Value>
+	</Text>
+	<Text>
+	<X> 740 </X>
+	<Y> 1016 </Y>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $11-99-02-0032.Price </Value>
+	</Text>
+	<Text>
+	<X> 722 </X>
+	<Y> 1016 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X> 574 </X>
+	<Y> 1194 </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> $11-99-02-0032.Name </Value>
+	</Text>
+	<Text>
+	<X> 574 </X>
+	<Y> 1250 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $11-99-02-0032.description </Value>
+	</Text>
+	<Text>
+	<X> 574 </X>
+	<Y> 1194 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $11-99-02-0032.NameE </Value>
+	</Text>
+	<Text>
+	<X> 574 </X>
+	<Y> 1250 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> $11-99-02-0032.descriptionE </Value>
+	</Text>
+	<Text>
+	<X> 997 </X>
+	<Y> 1016 </Y>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $11-99-02-0028.Price </Value>
+	</Text>
+	<Text>
+	<X> 979 </X>
+	<Y> 1016 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X> 831 </X>
+	<Y> 1194 </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> $11-99-02-0028.Name </Value>
+	</Text>
+	<Text>
+	<X> 831 </X>
+	<Y> 1250 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $11-99-02-0028.description </Value>
+	</Text>
+	<Text>
+	<X> 831 </X>
+	<Y> 1194 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $11-99-02-0028.NameE </Value>
+	</Text>
+	<Text>
+	<X> 831 </X>
+	<Y> 1250 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> $11-99-02-0028.descriptionE </Value>
+	</Text>
+	<Text>
+	<X> 226 </X>
+	<Y> 1344 </Y>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $11-99-02-0029.Price </Value>
+	</Text>
+	<Text>
+	<X> 208 </X>
+	<Y> 1344 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X> 60 </X>
+	<Y> 1522 </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> $11-99-02-0029.Name </Value>
+	</Text>
+	<Text>
+	<X> 60 </X>
+	<Y> 1578 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $11-99-02-0029.description </Value>
+	</Text>
+	<Text>
+	<X> 60 </X>
+	<Y> 1522 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $11-99-02-0029.NameE </Value>
+	</Text>
+	<Text>
+	<X> 60 </X>
+	<Y> 1578 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> $11-99-02-0029.descriptionE </Value>
+	</Text>
+	<Text>
+	<X> 483 </X>
+	<Y> 1344 </Y>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $11-99-01-0042.Price </Value>
+	</Text>
+	<Text>
+	<X> 465 </X>
+	<Y> 1344 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X> 317 </X>
+	<Y> 1522 </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> $11-99-01-0042.Name </Value>
+	</Text>
+	<Text>
+	<X> 317 </X>
+	<Y> 1578 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $11-99-01-0042.description </Value>
+	</Text>
+	<Text>
+	<X> 317 </X>
+	<Y> 1522 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $11-99-01-0042.NameE </Value>
+	</Text>
+	<Text>
+	<X> 317 </X>
+	<Y> 1578 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> $11-99-01-0042.descriptionE </Value>
+	</Text>
+	<Text>
+	<X> 740 </X>
+	<Y> 1344 </Y>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $11-99-02-0043.Price </Value>
+	</Text>
+	<Text>
+	<X> 722 </X>
+	<Y> 1344 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X> 574 </X>
+	<Y> 1522 </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> $11-99-02-0043.Name </Value>
+	</Text>
+	<Text>
+	<X> 574 </X>
+	<Y> 1578 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $11-99-02-0043.description </Value>
+	</Text>
+	<Text>
+	<X> 574 </X>
+	<Y> 1522 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $11-99-02-0043.NameE </Value>
+	</Text>
+	<Text>
+	<X> 574 </X>
+	<Y> 1578 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> $11-99-02-0043.descriptionE </Value>
+	</Text>
+	<Text>
+	<X> 997 </X>
+	<Y> 1344 </Y>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $11-99-02-0044.Price </Value>
+	</Text>
+	<Text>
+	<X> 979 </X>
+	<Y> 1344 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X> 831 </X>
+	<Y> 1522 </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> $11-99-02-0044.Name </Value>
+	</Text>
+	<Text>
+	<X> 831 </X>
+	<Y> 1578 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $11-99-02-0044.description </Value>
+	</Text>
+	<Text>
+	<X> 831 </X>
+	<Y> 1522 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $11-99-02-0044.NameE </Value>
+	</Text>
+	<Text>
+	<X> 831 </X>
+	<Y> 1578 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> $11-99-02-0044.descriptionE </Value>
+	</Text>
+	<Text>
+	<X> 226 </X>
+	<Y> 1672 </Y>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $11-99-01-0045.Price </Value>
+	</Text>
+	<Text>
+	<X> 208 </X>
+	<Y> 1672 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X> 60 </X>
+	<Y> 1850 </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> $11-99-01-0045.Name </Value>
+	</Text>
+	<Text>
+	<X> 60 </X>
+	<Y> 1906 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $11-99-01-0045.description </Value>
+	</Text>
+	<Text>
+	<X> 60 </X>
+	<Y> 1850 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $11-99-01-0045.NameE </Value>
+	</Text>
+	<Text>
+	<X> 60 </X>
+	<Y> 1906 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> $11-99-01-0045.descriptionE </Value>
 	</Text>
 </FrameScroll>
 
diff --git a/xml/page_catalog_choose_drink7.xml b/xml/page_catalog_choose_drink7.xml
index 5edb70ec..feddaa8b 100644
--- a/xml/page_catalog_choose_drink7.xml
+++ b/xml/page_catalog_choose_drink7.xml
@@ -102,6 +102,8 @@
     Else
         Var show_eng = "true"
     EndIf
+    
+
     Open CurrentXMLFileName2
 </EventClick>
 </Button>
diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml
index e4a6cb35..f5bdb981 100644
--- a/xml/page_thankyou.xml
+++ b/xml/page_thankyou.xml
@@ -39,7 +39,7 @@
 	Var CountDownThankyou = CountDownThankyou - 1
 
 	Var Timeout = Timeout + 1 
-	If Timeout = 3 Then
+	If Timeout = 2 Then
 		If PayWithQR = 0 Then
 			If FreeVendingCampaign = 0 Then
 				If IntVendingCampaign < PayAmount Then 
diff --git a/xml/page_topping_alter.xml b/xml/page_topping_alter.xml
index eaf1e21d..aecdd908 100644
--- a/xml/page_topping_alter.xml
+++ b/xml/page_topping_alter.xml
@@ -11,19 +11,11 @@
 	Var SugarState3 = "Invisible"
 	Var SugarState4 = "Invisible"
 	Var SugarState5 = "Invisible"
-
-	;Var SugarState1 = "Enable"
-	;Var SugarState2 = "Enable"
-	;Var SugarState3 = "Enable"
-	;Var SugarState4 = "Enable"
-	;Var SugarState5 = "Enable"
+	
 	Var BGSugar = "Invisible"
 
-	SAVELOG TOPPING1
-	SAVELOG TOPPING2
-	SAVELOG TOPPING3
-	SAVELOG TOPPING4
-	
+	Var ShotCoffeeBG = "Invisible"
+	Var showShotEnable = "Invisible"
 	;SAVELOG PreviseXMLFileName2
 	
 	
@@ -36,6 +28,9 @@
 	Var y2_topping_bg = y_topping_bg + y_block
 	Var y2_topping = y_topping + y_block
 
+	Var y_shot_coffee_bg = y2_topping_bg
+	Var y_shot_coffee_bt = y2_topping + 100
+
 	Var topping1 = "1"
 	Var BugFlag = 0
 
@@ -146,13 +141,17 @@
 	
 	
 	SAVELOG TOPPING1
+	SAVELOG TOPPING2
+	SAVELOG TOPPING3
+	SAVELOG TOPPING4
+	
 	SAVELOG MenuCodeName
 	;SAVELOG toppingID1Default
 	
 	If BugFlag = 1 Then
 
 	Else
-		
+
 		If MenuCodeName = "barista1" Then
 			Open "ROOT/taobin_project/xml/page_topping_with_barista.xml"
 			Var ToppingGotoPayment = "false"
@@ -171,6 +170,17 @@
 			Var ToppingGotoPayment = "false"
 			Refresh
 		EndIf
+
+		If TOPPING2 = "shot coffee" Then
+			Var backGroundAddExtra = DirImage + "/extra_img_1.png"
+
+			SAVELOG backGroundAddExtra
+			Var ShotCoffeeBG = "Enable"
+			Var y_shot_coffee_bg = y2_topping_bg
+			Var y_shot_coffee_bt = y_shot_coffee_bg + 100
+			Var showShotEnable = "Enable"
+			Refresh
+		EndIf
 		
 		If TOPPING1 = "Powder Sugar Premix 25" Then
 			Var ToppingGotoPayment = "false"
@@ -303,6 +313,45 @@
 <Value> PriceShowValue </Value>
 </Text>
 
+; shot layout
+
+<Image>
+<X> 52 </X>
+<Y> y_shot_coffee_bg </Y>
+<State> ShotCoffeeBG </State>
+<Filename> backGroundAddExtra </Filename>
+</Image>
+
+; 
+<Button>
+<X> 100 </X>
+<Y> y_shot_coffee_bt </Y>
+<State> showShotEnable </Stage>
+<Filename> Var( DirImage + "/add_shot_img.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/add_shot_img_2.png" ) </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+
+	Refresh
+</EventClick>
+</Button>
+
+; 
+<Button>
+<X> 925 </X>
+<Y> y_shot_coffee_bt </Y>
+<State> showShotEnable </Stage>
+<Filename> Var( DirImage + "/cb_nch.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/cb_ch.png" ) </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+
+	
+</EventClick>
+</Button>
+
 
 
 ; sugar layout
diff --git a/xml/page_topping_with_barista.xml b/xml/page_topping_with_barista.xml
index db2985ce..782693f6 100644
--- a/xml/page_topping_with_barista.xml
+++ b/xml/page_topping_with_barista.xml
@@ -30,8 +30,14 @@
 
 	Var BGSugar = "Invisible"
 
-	;SAVELOG TOPPING1
-	;SAVELOG TOPPING2
+	SAVELOG TOPPING1
+	SAVELOG TOPPING2
+	SAVELOG toppingID1Default
+	SAVELOG toppingID1index1
+	SAVELOG toppingID1index2
+	SAVELOG toppingID1index3
+	SAVELOG toppingID1index4
+	SAVELOG toppingID1index5
 	;SAVELOG PreviseXMLFileName2
 	
 	;
@@ -54,18 +60,19 @@
 	;SAVELOG y2_topping
 
 
-	If TOPPING1 = "Powder Sugar" Then
-		Var SugarState1 = "PressForever"
+	If TOPPING1 = "Sugar" Then
+		Var SugarState1 = "Enable"
 		Var SugarState2 = "Enable"
-		Var SugarState3 = "Enable"
+		Var SugarState3 = "PressForever"
 		Var SugarState4 = "Enable"
 		Var SugarState5 = "Enable"
 		Var BGSugar = "Enable"
+		Var topping1 = toppingID1Default
 	EndIf
 
-	If TOPPING1 = "Powder Sugar Premix 25" Then
+	If TOPPING1 = "Sugar Premix 25" Then
 		Var SugarState1 = "Invisible"
-		Var SugarState2 = "Invisible"
+		Var SugarState2 = "Enable"
 		Var SugarState3 = "PressForever"
 		Var SugarState4 = "Enable"
 		Var SugarState5 = "Enable"
@@ -184,9 +191,9 @@
 	
 	If BugFlag = 1 Then
 		If TOPPING1 = "Powder Sugar" Then
-			Var SugarState1 = "PressForever"
+			Var SugarState1 = "Enable"
 			Var SugarState2 = "Enable"
-			Var SugarState3 = "Enable"
+			Var SugarState3 = "PressForever"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var BGSugar = "Enable"
@@ -198,10 +205,10 @@
 			Refresh
 		EndIf
 		
-		If TOPPING1 = "Powder Sugar Premix 25" Then
+		If TOPPING1 = "Sugar Premix 25" Then
 			Var SugarState1 = "Invisible"
-			Var SugarState2 = "Invisible"
-			Var SugarState3 = "PressForever"
+			Var SugarState2 = "PressForever"
+			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var BGSugar = "Enable"
@@ -344,14 +351,15 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	
-	If TOPPING1 = "Powder Sugar Premix 25" Then
+	If TOPPING1 = "Sugar Premix 25" Then
 		Var SugarState1 = "Invisible"
 		Var SugarState2 = "Invisible"
-		Var topping1 = "1"
+		Var topping1 = toppingID1index1
 	Else
 		Var SugarState1 = "PressForever"
 		Var SugarState2 = "Enable"
-		Var topping1 = "1"
+		Var topping1 = toppingID1index1
+	
 	EndIf
 	
 	Var SugarState3 = "Enable"
@@ -364,7 +372,7 @@
 
 ; sugar2
 <Button>
-<X> 327 </X>
+<X> 344 </X>
 <Y> y_topping </Y>
 <State> SugarState2 </Stage>
 <Filename> "ROOT/taobin_project/image/topping/bn_sugar2.png" </Filename>
@@ -373,14 +381,16 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	
-	If TOPPING1 = "Powder Sugar Premix 25" Then
+	If TOPPING1 = "Sugar Premix 25" Then
 		Var SugarState1 = "Invisible"
-		Var SugarState2 = "Invisible"
-		Var topping1 = "10"	
+		Var SugarState2 = "PressForever"
+		Var topping1 = toppingID1index2
+	
 	Else
 		Var SugarState1 = "Enable"
 		Var SugarState2 = "PressForever"
-		Var topping1 = "2"
+		Var topping1 = toppingID1index2
+	
 	EndIf
 	Var SugarState3 = "Enable"
 	Var SugarState4 = "Enable"
@@ -393,7 +403,7 @@
 
 ; sugar3
 <Button>
-<X> 503 </X>
+<X> 507 </X>
 <Y> y_topping </Y>
 <State> SugarState3 </Stage>
 <Filename> "ROOT/taobin_project/image/topping/bn_sugar3.png" </Filename>
@@ -402,14 +412,16 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 
-	If TOPPING1 = "Powder Sugar Premix 25" Then
+	If TOPPING1 = "Sugar Premix 25" Then
 		Var SugarState1 = "Invisible"
-		Var SugarState2 = "Invisible"
-		Var topping1 = "11"
+		Var SugarState2 = "Enable"
+		Var topping1 = toppingID1index3
+	
 	Else
 		Var SugarState1 = "Enable"
 		Var SugarState2 = "Enable"
-		Var topping1 = "3"
+		Var topping1 = toppingID1index3
+	
 	EndIf
 
 	Var SugarState3 = "PressForever"
@@ -422,7 +434,7 @@
 
 ; sugar4
 <Button>
-<X> 664 </X>
+<X> 670 </X>
 <Y> y_topping </Y>
 <State> SugarState4 </Stage>
 <Filename> "ROOT/taobin_project/image/topping/bn_sugar4.png" </Filename>
@@ -431,14 +443,16 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	
-	If TOPPING1 = "Powder Sugar Premix 25" Then
+	If TOPPING1 = "Sugar Premix 25" Then
 		Var SugarState1 = "Invisible"
-		Var SugarState2 = "Invisible"
-		Var topping1 = "12"
+		Var SugarState2 = "Enable"
+		Var topping1 = toppingID1index4
+	
 	Else
 		Var SugarState1 = "Enable"
 		Var SugarState2 = "Enable"
-		Var topping1 = "4"
+		Var topping1 = toppingID1index4
+	
 	EndIf
 
 	Var SugarState3 = "Enable"
@@ -451,7 +465,7 @@
 
 ; sugar5
 <Button>
-<X> 836 </X>
+<X> 833 </X>
 <Y> y_topping </Y>
 <State> SugarState5 </Stage>
 <Filename> "ROOT/taobin_project/image/topping/bn_sugar5.png" </Filename>
@@ -460,14 +474,16 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	
-	If TOPPING1 = "Powder Sugar Premix 25" Then
+	If TOPPING1 = "Sugar Premix 25" Then
 		Var SugarState1 = "Invisible"
-		Var SugarState2 = "Invisible"
-		Var topping1 = "13"
+		Var SugarState2 = "Enable"
+		Var topping1 = toppingID1index5
+	
 	Else
 		Var SugarState1 = "Enable"
 		Var SugarState2 = "Enable"
-		Var topping1 = "5"
+		Var topping1 = toppingID1index5
+	
 	EndIf
 
 	Var SugarState3 = "Enable"
diff --git a/xml/vending_info.xml b/xml/vending_info.xml
index 7f2c6c65..a3f2ef95 100644
--- a/xml/vending_info.xml
+++ b/xml/vending_info.xml
@@ -112,6 +112,9 @@
 <X> info_startX </X>
 <Y> info_5Y </Y>
 <Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
+<EventClick>
+	Machine DoorClose
+</EventClick>
 </Image>
 
 
@@ -120,6 +123,13 @@
 <X> info2_startX </X>
 <Y> info_1Y </Y>
 <Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
+<EventClick>
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+	OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml"
+	
+	TopView "show"
+	Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
+</EventClick>
 </Image>