diff --git a/inter/hkg/xml/multi/control_and_lang_swith.ev b/inter/hkg/xml/multi/control_and_lang_swith.ev
index 7de4373f..98086298 100644
--- a/inter/hkg/xml/multi/control_and_lang_swith.ev
+++ b/inter/hkg/xml/multi/control_and_lang_swith.ev
@@ -35,7 +35,8 @@ Else
     Var InstanceTabOpenFile6 = "ROOT/taobin_project/inter/hkg/xml/multi/page_catalog_group_health.lxml"
 EndIf
 
-Var InstanceTabOpenFile15 = "ROOT/taobin_project/inter/hkg/xml/multi/tab_menu.lxml"
+TabMenuLock 15
+OpenInst 15 "ROOT/taobin_project/inter/hkg/xml/multi/tab_menu.lxml"
 
 TabMenuVisibleInst 99
 
diff --git a/inter/hkg/xml/multi/menu_catalog_new.lxml b/inter/hkg/xml/multi/menu_catalog_new.lxml
index a865cc2a..809be2d6 100644
--- a/inter/hkg/xml/multi/menu_catalog_new.lxml
+++ b/inter/hkg/xml/multi/menu_catalog_new.lxml
@@ -125,7 +125,7 @@
 
     OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
 
-    ;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_show_and_refresh.lxml"
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_open_instance.lxml"
     RefreshAll
 
 </EventLanguageOnChange>
