diff --git a/animation01/Menu Description - Sheet1.tsv b/animation01/Menu Description - Sheet1.tsv
index 83703f1b..9306bef0 100644
--- a/animation01/Menu Description - Sheet1.tsv	
+++ b/animation01/Menu Description - Sheet1.tsv	
@@ -177,6 +177,12 @@ Pure beauty	12-01-01-0033	1	2	48	3	4	5				24	66	1:06	32
 	12-02-03-0032													
 														
 														
+Geisha	12-01-02-0036	1	7	49	2	3	4	5			24	100	22:40	32
+Geisha	12-01-01-0035	1	2	49	3	4	5	16			24	88	1:28	32
+Geisha	12-01-02-0035	1	2	49	3	4	5	23	16		24	133	2:13	32
+Geisha	12-01-01-0036	1	2	49	3	4	5				24	66	1:06	32
+														
+														
 														
 														
 โกโก้สตอเบอร์รี่เย็น	12-03-02-0010	1	15	17	19	23					24	125	2:05	40
diff --git a/animation01/Menu Description - Sheet1_.tsv b/animation01/Menu Description - Sheet1_.tsv
index b4bc40f8..83703f1b 100644
--- a/animation01/Menu Description - Sheet1_.tsv	
+++ b/animation01/Menu Description - Sheet1_.tsv	
@@ -225,9 +225,9 @@ THAI TEA SHAKE	12-04-02-1021	1	25	26	6	7	10	23			24	223	3:43	37
 แอพ ฟาสท์ ชาเขียว	12-04-02-1022	1	25	26	9	6	7	23			24	181	3:01	30
 														
 ชาอู่หลงร้อน	12-02-01-0031	1	10	16							24	90	1:30	29
-ชาอู่หลงเย็น	12-02-01-0032	1	10	16	23						24	104	1:44	25
-	12-02-03-0031	1	10	16							24	90	1:30	29
-	12-02-03-0032	1	10	16		23					24	104	1:44	25
+ชาอู่หลงเย็น	12-02-02-0031	1	10	16	23						24	104	1:44	25
+-	12-02-03-0031	1	10	16							24	90	1:30	29
+-	12-02-03-0032	1	10	16		23					24	104	1:44	25
 														
 ชาอู่หลงมะนาว ร้อน	12-02-01-0032	1	10	12	16						24	90	1:30	29
 ชาอู่หลงมะนาว เย็น	12-02-02-0032	1	10	12	16	23					24	104	1:44	25
diff --git a/xml/page_catalog_group_coffee.xml b/xml/page_catalog_group_coffee.xml
index 3b8f2ac4..825515e6 100644
--- a/xml/page_catalog_group_coffee.xml
+++ b/xml/page_catalog_group_coffee.xml
@@ -590,7 +590,7 @@
 	 Var block_index_override = 0
 	 Var block_index_move = 0
 </Script>
-; menu_new_list 38
+; menu_new_list 41
 	; 12-01-01-0001 - - 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -2298,6 +2298,176 @@ ESPRESSO" </Value>
 	<State> "Invisible" </State>
 	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
