diff --git a/xml/event/dummy_layout_promotion.py b/xml/event/dummy_layout_promotion.py
index b5d1ebbf..6c33e8cd 100644
--- a/xml/event/dummy_layout_promotion.py
+++ b/xml/event/dummy_layout_promotion.py
@@ -136,10 +136,10 @@ else:
 				file_inc3_content = file_inc3_content.replace( "###" + key_val[0], '"' + key_val[1].strip() + '"')
 		
 
-		# file_inc_event_click = open(directory_to_process + "/event/promotion_onclick3.inc", 'r')
-		# file_inc_event_click_content = file_inc_event_click.read()
+		file_inc_event_click = open(directory_to_process + "/event/promotion_onclick3.inc", 'r')
+		file_inc_event_click_content = file_inc_event_click.read()
 
-		# file_inc3_content = file_inc3_content.replace("###EventOnClick", file_inc_event_click_content)
+		file_inc3_content = file_inc3_content.replace("###EventOnClick", file_inc_event_click_content)
  
 
 		print(file_inc3_content)
diff --git a/xml/event/promotion_mystery_cup_35.xml b/xml/event/promotion_mystery_cup_35.xml
index dce7b57f..d925062f 100644
--- a/xml/event/promotion_mystery_cup_35.xml
+++ b/xml/event/promotion_mystery_cup_35.xml
@@ -8,7 +8,6 @@
 <Volume> SoundVolume </Volume>
 <EventOpen>
 	; On open
-	Var BigButtonEnable = "Enable"  
 	    Var NextPage = "-"
 
     DEBUGVAR ICE_PROCESS_STATUS
@@ -199,13 +198,6 @@
 
     If Timeout > 60 Then
         SAVELOG "Timeout"
-		Var BigButtonEnable = "Enable"
-		Var SubRandMilkButtonEnable = "Invisible"
-		Var SubRandTeaButtonEnable = "Invisible"
-		Var SubRandCoffButtonEnable = "Invisible"
-		Var SubRandAllButtonEnable = "Invisible"
-
-
         If  Seeker = "next" Then 
             Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
         Else
@@ -8936,6 +8928,9 @@ LIMENADE SODA" </Value>
     Var buttonRemoveCup = "Invisible"
 </EventClick>
 </Button>
+
+
+
 ;
 ;
 ;
@@ -8960,18 +8955,19 @@ LIMENADE SODA" </Value>
        Var return = "ROOT/taobin_project/image/event/bn_random_milk.png"
         )
      </FilenamePress>
-	 	<FilenameDisable>
-	eval(
-		Var return = "ROOT/taobin_project/image/event/bd_random_milk.png"
-	)
-	</FilenameDisable>
-	<EventClick>
-		Random2 0 IndexOfMilk ResultRandomIndex
-		Var ProductCodeRandom = ListOfMilk[ResultRandomIndex]
-		DEBUGVAR ListOfMilk[ResultRandomIndex]
-		Topping "Load" ProductCodeRandom
-		Open "ROOT/taobin_project/xml/page_topping_select_35.xml"
-	</EventClick>
+        <FilenameDisable>
+    eval(
+        Var return = "ROOT/taobin_project/image/event/bd_random_milk.png"
+    )
+    </FilenameDisable>
+    <EventClick>
+        Random2 0 IndexOfMilk ResultRandomIndex
+        Var ProductCodeRandom = ListOfMilk[ResultRandomIndex]
+        DEBUGVAR ListOfMilk[ResultRandomIndex]
+        Topping "Load" ProductCodeRandom
+        Var OpenFromXML = CurrentXMLFileName2
+        Open "ROOT/taobin_project/xml/page_topping_select_35.xml"
+    </EventClick>
 </Button>
 
 <Button>
@@ -8988,18 +8984,19 @@ LIMENADE SODA" </Value>
        Var return = "ROOT/taobin_project/image/event/bn_random_tea.png"
         )
      </FilenamePress>
-	 	<FilenameDisable>
-	eval(
-		Var return = "ROOT/taobin_project/image/event/bd_random_tea.png"
-	)
-	</FilenameDisable>
+        <FilenameDisable>
+    eval(
+        Var return = "ROOT/taobin_project/image/event/bd_random_tea.png"
+    )
+    </FilenameDisable>
 <EventClick>
