diff --git a/animation01/play_list.tsv b/animation01/play_list.tsv
index 7c3b0970..73123d06 100644
--- a/animation01/play_list.tsv
+++ b/animation01/play_list.tsv
@@ -1363,3 +1363,14 @@ Macallan Lumina Mizuwari 11-99-05-0055 1 27 28 24 100 7:40 32
ผลไม้ปั่น 12-01-07-0001 1 41 41 41 41 41 24 100 7:40 32
+
+
+โอวัลตินกาแฟ 12-01-03-0092 1 51 17 2 3 4 5 23 41 24 100 7:40 32
+โอวัลตินกาแฟ 12-21-03-0092 1 51 17 2 3 4 5 23 41 24 100 7:40 32
+โอวัลตินชาไทยนม 12-02-03-0105 1 51 17 10 23 41 24 100 7:40 32
+โอวัลตินมัทฉะลาเต้ 12-02-03-0106 1 51 17 8 9 23 41 24 100 7:40 32
+โอวัลตินชานม 12-02-03-0107 1 51 17 10 23 41 24 100 7:40 32
+โอวัลตินมะลิ 12-02-03-0108 1 51 17 10 23 41 24 100 7:40 32
+โอวัลตินน้ำแดง 12-03-03-0108 1 51 17 21 23 41 24 100 7:40 32
+โอวัลตินคาราเมล 12-03-03-0109 1 51 17 22 23 41 24 100 7:40 32
+โอวัลตินมะพร้าว 12-03-03-0110 1 51 17 62 23 41 24 100 7:40 32
diff --git a/image/event/image_template4 b/image/event/image_template4
index 70bbf563..a05472f5 100644
--- a/image/event/image_template4
+++ b/image/event/image_template4
@@ -1,3 +1,3 @@
-normal_thai=ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png
-press_thai=ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png
-disable_thai=ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png
+normal_thai=ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine.png
+press_thai=ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine.png
+disable_thai=ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine.png
diff --git a/image/event/ovaltine_school/ovaltine_school.mp4 b/image/event/ovaltine_school/ovaltine_school.mp4
deleted file mode 100755
index 315c7d64..00000000
Binary files a/image/event/ovaltine_school/ovaltine_school.mp4 and /dev/null differ
diff --git a/image/event/ovaltine_school/ovaltine_school.png b/image/event/ovaltine_school/ovaltine_school.png
deleted file mode 100644
index 6a743d00..00000000
Binary files a/image/event/ovaltine_school/ovaltine_school.png and /dev/null differ
diff --git a/image/event/school_ovaltine/school_ovaltine.jpg b/image/event/school_ovaltine/school_ovaltine.jpg
new file mode 100644
index 00000000..29bc675c
Binary files /dev/null and b/image/event/school_ovaltine/school_ovaltine.jpg differ
diff --git a/image/event/school_ovaltine/school_ovaltine.mp4 b/image/event/school_ovaltine/school_ovaltine.mp4
new file mode 100644
index 00000000..c45c115f
Binary files /dev/null and b/image/event/school_ovaltine/school_ovaltine.mp4 differ
diff --git a/image/page_drink_disable_n2/blended_mango_only.png b/image/page_drink_disable_n2/blended_mango_only.png
new file mode 100644
index 00000000..6639e49f
Binary files /dev/null and b/image/page_drink_disable_n2/blended_mango_only.png differ
diff --git a/image/page_drink_disable_n2/bn_Ovaltine_Latte.png b/image/page_drink_disable_n2/bn_Ovaltine_Latte.png
new file mode 100644
index 00000000..7196201a
Binary files /dev/null and b/image/page_drink_disable_n2/bn_Ovaltine_Latte.png differ
diff --git a/image/page_drink_disable_n2/bn_Ovaltine_Milk_Caramel.png b/image/page_drink_disable_n2/bn_Ovaltine_Milk_Caramel.png
new file mode 100644
index 00000000..71987fbb
Binary files /dev/null and b/image/page_drink_disable_n2/bn_Ovaltine_Milk_Caramel.png differ
diff --git a/image/page_drink_disable_n2/bn_Ovaltine_Milk_Coconut.png b/image/page_drink_disable_n2/bn_Ovaltine_Milk_Coconut.png
new file mode 100644
index 00000000..bb38895f
Binary files /dev/null and b/image/page_drink_disable_n2/bn_Ovaltine_Milk_Coconut.png differ
diff --git a/image/page_drink_disable_n2/bn_Ovaltine_Milk_Jasmine.png b/image/page_drink_disable_n2/bn_Ovaltine_Milk_Jasmine.png
new file mode 100644
index 00000000..7bd5547b
Binary files /dev/null and b/image/page_drink_disable_n2/bn_Ovaltine_Milk_Jasmine.png differ
diff --git a/image/page_drink_disable_n2/bn_Ovaltine_Milk_Matcha.png b/image/page_drink_disable_n2/bn_Ovaltine_Milk_Matcha.png
new file mode 100644
index 00000000..9f000811
Binary files /dev/null and b/image/page_drink_disable_n2/bn_Ovaltine_Milk_Matcha.png differ
diff --git a/image/page_drink_disable_n2/bn_Ovaltine_Milk_Salak.png b/image/page_drink_disable_n2/bn_Ovaltine_Milk_Salak.png
new file mode 100644
index 00000000..e2546f6f
Binary files /dev/null and b/image/page_drink_disable_n2/bn_Ovaltine_Milk_Salak.png differ
diff --git a/image/page_drink_disable_n2/bn_Ovaltine_Milk_Taiwanese_Tea.png b/image/page_drink_disable_n2/bn_Ovaltine_Milk_Taiwanese_Tea.png
new file mode 100644
index 00000000..acbfd34a
Binary files /dev/null and b/image/page_drink_disable_n2/bn_Ovaltine_Milk_Taiwanese_Tea.png differ
diff --git a/image/page_drink_disable_n2/bn_Ovaltine_Milk_ThaiTea.png b/image/page_drink_disable_n2/bn_Ovaltine_Milk_ThaiTea.png
new file mode 100644
index 00000000..0353ee81
Binary files /dev/null and b/image/page_drink_disable_n2/bn_Ovaltine_Milk_ThaiTea.png differ
diff --git a/image/page_drink_disable_n2/bn_Pepsi_Tropical_boost_energy.png b/image/page_drink_disable_n2/bn_Pepsi_Tropical_boost_energy.png
index 6878818f..6f311338 100644
Binary files a/image/page_drink_disable_n2/bn_Pepsi_Tropical_boost_energy.png and b/image/page_drink_disable_n2/bn_Pepsi_Tropical_boost_energy.png differ
diff --git a/image/page_drink_n/blended_mango_only.png b/image/page_drink_n/blended_mango_only.png
new file mode 100644
index 00000000..358e2ec6
Binary files /dev/null and b/image/page_drink_n/blended_mango_only.png differ
diff --git a/image/page_drink_n/bn_Ovaltine_Latte.png b/image/page_drink_n/bn_Ovaltine_Latte.png
new file mode 100644
index 00000000..e9cd6731
Binary files /dev/null and b/image/page_drink_n/bn_Ovaltine_Latte.png differ
diff --git a/image/page_drink_n/bn_Ovaltine_Milk_Caramel.png b/image/page_drink_n/bn_Ovaltine_Milk_Caramel.png
new file mode 100644
index 00000000..736b8af3
Binary files /dev/null and b/image/page_drink_n/bn_Ovaltine_Milk_Caramel.png differ
diff --git a/image/page_drink_n/bn_Ovaltine_Milk_Coconut.png b/image/page_drink_n/bn_Ovaltine_Milk_Coconut.png
new file mode 100644
index 00000000..3495f3a4
Binary files /dev/null and b/image/page_drink_n/bn_Ovaltine_Milk_Coconut.png differ
diff --git a/image/page_drink_n/bn_Ovaltine_Milk_Jasmine.png b/image/page_drink_n/bn_Ovaltine_Milk_Jasmine.png
new file mode 100644
index 00000000..2f450860
Binary files /dev/null and b/image/page_drink_n/bn_Ovaltine_Milk_Jasmine.png differ
diff --git a/image/page_drink_n/bn_Ovaltine_Milk_Matcha.png b/image/page_drink_n/bn_Ovaltine_Milk_Matcha.png
new file mode 100644
index 00000000..37200959
Binary files /dev/null and b/image/page_drink_n/bn_Ovaltine_Milk_Matcha.png differ
diff --git a/image/page_drink_n/bn_Ovaltine_Milk_Salak.png b/image/page_drink_n/bn_Ovaltine_Milk_Salak.png
new file mode 100644
index 00000000..4305072e
Binary files /dev/null and b/image/page_drink_n/bn_Ovaltine_Milk_Salak.png differ
diff --git a/image/page_drink_n/bn_Ovaltine_Milk_Taiwanese_Tea.png b/image/page_drink_n/bn_Ovaltine_Milk_Taiwanese_Tea.png
new file mode 100644
index 00000000..0ba773ae
Binary files /dev/null and b/image/page_drink_n/bn_Ovaltine_Milk_Taiwanese_Tea.png differ
diff --git a/image/page_drink_n/bn_Ovaltine_Milk_ThaiTea.png b/image/page_drink_n/bn_Ovaltine_Milk_ThaiTea.png
new file mode 100644
index 00000000..a3b3aa34
Binary files /dev/null and b/image/page_drink_n/bn_Ovaltine_Milk_ThaiTea.png differ
diff --git a/image/page_drink_picture2_n/blended_mango_only.png b/image/page_drink_picture2_n/blended_mango_only.png
new file mode 100644
index 00000000..df29a383
Binary files /dev/null and b/image/page_drink_picture2_n/blended_mango_only.png differ
diff --git a/image/page_drink_picture2_n/bn_Ovaltine_Latte.png b/image/page_drink_picture2_n/bn_Ovaltine_Latte.png
new file mode 100644
index 00000000..c86edb63
Binary files /dev/null and b/image/page_drink_picture2_n/bn_Ovaltine_Latte.png differ
diff --git a/image/page_drink_picture2_n/bn_Ovaltine_Milk_Caramel.png b/image/page_drink_picture2_n/bn_Ovaltine_Milk_Caramel.png
new file mode 100644
index 00000000..d03e8854
Binary files /dev/null and b/image/page_drink_picture2_n/bn_Ovaltine_Milk_Caramel.png differ
diff --git a/image/page_drink_picture2_n/bn_Ovaltine_Milk_Coconut.png b/image/page_drink_picture2_n/bn_Ovaltine_Milk_Coconut.png
new file mode 100644
index 00000000..1179175a
Binary files /dev/null and b/image/page_drink_picture2_n/bn_Ovaltine_Milk_Coconut.png differ
diff --git a/image/page_drink_picture2_n/bn_Ovaltine_Milk_Jasmine.png b/image/page_drink_picture2_n/bn_Ovaltine_Milk_Jasmine.png
new file mode 100644
index 00000000..fb8e4dc0
Binary files /dev/null and b/image/page_drink_picture2_n/bn_Ovaltine_Milk_Jasmine.png differ
diff --git a/image/page_drink_picture2_n/bn_Ovaltine_Milk_Matcha.png b/image/page_drink_picture2_n/bn_Ovaltine_Milk_Matcha.png
new file mode 100644
index 00000000..b8bea986
Binary files /dev/null and b/image/page_drink_picture2_n/bn_Ovaltine_Milk_Matcha.png differ
diff --git a/image/page_drink_picture2_n/bn_Ovaltine_Milk_Salak.png b/image/page_drink_picture2_n/bn_Ovaltine_Milk_Salak.png
new file mode 100644
index 00000000..56f793d0
Binary files /dev/null and b/image/page_drink_picture2_n/bn_Ovaltine_Milk_Salak.png differ
diff --git a/image/page_drink_picture2_n/bn_Ovaltine_Milk_Taiwanese_Tea.png b/image/page_drink_picture2_n/bn_Ovaltine_Milk_Taiwanese_Tea.png
new file mode 100644
index 00000000..f384d22c
Binary files /dev/null and b/image/page_drink_picture2_n/bn_Ovaltine_Milk_Taiwanese_Tea.png differ
diff --git a/image/page_drink_picture2_n/bn_Ovaltine_Milk_ThaiTea.png b/image/page_drink_picture2_n/bn_Ovaltine_Milk_ThaiTea.png
new file mode 100644
index 00000000..d4b53fe8
Binary files /dev/null and b/image/page_drink_picture2_n/bn_Ovaltine_Milk_ThaiTea.png differ
diff --git a/image/page_drink_picture2_n/bn_iced_Ovaltine_cocoa_smoothie.png b/image/page_drink_picture2_n/bn_iced_Ovaltine_cocoa_smoothie.png
index 739b7234..3ebf3ed8 100644
Binary files a/image/page_drink_picture2_n/bn_iced_Ovaltine_cocoa_smoothie.png and b/image/page_drink_picture2_n/bn_iced_Ovaltine_cocoa_smoothie.png differ
diff --git a/image/page_drink_picture2_n/bn_iced_Super_Ovaltine_cocoa_smoothie.png b/image/page_drink_picture2_n/bn_iced_Super_Ovaltine_cocoa_smoothie.png
new file mode 100644
index 00000000..09227398
Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_Super_Ovaltine_cocoa_smoothie.png differ
diff --git a/image/page_drink_press_n/blended_mango_only.png b/image/page_drink_press_n/blended_mango_only.png
new file mode 100644
index 00000000..9fee5615
Binary files /dev/null and b/image/page_drink_press_n/blended_mango_only.png differ
diff --git a/image/page_drink_press_n/bn_Ovaltine_Latte.png b/image/page_drink_press_n/bn_Ovaltine_Latte.png
new file mode 100644
index 00000000..e66756ab
Binary files /dev/null and b/image/page_drink_press_n/bn_Ovaltine_Latte.png differ
diff --git a/image/page_drink_press_n/bn_Ovaltine_Milk_Caramel.png b/image/page_drink_press_n/bn_Ovaltine_Milk_Caramel.png
new file mode 100644
index 00000000..e4bc0894
Binary files /dev/null and b/image/page_drink_press_n/bn_Ovaltine_Milk_Caramel.png differ
diff --git a/image/page_drink_press_n/bn_Ovaltine_Milk_Coconut.png b/image/page_drink_press_n/bn_Ovaltine_Milk_Coconut.png
new file mode 100644
index 00000000..0f22369c
Binary files /dev/null and b/image/page_drink_press_n/bn_Ovaltine_Milk_Coconut.png differ
diff --git a/image/page_drink_press_n/bn_Ovaltine_Milk_Jasmine.png b/image/page_drink_press_n/bn_Ovaltine_Milk_Jasmine.png
new file mode 100644
index 00000000..5c89b09a
Binary files /dev/null and b/image/page_drink_press_n/bn_Ovaltine_Milk_Jasmine.png differ
diff --git a/image/page_drink_press_n/bn_Ovaltine_Milk_Matcha.png b/image/page_drink_press_n/bn_Ovaltine_Milk_Matcha.png
new file mode 100644
index 00000000..40130c07
Binary files /dev/null and b/image/page_drink_press_n/bn_Ovaltine_Milk_Matcha.png differ
diff --git a/image/page_drink_press_n/bn_Ovaltine_Milk_Salak.png b/image/page_drink_press_n/bn_Ovaltine_Milk_Salak.png
new file mode 100644
index 00000000..b1f1e39a
Binary files /dev/null and b/image/page_drink_press_n/bn_Ovaltine_Milk_Salak.png differ
diff --git a/image/page_drink_press_n/bn_Ovaltine_Milk_Taiwanese_Tea.png b/image/page_drink_press_n/bn_Ovaltine_Milk_Taiwanese_Tea.png
new file mode 100644
index 00000000..ec633291
Binary files /dev/null and b/image/page_drink_press_n/bn_Ovaltine_Milk_Taiwanese_Tea.png differ
diff --git a/image/page_drink_press_n/bn_Ovaltine_Milk_ThaiTea.png b/image/page_drink_press_n/bn_Ovaltine_Milk_ThaiTea.png
new file mode 100644
index 00000000..846506b2
Binary files /dev/null and b/image/page_drink_press_n/bn_Ovaltine_Milk_ThaiTea.png differ
diff --git a/inter/aus/image/catalog/bn_dessert.png b/inter/aus/image/catalog/bn_dessert.png
new file mode 100644
index 00000000..1ee6d50e
Binary files /dev/null and b/inter/aus/image/catalog/bn_dessert.png differ
diff --git a/inter/aus/image/catalog/bp_dessert.png b/inter/aus/image/catalog/bp_dessert.png
new file mode 100644
index 00000000..e875bc90
Binary files /dev/null and b/inter/aus/image/catalog/bp_dessert.png differ
diff --git a/inter/aus/image/page3_2_en/bn_dessert.png b/inter/aus/image/page3_2_en/bn_dessert.png
new file mode 100644
index 00000000..eeae4b76
Binary files /dev/null and b/inter/aus/image/page3_2_en/bn_dessert.png differ
diff --git a/inter/aus/image/page3_2_en/bp_dessert.png b/inter/aus/image/page3_2_en/bp_dessert.png
new file mode 100644
index 00000000..64b28e32
Binary files /dev/null and b/inter/aus/image/page3_2_en/bp_dessert.png differ
diff --git a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_LATTE.png b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_LATTE.png
index cbdbda29..d0d98e0e 100644
Binary files a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_LATTE.png and b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_LATTE.png differ
diff --git a/inter/aus/image/page_drink_disable_n2/bn_Vanilla_caramel_latte.png b/inter/aus/image/page_drink_disable_n2/bn_Vanilla_caramel_latte.png
index 93f5dab3..8cb573d5 100644
Binary files a/inter/aus/image/page_drink_disable_n2/bn_Vanilla_caramel_latte.png and b/inter/aus/image/page_drink_disable_n2/bn_Vanilla_caramel_latte.png differ
diff --git a/inter/aus/image/page_drink_disable_n2/bn_hot_america_no.png b/inter/aus/image/page_drink_disable_n2/bn_hot_america_no.png
index e59f7242..1b0c6840 100644
Binary files a/inter/aus/image/page_drink_disable_n2/bn_hot_america_no.png and b/inter/aus/image/page_drink_disable_n2/bn_hot_america_no.png differ
diff --git a/inter/aus/image/page_drink_disable_n2/bn_hot_cappuccino.png b/inter/aus/image/page_drink_disable_n2/bn_hot_cappuccino.png
index eb07c6ed..da8c65c6 100644
Binary files a/inter/aus/image/page_drink_disable_n2/bn_hot_cappuccino.png and b/inter/aus/image/page_drink_disable_n2/bn_hot_cappuccino.png differ
diff --git a/inter/aus/image/page_drink_disable_n2/bn_hot_caramel_latte.png b/inter/aus/image/page_drink_disable_n2/bn_hot_caramel_latte.png
index d5fc3069..09cccaac 100755
Binary files a/inter/aus/image/page_drink_disable_n2/bn_hot_caramel_latte.png and b/inter/aus/image/page_drink_disable_n2/bn_hot_caramel_latte.png differ
diff --git a/inter/aus/image/page_drink_disable_n2/bn_hot_latte.png b/inter/aus/image/page_drink_disable_n2/bn_hot_latte.png
index 4d2c79bf..89554b89 100755
Binary files a/inter/aus/image/page_drink_disable_n2/bn_hot_latte.png and b/inter/aus/image/page_drink_disable_n2/bn_hot_latte.png differ
diff --git a/inter/aus/image/page_drink_disable_n2/bn_hot_mocha.png b/inter/aus/image/page_drink_disable_n2/bn_hot_mocha.png
index a424a2be..456bdaf1 100755
Binary files a/inter/aus/image/page_drink_disable_n2/bn_hot_mocha.png and b/inter/aus/image/page_drink_disable_n2/bn_hot_mocha.png differ
diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_Strawberry_Matcha_Latte.png b/inter/aus/image/page_drink_disable_n2/bn_iced_Strawberry_Matcha_Latte.png
index 4d614dde..94e79855 100644
Binary files a/inter/aus/image/page_drink_disable_n2/bn_iced_Strawberry_Matcha_Latte.png and b/inter/aus/image/page_drink_disable_n2/bn_iced_Strawberry_Matcha_Latte.png differ
diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_cocoa.png b/inter/aus/image/page_drink_disable_n2/bn_iced_cocoa.png
index fe7a0dc8..5fcfa24e 100644
Binary files a/inter/aus/image/page_drink_disable_n2/bn_iced_cocoa.png and b/inter/aus/image/page_drink_disable_n2/bn_iced_cocoa.png differ
diff --git a/inter/aus/image/page_drink_disable_n2/bn_protein_Mocha.png b/inter/aus/image/page_drink_disable_n2/bn_protein_Mocha.png
index e37d288b..3889b2b0 100644
Binary files a/inter/aus/image/page_drink_disable_n2/bn_protein_Mocha.png and b/inter/aus/image/page_drink_disable_n2/bn_protein_Mocha.png differ
diff --git a/inter/aus/image/page_drink_n/bn_COCONUT_LATTE.png b/inter/aus/image/page_drink_n/bn_COCONUT_LATTE.png
index 8167917d..54291927 100644
Binary files a/inter/aus/image/page_drink_n/bn_COCONUT_LATTE.png and b/inter/aus/image/page_drink_n/bn_COCONUT_LATTE.png differ
diff --git a/inter/aus/image/page_drink_n/bn_Vanilla_caramel_latte.png b/inter/aus/image/page_drink_n/bn_Vanilla_caramel_latte.png
index 795a7e3b..da9e5ab4 100644
Binary files a/inter/aus/image/page_drink_n/bn_Vanilla_caramel_latte.png and b/inter/aus/image/page_drink_n/bn_Vanilla_caramel_latte.png differ
diff --git a/inter/aus/image/page_drink_n/bn_hot_america_no.png b/inter/aus/image/page_drink_n/bn_hot_america_no.png
index 455c8718..95987da4 100644
Binary files a/inter/aus/image/page_drink_n/bn_hot_america_no.png and b/inter/aus/image/page_drink_n/bn_hot_america_no.png differ
diff --git a/inter/aus/image/page_drink_n/bn_hot_cappuccino.png b/inter/aus/image/page_drink_n/bn_hot_cappuccino.png
index deb72747..da6760ed 100644
Binary files a/inter/aus/image/page_drink_n/bn_hot_cappuccino.png and b/inter/aus/image/page_drink_n/bn_hot_cappuccino.png differ
diff --git a/inter/aus/image/page_drink_n/bn_hot_caramel_latte.png b/inter/aus/image/page_drink_n/bn_hot_caramel_latte.png
index ce7e0a78..4f5f5420 100755
Binary files a/inter/aus/image/page_drink_n/bn_hot_caramel_latte.png and b/inter/aus/image/page_drink_n/bn_hot_caramel_latte.png differ
diff --git a/inter/aus/image/page_drink_n/bn_hot_latte.png b/inter/aus/image/page_drink_n/bn_hot_latte.png
index 5d31ce3e..503383e8 100755
Binary files a/inter/aus/image/page_drink_n/bn_hot_latte.png and b/inter/aus/image/page_drink_n/bn_hot_latte.png differ
diff --git a/inter/aus/image/page_drink_n/bn_hot_mocha.png b/inter/aus/image/page_drink_n/bn_hot_mocha.png
index f491f98d..20e2b31d 100755
Binary files a/inter/aus/image/page_drink_n/bn_hot_mocha.png and b/inter/aus/image/page_drink_n/bn_hot_mocha.png differ
diff --git a/inter/aus/image/page_drink_n/bn_iced_Strawberry_Matcha_Latte.png b/inter/aus/image/page_drink_n/bn_iced_Strawberry_Matcha_Latte.png
index 9a1da5cf..df47aebb 100644
Binary files a/inter/aus/image/page_drink_n/bn_iced_Strawberry_Matcha_Latte.png and b/inter/aus/image/page_drink_n/bn_iced_Strawberry_Matcha_Latte.png differ
diff --git a/inter/aus/image/page_drink_n/bn_iced_cocoa.png b/inter/aus/image/page_drink_n/bn_iced_cocoa.png
index e4ff956c..446f13cd 100644
Binary files a/inter/aus/image/page_drink_n/bn_iced_cocoa.png and b/inter/aus/image/page_drink_n/bn_iced_cocoa.png differ
diff --git a/inter/aus/image/page_drink_n/bn_protein_Mocha.png b/inter/aus/image/page_drink_n/bn_protein_Mocha.png
index f01f1153..99d04f7b 100644
Binary files a/inter/aus/image/page_drink_n/bn_protein_Mocha.png and b/inter/aus/image/page_drink_n/bn_protein_Mocha.png differ
diff --git a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_JASMINE_MILK_TEA.png b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_JASMINE_MILK_TEA.png
index 874cb232..9b94953c 100755
Binary files a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_JASMINE_MILK_TEA.png and b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_JASMINE_MILK_TEA.png differ
diff --git a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_LATTE.png b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_LATTE.png
index 7d963b6d..dfaf9201 100644
Binary files a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_LATTE.png and b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_LATTE.png differ
diff --git a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_THAI_BLACK_TEA.png b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_THAI_BLACK_TEA.png
index 3e8e9ce5..73791158 100755
Binary files a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_THAI_BLACK_TEA.png and b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_THAI_BLACK_TEA.png differ
diff --git a/inter/aus/image/page_drink_picture2_n/bn_Choc_caramel_crumble.png b/inter/aus/image/page_drink_picture2_n/bn_Choc_caramel_crumble.png
index 4e4fbf93..fde0d059 100755
Binary files a/inter/aus/image/page_drink_picture2_n/bn_Choc_caramel_crumble.png and b/inter/aus/image/page_drink_picture2_n/bn_Choc_caramel_crumble.png differ
diff --git a/inter/aus/image/page_drink_picture2_n/bn_Vanilla_caramel_latte.png b/inter/aus/image/page_drink_picture2_n/bn_Vanilla_caramel_latte.png
index 6e87301c..917f32bd 100755
Binary files a/inter/aus/image/page_drink_picture2_n/bn_Vanilla_caramel_latte.png and b/inter/aus/image/page_drink_picture2_n/bn_Vanilla_caramel_latte.png differ
diff --git a/inter/aus/image/page_drink_picture2_n/bn_hot_america_no.png b/inter/aus/image/page_drink_picture2_n/bn_hot_america_no.png
index ff112108..911e6592 100644
Binary files a/inter/aus/image/page_drink_picture2_n/bn_hot_america_no.png and b/inter/aus/image/page_drink_picture2_n/bn_hot_america_no.png differ
diff --git a/inter/aus/image/page_drink_picture2_n/bn_hot_cappuccino.png b/inter/aus/image/page_drink_picture2_n/bn_hot_cappuccino.png
index c20a253f..ddc217f3 100644
Binary files a/inter/aus/image/page_drink_picture2_n/bn_hot_cappuccino.png and b/inter/aus/image/page_drink_picture2_n/bn_hot_cappuccino.png differ
diff --git a/inter/aus/image/page_drink_picture2_n/bn_hot_caramel_latte.png b/inter/aus/image/page_drink_picture2_n/bn_hot_caramel_latte.png
index 79862b28..778f0e6c 100755
Binary files a/inter/aus/image/page_drink_picture2_n/bn_hot_caramel_latte.png and b/inter/aus/image/page_drink_picture2_n/bn_hot_caramel_latte.png differ
diff --git a/inter/aus/image/page_drink_picture2_n/bn_hot_latte.png b/inter/aus/image/page_drink_picture2_n/bn_hot_latte.png
index 47088227..85045381 100755
Binary files a/inter/aus/image/page_drink_picture2_n/bn_hot_latte.png and b/inter/aus/image/page_drink_picture2_n/bn_hot_latte.png differ
diff --git a/inter/aus/image/page_drink_picture2_n/bn_hot_mocha.png b/inter/aus/image/page_drink_picture2_n/bn_hot_mocha.png
index bfbe9f13..f30c23d1 100755
Binary files a/inter/aus/image/page_drink_picture2_n/bn_hot_mocha.png and b/inter/aus/image/page_drink_picture2_n/bn_hot_mocha.png differ
diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_Strawberry_Matcha_Latte.png b/inter/aus/image/page_drink_picture2_n/bn_iced_Strawberry_Matcha_Latte.png
index 8ffa509f..1a924bd9 100755
Binary files a/inter/aus/image/page_drink_picture2_n/bn_iced_Strawberry_Matcha_Latte.png and b/inter/aus/image/page_drink_picture2_n/bn_iced_Strawberry_Matcha_Latte.png differ
diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_cocoa.png b/inter/aus/image/page_drink_picture2_n/bn_iced_cocoa.png
index 98efb65b..b5a2594e 100644
Binary files a/inter/aus/image/page_drink_picture2_n/bn_iced_cocoa.png and b/inter/aus/image/page_drink_picture2_n/bn_iced_cocoa.png differ
diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_melon_soda.png b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_melon_soda.png
index 2b1c7894..f579006f 100755
Binary files a/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_melon_soda.png and b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_melon_soda.png differ
diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_melon_soda.png b/inter/aus/image/page_drink_picture2_n/bn_iced_melon_soda.png
index ce7d01c5..a0ea6e87 100644
Binary files a/inter/aus/image/page_drink_picture2_n/bn_iced_melon_soda.png and b/inter/aus/image/page_drink_picture2_n/bn_iced_melon_soda.png differ
diff --git a/inter/aus/image/page_drink_picture2_n/bn_protein_Mocha.png b/inter/aus/image/page_drink_picture2_n/bn_protein_Mocha.png
index d8c12e5b..2460b672 100644
Binary files a/inter/aus/image/page_drink_picture2_n/bn_protein_Mocha.png and b/inter/aus/image/page_drink_picture2_n/bn_protein_Mocha.png differ
diff --git a/inter/aus/image/page_drink_press_n/bn_COCONUT_LATTE.png b/inter/aus/image/page_drink_press_n/bn_COCONUT_LATTE.png
index 31d3e62c..7225ec28 100644
Binary files a/inter/aus/image/page_drink_press_n/bn_COCONUT_LATTE.png and b/inter/aus/image/page_drink_press_n/bn_COCONUT_LATTE.png differ
diff --git a/inter/aus/image/page_drink_press_n/bn_Vanilla_caramel_latte.png b/inter/aus/image/page_drink_press_n/bn_Vanilla_caramel_latte.png
index 2333b9b4..30f4a081 100644
Binary files a/inter/aus/image/page_drink_press_n/bn_Vanilla_caramel_latte.png and b/inter/aus/image/page_drink_press_n/bn_Vanilla_caramel_latte.png differ
diff --git a/inter/aus/image/page_drink_press_n/bn_hot_america_no.png b/inter/aus/image/page_drink_press_n/bn_hot_america_no.png
index ea82a412..282afede 100644
Binary files a/inter/aus/image/page_drink_press_n/bn_hot_america_no.png and b/inter/aus/image/page_drink_press_n/bn_hot_america_no.png differ
diff --git a/inter/aus/image/page_drink_press_n/bn_hot_cappuccino.png b/inter/aus/image/page_drink_press_n/bn_hot_cappuccino.png
index 3ba40c6e..d34c6d6d 100644
Binary files a/inter/aus/image/page_drink_press_n/bn_hot_cappuccino.png and b/inter/aus/image/page_drink_press_n/bn_hot_cappuccino.png differ
diff --git a/inter/aus/image/page_drink_press_n/bn_hot_caramel_latte.png b/inter/aus/image/page_drink_press_n/bn_hot_caramel_latte.png
index b3438d7a..5845a9d9 100755
Binary files a/inter/aus/image/page_drink_press_n/bn_hot_caramel_latte.png and b/inter/aus/image/page_drink_press_n/bn_hot_caramel_latte.png differ
diff --git a/inter/aus/image/page_drink_press_n/bn_hot_latte.png b/inter/aus/image/page_drink_press_n/bn_hot_latte.png
index d85ce0b5..4b9c46ec 100755
Binary files a/inter/aus/image/page_drink_press_n/bn_hot_latte.png and b/inter/aus/image/page_drink_press_n/bn_hot_latte.png differ
diff --git a/inter/aus/image/page_drink_press_n/bn_hot_mocha.png b/inter/aus/image/page_drink_press_n/bn_hot_mocha.png
index 8efb5dee..acd1cc0c 100755
Binary files a/inter/aus/image/page_drink_press_n/bn_hot_mocha.png and b/inter/aus/image/page_drink_press_n/bn_hot_mocha.png differ
diff --git a/inter/aus/image/page_drink_press_n/bn_iced_Strawberry_Matcha_Latte.png b/inter/aus/image/page_drink_press_n/bn_iced_Strawberry_Matcha_Latte.png
index 485fb450..471d662e 100644
Binary files a/inter/aus/image/page_drink_press_n/bn_iced_Strawberry_Matcha_Latte.png and b/inter/aus/image/page_drink_press_n/bn_iced_Strawberry_Matcha_Latte.png differ
diff --git a/inter/aus/image/page_drink_press_n/bn_iced_cocoa.png b/inter/aus/image/page_drink_press_n/bn_iced_cocoa.png
index 8fe78e1c..86713a13 100644
Binary files a/inter/aus/image/page_drink_press_n/bn_iced_cocoa.png and b/inter/aus/image/page_drink_press_n/bn_iced_cocoa.png differ
diff --git a/inter/aus/image/page_drink_press_n/bn_protein_Mocha.png b/inter/aus/image/page_drink_press_n/bn_protein_Mocha.png
index 8a10dc44..0ad79127 100644
Binary files a/inter/aus/image/page_drink_press_n/bn_protein_Mocha.png and b/inter/aus/image/page_drink_press_n/bn_protein_Mocha.png differ
diff --git a/inter/aus/menu/lang.tsv b/inter/aus/menu/lang.tsv
index ea2c2a60..fc2c0f36 100644
--- a/inter/aus/menu/lang.tsv
+++ b/inter/aus/menu/lang.tsv
@@ -17,6 +17,7 @@ TextID Note English Thai
000010 Healthier\nChoice ทางเลือกสุขภาพ\n[\nคุมจำนวน ไขมัน น้ำตาล โซเดียม\nแคลอรี่ต่ำ###Font=KanitRegular,Size=12,Align=Center]
000011 Kid Menu เมนูเด็ก
000012 App Fast แอพ ฟาสท์
+000025 Dessert ของหวาน
Menu
Font=Kanit,Type=Regular,Size=16,Color=0x5A5A5A,Align=center-vertical-horizontal Font=Kanit,Type=Regular,Size=32,Color=0x5A5A5A,Align=center-vertical-horizontal
@@ -38,6 +39,8 @@ TextID Note English Thai
000024 Cocktail ค็อกเทล
+
+
page_toopping_select
Font=Kanit,Type=Regular,Size=22,Color=0x513C2F,Align=Center Font=Kanit,Type=Regular,Size=24,Color=0x513C2F,Align=Center
Font=Kanit,Type=Medium,Size=22,Color=0x513C2F,Align=Center Font=Kanit,Type=Medium,Size=24,Color=0x513C2F,Align=Center
diff --git a/inter/aus/video/script_video.ev b/inter/aus/video/script_video.ev
index 269fca7e..43992ba3 100644
--- a/inter/aus/video/script_video.ev
+++ b/inter/aus/video/script_video.ev
@@ -2,6 +2,7 @@ Var MainfileSize = 0
Var EventNewYear = 0
Var EventAO = 0
Var StPatrickEvent = 0
+Var HappyEasterEvent = 0
diff --git a/inter/aus/xml/menu_catalog_new.lxml b/inter/aus/xml/menu_catalog_new.lxml
index 360b5835..e8248538 100644
--- a/inter/aus/xml/menu_catalog_new.lxml
+++ b/inter/aus/xml/menu_catalog_new.lxml
@@ -121,7 +121,7 @@
If CountryName = "Australia" 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/aus/image/page3_2_en/"
+ Var DirImageAlterAus = "ROOT/taobin_project/inter/aus/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
EndIf
@@ -266,8 +266,8 @@
-
diff --git a/inter/aus/xml/page_catalog.lxml b/inter/aus/xml/page_catalog.lxml
index 9bbf7af6..2c24f064 100644
--- a/inter/aus/xml/page_catalog.lxml
+++ b/inter/aus/xml/page_catalog.lxml
@@ -523,22 +523,22 @@
564
1532
"Enable"
- Var(DirImage + "/bn_HealthyOption.png")
- Var(DirImage + "/bp_HealthyOption.png")
+ Var(DirImageAUS + "/bn_dessert.png")
+ Var(DirImageAUS + "/bp_dessert.png")
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
- ;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml"
+ ;Open "ROOT/taobin_project/xml/page_catalog_group_dessert.lxml"
- Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_health.lxml"
+ Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_dessert.lxml"
Open OpenFileXML
- 000010
+ 000025
28
202
241
diff --git a/inter/aus/xml/page_catalog_group_coffee.lxml b/inter/aus/xml/page_catalog_group_coffee.lxml
index a1461000..cf35d9f5 100644
--- a/inter/aus/xml/page_catalog_group_coffee.lxml
+++ b/inter/aus/xml/page_catalog_group_coffee.lxml
@@ -23815,13 +23815,13 @@
Flag( 51-21-01-0081.Button,51-21-02-0081.Button,51-21-03-0081.Button,$Sum512101008151210200815121030081)