diff --git a/inter/sgp/xml/menu_new_layout_gen_v2.py b/inter/sgp/xml/menu_new_layout_gen_v2.py
index 79206c41..082cf057 100644
--- a/inter/sgp/xml/menu_new_layout_gen_v2.py
+++ b/inter/sgp/xml/menu_new_layout_gen_v2.py
@@ -917,8 +917,8 @@
       out_xml('\t Var block_index_move = 0\r\n')
     else:
 
-      out_xml('\t Var block_index_override = 4\r\n')
-      out_xml('\t Var block_index_move = 1\r\n')
+      out_xml('\t Var block_index_override = 0\r\n')
+      out_xml('\t Var block_index_move = 0\r\n')
       #out_xml('\t Var block_index_override = 4\r\n')
       #out_xml('\t Var block_index_move = 1\r\n')
       #out_xml('\tIf Seeker = "curr" Then\r\n')
diff --git a/inter/uae_dubai/menu/lang.tsv b/inter/uae_dubai/menu/lang.tsv
index 217a372e..6f834afa 100644
--- a/inter/uae_dubai/menu/lang.tsv
+++ b/inter/uae_dubai/menu/lang.tsv
@@ -40,32 +40,32 @@ TextID	Note	English	arabic
 
 
 	page_toopping_select
-		Font=Kanit,Type=Regular,Size=22,Color=0x513C2F,Align=Center	Font=Kanit,Type=Regular,Size=22,Color=0x513C2F,Align=Center
-		Font=Kanit,Type=Medium,Size=22,Color=0x513C2F,Align=Center	Font=Kanit,Type=Medium,Size=22,Color=0x513C2F,Align=Center
-		Font=Kanit,Type=Regular,Size=22,Color=0xCFCFCF,Align=Center	Font=Kanit,Type=Regular,Size=22,Color=0xCFCFCF,Align=Center
+		Font=Kanit,Type=Regular,Size=22,Color=0x0025FF,Align=Center	Font=Kanit,Type=Regular,Size=22,Color=0x0025FF,Align=Center
+		Font=Kanit,Type=Medium,Size=22,Color=0xFFFFFF,Align=Center	Font=Kanit,Type=Medium,Size=22,Color=0xFFFFFF,Align=Center
+		Font=Kanit,Type=Regular,Size=22,Color=0x0025FF,Align=Center	Font=Kanit,Type=Regular,Size=22,Color=0x0025FF,Align=Center
 000040		Not sweet	ليس لطيفا
 000041		Little	قليل
 000042		Less	أقل
 000043		Perfect	ممتاز
 000044		Extra	إضافي
 000045		Sweetest	أحلى
-		Font=Kanit,Type=Regular,Size=14,Color=0x84776F,Align=Center	Font=Kanit,Type=Regular,Size=14,Color=0x84776F,Align=Center
+		Font=Kanit,Type=Regular,Size=14,Color=0x8092FF,Align=Center	Font=Kanit,Type=Regular,Size=14,Color=0x8092FF,Align=Center
 		Font=Kanit,Type=Regular,Size=14,Color=0xEEEEEE,Align=Center	Font=Kanit,Type=Regular,Size=14,Color=0xEEEEEE,Align=Center
-		Font=Kanit,Type=Regular,Size=14,Color=0xCFCFCF,Align=Center	Font=Kanit,Type=Regular,Size=14,Color=0xCFCFCF,Align=Center
+		Font=Kanit,Type=Regular,Size=14,Color=0x0025FF,Align=Center	Font=Kanit,Type=Regular,Size=14,Color=0x0025FF,Align=Center
 000046		0%	0%
 000047		20%	20%
 000048		40%	40%
 000049		60%	60%
 000050		80%	80%
 000051		100%	100%
-		Font=Kanit,Type=Regular,Size=24,Color=0x513C2F,Align=Center	Font=Kanit,Type=Regular,Size=24,Color=0x513C2F,Align=Center
-		Font=Kanit,Type=Bold,Size=24,Color=0x513C2F,Align=Center	Font=Kanit,Type=Bold,Size=24,Color=0x513C2F,Align=Center
+		Font=Kanit,Type=Regular,Size=24,Color=0x0025FF,Align=Center	Font=Kanit,Type=Regular,Size=24,Color=0x0025FF,Align=Center
+		Font=Kanit,Type=Bold,Size=24,Color=0x0025FF,Align=Center	Font=Kanit,Type=Bold,Size=24,Color=0x0025FF,Align=Center
 000052		No added sugar	السكر لا تضاف
 000053		Less sweet	أقل حلاوة
 000054		Healthy sweet	صحي حلو
 000055		Just right	مجرد حق
 
-		Font=Kanit,Type=Regular,Size=15,Color=0x84776F,Align=Center	Font=Kanit,Type=Regular,Size=15,Color=0x84776F,Align=Center
+		Font=Kanit,Type=Regular,Size=15,Color=0x8092FF,Align=Center	Font=Kanit,Type=Regular,Size=15,Color=0x8092FF,Align=Center
 		Font=Kanit,Type=Regular,Size=15,Color=0xEEEEEE,Align=Center	Font=Kanit,Type=Regular,Size=15,Color=0xEEEEEE,Align=Center
 000056		=+ SUGAR 0 g (0 cal)	=+ سكر 0 جم (0 سعر حراري)
 000057		=+ SUGAR 3 g (11 cal)	=+ سكر3 جم (11 سعر حراري)
@@ -97,7 +97,7 @@ TextID	Note	English	arabic
 		Font=Kanit,Type=Regular,Size=36,Color=0x0025FF,PressColor=0xFFFFFF	Font=Kanit,Type=Regular,Size=36,Color=0x0025FF,PressColor=0xFFFFFF
 		Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF	Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF
 000074		Cancel	يلغي
-		Font=Kanit,Type=Light,Size=36,Color=0x0025FF	Font=Kanit,Type=Light,Size=36,Color=0x0025FF
+		Font=Kanit,Type=Light,Size=36,Color=0xFF0000	Font=Kanit,Type=Light,Size=36,Color=0xFF0000
 000075		Please choose drink type	الرجاء اختيار نوع المشروب
 
 
diff --git a/inter/uae_dubai/xml/menu_catalog_new.lxml b/inter/uae_dubai/xml/menu_catalog_new.lxml
index 9d23fc63..2a4ac788 100644
--- a/inter/uae_dubai/xml/menu_catalog_new.lxml
+++ b/inter/uae_dubai/xml/menu_catalog_new.lxml
@@ -114,18 +114,38 @@
     EndIf
     ;inter-image
 	If CountryName = "UnitedArabEmirates Dubai" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        ;Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/image/page3_en"
         Var ice_tab_text =  "Ice will be ready at "
     EndIf
 
     If LanguageShow = "UAE_DUBAI" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImage = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
+        ;Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+    EndIf
+
+    If UsePepsiTheme = 1 Then
+        Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+        Var DirImage2 = DirImage2 + "/image/drink_option_en/"
+        If LanguageShow = "UAE_DUBAI" Then
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3/"
+        Else
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2_en/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3_en/"
+
+            Var ice_tab_text =  "Ice will be ready at "
+        EndIf
     EndIf
 
     SAVELOG "EventLanguageOnChange menu -list"
diff --git a/inter/uae_dubai/xml/page_catalog_group_appfast.lxml b/inter/uae_dubai/xml/page_catalog_group_appfast.lxml
index 68fc771a..4ff041c1 100644
--- a/inter/uae_dubai/xml/page_catalog_group_appfast.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_appfast.lxml
@@ -295,18 +295,38 @@
     EndIf
     ;inter-image
 	If CountryName = "UnitedArabEmirates Dubai" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        ;Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/image/page3_en"
         Var ice_tab_text =  "Ice will be ready at "
     EndIf
 
     If LanguageShow = "UAE_DUBAI" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImage = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
