diff --git a/image/page2_en/bn_vending_machine.png b/image/page2_en/bn_vending_machine.png
new file mode 100644
index 00000000..04af15b7
Binary files /dev/null and b/image/page2_en/bn_vending_machine.png differ
diff --git a/image/page2_en/bp_vending_machine.png b/image/page2_en/bp_vending_machine.png
new file mode 100644
index 00000000..ee5449ee
Binary files /dev/null and b/image/page2_en/bp_vending_machine.png differ
diff --git a/xml/menu_catalog_default_init.xml b/xml/menu_catalog_default_init.xml
new file mode 100644
index 00000000..b3435b8f
--- /dev/null
+++ b/xml/menu_catalog_default_init.xml
@@ -0,0 +1,45 @@
+    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 
+
+        ; 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
+        
+    If AppFastEnable = "true" Then
+        Var Menu11Selected = "Enable" 
+        Var Menu7Selected = "Invisible"
+    Else
+        Var Menu11Selected = "Invisible" 
+        Var Menu7Selected = "Enable"
+    EndIf
diff --git a/xml/page_catalog_choose_drink.xml b/xml/page_catalog_choose_drink.xml
index 9db31992..523b2d22 100644
--- a/xml/page_catalog_choose_drink.xml
+++ b/xml/page_catalog_choose_drink.xml
@@ -246,8 +246,8 @@
 <X> 696 </X>
 <Y> 395 </Y>
 <State> Menu11Selected </State>
-<Filename> Var( DirImage + "/bn_appfast2.png") </Filename>
-<FilenamePress> Var( DirImage + "/bp_appfast2.png") </FilenamePress>
+<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> 
@@ -271,20 +271,6 @@
 </EventClick>
 </Button>
 
-; obselete
-;<Button>
-;<X> 696 </X>
-;<Y> 395 </Y>
-;<State> Menu5Selected </State>
-;<Filename> Var( DirImage + "/bn_fruit.png") </Filename>
-;<FilenamePress> Var( DirImage + "/bp_fruit.png") </FilenamePress>
-;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-;<Volume> SoundVolume </Volume>
-;<EventClick> 
-;    Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml" 
-;</EventClick>
-;</Button>
-
 
 <Button>
 <X> 847 </X>
diff --git a/xml/page_catalog_choose_drink1.xml b/xml/page_catalog_choose_drink1.xml
index 7891dc6c..4fded8a4 100644
--- a/xml/page_catalog_choose_drink1.xml
+++ b/xml/page_catalog_choose_drink1.xml
@@ -256,8 +256,8 @@
 <X> 696 </X>
 <Y> 395 </Y>
 <State> Menu11Selected </State>
-<Filename> Var( DirImage + "/bn_appfast2.png") </Filename>
-<FilenamePress> Var( DirImage + "/bp_appfast2.png") </FilenamePress>
+<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> 
@@ -281,20 +281,6 @@
 </EventClick>
 </Button>
 
-; obselete
-;<Button>
-;<X> 696 </X>
-;<Y> 395 </Y>
-;<State> Menu5Selected </State>
-;<Filename> Var( DirImage + "/bn_fruit.png") </Filename>
-;<FilenamePress> Var( DirImage + "/bp_fruit.png") </FilenamePress>
-;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-;<Volume> SoundVolume </Volume>
-;<EventClick> 
-;    Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml" 
-;</EventClick>
-;</Button>
-
 
 <Button>
 <X> 847 </X>
diff --git a/xml/page_catalog_choose_drink11.xml b/xml/page_catalog_choose_drink11.xml
index a451b25c..3ca112d4 100644
--- a/xml/page_catalog_choose_drink11.xml
+++ b/xml/page_catalog_choose_drink11.xml
@@ -230,8 +230,8 @@
 <X> 696 </X>
 <Y> 395 </Y>
 <State> Menu11Selected </State>