-		Random2 0 IndexOfTea ResultRandomIndex
-		Var ProductCodeRandom = ListOfTea[ResultRandomIndex]
-		DEBUGVAR ListOfTea[ResultRandomIndex]
-		Topping "Load" ProductCodeRandom
-		Open "ROOT/taobin_project/xml/page_topping_select_35.xml"
-	</EventClick>
+        Random2 0 IndexOfTea ResultRandomIndex
+        Var ProductCodeRandom = ListOfTea[ResultRandomIndex]
+        DEBUGVAR ListOfTea[ResultRandomIndex]
+        Topping "Load" ProductCodeRandom
+        Var OpenFromXML = CurrentXMLFileName2
+        Open "ROOT/taobin_project/xml/page_topping_select_35.xml"
+    </EventClick>
 </Button>
 
 <Button>
@@ -9016,18 +9013,19 @@ LIMENADE SODA" </Value>
        Var return = "ROOT/taobin_project/image/event/bn_random_coffee.png"
         )
      </FilenamePress>
-	 	<FilenameDisable>
-	eval(
-		Var return = "ROOT/taobin_project/image/event/bd_random_coffee.png"
-	)
-	</FilenameDisable>
+        <FilenameDisable>
+    eval(
+        Var return = "ROOT/taobin_project/image/event/bd_random_coffee.png"
+    )
+    </FilenameDisable>
 <EventClick>
-		Random2 0 IndexOfCoffee ResultRandomIndex
-		Var ProductCodeRandom = ListOfCoffee[ResultRandomIndex]
-		DEBUGVAR ListOfCoffee[ResultRandomIndex]
-		Topping "Load" ProductCodeRandom
-		Open "ROOT/taobin_project/xml/page_topping_select_35.xml"
-	</EventClick>
+        Random2 0 IndexOfCoffee ResultRandomIndex
+        Var ProductCodeRandom = ListOfCoffee[ResultRandomIndex]
+        DEBUGVAR ListOfCoffee[ResultRandomIndex]
+        Topping "Load" ProductCodeRandom
+        Var OpenFromXML = CurrentXMLFileName2
+        Open "ROOT/taobin_project/xml/page_topping_select_35.xml"
+    </EventClick>
 </Button>
 
 <Button>
@@ -9044,18 +9042,19 @@ LIMENADE SODA" </Value>
        Var return = "ROOT/taobin_project/image/event/bn_random_all.png"
         )
      </FilenamePress>
-	<FilenameDisable>
-	eval(
-		Var return = "ROOT/taobin_project/image/event/bd_random_all.png"
-	)
-	</FilenameDisable>
-	<EventClick>
-		Random2 0 IndexOfAllRandom ResultRandomIndex
-		Var ProductCodeRandom = ListOfAllRandom[ResultRandomIndex]
-		DEBUGVAR ListOfAllRandom[ResultRandomIndex]
-		Topping "Load" ProductCodeRandom
-		Open "ROOT/taobin_project/xml/page_topping_select_35.xml"
-	</EventClick>
+    <FilenameDisable>
+    eval(
+        Var return = "ROOT/taobin_project/image/event/bd_random_all.png"
+    )
+    </FilenameDisable>
+    <EventClick>
+        Random2 0 IndexOfAllRandom ResultRandomIndex
+        Var ProductCodeRandom = ListOfAllRandom[ResultRandomIndex]
+        DEBUGVAR ListOfAllRandom[ResultRandomIndex]
+        Topping "Load" ProductCodeRandom
+        Var OpenFromXML = CurrentXMLFileName2
+        Open "ROOT/taobin_project/xml/page_topping_select_35.xml"
+    </EventClick>
 </Button>
 
 ;
@@ -9099,198 +9098,198 @@ LIMENADE SODA" </Value>
         )
      </FilenameDisable>
 <EventOnClick> 
-		Var BigButtonEnable = "Invisible"
+        Var BigButtonEnable = "Invisible"
         DEBUGVAR BigButtonEnable
 
         ; Enable all 4 buttons
-		Var SubRandMilkButtonEnable = "Enable"
-		DEBUGVAR SubRandMilkButtonEnable
+        Var SubRandMilkButtonEnable = "Enable"
+        DEBUGVAR SubRandMilkButtonEnable
 
-		Var SubRandTeaButtonEnable = "Enable"
-		DEBUGVAR SubRandTeaButtonEnable
+        Var SubRandTeaButtonEnable = "Enable"
+        DEBUGVAR SubRandTeaButtonEnable
 
-		Var SubRandCoffButtonEnable = "Enable"
-		DEBUGVAR SubRandCoffButtonEnable
+        Var SubRandCoffButtonEnable = "Enable"
+        DEBUGVAR SubRandCoffButtonEnable
 
-		Var SubRandAllButtonEnable = "Enable"
-		DEBUGVAR SubRandAllButtonEnable
+        Var SubRandAllButtonEnable = "Enable"
+        DEBUGVAR SubRandAllButtonEnable
 
 
 
 
 
-		; For real, yeah for real
-		; All random cup
+        ; For real, yeah for real
+        ; All random cup
 