+        ;Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+    EndIf
+
+    If UsePepsiTheme = 1 Then
+        Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+        Var DirImage2 = DirImage2 + "/image/drink_option_en/"
+        If LanguageShow = "UAE_DUBAI" Then
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3/"
+        Else
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2_en/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3_en/"
+
+            Var ice_tab_text =  "Ice will be ready at "
+        EndIf
     EndIf
 
     SAVELOG "EventLanguageOnChange menu -list"
diff --git a/inter/uae_dubai/xml/page_catalog_group_cocktail.lxml b/inter/uae_dubai/xml/page_catalog_group_cocktail.lxml
index 27f0bfdc..400d6ca5 100644
--- a/inter/uae_dubai/xml/page_catalog_group_cocktail.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_cocktail.lxml
@@ -261,18 +261,38 @@
     EndIf
     ;inter-image
 	If CountryName = "UnitedArabEmirates Dubai" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        ;Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/image/page3_en"
         Var ice_tab_text =  "Ice will be ready at "
     EndIf
 
     If LanguageShow = "UAE_DUBAI" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImage = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
+        ;Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+    EndIf
+
+    If UsePepsiTheme = 1 Then
+        Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+        Var DirImage2 = DirImage2 + "/image/drink_option_en/"
+        If LanguageShow = "UAE_DUBAI" Then
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3/"
+        Else
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2_en/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3_en/"
+
+            Var ice_tab_text =  "Ice will be ready at "
+        EndIf
     EndIf
 
     SAVELOG "EventLanguageOnChange menu -list"
diff --git a/inter/uae_dubai/xml/page_catalog_group_coffee.lxml b/inter/uae_dubai/xml/page_catalog_group_coffee.lxml
index 47c01a2b..4493f895 100644
--- a/inter/uae_dubai/xml/page_catalog_group_coffee.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_coffee.lxml
@@ -287,18 +287,38 @@
     EndIf
     ;inter-image
 	If CountryName = "UnitedArabEmirates Dubai" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        ;Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/image/page3_en"
         Var ice_tab_text =  "Ice will be ready at "
     EndIf
 
     If LanguageShow = "UAE_DUBAI" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImage = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
+        ;Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+    EndIf
+
+    If UsePepsiTheme = 1 Then
+        Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+        Var DirImage2 = DirImage2 + "/image/drink_option_en/"
+        If LanguageShow = "UAE_DUBAI" Then
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3/"
+        Else
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2_en/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3_en/"
+
+            Var ice_tab_text =  "Ice will be ready at "
+        EndIf
     EndIf
 
     SAVELOG "EventLanguageOnChange menu -list"
diff --git a/inter/uae_dubai/xml/page_catalog_group_forkid.lxml b/inter/uae_dubai/xml/page_catalog_group_forkid.lxml
index 68268eb6..b88b55dc 100644
--- a/inter/uae_dubai/xml/page_catalog_group_forkid.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_forkid.lxml
@@ -296,18 +296,38 @@
     EndIf
     ;inter-image
 	If CountryName = "UnitedArabEmirates Dubai" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        ;Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/image/page3_en"
         Var ice_tab_text =  "Ice will be ready at "
     EndIf
 
     If LanguageShow = "UAE_DUBAI" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImage = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
+        ;Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+    EndIf
+
+    If UsePepsiTheme = 1 Then
+        Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+        Var DirImage2 = DirImage2 + "/image/drink_option_en/"
+        If LanguageShow = "UAE_DUBAI" Then
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3/"
+        Else
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2_en/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3_en/"
+
+            Var ice_tab_text =  "Ice will be ready at "
+        EndIf
     EndIf
 
     SAVELOG "EventLanguageOnChange menu -list"
diff --git a/inter/uae_dubai/xml/page_catalog_group_health.lxml b/inter/uae_dubai/xml/page_catalog_group_health.lxml
index f122461f..7380f58e 100644
--- a/inter/uae_dubai/xml/page_catalog_group_health.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_health.lxml
@@ -287,18 +287,38 @@
     EndIf
     ;inter-image
 	If CountryName = "UnitedArabEmirates Dubai" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        ;Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/image/page3_en"
         Var ice_tab_text =  "Ice will be ready at "
     EndIf
 
     If LanguageShow = "UAE_DUBAI" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImage = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
+        ;Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+    EndIf
+
+    If UsePepsiTheme = 1 Then
+        Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+        Var DirImage2 = DirImage2 + "/image/drink_option_en/"
+        If LanguageShow = "UAE_DUBAI" Then
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3/"
+        Else
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2_en/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3_en/"
+
+            Var ice_tab_text =  "Ice will be ready at "
+        EndIf
     EndIf
 
     SAVELOG "EventLanguageOnChange menu -list"
diff --git a/inter/uae_dubai/xml/page_catalog_group_milk.lxml b/inter/uae_dubai/xml/page_catalog_group_milk.lxml
index d8a8014a..97f6eed7 100644
--- a/inter/uae_dubai/xml/page_catalog_group_milk.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_milk.lxml
@@ -285,18 +285,38 @@
     EndIf
     ;inter-image
 	If CountryName = "UnitedArabEmirates Dubai" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        ;Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/image/page3_en"
         Var ice_tab_text =  "Ice will be ready at "
     EndIf
 
     If LanguageShow = "UAE_DUBAI" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImage = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
+        ;Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+    EndIf
+
+    If UsePepsiTheme = 1 Then
+        Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+        Var DirImage2 = DirImage2 + "/image/drink_option_en/"
+        If LanguageShow = "UAE_DUBAI" Then
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3/"
+        Else
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2_en/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3_en/"
+
+            Var ice_tab_text =  "Ice will be ready at "
+        EndIf
     EndIf
 
     SAVELOG "EventLanguageOnChange menu -list"
diff --git a/inter/uae_dubai/xml/page_catalog_group_other.lxml b/inter/uae_dubai/xml/page_catalog_group_other.lxml
index 92c669a2..a73dba39 100644
--- a/inter/uae_dubai/xml/page_catalog_group_other.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_other.lxml
@@ -286,18 +286,38 @@
     EndIf
     ;inter-image
 	If CountryName = "UnitedArabEmirates Dubai" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        ;Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/image/page3_en"
         Var ice_tab_text =  "Ice will be ready at "
     EndIf
 
     If LanguageShow = "UAE_DUBAI" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImage = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
+        ;Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+    EndIf
+
+    If UsePepsiTheme = 1 Then
+        Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+        Var DirImage2 = DirImage2 + "/image/drink_option_en/"
+        If LanguageShow = "UAE_DUBAI" Then
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3/"
+        Else
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2_en/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3_en/"
+
+            Var ice_tab_text =  "Ice will be ready at "
+        EndIf
     EndIf
 
     SAVELOG "EventLanguageOnChange menu -list"
diff --git a/inter/uae_dubai/xml/page_catalog_group_recommend.lxml b/inter/uae_dubai/xml/page_catalog_group_recommend.lxml
index 4827cc7d..63dd8304 100644
--- a/inter/uae_dubai/xml/page_catalog_group_recommend.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_recommend.lxml
@@ -278,18 +278,38 @@
     EndIf
     ;inter-image
 	If CountryName = "UnitedArabEmirates Dubai" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        ;Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/image/page3_en"
         Var ice_tab_text =  "Ice will be ready at "
     EndIf
 
     If LanguageShow = "UAE_DUBAI" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImage = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
