diff --git a/adv/1080x358.mp4 b/adv/1080x358.mp4
deleted file mode 100644
index fdde3c8d..00000000
Binary files a/adv/1080x358.mp4 and /dev/null differ
diff --git a/adv/Home screen 1080_608 px_2.mp4 b/adv/Home screen 1080_608 px_2.mp4
deleted file mode 100644
index 70e43e75..00000000
Binary files a/adv/Home screen 1080_608 px_2.mp4 and /dev/null differ
diff --git a/adv/Menu catagory1080_380 px (1).mp4 b/adv/Menu catagory1080_380 px (1).mp4
deleted file mode 100644
index 6c9cabcd..00000000
Binary files a/adv/Menu catagory1080_380 px (1).mp4 and /dev/null differ
diff --git a/adv/taobin_adv_16.mp4 b/adv/taobin_adv_16.mp4
index eaade225..70e43e75 100644
Binary files a/adv/taobin_adv_16.mp4 and b/adv/taobin_adv_16.mp4 differ
diff --git a/adv/taobin_adv_menu2_16.mp4 b/adv/taobin_adv_menu2_16.mp4
index 255c9d9b..fdde3c8d 100644
Binary files a/adv/taobin_adv_menu2_16.mp4 and b/adv/taobin_adv_menu2_16.mp4 differ
diff --git a/adv/taobin_adv_menu_16.mp4 b/adv/taobin_adv_menu_16.mp4
index c82add26..6c9cabcd 100644
Binary files a/adv/taobin_adv_menu_16.mp4 and b/adv/taobin_adv_menu_16.mp4 differ
diff --git a/image/topping2/bg_top_oreo.png b/image/topping2/bg_top_oreo.png
index 7e11f73d..97e25f64 100644
Binary files a/image/topping2/bg_top_oreo.png and b/image/topping2/bg_top_oreo.png differ
diff --git a/image/topping2_en/bg_top.png b/image/topping2_en/bg_top.png
index 62d50a3a..b3a5c633 100644
Binary files a/image/topping2_en/bg_top.png and b/image/topping2_en/bg_top.png differ
diff --git a/xml/menu_catalog_new.xml b/xml/menu_catalog_new.xml
index f23cd9de..2bc86f1e 100644
--- a/xml/menu_catalog_new.xml
+++ b/xml/menu_catalog_new.xml
@@ -1,4 +1,6 @@
 
+; notice enable heathy menu
+
 <Image>
 <X> 0 </X>
 <Y> 380 </Y>
@@ -153,39 +155,34 @@
 </Button>
 
 ;
-
+<ListView1>
+    <Row1>
+        <X> 92 </X>
+        <Y> 395 </Y>
 <Button>
-<X> 92 </X>
-<Y> 395 </Y>
 <State> Menu1Selected </State>
