diff --git a/inter/aus/video/script_thank.ev b/inter/aus/video/script_thank.ev
index 32caeb31..5dcd4685 100644
--- a/inter/aus/video/script_thank.ev
+++ b/inter/aus/video/script_thank.ev
@@ -1,17 +1,20 @@
 SAVELOG "For change size this file."
 
-GetFileSizeK "taobin_project/inter/aus/video/frying_turtle_save_world.mp4" ThankyouFileSize
-DEBUGVAR ThankyouFileSize
-If ThankyouFileSize = 6285202 Then
-    Var video_file_name = "ROOT/taobin_project/inter/aus/video/frying_turtle_save_world.mp4"
+If SaveTheWorldCount = 2 Then
+	Var video_file_name = "ROOT/taobin_project/inter/aus/video/frying_turtle_save_world.mp4"
+Else
+
+	Var video_id_to_ran = 2
+	Random2 1 2 video_id_to_ran
+
+	Var video_file_name = "ROOT/taobin_project/inter/common/video/taobin_thank" + video_id_to_ran
+	Var video_file_name = video_file_name + ".mp4"
+
+	If EventNewYear = 1 Then
+	    GetFileSizeK "taobin_project/inter/aus/video/taobin_thank1_event.mp4" MainfileSize
+	    DEBUGVAR MainfileSize
+	    If MainfileSize = 6749397 Then
+	        Var video_file_name = "ROOT/taobin_project/inter/aus/video/taobin_thank1_event.mp4"
+	    EndIf
+	EndIf
 EndIf
-
-If EventNewYear = 1 Then
-
-    GetFileSizeK "taobin_project/inter/aus/video/taobin_thank1_event.mp4" MainfileSize
-    DEBUGVAR MainfileSize
-    If MainfileSize = 6749397 Then
-        Var video_file_name = "ROOT/taobin_project/inter/aus/video/taobin_thank1_event.mp4"
-    EndIf
-
-EndIf
\ No newline at end of file
diff --git a/inter/hkg/video/script_thank.ev b/inter/hkg/video/script_thank.ev
index 3e2f6781..7def7017 100644
--- a/inter/hkg/video/script_thank.ev
+++ b/inter/hkg/video/script_thank.ev
@@ -1,13 +1,24 @@
 SAVELOG "For change size this file. New video"
 
-If EventTurnOn = 1 Then
+If SaveTheWorldCount = 2 Then
+	Var video_id_to_ran = 3
+	Random2 1 3 video_id_to_ran
 
-    GetFileSizeK "taobin_project/inter/hkg/video/taobin_thank1_event.mp4" MainfileSize
-    DEBUGVAR MainfileSize
-    If MainfileSize = 6749397 Then
-        Var video_file_name = "ROOT/taobin_project/inter/hkg/video/taobin_thank1_event.mp4"
-    EndIf
+	Var video_file_name = "ROOT/taobin_project/inter/common/video/taobin_save_world" + video_id_to_ran
+	Var video_file_name = video_file_name + ".mp4"
+Else
 
+	Var video_id_to_ran = 2
+	Random2 1 2 video_id_to_ran
+
+	Var video_file_name = "ROOT/taobin_project/inter/common/video/taobin_thank" + video_id_to_ran
+	Var video_file_name = video_file_name + ".mp4"
+
+	If EventTurnOn = 1 Then
+	    GetFileSizeK "taobin_project/inter/hkg/video/taobin_thank1_event.mp4" MainfileSize
+	    DEBUGVAR MainfileSize
+	    If MainfileSize = 6749397 Then
+	        Var video_file_name = "ROOT/taobin_project/inter/hkg/video/taobin_thank1_event.mp4"
+	    EndIf
+	EndIf
 EndIf
-
-
diff --git a/inter/mys/video/script_thank.ev b/inter/mys/video/script_thank.ev
index 82aa7386..94b14265 100644
--- a/inter/mys/video/script_thank.ev
+++ b/inter/mys/video/script_thank.ev
@@ -1,13 +1,23 @@
 SAVELOG "For change size this file. New video"
 