-		Var IndexOfAllRandom = 0
-		Var IndexOfMilk = 0
-		Var IndexOfTea = 0
-		Var IndexOfCoffee = 0
+        Var IndexOfAllRandom = 0
+        Var IndexOfMilk = 0
+        Var IndexOfTea = 0
+        Var IndexOfCoffee = 0
 
-		; Oreo smoothie volcano
-		If $12-99-03-0020.Button = "Enable" Then
-			Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0020"
-			Var ListOfMilk[IndexOfMilk] = "12-99-03-0020"
-			Var IndexOfAllRandom = IndexOfAllRandom + 1
-			Var IndexOfMilk = IndexOfMilk + 1
-		EndIf
+        ; Oreo smoothie volcano
+        If $12-99-03-0020.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0020"
+            Var ListOfMilk[IndexOfMilk] = "12-99-03-0020"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfMilk = IndexOfMilk + 1
+        EndIf
 
-		; Pink milk oreo volcano
-		If $12-99-03-0021.Button = "Enable" Then
-			Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0021"
-			Var ListOfMilk[IndexOfMilk] = "12-99-03-0021"
-			Var IndexOfAllRandom = IndexOfAllRandom + 1
-			Var IndexOfMilk = IndexOfMilk + 1
-		EndIf
+        ; Pink milk oreo volcano
+        If $12-99-03-0021.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0021"
+            Var ListOfMilk[IndexOfMilk] = "12-99-03-0021"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfMilk = IndexOfMilk + 1
+        EndIf
 
-		; Choco oreo volcano
-		If $12-99-03-0022.Button = "Enable" Then
-			Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0022"
-			Var ListOfMilk[IndexOfMilk] = "12-99-03-0022"
-			Var IndexOfAllRandom = IndexOfAllRandom + 1
-			Var IndexOfMilk = IndexOfMilk + 1
-		EndIf
+        ; Choco oreo volcano
+        If $12-99-03-0022.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0022"
+            Var ListOfMilk[IndexOfMilk] = "12-99-03-0022"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfMilk = IndexOfMilk + 1
+        EndIf
 
-		; Caramel milk oreo volcano
-		If $12-99-03-0023.Button = "Enable" Then
-			Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0023"
-			Var ListOfMilk[IndexOfMilk] = "12-99-03-0023"
-			Var IndexOfAllRandom = IndexOfAllRandom + 1
-			Var IndexOfMilk = IndexOfMilk + 1
-		EndIf
+        ; Caramel milk oreo volcano
+        If $12-99-03-0023.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0023"
+            Var ListOfMilk[IndexOfMilk] = "12-99-03-0023"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfMilk = IndexOfMilk + 1
+        EndIf
 
-		; Thai milk tea oreo smoothie
-		If $12-99-03-0024.Button = "Enable" Then
-			Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0024"
-			Var ListOfTea[IndexOfTea] = "12-99-03-0024"
-			Var IndexOfAllRandom = IndexOfAllRandom + 1
-			Var IndexOfTea = IndexOfTea + 1
-		EndIf
+        ; Thai milk tea oreo smoothie
+        If $12-99-03-0024.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0024"
+            Var ListOfTea[IndexOfTea] = "12-99-03-0024"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfTea = IndexOfTea + 1
+        EndIf
 
-		; Cafe late oreo smoothie
-		If $12-99-03-0025.Button = "Enable" Then
-			Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0025"
-			Var ListOfCoffee[IndexOfCoffee] = "12-99-03-0025"
-			Var IndexOfAllRandom = IndexOfAllRandom + 1
-			Var IndexOfCoffee = IndexOfCoffee + 1
-		EndIf
+        ; Cafe late oreo smoothie
+        If $12-99-03-0025.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0025"
+            Var ListOfCoffee[IndexOfCoffee] = "12-99-03-0025"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfCoffee = IndexOfCoffee + 1
+        EndIf
 
-		; Strawberry milk oreo volcano
-		If $12-99-03-0026.Button = "Enable" Then
-			Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0026"
-			Var ListOfMilk[IndexOfMilk] = "12-99-03-0026"
-			Var IndexOfAllRandom = IndexOfAllRandom + 1
-			Var IndexOfMilk = IndexOfMilk + 1
-		EndIf
+        ; Strawberry milk oreo volcano
+        If $12-99-03-0026.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0026"
+            Var ListOfMilk[IndexOfMilk] = "12-99-03-0026"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfMilk = IndexOfMilk + 1
+        EndIf
 