-<Filename> Var( DirImage + "/bn_bestseller.png" )</Filename>
-<FilenamePress> Var( DirImage + "/bp_bestseller.png") </FilenamePress>
+<Filename> Var( DirImageAlter + "/bn_bestseller.png" )</Filename>
+<FilenamePress> Var( DirImageAlter + "/bp_bestseller.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-     If new_layout = "true" Then
-        Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
-    Else
-        Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
-    EndIf
+    Open "ROOT/taobin_project/xml/page_catalog_group_recommend.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>
+<Filename> Var( DirImageAlter + "/bn_recommend2.png" )</Filename>
+<FilenamePress> Var( DirImageAlter + "/bp_recommend2.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    If new_layout = "true" Then
-        Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
-    Else
-        Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
-    EndIf
+    Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+
 </EventClick>
 </Button>
 
@@ -196,45 +193,23 @@
 <X> 243 </X>
 <Y> 395 </Y>
 <State> Menu2Selected </State>
-<Filename> Var( DirImage + "/bn_coffee.png") </Filename>
-<FilenamePress> Var( DirImage + "/bp_coffee.png") </FilenamePress>
+<Filename> Var( DirImageAlter + "/bn_coffee.png") </Filename>
+<FilenamePress> Var( DirImageAlter + "/bp_coffee.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    If new_layout = "true" Then
-        Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml" 
-    Else
-        Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml" 
-    EndIf
+    Open "ROOT/taobin_project/xml/page_catalog_group_coffee.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 = "-"
-    If new_layout = "true" Then
-        Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml" 
-    Else
-        Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml" 
-    EndIf
-</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>
+<Filename> Var( DirImageAlter + "/bn_tea.png") </Filename>
+<FilenamePress> Var( DirImageAlter + "/bp_tea.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -251,8 +226,8 @@
 <X> 355 </X>
 <Y> 395 </Y>
 <State> Menu3Selected2 </State>
-<Filename> Var( DirImage + "/bn_tea2.png") </Filename>
-<FilenamePress> Var( DirImage + "/bp_tea2.png") </FilenamePress>
+<Filename> Var( DirImageAlter + "/bn_tea2.png") </Filename>
+<FilenamePress> Var( DirImageAlter + "/bp_tea2.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -273,8 +248,8 @@
 <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>
+<Filename> Var( DirImageAlter + "/bn_cho_ca.png") </Filename>
+<FilenamePress> Var( DirImageAlter + "/bp_cho_ca.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -291,8 +266,8 @@
 <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>
+<Filename> Var( DirImageAlter + "/bn_cho_ca2.png") </Filename>
+<FilenamePress> Var( DirImageAlter + "/bp_cho_ca2.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -312,8 +287,8 @@
 <X> 696 </X>
 <Y> 395 </Y>
 <State> Menu7Selected </State>
-<Filename> Var( DirImage + "/bn_protein.png") </Filename>
-<FilenamePress> Var( DirImage + "/bp_protein.png") </FilenamePress>
+<Filename> Var( DirImageAlter + "/bn_protein.png") </Filename>
+<FilenamePress> Var( DirImageAlter + "/bp_protein.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -329,8 +304,8 @@
 <X> 611 </X>
 <Y> 395 </Y>
 <State> Menu7Selected2 </State>
-<Filename> Var( DirImage + "/bn_protein2.png") </Filename>
-<FilenamePress> Var( DirImage + "/bp_protein2.png") </FilenamePress>
+<Filename> Var( DirImageAlter + "/bn_protein2.png") </Filename>
+<FilenamePress> Var( DirImageAlter + "/bp_protein2.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -348,25 +323,8 @@
 <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 = "-"
-    If new_layout = "true" Then
-        Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml" 
-    Else
-        Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
-    EndIf
-</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>
+<Filename> Var( DirImageAlter + "/bn_appfast.png") </Filename>
+<FilenamePress> Var( DirImageAlter + "/bp_appfast.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -385,8 +343,8 @@
 <X> 696 </X>
 <Y> 395 </Y>
 <State> Menu21Selected </State>
-<Filename> Var( DirImage + "/bn_forkid.png") </Filename>
-<FilenamePress> Var( DirImage + "/bp_forkid.png") </FilenamePress>
+<Filename> Var( DirImageAlter + "/bn_forkid.png") </Filename>
+<FilenamePress> Var( DirImageAlter + "/bp_forkid.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -394,27 +352,13 @@
     Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml" 
 </EventClick>
 </Button>
-<Button>
-<X> 611 </X>
-<Y> 395 </Y>
-<State> Menu21Selected2 </State>
-<Filename> Var( DirImage + "/bn_forkid2.png") </Filename>
-<FilenamePress> Var( DirImage + "/bp_forkid2.png") </FilenamePress>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-    Var NextPage = "-"
-    Open "ROOT/taobin_project/xml/page_catalog_group_forkid.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>
+<Filename> Var( DirImageAlter + "/bn_cocktail.png") </Filename>
+<FilenamePress> Var( DirImageAlter + "/bp_cocktail.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -422,44 +366,13 @@
     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 = "-"
-    If new_layout = "true" Then
-        Open "ROOT/taobin_project/xml/page_catalog_group_other.xml" 
-    Else
-        Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
-    EndIf
-</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>
+<Filename> Var( DirImageAlter + "/bn_sodada.png") </Filename>
+<FilenamePress> Var( DirImageAlter + "/bp_sodada.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -476,8 +389,8 @@
 <X> 867 </X>
 <Y> 395 </Y>
 <State> MenuVSelected2 </State>
-<Filename> Var( DirImage + "/bn_vending2.png") </Filename>
-<FilenamePress> Var( DirImage + "/bp_vending2.png") </FilenamePress>
+<Filename> Var( DirImageAlter + "/bn_vending2.png") </Filename>
+<FilenamePress> Var( DirImageAlter + "/bp_vending2.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
diff --git a/xml/menu_catalog_new_menu.xml b/xml/menu_catalog_new_menu.xml
index b5ff82b3..06beafe7 100644
--- a/xml/menu_catalog_new_menu.xml
+++ b/xml/menu_catalog_new_menu.xml
@@ -1,6 +1,9 @@
 
     If show_eng = "true" Then 
         Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
+		Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+
     Else
         Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
+        Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
     EndIf
\ No newline at end of file
diff --git a/xml/page_catalog_group_appfast.skt b/xml/page_catalog_group_appfast.skt
index 341a5420..f86c5d0f 100644
--- a/xml/page_catalog_group_appfast.skt
+++ b/xml/page_catalog_group_appfast.skt
@@ -52,13 +52,7 @@
 
 
 <?hurr 
-    echo $param
-    if $param == "new-layout":
-        echo "using new layout hurr"
-        #include=menu_catalog.xml
-    else:
-        #include=menu_catalog.xml
-
+    #include=menu_catalog.xml
 ?>
 
 
diff --git a/xml/page_catalog_group_other.skt b/xml/page_catalog_group_other.skt
index e4925a19..794841f3 100644
--- a/xml/page_catalog_group_other.skt
+++ b/xml/page_catalog_group_other.skt
@@ -1,5 +1,6 @@
 <?hurr 
     #include=menu_head.py 
+    echo param
 ?>
 
 <Popup>
@@ -34,7 +35,7 @@
 
 
 <?hurr 
-    #include=menu_catalog.xml
+    #include=menu_catalog_inc.py
 ?>
 
 
diff --git a/xml/page_catalog_group_other.xml b/xml/page_catalog_group_other.xml
index bbb1783d..77311d38 100644
--- a/xml/page_catalog_group_other.xml
+++ b/xml/page_catalog_group_other.xml
@@ -160,512 +160,6 @@
 
 
 
-<Image>
-<X> 0 </X>
-<Y> 380 </Y>
-<Width> 1080 </Width>
-<Height> 1540 </Height>
-<Color> "0xeae6e1" </Color>
-</Image>
-
-
-
-<Timeout> 1000 </Timeout>
-<EventTimeout> 
-    ;DEBUGVAR ICE_PROCESS_STATUS
-    
-    If ICE_PROCESS_STATUS = 2 Then
-        Var ice_tab_process_show = "Enable"
-        Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
-    Else
-        Var ice_tab_process_show = "Invisible"
-    EndIf
-
-
-    If NextPage = "-" Then
-
-    Else
-            If CupOnArm = "true" Then
-                If Timeout > 9 Then
-                    SAVELOG "COA9"
-                    Open NextPage
-                EndIf
-            Else
-                If Timeout > 30 Then
-                    SAVELOG "COA30"
-                    Open NextPage
-                EndIf
-            EndIf
-    EndIf
-
-    If Timeout > 60 Then
-        SAVELOG "Timeout"
-        If  Seeker = "next" Then 
-            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
-        Else
-            SAVELOG "Back"
-            Open "ROOT/taobin_project/xml/page_back_to_main.xml"
-        EndIf
-    EndIf
-
-    If BrewCommand = "RefreshAll" Then
-        Var BrewCommand = "-"
-        Open CurrentXMLFileName2
-    EndIf
-
-    If Seeker = "curr" Then
-        If DoorCupPosition = "bottom" Then
-            ; It normal 
-            Var EmergencyStop = "false"
-        Else
-            Var EmergencyStop = "true"
-            
-            ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" 
-
-        EndIf
-    EndIf
-
-    If IgnoreNetCore = "true" Then
-
-    Else
-        ;stop_now
-        If NETCORE_LOST_CNT > 120 Then
-            Var stop_now = "true"
-            Var MachineErrorDetailAll = "???"
-            SAVELOG "NETCORE_LOST_CNT"
-            
-            Open "ROOT/taobin_project/xml/page_back_to_error.xml"
-        EndIf
-    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 = "-"
-     If new_layout = "true" Then
-        Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
-    Else
-        Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
-    EndIf
-</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 = "-"
-    If new_layout = "true" Then
-        Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
-    Else
-        Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
-    EndIf
-</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 = "-"
-    If new_layout = "true" Then
-        Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml" 
-    Else
-        Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml" 
-    EndIf
-</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 = "-"
-    If new_layout = "true" Then
-        Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml" 
-    Else
-        Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml" 
-    EndIf
-</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 = "-"
-    If new_layout = "true" Then
-        Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml" 
-    Else
-        Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" 
-    EndIf
-</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 = "-"
-    
-    If new_layout = "true" Then
-        Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml" 
-    Else
-        Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" 
-    EndIf
-
-</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 = "-"
-    If new_layout = "true" Then
-        Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml" 
-    Else
-        Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
-
-    EndIf
-</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 = "-"
-    If new_layout = "true" Then
-        Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml" 
-    Else
-        Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
-
-    EndIf
-</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 = "-"
-    If new_layout = "true" Then
-        Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml" 
-    Else
-        Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
-    EndIf
-</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 = "-"
-    If new_layout = "true" Then
-        Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml" 
-    Else
-        Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
-    EndIf
-</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 = "-"
-    If new_layout = "true" Then
-        Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml" 
-    Else
-        Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
-    EndIf
-</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 = "-"
-    If new_layout = "true" Then
-        Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml" 
-    Else
-        Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
-    EndIf
-</EventClick>
-</Button>
-
-
-
-<Button>
-<X> 696 </X>
-<Y> 395 </Y>
-<State> Menu21Selected </State>
-<Filename> Var( DirImage + "/bn_forkid.png") </Filename>
-<FilenamePress> Var( DirImage + "/bp_forkid.png") </FilenamePress>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-    Var NextPage = "-"
-    Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml" 
-</EventClick>
-</Button>
-<Button>
-<X> 611 </X>
-<Y> 395 </Y>
-<State> Menu21Selected2 </State>
-<Filename> Var( DirImage + "/bn_forkid2.png") </Filename>
-<FilenamePress> Var( DirImage + "/bp_forkid2.png") </FilenamePress>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-    Var NextPage = "-"
-    Open "ROOT/taobin_project/xml/page_catalog_group_forkid.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 = "-"
-    If new_layout = "true" Then
-        Open "ROOT/taobin_project/xml/page_catalog_group_other.xml" 
-    Else
-        Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
-    EndIf
-</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 = "-"
-    If new_layout = "true" Then
-        Open "ROOT/taobin_project/xml/page_catalog_group_other.xml" 
-    Else
-        Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
-    EndIf
-</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>
-
-
 
 
 
diff --git a/xml/page_topping_select5.xml b/xml/page_topping_select5.xml
index 18dfb0d5..6c4e8374 100644
--- a/xml/page_topping_select5.xml
+++ b/xml/page_topping_select5.xml
@@ -68,10 +68,19 @@
 	
 	Var BGSugar = "Invisible"
 	Var ShotCoffeeBG = "Invisible"
-	
-	Var showShotEnable = "Enable"
-	Var ShotCoffeePremium = "Enable"
-	Var showOreoAddEnable = "Enable"
+
+	Var showShotEnable = "Invisible"
+	Var ShotCoffeePremium = "Invisible"
+	Var showOreoAddEnable = "Invisible"
+
+	Var BGSugarHotHealthy = "Invisible"
+	Var BGSugarColdHealthy = "Invisible"
+
+	Var showText8 = "Invisible"
+
+	;Var showShotEnable = "Enable"
+	;Var ShotCoffeePremium = "Enable"
+	;Var showOreoAddEnable = "Enable"
 
 
 	; On open
@@ -467,6 +476,8 @@
 	DEBUGVAR TOPPING2
 	DEBUGVAR TOPPING3
 	DEBUGVAR TOPPING4
+	DEBUGVAR TOPPING5
+	DEBUGVAR TOPPING6
 	DEBUGVAR toppingID1index1
 	DEBUGVAR toppingID1index2
 	DEBUGVAR toppingID1index3
@@ -498,6 +509,7 @@
 
 	DEBUGVAR toppingID2price2
 	DEBUGVAR toppingID3price2
+	DEBUGVAR toppingID6price2
 
 	DEBUGVAR BrewParam
 	DEBUGVAR UserSeletedSugar
@@ -507,6 +519,17 @@
 	Else
 
 
+		If TOPPING6 = "Topping-Volcano" Then
+			If blend_button_state = "PressForever" Then
+
+				Var showOreoAddEnable = "Enable"
+				Var showText8 = "Invisible" 
+			Else
+				Var showOreoAddEnable = "Disable"
+				Var showText8 = "Enable"
+
+			EndIf
+		EndIf
 		
 
 
@@ -884,7 +907,7 @@
 			If TOPPING2 = "shot coffee 1003" Then
 		
 				Var ShotCoffeePremium = "Enable"
-				Var showShotEnable = "Enable"
+				Var showShotEnable = "Invisible"
 
 				Var text_price_topping = "(+฿" + toppingID2price2
 				DEBUGVAR TOPPING2
@@ -893,7 +916,7 @@
 		If TOPPING2 = "shot coffee 1007" Then
 		
 				Var ShotCoffeePremium = "Enable"
-				Var showShotEnable = "Enable"
+				Var showShotEnable = "Invisible"
 
 				Var text_price_topping = "(+฿" + toppingID2price2
 				DEBUGVAR TOPPING2
@@ -902,7 +925,7 @@
 			If TOPPING2 = "shot coffee 1008" Then
 		
 				Var ShotCoffeePremium = "Enable"
-				Var showShotEnable = "Enable"
+				Var showShotEnable = "Invisible"
 
 				Var text_price_topping = "(+฿" + toppingID2price2
 				DEBUGVAR TOPPING2
@@ -912,7 +935,7 @@
 			If TOPPING2 = "add-show-1009" Then
 		
 				Var ShotCoffeePremium = "Enable"
-				Var showShotEnable = "Enable"
+				Var showShotEnable = "Invisible"
 
 				Var text_price_topping = "(+฿" + toppingID2price2
 				DEBUGVAR TOPPING2
@@ -921,7 +944,7 @@
 			If TOPPING2 = "add-show-1101" Then
 		
 				Var ShotCoffeePremium = "Enable"
-				Var showShotEnable = "Enable"
+				Var showShotEnable = "Invisible"
 
 				Var text_price_topping = "(+฿" + toppingID2price2
 				DEBUGVAR TOPPING2
@@ -931,7 +954,7 @@
 			If TOPPING2 = "add-show-1102" Then
 		
 				Var ShotCoffeePremium = "Enable"
-				Var showShotEnable = "Enable"
+				Var showShotEnable = "Invisible"
 
 				Var text_price_topping = "(+฿" + toppingID2price2
 				DEBUGVAR TOPPING2
@@ -941,7 +964,7 @@
 			If TOPPING2 = "add-show-1103" Then
 		
 				Var ShotCoffeePremium = "Enable"
-				Var showShotEnable = "Enable"
+				Var showShotEnable = "Invisible"
 
 				Var text_price_topping = "(+฿" + toppingID2price2
 				DEBUGVAR TOPPING2
@@ -950,7 +973,7 @@
 			If TOPPING2 = "add-show-1104" Then
 		
 				Var ShotCoffeePremium = "Enable"
-				Var showShotEnable = "Enable"
+				Var showShotEnable = "Invisible"
 
 				Var text_price_topping = "(+฿" + toppingID2price2
 				DEBUGVAR TOPPING2
@@ -960,7 +983,7 @@
 			If TOPPING2 = "add-show-1105" Then
 		
 				Var ShotCoffeePremium = "Enable"
-				Var showShotEnable = "Enable"
+				Var showShotEnable = "Invisible"
 
 				Var text_price_topping = "(+฿" + toppingID2price2
 				DEBUGVAR TOPPING2
@@ -997,6 +1020,9 @@
 			Var PriceShowValue = "Free"
 		EndIf
 
+		DEBUGVAR showShotEnable
+		DEBUGVAR showOreoAddEnable
+		DEBUGVAR ShotCoffeePremium
 		SAVELOG toppingID2price1
 		SAVELOG toppingID2price2
 		SAVELOG toppingID2price3
@@ -1662,6 +1688,441 @@
 </Button>
 ;- END topping1
 </Block>
+
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;- Begin topping2
+<Block>
+
+<Width> 988 </Width>
+<Height> 156 </Height>
+<MarginTop> 20 </MarginTop>
+<State> BGSugarHotHealthy </State> 
+; sugar layout
+<Image>
+<State> BGSugarHotHealthy </State>
+<Filename> Var( DirImage + "/bg_sugar_bank_button.png" )</Filename>
+</Image>
+
+
+;
+
+; sugar1
+<Button>
+<X> 149 </X>
+<Y> 77 </Y>
+<State> SugarState1 </State>
+<Filename> Var( DirImage + "/bn_hot_sugar1.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/bp_hot_sugar1.png" ) </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	DEBUGVAR SugarState1
+	SAVELOG "SUGAR1"
+
+	If SelectDrinkType = 0 Then
+		SAVELOG "drink type popup"
+		Var high_light_drink_type = "Enable"
+	Else
+
+		If ShiftSugarStep = 1 Then
+				
+			Var SugarState1 = "PressForever"
+			Var SugarState2 = "Enable"
+			Var SugarState3 = "Enable"
+			Var SugarState4 = "Enable"
+			Var SugarState5 = "Enable"
+			Var topping1 = toppingID1index1
+		EndIf
+
+		Var UserSeletedSugar = 1
+
+	EndIf
+
+	DEBUGVAR topping1
+	Refresh
+</EventClick>
+</Button>
+
+; sugar2
+<Button>
+<X> 352 </X>
+<Y> 77 </Y>
+<State> SugarState2 </State>
+<Filename> Var( DirImage + "/bn_hot_sugar2.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/bp_hot_sugar2.png" ) </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	SAVELOG "SUGAR2"
+	DEBUGVAR SelectDrinkType
+	DEBUGVAR UserSeletedSugar
+
+	If SelectDrinkType = 0 Then
+		SAVELOG "drink type popup"
+		Var high_light_drink_type = "Enable"
+	Else
+
+		If ShiftSugarStep = 1 Then
+			Var SugarState1 = "Enable"
+			Var SugarState2 = "PressForever"
+			Var SugarState3 = "Enable"
+			Var SugarState4 = "Enable"
+			Var SugarState5 = "Enable"
+			Var topping1 = toppingID1index2
+		EndIf
+
+		If ShiftSugarStep = 2 Then
+
+			Var SugarState2 = "PressForever"
+			Var SugarState3 = "Enable"
+			Var SugarState4 = "Enable"
+			Var SugarState5 = "Enable"
+			Var topping1 = toppingID1index1
+		EndIf
+
+		Var UserSeletedSugar = 1
+	EndIf
+
+	DEBUGVAR topping1
+	Refresh
+</EventClick>
+</Button>
+
+
+; sugar3
+<Button>
+<X> 555 </X>
+<Y> 77 </Y>
+<State> SugarState3 </State>
+<Filename> Var( DirImage + "/bn_hot_sugar3.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/bp_hot_sugar3.png" ) </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	SAVELOG "SUGAR3"
+
+	If SelectDrinkType = 0 Then
+		SAVELOG "drink type popup"
+		Var high_light_drink_type = "Enable"
+	Else
+
+		If ShiftSugarStep = 1 Then
+			Var SugarState1 = "Enable"
+			Var SugarState2 = "Enable"
+			Var SugarState3 = "PressForever"
+			Var SugarState4 = "Enable"
+			Var SugarState5 = "Enable"
+			Var topping1 = toppingID1index3
+		EndIf
+
+		If ShiftSugarStep = 2 Then
+			Var SugarState2 = "Enable"
+			Var SugarState3 = "PressForever"
+			Var SugarState4 = "Enable"
+			Var SugarState5 = "Enable"
+			Var topping1 = toppingID1index2
+		EndIf
+
+		If ShiftSugarStep = 3 Then
+
+			Var SugarState3 = "PressForever"
+			Var SugarState4 = "Enable"
+			Var SugarState5 = "Enable"
+			Var topping1 = toppingID1index1
+
+		EndIf
+
+		Var UserSeletedSugar = 1
+	EndIf
+
+	DEBUGVAR topping1
+	Refresh
+</EventClick>
+</Button>
+
+; sugar4
+<Button>
+<X> 758 </X>
+<Y> 77 </Y>
+<State> SugarState4 </State>
+<Filename> Var( DirImage + "/bn_hot_sugar4.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/bp_hot_sugar4.png" ) </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	SAVELOG "SUGAR4"
+
+	If SelectDrinkType = 0 Then
+		SAVELOG "drink type popup"
+		Var high_light_drink_type = "Enable"
+	Else
+
+		If ShiftSugarStep = 1 Then
+			Var SugarState1 = "Enable"
+			Var SugarState2 = "Enable"
+			Var SugarState3 = "Enable"
+			Var SugarState4 = "PressForever"
+			Var SugarState5 = "Enable"
+			Var topping1 = toppingID1index4
+		EndIf
+
+		If ShiftSugarStep = 2 Then
+			Var SugarState2 = "Enable"
+			Var SugarState3 = "Enable"
+			Var SugarState4 = "PressForever"
+			Var SugarState5 = "Enable"
+			Var topping1 = toppingID1index3
+		EndIf
+
+		If ShiftSugarStep = 3 Then
+
+			Var SugarState3 = "Enable"
+			Var SugarState4 = "PressForever"
+			Var SugarState5 = "Enable"
+			Var topping1 = toppingID1index2
+		EndIf
+
+		Var UserSeletedSugar = 1
+	EndIf
+
+	DEBUGVAR topping1
+	Refresh
+</EventClick>
+</Button>
+
+;- END topping2
+</Block>
+
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;- Begin topping3
+<Block>
+
+<Width> 988 </Width>
+<Height> 156 </Height>
+<MarginTop> 20 </MarginTop>
+<State> BGSugarColdHealthy </State> 
+; sugar layout
+<Image>
+<State> BGSugarColdHealthy </State>
+<Filename> Var( DirImage + "/bg_sugar_bank_button.png" )</Filename>
+</Image>
+
+
+;
+
+; sugar1
+<Button>
+<X> 149 </X>
+<Y> 77 </Y>
+<State> SugarState1 </State>
+<Filename> Var( DirImage + "/bn_cold_sugar1.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/bp_cold_sugar1.png" ) </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	DEBUGVAR SugarState1
+	SAVELOG "SUGAR1"
+
+	If SelectDrinkType = 0 Then
+		SAVELOG "drink type popup"
+		Var high_light_drink_type = "Enable"
+	Else
+
+		If ShiftSugarStep = 1 Then
+				
+			Var SugarState1 = "PressForever"
+			Var SugarState2 = "Enable"
+			Var SugarState3 = "Enable"
+			Var SugarState4 = "Enable"
+			Var SugarState5 = "Enable"
+			Var topping1 = toppingID1index1
+		EndIf
+
+		Var UserSeletedSugar = 1
+
+	EndIf
+
+	DEBUGVAR topping1
+	Refresh
+</EventClick>
+</Button>
+
+; sugar2
+<Button>
+<X> 352 </X>
+<Y> 77 </Y>
+<State> SugarState2 </State>
+<Filename> Var( DirImage + "/bn_cold_sugar2.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/bp_cold_sugar2.png" ) </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	SAVELOG "SUGAR2"
+	DEBUGVAR SelectDrinkType
+	DEBUGVAR UserSeletedSugar
+
+	If SelectDrinkType = 0 Then
+		SAVELOG "drink type popup"
+		Var high_light_drink_type = "Enable"
+	Else
+
+		If ShiftSugarStep = 1 Then
+			Var SugarState1 = "Enable"
+			Var SugarState2 = "PressForever"
+			Var SugarState3 = "Enable"
+			Var SugarState4 = "Enable"
+			Var SugarState5 = "Enable"
+			Var topping1 = toppingID1index2
+		EndIf
+
+		If ShiftSugarStep = 2 Then
+
+			Var SugarState2 = "PressForever"
+			Var SugarState3 = "Enable"
+			Var SugarState4 = "Enable"
+			Var SugarState5 = "Enable"
+			Var topping1 = toppingID1index1
+		EndIf
+
+		Var UserSeletedSugar = 1
+	EndIf
+
+	DEBUGVAR topping1
+	Refresh
+</EventClick>
+</Button>
+
+
+; sugar3
+<Button>
+<X> 555 </X>
+<Y> 77 </Y>
+<State> SugarState3 </State>
+<Filename> Var( DirImage + "/bn_cold_sugar3.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/bp_cold_sugar3.png" ) </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	SAVELOG "SUGAR3"
+
+	If SelectDrinkType = 0 Then
+		SAVELOG "drink type popup"
+		Var high_light_drink_type = "Enable"
+	Else
+
+		If ShiftSugarStep = 1 Then
+			Var SugarState1 = "Enable"
+			Var SugarState2 = "Enable"
+			Var SugarState3 = "PressForever"
+			Var SugarState4 = "Enable"
+			Var SugarState5 = "Enable"
+			Var topping1 = toppingID1index3
+		EndIf
+
+		If ShiftSugarStep = 2 Then
+			Var SugarState2 = "Enable"
+			Var SugarState3 = "PressForever"
+			Var SugarState4 = "Enable"
+			Var SugarState5 = "Enable"
+			Var topping1 = toppingID1index2
+		EndIf
+
+		If ShiftSugarStep = 3 Then
+
+			Var SugarState3 = "PressForever"
+			Var SugarState4 = "Enable"
+			Var SugarState5 = "Enable"
+			Var topping1 = toppingID1index1
+
+		EndIf
+
+		Var UserSeletedSugar = 1
+	EndIf
+
+	DEBUGVAR topping1
+	Refresh
+</EventClick>
+</Button>
+
+; sugar4
+<Button>
+<X> 758 </X>
+<Y> 77 </Y>
+<State> SugarState4 </State>
+<Filename> Var( DirImage + "/bn_cold_sugar4.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/bp_cold_sugar4.png" ) </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	SAVELOG "SUGAR4"
+
+	If SelectDrinkType = 0 Then
+		SAVELOG "drink type popup"
+		Var high_light_drink_type = "Enable"
+	Else
+
+		If ShiftSugarStep = 1 Then
+			Var SugarState1 = "Enable"
+			Var SugarState2 = "Enable"
+			Var SugarState3 = "Enable"
+			Var SugarState4 = "PressForever"
+			Var SugarState5 = "Enable"
+			Var topping1 = toppingID1index4
+		EndIf
+
+		If ShiftSugarStep = 2 Then
+			Var SugarState2 = "Enable"
+			Var SugarState3 = "Enable"
+			Var SugarState4 = "PressForever"
+			Var SugarState5 = "Enable"
+			Var topping1 = toppingID1index3
+		EndIf
+
+		If ShiftSugarStep = 3 Then
+
+			Var SugarState3 = "Enable"
+			Var SugarState4 = "PressForever"
+			Var SugarState5 = "Enable"
+			Var topping1 = toppingID1index2
+		EndIf
+
+		Var UserSeletedSugar = 1
+	EndIf
+
+	DEBUGVAR topping1
+	Refresh
+</EventClick>
+</Button>
+
+;- END topping2
+</Block>
+
 ;
 ;
 ;
@@ -1675,7 +2136,7 @@
 ;-END
 ;
 ;
-;
+; Extra topping.
 ;
 ;
 ;
@@ -1707,18 +2168,18 @@
 <Row1>
 <Width> 986 </Width>
 <Height> "auto" </Height>	
-<State> "Enable" </State>
+<State> ShotCoffeePremium </State>
 ; 
 <Image>
 	<X> 0 </X>
 	<Y> 0 </Y>
-	<Filename> "ROOT/taobin_project/image/topping2/bg_top_b3shot.png" </Filename>
+	<Filename> Var( DirImage + "/bg_top_b3shot.png") </Filename>
 </Image>
 
 <Button>
 <X> 40 </X>
 <Y> 5 </Y>
-<State> showShotEnable </State>
+<State> ShotCoffeePremium </State>
 <Mode> "No" </Mode>
 <Filename> "ROOT/taobin_project/image/topping2/bn_add_shot2.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/topping2/bp_add_shot2.png" </FilenamePress>
@@ -1727,14 +2188,14 @@
 <EventClick> 
 	SAVELOG "premium shot press"
 	
-	If showShotEnable = "Press" Then
-		Var showShotEnable = "Enable"
+	If ShotCoffeePremium = "Press" Then
+		Var ShotCoffeePremium = "Enable"
 		Var PriceDrinkTmp = PriceDrinkTmp - toppingID2price2
 		Var topping2 = toppingID2index1
 		Var DisableUsingCode = "false"
 		SAVELOG "Deselect add premium shot"
 	Else
-		Var showShotEnable = "Press"
+		Var ShotCoffeePremium = "Press"
 		Var PriceDrinkTmp = PriceDrinkTmp + toppingID2price2
 		Var topping2 = toppingID2index2
 		Var DisableUsingCode = "true"
@@ -1755,7 +2216,7 @@
 <Button>
 <X> 896 </X>
 <Y> 14 </Y>
-<State> showShotEnable </State>
+<State> ShotCoffeePremium </State>
 <Mode> "No" </Mode>
 <Filename> Var( DirImage + "/cb_notcheck.png" ) </Filename>
 <FilenamePress> Var( DirImage + "/cb_checked.png" ) </FilenamePress>
@@ -1764,14 +2225,14 @@
 <EventClick> 
 	SAVELOG "premium shot press"
 	
-	If showShotEnable = "Press" Then
-		Var showShotEnable = "Enable"
+	If ShotCoffeePremium = "Press" Then
+		Var ShotCoffeePremium = "Enable"
 		Var PriceDrinkTmp = PriceDrinkTmp - toppingID2price2
 		Var topping2 = toppingID2index1
 		Var DisableUsingCode = "false"
 		SAVELOG "Deselect add premium shot"
 	Else
-		Var showShotEnable = "Press"
+		Var ShotCoffeePremium = "Press"
 		Var PriceDrinkTmp = PriceDrinkTmp + toppingID2price2
 		Var topping2 = toppingID2index2
 		Var DisableUsingCode = "true"
@@ -1793,10 +2254,10 @@
 <X> topping_shot_price_x </X>
 <Y> 2 </Y>
 <Font> KanitRegularTTF </Font>
-<State> "Enable"</State>
+<State> "ShotCoffeePremium"</State>
 <Size> 36 </Size>
 <Color> 0x84776F </Color>
-<Value> "(+฿55)" </Value>
+<Value> text_price_topping </Value>
 </Text>
 
 </Row1>
@@ -1804,16 +2265,16 @@
 ;
 ;
 ;
-;-BEGIN shot layout
+;-BEGIN shot layout   "showShotEnable"
 <Row1>	
 <Width> 986 </Width>
 <Height> "auto" </Height>
-;<State> "Enable" </State>
+<State> showShotEnable </State>
 ;
 <Image>
 	<X> 0 </X>
 	<Y> 0 </Y>
-	<Filename> "ROOT/taobin_project/image/topping2/bg_top_oreo.png" </Filename>
+	<Filename> Var( DirImage + "/bg_top_shot.png") </Filename>
 </Image>
 ; 
 <Button>
@@ -1835,12 +2296,7 @@
 		Var showShotEnable = "Press"
 	EndIf
 
-	If new_layout = "true" Then 
-		Function 2
-	Else
-		Function 1
-	EndIf
-
+	Function 2
 
 	Refresh
 
@@ -1872,12 +2328,7 @@
 		Var showShotEnable = "Press"
 	EndIf
 
-	If new_layout = "true" Then 
-		Function 2
-	Else
-		Function 1
-	EndIf
-
+	Function 2
 
 	Refresh
 
@@ -1904,12 +2355,12 @@
 <Row1>	
 <Width> 986 </Width>
 <Height> "auto" </Height>
-<State> "Enable" </State>
+<State> showOreoAddEnable </State>
 ;
 <Image>
 	<X> 0 </X>
 	<Y> 0 </Y>
-	<Filename> "ROOT/taobin_project/image/topping2/bg_top_oreo.png" </Filename>
+	<Filename> Var( DirImage + "/bg_top_oreo.png") </Filename>
 </Image>
 ; 
 <Button>
@@ -1977,10 +2428,10 @@
 </Button>
 
 <Image>
-<State> showText4 </State>
-<X> 602 </X>
-<Y> 4 </Y>
-<Filename>  Var( DirImage + "/text4.png" ) </Filename>
+<State> showText8 </State>
+<X> 611 </X>
+<Y> 14 </Y>
+<Filename>  Var( DirImage + "/text8.png" ) </Filename>
 </Image>
 
 </Row1>
@@ -2772,6 +3223,7 @@
 		Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2
 		
 		Var topping2 = toppingID2index2
+		
 		Var DisableUsingCode = "true"
 		
 		Var showText7 = "Enable"
@@ -2792,6 +3244,23 @@
 
 	EndIf
 
+
+	DEBUGVAR showOreoAddEnable
+
+	If showOreoAddEnable = "Press" Then
+		Var TOPPING_PRICE = TOPPING_PRICE + toppingID6price2
+		Var topping6 = toppingID6index2
+		Var DisableUsingCode = "true"
+	Else
+		Var PriceDrinkTmp = PriceDrinkNoTop
+
+		Var topping6 = toppingID6index1
+
+		Var DisableUsingCode = "false"
+		
+	EndIf
+	
+
 	DEBUGVAR SelectDrinkType
 
 	DEBUGVAR showShotEnable