diff --git a/image/drink_option/pricetaotim.png b/image/drink_option/pricetaotim.png
new file mode 100644
index 00000000..2f112567
Binary files /dev/null and b/image/drink_option/pricetaotim.png differ
diff --git a/image/drink_option_en/pricetaotim.png b/image/drink_option_en/pricetaotim.png
new file mode 100644
index 00000000..bbc22d1c
Binary files /dev/null and b/image/drink_option_en/pricetaotim.png differ
diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv
index f191002b..1fe656a5 100644
--- a/menu/new-layout.tsv
+++ b/menu/new-layout.tsv
@@ -16,7 +16,7 @@ TAGESP
 		ชานมไทยไข่มุก	THAI MILK TEA BUBBLE	ชาไทย นม ไข่มุก	Thai tea, Sugar, milk, Bubble	-	12-02-62-0039	12-02-63-0039	bn_thaitea_bubble.png	-	-	-	posi1
 		ชานมมะลิไข่มุก	JASMINE MILK TEA BUBBLE	ชามะลิ นม ไข่มุก	Jasmine , Milk, Bubble	-	12-02-62-0047	12-02-63-0047	bn_jasmine_bubble.png	-	-	-	posi1
 		ชานมไต้หวันไข่มุก	TAIWANESE TEA BUBBLE	ชาไต้หวัน นม ไข่มุก	Taiwan Tea, Milk, Sugar, Bubble	-	12-02-62-0025	12-02-63-0025	bn_taiwan_bubble.png	-	-	-	posi1
-		เต่าติมไข่มุก	TAO TIM BUBBLE TEA	ไอศครีมนม น้ำเชื่อมคาราเมล และบุกไข่มุก	Icecream, Caramel syrup and Pearl carrageenan	-	-	12-41-03-0028	taotim_bubble.png	-	-	-	posi1
+		เต่าติมไข่มุก	TAO TIM BUBBLE TEA	ไอศครีมนม น้ำเชื่อมคาราเมล และบุกไข่มุก	Icecream, Caramel syrup and Pearl carrageenan	TAOTIM	-	12-41-03-0028	taotim_bubble.png	-	-	-	posi1
 
 
 		นมโอ๊ตสตรอว์เบอร์รี่	Strawberry Oat Milk	นมโอ๊ต น้ำเชื่อมสตรอว์เบอร์รี่\nและน้ำแข็ง	Oat Milk, Strawberry Syrup 	-	12-03-82-0011	12-03-83-0011	bn_smoothie_Strawberry_Oat_smoothie.png	-	-	-	posi1
diff --git a/xml/event/promotion_lipit.xml b/xml/event/promotion_lipit.xml
index 4a7396b8..d165657a 100644
--- a/xml/event/promotion_lipit.xml
+++ b/xml/event/promotion_lipit.xml
@@ -4621,19 +4621,19 @@ Sugar, Biscof" </Value>
 </Block>
 	; - - - 
 	; ==================> Len = 12
-	; - - 12-41-03-0028 
+	; TAOTIM - 12-41-03-0028 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-41-03-0028.Button,Disable=Invisible,$Sum1241030028) </State> 
+	<State> Flag( TAOTIM.Button,12-41-03-0028.Button,Disable=Invisible,$SumTAOTIM1241030028) </State> 
 	<Button>