-		; Melon milk oreo volcano
-		If $12-99-03-0027.Button = "Enable" Then
-			Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0027"
-			Var ListOfMilk[IndexOfMilk] = "12-99-03-0027"
-			Var IndexOfAllRandom = IndexOfAllRandom + 1
-			Var IndexOfMilk = IndexOfMilk + 1
-		EndIf
+        ; Melon milk oreo volcano
+        If $12-99-03-0027.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0027"
+            Var ListOfMilk[IndexOfMilk] = "12-99-03-0027"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfMilk = IndexOfMilk + 1
+        EndIf
 
-		; Bana^2 milk oreo volcano
-		If $12-99-03-0028.Button = "Enable" Then
-			Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0028"
-			Var ListOfMilk[IndexOfMilk] = "12-99-03-0028"
-			Var IndexOfAllRandom = IndexOfAllRandom + 1
-			Var IndexOfMilk = IndexOfMilk + 1
-		EndIf
+        ; Bana^2 milk oreo volcano
+        If $12-99-03-0028.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0028"
+            Var ListOfMilk[IndexOfMilk] = "12-99-03-0028"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfMilk = IndexOfMilk + 1
+        EndIf
 
-		; HOJICHA Oreo smoothie
-		If $12-99-03-0029.Button = "Enable" Then
-			Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0029"
-			Var ListOfTea[IndexOfTea] = "12-99-03-0029"
-			Var IndexOfAllRandom = IndexOfAllRandom + 1
-			Var IndexOfTea = IndexOfTea + 1
-		EndIf
+        ; HOJICHA Oreo smoothie
+        If $12-99-03-0029.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0029"
+            Var ListOfTea[IndexOfTea] = "12-99-03-0029"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfTea = IndexOfTea + 1
+        EndIf
 
-		; Thai milk tea smoothie
-		If $12-99-03-0030.Button = "Enable" Then
-			Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0030"
-			Var ListOfTea[IndexOfTea] = "12-99-03-0030"
-			Var IndexOfAllRandom = IndexOfAllRandom + 1
-			Var IndexOfTea = IndexOfTea + 1
-		EndIf
+        ; Thai milk tea smoothie
+        If $12-99-03-0030.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0030"
+            Var ListOfTea[IndexOfTea] = "12-99-03-0030"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfTea = IndexOfTea + 1
+        EndIf
 
-		; Melon milk smoothie
-		If $12-99-03-0031.Button = "Enable" Then
-			Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0031"
-			Var ListOfMilk[IndexOfMilk] = "12-99-03-0031"
-			Var IndexOfAllRandom = IndexOfAllRandom + 1
-			Var IndexOfMilk = IndexOfMilk + 1
-		EndIf
+        ; Melon milk smoothie
+        If $12-99-03-0031.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0031"
+            Var ListOfMilk[IndexOfMilk] = "12-99-03-0031"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfMilk = IndexOfMilk + 1
+        EndIf
 
-		; Taiwanese tea smoothie
-		If $12-99-03-0032.Button = "Enable" Then
-			Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0032"
-			Var ListOfTea[IndexOfTea] = "12-99-03-0032"
-			Var IndexOfAllRandom = IndexOfAllRandom + 1
-			Var IndexOfTea = IndexOfTea + 1
-		EndIf
+        ; Taiwanese tea smoothie
+        If $12-99-03-0032.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0032"
+            Var ListOfTea[IndexOfTea] = "12-99-03-0032"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfTea = IndexOfTea + 1
+        EndIf
 
-		; Tokyo bana^2 milk smoothie
-		If $12-99-03-0033.Button = "Enable" Then
-			Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0033"
-			Var ListOfMilk[IndexOfMilk] = "12-99-03-0033"
-			Var IndexOfAllRandom = IndexOfAllRandom + 1
-			Var IndexOfMilk = IndexOfMilk + 1
-		EndIf
+        ; Tokyo bana^2 milk smoothie
+        If $12-99-03-0033.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0033"
+            Var ListOfMilk[IndexOfMilk] = "12-99-03-0033"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfMilk = IndexOfMilk + 1
+        EndIf
 
-		; Hojicha smoothie
-		If $12-99-03-0034.Button = "Enable" Then
-			Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0034"
-			Var ListOfTea[IndexOfTea] = "12-99-03-0034"
-			Var IndexOfAllRandom = IndexOfAllRandom + 1
-			Var IndexOfTea = IndexOfTea + 1
-		EndIf
+        ; Hojicha smoothie
+        If $12-99-03-0034.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0034"
+            Var ListOfTea[IndexOfTea] = "12-99-03-0034"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfTea = IndexOfTea + 1
+        EndIf
 