+</Block>
+	; 12-01-01-0036 - - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-01-01-0036.Button,) </State> 
+	<Button>
+	<State> Flag( 12-01-01-0036.Button,) </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_espresso_light_geisha.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_espresso_light_geisha.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_espresso_light_geisha.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var NameDrink = "GEISHA ESPRESSO"
+		Var NameDrinkTH = "เอสเพรสโซ่ช็อต  GEISHA"
+		Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process)  กลิ่นดอกไม้ ผลไม้เขตร้อน"
+		Var DrinkDescription = "Light roast (natural process) Note: Floral & Tropical fruit"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_geisha.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $12-01-01-0036.Price
+		Var PriceD2 = $-.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "12-01-01-0036"
+		Var PD_CODE2 = "##-##-##-####"
+		Var PD_CODE3 = "##-##-##-####"
+		Var PD_STAGE_1 = $12-01-01-0036.Button
+		Var PD_STAGE_2 = "Disable2"
+		Var PD_STAGE_3 = "Disable2"
+		If PD_STAGE_2 = "Enable" Then
+			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0036"
+			Else
+				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
+			EndIf
+		EndIf
+		Var menu_name_eng_hot = $12-01-01-0036.NameE
+		Var menu_desc_eng_hot = $12-01-01-0036.descriptionE
+		Var menu_name_thai_hot = $12-01-01-0036.Name
+		Var menu_desc_thai_hot = $12-01-01-0036.description
+		
+		Var menu_name_eng_cold = $##-##-##-####.NameE
+		Var menu_desc_eng_cold = $##-##-##-####.descriptionE
+		Var menu_name_thai_cold = $##-##-##-####.Name
+		Var menu_desc_thai_cold = $##-##-##-####.description
+		
+		Var menu_name_eng_blender = $##-##-##-####.NameE
+		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
+		Var menu_name_thai_blender = $##-##-##-####.Name
+		Var menu_desc_thai_blender = $##-##-##-####.description
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select4.xml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> "เอสเพรสโซ่ช็อต 
+GEISHA" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> "กาแฟคั่วอ่อน (natural process) 
+กลิ่นดอกไม้ ผลไม้เขตร้อน" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 164 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> "GEISHA ESPRESSO" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> "Light roast (natural process) Note: Floral & Tropical fruit" </Value>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> $12-01-01-0036.Button </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> 50 </X>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $12-01-01-0036.Button </State>
+	<Value> Var( "฿" + $12-01-01-0036.Price ) </Value>
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<State> "Invisible" </State>
+	</Image>
+	<Text>
+	<X> 115 </X>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> Var( "฿" + $-.Price ) </Value>
+	</Text>
+	<Image>
+	<X> 146 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<State> "Invisible" </State>
+	</Image>
+	<Text>
+	<X> 183 </X>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> Var( "฿" + $-.Price ) </Value>
+	</Text>
 </Block>
 	; 12-01-01-0014 12-01-02-0011 - 
 <Block>
@@ -3501,6 +3671,177 @@ AMERICANO" </Value>
 	<State> "Invisible" </State>
 	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
+</Block>
+	; 12-01-01-0035 12-01-02-0035 - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-01-01-0035.Button,12-01-02-0035.Button,) </State> 
+	<Button>
+	<State> Flag( 12-01-01-0035.Button,12-01-02-0035.Button,) </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_americano_light_geisha.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_americano_light_geisha.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_americano_light_geisha.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var NameDrink = "GEISHA   AMERICANO"
+		Var NameDrinkTH = "อเมริกาโน  GEISHA"
+		Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process)  กลิ่นดอกไม้ ผลไม้เขตร้อน"
+		Var DrinkDescription = "Light roast (natural process) Note: Floral & Tropical fruit"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_geisha.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $12-01-01-0035.Price
+		Var PriceD2 = $12-01-02-0035.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "12-01-01-0035"
+		Var PD_CODE2 = "12-01-02-0035"
+		Var PD_CODE3 = "##-##-##-####"
+		Var PD_STAGE_1 = $12-01-01-0035.Button
+		Var PD_STAGE_2 = $12-01-02-0035.Button
+		Var PD_STAGE_3 = "Disable2"
+		If PD_STAGE_2 = "Enable" Then
+			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-01-02-0035"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0035"
+			Else
+				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
+			EndIf
+		EndIf
+		Var menu_name_eng_hot = $12-01-01-0035.NameE
+		Var menu_desc_eng_hot = $12-01-01-0035.descriptionE
+		Var menu_name_thai_hot = $12-01-01-0035.Name
+		Var menu_desc_thai_hot = $12-01-01-0035.description
+		
+		Var menu_name_eng_cold = $12-01-02-0035.NameE
+		Var menu_desc_eng_cold = $12-01-02-0035.descriptionE
+		Var menu_name_thai_cold = $12-01-02-0035.Name
+		Var menu_desc_thai_cold = $12-01-02-0035.description
+		
+		Var menu_name_eng_blender = $##-##-##-####.NameE
+		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
+		Var menu_name_thai_blender = $##-##-##-####.Name
+		Var menu_desc_thai_blender = $##-##-##-####.description
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select4.xml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> "อเมริกาโน 
+GEISHA" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> "กาแฟคั่วอ่อน (natural process) 
+กลิ่นดอกไม้ ผลไม้เขตร้อน" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 164 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> "GEISHA  
+AMERICANO" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> "Light roast (natural process) Note: Floral & Tropical fruit" </Value>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> $12-01-01-0035.Button </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> 50 </X>
+	<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> Var( "฿" + $12-01-01-0035.Price ) </Value>
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<State> $12-01-02-0035.Button </State>
+	</Image>
+	<Text>
+	<X> 115 </X>
+	<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> Var( "฿" + $12-01-02-0035.Price ) </Value>
+	</Text>
+	<Image>
+	<X> 146 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<State> "Invisible" </State>
+	</Image>
+	<Text>
+	<X> 183 </X>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> Var( "฿" + $-.Price ) </Value>
+	</Text>
 </Block>
 	; - 12-01-02-0020 - 
 <Block>