+        ;Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+    EndIf
+
+    If UsePepsiTheme = 1 Then
+        Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+        Var DirImage2 = DirImage2 + "/image/drink_option_en/"
+        If LanguageShow = "UAE_DUBAI" Then
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3/"
+        Else
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2_en/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3_en/"
+
+            Var ice_tab_text =  "Ice will be ready at "
+        EndIf
     EndIf
 
     SAVELOG "EventLanguageOnChange menu -list"
diff --git a/inter/uae_dubai/xml/page_catalog_group_tea.lxml b/inter/uae_dubai/xml/page_catalog_group_tea.lxml
index 16c66d07..ec6da65e 100644
--- a/inter/uae_dubai/xml/page_catalog_group_tea.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_tea.lxml
@@ -287,18 +287,38 @@
     EndIf
     ;inter-image
 	If CountryName = "UnitedArabEmirates Dubai" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        ;Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/image/page3_en"
         Var ice_tab_text =  "Ice will be ready at "
     EndIf
 
     If LanguageShow = "UAE_DUBAI" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImage = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
+        ;Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+    EndIf
+
+    If UsePepsiTheme = 1 Then
+        Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+        Var DirImage2 = DirImage2 + "/image/drink_option_en/"
+        If LanguageShow = "UAE_DUBAI" Then
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3/"
+        Else
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2_en/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3_en/"
+
+            Var ice_tab_text =  "Ice will be ready at "
+        EndIf
     EndIf
 
     SAVELOG "EventLanguageOnChange menu -list"
diff --git a/inter/uae_dubai/xml/page_catalog_group_whey.lxml b/inter/uae_dubai/xml/page_catalog_group_whey.lxml
index cd233a64..7e88bd28 100644
--- a/inter/uae_dubai/xml/page_catalog_group_whey.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_whey.lxml
@@ -292,18 +292,38 @@
     EndIf
     ;inter-image
 	If CountryName = "UnitedArabEmirates Dubai" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2_en/"
-        Var DirImage = "ROOT/taobin_project/image/page3_en"
+        ;Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/image/page3_2_en/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/image/page3_en"
         Var ice_tab_text =  "Ice will be ready at "
     EndIf
 
     If LanguageShow = "UAE_DUBAI" Then
-        Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
-        Var DirImageAlter = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
-        Var DirImage = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
+        ;Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+        Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
+    EndIf
+
+    If UsePepsiTheme = 1 Then
+        Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+        Var DirImage2 = DirImage2 + "/image/drink_option_en/"
+        If LanguageShow = "UAE_DUBAI" Then
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3/"
+        Else
+            Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImageAlter = DirImageAlter + "/image/page3_2_en/"
+
+            Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+            Var DirImage = DirImage + "/image/page3_en/"
+
+            Var ice_tab_text =  "Ice will be ready at "
+        EndIf
     EndIf
 
     SAVELOG "EventLanguageOnChange menu -list"
diff --git a/inter/whatthecup/uae_dubai/xml/page_payment_cash-SGP_blue.xml b/inter/whatthecup/uae_dubai/xml/page_payment_cash-UAE_blue.xml
similarity index 77%
rename from inter/whatthecup/uae_dubai/xml/page_payment_cash-SGP_blue.xml
rename to inter/whatthecup/uae_dubai/xml/page_payment_cash-UAE_blue.xml
index ddb13176..9c68266e 100644
--- a/inter/whatthecup/uae_dubai/xml/page_payment_cash-SGP_blue.xml
+++ b/inter/whatthecup/uae_dubai/xml/page_payment_cash-UAE_blue.xml
@@ -7,25 +7,13 @@
 <Sound> PlaySoundLag </Sound>
 <EventOpen>
 
-	READ_FILE "/mnt/sdcard/coffeevending/sim_on" str_sim_on
-	DEBUGVAR str_sim_on
-
-	Var SGPSimMode = "Invisible"
-
-	If str_sim_on = "1" Then
-		Var SGPSimMode = "Enable"
-	EndIf
-
 	Var cash_disable = "0"
 	READ_FILE "/mnt/sdcard/coffeevending/cash_disable" cash_disable
 	DEBUGVAR cash_disable
 
-	SAVELOG "page_payment_cach-SGP.xml"
+	SAVELOG "page_payment_cach-uae_dubai.xml"
 
     Var  PreScaleCanculate = 100
-	DEBUGVAR VendingCashless
-	CashlessReq FAIL
-
 
 	Var CashlessPayFlag = 0
 	Var RemainAmountStrENG = ""
@@ -235,24 +223,32 @@
 	EndIf
 
 
+
+
 	Var Seeker.PayWithQR = 0
 	Var NoGotoMenupage = "false"
-		If show_eng = "true" Then
-			Var FilenameShowbuttonCashBN = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_payment_en/page_payment/bn_cash.png"
-			Var FilenameShowbuttonCashBP = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_payment_en/page_payment/bp_cash.png"
+	DEBUGVAR show_eng
+	If show_eng = "true" Then
+		If LanguageShow = "UAE_DUBAI" Then
+			Var FilenameShowbuttonCashBN = CountryWTCRootPath + "/image/page_payment_cash/bn_cash.png"
+			Var FilenameShowbuttonCashBP = CountryWTCRootPath + "/image/page_payment_cash/bp_cash.png"
 		Else
-			Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash.png"
-			Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash.png"
-
+			Var FilenameShowbuttonCashBN = CountryWTCRootPath + "/image/page_payment_en/page_payment/bn_cash.png"
+			Var FilenameShowbuttonCashBP = CountryWTCRootPath + "/image/page_payment_en/page_payment/bp_cash.png"
 		EndIf
+	Else
+		Var FilenameShowbuttonCashBN = CountryRootPath + "/image/page_payment_cash/bn_cash.png"
+		Var FilenameShowbuttonCashBP = CountryRootPath + "/image/page_payment_cash/bp_cash.png"
+
+	EndIf
 
 	Var X_CASH = 216
 
 	If RoadShow = "true" Then
 		Var X_CASH = 287
 		If show_eng = "true" Then
-			Var FilenameShowbuttonCashBN = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_payment_en/page_payment/bn_cash.png"
-			Var FilenameShowbuttonCashBP = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_payment_en/page_payment/bp_cash.png"
+			Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png"
+			Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash.png"
 		Else
 			Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash.png"
 			Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash.png"
@@ -275,8 +271,6 @@
 			Var PaidPaymentFromNextStage = 1
 
 		EndIf
-		DEBUGVAR UserChoosePayment
-		Var UserChoosePayment = ""
 		Open "ROOT/taobin_project/xml/page_thankyou.xml"
 
 	EndIf
@@ -348,16 +342,48 @@
 	;EndIf
 
 	If show_eng = "true" Then
-		Var DirImage = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_payment_en/page_payment"
-		Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_payment_cash_extend_en"
+		Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
+		Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_en"
+
+		If UsePepsiTheme = 1 Then
+			Var DirImage = CountryWTCRootPath + "/image/page_payment_en/page_payment"
+			Var DirImage2 = CountryWTCRootPath + "/image/page_payment_cash_extend_en"
+		EndIf
+
+
 		Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
 
+		Var backTopLeft = DirImage + "/bn_back_arrow2.png"
+
+		Var cancelBtn = DirImage + "/bn_cancel.png"
+		Var cancelBtnP = DirImage + "/bp_cancel.png"
+
+		Var cancel2Btn = DirImage2 + "/bn_cancel2.png"
+		Var cancel2BtnP = DirImage2 + "/bp_cancel2.png"
 	Else
 		Var DirImage = "ROOT/taobin_project/image/page_payment"
 		Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend"
 		Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
 	EndIf
 
