diff --git a/image/topping2_en/bg_milk_choice_j.png b/image/topping2_en/bg_milk_choice_j.png
index 542fb9b1..a67dd2dd 100644
Binary files a/image/topping2_en/bg_milk_choice_j.png and b/image/topping2_en/bg_milk_choice_j.png differ
diff --git a/xml/page_topping_select7.xml b/xml/page_topping_select7.xml
index d6e432a9..fba8407a 100644
--- a/xml/page_topping_select7.xml
+++ b/xml/page_topping_select7.xml
@@ -300,12 +300,12 @@
 	Var img_smth_dis2 = "/bt_smoothie_disable2_no.png"
 
 	If MilkChoiceVeganEnable = 1 Then
-		Var CerealMilkToppingBg = DirImage + "/bg_milk_choice_j.png"
+		Var OatMilkToppingBg = DirImage + "/bg_milk_choice_j.png"
 	Else
-		Var CerealMilkToppingBg = DirImage + "/bg_milk_choice.png"
+		Var OatMilkToppingBg = DirImage + "/bg_milk_choice.png"
 	EndIf
-	Var CerealMilkToppingEnable = "Invisible"
-	Var CerealMilkEnable = "Invisible"
+	Var OatMilkToppingEnable = "Invisible"
+	Var OatMilkEnable = "Invisible"
 
 
 	Var topping_price_refresh = 1
@@ -354,9 +354,9 @@
 	EndIf
 
 	If show_eng = "true" Then
-		Var CerealMilkX = 400
+		Var OatMilkX = 400
 	Else
-		Var CerealMilkX = 270
+		Var OatMilkX = 270
 	EndIf
 
 	TRY "/mnt/sdcard/coffeevending/taobin_project/flash_deal/topping_page.ev"
@@ -601,12 +601,18 @@
 		EndIf
 	EndIf
 
+	If MilkChoiceVeganEnable = 1 Then
+		Var OatMilkToppingBg = DirImage + "/bg_milk_choice_j.png"
+	Else
+		Var OatMilkToppingBg = DirImage + "/bg_milk_choice.png"
+	EndIf
+
 	TRY "/mnt/sdcard/coffeevending/taobin_project/flash_deal/topping_page.ev"
 
 	If show_eng = "true" Then
-		Var CerealMilkX = 400
+		Var OatMilkX = 400
 	Else
-		Var CerealMilkX = 270
+		Var OatMilkX = 270
 	EndIf
 
 	Function 2
@@ -711,6 +717,8 @@
 	
 	DEBUGVAR MenuCodeName1
 	DEBUGVAR MenuCodeName2
+	DEBUGVAR MenuCodeName1_State
+	DEBUGVAR MenuCodeName2_State
 	DEBUGVAR SubMenuOnTop1
 	DEBUGVAR SubMenuOnTop2
 	DEBUGVAR SubMenuOnTop3
@@ -1489,10 +1497,12 @@
 		EndIf 
 		;topping_price_refresh = 0
 		
-		If MenuCodeName1 = "Cereal-Milk" Then
-			Var CerealMilkToppingEnable = "Enable"
-			Var CerealMilkPrice = SubMenuPrice1
-			Var CerealMilkEnable = "Enable"
+		If MenuCodeName1 = "OatMilk" Then
+			Var OatMilkToppingEnable = "Enable"
+			Var OatMilkPrice = SubMenuPrice1
+			If MenuCodeName1_State = "Enable" Then
+				Var OatMilkEnable = "Enable"
+			EndIf
 		EndIf
 
 		
@@ -2805,32 +2815,32 @@
 ;
 ;-BEGIN milk choice
 <Block>
-<State> CerealMilkToppingEnable </State>
+<State> OatMilkToppingEnable </State>
 <Width> 986 </Width>
 <Height> 157 </Height>
 <MarginTop> 20 </MarginTop>
 <Image>
-<State> CerealMilkToppingEnable </State>
-<Filename> CerealMilkToppingBg </Filename>
+<State> OatMilkToppingEnable </State>
+<Filename> OatMilkToppingBg </Filename>
 </Image>
 
 <Button>
 <X> 40 </X>
 <Y> 72 </Y>
