diff --git a/ui/lang.tsv b/ui/lang.tsv
index 1904b730..1b0fff07 100644
--- a/ui/lang.tsv
+++ b/ui/lang.tsv
@@ -1256,7 +1256,7 @@
 1300003		Beans module	ชุดเมล็ดกาแฟ
 1300004		Bean tray	ถาดใส่เมล็ดกาแฟ
 1300005		Switch tray :	สวิตซ์ถาด :
-1300006		Check tray shutter	ตรวจสอบชัตเตอร์ของถาด
+1300006		Check tray shutter	ตรวจสอบชัตเตอร์ถาด
 1300007		Pay beans	จ่ายถั่ว
 1300008		1. Select beans	1. เลือกเมล็ดกาแฟ
 1300009		2. Select direction	2. เลือกทิศทาง
@@ -1269,7 +1269,7 @@
 1300016		Brew time:sec	เวลาชง: วินาที
 1300017		Test grind sizes	ทดสอบขนาดบด
 1300018		Coffee module type :	ประเภทชุดกาแฟ :
-1300019		1. Select grind sizes	1. เลือกขนาดบด
+1300019		1. Select grind sizes	1. เลือกขนาดการบด
 1300020		More coarse	หยาบขึ้น
 1300021		More fine	ละเอียดขึ้น
 1300022		2. Test grinding	2. ทดสอบการบด
diff --git a/xml/event/double_promotion_matcha_every_day_and_oreo_volcano.xml b/xml/event/double_promotion_matcha_every_day_and_oreo_volcano.xml
index a6ced732..c2ff7d32 100644
--- a/xml/event/double_promotion_matcha_every_day_and_oreo_volcano.xml
+++ b/xml/event/double_promotion_matcha_every_day_and_oreo_volcano.xml
@@ -178,7 +178,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-02-02-0099.Button,DateTimeStart="2025/04/01T00:00:00",$Sum1202020099) </State> 
+	<State> Flag( 12-02-02-0099.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",$Sum1202020099) </State> 
 	<Button>
 	<State> $Sum1202020099 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Pure_Matcha_X3.png" </Filename>
@@ -429,7 +429,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-03-0103.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1203030103) </State> 
+	<State> Flag( 12-03-03-0103.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1203030103) </State> 
 	<Button>
 	<State> $Sum1203030103 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Coconut_Milk_Smoothie.png" </Filename>
@@ -684,7 +684,7 @@ And Ice" </Value>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-03-0106.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1203030106) </State> 
+	<State> Flag( 12-03-03-0106.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1203030106) </State> 
 	<Button>
 	<State> $Sum1203030106 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Coconut_Milk_Matcha_Smoothie.png" </Filename>
@@ -939,7 +939,7 @@ Sugar And Ice" </Value>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-01-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1201020090) </State> 
+	<State> Flag( 12-01-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1201020090) </State> 
 	<Button>
 	<State> $Sum1201020090 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_Oliang.png" </Filename>
@@ -1188,7 +1188,7 @@ Sugar And Ice" </Value>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-21-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1221020090) </State> 
+	<State> Flag( 12-21-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1221020090) </State> 
 	<Button>
 	<State> $Sum1221020090 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_Oliang.png" </Filename>
@@ -5739,9 +5739,9 @@ Volcano" </Value>
 	<State> Flag( 12-05-02-0143.Button,12-05-03-0143.Button,$Sum12050201431205030143) </State> 
 	<Button>
 	<State> $Sum12050201431205030143 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_energy_drink_soda_Extra_boost_energy.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_energy_drink_soda_Extra_boost_energy.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_energy_drink_soda_Extra_boost_energy.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_energy_drink_soda_Extra.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_energy_drink_soda_Extra.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_energy_drink_soda_Extra.png" </FilenameDisable>
 	<OverlayImage> xmlpro( 12-05-03-0143, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
@@ -5750,7 +5750,7 @@ Volcano" </Value>
 		Var NameDrinkTH = "เต่าพลังโซดา (เพิ่มปริมาณ)"
 		Var DrinkDescriptionTH = "เครื่องดื่มเต่าทรงพลัง โซดา และน้ำแข็ง (มีคาเฟอีน)"
 		Var DrinkDescription = "Medicine Drink, Soda, Ice"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_energy_drink_soda_Extra_boost_energy.png"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_energy_drink_soda_Extra.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $12-05-02-0143.Price
diff --git a/xml/event/promotion_matcha_every_day.xml b/xml/event/promotion_matcha_every_day.xml
index 39a2ec1f..41b35594 100644
--- a/xml/event/promotion_matcha_every_day.xml
+++ b/xml/event/promotion_matcha_every_day.xml
@@ -76,7 +76,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-02-02-0099.Button,DateTimeStart="2025/04/01T00:00:00",Disable=Invisible,$Sum1202020099) </State> 
+	<State> Flag( 12-02-02-0099.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Disable=Invisible,$Sum1202020099) </State> 
 	<Button>
 	<State> $Sum1202020099 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Pure_Matcha_X3.png" </Filename>