-<Filename> Var( DirImage + "/bn_appfast2.png") </Filename>
-<FilenamePress> Var( DirImage + "/bp_appfast2.png") </FilenamePress>
+<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> 
@@ -255,20 +255,6 @@
 </EventClick>
 </Button>
 
-; obselete
-;<Button>
-;<X> 696 </X>
-;<Y> 395 </Y>
-;<State> Menu5Selected </State>
-;<Filename> Var( DirImage + "/bn_fruit.png") </Filename>
-;<FilenamePress> Var( DirImage + "/bp_fruit.png") </FilenamePress>
-;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-;<Volume> SoundVolume </Volume>
-;<EventClick> 
-;    Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml" 
-;</EventClick>
-;</Button>
-
 
 <Button>
 <X> 847 </X>
diff --git a/xml/page_catalog_choose_drink2.pml b/xml/page_catalog_choose_drink2.pml
index 5a7587e0..46a1c978 100644
--- a/xml/page_catalog_choose_drink2.pml
+++ b/xml/page_catalog_choose_drink2.pml
@@ -94,46 +94,18 @@
 <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
+    ?>
 
-    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 = "PressForever"
-    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"
-    EndIf
-
-
 
+    ; coffee show
+    Var Menu2Selected = "PressForever"
+   
     
 
     
diff --git a/xml/page_catalog_choose_drink2.xml b/xml/page_catalog_choose_drink2.xml
index c25d1a89..e5d43d65 100644
--- a/xml/page_catalog_choose_drink2.xml
+++ b/xml/page_catalog_choose_drink2.xml
@@ -11,7 +11,7 @@
 <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,20 +27,22 @@
         Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
     EndIf
 
-	Var Menu1Selected = "Enable"
-    Var Menu2Selected = "PressForever"
+    ; 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
-    
+        
     If AppFastEnable = "true" Then
         Var Menu11Selected = "Enable" 
         Var Menu7Selected = "Invisible"
@@ -50,7 +52,14 @@
     EndIf
 
 
+    If CocktailShow = "true" Then 
+        Var Menu7Selected = "Invisible"
+        Var Menu8Selected = "Enable"
+    EndIf
 
+    ; coffee show
+    Var Menu2Selected = "PressForever"
+   
     
 
     
@@ -235,8 +244,8 @@
 <X> 696 </X>
 <Y> 395 </Y>
 <State> Menu11Selected </State>
-<Filename> Var( DirImage + "/bn_appfast2.png") </Filename>
-<FilenamePress> Var( DirImage + "/bp_appfast2.png") </FilenamePress>
+<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> 
@@ -260,20 +269,6 @@
 </EventClick>
 </Button>
 
-; obselete
-;<Button>
-;<X> 696 </X>
-;<Y> 395 </Y>
-;<State> Menu5Selected </State>
-;<Filename> Var( DirImage + "/bn_fruit.png") </Filename>
-;<FilenamePress> Var( DirImage + "/bp_fruit.png") </FilenamePress>
-;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-;<Volume> SoundVolume </Volume>
-;<EventClick> 
-;    Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml" 
-;</EventClick>
-;</Button>
-
 
 <Button>
 <X> 847 </X>
diff --git a/xml/page_catalog_choose_drink3.pml b/xml/page_catalog_choose_drink3.pml
index 3b5647ac..d66ba760 100644
--- a/xml/page_catalog_choose_drink3.pml
+++ b/xml/page_catalog_choose_drink3.pml
@@ -67,46 +67,13 @@
 <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
+    <?hurr
+        #include=menu_catalog_default_init.xml
+    ?>
 
-    Var Menu1Selected = "Enable"
-    Var Menu2Selected = "Enable"
+    ; tea
     Var Menu3Selected = "PressForever"
-    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"
-    EndIf
-
-
     Var Timeout = 0
 </EventOpen>
 