+	If LanguageShow = "UAE_DUBAI" Then
+		Var DirImage = CountryRootPath + "/image/page_payment_cash/"
+
+		If UsePepsiTheme = 1 Then
+			Var DirImage = CountryWTCRootPath + "/image/page_payment_cash/"
+		EndIf
+
+		Var backTopLeft = DirImage + "/bn_back_arrow2-UAE_DUBAI.png"
+
+		Var cancelBtn = DirImage + "/bn_cancel-UAE_DUBAI.png"
+		Var cancelBtnP = DirImage + "/bp_cancel-UAE_DUBAI.png"
+
+		Var cancel2Btn = DirImage + "/bn_cancel2-UAE_DUBAI.png"
+		Var cancel2BtnP = DirImage + "/bp_cancel2-UAE_DUBAI.png"
+
+		DEBUGVAR cancel2Btn
+		DEBUGVAR cancel2BtnP
+	EndIf
 
 	Var EnoughChange = "yes"
 
@@ -369,6 +395,10 @@
 		Var SELLONLINE = 1
 	EndIf
 
+	If IgnoreNetCore = "true" Then
+		Var SELLONLINE = 1
+	EndIf
+
 	If SELLONLINE = 0 Then
 			SAVELOG "Cash only NetworkStatus down"
 
@@ -383,7 +413,6 @@
 			Var ShowNetworkProblem = "Enable"
 			Var ShowButtonClick2 = "Invisible"
 
-
 	Else
 		Var PayOfflineMode = 0
 
@@ -407,7 +436,14 @@
 
 
 	Var pay_with_credit_image = DirImage + "/bp_pay_with_credit.png"
-	Var pay_with_chanel_text = DirImage + "/text_1.png"
+	If LanguageShow = "UAE_DUBAI" Then
+		Var pay_with_chanel_text = CountryRootPath + "image/page_payment_cash/text_1.png"
+		If UsePepsiTheme = 1 Then
+			Var pay_with_chanel_text = CountryWTCRootPath + "/image/page_payment_cash/text_1.png"
+		EndIf
+	Else
+		Var pay_with_chanel_text = DirImage + "/text_1.png"
+	EndIf
 
 
 	;If DisableUsingCode = "true" Then
@@ -470,19 +506,19 @@
 	Var TopRowY = 1276
 	Var BotRowY = 1499
 
+	If SettingDisableTaobinCredit = "true" Then
 	Var PayState4 = "Invisible"
+	Var PayState4 = "Invisible"
+
+	If SettingDisableTaobinCode = "true" Then
+		Var PayState2 = "Invisible"
+		Var PayState4 = "Invisible"
 
 	If SettingDisableTaobinCode = "true" Then
 		Var PayState2 = "Invisible"
 	EndIf
 
-
-	Var UserChoosePayment = ""
-
-	DEBUGVAR SettingDisableTaobinCredit
-	Var CancelContinue = 0
-
-	Var QR_POPUP = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_payment/img_tap_card_5_sec.png"
+	DEBUGVAR DirImage2
 </EventOpen>
 
 <EventActionOk>
@@ -492,7 +528,6 @@
 	DEBUGVAR ECommerceQR
 	SPLIT  ECommerceQR "/"  5  VendingQRTypeResult
 
-	DEBUGVAR UserChoosePayment
 
 	If ActionOKCase = 0 Then
 		If VendingREFID = "" Then
@@ -540,8 +575,6 @@
 
 			Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
 			Var BrewingTextThai = "เตรียมแก้ว"
-			DEBUGVAR UserChoosePayment
-			Var UserChoosePayment = ""
 			Open "ROOT/taobin_project/xml/page_thankyou.xml"
 
 		EndIf
@@ -730,18 +763,23 @@
 		Var Seeker.CreditCard = 1
 		Var Seeker.CreditCardRef = CreditCardRef
 
-		DEBUGVAR UserChoosePayment
-		Var UserChoosePayment = ""
+		CashlessReq SUCCESS
+
 		Open "ROOT/taobin_project/xml/page_thankyou.xml"
 
 	EndIf
 
+	If VendingCashless = "END" Then
+        If ReqPayInfoFromCashOther = 2 Then
+            DEBUGVAR "CashlessReq OFF"
+           	CashlessReq OFF
+        EndIf
+	EndIf
+
 </EventActionOk>
 
 <EventActionError>
 
-	DEBUGVAR UserChoosePayment
-
 	If ActionOKCase = 0 Then
 		If ReqPayInfoFlag = 1 Then
 			Var QRErrorFlag = 1
@@ -777,13 +815,17 @@
 
 
 	If VendingCashless = "ERROR" Then
-		Var Timeout = 0
+    	If CoinInOK = 1 Then
 
-		;Var QRErrorFlag = 1
-		If alphaState = "Enable" Then
-			Var QRErrorState = "Enable"
-			Var LOADING_STATE = "Invisible"
-		EndIf
+    	Else
+    		Var Timeout = 0
+    	EndIf
+
+    	;Var QRErrorFlag = 1
+    	If alphaState = "Enable" Then
+    		Var QRErrorState = "Enable"
+    		Var LOADING_STATE = "Invisible"
+    	EndIf
 
 	EndIf
 
@@ -794,82 +836,14 @@
 </EventActionError>
 
 <EventCashlessCard>
-
-	Var CreditCardRef = ""
-	GenHashWithTimeStamp CreditCardRef
-	DEBUGVAR VendingCashless
-	DEBUGVAR UserChoosePayment
-	DEBUGVAR CoinInFlag
-
-
-
-	If CancelFlag = 0 Then
-
-		If CoinInFlag = 0 Then
-
-			DEBUGVAR UserChoosePayment
-			DEBUGVAR VendingCashless
-
-			If UserChoosePayment = "CreditCashless" Then
-				If VendingCashless = "READY" Then
-					Var QRCODE99 = ""
-					Var Timeout = 0
-					Var QRErrorState = "Invisible"
-					Var QR_POPUP = "ROOT/taobin_project/image/page_payment_en/page_payment/img_popup8-2.png"
-					Var VendingCashless = "-"
-					Var LOADING_STATE = "Enable"
-					Var alphaState = "Enable"
-					Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
-					CashlessPay RemainAmountX CreditCardRef
-					Var CashlessPayFlag = 1
-				EndIf
-			EndIf
-
-			If UserChoosePayment = "" Then
-				If VendingCashless = "READY" Then
-					Var QRCODE99 = ""
-					Var Timeout = 0
-					Var QRErrorState = "Invisible"
-					Var QR_POPUP = "ROOT/taobin_project/image/page_payment_en/page_payment/img_popup8-2.png"
-					Var VendingCashless = "-"
-					Var LOADING_STATE = "Enable"
-					Var alphaState = "Enable"
-					Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
-					CashlessPay RemainAmountX CreditCardRef
-					Var CashlessPayFlag = 1
-
-					Var UserChoosePayment = "CreditCashless"
-				EndIf
-			EndIf
-
-		EndIf
-
-	Else
-
-		If CancelFlag = 1 Then
-			DEBUGVAR CancelFlag
-			Var CashlessPayFlag = 0
-			CashlessReq FAIL
-		EndIf
-
-	EndIf
-
-
 	Refresh
-
 </EventCashlessCard>
 
 
 <Timeout> 1000 </Timeout>
 <EventTimeout>
-
-	DEBUGVAR VendingCashless
-
-
 	If ReadyForBrew = "false" Then
 		SAVELOG "Back to main1"