-		; Cocoa bana^2 smoothie
-		If $12-99-03-0035.Button = "Enable" Then
-			Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0035"
-			Var ListOfMilk[IndexOfMilk] = "12-99-03-0035"
-			Var IndexOfAllRandom = IndexOfAllRandom + 1
-			Var IndexOfMilk = IndexOfMilk + 1
-		EndIf
+        ; Cocoa bana^2 smoothie
+        If $12-99-03-0035.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0035"
+            Var ListOfMilk[IndexOfMilk] = "12-99-03-0035"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfMilk = IndexOfMilk + 1
+        EndIf
 
-		; Taiwanese tea cafe latte smoothie
-		If $12-99-03-0036.Button = "Enable" Then
-			Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0036"
-			Var ListOfCoffee[IndexOfCoffee] = "12-99-03-0036"
-			Var IndexOfAllRandom = IndexOfAllRandom + 1
-			Var IndexOfCoffee = IndexOfCoffee + 1
-		EndIf
+        ; Taiwanese tea cafe latte smoothie
+        If $12-99-03-0036.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0036"
+            Var ListOfCoffee[IndexOfCoffee] = "12-99-03-0036"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfCoffee = IndexOfCoffee + 1
+        EndIf
 
-		; Melon cafe latte smoothie
-		If $12-99-03-0037.Button = "Enable" Then
-			Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0037"
-			Var ListOfCoffee[IndexOfCoffee] = "12-99-03-0037"
-			Var IndexOfAllRandom = IndexOfAllRandom + 1
-			Var IndexOfCoffee = IndexOfCoffee + 1
-		EndIf
+        ; Melon cafe latte smoothie
+        If $12-99-03-0037.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0037"
+            Var ListOfCoffee[IndexOfCoffee] = "12-99-03-0037"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfCoffee = IndexOfCoffee + 1
+        EndIf
 
-		; Taiwanese tea cafe latte smoothie v2
-		If $12-99-03-0038.Button = "Enable" Then
-			Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0038"
-			Var ListOfCoffee[IndexOfCoffee] = "12-99-03-0038"
-			Var IndexOfAllRandom = IndexOfAllRandom + 1
-			Var IndexOfCoffee = IndexOfCoffee + 1
-		EndIf
+        ; Taiwanese tea cafe latte smoothie v2
+        If $12-99-03-0038.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0038"
+            Var ListOfCoffee[IndexOfCoffee] = "12-99-03-0038"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfCoffee = IndexOfCoffee + 1
+        EndIf
 
-		; Melon cafe latte smoothie v2
-		If $12-99-03-0039.Button = "Enable" Then
-			Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0039"
-			Var ListOfCoffee[IndexOfCoffee] = "12-99-03-0039"
-			Var IndexOfAllRandom = IndexOfAllRandom + 1
-			Var IndexOfCoffee = IndexOfCoffee + 1
-		EndIf
+        ; Melon cafe latte smoothie v2
+        If $12-99-03-0039.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0039"
+            Var ListOfCoffee[IndexOfCoffee] = "12-99-03-0039"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfCoffee = IndexOfCoffee + 1
+        EndIf
 
-		DEBUGVAR IndexOfAllRandom
-		DEBUGVAR IndexOfCoffee
-		DEBUGVAR IndexOfMilk
-		DEBUGVAR IndexOfTea
+        DEBUGVAR IndexOfAllRandom
+        DEBUGVAR IndexOfCoffee
+        DEBUGVAR IndexOfMilk
+        DEBUGVAR IndexOfTea
     
         If IndexOfAllRandom = 0 Then
             Var SubRandAllButtonEnable = "Disable"
@@ -9306,7 +9305,11 @@ LIMENADE SODA" </Value>
             Var SubRandTeaButtonEnable = "Disable"
         EndIf
 
-		Refresh
+        Refresh
+
+
+
+
 </EventOnClick>
 </Button>
 
@@ -9321,3 +9324,4 @@ LIMENADE SODA" </Value>
 
 
 </Popup>