diff --git a/xml/page_catalog_choose_drink3.xml b/xml/page_catalog_choose_drink3.xml
index 6a45b99b..70e32d4c 100644
--- a/xml/page_catalog_choose_drink3.xml
+++ b/xml/page_catalog_choose_drink3.xml
@@ -10,7 +10,8 @@
 <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"
@@ -26,21 +27,22 @@
         Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
     EndIf
 
+    ; init default
     Var Menu1Selected = "Enable"
-    Var Menu2Selected = "Enable"
-    Var Menu3Selected = "PressForever"
+    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"
@@ -50,6 +52,8 @@
     EndIf
 
 
+    ; tea
+    Var Menu3Selected = "PressForever"
     Var Timeout = 0
 </EventOpen>
 
@@ -231,8 +235,8 @@
 <X> 696 </X>
 <Y> 395 </Y>
 <State> Menu11Selected </State>
-<Filename> Var( DirImage + "/bn_appfast2.png") </Filename>
-<FilenamePress> Var( DirImage + "/bp_appfast2.png") </FilenamePress>
+<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> 
@@ -256,20 +260,6 @@
 </EventClick>
 </Button>
 
-; obselete
-;<Button>
-;<X> 696 </X>
-;<Y> 395 </Y>
-;<State> Menu5Selected </State>
-;<Filename> Var( DirImage + "/bn_fruit.png") </Filename>
-;<FilenamePress> Var( DirImage + "/bp_fruit.png") </FilenamePress>
-;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-;<Volume> SoundVolume </Volume>
-;<EventClick> 
-;    Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml" 
-;</EventClick>
-;</Button>
-
 
 <Button>
 <X> 847 </X>
diff --git a/xml/page_catalog_choose_drink4.pml b/xml/page_catalog_choose_drink4.pml
index d8818c57..d623311e 100644
--- a/xml/page_catalog_choose_drink4.pml
+++ b/xml/page_catalog_choose_drink4.pml
@@ -38,46 +38,12 @@
 <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
+    ?>
 
-    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 = "PressForever"
-    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"
-    EndIf
-
     Var Timeout = 0
 </EventOpen>
 
diff --git a/xml/page_catalog_choose_drink4.xml b/xml/page_catalog_choose_drink4.xml
index c03fc021..4f6e59a1 100644
--- a/xml/page_catalog_choose_drink4.xml
+++ b/xml/page_catalog_choose_drink4.xml
@@ -9,8 +9,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"
@@ -26,21 +25,22 @@
         Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
     EndIf
 
-	Var Menu1Selected = "Enable"
-    Var Menu2Selected = "Enable"
+    ; init default
+    Var Menu1Selected = "Enable"
     Var Menu3Selected = "Enable"
-    Var Menu4Selected = "PressForever"
+    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"
@@ -49,6 +49,9 @@
         Var Menu7Selected = "Enable"
     EndIf
 
+
+    Var Menu4Selected = "PressForever"
+    
     Var Timeout = 0
 </EventOpen>
 
@@ -230,8 +233,8 @@
 <X> 696 </X>
 <Y> 395 </Y>
 <State> Menu11Selected </State>
-<Filename> Var( DirImage + "/bn_appfast2.png") </Filename>
-<FilenamePress> Var( DirImage + "/bp_appfast2.png") </FilenamePress>
+<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> 
@@ -255,20 +258,6 @@
 </EventClick>
 </Button>
 
-; obselete
-;<Button>
-;<X> 696 </X>
-;<Y> 395 </Y>
-;<State> Menu5Selected </State>
-;<Filename> Var( DirImage + "/bn_fruit.png") </Filename>
-;<FilenamePress> Var( DirImage + "/bp_fruit.png") </FilenamePress>
-;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-;<Volume> SoundVolume </Volume>
-;<EventClick> 
-;    Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml" 
-;</EventClick>
-;</Button>
-
 
 <Button>
 <X> 847 </X>