-		DEBUGVAR UserChoosePayment
-		Var UserChoosePayment = ""
 		Open "ROOT/taobin_project/xml/page_back_to_main.xml"
 
 	EndIf
@@ -907,11 +881,17 @@
 
 	  If RoadShow = "true" Then
 	  Else
-	  	If PayState3 = "Enable" Then
+			Var PayState3 = "Disable"
 			Var PayState3 = "Disable"
 		EndIf
+		If PayState5 = "Enable" Then
+		Var PayState3 = "Disable"
+		EndIf
 		If PayState5 = "Enable" Then
 		  	Var PayState5 = "Disable"
+		  	Var PayState5 = "Disable"
+	  	EndIf
+	  	Var PayState5 = "Disable"
 	  	EndIf
 	  EndIf
 
@@ -963,41 +943,24 @@
 			;Var Timeout = 0
 		EndIf
 		If Seeker = "curr" Then
-			DEBUGVAR UserChoosePayment
-			DEBUGVAR CancelContinue
-			Var UserChoosePayment = ""
-
-			If CancelContinue = 2 Then
-		        Open "ROOT/taobin_project/xml/page_payment.xml"
-			EndIf
-
 			Open "ROOT/taobin_project/xml/page_catalog.xml"
 		Else
-			DEBUGVAR UserChoosePayment
-			Var UserChoosePayment = ""
 
-			If CancelContinue = 2 Then
-		        Open "ROOT/taobin_project/xml/page_payment.xml"
-			EndIf
-
-			Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
+			Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
+			DEBUGVAR brewing3ContiInter
+			Open brewing3ContiInter
 		EndIf
 	EndIf
 
 
 	If TestLoopMakeDrink = 1 Then
 		MakeDrinkV1  SelectDrink SelectSugarID
-		DEBUGVAR UserChoosePayment
-		Var UserChoosePayment = ""
 		Open "ROOT/taobin_project/xml/page_thankyou.xml"
 	EndIf
 
 
 
 	If CoinInOK = 1 Then
-
-		Var PayState5 = "Disable"
-
 		Var CoinInCounter = CoinInCounter + 1
 		If CoinInCounter = 1 Then
 
@@ -1008,10 +971,6 @@
 			Var PayOK = 1
 
 		EndIf
-
-	Else
-		Var PayState5 = "Enable"
-
 	EndIf
 
 	Var stringLog = "Timeout " + Timeout
@@ -1035,8 +994,6 @@
 
 			EndIf
 
-			DEBUGVAR UserChoosePayment
-			Var UserChoosePayment = ""
 			Open "ROOT/taobin_project/xml/page_thankyou.xml"
 
 		Else
@@ -1051,20 +1008,6 @@
 				Var CancelFlag = 1
 				Var cancelState = "Enable"
 
-				If CashlessPayFlag = 0 Then
-
-					If UserChoosePayment = "CreditCashless" Then
-						Var CashlessPayFlag = 0
-						CashlessReq FAIL
-					EndIf
-
-					If UserChoosePayment = "" Then
-						Var CashlessPayFlag = 0
-						CashlessReq FAIL
-					EndIf
-
-				EndIf
-
 				If CashlessPayFlag = 1 Then
 					Var CashlessPayFlag = 0
 					CashlessReq FAIL
@@ -1086,13 +1029,11 @@
 					If Seeker.IntVendingCampaign = 0 Then
 						VendingQR OFF
 						If Seeker = "curr" Then
-							DEBUGVAR UserChoosePayment
-							Var UserChoosePayment = ""
 							Open "ROOT/taobin_project/xml/page_catalog.xml"
 						Else
-							DEBUGVAR UserChoosePayment
-							Var UserChoosePayment = ""
-							Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
+							Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
+
+							Open brewing3ContiInter
 						EndIf
 					EndIf
 				EndIf
@@ -1113,32 +1054,20 @@
 		EndIf
 
 		Var CancelCounter = CancelCounter + 1
-		DEBUGVAR CancelCounter
-		DEBUGVAR Seeker.StoreCreditFlag
-		DEBUGVAR CancelNumber
 		If CancelCounter = CancelNumber Then
 			;Change CoinAmount
-			DEBUGVAR CoinAmount
 			If CoinAmount > 0 Then
-				DEBUGVAR Seeker.StoreCreditFlag
 				If Seeker.StoreCreditFlag = 1 Then
 					Var ChangeOK = 1
 				Else
-					DEBUGVAR CoinAmount
 					Change CoinAmount
 				EndIf
 
 			Else
-				DEBUGVAR CancelContinue
 				If ActionOKCase = 0 Then
 					Var ActionOKCase = 1
 					Var PayInfoCFlag = 1
 				EndIf
-
-				If CancelContinue = 1 Then
-				    Var CancelContinue = 2
-				EndIf
-
 			EndIf
 
 			VendingQR OFF
@@ -1173,13 +1102,11 @@
 				If Seeker = "curr" Then
 					If Seeker.IntVendingCampaign = 0 Then
 							If Seeker = "curr" Then
-								DEBUGVAR UserChoosePayment
-								Var UserChoosePayment = ""
 								Open "ROOT/taobin_project/xml/page_catalog.xml"
 							Else
-								DEBUGVAR UserChoosePayment
-								Var UserChoosePayment = ""
-								Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
+								Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
+
+								Open brewing3ContiInter
 							EndIf
 					EndIf
 				Else
@@ -1339,8 +1266,6 @@
 
 	Var CoinInFlag = 1
 
-	DEBUGVAR CoinInOK
-
 
 
 	If ViewBill > 0 Then
@@ -1383,11 +1308,11 @@
 					Var alphaState3_offline = "Enable"
 				EndIf
 
-				If show_eng = "true" Then
-					PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/The_change_has_run_out.mp3"
-				Else
-					PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/The_change_has_run_out.mp3"
-				EndIf
+				;If show_eng = "true" Then
+				;	PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/The_change_has_run_out.mp3"
+				;Else
+				;	PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/The_change_has_run_out.mp3"
+				;EndIf
 
 			EndIf
 
@@ -1505,8 +1430,8 @@
 <Button>
 <X> 18 </X>
 <Y> 422 </Y>
-<Filename> Var( DirImage + "/bn_back_arrow2.png")  </Filename>
-<FilenamePress> Var( DirImage + "/bn_back_arrow2.png") </FilenamePress>
+<Filename> backTopLeft  </Filename>
+<FilenamePress> backTopLeft </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
@@ -1529,30 +1454,11 @@
 				Var CancelNumber = 12
 			EndIf
 
-			If CashlessPayFlag = 0 Then
-				If UserChoosePayment = "CreditCashless" Then
-					Var CashlessPayFlag = 0
-					CashlessReq FAIL
-				EndIf
-
-				If UserChoosePayment = "" Then
-					Var CashlessPayFlag = 0
-					CashlessReq FAIL
-				EndIf
-			EndIf
-
 			If CashlessPayFlag = 1 Then
 				Var CashlessPayFlag = 0
 				CashlessReq FAIL
 			EndIf
 
-
-
-			DEBUGVAR UserChoosePayment
-			Var UserChoosePayment = ""
-
-			Var CancelContinue = 0
-
         EndIf
 	EndIf
 
@@ -1569,12 +1475,6 @@
 <Filename> PictureDrink </Filename>
 </Image>
 
-<Image>
-<X> 375 </X>
-<Y> 623 </Y>
-<Filename> OverlayMenuFilter </Filename>
-</Image>
-
 
 <Image>
 <X> 375 </X>