+
diff --git a/xml/event/promotion_onclick3.inc b/xml/event/promotion_onclick3.inc
new file mode 100644
index 00000000..f0245678
--- /dev/null
+++ b/xml/event/promotion_onclick3.inc
@@ -0,0 +1,211 @@
+Var BigButtonEnable = "Invisible"
+        DEBUGVAR BigButtonEnable
+
+        ; Enable all 4 buttons
+        Var SubRandMilkButtonEnable = "Enable"
+        DEBUGVAR SubRandMilkButtonEnable
+
+        Var SubRandTeaButtonEnable = "Enable"
+        DEBUGVAR SubRandTeaButtonEnable
+
+        Var SubRandCoffButtonEnable = "Enable"
+        DEBUGVAR SubRandCoffButtonEnable
+
+        Var SubRandAllButtonEnable = "Enable"
+        DEBUGVAR SubRandAllButtonEnable
+
+
+
+
+
+        ; For real, yeah for real
+        ; All random cup
+
+        Var IndexOfAllRandom = 0
+        Var IndexOfMilk = 0
+        Var IndexOfTea = 0
+        Var IndexOfCoffee = 0
+
+        ; Oreo smoothie volcano
+        If $12-99-03-0020.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0020"
+            Var ListOfMilk[IndexOfMilk] = "12-99-03-0020"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfMilk = IndexOfMilk + 1
+        EndIf
+
+        ; Pink milk oreo volcano
+        If $12-99-03-0021.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0021"
+            Var ListOfMilk[IndexOfMilk] = "12-99-03-0021"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfMilk = IndexOfMilk + 1
+        EndIf
+
+        ; Choco oreo volcano
+        If $12-99-03-0022.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0022"
+            Var ListOfMilk[IndexOfMilk] = "12-99-03-0022"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfMilk = IndexOfMilk + 1
+        EndIf
+
+        ; Caramel milk oreo volcano
+        If $12-99-03-0023.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0023"
+            Var ListOfMilk[IndexOfMilk] = "12-99-03-0023"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfMilk = IndexOfMilk + 1
+        EndIf
+
+        ; Thai milk tea oreo smoothie
+        If $12-99-03-0024.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0024"
+            Var ListOfTea[IndexOfTea] = "12-99-03-0024"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfTea = IndexOfTea + 1
+        EndIf
+
+        ; Cafe late oreo smoothie
+        If $12-99-03-0025.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0025"
+            Var ListOfCoffee[IndexOfCoffee] = "12-99-03-0025"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfCoffee = IndexOfCoffee + 1
+        EndIf
+
+        ; Strawberry milk oreo volcano
+        If $12-99-03-0026.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0026"
+            Var ListOfMilk[IndexOfMilk] = "12-99-03-0026"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfMilk = IndexOfMilk + 1
+        EndIf
+
+        ; Melon milk oreo volcano
+        If $12-99-03-0027.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0027"
+            Var ListOfMilk[IndexOfMilk] = "12-99-03-0027"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfMilk = IndexOfMilk + 1
+        EndIf
+
+        ; Bana^2 milk oreo volcano
+        If $12-99-03-0028.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0028"
+            Var ListOfMilk[IndexOfMilk] = "12-99-03-0028"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfMilk = IndexOfMilk + 1
+        EndIf
+
+        ; HOJICHA Oreo smoothie
+        If $12-99-03-0029.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0029"
+            Var ListOfTea[IndexOfTea] = "12-99-03-0029"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfTea = IndexOfTea + 1
+        EndIf
+
+        ; Thai milk tea smoothie
+        If $12-99-03-0030.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0030"
+            Var ListOfTea[IndexOfTea] = "12-99-03-0030"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfTea = IndexOfTea + 1
+        EndIf
+
+        ; Melon milk smoothie
+        If $12-99-03-0031.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0031"
+            Var ListOfMilk[IndexOfMilk] = "12-99-03-0031"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfMilk = IndexOfMilk + 1
+        EndIf
+
+        ; Taiwanese tea smoothie
+        If $12-99-03-0032.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0032"
+            Var ListOfTea[IndexOfTea] = "12-99-03-0032"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfTea = IndexOfTea + 1
+        EndIf
+
+        ; Tokyo bana^2 milk smoothie
+        If $12-99-03-0033.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0033"
+            Var ListOfMilk[IndexOfMilk] = "12-99-03-0033"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfMilk = IndexOfMilk + 1
+        EndIf
+
+        ; Hojicha smoothie
+        If $12-99-03-0034.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0034"
+            Var ListOfTea[IndexOfTea] = "12-99-03-0034"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfTea = IndexOfTea + 1
+        EndIf
+
+        ; Cocoa bana^2 smoothie
+        If $12-99-03-0035.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0035"
+            Var ListOfMilk[IndexOfMilk] = "12-99-03-0035"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfMilk = IndexOfMilk + 1
+        EndIf
+
+        ; Taiwanese tea cafe latte smoothie
+        If $12-99-03-0036.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0036"
+            Var ListOfCoffee[IndexOfCoffee] = "12-99-03-0036"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfCoffee = IndexOfCoffee + 1
+        EndIf
+
+        ; Melon cafe latte smoothie
+        If $12-99-03-0037.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0037"
+            Var ListOfCoffee[IndexOfCoffee] = "12-99-03-0037"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfCoffee = IndexOfCoffee + 1
+        EndIf
+
+        ; Taiwanese tea cafe latte smoothie v2
+        If $12-99-03-0038.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0038"
+            Var ListOfCoffee[IndexOfCoffee] = "12-99-03-0038"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfCoffee = IndexOfCoffee + 1
+        EndIf
+
+        ; Melon cafe latte smoothie v2
+        If $12-99-03-0039.Button = "Enable" Then
+            Var ListOfAllRandom[IndexOfAllRandom] = "12-99-03-0039"
+            Var ListOfCoffee[IndexOfCoffee] = "12-99-03-0039"
+            Var IndexOfAllRandom = IndexOfAllRandom + 1
+            Var IndexOfCoffee = IndexOfCoffee + 1
+        EndIf
+
+        DEBUGVAR IndexOfAllRandom
+        DEBUGVAR IndexOfCoffee
+        DEBUGVAR IndexOfMilk
+        DEBUGVAR IndexOfTea
+    
+        If IndexOfAllRandom = 0 Then
+            Var SubRandAllButtonEnable = "Disable"
+        EndIf
+
+        If IndexOfCoffee = 0 Then
+            Var SubRandCoffButtonEnable = "Disable"
+        EndIf
+        If IndexOfMilk = 0 Then
+            Var SubRandMilkButtonEnable = "Disable"
+        EndIf
+        If IndexOfTea = 0 Then
+            Var SubRandTeaButtonEnable = "Disable"
+        EndIf
+
+        Refresh
+
+
+
diff --git a/xml/event/promotion_template3.inc b/xml/event/promotion_template3.inc
index db8bccfc..f524de85 100644
--- a/xml/event/promotion_template3.inc
+++ b/xml/event/promotion_template3.inc
@@ -1,3 +1,137 @@
+;
+;
+;
+
+; Sub-button for 4 random menu
+
+;
+;
+;
+
+<Button>
+    <X> 43 </X>
+    <Y> 519 </Y>
+    <State> SubRandMilkButtonEnable </State>
+    <Filename> 
+     eval( 
+       Var return = "ROOT/taobin_project/image/event/bn_random_milk.png"
+        )
+     </Filename>
+    <FilenamePress> 
+     eval( 
+       Var return = "ROOT/taobin_project/image/event/bn_random_milk.png"
+        )
+     </FilenamePress>
+        <FilenameDisable>
+    eval(
+        Var return = "ROOT/taobin_project/image/event/bd_random_milk.png"
+    )
+    </FilenameDisable>
+    <EventClick>
+        Random2 0 IndexOfMilk ResultRandomIndex
+        Var ProductCodeRandom = ListOfMilk[ResultRandomIndex]
+        DEBUGVAR ListOfMilk[ResultRandomIndex]
+        Topping "Load" ProductCodeRandom
+        Var OpenFromXML = CurrentXMLFileName2
+        Open "ROOT/taobin_project/xml/page_topping_select_35.xml"
+    </EventClick>
+</Button>
+
+<Button>
+    <X> 301 </X>
+    <Y> 519 </Y>
+    <State> SubRandTeaButtonEnable </State>
+    <Filename> 
+     eval( 
+       Var return = "ROOT/taobin_project/image/event/bn_random_tea.png"
+        )
+     </Filename>
+    <FilenamePress> 
+     eval( 
+       Var return = "ROOT/taobin_project/image/event/bn_random_tea.png"
+        )
+     </FilenamePress>
+        <FilenameDisable>
+    eval(
+        Var return = "ROOT/taobin_project/image/event/bd_random_tea.png"
+    )
+    </FilenameDisable>
+<EventClick>
+        Random2 0 IndexOfTea ResultRandomIndex
+        Var ProductCodeRandom = ListOfTea[ResultRandomIndex]
+        DEBUGVAR ListOfTea[ResultRandomIndex]
+        Topping "Load" ProductCodeRandom
+        Var OpenFromXML = CurrentXMLFileName2
+        Open "ROOT/taobin_project/xml/page_topping_select_35.xml"
+    </EventClick>
+</Button>
+
+<Button>
+    <X> 43 </X>
+    <Y> 837 </Y>
+    <State> SubRandCoffButtonEnable </State>
+    <Filename> 
+     eval( 
+       Var return = "ROOT/taobin_project/image/event/bn_random_coffee.png"
+        )
+     </Filename>
+    <FilenamePress> 
+     eval( 
+       Var return = "ROOT/taobin_project/image/event/bn_random_coffee.png"
+        )
+     </FilenamePress>
+        <FilenameDisable>
+    eval(
+        Var return = "ROOT/taobin_project/image/event/bd_random_coffee.png"
+    )
+    </FilenameDisable>
+<EventClick>
+        Random2 0 IndexOfCoffee ResultRandomIndex
+        Var ProductCodeRandom = ListOfCoffee[ResultRandomIndex]
+        DEBUGVAR ListOfCoffee[ResultRandomIndex]
+        Topping "Load" ProductCodeRandom
+        Var OpenFromXML = CurrentXMLFileName2
+        Open "ROOT/taobin_project/xml/page_topping_select_35.xml"
+    </EventClick>
+</Button>
+
+<Button>
+    <X> 301 </X>
+    <Y> 837 </Y>
+    <State> SubRandAllButtonEnable </State>
+    <Filename> 
+     eval( 
+       Var return = "ROOT/taobin_project/image/event/bn_random_all.png"
+        )
+     </Filename>
+    <FilenamePress> 
+     eval( 
+       Var return = "ROOT/taobin_project/image/event/bn_random_all.png"
+        )
+     </FilenamePress>
+    <FilenameDisable>
+    eval(
+        Var return = "ROOT/taobin_project/image/event/bd_random_all.png"
+    )
+    </FilenameDisable>
+    <EventClick>
+        Random2 0 IndexOfAllRandom ResultRandomIndex
+        Var ProductCodeRandom = ListOfAllRandom[ResultRandomIndex]
+        DEBUGVAR ListOfAllRandom[ResultRandomIndex]
+        Topping "Load" ProductCodeRandom
+        Var OpenFromXML = CurrentXMLFileName2
+        Open "ROOT/taobin_project/xml/page_topping_select_35.xml"
+    </EventClick>
+</Button>
+
+;
+;
+;
+;
+; Big button for mys event
+;
+;
+;
 
 <Button>
     <X> 42 </X>