diff --git a/xml/page_catalog_choose_drink5.pml b/xml/page_catalog_choose_drink5.pml
index 27c173ce..edd4979a 100644
--- a/xml/page_catalog_choose_drink5.pml
+++ b/xml/page_catalog_choose_drink5.pml
@@ -3,6 +3,7 @@
 ?>
 <?hurr
  
+ # fruite
  
  product_code = []
  product_code.append('12-05-01-0001')
@@ -27,46 +28,9 @@
 <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 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"
-    EndIf
-
+    <?hurr
+        #include=menu_catalog_default_init.xml
+    ?>
 
     Var Timeout = 0
 </EventOpen>
diff --git a/xml/page_catalog_choose_drink5.xml b/xml/page_catalog_choose_drink5.xml
index c2b4d179..f6c703a0 100644
--- a/xml/page_catalog_choose_drink5.xml
+++ b/xml/page_catalog_choose_drink5.xml
@@ -10,7 +10,7 @@
 <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"
@@ -26,22 +26,22 @@
         Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
     EndIf
 
-
-	Var Menu1Selected = "Enable"
-    Var Menu2Selected = "Enable"
+    ; 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
-
+        
     If AppFastEnable = "true" Then
         Var Menu11Selected = "Enable" 
         Var Menu7Selected = "Invisible"
@@ -231,8 +231,8 @@
 <X> 696 </X>
 <Y> 395 </Y>
 <State> Menu11Selected </State>
-<Filename> Var( DirImage + "/bn_appfast2.png") </Filename>
-<FilenamePress> Var( DirImage + "/bp_appfast2.png") </FilenamePress>
+<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> 
@@ -256,20 +256,6 @@
 </EventClick>
 </Button>
 
-; obselete
-;<Button>
-;<X> 696 </X>
-;<Y> 395 </Y>
-;<State> Menu5Selected </State>
-;<Filename> Var( DirImage + "/bn_fruit.png") </Filename>
-;<FilenamePress> Var( DirImage + "/bp_fruit.png") </FilenamePress>
-;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-;<Volume> SoundVolume </Volume>
-;<EventClick> 
-;    Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml" 
-;</EventClick>
-;</Button>
-
 
 <Button>
 <X> 847 </X>
diff --git a/xml/page_catalog_choose_drink6.pml b/xml/page_catalog_choose_drink6.pml
index 5f31c6fe..7a15a881 100644
--- a/xml/page_catalog_choose_drink6.pml
+++ b/xml/page_catalog_choose_drink6.pml
@@ -73,47 +73,12 @@
 <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"
 
-    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
+    <?hurr
+        #include=menu_catalog_default_init.xml
+    ?>
 
-	Var Menu1Selected = "Enable"
-    Var Menu2Selected = "Enable"
-    Var Menu3Selected = "Enable"
-    Var Menu4Selected = "Enable"
-    Var Menu5Selected = "Invisible"
     Var Menu6Selected = "PressForever"
-    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"
-    EndIf
-
-    
     Var Timeout = 0
 </EventOpen>
 
diff --git a/xml/page_catalog_choose_drink6.xml b/xml/page_catalog_choose_drink6.xml
index f40da837..65d2157e 100644
--- a/xml/page_catalog_choose_drink6.xml
+++ b/xml/page_catalog_choose_drink6.xml
@@ -9,8 +9,8 @@
 <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"
@@ -26,21 +26,22 @@
         Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
     EndIf
 
-	Var Menu1Selected = "Enable"
-    Var Menu2Selected = "Enable"
+    ; init default
+    Var Menu1Selected = "Enable"
     Var Menu3Selected = "Enable"
     Var Menu4Selected = "Enable"
+    ; 5 fruit
     Var Menu5Selected = "Invisible"
-    Var Menu6Selected = "PressForever"
+    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"
@@ -49,7 +50,8 @@
         Var Menu7Selected = "Enable"
     EndIf
 
