diff --git a/xml/page_topping_select7.xml b/xml/page_topping_select7.xml
index f57fada8..a500cbab 100644
--- a/xml/page_topping_select7.xml
+++ b/xml/page_topping_select7.xml
@@ -2380,7 +2380,14 @@
 					Var showShotEnable = "Invisible"
 					Var ExtraTopping = "Enable"
 				Else
-					Var EnableLightRoast = "Enable"
+					If toppingID2index3 = 0 Then
+						Var EnableLightRoast = "Invisible"
+						Var ShotCoffeePremium = "Enable"
+						Var showShotEnable = "Invisible"
+						Var ExtraTopping = "Enable"
+					Else
+						Var EnableLightRoast = "Enable"
+					EndIf
 				EndIf
 
 				DEBUGVAR TOPPING2
@@ -2438,16 +2445,16 @@
 					Var CustomCoffeeQuantityAdditionalPrice[0] = ""
 				EndIf
 
-				If toppingID2price2 > 0 Then
-					Var priceFormated !assigned StringFmt( toppingID2price2 , PriceCustomCoffeeFormat, PreScaleConvertShow)
+				If toppingID2price3 > 0 Then
+					Var priceFormated !assigned StringFmt( toppingID2price3 , PriceCustomCoffeeFormat, PreScaleConvertShow)
 					Var CustomCoffeeQuantityAdditionalPrice[1] = "(+" + priceFormated
 					Var CustomCoffeeQuantityAdditionalPrice[1] = CustomCoffeeQuantityAdditionalPrice[1] + ")"
 				Else
 					Var CustomCoffeeQuantityAdditionalPrice[1] = ""
 				EndIf
 
-				If toppingID2price3 > 0 Then
-					Var priceFormated !assigned StringFmt( toppingID2price3 , PriceCustomCoffeeFormat, PreScaleConvertShow)
+				If toppingID2price4 > 0 Then
+					Var priceFormated !assigned StringFmt( toppingID2price4 , PriceCustomCoffeeFormat, PreScaleConvertShow)
 					Var CustomCoffeeQuantityAdditionalPrice[2] = "(+" + priceFormated
 					Var CustomCoffeeQuantityAdditionalPrice[2] = CustomCoffeeQuantityAdditionalPrice[2] + ")"
 				Else
@@ -2455,6 +2462,18 @@
 				EndIf
 			EndIf
 
+			If CustomCoffeeQuantityAdditionalPrice[1] = "" Then
+				Var CustomCoffeeQuantityTextX[1] = 809
+			Else
+				Var CustomCoffeeQuantityTextX[1] = 784
+			EndIf
+
+			If CustomCoffeeQuantityAdditionalPrice[2] = "" Then
+				Var CustomCoffeeQuantityTextX[2] = 922
+			Else
+				Var CustomCoffeeQuantityTextX[2] = 892
+			EndIf
+
 		;-END
 
 
@@ -6096,7 +6115,7 @@
 	</Button>
 
 	<Text>
-		<X> 694 </X>
+		<X> 699 </X>
 		<Y> CustomCoffeeTextY </Y>
 		<Font> KanitRegularTTF </Font>
 		<State> showCoffeeQuantity </State>
@@ -6106,7 +6125,8 @@
 	</Text>
 
 	<Text>
-		<X> 784 </X>
+		<Refresh> "Enable" </Refresh>
+		<X> CustomCoffeeQuantityTextX[1] </X>
 		<Y> CustomCoffeeTextY </Y>
 		<Font> KanitRegularTTF </Font>
 		<State> showCoffeeQuantity </State>
@@ -6116,7 +6136,8 @@
 	</Text>
 
 	<Text>
-		<X> 892 </X>
+		<Refresh> "Enable" </Refresh>
+		<X> CustomCoffeeQuantityTextX[2] </X>
 		<Y> CustomCoffeeTextY </Y>
 		<Font> KanitRegularTTF </Font>
 		<State> showCoffeeQuantity </State>
@@ -7907,10 +7928,10 @@
 			Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price1
 		EndIf
 		If CustomCoffeeQuantityState[1] = "PressForever" Then
-			Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2
+			Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price3
 		EndIf
 		If CustomCoffeeQuantityState[2] = "PressForever" Then
-			Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price3
+			Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price4
 		EndIf
 
 		If CustomCoffeeLevelState[0] = "PressForever" Then