-<State> CerealMilkEnable </State>
+<State> OatMilkEnable </State>
 <Mode> "No" </Mode>
 <Filename> "ROOT/taobin_project/image/topping2/bn_cereal.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/topping2/bp_cereal.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	SAVELOG " CerealMilkEnable "
+	SAVELOG " OatMilkEnable "
 	
 
-	If CerealMilkEnable = "Press" Then
-		Var CerealMilkEnable = "Enable"
+	If OatMilkEnable = "Press" Then
+		Var OatMilkEnable = "Enable"
 	Else
-		Var CerealMilkEnable = "Press"
+		Var OatMilkEnable = "Press"
 	EndIf
 
 	Function 2
@@ -2843,20 +2853,20 @@
 <Button>
 <X> 896 </X>
 <Y> 78 </Y>
-<State> CerealMilkEnable </State>
+<State> OatMilkEnable </State>
 <Mode> "No" </Mode>
 <Filename> Var( DirImage + "/cb_notcheck.png" ) </Filename>
 <FilenamePress> Var( DirImage + "/cb_checked.png" ) </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	SAVELOG " CerealMilkEnable "
+	SAVELOG " OatMilkEnable "
 	
 
-	If CerealMilkEnable = "Press" Then
-		Var CerealMilkEnable = "Enable"
+	If OatMilkEnable = "Press" Then
+		Var OatMilkEnable = "Enable"
 	Else
-		Var CerealMilkEnable = "Press"
+		Var OatMilkEnable = "Press"
 	EndIf
 
 	Function 2
@@ -2874,7 +2884,7 @@
 <State> "Enable" </State>
 <Size> 36 </Size>
 <Color> 0x84776F </Color>
-<Value> CerealMilkPrice </Value>
+<Value> OatMilkPrice </Value>
 </Text>
 
 </Block>
@@ -4179,21 +4189,21 @@
 		Machine PreparCup
 	EndIf
 	
-	;Var CerealMilkAddAmount = SubMenuPrice1 - PriceDrinkNoTop
-	Var CerealMilkAddAmount = 5
+	;Var OatMilkAddAmount = SubMenuPrice1 - PriceDrinkNoTop
+	Var OatMilkAddAmount = 5
 
-	If CerealMilkAddAmount = 0 Then
-		Var CerealMilkPrice = "(+฿5)"
+	If OatMilkAddAmount = 0 Then
+		Var OatMilkPrice = "(+฿5)"
 
 	Else
-		Var CerealMilkPrice = "(+฿" +  CerealMilkAddAmount
-		Var CerealMilkPrice = CerealMilkPrice +  ")"
+		Var OatMilkPrice = "(+฿" +  OatMilkAddAmount
+		Var OatMilkPrice = OatMilkPrice +  ")"
 
-		Var CerealMilkPrice = "(+฿5)"
+		Var OatMilkPrice = "(+฿5)"
 	EndIf
 
 	DEBUGVAR SubMenuPrice1
-	DEBUGVAR CerealMilkAddAmount
+	DEBUGVAR OatMilkAddAmount
 
 
 	
@@ -4276,11 +4286,13 @@
 		
 	EndIf
 
-	If CerealMilkEnable = "Press" Then
-		If MenuCodeName1 = "Cereal-Milk" Then
-			Var TOPPING_PRICE = TOPPING_PRICE + CerealMilkAddAmount
-			Var DisableUsingCode = "true"
-			Var UserSelectProductCode = SubMenuProductCode1
+	If OatMilkEnable = "Press" Then
+		If MenuCodeName1 = "OatMilk" Then
+			If MenuCodeName1_State = "Enable" Then
+				Var TOPPING_PRICE = TOPPING_PRICE + OatMilkAddAmount
+				Var DisableUsingCode = "true"
+				Var UserSelectProductCode = SubMenuProductCode1
+			EndIf
 		EndIf
 
 	Else