diff --git a/image/page3_en/bn_vending2.png b/image/page3_en/bn_vending2.png
index 37ae8d0b..486d1f45 100644
Binary files a/image/page3_en/bn_vending2.png and b/image/page3_en/bn_vending2.png differ
diff --git a/image/page3_en/bp_vending2.png b/image/page3_en/bp_vending2.png
index 9b1dd550..221a74c3 100644
Binary files a/image/page3_en/bp_vending2.png and b/image/page3_en/bp_vending2.png differ
diff --git a/image/page_drink_disable/bn_hot_espresso_light_pure_beauty.png b/image/page_drink_disable/bn_hot_espresso_light_pure_beauty.png
index b3e27af8..ade11e19 100644
Binary files a/image/page_drink_disable/bn_hot_espresso_light_pure_beauty.png and b/image/page_drink_disable/bn_hot_espresso_light_pure_beauty.png differ
diff --git a/spiral/xml/page_catalog_vending_machine.xml b/spiral/xml/page_catalog_vending_machine.xml
new file mode 100644
index 00000000..7a351c00
--- /dev/null
+++ b/spiral/xml/page_catalog_vending_machine.xml
@@ -0,0 +1,483 @@
+
+
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	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
+
+    ; 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 Menu11Selected2 = "Enable" 
+            Var Menu7Selected2 = "Invisible"
+        Else
+            Var Menu11Selected2 = "Invisible" 
+            Var Menu7Selected2 = "Enable"
+        EndIf
+
+         ; 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"
+        ; 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
+
+
+    ; spiral
+    Var MenuVSelected2 = "PressForever"
+
+
+    Var Timeout = 0
+</EventOpen>
+
+
+
+
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+    If NextPage = "-" Then
+
+    Else
+        If CupOnArm = "true" Then
+            If Timeout > 9 Then
+                Open NextPage
+            EndIf
+        Else
+            If Timeout > 30 Then
+                Open NextPage
+            EndIf
+        EndIf
+    EndIf
+
+    If Timeout > 60 Then
+        If  Seeker = "next" Then 
+            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+        Else
+            Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+        EndIf
+    EndIf
+
+    If BrewCommand = "RefreshAll" Then
+        Var BrewCommand = "-"
+        Open CurrentXMLFileName2
+    EndIf
+
+    Var Timeout = Timeout + 1
+    TimerReset
+</EventTimeout> 
+
+
+;<Image>
+;<X> 0 </X>
+;<Y> 0 </Y>
+;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
+;</Image>
+
+<Video>
+<X> 0 </X>
+<Y> 0 </Y>
+<Width> 1080</Width>
+<Height> 380 </Height>
+<Loop> "true" </Loop>
+<Filename> video_menu_1 </Filename>
+</Video>
+
+; under line
+<Image>
+<X> 0 </X>
+<Y> 494 </Y>
+<Filename> "ROOT/taobin_project/image/page3/tab_line_bottom.png" </Filename>
+</Image>
+
+
+; under line
+<Image>
+<X> 0 </X>
+<Y> 358 </Y>
+<Filename> "ROOT/taobin_project/image/page3/bg1.png" </Filename>
+</Image>
+
+
+; back
+<Button>
+<X> 19 </X>
+<Y> 397 </Y>
+<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    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>
+
+<Button>
+<X> 1000 </X>
+<Y> 415 </Y>
+<Filename> show_btn </Filename>
+<FilenamePress> show_btp </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    ; eng
+    If show_eng = "true" Then 
+        Var show_eng = "false"
+    Else
+        Var show_eng = "true"
+    EndIf
+    
+
+    Open CurrentXMLFileName2
+</EventClick>
+</Button>
+
+;
+
+;
+
+<Button>
+<X> 92 </X>
+<Y> 395 </Y>
+<State> Menu1Selected </State>
+<Filename> Var( DirImage + "/bn_bestseller.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bp_bestseller.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> 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>
+<Y> 395 </Y>
+<State> Menu2Selected </State>
+<Filename> Var( DirImage + "/bn_coffee.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_coffee.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> 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>
+<Y> 395 </Y>
+<State> Menu3Selected </State>
+<Filename> Var( DirImage + "/bn_tea.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_tea.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> 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>
+<State> Menu4Selected </State>
+<Filename> Var( DirImage + "/bn_cho_ca.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cho_ca.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> 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>
+<Y> 395 </Y>
+<State> Menu7Selected </State>
+<Filename> Var( DirImage + "/bn_protein.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_protein.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> 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>
+<Y> 395 </Y>
+<State> Menu11Selected </State>
+<Filename> Var( DirImage + "/bn_appfast.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_appfast.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>
+<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>
+<X> 696 </X>
+<Y> 395 </Y>
+<State> Menu8Selected </State>
+<Filename> Var( DirImage + "/bn_cocktail.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cocktail.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>
+<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>
+<X> 847 </X>
+<Y> 395 </Y>
+<State> Menu6Selected </State>
+<Filename> Var( DirImage + "/bn_sodada.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_sodada.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> 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_project/spiral/xml/page_catalog_vending_machine.xml" 
+</EventClick>
+</Button>
+
+<EventWebApp>
+
+    DEBUGVAR web_ready
+    If web_ready = "true" Then
+        If web_ref = QRCODE99x Then
+
+            Var web_readyOK = web_ready
+            Var web_telnumOK = web_telnum
+            
+            Var web_app_prepar = "true"
+            Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+
+        EndIf
+    Else
+    EndIf
+ 
+</EventWebApp>
+
+
+
+
+
+
+
+</Popup>
diff --git a/spiral/xml/z_android.pml b/spiral/xml/z_android.pml
new file mode 100644
index 00000000..cd5155c6
--- /dev/null
+++ b/spiral/xml/z_android.pml
@@ -0,0 +1 @@
+<?hurr #system=~/Library/Android/sdk/platform-tools/adb push ~/thai02/coffeevending/taobin_project/spiral/xml /mnt/sdcard/coffeevending/taobin_project/spiral/; ?>
diff --git a/xml/menu_catalog.xml b/xml/menu_catalog.xml
index a8537a1d..e5ea13bc 100644
--- a/xml/menu_catalog.xml
+++ b/xml/menu_catalog.xml
@@ -344,7 +344,7 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" 
+    Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" 
 </EventClick>
 </Button>
 
diff --git a/xml/menu_catalog_default_init.xml b/xml/menu_catalog_default_init.xml
index b0035dfd..e30edf84 100644
--- a/xml/menu_catalog_default_init.xml
+++ b/xml/menu_catalog_default_init.xml
@@ -25,6 +25,14 @@
         Var Menu7Selected2 = "Enable"
         Var MenuVSelected2 = "Enable"
 
+        If AppFastEnable = "true" Then
+            Var Menu11Selected2 = "Enable" 
+            Var Menu7Selected2 = "Invisible"
+        Else
+            Var Menu11Selected2 = "Invisible" 
+            Var Menu7Selected2 = "Enable"
+        EndIf
+
          ; init default
         Var Menu1Selected = "Invisible"
         Var Menu2Selected = "Invisible"
diff --git a/xml/page_catalog_choose_drink.xml b/xml/page_catalog_choose_drink.xml
index 78c7a9e5..224662bc 100644
--- a/xml/page_catalog_choose_drink.xml
+++ b/xml/page_catalog_choose_drink.xml
@@ -416,7 +416,7 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" 
+    Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" 
 </EventClick>
 </Button>
 
diff --git a/xml/page_catalog_choose_drink1.xml b/xml/page_catalog_choose_drink1.xml
index 71aab5c1..bf994b28 100644
--- a/xml/page_catalog_choose_drink1.xml
+++ b/xml/page_catalog_choose_drink1.xml
@@ -37,6 +37,14 @@
         Var Menu7Selected2 = "Enable"
         Var MenuVSelected2 = "Enable"
 
+        If AppFastEnable = "true" Then
+            Var Menu11Selected2 = "Enable" 
+            Var Menu7Selected2 = "Invisible"
+        Else
+            Var Menu11Selected2 = "Invisible" 
+            Var Menu7Selected2 = "Enable"
+        EndIf
+
          ; init default
         Var Menu1Selected = "Invisible"
         Var Menu2Selected = "Invisible"
@@ -475,7 +483,7 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" 
+    Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" 
 </EventClick>
 </Button>
 
diff --git a/xml/page_catalog_choose_drink11.xml b/xml/page_catalog_choose_drink11.xml
index 77c68496..d1429e12 100644
--- a/xml/page_catalog_choose_drink11.xml
+++ b/xml/page_catalog_choose_drink11.xml
@@ -39,6 +39,14 @@
         Var Menu7Selected2 = "Enable"
         Var MenuVSelected2 = "Enable"
 
+        If AppFastEnable = "true" Then
+            Var Menu11Selected2 = "Enable" 
+            Var Menu7Selected2 = "Invisible"
+        Else
+            Var Menu11Selected2 = "Invisible" 
+            Var Menu7Selected2 = "Enable"
+        EndIf
+
          ; init default
         Var Menu1Selected = "Invisible"
         Var Menu2Selected = "Invisible"
@@ -463,7 +471,7 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" 
+    Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" 
 </EventClick>
 </Button>
 
diff --git a/xml/page_catalog_choose_drink2.xml b/xml/page_catalog_choose_drink2.xml
index 8094ca48..ae9f7c55 100644
--- a/xml/page_catalog_choose_drink2.xml
+++ b/xml/page_catalog_choose_drink2.xml
@@ -38,6 +38,14 @@
         Var Menu7Selected2 = "Enable"
         Var MenuVSelected2 = "Enable"
 
+        If AppFastEnable = "true" Then
+            Var Menu11Selected2 = "Enable" 
+            Var Menu7Selected2 = "Invisible"
+        Else
+            Var Menu11Selected2 = "Invisible" 
+            Var Menu7Selected2 = "Enable"
+        EndIf
+
          ; init default
         Var Menu1Selected = "Invisible"
         Var Menu2Selected = "Invisible"
@@ -451,7 +459,7 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" 
+    Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" 
 </EventClick>
 </Button>
 
diff --git a/xml/page_catalog_choose_drink3.xml b/xml/page_catalog_choose_drink3.xml
index 7d1c01de..89c6469d 100644
--- a/xml/page_catalog_choose_drink3.xml
+++ b/xml/page_catalog_choose_drink3.xml
@@ -38,6 +38,14 @@
         Var Menu7Selected2 = "Enable"
         Var MenuVSelected2 = "Enable"
 
+        If AppFastEnable = "true" Then
+            Var Menu11Selected2 = "Enable" 
+            Var Menu7Selected2 = "Invisible"
+        Else
+            Var Menu11Selected2 = "Invisible" 
+            Var Menu7Selected2 = "Enable"
+        EndIf
+
          ; init default
         Var Menu1Selected = "Invisible"
         Var Menu2Selected = "Invisible"
@@ -450,7 +458,7 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" 
+    Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" 
 </EventClick>
 </Button>
 
diff --git a/xml/page_catalog_choose_drink4.xml b/xml/page_catalog_choose_drink4.xml
index b06d3e20..eb915768 100644
--- a/xml/page_catalog_choose_drink4.xml
+++ b/xml/page_catalog_choose_drink4.xml
@@ -36,6 +36,14 @@
         Var Menu7Selected2 = "Enable"
         Var MenuVSelected2 = "Enable"
 
+        If AppFastEnable = "true" Then
+            Var Menu11Selected2 = "Enable" 
+            Var Menu7Selected2 = "Invisible"
+        Else
+            Var Menu11Selected2 = "Invisible" 
+            Var Menu7Selected2 = "Enable"
+        EndIf
+
          ; init default
         Var Menu1Selected = "Invisible"
         Var Menu2Selected = "Invisible"
@@ -448,7 +456,7 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" 
+    Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" 
 </EventClick>
 </Button>
 
diff --git a/xml/page_catalog_choose_drink5.xml b/xml/page_catalog_choose_drink5.xml
index 574a6f3b..44e0d060 100644
--- a/xml/page_catalog_choose_drink5.xml
+++ b/xml/page_catalog_choose_drink5.xml
@@ -37,6 +37,14 @@
         Var Menu7Selected2 = "Enable"
         Var MenuVSelected2 = "Enable"
 
+        If AppFastEnable = "true" Then
+            Var Menu11Selected2 = "Enable" 
+            Var Menu7Selected2 = "Invisible"
+        Else
+            Var Menu11Selected2 = "Invisible" 
+            Var Menu7Selected2 = "Enable"
+        EndIf
+
          ; init default
         Var Menu1Selected = "Invisible"
         Var Menu2Selected = "Invisible"
@@ -441,7 +449,7 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" 
+    Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" 
 </EventClick>
 </Button>
 
diff --git a/xml/page_catalog_choose_drink6.xml b/xml/page_catalog_choose_drink6.xml
index 3a8e8b5e..2bbf6f14 100644
--- a/xml/page_catalog_choose_drink6.xml
+++ b/xml/page_catalog_choose_drink6.xml
@@ -37,6 +37,14 @@
         Var Menu7Selected2 = "Enable"
         Var MenuVSelected2 = "Enable"
 
+        If AppFastEnable = "true" Then
+            Var Menu11Selected2 = "Enable" 
+            Var Menu7Selected2 = "Invisible"
+        Else
+            Var Menu11Selected2 = "Invisible" 
+            Var Menu7Selected2 = "Enable"
+        EndIf
+
          ; init default
         Var Menu1Selected = "Invisible"
         Var Menu2Selected = "Invisible"
@@ -447,7 +455,7 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" 
+    Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" 
 </EventClick>
 </Button>
 
diff --git a/xml/page_catalog_choose_drink7.xml b/xml/page_catalog_choose_drink7.xml
index a04fb5b6..42e61904 100644
--- a/xml/page_catalog_choose_drink7.xml
+++ b/xml/page_catalog_choose_drink7.xml
@@ -37,6 +37,14 @@
         Var Menu7Selected2 = "Enable"
         Var MenuVSelected2 = "Enable"
 
+        If AppFastEnable = "true" Then
+            Var Menu11Selected2 = "Enable" 
+            Var Menu7Selected2 = "Invisible"
+        Else
+            Var Menu11Selected2 = "Invisible" 
+            Var Menu7Selected2 = "Enable"
+        EndIf
+
          ; init default
         Var Menu1Selected = "Invisible"
         Var Menu2Selected = "Invisible"
@@ -95,11 +103,11 @@
     If SpiralOnline = "true" Then 
     
         If AppFastEnable = "true" Then
-            Var Menu11Selected2 = "Invisible" 
-            Var Menu7Selected2 = "PressForever"
-        Else
             Var Menu11Selected2 = "PressForever" 
             Var Menu7Selected2 = "Invisible"
+        Else
+            Var Menu11Selected2 = "Invisible" 
+            Var Menu7Selected2 = "PressForever"
         EndIf
     Else
     
@@ -463,7 +471,7 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" 
+    Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" 
 </EventClick>
 </Button>
 
diff --git a/xml/page_catalog_choose_drink8.xml b/xml/page_catalog_choose_drink8.xml
index f11bba4f..17f6105c 100644
--- a/xml/page_catalog_choose_drink8.xml
+++ b/xml/page_catalog_choose_drink8.xml
@@ -37,6 +37,14 @@
         Var Menu7Selected2 = "Enable"
         Var MenuVSelected2 = "Enable"
 
+        If AppFastEnable = "true" Then
+            Var Menu11Selected2 = "Enable" 
+            Var Menu7Selected2 = "Invisible"
+        Else
+            Var Menu11Selected2 = "Invisible" 
+            Var Menu7Selected2 = "Enable"
+        EndIf
+
          ; init default
         Var Menu1Selected = "Invisible"
         Var Menu2Selected = "Invisible"
@@ -443,7 +451,7 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" 
+    Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" 
 </EventClick>
 </Button>
 
diff --git a/xml/page_catalog_with_vending.xml b/xml/page_catalog_with_vending.xml
index 6b49801b..5c082afe 100644
--- a/xml/page_catalog_with_vending.xml
+++ b/xml/page_catalog_with_vending.xml
@@ -271,8 +271,8 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	; eng
-	Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" 
-	
+    Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" 
+
 </EventClick>
 </Button>