diff --git a/xml/menu_catalog.xml b/xml/menu_catalog.xml
index 9ea86d2d..a8537a1d 100644
--- a/xml/menu_catalog.xml
+++ b/xml/menu_catalog.xml
@@ -73,8 +73,13 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/page_catalog.xml" 
-	
+    If SpiralOnline = "true" Then
+        Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" 
+    
+    Else
+	   Open "ROOT/taobin_project/xml/page_catalog.xml" 
+	EndIf
+
 </EventClick>
 </Button>
 
@@ -113,6 +118,22 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 99 </X>
+<Y> 395 </Y>
+<State> Menu1Selected2 </State>
+<Filename> Var( DirImage + "/bn_recommend2.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bp_recommend2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+</EventClick>
+</Button>
+
+
+
 
 <Button>
 <X> 243 </X>
@@ -127,6 +148,21 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
 </EventClick>
 </Button>
+<Button>
+<X> 227 </X>
+<Y> 395 </Y>
+<State> Menu2Selected2 </State>
+<Filename> Var( DirImage + "/bn_coffee2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_coffee2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
+</EventClick>
+</Button>
+
+
 
 <Button>
 <X> 394 </X>
@@ -142,6 +178,22 @@
 </EventClick>
 </Button>
 
+<Button>
+<X> 355 </X>
+<Y> 395 </Y>
+<State> Menu3Selected2 </State>
+<Filename> Var( DirImage + "/bn_tea2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_tea2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" 
+</EventClick>
+</Button>
+
+
+
 <Button>
 <X> 545 </X>
 <Y> 395 </Y>
@@ -155,6 +207,21 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 483 </X>
+<Y> 395 </Y>
+<State> Menu4Selected2 </State>
+<Filename> Var( DirImage + "/bn_cho_ca2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cho_ca2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
+</EventClick>
+</Button>
+
+
 
 <Button>
 <X> 696 </X>
@@ -169,6 +236,20 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 611 </X>
+<Y> 395 </Y>
+<State> Menu7Selected2 </State>
+<Filename> Var( DirImage + "/bn_protein2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_protein2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
+</EventClick>
+</Button>
+
 
 <Button>
 <X> 696 </X>
@@ -183,6 +264,19 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 611 </X>
+<Y> 395 </Y>
+<State> Menu11Selected2 </State>
+<Filename> Var( DirImage + "/bn_appfast2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_appfast2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
+</EventClick>
+</Button>
 
 
 <Button>
@@ -198,6 +292,19 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 739 </X>
+<Y> 395 </Y>
+<State> Menu8Selected2 </State>
+<Filename> Var( DirImage + "/bn_cocktail2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cocktail2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
+</EventClick>
+</Button>
 
 
 <Button>
@@ -213,6 +320,33 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 739 </X>
+<Y> 395 </Y>
+<State> Menu6Selected2 </State>
+<Filename> Var( DirImage + "/bn_sodada2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_sodada2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
+</EventClick>
+</Button>
+
+<Button>
+<X> 867 </X>
+<Y> 395 </Y>
+<State> MenuVSelected2 </State>
+<Filename> Var( DirImage + "/bn_vending2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_vending2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" 
+</EventClick>
+</Button>
 
 <EventWebApp>
 
diff --git a/xml/menu_catalog_default_init.xml b/xml/menu_catalog_default_init.xml
index b3435b8f..b0035dfd 100644
--- a/xml/menu_catalog_default_init.xml
+++ b/xml/menu_catalog_default_init.xml
@@ -16,30 +16,64 @@
 
     ; SpiralOnline
     If SpiralOnline = "true" Then 
-
-        ; fuck
-    EndIf
-
-    ; init default
-    Var Menu1Selected = "Enable"
-    Var Menu3Selected = "Enable"
-    Var Menu4Selected = "Enable"
-    ; 5 fruit
-    Var Menu5Selected = "Invisible"
-    Var Menu6Selected = "Enable"
-    Var Menu7Selected = "Enable"
-    ; 8 cocktail
-    Var Menu8Selected = "Invisible"
-
-    If CocktailShow = "true" Then 
-        Var Menu7Selected = "Invisible"
-        Var Menu8Selected = "Enable"
-    EndIf
+        Var Menu1Selected2 = "Enable"
+        Var Menu2Selected2 = "Enable"
+        Var Menu3Selected2 = "Enable"
+        Var Menu4Selected2 = "Enable"
         
-    If AppFastEnable = "true" Then
-        Var Menu11Selected = "Enable" 
+        Var Menu6Selected2 = "Enable"
+        Var Menu7Selected2 = "Enable"
+        Var MenuVSelected2 = "Enable"
+
+         ; init default
+        Var Menu1Selected = "Invisible"
+        Var Menu2Selected = "Invisible"
+        Var Menu3Selected = "Invisible"
+        Var Menu4Selected = "Invisible"
+        ; 5 fruit
+        Var Menu5Selected = "Invisible"
+        Var Menu6Selected = "Invisible"
         Var Menu7Selected = "Invisible"
-    Else
+        ; 8 cocktail
+        Var Menu8Selected = "Invisible"
+
+            
         Var Menu11Selected = "Invisible" 
+        Var Menu7Selected = "Invisible"
+        ; fuck
+    Else
+        Var Menu1Selected2 = "Invisible"
+        Var Menu2Selected2 = "Invisible"
+        Var Menu3Selected2 = "Invisible"
+        Var Menu4Selected2 = "Invisible"
+        
+        Var Menu6Selected2 = "Invisible"
+        Var Menu7Selected2 = "Invisible"
+        Var MenuVSelected2 = "Invisible"
+        Var Menu11Selected2 = "Invisible"
+
+        ; init default
+        Var Menu1Selected = "Enable"
+        Var Menu2Selected = "Enable"
+        Var Menu3Selected = "Enable"
+        Var Menu4Selected = "Enable"
+        ; 5 fruit
+        Var Menu5Selected = "Invisible"
+        Var Menu6Selected = "Enable"
         Var Menu7Selected = "Enable"
+        ; 8 cocktail
+        Var Menu8Selected = "Invisible"
+
+        If CocktailShow = "true" Then 
+            Var Menu7Selected = "Invisible"
+            Var Menu8Selected = "Enable"
+        EndIf
+            
+        If AppFastEnable = "true" Then
+            Var Menu11Selected = "Enable" 
+            Var Menu7Selected = "Invisible"
+        Else
+            Var Menu11Selected = "Invisible" 
+            Var Menu7Selected = "Enable"
+        EndIf
     EndIf
diff --git a/xml/page_board.xml b/xml/page_board.xml
index 05e6b075..4928f7a1 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -706,9 +706,14 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
-	;If TaobinOnline = "true" Then
-		OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml"
-	;EndIf
+	If SpiralOnline = "true" Then
+
+			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_with_vending.xml"
+		Else
+
+			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml"
+		
+		EndIf
 	If TermTemOnline = "true" Then
 		OpenInst 2 "/mnt/sdcard/coffeevending/termtem_project/xml/page_tt_catalog.xml"
 	EndIf
diff --git a/xml/page_catalog_choose_drink.xml b/xml/page_catalog_choose_drink.xml
index 523b2d22..78c7a9e5 100644
--- a/xml/page_catalog_choose_drink.xml
+++ b/xml/page_catalog_choose_drink.xml
@@ -145,8 +145,13 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/page_catalog.xml" 
-	
+    If SpiralOnline = "true" Then
+        Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" 
+    
+    Else
+	   Open "ROOT/taobin_project/xml/page_catalog.xml" 
+	EndIf
+
 </EventClick>
 </Button>
 
@@ -185,6 +190,22 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 99 </X>
+<Y> 395 </Y>
+<State> Menu1Selected2 </State>
+<Filename> Var( DirImage + "/bn_recommend2.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bp_recommend2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+</EventClick>
+</Button>
+
+
+
 
 <Button>
 <X> 243 </X>
@@ -199,6 +220,21 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
 </EventClick>
 </Button>
+<Button>
+<X> 227 </X>
+<Y> 395 </Y>
+<State> Menu2Selected2 </State>
+<Filename> Var( DirImage + "/bn_coffee2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_coffee2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
+</EventClick>
+</Button>
+
+
 
 <Button>
 <X> 394 </X>
@@ -214,6 +250,22 @@
 </EventClick>
 </Button>
 
+<Button>
+<X> 355 </X>
+<Y> 395 </Y>
+<State> Menu3Selected2 </State>
+<Filename> Var( DirImage + "/bn_tea2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_tea2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" 
+</EventClick>
+</Button>
+
+
+
 <Button>
 <X> 545 </X>
 <Y> 395 </Y>
@@ -227,6 +279,21 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 483 </X>
+<Y> 395 </Y>
+<State> Menu4Selected2 </State>
+<Filename> Var( DirImage + "/bn_cho_ca2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cho_ca2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
+</EventClick>
+</Button>
+
+
 
 <Button>
 <X> 696 </X>
@@ -241,6 +308,20 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 611 </X>
+<Y> 395 </Y>
+<State> Menu7Selected2 </State>
+<Filename> Var( DirImage + "/bn_protein2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_protein2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
+</EventClick>
+</Button>
+
 
 <Button>
 <X> 696 </X>
@@ -255,6 +336,19 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 611 </X>
+<Y> 395 </Y>
+<State> Menu11Selected2 </State>
+<Filename> Var( DirImage + "/bn_appfast2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_appfast2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
+</EventClick>
+</Button>
 
 
 <Button>
@@ -270,6 +364,19 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 739 </X>
+<Y> 395 </Y>
+<State> Menu8Selected2 </State>
+<Filename> Var( DirImage + "/bn_cocktail2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cocktail2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
+</EventClick>
+</Button>
 
 
 <Button>
@@ -285,6 +392,33 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 739 </X>
+<Y> 395 </Y>
+<State> Menu6Selected2 </State>
+<Filename> Var( DirImage + "/bn_sodada2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_sodada2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
+</EventClick>
+</Button>
+
+<Button>
+<X> 867 </X>
+<Y> 395 </Y>
+<State> MenuVSelected2 </State>
+<Filename> Var( DirImage + "/bn_vending2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_vending2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" 
+</EventClick>
+</Button>
 
 <EventWebApp>
 
diff --git a/xml/page_catalog_choose_drink1.pml b/xml/page_catalog_choose_drink1.pml
index c02288d0..5b3569ee 100644
--- a/xml/page_catalog_choose_drink1.pml
+++ b/xml/page_catalog_choose_drink1.pml
@@ -34,44 +34,16 @@
 <Volume> SoundVolume </Volume>
 <EventOpen>
 	; On open
-	
-    If show_eng = "true" Then 
-        Var showthaiText = "Invisible"
-        Var showengText = "Enable"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
-        Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
-        Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
-
+	<?hurr
+        #include=menu_catalog_default_init.xml
+    ?>
+    If SpiralOnline = "true" Then 
+        Var Menu1Selected2 = "PressForever"
     Else
-        Var showengText = "Invisible"
-        Var showthaiText = "Enable"
-        
-        Var DirImage = "ROOT/taobin_project/image/page3"
-        Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
-        Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
-    EndIf
-
-    Var Menu1Selected = "PressForever"
-    Var Menu2Selected = "Enable"
-    Var Menu3Selected = "Enable"
-    Var Menu4Selected = "Enable"
-    Var Menu5Selected = "Invisible"
-    Var Menu6Selected = "Enable"
-    Var Menu7Selected = "Enable"
-    Var Menu8Selected = "Invisible"
-
-    If CocktailShow = "true" Then 
-        Var Menu7Selected = "Invisible"
-        Var Menu8Selected = "Enable"
-    EndIf
-
-    If AppFastEnable = "true" Then
-        Var Menu11Selected = "Enable" 
-        Var Menu7Selected = "Invisible"
-    Else
-        Var Menu11Selected = "Invisible" 
-        Var Menu7Selected = "Enable"
+        ; coffee show
+        Var Menu1Selected = "PressForever"
     EndIf
+    
 
     
     SAVELOG PreviseXMLFileName2
diff --git a/xml/page_catalog_choose_drink1.xml b/xml/page_catalog_choose_drink1.xml
index 4fded8a4..71aab5c1 100644
--- a/xml/page_catalog_choose_drink1.xml
+++ b/xml/page_catalog_choose_drink1.xml
@@ -10,8 +10,7 @@
 <Volume> SoundVolume </Volume>
 <EventOpen>
 	; On open
-	
-    If show_eng = "true" Then 
+	    If show_eng = "true" Then 
         Var showthaiText = "Invisible"
         Var showengText = "Enable"
         Var DirImage = "ROOT/taobin_project/image/page3_en"
@@ -27,28 +26,78 @@
         Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
     EndIf
 
-    Var Menu1Selected = "PressForever"
-    Var Menu2Selected = "Enable"
-    Var Menu3Selected = "Enable"
-    Var Menu4Selected = "Enable"
-    Var Menu5Selected = "Invisible"
-    Var Menu6Selected = "Enable"
-    Var Menu7Selected = "Enable"
-    Var Menu8Selected = "Invisible"
+    ; SpiralOnline
+    If SpiralOnline = "true" Then 
+        Var Menu1Selected2 = "Enable"
+        Var Menu2Selected2 = "Enable"
+        Var Menu3Selected2 = "Enable"
+        Var Menu4Selected2 = "Enable"
+        
+        Var Menu6Selected2 = "Enable"
+        Var Menu7Selected2 = "Enable"
+        Var MenuVSelected2 = "Enable"
 
-    If CocktailShow = "true" Then 
+         ; init default
+        Var Menu1Selected = "Invisible"
+        Var Menu2Selected = "Invisible"
+        Var Menu3Selected = "Invisible"
+        Var Menu4Selected = "Invisible"
+        ; 5 fruit
+        Var Menu5Selected = "Invisible"
+        Var Menu6Selected = "Invisible"
         Var Menu7Selected = "Invisible"
-        Var Menu8Selected = "Enable"
-    EndIf
+        ; 8 cocktail
+        Var Menu8Selected = "Invisible"
 
-    If AppFastEnable = "true" Then
-        Var Menu11Selected = "Enable" 
-        Var Menu7Selected = "Invisible"
-    Else
+            
         Var Menu11Selected = "Invisible" 
+        Var Menu7Selected = "Invisible"
+        ; fuck
+    Else
+        Var Menu1Selected2 = "Invisible"
+        Var Menu2Selected2 = "Invisible"
+        Var Menu3Selected2 = "Invisible"
+        Var Menu4Selected2 = "Invisible"
+        
+        Var Menu6Selected2 = "Invisible"
+        Var Menu7Selected2 = "Invisible"
+        Var MenuVSelected2 = "Invisible"
+        Var Menu11Selected2 = "Invisible"
+
+        ; init default
+        Var Menu1Selected = "Enable"
+        Var Menu2Selected = "Enable"
+        Var Menu3Selected = "Enable"
+        Var Menu4Selected = "Enable"
+        ; 5 fruit
+        Var Menu5Selected = "Invisible"
+        Var Menu6Selected = "Enable"
         Var Menu7Selected = "Enable"
+        ; 8 cocktail
+        Var Menu8Selected = "Invisible"
+
+        If CocktailShow = "true" Then 
+            Var Menu7Selected = "Invisible"
+            Var Menu8Selected = "Enable"
+        EndIf
+            
+        If AppFastEnable = "true" Then
+            Var Menu11Selected = "Enable" 
+            Var Menu7Selected = "Invisible"
+        Else
+            Var Menu11Selected = "Invisible" 
+            Var Menu7Selected = "Enable"
+        EndIf
     EndIf
 
+    If SpiralOnline = "true" Then 
+        Var Menu1Selected2 = "PressForever"
+    Else
+        ; coffee show
+        Var Menu1Selected = "PressForever"
+    EndIf
+    
+
     
     SAVELOG PreviseXMLFileName2
 
@@ -155,8 +204,13 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/page_catalog.xml" 
-	
+    If SpiralOnline = "true" Then
+        Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" 
+    
+    Else
+	   Open "ROOT/taobin_project/xml/page_catalog.xml" 
+	EndIf
+
 </EventClick>
 </Button>
 
@@ -195,6 +249,22 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 99 </X>
+<Y> 395 </Y>
+<State> Menu1Selected2 </State>
+<Filename> Var( DirImage + "/bn_recommend2.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bp_recommend2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+</EventClick>
+</Button>
+
+
+
 
 <Button>
 <X> 243 </X>
@@ -209,6 +279,21 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
 </EventClick>
 </Button>
+<Button>
+<X> 227 </X>
+<Y> 395 </Y>
+<State> Menu2Selected2 </State>
+<Filename> Var( DirImage + "/bn_coffee2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_coffee2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
+</EventClick>
+</Button>
+
+
 
 <Button>
 <X> 394 </X>
@@ -224,6 +309,22 @@
 </EventClick>
 </Button>
 
+<Button>
+<X> 355 </X>
+<Y> 395 </Y>
+<State> Menu3Selected2 </State>
+<Filename> Var( DirImage + "/bn_tea2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_tea2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" 
+</EventClick>
+</Button>
+
+
+
 <Button>
 <X> 545 </X>
 <Y> 395 </Y>
@@ -237,6 +338,21 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 483 </X>
+<Y> 395 </Y>
+<State> Menu4Selected2 </State>
+<Filename> Var( DirImage + "/bn_cho_ca2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cho_ca2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
+</EventClick>
+</Button>
+
+
 
 <Button>
 <X> 696 </X>
@@ -251,6 +367,20 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 611 </X>
+<Y> 395 </Y>
+<State> Menu7Selected2 </State>
+<Filename> Var( DirImage + "/bn_protein2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_protein2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
+</EventClick>
+</Button>
+
 
 <Button>
 <X> 696 </X>
@@ -265,6 +395,19 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 611 </X>
+<Y> 395 </Y>
+<State> Menu11Selected2 </State>
+<Filename> Var( DirImage + "/bn_appfast2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_appfast2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
+</EventClick>
+</Button>
 
 
 <Button>
@@ -280,6 +423,19 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 739 </X>
+<Y> 395 </Y>
+<State> Menu8Selected2 </State>
+<Filename> Var( DirImage + "/bn_cocktail2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cocktail2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
+</EventClick>
+</Button>
 
 
 <Button>
@@ -295,6 +451,33 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 739 </X>
+<Y> 395 </Y>
+<State> Menu6Selected2 </State>
+<Filename> Var( DirImage + "/bn_sodada2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_sodada2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
+</EventClick>
+</Button>
+
+<Button>
+<X> 867 </X>
+<Y> 395 </Y>
+<State> MenuVSelected2 </State>
+<Filename> Var( DirImage + "/bn_vending2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_vending2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" 
+</EventClick>
+</Button>
 
 <EventWebApp>
 
diff --git a/xml/page_catalog_choose_drink11.pml b/xml/page_catalog_choose_drink11.pml
index 8fd17d45..2264bde2 100644
--- a/xml/page_catalog_choose_drink11.pml
+++ b/xml/page_catalog_choose_drink11.pml
@@ -26,43 +26,29 @@
 <EventOpen>
 	; On open
 	
-	If show_eng = "true" Then 
-        Var showthaiText = "Invisible"
-        Var showengText = "Enable"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
-        Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
-        Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
-
-    Else
-        Var showengText = "Invisible"
-        Var showthaiText = "Enable"
-        
-        Var DirImage = "ROOT/taobin_project/image/page3"
-        Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
-        Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
-    EndIf
-
-    Var Menu1Selected = "Enable"
-    Var Menu2Selected = "Enable"
-    Var Menu3Selected = "Enable"
-    Var Menu4Selected = "Enable"
-    Var Menu5Selected = "Invisible"
-    Var Menu6Selected = "Enable"
-    Var Menu8Selected = "Invisible"
+	; On open
 
+    <?hurr
+        #include=menu_catalog_default_init.xml
+    ?>
+    If SpiralOnline = "true" Then 
     
-    
-    If AppFastEnable = "true" Then
-        Var Menu11Selected = "PressForever" 
-        Var Menu7Selected = "Invisible"
+        If AppFastEnable = "true" Then
+            Var Menu11Selected2 = "PressForever" 
+            Var Menu7Selected2 = "Invisible"
+        Else
+            Var Menu11Selected2 = "Invisible" 
+            Var Menu7Selected2 = "PressForever"
+        EndIf
     Else
-        Var Menu11Selected = "Invisible" 
-        Var Menu7Selected = "PressForever"
-    EndIf
 
-    If CocktailShow = "true" Then 
-        Var Menu7Selected = "Invisible"
-        Var Menu8Selected = "Enable"
+        If AppFastEnable = "true" Then
+            Var Menu11Selected = "PressForever" 
+            Var Menu7Selected = "Invisible"
+        Else
+            Var Menu11Selected = "Invisible" 
+            Var Menu7Selected = "PressForever"
+        EndIf
     EndIf
 
     
diff --git a/xml/page_catalog_choose_drink11.xml b/xml/page_catalog_choose_drink11.xml
index 3ca112d4..77c68496 100644
--- a/xml/page_catalog_choose_drink11.xml
+++ b/xml/page_catalog_choose_drink11.xml
@@ -10,7 +10,9 @@
 <EventOpen>
 	; On open
 	
-	If show_eng = "true" Then 
+	; On open
+
+        If show_eng = "true" Then 
         Var showthaiText = "Invisible"
         Var showengText = "Enable"
         Var DirImage = "ROOT/taobin_project/image/page3_en"
@@ -26,27 +28,88 @@
         Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
     EndIf
 
-    Var Menu1Selected = "Enable"
-    Var Menu2Selected = "Enable"
-    Var Menu3Selected = "Enable"
-    Var Menu4Selected = "Enable"
-    Var Menu5Selected = "Invisible"
-    Var Menu6Selected = "Enable"
-    Var Menu8Selected = "Invisible"
+    ; SpiralOnline
+    If SpiralOnline = "true" Then 
+        Var Menu1Selected2 = "Enable"
+        Var Menu2Selected2 = "Enable"
+        Var Menu3Selected2 = "Enable"
+        Var Menu4Selected2 = "Enable"
+        
+        Var Menu6Selected2 = "Enable"
+        Var Menu7Selected2 = "Enable"
+        Var MenuVSelected2 = "Enable"
 
-    
-    
-    If AppFastEnable = "true" Then
-        Var Menu11Selected = "PressForever" 
+         ; init default
+        Var Menu1Selected = "Invisible"
+        Var Menu2Selected = "Invisible"
+        Var Menu3Selected = "Invisible"
+        Var Menu4Selected = "Invisible"
+        ; 5 fruit
+        Var Menu5Selected = "Invisible"
+        Var Menu6Selected = "Invisible"
         Var Menu7Selected = "Invisible"
-    Else
+        ; 8 cocktail
+        Var Menu8Selected = "Invisible"
+
+            
         Var Menu11Selected = "Invisible" 
-        Var Menu7Selected = "PressForever"
+        Var Menu7Selected = "Invisible"
+        ; fuck
+    Else
+        Var Menu1Selected2 = "Invisible"
+        Var Menu2Selected2 = "Invisible"
+        Var Menu3Selected2 = "Invisible"
+        Var Menu4Selected2 = "Invisible"
+        
+        Var Menu6Selected2 = "Invisible"
+        Var Menu7Selected2 = "Invisible"
+        Var MenuVSelected2 = "Invisible"
+        Var Menu11Selected2 = "Invisible"
+
+        ; init default
+        Var Menu1Selected = "Enable"
+        Var Menu2Selected = "Enable"
+        Var Menu3Selected = "Enable"
+        Var Menu4Selected = "Enable"
+        ; 5 fruit
+        Var Menu5Selected = "Invisible"
+        Var Menu6Selected = "Enable"
+        Var Menu7Selected = "Enable"
+        ; 8 cocktail
+        Var Menu8Selected = "Invisible"
+
+        If CocktailShow = "true" Then 
+            Var Menu7Selected = "Invisible"
+            Var Menu8Selected = "Enable"
+        EndIf
+            
+        If AppFastEnable = "true" Then
+            Var Menu11Selected = "Enable" 
+            Var Menu7Selected = "Invisible"
+        Else
+            Var Menu11Selected = "Invisible" 
+            Var Menu7Selected = "Enable"
+        EndIf
     EndIf
 
-    If CocktailShow = "true" Then 
-        Var Menu7Selected = "Invisible"
-        Var Menu8Selected = "Enable"
+    If SpiralOnline = "true" Then 
+    
+        If AppFastEnable = "true" Then
+            Var Menu11Selected2 = "PressForever" 
+            Var Menu7Selected2 = "Invisible"
+        Else
+            Var Menu11Selected2 = "Invisible" 
+            Var Menu7Selected2 = "PressForever"
+        EndIf
+    Else
+
+        If AppFastEnable = "true" Then
+            Var Menu11Selected = "PressForever" 
+            Var Menu7Selected = "Invisible"
+        Else
+            Var Menu11Selected = "Invisible" 
+            Var Menu7Selected = "PressForever"
+        EndIf
     EndIf
 
     
@@ -129,8 +192,13 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/page_catalog.xml" 
-	
+    If SpiralOnline = "true" Then
+        Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" 
+    
+    Else
+	   Open "ROOT/taobin_project/xml/page_catalog.xml" 
+	EndIf
+
 </EventClick>
 </Button>
 
@@ -169,6 +237,22 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 99 </X>
+<Y> 395 </Y>
+<State> Menu1Selected2 </State>
+<Filename> Var( DirImage + "/bn_recommend2.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bp_recommend2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+</EventClick>
+</Button>
+
+
+
 
 <Button>
 <X> 243 </X>
@@ -183,6 +267,21 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
 </EventClick>
 </Button>
+<Button>
+<X> 227 </X>
+<Y> 395 </Y>
+<State> Menu2Selected2 </State>
+<Filename> Var( DirImage + "/bn_coffee2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_coffee2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
+</EventClick>
+</Button>
+
+
 
 <Button>
 <X> 394 </X>
@@ -198,6 +297,22 @@
 </EventClick>
 </Button>
 
+<Button>
+<X> 355 </X>
+<Y> 395 </Y>
+<State> Menu3Selected2 </State>
+<Filename> Var( DirImage + "/bn_tea2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_tea2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" 
+</EventClick>
+</Button>
+
+
+
 <Button>
 <X> 545 </X>
 <Y> 395 </Y>
@@ -211,6 +326,21 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 483 </X>
+<Y> 395 </Y>
+<State> Menu4Selected2 </State>
+<Filename> Var( DirImage + "/bn_cho_ca2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cho_ca2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
+</EventClick>
+</Button>
+
+
 
 <Button>
 <X> 696 </X>
@@ -225,6 +355,20 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 611 </X>
+<Y> 395 </Y>
+<State> Menu7Selected2 </State>
+<Filename> Var( DirImage + "/bn_protein2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_protein2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
+</EventClick>
+</Button>
+
 
 <Button>
 <X> 696 </X>
@@ -239,6 +383,19 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 611 </X>
+<Y> 395 </Y>
+<State> Menu11Selected2 </State>
+<Filename> Var( DirImage + "/bn_appfast2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_appfast2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
+</EventClick>
+</Button>
 
 
 <Button>
@@ -254,6 +411,19 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 739 </X>
+<Y> 395 </Y>
+<State> Menu8Selected2 </State>
+<Filename> Var( DirImage + "/bn_cocktail2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cocktail2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
+</EventClick>
+</Button>
 
 
 <Button>
@@ -269,6 +439,33 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 739 </X>
+<Y> 395 </Y>
+<State> Menu6Selected2 </State>
+<Filename> Var( DirImage + "/bn_sodada2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_sodada2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
+</EventClick>
+</Button>
+
+<Button>
+<X> 867 </X>
+<Y> 395 </Y>
+<State> MenuVSelected2 </State>
+<Filename> Var( DirImage + "/bn_vending2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_vending2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" 
+</EventClick>
+</Button>
 
 <EventWebApp>
 
diff --git a/xml/page_catalog_choose_drink2.pml b/xml/page_catalog_choose_drink2.pml
index 46a1c978..e354c7e7 100644
--- a/xml/page_catalog_choose_drink2.pml
+++ b/xml/page_catalog_choose_drink2.pml
@@ -97,15 +97,12 @@
 	<?hurr
         #include=menu_catalog_default_init.xml
     ?>
-
-    If CocktailShow = "true" Then 
-        Var Menu7Selected = "Invisible"
-        Var Menu8Selected = "Enable"
+    If SpiralOnline = "true" Then 
+        Var Menu2Selected2 = "PressForever"
+    Else
+        ; coffee show
+        Var Menu2Selected = "PressForever"
     EndIf
-
-    ; coffee show
-    Var Menu2Selected = "PressForever"
-   
     
 
     
diff --git a/xml/page_catalog_choose_drink2.xml b/xml/page_catalog_choose_drink2.xml
index e5d43d65..8094ca48 100644
--- a/xml/page_catalog_choose_drink2.xml
+++ b/xml/page_catalog_choose_drink2.xml
@@ -27,39 +27,76 @@
         Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
     EndIf
 
-    ; init default
-    Var Menu1Selected = "Enable"
-    Var Menu3Selected = "Enable"
-    Var Menu4Selected = "Enable"
-    ; 5 fruit
-    Var Menu5Selected = "Invisible"
-    Var Menu6Selected = "Enable"
-    Var Menu7Selected = "Enable"
-    ; 8 cocktail
-    Var Menu8Selected = "Invisible"
-
-    If CocktailShow = "true" Then 
-        Var Menu7Selected = "Invisible"
-        Var Menu8Selected = "Enable"
-    EndIf
+    ; SpiralOnline
+    If SpiralOnline = "true" Then 
+        Var Menu1Selected2 = "Enable"
+        Var Menu2Selected2 = "Enable"
+        Var Menu3Selected2 = "Enable"
+        Var Menu4Selected2 = "Enable"
         
-    If AppFastEnable = "true" Then
-        Var Menu11Selected = "Enable" 
+        Var Menu6Selected2 = "Enable"
+        Var Menu7Selected2 = "Enable"
+        Var MenuVSelected2 = "Enable"
+
+         ; init default
+        Var Menu1Selected = "Invisible"
+        Var Menu2Selected = "Invisible"
+        Var Menu3Selected = "Invisible"
+        Var Menu4Selected = "Invisible"
+        ; 5 fruit
+        Var Menu5Selected = "Invisible"
+        Var Menu6Selected = "Invisible"
         Var Menu7Selected = "Invisible"
-    Else
+        ; 8 cocktail
+        Var Menu8Selected = "Invisible"
+
+            
         Var Menu11Selected = "Invisible" 
-        Var Menu7Selected = "Enable"
-    EndIf
-
-
-    If CocktailShow = "true" Then 
         Var Menu7Selected = "Invisible"
-        Var Menu8Selected = "Enable"
+        ; fuck
+    Else
+        Var Menu1Selected2 = "Invisible"
+        Var Menu2Selected2 = "Invisible"
+        Var Menu3Selected2 = "Invisible"
+        Var Menu4Selected2 = "Invisible"
+        
+        Var Menu6Selected2 = "Invisible"
+        Var Menu7Selected2 = "Invisible"
+        Var MenuVSelected2 = "Invisible"
+        Var Menu11Selected2 = "Invisible"
+
+        ; init default
+        Var Menu1Selected = "Enable"
+        Var Menu2Selected = "Enable"
+        Var Menu3Selected = "Enable"
+        Var Menu4Selected = "Enable"
+        ; 5 fruit
+        Var Menu5Selected = "Invisible"
+        Var Menu6Selected = "Enable"
+        Var Menu7Selected = "Enable"
+        ; 8 cocktail
+        Var Menu8Selected = "Invisible"
+
+        If CocktailShow = "true" Then 
+            Var Menu7Selected = "Invisible"
+            Var Menu8Selected = "Enable"
+        EndIf
+            
+        If AppFastEnable = "true" Then
+            Var Menu11Selected = "Enable" 
+            Var Menu7Selected = "Invisible"
+        Else
+            Var Menu11Selected = "Invisible" 
+            Var Menu7Selected = "Enable"
+        EndIf
     EndIf
 
-    ; coffee show
-    Var Menu2Selected = "PressForever"
-   
+    If SpiralOnline = "true" Then 
+        Var Menu2Selected2 = "PressForever"
+    Else
+        ; coffee show
+        Var Menu2Selected = "PressForever"
+    EndIf
     
 
     
@@ -143,8 +180,13 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/page_catalog.xml" 
-	
+    If SpiralOnline = "true" Then
+        Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" 
+    
+    Else
+	   Open "ROOT/taobin_project/xml/page_catalog.xml" 
+	EndIf
+
 </EventClick>
 </Button>
 
@@ -183,6 +225,22 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 99 </X>
+<Y> 395 </Y>
+<State> Menu1Selected2 </State>
+<Filename> Var( DirImage + "/bn_recommend2.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bp_recommend2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+</EventClick>
+</Button>
+
+
+
 
 <Button>
 <X> 243 </X>
@@ -197,6 +255,21 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
 </EventClick>
 </Button>
+<Button>
+<X> 227 </X>
+<Y> 395 </Y>
+<State> Menu2Selected2 </State>
+<Filename> Var( DirImage + "/bn_coffee2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_coffee2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
+</EventClick>
+</Button>
+
+
 
 <Button>
 <X> 394 </X>
@@ -212,6 +285,22 @@
 </EventClick>
 </Button>
 
+<Button>
+<X> 355 </X>
+<Y> 395 </Y>
+<State> Menu3Selected2 </State>
+<Filename> Var( DirImage + "/bn_tea2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_tea2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" 
+</EventClick>
+</Button>
+
+
+
 <Button>
 <X> 545 </X>
 <Y> 395 </Y>
@@ -225,6 +314,21 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 483 </X>
+<Y> 395 </Y>
+<State> Menu4Selected2 </State>
+<Filename> Var( DirImage + "/bn_cho_ca2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cho_ca2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
+</EventClick>
+</Button>
+
+
 
 <Button>
 <X> 696 </X>
@@ -239,6 +343,20 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 611 </X>
+<Y> 395 </Y>
+<State> Menu7Selected2 </State>
+<Filename> Var( DirImage + "/bn_protein2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_protein2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
+</EventClick>
+</Button>
+
 
 <Button>
 <X> 696 </X>
@@ -253,6 +371,19 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 611 </X>
+<Y> 395 </Y>
+<State> Menu11Selected2 </State>
+<Filename> Var( DirImage + "/bn_appfast2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_appfast2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
+</EventClick>
+</Button>
 
 
 <Button>
@@ -268,6 +399,19 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 739 </X>
+<Y> 395 </Y>
+<State> Menu8Selected2 </State>
+<Filename> Var( DirImage + "/bn_cocktail2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cocktail2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
+</EventClick>
+</Button>
 
 
 <Button>
@@ -283,6 +427,33 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 739 </X>
+<Y> 395 </Y>
+<State> Menu6Selected2 </State>
+<Filename> Var( DirImage + "/bn_sodada2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_sodada2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
+</EventClick>
+</Button>
+
+<Button>
+<X> 867 </X>
+<Y> 395 </Y>
+<State> MenuVSelected2 </State>
+<Filename> Var( DirImage + "/bn_vending2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_vending2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" 
+</EventClick>
+</Button>
 
 <EventWebApp>
 
diff --git a/xml/page_catalog_choose_drink3.pml b/xml/page_catalog_choose_drink3.pml
index d66ba760..37328609 100644
--- a/xml/page_catalog_choose_drink3.pml
+++ b/xml/page_catalog_choose_drink3.pml
@@ -73,7 +73,12 @@
     ?>
 
     ; tea
-    Var Menu3Selected = "PressForever"
+    If SpiralOnline = "true" Then 
+        Var Menu3Selected2 = "PressForever"
+    Else
+        Var Menu3Selected = "PressForever"
+    EndIf
+
     Var Timeout = 0
 </EventOpen>
 
diff --git a/xml/page_catalog_choose_drink3.xml b/xml/page_catalog_choose_drink3.xml
index 70e32d4c..7d1c01de 100644
--- a/xml/page_catalog_choose_drink3.xml
+++ b/xml/page_catalog_choose_drink3.xml
@@ -27,33 +27,78 @@
         Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
     EndIf
 
-    ; init default
-    Var Menu1Selected = "Enable"
-    Var Menu3Selected = "Enable"
-    Var Menu4Selected = "Enable"
-    ; 5 fruit
-    Var Menu5Selected = "Invisible"
-    Var Menu6Selected = "Enable"
-    Var Menu7Selected = "Enable"
-    ; 8 cocktail
-    Var Menu8Selected = "Invisible"
-
-    If CocktailShow = "true" Then 
-        Var Menu7Selected = "Invisible"
-        Var Menu8Selected = "Enable"
-    EndIf
+    ; SpiralOnline
+    If SpiralOnline = "true" Then 
+        Var Menu1Selected2 = "Enable"
+        Var Menu2Selected2 = "Enable"
+        Var Menu3Selected2 = "Enable"
+        Var Menu4Selected2 = "Enable"
         
-    If AppFastEnable = "true" Then
-        Var Menu11Selected = "Enable" 
+        Var Menu6Selected2 = "Enable"
+        Var Menu7Selected2 = "Enable"
+        Var MenuVSelected2 = "Enable"
+
+         ; init default
+        Var Menu1Selected = "Invisible"
+        Var Menu2Selected = "Invisible"
+        Var Menu3Selected = "Invisible"
+        Var Menu4Selected = "Invisible"
+        ; 5 fruit
+        Var Menu5Selected = "Invisible"
+        Var Menu6Selected = "Invisible"
         Var Menu7Selected = "Invisible"
-    Else
+        ; 8 cocktail
+        Var Menu8Selected = "Invisible"
+
+            
         Var Menu11Selected = "Invisible" 
+        Var Menu7Selected = "Invisible"
+        ; fuck
+    Else
+        Var Menu1Selected2 = "Invisible"
+        Var Menu2Selected2 = "Invisible"
+        Var Menu3Selected2 = "Invisible"
+        Var Menu4Selected2 = "Invisible"
+        
+        Var Menu6Selected2 = "Invisible"
+        Var Menu7Selected2 = "Invisible"
+        Var MenuVSelected2 = "Invisible"
+        Var Menu11Selected2 = "Invisible"
+
+        ; init default
+        Var Menu1Selected = "Enable"
+        Var Menu2Selected = "Enable"
+        Var Menu3Selected = "Enable"
+        Var Menu4Selected = "Enable"
+        ; 5 fruit
+        Var Menu5Selected = "Invisible"
+        Var Menu6Selected = "Enable"
         Var Menu7Selected = "Enable"
+        ; 8 cocktail
+        Var Menu8Selected = "Invisible"
+
+        If CocktailShow = "true" Then 
+            Var Menu7Selected = "Invisible"
+            Var Menu8Selected = "Enable"
+        EndIf
+            
+        If AppFastEnable = "true" Then
+            Var Menu11Selected = "Enable" 
+            Var Menu7Selected = "Invisible"
+        Else
+            Var Menu11Selected = "Invisible" 
+            Var Menu7Selected = "Enable"
+        EndIf
     EndIf
 
 
     ; tea
-    Var Menu3Selected = "PressForever"
+    If SpiralOnline = "true" Then 
+        Var Menu3Selected2 = "PressForever"
+    Else
+        Var Menu3Selected = "PressForever"
+    EndIf
+
     Var Timeout = 0
 </EventOpen>
 
@@ -134,8 +179,13 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/page_catalog.xml" 
-	
+    If SpiralOnline = "true" Then
+        Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" 
+    
+    Else
+	   Open "ROOT/taobin_project/xml/page_catalog.xml" 
+	EndIf
+
 </EventClick>
 </Button>
 
@@ -174,6 +224,22 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 99 </X>
+<Y> 395 </Y>
+<State> Menu1Selected2 </State>
+<Filename> Var( DirImage + "/bn_recommend2.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bp_recommend2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+</EventClick>
+</Button>
+
+
+
 
 <Button>
 <X> 243 </X>
@@ -188,6 +254,21 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
 </EventClick>
 </Button>
+<Button>
+<X> 227 </X>
+<Y> 395 </Y>
+<State> Menu2Selected2 </State>
+<Filename> Var( DirImage + "/bn_coffee2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_coffee2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
+</EventClick>
+</Button>
+
+
 
 <Button>
 <X> 394 </X>
@@ -203,6 +284,22 @@
 </EventClick>
 </Button>
 
+<Button>
+<X> 355 </X>
+<Y> 395 </Y>
+<State> Menu3Selected2 </State>
+<Filename> Var( DirImage + "/bn_tea2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_tea2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" 
+</EventClick>
+</Button>
+
+
+
 <Button>
 <X> 545 </X>
 <Y> 395 </Y>
@@ -216,6 +313,21 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 483 </X>
+<Y> 395 </Y>
+<State> Menu4Selected2 </State>
+<Filename> Var( DirImage + "/bn_cho_ca2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cho_ca2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
+</EventClick>
+</Button>
+
+
 
 <Button>
 <X> 696 </X>
@@ -230,6 +342,20 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 611 </X>
+<Y> 395 </Y>
+<State> Menu7Selected2 </State>
+<Filename> Var( DirImage + "/bn_protein2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_protein2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
+</EventClick>
+</Button>
+
 
 <Button>
 <X> 696 </X>
@@ -244,6 +370,19 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 611 </X>
+<Y> 395 </Y>
+<State> Menu11Selected2 </State>
+<Filename> Var( DirImage + "/bn_appfast2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_appfast2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
+</EventClick>
+</Button>
 
 
 <Button>
@@ -259,6 +398,19 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 739 </X>
+<Y> 395 </Y>
+<State> Menu8Selected2 </State>
+<Filename> Var( DirImage + "/bn_cocktail2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cocktail2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
+</EventClick>
+</Button>
 
 
 <Button>
@@ -274,6 +426,33 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 739 </X>
+<Y> 395 </Y>
+<State> Menu6Selected2 </State>
+<Filename> Var( DirImage + "/bn_sodada2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_sodada2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
+</EventClick>
+</Button>
+
+<Button>
+<X> 867 </X>
+<Y> 395 </Y>
+<State> MenuVSelected2 </State>
+<Filename> Var( DirImage + "/bn_vending2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_vending2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" 
+</EventClick>
+</Button>
 
 <EventWebApp>
 
diff --git a/xml/page_catalog_choose_drink4.pml b/xml/page_catalog_choose_drink4.pml
index d623311e..c729fe4f 100644
--- a/xml/page_catalog_choose_drink4.pml
+++ b/xml/page_catalog_choose_drink4.pml
@@ -42,8 +42,13 @@
         #include=menu_catalog_default_init.xml
     ?>
 
-    Var Menu4Selected = "PressForever"
-    
+    ; cocoa
+    If SpiralOnline = "true" Then 
+        Var Menu4Selected2 = "PressForever"
+    Else
+        Var Menu4Selected = "PressForever"
+    EndIf
+
     Var Timeout = 0
 </EventOpen>
 
diff --git a/xml/page_catalog_choose_drink4.xml b/xml/page_catalog_choose_drink4.xml
index 4f6e59a1..b06d3e20 100644
--- a/xml/page_catalog_choose_drink4.xml
+++ b/xml/page_catalog_choose_drink4.xml
@@ -25,33 +25,78 @@
         Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
     EndIf
 
-    ; init default
-    Var Menu1Selected = "Enable"
-    Var Menu3Selected = "Enable"
-    Var Menu4Selected = "Enable"
-    ; 5 fruit
-    Var Menu5Selected = "Invisible"
-    Var Menu6Selected = "Enable"
-    Var Menu7Selected = "Enable"
-    ; 8 cocktail
-    Var Menu8Selected = "Invisible"
-
-    If CocktailShow = "true" Then 
-        Var Menu7Selected = "Invisible"
-        Var Menu8Selected = "Enable"
-    EndIf
+    ; SpiralOnline
+    If SpiralOnline = "true" Then 
+        Var Menu1Selected2 = "Enable"
+        Var Menu2Selected2 = "Enable"
+        Var Menu3Selected2 = "Enable"
+        Var Menu4Selected2 = "Enable"
         
-    If AppFastEnable = "true" Then
-        Var Menu11Selected = "Enable" 
+        Var Menu6Selected2 = "Enable"
+        Var Menu7Selected2 = "Enable"
+        Var MenuVSelected2 = "Enable"
+
+         ; init default
+        Var Menu1Selected = "Invisible"
+        Var Menu2Selected = "Invisible"
+        Var Menu3Selected = "Invisible"
+        Var Menu4Selected = "Invisible"
+        ; 5 fruit
+        Var Menu5Selected = "Invisible"
+        Var Menu6Selected = "Invisible"
         Var Menu7Selected = "Invisible"
-    Else
+        ; 8 cocktail
+        Var Menu8Selected = "Invisible"
+
+            
         Var Menu11Selected = "Invisible" 
+        Var Menu7Selected = "Invisible"
+        ; fuck
+    Else
+        Var Menu1Selected2 = "Invisible"
+        Var Menu2Selected2 = "Invisible"
+        Var Menu3Selected2 = "Invisible"
+        Var Menu4Selected2 = "Invisible"
+        
+        Var Menu6Selected2 = "Invisible"
+        Var Menu7Selected2 = "Invisible"
+        Var MenuVSelected2 = "Invisible"
+        Var Menu11Selected2 = "Invisible"
+
+        ; init default
+        Var Menu1Selected = "Enable"
+        Var Menu2Selected = "Enable"
+        Var Menu3Selected = "Enable"
+        Var Menu4Selected = "Enable"
+        ; 5 fruit
+        Var Menu5Selected = "Invisible"
+        Var Menu6Selected = "Enable"
         Var Menu7Selected = "Enable"
+        ; 8 cocktail
+        Var Menu8Selected = "Invisible"
+
+        If CocktailShow = "true" Then 
+            Var Menu7Selected = "Invisible"
+            Var Menu8Selected = "Enable"
+        EndIf
+            
+        If AppFastEnable = "true" Then
+            Var Menu11Selected = "Enable" 
+            Var Menu7Selected = "Invisible"
+        Else
+            Var Menu11Selected = "Invisible" 
+            Var Menu7Selected = "Enable"
+        EndIf
     EndIf
 
 
-    Var Menu4Selected = "PressForever"
-    
+    ; cocoa
+    If SpiralOnline = "true" Then 
+        Var Menu4Selected2 = "PressForever"
+    Else
+        Var Menu4Selected = "PressForever"
+    EndIf
+
     Var Timeout = 0
 </EventOpen>
 
@@ -132,8 +177,13 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/page_catalog.xml" 
-	
+    If SpiralOnline = "true" Then
+        Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" 
+    
+    Else
+	   Open "ROOT/taobin_project/xml/page_catalog.xml" 
+	EndIf
+
 </EventClick>
 </Button>
 
@@ -172,6 +222,22 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 99 </X>
+<Y> 395 </Y>
+<State> Menu1Selected2 </State>
+<Filename> Var( DirImage + "/bn_recommend2.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bp_recommend2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+</EventClick>
+</Button>
+
+
+
 
 <Button>
 <X> 243 </X>
@@ -186,6 +252,21 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
 </EventClick>
 </Button>
+<Button>
+<X> 227 </X>
+<Y> 395 </Y>
+<State> Menu2Selected2 </State>
+<Filename> Var( DirImage + "/bn_coffee2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_coffee2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
+</EventClick>
+</Button>
+
+
 
 <Button>
 <X> 394 </X>
@@ -201,6 +282,22 @@
 </EventClick>
 </Button>
 
+<Button>
+<X> 355 </X>
+<Y> 395 </Y>
+<State> Menu3Selected2 </State>
+<Filename> Var( DirImage + "/bn_tea2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_tea2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" 
+</EventClick>
+</Button>
+
+
+
 <Button>
 <X> 545 </X>
 <Y> 395 </Y>
@@ -214,6 +311,21 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 483 </X>
+<Y> 395 </Y>
+<State> Menu4Selected2 </State>
+<Filename> Var( DirImage + "/bn_cho_ca2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cho_ca2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
+</EventClick>
+</Button>
+
+
 
 <Button>
 <X> 696 </X>
@@ -228,6 +340,20 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 611 </X>
+<Y> 395 </Y>
+<State> Menu7Selected2 </State>
+<Filename> Var( DirImage + "/bn_protein2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_protein2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
+</EventClick>
+</Button>
+
 
 <Button>
 <X> 696 </X>
@@ -242,6 +368,19 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 611 </X>
+<Y> 395 </Y>
+<State> Menu11Selected2 </State>
+<Filename> Var( DirImage + "/bn_appfast2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_appfast2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
+</EventClick>
+</Button>
 
 
 <Button>
@@ -257,6 +396,19 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 739 </X>
+<Y> 395 </Y>
+<State> Menu8Selected2 </State>
+<Filename> Var( DirImage + "/bn_cocktail2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cocktail2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
+</EventClick>
+</Button>
 
 
 <Button>
@@ -272,6 +424,33 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 739 </X>
+<Y> 395 </Y>
+<State> Menu6Selected2 </State>
+<Filename> Var( DirImage + "/bn_sodada2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_sodada2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
+</EventClick>
+</Button>
+
+<Button>
+<X> 867 </X>
+<Y> 395 </Y>
+<State> MenuVSelected2 </State>
+<Filename> Var( DirImage + "/bn_vending2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_vending2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" 
+</EventClick>
+</Button>
 
 <EventWebApp>
 
diff --git a/xml/page_catalog_choose_drink5.xml b/xml/page_catalog_choose_drink5.xml
index f6c703a0..574a6f3b 100644
--- a/xml/page_catalog_choose_drink5.xml
+++ b/xml/page_catalog_choose_drink5.xml
@@ -26,28 +26,68 @@
         Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
     EndIf
 
-    ; init default
-    Var Menu1Selected = "Enable"
-    Var Menu3Selected = "Enable"
-    Var Menu4Selected = "Enable"
-    ; 5 fruit
-    Var Menu5Selected = "Invisible"
-    Var Menu6Selected = "Enable"
-    Var Menu7Selected = "Enable"
-    ; 8 cocktail
-    Var Menu8Selected = "Invisible"
-
-    If CocktailShow = "true" Then 
-        Var Menu7Selected = "Invisible"
-        Var Menu8Selected = "Enable"
-    EndIf
+    ; SpiralOnline
+    If SpiralOnline = "true" Then 
+        Var Menu1Selected2 = "Enable"
+        Var Menu2Selected2 = "Enable"
+        Var Menu3Selected2 = "Enable"
+        Var Menu4Selected2 = "Enable"
         
-    If AppFastEnable = "true" Then
-        Var Menu11Selected = "Enable" 
+        Var Menu6Selected2 = "Enable"
+        Var Menu7Selected2 = "Enable"
+        Var MenuVSelected2 = "Enable"
+
+         ; init default
+        Var Menu1Selected = "Invisible"
+        Var Menu2Selected = "Invisible"
+        Var Menu3Selected = "Invisible"
+        Var Menu4Selected = "Invisible"
+        ; 5 fruit
+        Var Menu5Selected = "Invisible"
+        Var Menu6Selected = "Invisible"
         Var Menu7Selected = "Invisible"
-    Else
+        ; 8 cocktail
+        Var Menu8Selected = "Invisible"
+
+            
         Var Menu11Selected = "Invisible" 
+        Var Menu7Selected = "Invisible"
+        ; fuck
+    Else
+        Var Menu1Selected2 = "Invisible"
+        Var Menu2Selected2 = "Invisible"
+        Var Menu3Selected2 = "Invisible"
+        Var Menu4Selected2 = "Invisible"
+        
+        Var Menu6Selected2 = "Invisible"
+        Var Menu7Selected2 = "Invisible"
+        Var MenuVSelected2 = "Invisible"
+        Var Menu11Selected2 = "Invisible"
+
+        ; init default
+        Var Menu1Selected = "Enable"
+        Var Menu2Selected = "Enable"
+        Var Menu3Selected = "Enable"
+        Var Menu4Selected = "Enable"
+        ; 5 fruit
+        Var Menu5Selected = "Invisible"
+        Var Menu6Selected = "Enable"
         Var Menu7Selected = "Enable"
+        ; 8 cocktail
+        Var Menu8Selected = "Invisible"
+
+        If CocktailShow = "true" Then 
+            Var Menu7Selected = "Invisible"
+            Var Menu8Selected = "Enable"
+        EndIf
+            
+        If AppFastEnable = "true" Then
+            Var Menu11Selected = "Enable" 
+            Var Menu7Selected = "Invisible"
+        Else
+            Var Menu11Selected = "Invisible" 
+            Var Menu7Selected = "Enable"
+        EndIf
     EndIf
 
 
@@ -130,8 +170,13 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/page_catalog.xml" 
-	
+    If SpiralOnline = "true" Then
+        Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" 
+    
+    Else
+	   Open "ROOT/taobin_project/xml/page_catalog.xml" 
+	EndIf
+
 </EventClick>
 </Button>
 
@@ -170,6 +215,22 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 99 </X>
+<Y> 395 </Y>
+<State> Menu1Selected2 </State>
+<Filename> Var( DirImage + "/bn_recommend2.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bp_recommend2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+</EventClick>
+</Button>
+
+
+
 
 <Button>
 <X> 243 </X>
@@ -184,6 +245,21 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
 </EventClick>
 </Button>
+<Button>
+<X> 227 </X>
+<Y> 395 </Y>
+<State> Menu2Selected2 </State>
+<Filename> Var( DirImage + "/bn_coffee2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_coffee2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
+</EventClick>
+</Button>
+
+
 
 <Button>
 <X> 394 </X>
@@ -199,6 +275,22 @@
 </EventClick>
 </Button>
 
+<Button>
+<X> 355 </X>
+<Y> 395 </Y>
+<State> Menu3Selected2 </State>
+<Filename> Var( DirImage + "/bn_tea2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_tea2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" 
+</EventClick>
+</Button>
+
+
+
 <Button>
 <X> 545 </X>
 <Y> 395 </Y>
@@ -212,6 +304,21 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 483 </X>
+<Y> 395 </Y>
+<State> Menu4Selected2 </State>
+<Filename> Var( DirImage + "/bn_cho_ca2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cho_ca2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
+</EventClick>
+</Button>
+
+
 
 <Button>
 <X> 696 </X>
@@ -226,6 +333,20 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 611 </X>
+<Y> 395 </Y>
+<State> Menu7Selected2 </State>
+<Filename> Var( DirImage + "/bn_protein2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_protein2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
+</EventClick>
+</Button>
+
 
 <Button>
 <X> 696 </X>
@@ -240,6 +361,19 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 611 </X>
+<Y> 395 </Y>
+<State> Menu11Selected2 </State>
+<Filename> Var( DirImage + "/bn_appfast2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_appfast2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
+</EventClick>
+</Button>
 
 
 <Button>
@@ -255,6 +389,19 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 739 </X>
+<Y> 395 </Y>
+<State> Menu8Selected2 </State>
+<Filename> Var( DirImage + "/bn_cocktail2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cocktail2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
+</EventClick>
+</Button>
 
 
 <Button>
@@ -270,6 +417,33 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 739 </X>
+<Y> 395 </Y>
+<State> Menu6Selected2 </State>
+<Filename> Var( DirImage + "/bn_sodada2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_sodada2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
+</EventClick>
+</Button>
+
+<Button>
+<X> 867 </X>
+<Y> 395 </Y>
+<State> MenuVSelected2 </State>
+<Filename> Var( DirImage + "/bn_vending2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_vending2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" 
+</EventClick>
+</Button>
 
 <EventWebApp>
 
diff --git a/xml/page_catalog_choose_drink6.pml b/xml/page_catalog_choose_drink6.pml
index 7a15a881..3b014802 100644
--- a/xml/page_catalog_choose_drink6.pml
+++ b/xml/page_catalog_choose_drink6.pml
@@ -78,7 +78,12 @@
         #include=menu_catalog_default_init.xml
     ?>
 
-    Var Menu6Selected = "PressForever"
+    ; soda and other
+    If SpiralOnline = "true" Then 
+        Var Menu6Selected2 = "PressForever"
+    Else
+        Var Menu6Selected = "PressForever"
+    EndIf
     Var Timeout = 0
 </EventOpen>
 
diff --git a/xml/page_catalog_choose_drink6.xml b/xml/page_catalog_choose_drink6.xml
index 65d2157e..3a8e8b5e 100644
--- a/xml/page_catalog_choose_drink6.xml
+++ b/xml/page_catalog_choose_drink6.xml
@@ -26,32 +26,77 @@
         Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
     EndIf
 
-    ; init default
-    Var Menu1Selected = "Enable"
-    Var Menu3Selected = "Enable"
-    Var Menu4Selected = "Enable"
-    ; 5 fruit
-    Var Menu5Selected = "Invisible"
-    Var Menu6Selected = "Enable"
-    Var Menu7Selected = "Enable"
-    ; 8 cocktail
-    Var Menu8Selected = "Invisible"
-
-    If CocktailShow = "true" Then 
-        Var Menu7Selected = "Invisible"
-        Var Menu8Selected = "Enable"
-    EndIf
+    ; SpiralOnline
+    If SpiralOnline = "true" Then 
+        Var Menu1Selected2 = "Enable"
+        Var Menu2Selected2 = "Enable"
+        Var Menu3Selected2 = "Enable"
+        Var Menu4Selected2 = "Enable"
         
-    If AppFastEnable = "true" Then
-        Var Menu11Selected = "Enable" 
+        Var Menu6Selected2 = "Enable"
+        Var Menu7Selected2 = "Enable"
+        Var MenuVSelected2 = "Enable"
+
+         ; init default
+        Var Menu1Selected = "Invisible"
+        Var Menu2Selected = "Invisible"
+        Var Menu3Selected = "Invisible"
+        Var Menu4Selected = "Invisible"
+        ; 5 fruit
+        Var Menu5Selected = "Invisible"
+        Var Menu6Selected = "Invisible"
         Var Menu7Selected = "Invisible"
-    Else
+        ; 8 cocktail
+        Var Menu8Selected = "Invisible"
+
+            
         Var Menu11Selected = "Invisible" 
+        Var Menu7Selected = "Invisible"
+        ; fuck
+    Else
+        Var Menu1Selected2 = "Invisible"
+        Var Menu2Selected2 = "Invisible"
+        Var Menu3Selected2 = "Invisible"
+        Var Menu4Selected2 = "Invisible"
+        
+        Var Menu6Selected2 = "Invisible"
+        Var Menu7Selected2 = "Invisible"
+        Var MenuVSelected2 = "Invisible"
+        Var Menu11Selected2 = "Invisible"
+
+        ; init default
+        Var Menu1Selected = "Enable"
+        Var Menu2Selected = "Enable"
+        Var Menu3Selected = "Enable"
+        Var Menu4Selected = "Enable"
+        ; 5 fruit
+        Var Menu5Selected = "Invisible"
+        Var Menu6Selected = "Enable"
         Var Menu7Selected = "Enable"
+        ; 8 cocktail
+        Var Menu8Selected = "Invisible"
+
+        If CocktailShow = "true" Then 
+            Var Menu7Selected = "Invisible"
+            Var Menu8Selected = "Enable"
+        EndIf
+            
+        If AppFastEnable = "true" Then
+            Var Menu11Selected = "Enable" 
+            Var Menu7Selected = "Invisible"
+        Else
+            Var Menu11Selected = "Invisible" 
+            Var Menu7Selected = "Enable"
+        EndIf
     EndIf
 
 
-    Var Menu6Selected = "PressForever"
+    ; soda and other
+    If SpiralOnline = "true" Then 
+        Var Menu6Selected2 = "PressForever"
+    Else
+        Var Menu6Selected = "PressForever"
+    EndIf
     Var Timeout = 0
 </EventOpen>
 
@@ -131,8 +176,13 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/page_catalog.xml" 
-	
+    If SpiralOnline = "true" Then
+        Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" 
+    
+    Else
+	   Open "ROOT/taobin_project/xml/page_catalog.xml" 
+	EndIf
+
 </EventClick>
 </Button>
 
@@ -171,6 +221,22 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 99 </X>
+<Y> 395 </Y>
+<State> Menu1Selected2 </State>
+<Filename> Var( DirImage + "/bn_recommend2.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bp_recommend2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+</EventClick>
+</Button>
+
+
+
 
 <Button>
 <X> 243 </X>
@@ -185,6 +251,21 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
 </EventClick>
 </Button>
+<Button>
+<X> 227 </X>
+<Y> 395 </Y>
+<State> Menu2Selected2 </State>
+<Filename> Var( DirImage + "/bn_coffee2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_coffee2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
+</EventClick>
+</Button>
+
+
 
 <Button>
 <X> 394 </X>
@@ -200,6 +281,22 @@
 </EventClick>
 </Button>
 
+<Button>
+<X> 355 </X>
+<Y> 395 </Y>
+<State> Menu3Selected2 </State>
+<Filename> Var( DirImage + "/bn_tea2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_tea2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" 
+</EventClick>
+</Button>
+
+
+
 <Button>
 <X> 545 </X>
 <Y> 395 </Y>
@@ -213,6 +310,21 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 483 </X>
+<Y> 395 </Y>
+<State> Menu4Selected2 </State>
+<Filename> Var( DirImage + "/bn_cho_ca2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cho_ca2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
+</EventClick>
+</Button>
+
+
 
 <Button>
 <X> 696 </X>
@@ -227,6 +339,20 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 611 </X>
+<Y> 395 </Y>
+<State> Menu7Selected2 </State>
+<Filename> Var( DirImage + "/bn_protein2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_protein2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
+</EventClick>
+</Button>
+
 
 <Button>
 <X> 696 </X>
@@ -241,6 +367,19 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 611 </X>
+<Y> 395 </Y>
+<State> Menu11Selected2 </State>
+<Filename> Var( DirImage + "/bn_appfast2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_appfast2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
+</EventClick>
+</Button>
 
 
 <Button>
@@ -256,6 +395,19 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 739 </X>
+<Y> 395 </Y>
+<State> Menu8Selected2 </State>
+<Filename> Var( DirImage + "/bn_cocktail2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cocktail2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
+</EventClick>
+</Button>
 
 
 <Button>
@@ -271,6 +423,33 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 739 </X>
+<Y> 395 </Y>
+<State> Menu6Selected2 </State>
+<Filename> Var( DirImage + "/bn_sodada2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_sodada2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
+</EventClick>
+</Button>
+
+<Button>
+<X> 867 </X>
+<Y> 395 </Y>
+<State> MenuVSelected2 </State>
+<Filename> Var( DirImage + "/bn_vending2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_vending2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" 
+</EventClick>
+</Button>
 
 <EventWebApp>
 
diff --git a/xml/page_catalog_choose_drink7.pml b/xml/page_catalog_choose_drink7.pml
index b9c20773..f81a7258 100644
--- a/xml/page_catalog_choose_drink7.pml
+++ b/xml/page_catalog_choose_drink7.pml
@@ -39,8 +39,28 @@
         #include=menu_catalog_default_init.xml
     ?>
     
-    Var Menu7Selected = "PressForever"
+    ; protein
+    If SpiralOnline = "true" Then 
     
+        If AppFastEnable = "true" Then
+            Var Menu11Selected2 = "PressForever" 
+            Var Menu7Selected2 = "Invisible"
+        Else
+            Var Menu11Selected2 = "Invisible" 
+            Var Menu7Selected2 = "PressForever"
+        EndIf
+    Else
+    
+        If AppFastEnable = "true" Then
+            Var Menu11Selected = "PressForever" 
+            Var Menu7Selected = "Invisible"
+        Else
+            Var Menu11Selected = "Invisible" 
+            Var Menu7Selected = "PressForever"
+        EndIf
+    EndIf
+
+
     Var Timeout = 0
 </EventOpen>
 
diff --git a/xml/page_catalog_choose_drink7.xml b/xml/page_catalog_choose_drink7.xml
index b5293aa6..a04fb5b6 100644
--- a/xml/page_catalog_choose_drink7.xml
+++ b/xml/page_catalog_choose_drink7.xml
@@ -26,33 +26,93 @@
         Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
     EndIf
 
-    ; init default
-    Var Menu1Selected = "Enable"
-    Var Menu3Selected = "Enable"
-    Var Menu4Selected = "Enable"
-    ; 5 fruit
-    Var Menu5Selected = "Invisible"
-    Var Menu6Selected = "Enable"
-    Var Menu7Selected = "Enable"
-    ; 8 cocktail
-    Var Menu8Selected = "Invisible"
-
-    If CocktailShow = "true" Then 
-        Var Menu7Selected = "Invisible"
-        Var Menu8Selected = "Enable"
-    EndIf
+    ; SpiralOnline
+    If SpiralOnline = "true" Then 
+        Var Menu1Selected2 = "Enable"
+        Var Menu2Selected2 = "Enable"
+        Var Menu3Selected2 = "Enable"
+        Var Menu4Selected2 = "Enable"
         
-    If AppFastEnable = "true" Then
-        Var Menu11Selected = "Enable" 
+        Var Menu6Selected2 = "Enable"
+        Var Menu7Selected2 = "Enable"
+        Var MenuVSelected2 = "Enable"
+
+         ; init default
+        Var Menu1Selected = "Invisible"
+        Var Menu2Selected = "Invisible"
+        Var Menu3Selected = "Invisible"
+        Var Menu4Selected = "Invisible"
+        ; 5 fruit
+        Var Menu5Selected = "Invisible"
+        Var Menu6Selected = "Invisible"
         Var Menu7Selected = "Invisible"
-    Else
+        ; 8 cocktail
+        Var Menu8Selected = "Invisible"
+
+            
         Var Menu11Selected = "Invisible" 
+        Var Menu7Selected = "Invisible"
+        ; fuck
+    Else
+        Var Menu1Selected2 = "Invisible"
+        Var Menu2Selected2 = "Invisible"
+        Var Menu3Selected2 = "Invisible"
+        Var Menu4Selected2 = "Invisible"
+        
+        Var Menu6Selected2 = "Invisible"
+        Var Menu7Selected2 = "Invisible"
+        Var MenuVSelected2 = "Invisible"
+        Var Menu11Selected2 = "Invisible"
+
+        ; init default
+        Var Menu1Selected = "Enable"
+        Var Menu2Selected = "Enable"
+        Var Menu3Selected = "Enable"
+        Var Menu4Selected = "Enable"
+        ; 5 fruit
+        Var Menu5Selected = "Invisible"
+        Var Menu6Selected = "Enable"
         Var Menu7Selected = "Enable"
+        ; 8 cocktail
+        Var Menu8Selected = "Invisible"
+
+        If CocktailShow = "true" Then 
+            Var Menu7Selected = "Invisible"
+            Var Menu8Selected = "Enable"
+        EndIf
+            
+        If AppFastEnable = "true" Then
+            Var Menu11Selected = "Enable" 
+            Var Menu7Selected = "Invisible"
+        Else
+            Var Menu11Selected = "Invisible" 
+            Var Menu7Selected = "Enable"
+        EndIf
     EndIf
 
     
-    Var Menu7Selected = "PressForever"
+    ; protein
+    If SpiralOnline = "true" Then 
     
+        If AppFastEnable = "true" Then
+            Var Menu11Selected2 = "Invisible" 
+            Var Menu7Selected2 = "PressForever"
+        Else
+            Var Menu11Selected2 = "PressForever" 
+            Var Menu7Selected2 = "Invisible"
+        EndIf
+    Else
+    
+        If AppFastEnable = "true" Then
+            Var Menu11Selected = "PressForever" 
+            Var Menu7Selected = "Invisible"
+        Else
+            Var Menu11Selected = "Invisible" 
+            Var Menu7Selected = "PressForever"
+        EndIf
+    EndIf
+
+
     Var Timeout = 0
 </EventOpen>
 
@@ -132,8 +192,13 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/page_catalog.xml" 
-	
+    If SpiralOnline = "true" Then
+        Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" 
+    
+    Else
+	   Open "ROOT/taobin_project/xml/page_catalog.xml" 
+	EndIf
+
 </EventClick>
 </Button>
 
@@ -172,6 +237,22 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 99 </X>
+<Y> 395 </Y>
+<State> Menu1Selected2 </State>
+<Filename> Var( DirImage + "/bn_recommend2.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bp_recommend2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+</EventClick>
+</Button>
+
+
+
 
 <Button>
 <X> 243 </X>
@@ -186,6 +267,21 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
 </EventClick>
 </Button>
+<Button>
+<X> 227 </X>
+<Y> 395 </Y>
+<State> Menu2Selected2 </State>
+<Filename> Var( DirImage + "/bn_coffee2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_coffee2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
+</EventClick>
+</Button>
+
+
 
 <Button>
 <X> 394 </X>
@@ -201,6 +297,22 @@
 </EventClick>
 </Button>
 
+<Button>
+<X> 355 </X>
+<Y> 395 </Y>
+<State> Menu3Selected2 </State>
+<Filename> Var( DirImage + "/bn_tea2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_tea2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" 
+</EventClick>
+</Button>
+
+
+
 <Button>
 <X> 545 </X>
 <Y> 395 </Y>
@@ -214,6 +326,21 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 483 </X>
+<Y> 395 </Y>
+<State> Menu4Selected2 </State>
+<Filename> Var( DirImage + "/bn_cho_ca2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cho_ca2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
+</EventClick>
+</Button>
+
+
 
 <Button>
 <X> 696 </X>
@@ -228,6 +355,20 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 611 </X>
+<Y> 395 </Y>
+<State> Menu7Selected2 </State>
+<Filename> Var( DirImage + "/bn_protein2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_protein2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
+</EventClick>
+</Button>
+
 
 <Button>
 <X> 696 </X>
@@ -242,6 +383,19 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 611 </X>
+<Y> 395 </Y>
+<State> Menu11Selected2 </State>
+<Filename> Var( DirImage + "/bn_appfast2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_appfast2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
+</EventClick>
+</Button>
 
 
 <Button>
@@ -257,6 +411,19 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 739 </X>
+<Y> 395 </Y>
+<State> Menu8Selected2 </State>
+<Filename> Var( DirImage + "/bn_cocktail2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cocktail2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
+</EventClick>
+</Button>
 
 
 <Button>
@@ -272,6 +439,33 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 739 </X>
+<Y> 395 </Y>
+<State> Menu6Selected2 </State>
+<Filename> Var( DirImage + "/bn_sodada2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_sodada2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
+</EventClick>
+</Button>
+
+<Button>
+<X> 867 </X>
+<Y> 395 </Y>
+<State> MenuVSelected2 </State>
+<Filename> Var( DirImage + "/bn_vending2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_vending2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" 
+</EventClick>
+</Button>
 
 <EventWebApp>
 
diff --git a/xml/page_catalog_choose_drink8.xml b/xml/page_catalog_choose_drink8.xml
index 2266f21a..f11bba4f 100644
--- a/xml/page_catalog_choose_drink8.xml
+++ b/xml/page_catalog_choose_drink8.xml
@@ -26,28 +26,68 @@
         Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
     EndIf
 
-    ; init default
-    Var Menu1Selected = "Enable"
-    Var Menu3Selected = "Enable"
-    Var Menu4Selected = "Enable"
-    ; 5 fruit
-    Var Menu5Selected = "Invisible"
-    Var Menu6Selected = "Enable"
-    Var Menu7Selected = "Enable"
-    ; 8 cocktail
-    Var Menu8Selected = "Invisible"
-
-    If CocktailShow = "true" Then 
-        Var Menu7Selected = "Invisible"
-        Var Menu8Selected = "Enable"
-    EndIf
+    ; SpiralOnline
+    If SpiralOnline = "true" Then 
+        Var Menu1Selected2 = "Enable"
+        Var Menu2Selected2 = "Enable"
+        Var Menu3Selected2 = "Enable"
+        Var Menu4Selected2 = "Enable"
         
-    If AppFastEnable = "true" Then
-        Var Menu11Selected = "Enable" 
+        Var Menu6Selected2 = "Enable"
+        Var Menu7Selected2 = "Enable"
+        Var MenuVSelected2 = "Enable"
+
+         ; init default
+        Var Menu1Selected = "Invisible"
+        Var Menu2Selected = "Invisible"
+        Var Menu3Selected = "Invisible"
+        Var Menu4Selected = "Invisible"
+        ; 5 fruit
+        Var Menu5Selected = "Invisible"
+        Var Menu6Selected = "Invisible"
         Var Menu7Selected = "Invisible"
-    Else
+        ; 8 cocktail
+        Var Menu8Selected = "Invisible"
+
+            
         Var Menu11Selected = "Invisible" 
+        Var Menu7Selected = "Invisible"
+        ; fuck
+    Else
+        Var Menu1Selected2 = "Invisible"
+        Var Menu2Selected2 = "Invisible"
+        Var Menu3Selected2 = "Invisible"
+        Var Menu4Selected2 = "Invisible"
+        
+        Var Menu6Selected2 = "Invisible"
+        Var Menu7Selected2 = "Invisible"
+        Var MenuVSelected2 = "Invisible"
+        Var Menu11Selected2 = "Invisible"
+
+        ; init default
+        Var Menu1Selected = "Enable"
+        Var Menu2Selected = "Enable"
+        Var Menu3Selected = "Enable"
+        Var Menu4Selected = "Enable"
+        ; 5 fruit
+        Var Menu5Selected = "Invisible"
+        Var Menu6Selected = "Enable"
         Var Menu7Selected = "Enable"
+        ; 8 cocktail
+        Var Menu8Selected = "Invisible"
+
+        If CocktailShow = "true" Then 
+            Var Menu7Selected = "Invisible"
+            Var Menu8Selected = "Enable"
+        EndIf
+            
+        If AppFastEnable = "true" Then
+            Var Menu11Selected = "Enable" 
+            Var Menu7Selected = "Invisible"
+        Else
+            Var Menu11Selected = "Invisible" 
+            Var Menu7Selected = "Enable"
+        EndIf
     EndIf
 
     ; fuck!
@@ -132,8 +172,13 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/page_catalog.xml" 
-	
+    If SpiralOnline = "true" Then
+        Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" 
+    
+    Else
+	   Open "ROOT/taobin_project/xml/page_catalog.xml" 
+	EndIf
+
 </EventClick>
 </Button>
 
@@ -172,6 +217,22 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 99 </X>
+<Y> 395 </Y>
+<State> Menu1Selected2 </State>
+<Filename> Var( DirImage + "/bn_recommend2.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bp_recommend2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+</EventClick>
+</Button>
+
+
+
 
 <Button>
 <X> 243 </X>
@@ -186,6 +247,21 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
 </EventClick>
 </Button>
+<Button>
+<X> 227 </X>
+<Y> 395 </Y>
+<State> Menu2Selected2 </State>
+<Filename> Var( DirImage + "/bn_coffee2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_coffee2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
+</EventClick>
+</Button>
+
+
 
 <Button>
 <X> 394 </X>
@@ -201,6 +277,22 @@
 </EventClick>
 </Button>
 
+<Button>
+<X> 355 </X>
+<Y> 395 </Y>
+<State> Menu3Selected2 </State>
+<Filename> Var( DirImage + "/bn_tea2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_tea2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" 
+</EventClick>
+</Button>
+
+
+
 <Button>
 <X> 545 </X>
 <Y> 395 </Y>
@@ -214,6 +306,21 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 483 </X>
+<Y> 395 </Y>
+<State> Menu4Selected2 </State>
+<Filename> Var( DirImage + "/bn_cho_ca2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cho_ca2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
+</EventClick>
+</Button>
+
+
 
 <Button>
 <X> 696 </X>
@@ -228,6 +335,20 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 611 </X>
+<Y> 395 </Y>
+<State> Menu7Selected2 </State>
+<Filename> Var( DirImage + "/bn_protein2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_protein2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
+</EventClick>
+</Button>
+
 
 <Button>
 <X> 696 </X>
@@ -242,6 +363,19 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 611 </X>
+<Y> 395 </Y>
+<State> Menu11Selected2 </State>
+<Filename> Var( DirImage + "/bn_appfast2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_appfast2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
+</EventClick>
+</Button>
 
 
 <Button>
@@ -257,6 +391,19 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 739 </X>
+<Y> 395 </Y>
+<State> Menu8Selected2 </State>
+<Filename> Var( DirImage + "/bn_cocktail2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cocktail2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
+</EventClick>
+</Button>
 
 
 <Button>
@@ -272,6 +419,33 @@
     Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
 </EventClick>
 </Button>
+<Button>
+<X> 739 </X>
+<Y> 395 </Y>
+<State> Menu6Selected2 </State>
+<Filename> Var( DirImage + "/bn_sodada2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_sodada2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
+</EventClick>
+</Button>
+
+<Button>
+<X> 867 </X>
+<Y> 395 </Y>
+<State> MenuVSelected2 </State>
+<Filename> Var( DirImage + "/bn_vending2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_vending2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" 
+</EventClick>
+</Button>
 
 <EventWebApp>
 
diff --git a/xml/page_catalog_with_vending.xml b/xml/page_catalog_with_vending.xml
index 44c8dc74..6b49801b 100644
--- a/xml/page_catalog_with_vending.xml
+++ b/xml/page_catalog_with_vending.xml
@@ -271,7 +271,7 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	; eng
-	Open "ROOT/taobin_sprial/xml/page_catalog_vending_machine.xml" 
+	Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" 
 	
 </EventClick>
 </Button>