@@ -6,34 +140,32 @@
     <Filename> 
      eval( 
         If show_eng = "true" Then 
-            Var return = ###normal_eng
+            Var return = "ROOT/taobin_project/image/event/pro_mystery_cup_en.png"    
         Else
-            Var return = ###normal_thai
+            Var return = "ROOT/taobin_project/image/event/pro_mystery_cup_th.png"
         EndIf
         )
      </Filename>
     <FilenamePress> 
      eval( 
         If show_eng = "true" Then 
-            Var return = ###press_eng    
+            Var return = "ROOT/taobin_project/image/event/pro_mystery_cup_en.png"    
         Else
-            Var return = ###press_thai
+            Var return = "ROOT/taobin_project/image/event/pro_mystery_cup_th.png"
         EndIf
         )
      </FilenamePress>
     <FilenameDisable> 
      eval( 
         If show_eng = "true" Then 
-            Var return = ###disable_eng
+            Var return = "ROOT/taobin_project/image/event/pro_mystery_cup_en.png"
         Else
-            Var return = ###disable_thai
+            Var return = "ROOT/taobin_project/image/event/pro_mystery_cup_th.png"
         EndIf
         )
      </FilenameDisable>
 <EventOnClick> 
-
-        ;This is Custom Click for Mystery cup
-        
+        ###EventOnClick
 </EventOnClick>
 </Button>
 