-If EventTurnOn = 1 Then
+If SaveTheWorldCount = 2 Then
+	Var video_id_to_ran = 3
+	Random2 1 3 video_id_to_ran
 
-    GetFileSizeK "taobin_project/inter/mys/video/taobin_thank1_event.mp4" MainfileSize
-    DEBUGVAR MainfileSize
-    If MainfileSize = 6749397 Then
-        Var video_file_name = "ROOT/taobin_project/inter/mys/video/taobin_thank1_event.mp4"
-    EndIf
+	Var video_file_name = "ROOT/taobin_project/inter/common/video/taobin_save_world" + video_id_to_ran
+	Var video_file_name = video_file_name + ".mp4"
+Else
+	Var video_id_to_ran = 2
+	Random2 1 2 video_id_to_ran
 
+	Var video_file_name = "ROOT/taobin_project/inter/common/video/taobin_thank" + video_id_to_ran
+	Var video_file_name = video_file_name + ".mp4"
+
+	If EventTurnOn = 1 Then
+	    GetFileSizeK "taobin_project/inter/mys/video/taobin_thank1_event.mp4" MainfileSize
+	    DEBUGVAR MainfileSize
+	    If MainfileSize = 6749397 Then
+	        Var video_file_name = "ROOT/taobin_project/inter/mys/video/taobin_thank1_event.mp4"
+	    EndIf
+	EndIf
 EndIf
-
-
diff --git a/inter/sgp/video/script_thank.ev b/inter/sgp/video/script_thank.ev
index bf47f804..0c9cf59d 100644
--- a/inter/sgp/video/script_thank.ev
+++ b/inter/sgp/video/script_thank.ev
@@ -1,13 +1,25 @@
 SAVELOG "For change size this file. New video"
 
-If EventTurnOn = 1 Then
+If SaveTheWorldCount = 2 Then
+	Var video_id_to_ran = 3
+	Random2 1 3 video_id_to_ran
 
-    GetFileSizeK "taobin_project/inter/sgp/video/taobin_thank1_event.mp4" MainfileSize
-    DEBUGVAR MainfileSize
-    If MainfileSize = 6749397 Then
-        Var video_file_name = "ROOT/taobin_project/inter/sgp/video/taobin_thank1_event.mp4"
-    EndIf
+	Var video_file_name = "ROOT/taobin_project/inter/common/video/taobin_save_world" + video_id_to_ran
+	Var video_file_name = video_file_name + ".mp4"
+Else
+	Var video_id_to_ran = 2
+	Random2 1 2 video_id_to_ran
 
+	Var video_file_name = "ROOT/taobin_project/inter/common/video/taobin_thank" + video_id_to_ran
+	Var video_file_name = video_file_name + ".mp4"
+
+	If EventTurnOn = 1 Then
+	    GetFileSizeK "taobin_project/inter/sgp/video/taobin_thank1_event.mp4" MainfileSize
+	    DEBUGVAR MainfileSize
+	    If MainfileSize = 6749397 Then
+	        Var video_file_name = "ROOT/taobin_project/inter/sgp/video/taobin_thank1_event.mp4"
+	    EndIf
+	EndIf
 EndIf
 
 
diff --git a/inter/tha/video/script_thank.ev b/inter/tha/video/script_thank.ev
index 5ba044ff..08b82822 100644
--- a/inter/tha/video/script_thank.ev
+++ b/inter/tha/video/script_thank.ev
@@ -1,11 +1,23 @@
 SAVELOG "For change size this file."
 
-If EventTurnOn = 1 Then
+If SaveTheWorldCount = 2 Then
+	Var video_id_to_ran = 3
+	Random2 1 3 video_id_to_ran
 
-    GetFileSizeK "taobin_project/inter/aus/video/taobin_thank1_event.mp4" MainfileSize
-    DEBUGVAR MainfileSize
-    If MainfileSize = 6749397 Then
-        Var video_file_name = "ROOT/taobin_project/inter/aus/video/taobin_thank1_event.mp4"
-    EndIf
+	Var video_file_name = "ROOT/taobin_project/video/taobin_save_world" + video_id_to_ran
+	Var video_file_name = video_file_name + ".mp4"
+Else
+	Var video_id_to_ran = 2
+	Random2 1 2 video_id_to_ran
 