@@ -4704,6 +5045,177 @@ ALMOST DIRTY" </Value>
 	<State> "Invisible" </State>
 	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
+</Block>
+	; - 12-01-02-0036 - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-01-02-0036.Button,) </State> 
+	<Button>
+	<State> Flag( 12-01-02-0036.Button,) </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_dirty_light_geisha.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_dirty_light_geisha.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n//bn_dirty_light_geisha.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var NameDrink = "GEISHA  ALMOST DIRTY"
+		Var NameDrinkTH = "GEISHA  ALMOST DIRTY"
+		Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process)  กลิ่นดอกไม้ ผลไม้เขตร้อน"
+		Var DrinkDescription = "Light roast (natural process) Note: Floral & Tropical fruit"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_dirty_light_geisha.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $12-01-02-0036.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "12-01-02-0036"
+		Var PD_CODE3 = "##-##-##-####"
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = $12-01-02-0036.Button
+		Var PD_STAGE_3 = "Disable2"
+		If PD_STAGE_2 = "Enable" Then
+			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-01-02-0036"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
+			Else
+				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
+			EndIf
+		EndIf
+		Var menu_name_eng_hot = $##-##-##-####.NameE
+		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
+		Var menu_name_thai_hot = $##-##-##-####.Name
+		Var menu_desc_thai_hot = $##-##-##-####.description
+		
+		Var menu_name_eng_cold = $12-01-02-0036.NameE
+		Var menu_desc_eng_cold = $12-01-02-0036.descriptionE
+		Var menu_name_thai_cold = $12-01-02-0036.Name
+		Var menu_desc_thai_cold = $12-01-02-0036.description
+		
+		Var menu_name_eng_blender = $##-##-##-####.NameE
+		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
+		Var menu_name_thai_blender = $##-##-##-####.Name
+		Var menu_desc_thai_blender = $##-##-##-####.description
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select4.xml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> "GEISHA 
+ALMOST DIRTY" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> "กาแฟคั่วอ่อน (natural process) 
+กลิ่นดอกไม้ ผลไม้เขตร้อน" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 164 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> "GEISHA 
+ALMOST DIRTY" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> "Light roast (natural process) Note: Floral & Tropical fruit" </Value>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> "Invisible" </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> 50 </X>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> Var( "฿" + $-.Price ) </Value>
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<State> $12-01-02-0036.Button </State>
+	</Image>
+	<Text>
+	<X> 115 </X>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $12-01-02-0036.Button </State>
+	<Value> Var( "฿" + $12-01-02-0036.Price ) </Value>
+	</Text>
+	<Image>
+	<X> 146 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<State> "Invisible" </State>
+	</Image>
+	<Text>
+	<X> 183 </X>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> Var( "฿" + $-.Price ) </Value>
+	</Text>
 </Block>
 	; - 12-11-02-0001 12-11-03-0001 
 <Block>
diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml
index 1d6123c6..ccc21d54 100644
--- a/xml/page_catalog_group_recommend.xml
+++ b/xml/page_catalog_group_recommend.xml
@@ -623,7 +623,7 @@
 	<Service> testservice </Service>
 	</QRCode>
 </Block>