@@ -1594,6 +1494,7 @@
 <X>  664 </X>
 <Y>  1276</Y>
 <State> PayState2</State>
+;inter-image
 <Filename> Var( DirImage + "/bn_pay_with_code.png") </Filename>
 <FilenamePress> Var( DirImage + "/bp_pay_with_code.png") </FilenamePress>
 <FilenameDisable> Var( DirImage + "/bd_pay_with_code.png") </FilenameDisable>
@@ -1607,9 +1508,7 @@
 			If CancelFlag = 0 Then
 			Var TelephoneNumber = ""
 			Var Tel_Confirm_State = "Disable"
-
-			Var UserChoosePayment = "Code"
-			Open "ROOT/taobin_project/inter/whatthecup/sgp/xml/page_payment_code-SGP_blue.xml"
+			Open "ROOT/taobin_project/xml/page_payment_code.xml"
 			EndIf
 		EndIf
 
@@ -1621,28 +1520,51 @@
 <X> X_CASH </X>
 <Y> 1276 </Y>
 <State> PayState5 </State>
-<Filename> Var( DirImage + "/bn_credit_card_ezlink.png") </Filename>
-<FilenamePress> Var( DirImage + "/bp_credit_card_ezlink.png") </FilenamePress>
-<FilenameDisable> Var( DirImage + "/bd_credit_card_ezlink.png") </FilenameDisable>
+;inter-image
+<Filename> Var( DirImage + "/bn_credit_card_and_qr.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_credit_card_and_qr.png") </FilenamePress>
+<FilenameDisable> Var( DirImage + "/bd_credit_card_and_qr.png") </FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
 
-If alphaState = "Invisible" Then
-	If CoinInFlag = 0 Then
-		If CancelFlag = 0 Then
+    If alphaState = "Invisible" Then
+    	If CoinInFlag = 0 Then
+    		If CancelFlag = 0 Then
+                Var QR_POPUP = "/img_popup8.png"
+                Var alphaState = "Enable"
+                Coin CARD
 
-			Var UserChoosePayment = "CreditCashless"
+                Var ReqPayInfoFromCashOther = 2
+                Var CreditCardRef = ""
 
-            Var QR_POPUP = DirImage + "/image/page_payment_en/page_payment/img_tap_card_5_sec.png"
-			DEBUGVAR QR_POPUP
-			Refresh
-            Var alphaState = "Enable"
-            Coin CARD
-        EndIf
-	EndIf
+               	GenHashWithTimeStamp CreditCardRef
+               	DEBUGVAR VendingCashless
 
-EndIf
+               	Var QRCODE99 = ""
+               	Var Timeout = 0
+               	Var QRErrorState = "Invisible"
+
+               	;add-pd-to-ref
+               	Var CreditCardRef = CreditCardRef + "/"
+               	Var CreditCardRef = CreditCardRef + SelectDrink
+               	DEBUGVAR CreditCardRef
+
+          		If CoinInOK = 1 Then
+
+          		Else
+         			Var Timeout = 0
+          		EndIf
+
+          		Var VendingCashless = "-"
+          		Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
+          		CashlessPay RemainAmountX CreditCardRef
+          		Var CashlessPayFlag = 1
+            EndIf
+    	EndIf
+    EndIf
+
+    Refresh
 
 </EventClick>
 </Button>
@@ -1667,8 +1589,6 @@ EndIf
 			If CancelFlag = 0 Then
 			Var TelephoneNumber = ""
 			Var Tel_Confirm_State = "Disable"
-
-			Var UserChoosePayment = "Credit"
 			Open "ROOT/taobin_project/xml/page_payment_credit.xml"
 			EndIf
 		EndIf
@@ -1679,7 +1599,7 @@ EndIf
 </EventClick>
 </Button>
 