-EndIf
\ No newline at end of file
+	Var video_file_name = "ROOT/taobin_project/video/taobin_thank" + video_id_to_ran
+	Var video_file_name = video_file_name + ".mp4"
+
+	If EventTurnOn = 1 Then
+	    GetFileSizeK "taobin_project/inter/aus/video/taobin_thank1_event.mp4" MainfileSize
+	    DEBUGVAR MainfileSize
+	    If MainfileSize = 6749397 Then
+	        Var video_file_name = "ROOT/taobin_project/inter/aus/video/taobin_thank1_event.mp4"
+	    EndIf
+	EndIf
+EndIf
diff --git a/inter/uae_dubai/video/script_thank.ev b/inter/uae_dubai/video/script_thank.ev
index 9fca7d89..a4ded388 100644
--- a/inter/uae_dubai/video/script_thank.ev
+++ b/inter/uae_dubai/video/script_thank.ev
@@ -1,5 +1,18 @@
 SAVELOG "For change size this file. New video"
 
+If SaveTheWorldCount = 2 Then
+	Var video_id_to_ran = 3
+	Random2 1 3 video_id_to_ran
+
+	Var video_file_name = "ROOT/taobin_project/inter/common/video/taobin_save_world" + video_id_to_ran
+	Var video_file_name = video_file_name + ".mp4"
+Else
+	Var video_id_to_ran = 2
+	Random2 1 2 video_id_to_ran
+
+	Var video_file_name = "ROOT/taobin_project/inter/common/video/taobin_thank" + video_id_to_ran
+	Var video_file_name = video_file_name + ".mp4"
+EndIf
 
 If UsePepsiTheme = 1 Then
 
diff --git a/video/script2.ev b/video/script2.ev
index 41a3e0ff..3e2477d2 100644
--- a/video/script2.ev
+++ b/video/script2.ev
@@ -1,15 +1,29 @@
 
 SAVELOG "None."
 
+If SaveTheWorldCount = 2 Then
+	Var video_id_to_ran = 3
+	Random2 1 3 video_id_to_ran
 
-If EventTurnOn = 1 Then
-	GetFileSizeK "taobin_project/video/taobin_thank1_event.mp4" MainfileSize
-	DEBUGVAR MainfileSize
+	Var video_file_name = "ROOT/taobin_project/video/taobin_save_world" + video_id_to_ran
+	Var video_file_name = video_file_name + ".mp4"
+Else
+	Var video_id_to_ran = 2
+	Random2 1 2 video_id_to_ran
 
-	If MainfileSize = 22 Then
-		
-		Var video_file_name = "ROOT/taobin_project/video/taobin_thank1_event.mp4"
-		
+	Var video_file_name = "ROOT/taobin_project/video/taobin_thank" + video_id_to_ran
+	Var video_file_name = video_file_name + ".mp4"
+
+	If EventTurnOn = 1 Then
+		GetFileSizeK "taobin_project/video/taobin_thank1_event.mp4" MainfileSize
+		DEBUGVAR MainfileSize
+
+		If MainfileSize = 22 Then
+
+			Var video_file_name = "ROOT/taobin_project/video/taobin_thank1_event.mp4"
+
+		EndIf
 	EndIf
 EndIf
+
 DEBUGVAR video_file_name
diff --git a/xml/page_payment.xml b/xml/page_payment.xml
index 4e2f62a2..e2a8dfea 100644
--- a/xml/page_payment.xml
+++ b/xml/page_payment.xml
@@ -205,8 +205,8 @@
 		EndIf
 
 		If CountryName = "HongKong" Then
-			Var PlaySongLag = "ROOT/taobin_project/sound_eng/How_would_you_like_to_pay.mp3"
-		End
+			Var PlaySoundLag = "ROOT/taobin_project/sound_eng/How_would_you_like_to_pay.mp3"
+		EndIf
 
 
 		Var PlaySoundCodeLang = "ROOT/sounds/Code8digit.m4a"
diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml
index 7e3c9f49..11773ba4 100644
--- a/xml/page_thankyou.xml
+++ b/xml/page_thankyou.xml
@@ -134,26 +134,9 @@
 	DEBUGVAR SaveTheWorldCount
 
 	If SaveTheWorldCount = 2 Then
-
 		If LedLidBlink = "no" Then
 			Var SaveTheWorldST = "Enable"
 		EndIf
-
-		Var video_id_to_ran = 3
-		Var video_name_to_play = "taobin_save_world"
-
-		Random2 1 3 video_id_to_ran
-
-		Var ThankyouST = "Invisible"
-	Else
-
-		Var video_id_to_ran = 2
-		Var video_name_to_play = "taobin_thank"
-
-		Random2 1 2 video_id_to_ran
-
-
-		Var ThankyouST = "Enable"
 	EndIf
 
 
@@ -162,40 +145,16 @@
 	Var show_video = 1
 	Var SaveTheWorldST = "Invisible"
 
-	If CountryName = "Thailand" Then
-		Var video_file_name = "ROOT/taobin_project/video/" + video_name_to_play
+	; ================= Video thankyou =============================
+
+	If InternationalEnable = 1 Then
+		Var script_thankyou = CountryRootPath + "video/script_thank.ev"
+		TRY script_thankyou
 	Else
-		If InternationalEnable = 1 Then
-			Var video_file_name = "ROOT/taobin_project/inter/common/video/" + video_name_to_play
-		Else
-			Var video_file_name = "ROOT/taobin_project/video/" + video_name_to_play
-		EndIf
+		TRY "/mnt/sdcard/coffeevending/taobin_project/video/script2.ev"
 	EndIf
 
-	Var video_file_name = video_file_name + video_id_to_ran
-	Var video_file_name = video_file_name + ".mp4"
-
-	If SaveTheWorldCount < 2  Then
-
-		If InternationalEnable = 1 Then
-			If CountryName = "Thailand" Then
-				TRY "/mnt/sdcard/coffeevending/taobin_project/video/script2.ev"
-			Else
-				Var script_thankyou = CountryRootPath + "video/script_thank.ev"
-				TRY script_thankyou
-			EndIf
-		Else
-			TRY "/mnt/sdcard/coffeevending/taobin_project/video/script2.ev"
-		EndIf
-	Else
-	    If InternationalEnable = 1 Then
-            If UsePepsiTheme = 1 Then
-                Var script_thankyou = CountryRootPath + "video/script_thank.ev"
-                TRY script_thankyou
-            EndIf
-        EndIf
-
-	EndIf
+	; ================== End video thankyou =========================
 
 
 
diff --git a/xml/page_topping_select8.xml b/xml/page_topping_select8.xml
index e78d98b0..fcbd365f 100644
--- a/xml/page_topping_select8.xml
+++ b/xml/page_topping_select8.xml
@@ -10732,8 +10732,18 @@
     <Style> "shake-text" </Style>
     <OnEvent> "OnValueChange" </OnEvent>
 </Animation>
+
 </Button>
 
+<Text>
+<X> 750 </X>
+<Y> 1083 </Y>
+<Font> KanitRegularTTF </Font>
+<State> CustomOreoState </State>
+<Size> 16 </Size>
+<Color> 0x84776F </Color>
+<Value> OreoPriceText </Value>
+</Text>
 
 
 <Image>
@@ -10829,7 +10839,15 @@
 </Animation>
 </Button>
 
-
+<Text>
+<X> 750 </X>
+<Y> 1155 </Y>
+<Font> KanitRegularTTF </Font>
+<State> CustomOvaltineState </State>
+<Size> 16 </Size>
+<Color> 0x84776F </Color>
+<Value> OvaltinePriceText </Value>
+</Text>
 
 
 
@@ -10926,7 +10944,15 @@
 </Animation>
 </Button>
 
-
+<Text>
+<X> 750 </X>
+<Y> 1226 </Y>
+<Font> KanitRegularTTF </Font>
+<State> CustomCocoaState </State>
+<Size> 16 </Size>
+<Color> 0x84776F </Color>
+<Value> CocoaPriceText </Value>
+</Text>
 
 
 <Image>