-; menu_new_list 40
+; menu_new_list 43
 	; 12-06-01-0001 - - 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
@@ -3518,6 +3518,176 @@ ESPRESSO" </Value>
 	<State> "Invisible" </State>
 	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
+</Block>
+	; 12-01-01-0036 - - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-01-01-0036.Button,) </State> 
+	<Button>
+	<State> Flag( 12-01-01-0036.Button,) </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_espresso_light_geisha.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_espresso_light_geisha.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_espresso_light_geisha.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var NameDrink = "GEISHA ESPRESSO"
+		Var NameDrinkTH = "เอสเพรสโซ่ช็อต  GEISHA"
+		Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process)  กลิ่นดอกไม้ ผลไม้เขตร้อน"
+		Var DrinkDescription = "Light roast (natural process) Note: Floral & Tropical fruit"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_geisha.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $12-01-01-0036.Price
+		Var PriceD2 = $-.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "12-01-01-0036"
+		Var PD_CODE2 = "##-##-##-####"
+		Var PD_CODE3 = "##-##-##-####"
+		Var PD_STAGE_1 = $12-01-01-0036.Button
+		Var PD_STAGE_2 = "Disable2"
+		Var PD_STAGE_3 = "Disable2"
+		If PD_STAGE_2 = "Enable" Then
+			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0036"
+			Else
+				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
+			EndIf
+		EndIf
+		Var menu_name_eng_hot = $12-01-01-0036.NameE
+		Var menu_desc_eng_hot = $12-01-01-0036.descriptionE
+		Var menu_name_thai_hot = $12-01-01-0036.Name
+		Var menu_desc_thai_hot = $12-01-01-0036.description
+		
+		Var menu_name_eng_cold = $##-##-##-####.NameE
+		Var menu_desc_eng_cold = $##-##-##-####.descriptionE
+		Var menu_name_thai_cold = $##-##-##-####.Name
+		Var menu_desc_thai_cold = $##-##-##-####.description
+		
+		Var menu_name_eng_blender = $##-##-##-####.NameE
+		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
+		Var menu_name_thai_blender = $##-##-##-####.Name
+		Var menu_desc_thai_blender = $##-##-##-####.description
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select4.xml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> "เอสเพรสโซ่ช็อต 
+GEISHA" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> "กาแฟคั่วอ่อน (natural process) 
+กลิ่นดอกไม้ ผลไม้เขตร้อน" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 164 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> "GEISHA ESPRESSO" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> "Light roast (natural process) Note: Floral & Tropical fruit" </Value>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> $12-01-01-0036.Button </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> 50 </X>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $12-01-01-0036.Button </State>
+	<Value> Var( "฿" + $12-01-01-0036.Price ) </Value>
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<State> "Invisible" </State>
+	</Image>
+	<Text>
+	<X> 115 </X>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> Var( "฿" + $-.Price ) </Value>
+	</Text>
+	<Image>
+	<X> 146 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<State> "Invisible" </State>
+	</Image>
+	<Text>
+	<X> 183 </X>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> Var( "฿" + $-.Price ) </Value>
+	</Text>
 </Block>
 	; 12-01-01-0014 12-01-02-0011 - 
 <Block>
@@ -4721,6 +4891,177 @@ AMERICANO" </Value>
 	<State> "Invisible" </State>
 	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