-    
+
+    Var Menu6Selected = "PressForever"
     Var Timeout = 0
 </EventOpen>
 
@@ -230,8 +232,8 @@
 <X> 696 </X>
 <Y> 395 </Y>
 <State> Menu11Selected </State>
-<Filename> Var( DirImage + "/bn_appfast2.png") </Filename>
-<FilenamePress> Var( DirImage + "/bp_appfast2.png") </FilenamePress>
+<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> 
@@ -255,20 +257,6 @@
 </EventClick>
 </Button>
 
-; obselete
-;<Button>
-;<X> 696 </X>
-;<Y> 395 </Y>
-;<State> Menu5Selected </State>
-;<Filename> Var( DirImage + "/bn_fruit.png") </Filename>
-;<FilenamePress> Var( DirImage + "/bp_fruit.png") </FilenamePress>
-;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-;<Volume> SoundVolume </Volume>
-;<EventClick> 
-;    Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml" 
-;</EventClick>
-;</Button>
-
 
 <Button>
 <X> 847 </X>
diff --git a/xml/page_catalog_choose_drink7.pml b/xml/page_catalog_choose_drink7.pml
index d80f84fd..b9c20773 100644
--- a/xml/page_catalog_choose_drink7.pml
+++ b/xml/page_catalog_choose_drink7.pml
@@ -35,43 +35,11 @@
 <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"
+	<?hurr
+        #include=menu_catalog_default_init.xml
+    ?>
+    
     Var Menu7Selected = "PressForever"
-    Var Menu8Selected = "Invisible"
-
-    If CocktailShow = "true" Then 
-        Var Menu7Selected = "Invisible"
-        Var Menu8Selected = "Enable"
-    EndIf
-
-    If AppFastEnable = "true" Then
-        Var Menu11Selected = "PressForever" 
-        Var Menu7Selected = "Invisible"
-    Else
-        Var Menu11Selected = "Invisible" 
-        Var Menu7Selected = "PressForever"
-    EndIf
     
     Var Timeout = 0
 </EventOpen>
diff --git a/xml/page_catalog_choose_drink7.xml b/xml/page_catalog_choose_drink7.xml
index ed305ebb..b5293aa6 100644
--- a/xml/page_catalog_choose_drink7.xml
+++ b/xml/page_catalog_choose_drink7.xml
@@ -10,7 +10,7 @@
 <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"
@@ -26,27 +26,32 @@
         Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
     EndIf
 
+    ; init default
     Var Menu1Selected = "Enable"
-    Var Menu2Selected = "Enable"
     Var Menu3Selected = "Enable"
     Var Menu4Selected = "Enable"
+    ; 5 fruit
     Var Menu5Selected = "Invisible"
     Var Menu6Selected = "Enable"
-    Var Menu7Selected = "PressForever"
+    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 = "PressForever" 
+        Var Menu11Selected = "Enable" 
         Var Menu7Selected = "Invisible"
     Else
         Var Menu11Selected = "Invisible" 
-        Var Menu7Selected = "PressForever"
+        Var Menu7Selected = "Enable"
     EndIf
+
+    
+    Var Menu7Selected = "PressForever"
     
     Var Timeout = 0
 </EventOpen>
@@ -228,8 +233,8 @@
 <X> 696 </X>
 <Y> 395 </Y>
 <State> Menu11Selected </State>
-<Filename> Var( DirImage + "/bn_appfast2.png") </Filename>
-<FilenamePress> Var( DirImage + "/bp_appfast2.png") </FilenamePress>
+<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> 
@@ -253,20 +258,6 @@
 </EventClick>
 </Button>
 
-; obselete
-;<Button>
-;<X> 696 </X>
-;<Y> 395 </Y>
-;<State> Menu5Selected </State>
-;<Filename> Var( DirImage + "/bn_fruit.png") </Filename>
-;<FilenamePress> Var( DirImage + "/bp_fruit.png") </FilenamePress>
-;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-;<Volume> SoundVolume </Volume>
-;<EventClick> 
-;    Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml" 
-;</EventClick>
-;</Button>
-
 
 <Button>
 <X> 847 </X>