-; cash Singapore
+; cash Dubai
 <Button>
 <X> 439 </X>
 <Y> eval(
@@ -1699,8 +1619,6 @@ EndIf
 
 	If alphaState = "Invisible" Then
 
-		Var UserChoosePayment = "Coin"
-
 		If EnoughChange = "yes" Then
 
 			Var alphaState2 = "Enable"
@@ -1758,18 +1676,6 @@ EndIf
 				Var CancelNumber = 12
 			EndIf
 
-			If CashlessPayFlag = 0 Then
-				If UserChoosePayment = "CreditCashless" Then
-					Var CashlessPayFlag = 0
-					CashlessReq FAIL
-				EndIf
-
-				If UserChoosePayment = "" Then
-					Var CashlessPayFlag = 0
-					CashlessReq FAIL
-				EndIf
-			EndIf
-
 			If CashlessPayFlag = 1 Then
 				Var CashlessPayFlag = 0
 				CashlessReq FAIL
@@ -1790,7 +1696,7 @@ EndIf
 <Align> Center </Align>
 <Size> 72 </Size>
 <Font> KanitMediumTTF </Font>
-<Color> PopupBodyTextColor </Color>
+<Color> 0xB78F24 </Color>
 <Value> showRemaining </Value>
 </Text>
 
@@ -1801,9 +1707,9 @@ EndIf
 <Y> 938 </Y>
 <Width> 1080</Width>
 <Align> Center </Align>
-<Size> 66 </Size>
+<Size> 72 </Size>
 <Font> KanitMediumTTF </Font>
-<Color> HeadlineColor </Color>
+<Color> 0x513C2F </Color>
 <Value> showname </Value>
 </Text>
 
@@ -1814,7 +1720,7 @@ EndIf
 <Align> Center </Align>
 <Size> 24 </Size>
 <Font> KanitLightTTF </Font>
-<Color> SubHeadlineColor </Color>
+<Color> 0x6F5F51 </Color>
 <Value> showdesc </Value>
 </Text>
 
@@ -1823,14 +1729,21 @@ EndIf
 <X> 0 </X>
 <Y> 380 </Y>
 <State> alphaState </State>
-<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/page_payment_en/page_payment/alpha.png" </Filename>
+<Filename> "ROOT/taobin_project/image/page_payment/alpha.png" </Filename>
 </Image>
 
 <Image>
 <X> 249 </X>
 <Y> 748 </Y>
 <State> alphaState </State>
-<Filename>  QR_POPUP </Filename>
+<Filename> eval(
+	If LanguageShow = "UAE_DUBAI" Then
+		Var return = DirImage + QR_POPUP
+	Else
+		Var return = "ROOT/taobin_project/image/page_payment_en/page_payment/" + QR_POPUP
+	EndIf
+	DEBUGVAR return
+)</Filename>
 </Image>
 
 
@@ -1850,41 +1763,25 @@ EndIf
 <X> 438 </X>
 <Y> 1345 </Y>
 <State> alphaState </State>
-<Filename> Var( DirImage + "/bn_cancel.png" )</Filename>
-<FilenamePress> Var( DirImage + "/bp_cancel.png" )</FilenamePress>
+<Filename> cancelBtn </Filename>
+<FilenamePress> cancelBtnP </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
 
-	  Var LOADING_STATE = "Invisible"
-	  Var QRErrorState = "Invisible"
-	  Var alphaState = "Invisible"
-	  Var QRCODE99 = ""
-	  ;CoinVending ON
-	  ;VendingQR OFF
+    Var LOADING_STATE = "Invisible"
+    Var QRErrorState = "Invisible"
+    Var alphaState = "Invisible"
+    Var QRCODE99 = ""
+    ;CoinVending ON
+    ;VendingQR OFF
 
-	  CashlessReq OFF
+    If CashlessPayFlag = 1 Then
+        Var CashlessPayFlag = 0
+        CashlessReq FAIL
+    EndIf
 
-	If CashlessPayFlag = 0 Then
-		If UserChoosePayment = "CreditCashless" Then
-			Var CashlessPayFlag = 0
-			CashlessReq FAIL
-		EndIf
-
-		If UserChoosePayment = "" Then
-			Var CashlessPayFlag = 0
-			CashlessReq FAIL
-		EndIf
-	EndIf
-
-
-	  If CashlessPayFlag = 1 Then
-		Var CashlessPayFlag = 0
-		CashlessReq FAIL
-	  EndIf
-
-
-	  Refresh
+    Refresh
 </EventClick>
 </Button>
 
@@ -1893,7 +1790,7 @@ EndIf
 <X> 0 </X>
 <Y> 380 </Y>
 <State> alphaState2 </State>
-<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/page_payment_en/page_payment/alpha.png" </Filename>
+<Filename> "ROOT/taobin_project/image/page_payment/alpha.png" </Filename>
 </Image>
 
 <Image>
@@ -1901,7 +1798,13 @@ EndIf
 <Y> 748 </Y>
 <State> alphaState2 </State>
 ;inter-image
-<Filename> Var( DirImage2 + "/img_popup11-SGP.png" )</Filename>
+<Filename> eval(
+	If LanguageShow = "UAE_DUBAI" Then
+		Var return = CountryRootPath + "/image/page_payment_cash/img_popup11-UAE_DUBAI.png"
+	Else
+		Var return = CountryRootPath + "/image/page_payment_cash/img_popup11-UAE_DUBAI_en.png"
+	EndIf
+) </Filename>
 </Image>
 
 
@@ -1953,8 +1856,6 @@ EndIf
 <EventClick>
 	;VendingQR OFF
 
-	SAVELOG "AdultState1 click"
-
 	If CoinInOK = 0 Then
         If CancelFlag = 0 Then
 			SAVELOG "ButtonCancleMain  > Cancle Order."
@@ -1971,23 +1872,6 @@ EndIf
 				Var CancelNumber = 12
 			EndIf
 
-			If CashlessPayFlag = 0 Then
-				If UserChoosePayment = "CreditCashless" Then
-					Var CashlessPayFlag = 0
-					CashlessReq FAIL
-				EndIf
-
-				If UserChoosePayment = "" Then
-					Var CashlessPayFlag = 0
-					CashlessReq FAIL
-				EndIf
-			EndIf
-
-			If CashlessPayFlag = 1 Then
-				Var CashlessPayFlag = 0
-				CashlessReq FAIL
-			EndIf
-
         EndIf
 	EndIf
 
@@ -2021,9 +1905,6 @@ EndIf
 <EventClick>
 	;VendingQR OFF
 
-	SAVELOG "AdultState3 click"
-
-
 	If CoinInOK = 0 Then
         If CancelFlag = 0 Then
 			SAVELOG "ButtonCancleMain  > Cancle Order."
@@ -2040,23 +1921,6 @@ EndIf
 				Var CancelNumber = 12
 			EndIf
 
-			If CashlessPayFlag = 0 Then
-				If UserChoosePayment = "CreditCashless" Then
-					Var CashlessPayFlag = 0
-					CashlessReq FAIL
-				EndIf
-
-				If UserChoosePayment = "" Then
-					Var CashlessPayFlag = 0
-					CashlessReq FAIL
-				EndIf
-			EndIf
-
-			If CashlessPayFlag = 1 Then
-				Var CashlessPayFlag = 0
-				CashlessReq FAIL
-			EndIf
-
         EndIf
 	EndIf
 
@@ -2068,8 +1932,8 @@ EndIf
 <X> 438 </X>
 <Y> 1345 </Y>
 <State> alphaState2 </State>
-<Filename> Var( DirImage + "/bn_cancel.png" )</Filename>
-<FilenamePress> Var( DirImage + "/bp_cancel.png" )</FilenamePress>
+<Filename> cancelBtn </Filename>
+<FilenamePress> cancelBtn </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
@@ -2077,8 +1941,7 @@ EndIf
 
 
 
-	SAVELOG "alphaState2 click"
-	DEBUGVAR CancelFlag
+
 	If CoinInOK = 0 Then
         If CancelFlag = 0 Then
 			SAVELOG "ButtonCancleAlpha2  > Cancle Order."
@@ -2093,17 +1956,35 @@ EndIf
 			If FlagQROpened = 1 Then
 				Var CancelNumber = 12
 			EndIf
-
-			If CashlessPayFlag = 0 Then
-				If UserChoosePayment = "CreditCashless" Then
-					Var CashlessPayFlag = 0
-					CashlessReq FAIL
+				EndIf
 				EndIf
 
+				If UserChoosePayment = "" Then
+					Var CashlessPayFlag = 0
+					CashlessReq FAIL
+        EndIf
+
 				If UserChoosePayment = "" Then
 					Var CashlessPayFlag = 0
 					CashlessReq FAIL
 				EndIf
+				EndIf
+			EndIf
+
+			If CashlessPayFlag = 1 Then
+				Var CashlessPayFlag = 0
+				CashlessReq FAIL
+			EndIf
+
+
+        EndIf
+	EndIf
+
+	DEBUGVAR UserChoosePayment
+	Var UserChoosePayment = ""
+
+	Var CancelContinue = 1
+	EndIf
 			EndIf
 
 			If CashlessPayFlag = 1 Then
@@ -2138,7 +2019,7 @@ EndIf
 <Width> 1080 </Width>
 <Font> KanitRegularTTF </Font>
 <State> alphaState2 </State>
-<Color> PopupBodyTextColor </Color>
+<Color> 0xDE794E </Color>
 <Value> RemainAmountStr </Value>
 </Text>
 ; end case popup
@@ -2147,107 +2028,42 @@ EndIf
 <X> 0 </X>
 <Y> 380 </Y>
 <State> alphaState3 </State>
-<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/page_payment_en/page_payment/alpha.png" </Filename>
+<Filename> "ROOT/taobin_project/image/page_payment/alpha.png" </Filename>
 </Image>
 
 <Image>
 <X> 182 </X>
 <Y> 748 </Y>
 <State> alphaState3 </State>
-<Filename> Var( DirImage + "/img_popup12_NotEnoughCoin.png" )</Filename>
+<Filename> Var( DirImage2 + "/img_popup12_uae.png" )</Filename>
 </Image>
 
+;<Button>
+;<X> 327 </X>
+;<Y> 1208 </Y>
+;<State> alphaState3 </State>
+;<Filename> Var( DirImage2 + "/bn_keep.png" )</Filename>
+;<FilenamePress> Var( DirImage2 + "/bp_keep.png" )</FilenamePress>
+;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+;<Volume> SoundVolume </Volume>
+;<EventClick>
+;
+;		Open "ROOT/taobin_project/xml/page_payment_storeCredit.xml"
+;</EventClick>
+;</Button>
+
 <Button>
 <X> 327 </X>
-<Y> 1208 </Y>
-<State> eval(
-	DEBUGVAR SettingDisableTaobinCredit
-	If SettingDisableTaobinCredit = "true" Then
-		Var return = "Invisible"
-	Else
-		Var return = alphaState3
-	EndIf
-	DEBUGVAR return
-) </State>
-<Filename> Var( DirImage2 + "/bn_keep.png" )</Filename>
-<FilenamePress> Var( DirImage2 + "/bp_keep.png" )</FilenamePress>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick>
-
-		Open "ROOT/taobin_project/xml/page_payment_storeCredit.xml"
-</EventClick>
-</Button>
-
-<Button>
-<X> 397 </X>
 <Y> 1335 </Y>
 <State> alphaState3 </State>
-<Filename> Var( DirImage + "/bn_cancel2.png" )</Filename>
-<FilenamePress> Var( DirImage + "/bp_cancel2.png" )</FilenamePress>
+<Filename> cancel2Btn </Filename>
+<FilenamePress> cancel2BtnP </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
 
-	SAVELOG "alphaState3 click"
 	CoinVending BILLREJECT
 	Var alphaState3 = "Invisible"
-
-	If SettingDisableTaobinCredit = "true" Then
-
-		If EnoughChange = "yes" Then
-
-
-		Else
-
-			If CoinInOK = 0 Then
-				If CancelFlag = 0 Then
-
-					If ViewBill > 0 Then
-							CoinVending BILLREJECT
-					EndIf
-
-					SAVELOG "ButtonCancleMain  > Cancle Order."
-					Machine CancelWepApp
-					CoinVending OFF
-					Var CancelFlag = 1
-					Var cancelState = "Enable"
-					Var CancelCounter = 0
-
-					If FlagQROpened = 1 Then
-						Var CancelNumber = 12
-					EndIf
-
-					If CashlessPayFlag = 0 Then
-						If UserChoosePayment = "CreditCashless" Then
-							Var CashlessPayFlag = 0
-							CashlessReq FAIL
-						EndIf
-
-						If UserChoosePayment = "" Then
-							Var CashlessPayFlag = 0
-							CashlessReq FAIL
-						EndIf
-					EndIf
-
-
-					If CashlessPayFlag = 1 Then
-						Var CashlessPayFlag = 0
-						CashlessReq FAIL
-					EndIf
-
-					DEBUGVAR UserChoosePayment
-					Var UserChoosePayment = ""
-
-					Var CancelContinue = 0
-
-				EndIf
-			EndIf
-
-
-		EndIf
-	EndIf
-
 	Refresh
 </EventClick>
 </Button>
@@ -2256,86 +2072,28 @@ EndIf
 <X> 0 </X>
 <Y> 380 </Y>
 <State> alphaState3_offline </State>
-<Filename> "ROOT/taobin_project/whatthecup/sgp/image/page_payment_en/page_payment/alpha.png" </Filename>
+<Filename> "ROOT/taobin_project/image/page_payment/alpha.png" </Filename>
 </Image>
 
 <Image>
 <X> 182 </X>
 <Y> 748 </Y>
 <State> alphaState3_offline </State>
-<Filename> Var( DirImage + "/img_popup12_offline.png" )</Filename>
+<Filename> Var( DirImage2 + "/img_popup12_offline.png" )</Filename>
 </Image>
 
 <Button>
-<X> 397 </X>
+<X> 327 </X>
 <Y> 1335 </Y>
 <State> alphaState3_offline </State>
-<Filename> Var( DirImage + "/bn_cancel2.png" )</Filename>
-<FilenamePress> Var( DirImage + "/bp_cancel2.png" )</FilenamePress>
+<Filename> cancel2Btn </Filename>
+<FilenamePress> cancel2BtnP </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
-	SAVELOG "alphaState3_offline click"
+
 	CoinVending BILLREJECT
 	Var alphaState3_offline = "Invisible"
-
-
-	If SettingDisableTaobinCredit = "true" Then
-
-		If EnoughChange = "yes" Then
-
-
-		Else
-
-			If CoinInOK = 0 Then
-				If CancelFlag = 0 Then
-
-					If ViewBill > 0 Then
-							CoinVending BILLREJECT
-					EndIf
-
-					SAVELOG "ButtonCancleMain  > Cancle Order."
-					Machine CancelWepApp
-					CoinVending OFF
-					Var CancelFlag = 1
-					Var cancelState = "Enable"
-					Var CancelCounter = 0
-
-					If FlagQROpened = 1 Then
-						Var CancelNumber = 12
-					EndIf
-
-					If CashlessPayFlag = 0 Then
-						If UserChoosePayment = "CreditCashless" Then
-							Var CashlessPayFlag = 0
-							CashlessReq FAIL
-						EndIf
-
-						If UserChoosePayment = "" Then
-							Var CashlessPayFlag = 0
-							CashlessReq FAIL
-						EndIf
-					EndIf
-
-					If CashlessPayFlag = 1 Then
-						Var CashlessPayFlag = 0
-						CashlessReq FAIL
-					EndIf
-
-					DEBUGVAR UserChoosePayment
-					Var UserChoosePayment = ""
-
-					Var CancelContinue = 1
-
-				EndIf
-			EndIf
-
-
-		EndIf
-	EndIf
-
-
-
 	Refresh
 </EventClick>
 </Button>
@@ -2391,7 +2149,14 @@ EndIf
 <X> 0 </X>
 <Y> 380 </Y>
 <State> cancelState </State>
-<Filename> Var( DirImage + "/CancelOrder2.png" ) </Filename>
+;Var( DirImage + "/CancelOrder.png" )
+<Filename> eval(
+	If LanguageShow = "UAE_DUBAI" Then
+		Var return = DirImage + "/CancelOrder-UAE_DUBAI.png"
+	Else
+		Var return = DirImage + "/CancelOrder.png"
+	EndIf
+) </Filename>
 </Image>
 
 ;<GIF>
@@ -2467,40 +2232,17 @@ EndIf
 <Value> ShowNetworkProblemText </Value>
 </Text>
 
-
 <EventUnitTest1>
-
-Var SELLONLINE = 1
-Var EnoughChange = "nay"
-Var PayState1 = "Enable"
-
+	Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
+	Var MachineStage = "make-drink"
+	Var BrewingTextThai = "เตรียมแก้ว"
+	MakeDrinkV1  SelectDrink SelectSugarID
+	Open "ROOT/taobin_project/xml/page_thankyou.xml"
 </EventUnitTest1>
 
-<EventUnitTest2>
 
-Var SELLONLINE = 1
-Var EnoughChange = "yes"
-Var PayState1 = "Enable"
 
-</EventUnitTest2>
 
-<EventUnitTest3>
-
-MakeDrinkV1  SelectDrink SelectSugarID
-Open "ROOT/taobin_project/xml/page_thankyou.xml"
-
-</EventUnitTest3>
-<EventUnitTest4>
-
-Var PayState2 = "Enable"
-
-</EventUnitTest4>
-
-<EventUnitTest5>
-
-Var alphaState3 = "Enable"
-
-</EventUnitTest5>
 
 
 
diff --git a/xml/page_board.xml b/xml/page_board.xml
index 28021cb9..bdd0e824 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -1264,6 +1264,9 @@
 
 			Var ShowButtonClickFull = "Enable"
 
+			; root-path
+			Var CountryWTCRootPath = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+
 		EndIf
 	Else
 		; default-theme
diff --git a/xml/page_payment_cash-UAE.xml b/xml/page_payment_cash-UAE.xml
index 69e6f26c..09dcafa7 100644
--- a/xml/page_payment_cash-UAE.xml
+++ b/xml/page_payment_cash-UAE.xml
@@ -7,6 +7,10 @@
 <Sound> PlaySoundLag </Sound>
 <EventOpen>
 
+	If UsePepsiTheme = 1 Then
+		Open "ROOT/taobin_project/inter/whatthecup/uae_dubai/xml/page_payment_cash-UAE_blue.xml"
+	EndIf
+
 	Var cash_disable = "0"
 	READ_FILE "/mnt/sdcard/coffeevending/cash_disable" cash_disable
 	DEBUGVAR cash_disable