@@ -327,7 +327,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-03-0103.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1203030103) </State> 
+	<State> Flag( 12-03-03-0103.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1203030103) </State> 
 	<Button>
 	<State> $Sum1203030103 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Coconut_Milk_Smoothie.png" </Filename>
@@ -582,7 +582,7 @@ And Ice" </Value>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-03-0106.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1203030106) </State> 
+	<State> Flag( 12-03-03-0106.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1203030106) </State> 
 	<Button>
 	<State> $Sum1203030106 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Coconut_Milk_Matcha_Smoothie.png" </Filename>
@@ -837,7 +837,7 @@ Sugar And Ice" </Value>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-01-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1201020090) </State> 
+	<State> Flag( 12-01-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1201020090) </State> 
 	<Button>
 	<State> $Sum1201020090 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_Oliang.png" </Filename>
@@ -1086,7 +1086,7 @@ Sugar And Ice" </Value>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-21-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1221020090) </State> 
+	<State> Flag( 12-21-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1221020090) </State> 
 	<Button>
 	<State> $Sum1221020090 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_Oliang.png" </Filename>
diff --git a/xml/event/promotion_oreo_volcano.xml b/xml/event/promotion_oreo_volcano.xml
index 443d1cf5..e4837674 100644
--- a/xml/event/promotion_oreo_volcano.xml
+++ b/xml/event/promotion_oreo_volcano.xml
@@ -76,7 +76,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-02-02-0099.Button,DateTimeStart="2025/04/01T00:00:00",Disable=Invisible,$Sum1202020099) </State> 
+	<State> Flag( 12-02-02-0099.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Disable=Invisible,$Sum1202020099) </State> 
 	<Button>
 	<State> $Sum1202020099 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Pure_Matcha_X3.png" </Filename>
@@ -327,7 +327,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-03-0103.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1203030103) </State> 
+	<State> Flag( 12-03-03-0103.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1203030103) </State> 
 	<Button>
 	<State> $Sum1203030103 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Coconut_Milk_Smoothie.png" </Filename>
@@ -582,7 +582,7 @@ And Ice" </Value>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-03-0106.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1203030106) </State> 
+	<State> Flag( 12-03-03-0106.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1203030106) </State> 
 	<Button>
 	<State> $Sum1203030106 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Coconut_Milk_Matcha_Smoothie.png" </Filename>
@@ -837,7 +837,7 @@ Sugar And Ice" </Value>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-01-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1201020090) </State> 
+	<State> Flag( 12-01-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1201020090) </State> 
 	<Button>
 	<State> $Sum1201020090 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_Oliang.png" </Filename>
@@ -1086,7 +1086,7 @@ Sugar And Ice" </Value>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-21-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1221020090) </State> 
+	<State> Flag( 12-21-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1221020090) </State> 
 	<Button>
 	<State> $Sum1221020090 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_Oliang.png" </Filename>
diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml
index 81d05a74..fe501f2c 100644
--- a/xml/page_catalog_group_recommend.xml
+++ b/xml/page_catalog_group_recommend.xml
@@ -69,7 +69,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-02-02-0099.Button,DateTimeStart="2025/04/01T00:00:00",Disable=Invisible,$Sum1202020099) </State> 
+	<State> Flag( 12-02-02-0099.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Disable=Invisible,$Sum1202020099) </State> 
 	<Button>
 	<State> $Sum1202020099 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Pure_Matcha_X3.png" </Filename>