+</Block>
+	; 12-01-01-0035 12-01-02-0035 - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-01-01-0035.Button,12-01-02-0035.Button,) </State> 
+	<Button>
+	<State> Flag( 12-01-01-0035.Button,12-01-02-0035.Button,) </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_americano_light_geisha.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_americano_light_geisha.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_americano_light_geisha.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var NameDrink = "GEISHA   AMERICANO"
+		Var NameDrinkTH = "อเมริกาโน  GEISHA"
+		Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process)  กลิ่นดอกไม้ ผลไม้เขตร้อน"
+		Var DrinkDescription = "Light roast (natural process) Note: Floral & Tropical fruit"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_geisha.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $12-01-01-0035.Price
+		Var PriceD2 = $12-01-02-0035.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "12-01-01-0035"
+		Var PD_CODE2 = "12-01-02-0035"
+		Var PD_CODE3 = "##-##-##-####"
+		Var PD_STAGE_1 = $12-01-01-0035.Button
+		Var PD_STAGE_2 = $12-01-02-0035.Button
+		Var PD_STAGE_3 = "Disable2"
+		If PD_STAGE_2 = "Enable" Then
+			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-01-02-0035"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0035"
+			Else
+				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
+			EndIf
+		EndIf
+		Var menu_name_eng_hot = $12-01-01-0035.NameE
+		Var menu_desc_eng_hot = $12-01-01-0035.descriptionE
+		Var menu_name_thai_hot = $12-01-01-0035.Name
+		Var menu_desc_thai_hot = $12-01-01-0035.description
+		
+		Var menu_name_eng_cold = $12-01-02-0035.NameE
+		Var menu_desc_eng_cold = $12-01-02-0035.descriptionE
+		Var menu_name_thai_cold = $12-01-02-0035.Name
+		Var menu_desc_thai_cold = $12-01-02-0035.description
+		
+		Var menu_name_eng_blender = $##-##-##-####.NameE
+		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
+		Var menu_name_thai_blender = $##-##-##-####.Name
+		Var menu_desc_thai_blender = $##-##-##-####.description
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select4.xml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> "อเมริกาโน 
+GEISHA" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> "กาแฟคั่วอ่อน (natural process) 
+กลิ่นดอกไม้ ผลไม้เขตร้อน" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 164 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> "GEISHA  
+AMERICANO" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> "Light roast (natural process) Note: Floral & Tropical fruit" </Value>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> $12-01-01-0035.Button </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> 50 </X>
+	<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> Var( "฿" + $12-01-01-0035.Price ) </Value>
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<State> $12-01-02-0035.Button </State>
+	</Image>
+	<Text>
+	<X> 115 </X>
+	<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> Var( "฿" + $12-01-02-0035.Price ) </Value>
+	</Text>
+	<Image>
+	<X> 146 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<State> "Invisible" </State>
+	</Image>
+	<Text>
+	<X> 183 </X>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> Var( "฿" + $-.Price ) </Value>
+	</Text>
 </Block>
 	; - 12-01-02-0020 - 
 <Block>
@@ -5763,9 +6104,9 @@ Note: Peach, tea, chocolate" </Value>
 	<State> Flag( 12-01-02-0033.Button,) </State> 
 	<Button>
 	<State> Flag( 12-01-02-0033.Button,) </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_dirty_light_pure_beauty.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_dirty_light_pure_beauty.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n//bn_dirty_light_pure_beauty.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_americano_light_geisha.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_americano_light_geisha.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_americano_light_geisha.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -5773,7 +6114,7 @@ Note: Peach, tea, chocolate" </Value>
 		Var NameDrinkTH = "PURE BEAUTY  ALMOST DIRTY"
 		Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process)  กลิ่นดอกไม้ ผลไม้เขตร้อน"
 		Var DrinkDescription = "Light roast (natural process) Note: Floral & Tropical fruit"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_dirty_light_pure_beauty.png"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_geisha.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $12-01-02-0033.Price
@@ -5924,6 +6265,177 @@ ALMOST DIRTY" </Value>
 	<State> "Invisible" </State>
 	<Value> Var( "฿" + $-.Price ) </Value>
 	</Text>