diff --git a/inter/hkg/xml/multi/tab_menu.lxml b/inter/hkg/xml/multi/tab_menu.lxml
index 475ec8f0..bbc82669 100644
--- a/inter/hkg/xml/multi/tab_menu.lxml
+++ b/inter/hkg/xml/multi/tab_menu.lxml
@@ -68,6 +68,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu1Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_recommend3.png" )</Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_recommend3.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -92,6 +93,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu2Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_coffee2.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_coffee2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -107,6 +109,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu3Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_tea2.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_tea2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -125,6 +128,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu4Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_cho_ca2.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_cho_ca2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -141,6 +145,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu7Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_protein2.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_protein2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -155,6 +160,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu11Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_appfast2.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_appfast2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -171,6 +177,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu21Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_forkid2.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_forkid2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -187,6 +194,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu22Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_health.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_health.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -201,6 +209,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu8Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_cocktail.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_cocktail.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -229,6 +238,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu62Selected </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -243,6 +253,7 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> MenuVSelected2 </State>
+        <Mode> "No" </Mode>
         <Filename> Var( DirImageAlter + "/bn_vending2.png") </Filename>
         <FilenamePress> Var( DirImageAlter + "/bp_vending2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
diff --git a/inter/hkg/xml/multi/tab_menu_open_instance.lxml b/inter/hkg/xml/multi/tab_menu_open_instance.lxml
new file mode 100644
index 00000000..afc80232
--- /dev/null
+++ b/inter/hkg/xml/multi/tab_menu_open_instance.lxml
@@ -0,0 +1 @@
+OpenInst 15 "ROOT/taobin_project/inter/hkg/xml/multi/tab_menu.lxml"
\ No newline at end of file
diff --git a/inter/tha/support_langs b/inter/tha/support_langs
index ca6da68c..d4d60144 100644
--- a/inter/tha/support_langs
+++ b/inter/tha/support_langs
@@ -1 +1 @@
-ENG,THAI,MSC,MYANMAR
\ No newline at end of file
+ENG,THAI,MSC,JAPAN,MYS,MYANMAR
\ No newline at end of file
diff --git a/inter/tha/xml/multi/menu_catalog_new.lxml b/inter/tha/xml/multi/menu_catalog_new.lxml
index b8e3d3f6..563fa0a0 100644
--- a/inter/tha/xml/multi/menu_catalog_new.lxml
+++ b/inter/tha/xml/multi/menu_catalog_new.lxml
@@ -60,7 +60,7 @@
 
     OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
 
-    ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
+    ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_open_instance.lxml"
    
 
     RefreshAll
diff --git a/inter/tha/xml/multi/tab_menu_open_instance.lxml b/inter/tha/xml/multi/tab_menu_open_instance.lxml
new file mode 100644
index 00000000..b4648a8c
--- /dev/null
+++ b/inter/tha/xml/multi/tab_menu_open_instance.lxml
@@ -0,0 +1 @@
+OpenInst 15 "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml"
\ No newline at end of file
diff --git a/xml/page_topping_select8.xml b/xml/page_topping_select8.xml
index c3eb8e73..dc763b24 100644
--- a/xml/page_topping_select8.xml
+++ b/xml/page_topping_select8.xml
@@ -1821,10 +1821,17 @@
 				Var CustomMilkState[1] = "Enable"
 				Var CustomMilkState[2] = "Enable"
 			Else
-				Var CustomMilkState[0] = "Disable"
-				Var CustomMilkState[1] = "Disable"
-				Var CustomMilkState[2] = "Disable"
+				If TOPPING11 = "milk-level" Then
+					Var CustomMilkState[0] = "Enable"
+					Var CustomMilkState[1] = "Enable"
+					Var CustomMilkState[2] = "Enable"
+				Else
+					Var CustomMilkState[0] = "Disable"
+					Var CustomMilkState[1] = "Disable"
+					Var CustomMilkState[2] = "Disable"
+				EndIf
 			EndIf
+
 		Else
 			Var CustomMilkState[0] = "Disable"
 			Var CustomMilkState[1] = "Disable"
@@ -2215,15 +2222,22 @@
 					Var showShotNormalSoda = "Invisible"
 					Var showShotEnableSoda = "Invisible"
 				Else
-					Var showShotNormalSoda = "Disable"
-					Var showShotEnableSoda = "Disable"
+					If toppingID13index2Status = "Enable" Then
+						Var showShotEnableSoda = "Enable"	
+						Var showShotNormalSoda = "Enable"						
+					Else
+						Var showShotNormalSoda = "Disable"
+						Var showShotEnableSoda = "Disable"
+					EndIf
 				EndIf
 			EndIf
 			
+		Else
+			Var showShotNormalSoda = "Disable"
+			Var showShotEnableSoda = "Disable"
 		EndIf
 
 
-
 		DEBUGVAR SubMenuGroupIDSlot6_1
 
 		DEBUGVAR TOPPING3
@@ -2623,6 +2637,20 @@
 				Var CustomMilkState[2] = "Disable"
 			EndIf
 
+			If TOPPING13 = "shot coffee" Then
+				If showShotNormalSoda = "Enable" Then
+					If showShotEnableSoda = "Enable" Then
+						Var showShotNormalSoda = "Press"
+					EndIf
+				EndIf
+			Else
+				If showShotNormal = "Enable" Then
+					If showShotEnable = "Enable" Then
+						Var showShotNormal = "Press"
+					EndIf
+				EndIf
+			EndIf
+
 			Var SelectToppingType = 1
 		EndIf
 
@@ -2682,34 +2710,30 @@
 				EndIf
 			EndIf
 
-			If CustomMilkState[0] = "Enable" Then
-				Var CustomMilkState[0] = "Disable"
-			EndIf
+			If TOPPING11 = "milk-level" Then
 
-			If CustomMilkState[1] = "Enable" Then
-				Var CustomMilkState[1] = "Disable"
-			EndIf
-			If CustomMilkState[2] = "Enable" Then
-				Var CustomMilkState[2] = "Disable"
-			EndIf
+				If CustomMilkState[0] = "Disable" Then
+					Var CustomMilkState[0] = "Enable"
+				EndIf
 
-			If CustomMilkState[0] = "PressForever" Then
-				Var CustomMilkState[0] = "Disable"
-			EndIf
+				If CustomMilkState[1] = "Disable" Then
+					Var CustomMilkState[1] = "Enable"
+				EndIf
+				If CustomMilkState[2] = "Disable" Then
+					Var CustomMilkState[2] = "Enable"
+				EndIf
 
-			If CustomMilkState[1] = "PressForever" Then
-				Var CustomMilkState[1] = "Disable"
-			EndIf
-			If CustomMilkState[2] = "PressForever" Then
-				Var CustomMilkState[2] = "Disable"
-			EndIf
-
-			If CustomMilkState[0] = "Enable" Then
-				If CustomMilkState[1] = "Enable" Then
-					If CustomMilkState[2] = "Enable" Then
-						Var CustomMilkState[1] = "PressForever" Then
+				If CustomMilkState[0] = "Enable" Then
+					If CustomMilkState[1] = "Enable" Then
+						If CustomMilkState[2] = "Enable" Then
+							Var CustomMilkState[1] = "PressForever" Then
+						EndIf
 					EndIf
 				EndIf
+			Else
+				Var CustomMilkState[0] = "Disable"
+				Var CustomMilkState[1] = "Disable"
+				Var CustomMilkState[2] = "Disable"
 			EndIf
 
 			If TOPPING13 = "shot coffee" Then