diff --git a/xml/page_catalog_choose_drink8.pml b/xml/page_catalog_choose_drink8.pml
index f9a5db81..aba7d42f 100644
--- a/xml/page_catalog_choose_drink8.pml
+++ b/xml/page_catalog_choose_drink8.pml
@@ -32,44 +32,10 @@
 <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 Menu7Selected = "Invisible"
-    Var Menu8Selected = "Invisible"
-  
-
-    If CocktailShow = "true" Then 
-        Var Menu7Selected = "Invisible"
-        Var Menu8Selected = "PressForever"
-    EndIf
-
-    If AppFastEnable = "true" Then
-        Var Menu11Selected = "Enable" 
-        Var Menu7Selected = "Invisible"
-    Else
-        Var Menu11Selected = "Invisible" 
-        Var Menu7Selected = "Enable"
-    EndIf
+	<?hurr
+        #include=menu_catalog_default_init.xml
+    ?>
+    ; fuck!
 
     
     Var Timeout = 0
diff --git a/xml/page_catalog_choose_drink8.xml b/xml/page_catalog_choose_drink8.xml
index 8619be9b..2266f21a 100644
--- a/xml/page_catalog_choose_drink8.xml
+++ b/xml/page_catalog_choose_drink8.xml
@@ -10,7 +10,7 @@
 <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"
@@ -26,21 +26,22 @@
         Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
     EndIf
 
-	 Var Menu1Selected = "Enable"
-    Var Menu2Selected = "Enable"
+    ; init default
+    Var Menu1Selected = "Enable"
     Var Menu3Selected = "Enable"
     Var Menu4Selected = "Enable"
+    ; 5 fruit
     Var Menu5Selected = "Invisible"
     Var Menu6Selected = "Enable"
-    Var Menu7Selected = "Invisible"
+    Var Menu7Selected = "Enable"
+    ; 8 cocktail
     Var Menu8Selected = "Invisible"
-  
 
     If CocktailShow = "true" Then 
         Var Menu7Selected = "Invisible"
-        Var Menu8Selected = "PressForever"
+        Var Menu8Selected = "Enable"
     EndIf
-
+        
     If AppFastEnable = "true" Then
         Var Menu11Selected = "Enable" 
         Var Menu7Selected = "Invisible"
@@ -49,6 +50,8 @@
         Var Menu7Selected = "Enable"
     EndIf
 
+    ; fuck!
+
     
     Var Timeout = 0
 </EventOpen>
@@ -230,8 +233,8 @@
 <X> 696 </X>
 <Y> 395 </Y>
 <State> Menu11Selected </State>
-<Filename> Var( DirImage + "/bn_appfast2.png") </Filename>
-<FilenamePress> Var( DirImage + "/bp_appfast2.png") </FilenamePress>
+<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> 
@@ -255,20 +258,6 @@
 </EventClick>
 </Button>
 
-; obselete
-;<Button>
-;<X> 696 </X>
-;<Y> 395 </Y>
-;<State> Menu5Selected </State>
-;<Filename> Var( DirImage + "/bn_fruit.png") </Filename>
-;<FilenamePress> Var( DirImage + "/bp_fruit.png") </FilenamePress>
-;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-;<Volume> SoundVolume </Volume>
-;<EventClick> 
-;    Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml" 
-;</EventClick>
-;</Button>
-
 
 <Button>
 <X> 847 </X>
diff --git a/xml_main/startup.xml b/xml_main/startup.xml
index b33d1726..092a03f4 100644
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@@ -95,8 +95,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "6.05"
-	Var XMLPageVersionInt = 605
+	Var XMLPageVersion = "6.06"
+	Var XMLPageVersionInt = 606
 </EventOpen>
 
 <Text>