diff --git a/xml/page_board.xml b/xml/page_board.xml
index 3fffcd9f..23e11981 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -1084,22 +1084,22 @@
 
 	;DEBUGVAR CountDownCheckCamera
 	DEBUGVAR Not#CameraSettingStatus
-	If CountDownCheckCamera = 0 Then
-		
-		If Not#CameraSettingStatus = "" Then
-			If CameraCount = 1 Then
-		
-				Var CountDownCheckCamera = 2
-				CameraSetting "usbfront" "default" "Rotate=90,Resolution=1280x720,scaleX=1.0,scaleY=0.7"
-			Else
-				Var CountDownCheckCamera = 5	
-			EndIf
-		Else
-			Var CountDownCheckCamera = 20
-		EndIf
-	Else 
-		Var CountDownCheckCamera = CountDownCheckCamera - 1
-	EndIf
+	;If CountDownCheckCamera = 0 Then
+	;	
+	;	If Not#CameraSettingStatus = "" Then
+	;		If CameraCount = 1 Then
+	;	
+	;			Var CountDownCheckCamera = 2
+	;			CameraSetting "usbfront" "default" "Rotate=90,Resolution=1280x720,scaleX=1.0,scaleY=0.7"
+	;		Else
+	;			Var CountDownCheckCamera = 5	
+	;		EndIf
+	;	Else
+	;		Var CountDownCheckCamera = 20
+	;	EndIf
+	;Else 
+	;	Var CountDownCheckCamera = CountDownCheckCamera - 1
+	;EndIf
 
 
 
diff --git a/xml/page_catalog2.xml b/xml/page_catalog2.xml
index 280df15a..8ebeb640 100644
--- a/xml/page_catalog2.xml
+++ b/xml/page_catalog2.xml
@@ -7,6 +7,8 @@
 <EventOpen>
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
 	
+	OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
+	
 	TopView "show"
 	; On open