@@ -320,7 +320,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-03-0103.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1203030103) </State> 
+	<State> Flag( 12-03-03-0103.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1203030103) </State> 
 	<Button>
 	<State> $Sum1203030103 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Coconut_Milk_Smoothie.png" </Filename>
@@ -575,7 +575,7 @@ And Ice" </Value>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-03-0106.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1203030106) </State> 
+	<State> Flag( 12-03-03-0106.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1203030106) </State> 
 	<Button>
 	<State> $Sum1203030106 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Coconut_Milk_Matcha_Smoothie.png" </Filename>
@@ -830,7 +830,7 @@ Sugar And Ice" </Value>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-01-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1201020090) </State> 
+	<State> Flag( 12-01-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1201020090) </State> 
 	<Button>
 	<State> $Sum1201020090 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_Oliang.png" </Filename>
@@ -1079,7 +1079,7 @@ Sugar And Ice" </Value>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-21-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1221020090) </State> 
+	<State> Flag( 12-21-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1221020090) </State> 
 	<Button>
 	<State> $Sum1221020090 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_Oliang.png" </Filename>
diff --git a/xml/page_catalog_group_recommend_multi_pro.xml b/xml/page_catalog_group_recommend_multi_pro.xml
index d84e8443..4004f22d 100644
--- a/xml/page_catalog_group_recommend_multi_pro.xml
+++ b/xml/page_catalog_group_recommend_multi_pro.xml
@@ -84,7 +84,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-02-02-0099.Button,DateTimeStart="2025/04/01T00:00:00",$Sum1202020099) </State> 
+	<State> Flag( 12-02-02-0099.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",$Sum1202020099) </State> 
 	<Button>
 	<State> $Sum1202020099 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Pure_Matcha_X3.png" </Filename>
@@ -335,7 +335,7 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-03-0103.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1203030103) </State> 
+	<State> Flag( 12-03-03-0103.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1203030103) </State> 
 	<Button>
 	<State> $Sum1203030103 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Coconut_Milk_Smoothie.png" </Filename>
@@ -590,7 +590,7 @@ And Ice" </Value>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-03-0106.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1203030106) </State> 
+	<State> Flag( 12-03-03-0106.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1203030106) </State> 
 	<Button>
 	<State> $Sum1203030106 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Coconut_Milk_Matcha_Smoothie.png" </Filename>
@@ -845,7 +845,7 @@ Sugar And Ice" </Value>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-01-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1201020090) </State> 
+	<State> Flag( 12-01-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1201020090) </State> 
 	<Button>
 	<State> $Sum1201020090 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_Oliang.png" </Filename>
@@ -1094,7 +1094,7 @@ Sugar And Ice" </Value>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-21-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1221020090) </State> 
+	<State> Flag( 12-21-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1221020090) </State> 
 	<Button>
 	<State> $Sum1221020090 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_Oliang.png" </Filename>