-	<State> $Sum1241030028 </State> 
+	<State> $SumTAOTIM1241030028 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//taotim_bubble.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//taotim_bubble.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//taotim_bubble.png" </FilenameDisable>
-	<OverlayImage> xmlpro( 12-41-03-0028, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<OverlayImage> xmlpro( TAOTIM, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -4643,16 +4643,16 @@ Sugar, Biscof" </Value>
 		Var DrinkDescription = "Icecream, Caramel syrup and Pearl carrageenan"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "taotim_bubble.png"
 		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $-.Price
+		Var PriceD1 = $TAOTIM.Price
 		Var PriceD2 = $-.Price
 		Var PriceD3 = $12-41-03-0028.Price
-		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE1 = "TAOTIM"
 		Var PD_CODE2 = "##-##-##-####"
 		Var PD_CODE3 = "12-41-03-0028"
-		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_1 = $TAOTIM.Button
 		Var PD_STAGE_2 = "Disable2"
 		Var PD_STAGE_3 = $12-41-03-0028.Button
-		Var OverlayMenuFilter !assigned xmlpro( 12-41-03-0028, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		Var OverlayMenuFilter !assigned xmlpro( TAOTIM, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
 		DEBUGVAR OverlayMenuFilter
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
@@ -4672,15 +4672,15 @@ Sugar, Biscof" </Value>
 			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "TAOTIM"
 			Else
 			Topping "Load" "12-41-03-0028"
 			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_hot = $TAOTIM.NameE
+		Var menu_desc_eng_hot = $TAOTIM.descriptionE
+		Var menu_name_thai_hot = $TAOTIM.Name
+		Var menu_desc_thai_hot = $TAOTIM.description
 		
 		Var menu_name_eng_cold = $##-##-##-####.NameE
 		Var menu_desc_eng_cold = $##-##-##-####.descriptionE
@@ -4747,11 +4747,6 @@ Sugar, Biscof" </Value>
 	<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>
@@ -4765,7 +4760,7 @@ Sugar, Biscof" </Value>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  $TAOTIM.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -4788,8 +4783,8 @@ Sugar, Biscof" </Value>
 	<Image>
 	<X> 146 </X>
 	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<Filename> Var( DirImage2 + "pricetaotim.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "pricetaotim.png" ) </FilenameDisable>
 	<State> $12-41-03-0028.Button </State>
 	</Image>
 	<Text>
@@ -4826,8 +4821,8 @@ Sugar, Biscof" </Value>
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum1241030028 = "Disable" Then
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+			If $SumTAOTIM1241030028 = "Disable" Then
+				STRCONTAIN "ERR" $TAOTIM.TAG tag1_is_disable
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
 				STRCONTAIN "ERR" $12-41-03-0028.TAG tag3_is_disable
 				Var return = "Invisible"
@@ -4865,7 +4860,7 @@ Sugar, Biscof" </Value>
 	<Font> MITRegularTTF </Font>
 	<Color> 0x5A5A5A </Color>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum1241030028 </State> 
+	<State> $SumTAOTIM1241030028 </State> 
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
diff --git a/xml/event/promotion_monday_banana.xml b/xml/event/promotion_monday_banana.xml
index bdf3e474..2fe5c9d3 100644
--- a/xml/event/promotion_monday_banana.xml
+++ b/xml/event/promotion_monday_banana.xml
@@ -4621,19 +4621,19 @@ Sugar, Biscof" </Value>
 </Block>
 	; - - - 
 	; ==================> Len = 12
-	; - - 12-41-03-0028 
+	; TAOTIM - 12-41-03-0028 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-41-03-0028.Button,Disable=Invisible,$Sum1241030028) </State> 
+	<State> Flag( TAOTIM.Button,12-41-03-0028.Button,Disable=Invisible,$SumTAOTIM1241030028) </State> 
 	<Button>
-	<State> $Sum1241030028 </State> 
+	<State> $SumTAOTIM1241030028 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//taotim_bubble.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//taotim_bubble.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//taotim_bubble.png" </FilenameDisable>
-	<OverlayImage> xmlpro( 12-41-03-0028, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<OverlayImage> xmlpro( TAOTIM, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -4643,16 +4643,16 @@ Sugar, Biscof" </Value>
 		Var DrinkDescription = "Icecream, Caramel syrup and Pearl carrageenan"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "taotim_bubble.png"
 		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $-.Price
+		Var PriceD1 = $TAOTIM.Price
 		Var PriceD2 = $-.Price
 		Var PriceD3 = $12-41-03-0028.Price
-		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE1 = "TAOTIM"
 		Var PD_CODE2 = "##-##-##-####"
 		Var PD_CODE3 = "12-41-03-0028"
-		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_1 = $TAOTIM.Button
 		Var PD_STAGE_2 = "Disable2"
 		Var PD_STAGE_3 = $12-41-03-0028.Button
-		Var OverlayMenuFilter !assigned xmlpro( 12-41-03-0028, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		Var OverlayMenuFilter !assigned xmlpro( TAOTIM, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
 		DEBUGVAR OverlayMenuFilter
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
@@ -4672,15 +4672,15 @@ Sugar, Biscof" </Value>
 			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "TAOTIM"
 			Else
 			Topping "Load" "12-41-03-0028"
 			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_hot = $TAOTIM.NameE
+		Var menu_desc_eng_hot = $TAOTIM.descriptionE
+		Var menu_name_thai_hot = $TAOTIM.Name
+		Var menu_desc_thai_hot = $TAOTIM.description
 		
 		Var menu_name_eng_cold = $##-##-##-####.NameE
 		Var menu_desc_eng_cold = $##-##-##-####.descriptionE
@@ -4747,11 +4747,6 @@ Sugar, Biscof" </Value>
 	<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>
@@ -4765,7 +4760,7 @@ Sugar, Biscof" </Value>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  $TAOTIM.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -4788,8 +4783,8 @@ Sugar, Biscof" </Value>
 	<Image>
 	<X> 146 </X>
 	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<Filename> Var( DirImage2 + "pricetaotim.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "pricetaotim.png" ) </FilenameDisable>
 	<State> $12-41-03-0028.Button </State>
 	</Image>
 	<Text>
@@ -4826,8 +4821,8 @@ Sugar, Biscof" </Value>
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum1241030028 = "Disable" Then
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+			If $SumTAOTIM1241030028 = "Disable" Then
+				STRCONTAIN "ERR" $TAOTIM.TAG tag1_is_disable
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
 				STRCONTAIN "ERR" $12-41-03-0028.TAG tag3_is_disable
 				Var return = "Invisible"
@@ -4865,7 +4860,7 @@ Sugar, Biscof" </Value>
 	<Font> MITRegularTTF </Font>
 	<Color> 0x5A5A5A </Color>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum1241030028 </State> 
+	<State> $SumTAOTIM1241030028 </State> 
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
diff --git a/xml/event/promotion_pepsi_second_cup_30.xml b/xml/event/promotion_pepsi_second_cup_30.xml
index b9728ecd..7f4bf671 100644
--- a/xml/event/promotion_pepsi_second_cup_30.xml
+++ b/xml/event/promotion_pepsi_second_cup_30.xml
@@ -4621,19 +4621,19 @@ Sugar, Biscof" </Value>
 </Block>
 	; - - - 
 	; ==================> Len = 12
-	; - - 12-41-03-0028 
+	; TAOTIM - 12-41-03-0028 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-41-03-0028.Button,Disable=Invisible,$Sum1241030028) </State> 
+	<State> Flag( TAOTIM.Button,12-41-03-0028.Button,Disable=Invisible,$SumTAOTIM1241030028) </State> 
 	<Button>
-	<State> $Sum1241030028 </State> 
+	<State> $SumTAOTIM1241030028 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//taotim_bubble.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//taotim_bubble.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//taotim_bubble.png" </FilenameDisable>
-	<OverlayImage> xmlpro( 12-41-03-0028, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<OverlayImage> xmlpro( TAOTIM, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -4643,16 +4643,16 @@ Sugar, Biscof" </Value>
 		Var DrinkDescription = "Icecream, Caramel syrup and Pearl carrageenan"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "taotim_bubble.png"
 		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $-.Price
+		Var PriceD1 = $TAOTIM.Price
 		Var PriceD2 = $-.Price
 		Var PriceD3 = $12-41-03-0028.Price
-		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE1 = "TAOTIM"
 		Var PD_CODE2 = "##-##-##-####"
 		Var PD_CODE3 = "12-41-03-0028"
-		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_1 = $TAOTIM.Button
 		Var PD_STAGE_2 = "Disable2"
 		Var PD_STAGE_3 = $12-41-03-0028.Button
-		Var OverlayMenuFilter !assigned xmlpro( 12-41-03-0028, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		Var OverlayMenuFilter !assigned xmlpro( TAOTIM, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
 		DEBUGVAR OverlayMenuFilter
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
@@ -4672,15 +4672,15 @@ Sugar, Biscof" </Value>
 			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "TAOTIM"
 			Else
 			Topping "Load" "12-41-03-0028"
 			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_hot = $TAOTIM.NameE
+		Var menu_desc_eng_hot = $TAOTIM.descriptionE
+		Var menu_name_thai_hot = $TAOTIM.Name
+		Var menu_desc_thai_hot = $TAOTIM.description
 		
 		Var menu_name_eng_cold = $##-##-##-####.NameE
 		Var menu_desc_eng_cold = $##-##-##-####.descriptionE
@@ -4747,11 +4747,6 @@ Sugar, Biscof" </Value>
 	<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>
@@ -4765,7 +4760,7 @@ Sugar, Biscof" </Value>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  $TAOTIM.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -4788,8 +4783,8 @@ Sugar, Biscof" </Value>
 	<Image>
 	<X> 146 </X>
 	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<Filename> Var( DirImage2 + "pricetaotim.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "pricetaotim.png" ) </FilenameDisable>
 	<State> $12-41-03-0028.Button </State>
 	</Image>
 	<Text>
@@ -4826,8 +4821,8 @@ Sugar, Biscof" </Value>
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum1241030028 = "Disable" Then
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+			If $SumTAOTIM1241030028 = "Disable" Then
+				STRCONTAIN "ERR" $TAOTIM.TAG tag1_is_disable
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
 				STRCONTAIN "ERR" $12-41-03-0028.TAG tag3_is_disable
 				Var return = "Invisible"
@@ -4865,7 +4860,7 @@ Sugar, Biscof" </Value>
 	<Font> MITRegularTTF </Font>
 	<Color> 0x5A5A5A </Color>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum1241030028 </State> 
+	<State> $SumTAOTIM1241030028 </State> 
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev
index 8ddca4c3..deaccdbb 100644
--- a/xml/event/tricker.ev
+++ b/xml/event/tricker.ev
@@ -258,9 +258,7 @@ EndIf
 If BoxID = 173149 Then
 	Var ProBadValentineEnable = 0
 	Var PepsiSecondCup30Enable = 0
-	Var MondayBananaPro = 1
-	Var LipitPro = 1
-	Var FreeEnergyDrink = 1
+
 EndIf
 
 
@@ -274,11 +272,14 @@ EndIf
 
 Var XMLLiveInfoEnable = 1
 
-If BoxID = 173973 Then
+If BoxID = 172053 Then
 	Var ProBadValentineEnable = 0
 	Var PepsiSecondCup30Enable = 0
 	Var PepsiSecondCup30DiscountEnable = 0
 	Var NewFlowPaymentCode = 0
+		Var MondayBananaPro = 0
+	Var LipitPro = 0
+	Var FreeEnergyDrink = 0
 EndIf
 
 
diff --git a/xml/menu_new_layout_gen.py b/xml/menu_new_layout_gen.py
index ff503ab9..cd7c09f4 100644
--- a/xml/menu_new_layout_gen.py
+++ b/xml/menu_new_layout_gen.py
@@ -550,11 +550,12 @@
           out_xml( '\t<Value> "' + spl[3].replace("\\n", "\n") + '" </Value>\r\n')
           out_xml( '\t</Text>\r\n')
 
-          out_xml( '\t<Image>\r\n')
-          out_xml( '\t<X> 16 </X>\r\n')
-          out_xml( '\t<Y> 264 </Y>\r\n')
-          out_xml( '\t<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>\r\n')
-          out_xml( '\t</Image>\r\n')
+          if spl[4] != "TAOTIM":  
+            out_xml( '\t<Image>\r\n')
+            out_xml( '\t<X> 16 </X>\r\n')
+            out_xml( '\t<Y> 264 </Y>\r\n')
+            out_xml( '\t<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>\r\n')
+            out_xml( '\t</Image>\r\n')
 
           ice_tab_hot_show = True
           shw = "$" + spl[4] + ".Button"
@@ -565,7 +566,11 @@
           if len(spl[4]) == 0 :
             shw = '"Invisible"'
             ice_tab_hot_show = False
-
+          
+          if spl[4] == "TAOTIM":
+            shw = '"Invisible"'
+            ice_tab_hot_show = False
+          
           out_xml( '\t<Image>\r\n')
           out_xml( '\t<X> 16 </X>\r\n')
           out_xml( '\t<Y> 264 </Y>\r\n')
@@ -628,6 +633,10 @@
             shw = '"Invisible"'
             ice_tab_ice_show = False
 
+          if spl[4] == "TAOTIM":
+            shw = '"Invisible"'
+            ice_tab_ice_show = False
+          
           out_xml( '\t<Image>\r\n')
           out_xml( '\t<X> 81 </X>\r\n')
           out_xml( '\t<Y> 264 </Y>\r\n')
@@ -678,22 +687,40 @@
       
           ice_tab_blend_show = True
 
-          shw = "$" + spl[6] + ".Button"
-          if spl[6] == "-" :
-            shw = '"Invisible"'
-            ice_tab_blend_show = False
+          if spl[4] == "TAOTIM":
+            shw = "$" + spl[6] + ".Button"
+            if spl[6] == "-" :
+              shw = '"Invisible"'
+              ice_tab_blend_show = False
 
-          if len(spl[6]) == 0 :
-            shw = '"Invisible"'
-            ice_tab_blend_show = False
+            if len(spl[6]) == 0 :
+              shw = '"Invisible"'
+              ice_tab_blend_show = False
 
-          out_xml( '\t<Image>\r\n')
-          out_xml( '\t<X> 146 </X>\r\n')
-          out_xml( '\t<Y> 264 </Y>\r\n')
-          out_xml( '\t<Filename> Var( DirImage2 + "blend.png" ) </Filename>\r\n')
-          out_xml( '\t<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>\r\n')
-          out_xml( '\t<State> ' + shw + ' </State>\r\n')
-          out_xml( '\t</Image>\r\n')
+            out_xml( '\t<Image>\r\n')
+            out_xml( '\t<X> 146 </X>\r\n')
+            out_xml( '\t<Y> 264 </Y>\r\n')
+            out_xml( '\t<Filename> Var( DirImage2 + "pricetaotim.png" ) </Filename>\r\n')
+            out_xml( '\t<FilenameDisable> Var( DirImage2 + "pricetaotim.png" ) </FilenameDisable>\r\n')
+            out_xml( '\t<State> ' + shw + ' </State>\r\n')
+            out_xml( '\t</Image>\r\n')
+          else:
+            shw = "$" + spl[6] + ".Button"
+            if spl[6] == "-" :
+              shw = '"Invisible"'
+              ice_tab_blend_show = False
+
+            if len(spl[6]) == 0 :
+              shw = '"Invisible"'
+              ice_tab_blend_show = False
+
+            out_xml( '\t<Image>\r\n')
+            out_xml( '\t<X> 146 </X>\r\n')
+            out_xml( '\t<Y> 264 </Y>\r\n')
+            out_xml( '\t<Filename> Var( DirImage2 + "blend.png" ) </Filename>\r\n')
+            out_xml( '\t<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>\r\n')
+            out_xml( '\t<State> ' + shw + ' </State>\r\n')
+            out_xml( '\t</Image>\r\n')
 
           out_xml( '\t<Text>\r\n')
           if "inter" in param:
diff --git a/xml/menutab/page_catalog_group_recommend.xml b/xml/menutab/page_catalog_group_recommend.xml
index 470f4ac5..f8ad24a5 100644
--- a/xml/menutab/page_catalog_group_recommend.xml
+++ b/xml/menutab/page_catalog_group_recommend.xml
@@ -3695,19 +3695,19 @@ Sugar, Biscof" </Value>
 </Block>
 	; - - - 
 	; ==================> Len = 12
-	; - - 12-41-03-0028 
+	; TAOTIM - 12-41-03-0028 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-41-03-0028.Button,Disable=Invisible,$Sum1241030028) </State> 
+	<State> Flag( TAOTIM.Button,12-41-03-0028.Button,Disable=Invisible,$SumTAOTIM1241030028) </State> 
 	<Button>
-	<State> $Sum1241030028 </State> 
+	<State> $SumTAOTIM1241030028 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//taotim_bubble.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//taotim_bubble.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//taotim_bubble.png" </FilenameDisable>
-	<OverlayImage> xmlpro( 12-41-03-0028, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<OverlayImage> xmlpro( TAOTIM, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -3718,16 +3718,16 @@ Sugar, Biscof" </Value>
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "taotim_bubble.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		GetInstanceIDMenuTab OpenFromInstMenuTab
-		Var PriceD1 = $-.Price
+		Var PriceD1 = $TAOTIM.Price
 		Var PriceD2 = $-.Price
 		Var PriceD3 = $12-41-03-0028.Price
-		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE1 = "TAOTIM"
 		Var PD_CODE2 = "##-##-##-####"
 		Var PD_CODE3 = "12-41-03-0028"
-		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_1 = $TAOTIM.Button
 		Var PD_STAGE_2 = "Disable2"
 		Var PD_STAGE_3 = $12-41-03-0028.Button
-		Var OverlayMenuFilter !assigned xmlpro( 12-41-03-0028, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		Var OverlayMenuFilter !assigned xmlpro( TAOTIM, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
 		DEBUGVAR OverlayMenuFilter
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
@@ -3747,15 +3747,15 @@ Sugar, Biscof" </Value>
 			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "TAOTIM"
 			Else
 			Topping "Load" "12-41-03-0028"
 			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_hot = $TAOTIM.NameE
+		Var menu_desc_eng_hot = $TAOTIM.descriptionE
+		Var menu_name_thai_hot = $TAOTIM.Name
+		Var menu_desc_thai_hot = $TAOTIM.description
 		
 		Var menu_name_eng_cold = $##-##-##-####.NameE
 		Var menu_desc_eng_cold = $##-##-##-####.descriptionE
@@ -3828,7 +3828,7 @@ Sugar, Biscof" </Value>
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<State> "Invisible" </State>
+	<State> $TAOTIM.Button </State>
 	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
 	</Image>
@@ -3840,8 +3840,8 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<State> $TAOTIM.Button </State>
+	<Value> StringFmt(  $TAOTIM.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -3886,7 +3886,11 @@ Sugar, Biscof" </Value>
 		eval( 
 		If ICE_PROCESS_STATUS = 2 Then
 		
-			Var ice_tab_process_show = "Invisible"
+			If $SumTAOTIM1241030028 = "Disable" Then
+				Var ice_tab_process_show = "Disable"
+			Else
+				Var ice_tab_process_show = "Enable"
+			EndIf
 		
 		Else
 			Var ice_tab_process_show = "Invisible"
@@ -3902,8 +3906,8 @@ Sugar, Biscof" </Value>
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum1241030028 = "Disable" Then
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+			If $SumTAOTIM1241030028 = "Disable" Then
+				STRCONTAIN "ERR" $TAOTIM.TAG tag1_is_disable
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
 				STRCONTAIN "ERR" $12-41-03-0028.TAG tag3_is_disable
 				Var return = "Invisible"
@@ -3941,7 +3945,7 @@ Sugar, Biscof" </Value>
 	<Font> MITRegularTTF </Font>
 	<Color> 0x5A5A5A </Color>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum1241030028 </State> 
+	<State> $SumTAOTIM1241030028 </State> 
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
diff --git a/xml/page_board.xml b/xml/page_board.xml
index 89a93d79..380209b5 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -1350,8 +1350,7 @@
 		EndIf
 	EndIf
 
-	DEBUGVAR ShowButtonClick2
-
+	
 	Refresh
 
 	TimerReset
@@ -1634,7 +1633,7 @@
 	Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml"
 
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
-4
+
 
 	Var OpenFromPageBoard = 1
 
diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml
index 78b02a0c..ee1e3a5e 100644
--- a/xml/page_catalog_group_recommend.xml
+++ b/xml/page_catalog_group_recommend.xml
@@ -3642,19 +3642,19 @@ Sugar, Biscof" </Value>
 </Block>
 	; - - - 
 	; ==================> Len = 12
-	; - - 12-41-03-0028 
+	; TAOTIM - 12-41-03-0028 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-41-03-0028.Button,Disable=Invisible,$Sum1241030028) </State> 
+	<State> Flag( TAOTIM.Button,12-41-03-0028.Button,Disable=Invisible,$SumTAOTIM1241030028) </State> 
 	<Button>
-	<State> $Sum1241030028 </State> 
+	<State> $SumTAOTIM1241030028 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//taotim_bubble.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//taotim_bubble.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//taotim_bubble.png" </FilenameDisable>
-	<OverlayImage> xmlpro( 12-41-03-0028, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<OverlayImage> xmlpro( TAOTIM, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -3664,16 +3664,16 @@ Sugar, Biscof" </Value>
 		Var DrinkDescription = "Icecream, Caramel syrup and Pearl carrageenan"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "taotim_bubble.png"
 		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $-.Price
+		Var PriceD1 = $TAOTIM.Price
 		Var PriceD2 = $-.Price
 		Var PriceD3 = $12-41-03-0028.Price
-		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE1 = "TAOTIM"
 		Var PD_CODE2 = "##-##-##-####"
 		Var PD_CODE3 = "12-41-03-0028"
-		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_1 = $TAOTIM.Button
 		Var PD_STAGE_2 = "Disable2"
 		Var PD_STAGE_3 = $12-41-03-0028.Button
-		Var OverlayMenuFilter !assigned xmlpro( 12-41-03-0028, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		Var OverlayMenuFilter !assigned xmlpro( TAOTIM, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
 		DEBUGVAR OverlayMenuFilter
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
@@ -3693,15 +3693,15 @@ Sugar, Biscof" </Value>
 			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "TAOTIM"
 			Else
 			Topping "Load" "12-41-03-0028"
 			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_hot = $TAOTIM.NameE
+		Var menu_desc_eng_hot = $TAOTIM.descriptionE
+		Var menu_name_thai_hot = $TAOTIM.Name
+		Var menu_desc_thai_hot = $TAOTIM.description
 		
 		Var menu_name_eng_cold = $##-##-##-####.NameE
 		Var menu_desc_eng_cold = $##-##-##-####.descriptionE
@@ -3768,11 +3768,6 @@ Sugar, Biscof" </Value>
 	<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>
@@ -3786,7 +3781,7 @@ Sugar, Biscof" </Value>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  $TAOTIM.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -3809,8 +3804,8 @@ Sugar, Biscof" </Value>
 	<Image>
 	<X> 146 </X>
 	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<Filename> Var( DirImage2 + "pricetaotim.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "pricetaotim.png" ) </FilenameDisable>
 	<State> $12-41-03-0028.Button </State>
 	</Image>
 	<Text>
@@ -3847,8 +3842,8 @@ Sugar, Biscof" </Value>
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum1241030028 = "Disable" Then
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+			If $SumTAOTIM1241030028 = "Disable" Then
+				STRCONTAIN "ERR" $TAOTIM.TAG tag1_is_disable
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
 				STRCONTAIN "ERR" $12-41-03-0028.TAG tag3_is_disable
 				Var return = "Invisible"
@@ -3886,7 +3881,7 @@ Sugar, Biscof" </Value>
 	<Font> MITRegularTTF </Font>
 	<Color> 0x5A5A5A </Color>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum1241030028 </State> 
+	<State> $SumTAOTIM1241030028 </State> 
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>