+</Block>
+	; - 12-01-02-0036 - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 12-01-02-0036.Button,) </State> 
+	<Button>
+	<State> Flag( 12-01-02-0036.Button,) </State> 
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_dirty_light_geisha.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_dirty_light_geisha.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n//bn_dirty_light_geisha.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var NameDrink = "GEISHA  ALMOST DIRTY"
+		Var NameDrinkTH = "GEISHA  ALMOST DIRTY"
+		Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process)  กลิ่นดอกไม้ ผลไม้เขตร้อน"
+		Var DrinkDescription = "Light roast (natural process) Note: Floral & Tropical fruit"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_dirty_light_geisha.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $12-01-02-0036.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "12-01-02-0036"
+		Var PD_CODE3 = "##-##-##-####"
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = $12-01-02-0036.Button
+		Var PD_STAGE_3 = "Disable2"
+		If PD_STAGE_2 = "Enable" Then
+			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-01-02-0036"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
+			Else
+				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
+			EndIf
+		EndIf
+		Var menu_name_eng_hot = $##-##-##-####.NameE
+		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
+		Var menu_name_thai_hot = $##-##-##-####.Name
+		Var menu_desc_thai_hot = $##-##-##-####.description
+		
+		Var menu_name_eng_cold = $12-01-02-0036.NameE
+		Var menu_desc_eng_cold = $12-01-02-0036.descriptionE
+		Var menu_name_thai_cold = $12-01-02-0036.Name
+		Var menu_desc_thai_cold = $12-01-02-0036.description
+		
+		Var menu_name_eng_blender = $##-##-##-####.NameE
+		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
+		Var menu_name_thai_blender = $##-##-##-####.Name
+		Var menu_desc_thai_blender = $##-##-##-####.description
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select4.xml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> "GEISHA 
+ALMOST DIRTY" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> "กาแฟคั่วอ่อน (natural process) 
+กลิ่นดอกไม้ ผลไม้เขตร้อน" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 164 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> "GEISHA 
+ALMOST DIRTY" </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> "Light roast (natural process) Note: Floral & Tropical fruit" </Value>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> "Invisible" </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> 50 </X>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> Var( "฿" + $-.Price ) </Value>
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<State> $12-01-02-0036.Button </State>
+	</Image>
+	<Text>
+	<X> 115 </X>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $12-01-02-0036.Button </State>
+	<Value> Var( "฿" + $12-01-02-0036.Price ) </Value>
+	</Text>
+	<Image>
+	<X> 146 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<State> "Invisible" </State>
+	</Image>
+	<Text>
+	<X> 183 </X>
+	<Y> 265 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> Var( "฿" + $-.Price ) </Value>
+	</Text>
 </Block>
 	; - 12-03-02-0006 12-03-03-0006 
 <Block>
diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml
index 333d7e5f..35aa038a 100644
--- a/xml/page_thankyou.xml
+++ b/xml/page_thankyou.xml
@@ -31,6 +31,8 @@
 	
 	Var Tel_Confirm_Flag = 0
 
+	Var TimeoutToNext = 3
+
 	DEBUGVAR Seeker
 
 	If Seeker = "curr" Then
@@ -106,13 +108,25 @@
 
 		Var video_id_to_ran = 3
 		Var video_name_to_play = "taobin_save_world"
-		Random video_id_to_ran
+		
+		If new_layout = "true" Then
+			Random2 1 3 video_id_to_ran
+		Else
+			Random video_id_to_ran
+		EndIf
+
 		Var ThankyouST = "Invisible"
 	Else
 
 		Var video_id_to_ran = 2
 		Var video_name_to_play = "taobin_thank"
-		Random video_id_to_ran
+		
+		If new_layout = "true" Then
+			Random2 1 2 video_id_to_ran
+		Else
+			Random video_id_to_ran
+		EndIf
+		
 		Var ThankyouST = "Enable"
 	EndIf
 
diff --git a/xml/page_topping_select4.xml b/xml/page_topping_select4.xml
index 902ce066..374cbebc 100644
--- a/xml/page_topping_select4.xml
+++ b/xml/page_topping_select4.xml
@@ -843,6 +843,14 @@
 			DEBUGVAR TOPPING2
 			Refresh
 		EndIf
+		If TOPPING2 = "add-show-1104" Then
+	
+			Var ShotCoffeePremium = "Enable"
+			Var showShotEnable = "Enable"
+
+			DEBUGVAR TOPPING2
+			Refresh
+		EndIf
 		
 
 ;-END
diff --git a/xml_main/startup.xml b/xml_main/startup.xml
index 52e630f3..f7b7124c 100644
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@@ -95,8 +95,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "6.27"
-	Var XMLPageVersionInt = 627
+	Var XMLPageVersion = "6.29"
+	Var XMLPageVersionInt = 629
 </EventOpen>
 
 <Text>