@@ -5645,9 +5645,9 @@ Volcano" </Value>
 	<State> Flag( 12-05-02-0143.Button,12-05-03-0143.Button,$Sum12050201431205030143) </State> 
 	<Button>
 	<State> $Sum12050201431205030143 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_energy_drink_soda_Extra_boost_energy.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_energy_drink_soda_Extra_boost_energy.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_energy_drink_soda_Extra_boost_energy.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_energy_drink_soda_Extra.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_energy_drink_soda_Extra.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_energy_drink_soda_Extra.png" </FilenameDisable>
 	<OverlayImage> xmlpro( 12-05-03-0143, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
@@ -5656,7 +5656,7 @@ Volcano" </Value>
 		Var NameDrinkTH = "เต่าพลังโซดา (เพิ่มปริมาณ)"
 		Var DrinkDescriptionTH = "เครื่องดื่มเต่าทรงพลัง โซดา และน้ำแข็ง (มีคาเฟอีน)"
 		Var DrinkDescription = "Medicine Drink, Soda, Ice"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_energy_drink_soda_Extra_boost_energy.png"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_energy_drink_soda_Extra.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $12-05-02-0143.Price
@@ -16604,7 +16604,7 @@ Limenade Soda" </Value>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-02-02-0099.Button,DateTimeStart="2025/04/01T00:00:00",$Sum1202020099) </State> 
+	<State> Flag( 12-02-02-0099.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",$Sum1202020099) </State> 
 	<Button>
 	<State> $Sum1202020099 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Pure_Matcha_X3.png" </Filename>
@@ -16855,7 +16855,7 @@ Limenade Soda" </Value>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-03-0103.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1203030103) </State> 
+	<State> Flag( 12-03-03-0103.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1203030103) </State> 
 	<Button>
 	<State> $Sum1203030103 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Coconut_Milk_Smoothie.png" </Filename>
@@ -17110,7 +17110,7 @@ And Ice" </Value>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-03-0106.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1203030106) </State> 
+	<State> Flag( 12-03-03-0106.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1203030106) </State> 
 	<Button>
 	<State> $Sum1203030106 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Coconut_Milk_Matcha_Smoothie.png" </Filename>
@@ -17365,7 +17365,7 @@ Sugar And Ice" </Value>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-01-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1201020090) </State> 
+	<State> Flag( 12-01-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1201020090) </State> 
 	<Button>
 	<State> $Sum1201020090 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_Oliang.png" </Filename>
@@ -17614,7 +17614,7 @@ Sugar And Ice" </Value>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-21-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1221020090) </State> 
+	<State> Flag( 12-21-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1221020090) </State> 
 	<Button>
 	<State> $Sum1221020090 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_Oliang.png" </Filename>
@@ -22165,9 +22165,9 @@ Volcano" </Value>
 	<State> Flag( 12-05-02-0143.Button,12-05-03-0143.Button,$Sum12050201431205030143) </State> 
 	<Button>
 	<State> $Sum12050201431205030143 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_energy_drink_soda_Extra_boost_energy.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_energy_drink_soda_Extra_boost_energy.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_energy_drink_soda_Extra_boost_energy.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_energy_drink_soda_Extra.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_energy_drink_soda_Extra.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_energy_drink_soda_Extra.png" </FilenameDisable>
 	<OverlayImage> xmlpro( 12-05-03-0143, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
@@ -22176,7 +22176,7 @@ Volcano" </Value>
 		Var NameDrinkTH = "เต่าพลังโซดา (เพิ่มปริมาณ)"
 		Var DrinkDescriptionTH = "เครื่องดื่มเต่าทรงพลัง โซดา และน้ำแข็ง (มีคาเฟอีน)"
 		Var DrinkDescription = "Medicine Drink, Soda, Ice"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_energy_drink_soda_Extra_boost_energy.png"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_energy_drink_soda_Extra.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $12-05-02-0143.Price
@@ -33124,7 +33124,7 @@ Limenade Soda" </Value>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-02-02-0099.Button,DateTimeStart="2025/04/01T00:00:00",$Sum1202020099) </State> 
+	<State> Flag( 12-02-02-0099.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",$Sum1202020099) </State> 
 	<Button>
 	<State> $Sum1202020099 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Pure_Matcha_X3.png" </Filename>
@@ -33375,7 +33375,7 @@ Limenade Soda" </Value>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-03-0103.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1203030103) </State> 
+	<State> Flag( 12-03-03-0103.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1203030103) </State> 
 	<Button>
 	<State> $Sum1203030103 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Coconut_Milk_Smoothie.png" </Filename>
@@ -33630,7 +33630,7 @@ And Ice" </Value>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-03-0106.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1203030106) </State> 
+	<State> Flag( 12-03-03-0106.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1203030106) </State> 
 	<Button>
 	<State> $Sum1203030106 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Coconut_Milk_Matcha_Smoothie.png" </Filename>
@@ -33885,7 +33885,7 @@ Sugar And Ice" </Value>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-01-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1201020090) </State> 
+	<State> Flag( 12-01-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1201020090) </State> 
 	<Button>
 	<State> $Sum1201020090 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_Oliang.png" </Filename>
@@ -34134,7 +34134,7 @@ Sugar And Ice" </Value>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-21-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1221020090) </State> 
+	<State> Flag( 12-21-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1221020090) </State> 
 	<Button>
 	<State> $Sum1221020090 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_Oliang.png" </Filename>
@@ -38685,9 +38685,9 @@ Volcano" </Value>
 	<State> Flag( 12-05-02-0143.Button,12-05-03-0143.Button,$Sum12050201431205030143) </State> 
 	<Button>
 	<State> $Sum12050201431205030143 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_energy_drink_soda_Extra_boost_energy.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_energy_drink_soda_Extra_boost_energy.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_energy_drink_soda_Extra_boost_energy.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_energy_drink_soda_Extra.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_energy_drink_soda_Extra.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_energy_drink_soda_Extra.png" </FilenameDisable>
 	<OverlayImage> xmlpro( 12-05-03-0143, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
@@ -38696,7 +38696,7 @@ Volcano" </Value>
 		Var NameDrinkTH = "เต่าพลังโซดา (เพิ่มปริมาณ)"
 		Var DrinkDescriptionTH = "เครื่องดื่มเต่าทรงพลัง โซดา และน้ำแข็ง (มีคาเฟอีน)"
 		Var DrinkDescription = "Medicine Drink, Soda, Ice"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_energy_drink_soda_Extra_boost_energy.png"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_energy_drink_soda_Extra.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $12-05-02-0143.Price
@@ -49644,7 +49644,7 @@ Limenade Soda" </Value>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-02-02-0099.Button,DateTimeStart="2025/04/01T00:00:00",$Sum1202020099) </State> 
+	<State> Flag( 12-02-02-0099.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",$Sum1202020099) </State> 
 	<Button>
 	<State> $Sum1202020099 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Pure_Matcha_X3.png" </Filename>
@@ -49895,7 +49895,7 @@ Limenade Soda" </Value>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-03-0103.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1203030103) </State> 
+	<State> Flag( 12-03-03-0103.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1203030103) </State> 
 	<Button>
 	<State> $Sum1203030103 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Coconut_Milk_Smoothie.png" </Filename>
@@ -50150,7 +50150,7 @@ And Ice" </Value>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-03-03-0106.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1203030106) </State> 
+	<State> Flag( 12-03-03-0106.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1203030106) </State> 
 	<Button>
 	<State> $Sum1203030106 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Coconut_Milk_Matcha_Smoothie.png" </Filename>
@@ -50405,7 +50405,7 @@ Sugar And Ice" </Value>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-01-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1201020090) </State> 
+	<State> Flag( 12-01-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1201020090) </State> 
 	<Button>
 	<State> $Sum1201020090 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_Oliang.png" </Filename>
@@ -50654,7 +50654,7 @@ Sugar And Ice" </Value>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-21-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1221020090) </State> 
+	<State> Flag( 12-21-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",DateTimeEnd="2025/05/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1221020090) </State> 
 	<Button>
 	<State> $Sum1221020090 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_Oliang.png" </Filename>
@@ -55205,9 +55205,9 @@ Volcano" </Value>
 	<State> Flag( 12-05-02-0143.Button,12-05-03-0143.Button,$Sum12050201431205030143) </State> 
 	<Button>
 	<State> $Sum12050201431205030143 </State> 
-	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_energy_drink_soda_Extra_boost_energy.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_energy_drink_soda_Extra_boost_energy.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_energy_drink_soda_Extra_boost_energy.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_energy_drink_soda_Extra.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_energy_drink_soda_Extra.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_energy_drink_soda_Extra.png" </FilenameDisable>
 	<OverlayImage> xmlpro( 12-05-03-0143, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
@@ -55216,7 +55216,7 @@ Volcano" </Value>
 		Var NameDrinkTH = "เต่าพลังโซดา (เพิ่มปริมาณ)"
 		Var DrinkDescriptionTH = "เครื่องดื่มเต่าทรงพลัง โซดา และน้ำแข็ง (มีคาเฟอีน)"
 		Var DrinkDescription = "Medicine Drink, Soda, Ice"
-		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_energy_drink_soda_Extra_boost_energy.png"
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_energy_drink_soda_Extra.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $12-05-02-0143.Price