diff --git a/inter/hkg/image/close_hkg/Frame1.png b/inter/hkg/image/close_hkg/Frame1.png
new file mode 100644
index 00000000..7a43d56e
Binary files /dev/null and b/inter/hkg/image/close_hkg/Frame1.png differ
diff --git a/inter/hkg/image/close_hkg/Frame10.png b/inter/hkg/image/close_hkg/Frame10.png
new file mode 100644
index 00000000..d2727ff0
Binary files /dev/null and b/inter/hkg/image/close_hkg/Frame10.png differ
diff --git a/inter/hkg/image/close_hkg/Frame11.png b/inter/hkg/image/close_hkg/Frame11.png
new file mode 100644
index 00000000..1c737617
Binary files /dev/null and b/inter/hkg/image/close_hkg/Frame11.png differ
diff --git a/inter/hkg/image/close_hkg/Frame12.png b/inter/hkg/image/close_hkg/Frame12.png
new file mode 100644
index 00000000..e05c2fe6
Binary files /dev/null and b/inter/hkg/image/close_hkg/Frame12.png differ
diff --git a/inter/hkg/image/close_hkg/Frame13.png b/inter/hkg/image/close_hkg/Frame13.png
new file mode 100644
index 00000000..daa728db
Binary files /dev/null and b/inter/hkg/image/close_hkg/Frame13.png differ
diff --git a/inter/hkg/image/close_hkg/Frame14.png b/inter/hkg/image/close_hkg/Frame14.png
new file mode 100644
index 00000000..f8b63f68
Binary files /dev/null and b/inter/hkg/image/close_hkg/Frame14.png differ
diff --git a/inter/hkg/image/close_hkg/Frame15.png b/inter/hkg/image/close_hkg/Frame15.png
new file mode 100644
index 00000000..cc71fdf7
Binary files /dev/null and b/inter/hkg/image/close_hkg/Frame15.png differ
diff --git a/inter/hkg/image/close_hkg/Frame16.png b/inter/hkg/image/close_hkg/Frame16.png
new file mode 100644
index 00000000..086fdc6e
Binary files /dev/null and b/inter/hkg/image/close_hkg/Frame16.png differ
diff --git a/inter/hkg/image/close_hkg/Frame17.png b/inter/hkg/image/close_hkg/Frame17.png
new file mode 100644
index 00000000..50870424
Binary files /dev/null and b/inter/hkg/image/close_hkg/Frame17.png differ
diff --git a/inter/hkg/image/close_hkg/Frame18.png b/inter/hkg/image/close_hkg/Frame18.png
new file mode 100644
index 00000000..b5ae0cde
Binary files /dev/null and b/inter/hkg/image/close_hkg/Frame18.png differ
diff --git a/inter/hkg/image/close_hkg/Frame19.png b/inter/hkg/image/close_hkg/Frame19.png
new file mode 100644
index 00000000..fa991c07
Binary files /dev/null and b/inter/hkg/image/close_hkg/Frame19.png differ
diff --git a/inter/hkg/image/close_hkg/Frame2.png b/inter/hkg/image/close_hkg/Frame2.png
new file mode 100644
index 00000000..31a7d4be
Binary files /dev/null and b/inter/hkg/image/close_hkg/Frame2.png differ
diff --git a/inter/hkg/image/close_hkg/Frame20.png b/inter/hkg/image/close_hkg/Frame20.png
new file mode 100644
index 00000000..677d294c
Binary files /dev/null and b/inter/hkg/image/close_hkg/Frame20.png differ
diff --git a/inter/hkg/image/close_hkg/Frame3.png b/inter/hkg/image/close_hkg/Frame3.png
new file mode 100644
index 00000000..f24016c6
Binary files /dev/null and b/inter/hkg/image/close_hkg/Frame3.png differ
diff --git a/inter/hkg/image/close_hkg/Frame4.png b/inter/hkg/image/close_hkg/Frame4.png
new file mode 100644
index 00000000..32d6d5cd
Binary files /dev/null and b/inter/hkg/image/close_hkg/Frame4.png differ
diff --git a/inter/hkg/image/close_hkg/Frame5.png b/inter/hkg/image/close_hkg/Frame5.png
new file mode 100644
index 00000000..5cfde2bd
Binary files /dev/null and b/inter/hkg/image/close_hkg/Frame5.png differ
diff --git a/inter/hkg/image/close_hkg/Frame6.png b/inter/hkg/image/close_hkg/Frame6.png
new file mode 100644
index 00000000..275b5a64
Binary files /dev/null and b/inter/hkg/image/close_hkg/Frame6.png differ
diff --git a/inter/hkg/image/close_hkg/Frame7.png b/inter/hkg/image/close_hkg/Frame7.png
new file mode 100644
index 00000000..69859852
Binary files /dev/null and b/inter/hkg/image/close_hkg/Frame7.png differ
diff --git a/inter/hkg/image/close_hkg/Frame8.png b/inter/hkg/image/close_hkg/Frame8.png
new file mode 100644
index 00000000..174339da
Binary files /dev/null and b/inter/hkg/image/close_hkg/Frame8.png differ
diff --git a/inter/hkg/image/close_hkg/Frame9.png b/inter/hkg/image/close_hkg/Frame9.png
new file mode 100644
index 00000000..272d7f18
Binary files /dev/null and b/inter/hkg/image/close_hkg/Frame9.png differ
diff --git a/inter/hkg/image/close_hkg/img1.png b/inter/hkg/image/close_hkg/img1.png
new file mode 100644
index 00000000..74e75a33
Binary files /dev/null and b/inter/hkg/image/close_hkg/img1.png differ
diff --git a/inter/hkg/image/collectiing/img_popup20-Failed.png b/inter/hkg/image/collectiing/img_popup20-Failed.png
new file mode 100644
index 00000000..140c1b41
Binary files /dev/null and b/inter/hkg/image/collectiing/img_popup20-Failed.png differ
diff --git a/inter/hkg/image/collectiing_drinkfail_msc/QR_contract.png b/inter/hkg/image/collectiing_drinkfail_msc/QR_contract.png
new file mode 100644
index 00000000..5a6aee0b
Binary files /dev/null and b/inter/hkg/image/collectiing_drinkfail_msc/QR_contract.png differ
diff --git a/inter/hkg/image/collectiing_drinkfail_msc/bn_close.png b/inter/hkg/image/collectiing_drinkfail_msc/bn_close.png
new file mode 100644
index 00000000..64bc620e
Binary files /dev/null and b/inter/hkg/image/collectiing_drinkfail_msc/bn_close.png differ
diff --git a/inter/hkg/image/collectiing_drinkfail_msc/text_11.png b/inter/hkg/image/collectiing_drinkfail_msc/text_11.png
new file mode 100644
index 00000000..232a28db
Binary files /dev/null and b/inter/hkg/image/collectiing_drinkfail_msc/text_11.png differ
diff --git a/inter/hkg/image/collectiing_drinkfail_mtc/QR_contract.png b/inter/hkg/image/collectiing_drinkfail_mtc/QR_contract.png
new file mode 100644
index 00000000..5a6aee0b
Binary files /dev/null and b/inter/hkg/image/collectiing_drinkfail_mtc/QR_contract.png differ
diff --git a/inter/hkg/image/collectiing_drinkfail_mtc/bn_close.png b/inter/hkg/image/collectiing_drinkfail_mtc/bn_close.png
new file mode 100644
index 00000000..64bc620e
Binary files /dev/null and b/inter/hkg/image/collectiing_drinkfail_mtc/bn_close.png differ
diff --git a/inter/hkg/image/collectiing_drinkfail_mtc/text_11.png b/inter/hkg/image/collectiing_drinkfail_mtc/text_11.png
new file mode 100644
index 00000000..72f15aa4
Binary files /dev/null and b/inter/hkg/image/collectiing_drinkfail_mtc/text_11.png differ
diff --git a/inter/hkg/image/complete_msc/Preparing.png b/inter/hkg/image/complete_msc/Preparing.png
new file mode 100644
index 00000000..2ce0ac74
Binary files /dev/null and b/inter/hkg/image/complete_msc/Preparing.png differ
diff --git a/inter/hkg/image/complete_msc/Preparing2.png b/inter/hkg/image/complete_msc/Preparing2.png
new file mode 100644
index 00000000..0ea9923d
Binary files /dev/null and b/inter/hkg/image/complete_msc/Preparing2.png differ
diff --git a/inter/hkg/image/complete_msc/bn_open door.png b/inter/hkg/image/complete_msc/bn_open door.png
new file mode 100644
index 00000000..f6e02192
Binary files /dev/null and b/inter/hkg/image/complete_msc/bn_open door.png differ
diff --git a/inter/hkg/image/complete_msc/bp_open door.png b/inter/hkg/image/complete_msc/bp_open door.png
new file mode 100644
index 00000000..a0bc5a0f
Binary files /dev/null and b/inter/hkg/image/complete_msc/bp_open door.png differ
diff --git a/inter/hkg/image/complete_msc/img2.png b/inter/hkg/image/complete_msc/img2.png
new file mode 100644
index 00000000..c1b67134
Binary files /dev/null and b/inter/hkg/image/complete_msc/img2.png differ
diff --git a/inter/hkg/image/complete_msc/imgDrinkFailed.png b/inter/hkg/image/complete_msc/imgDrinkFailed.png
new file mode 100644
index 00000000..68bd24ce
Binary files /dev/null and b/inter/hkg/image/complete_msc/imgDrinkFailed.png differ
diff --git a/inter/hkg/image/complete_msc/text_bottom.png b/inter/hkg/image/complete_msc/text_bottom.png
new file mode 100644
index 00000000..850b0167
Binary files /dev/null and b/inter/hkg/image/complete_msc/text_bottom.png differ
diff --git a/inter/hkg/image/complete_msc/txtDrinkFailed.png b/inter/hkg/image/complete_msc/txtDrinkFailed.png
new file mode 100644
index 00000000..3283c9ec
Binary files /dev/null and b/inter/hkg/image/complete_msc/txtDrinkFailed.png differ
diff --git a/inter/hkg/image/complete_msc/txtDrinkOK.png b/inter/hkg/image/complete_msc/txtDrinkOK.png
new file mode 100644
index 00000000..d5449abf
Binary files /dev/null and b/inter/hkg/image/complete_msc/txtDrinkOK.png differ
diff --git a/inter/hkg/image/complete_mtc/Preparing.png b/inter/hkg/image/complete_mtc/Preparing.png
new file mode 100644
index 00000000..4021bc86
Binary files /dev/null and b/inter/hkg/image/complete_mtc/Preparing.png differ
diff --git a/inter/hkg/image/complete_mtc/Preparing2.png b/inter/hkg/image/complete_mtc/Preparing2.png
new file mode 100644
index 00000000..0b1b81d7
Binary files /dev/null and b/inter/hkg/image/complete_mtc/Preparing2.png differ
diff --git a/inter/hkg/image/complete_mtc/bn_open door.png b/inter/hkg/image/complete_mtc/bn_open door.png
new file mode 100644
index 00000000..9d785ae0
Binary files /dev/null and b/inter/hkg/image/complete_mtc/bn_open door.png differ
diff --git a/inter/hkg/image/complete_mtc/bp_open door.png b/inter/hkg/image/complete_mtc/bp_open door.png
new file mode 100644
index 00000000..85583781
Binary files /dev/null and b/inter/hkg/image/complete_mtc/bp_open door.png differ
diff --git a/inter/hkg/image/complete_mtc/img2.png b/inter/hkg/image/complete_mtc/img2.png
new file mode 100644
index 00000000..71f94049
Binary files /dev/null and b/inter/hkg/image/complete_mtc/img2.png differ
diff --git a/inter/hkg/image/complete_mtc/imgDrinkFailed.png b/inter/hkg/image/complete_mtc/imgDrinkFailed.png
new file mode 100644
index 00000000..68bd24ce
Binary files /dev/null and b/inter/hkg/image/complete_mtc/imgDrinkFailed.png differ
diff --git a/inter/hkg/image/complete_mtc/text_bottom.png b/inter/hkg/image/complete_mtc/text_bottom.png
new file mode 100644
index 00000000..2c55f01d
Binary files /dev/null and b/inter/hkg/image/complete_mtc/text_bottom.png differ
diff --git a/inter/hkg/image/complete_mtc/txtDrinkFailed.png b/inter/hkg/image/complete_mtc/txtDrinkFailed.png
new file mode 100644
index 00000000..4b256840
Binary files /dev/null and b/inter/hkg/image/complete_mtc/txtDrinkFailed.png differ
diff --git a/inter/hkg/image/complete_mtc/txtDrinkOK.png b/inter/hkg/image/complete_mtc/txtDrinkOK.png
new file mode 100644
index 00000000..ca048392
Binary files /dev/null and b/inter/hkg/image/complete_mtc/txtDrinkOK.png differ
diff --git a/inter/hkg/image/page_payment_msc/page_payment/CancelOrder.png b/inter/hkg/image/page_payment_msc/page_payment/CancelOrder.png
index 34a9fc67..3fa07d7e 100644
Binary files a/inter/hkg/image/page_payment_msc/page_payment/CancelOrder.png and b/inter/hkg/image/page_payment_msc/page_payment/CancelOrder.png differ
diff --git a/inter/hkg/image/page_payment_msc/page_payment/CancelOrder2.png b/inter/hkg/image/page_payment_msc/page_payment/CancelOrder2.png
index 97859358..a0608398 100644
Binary files a/inter/hkg/image/page_payment_msc/page_payment/CancelOrder2.png and b/inter/hkg/image/page_payment_msc/page_payment/CancelOrder2.png differ
diff --git a/inter/hkg/image/page_payment_msc/page_payment/bd_credit_card.png b/inter/hkg/image/page_payment_msc/page_payment/bd_credit_card.png
new file mode 100644
index 00000000..f211a99b
Binary files /dev/null and b/inter/hkg/image/page_payment_msc/page_payment/bd_credit_card.png differ
diff --git a/inter/hkg/image/page_payment_msc/page_payment/bd_qr_code.png b/inter/hkg/image/page_payment_msc/page_payment/bd_qr_code.png
new file mode 100644
index 00000000..f85afbfc
Binary files /dev/null and b/inter/hkg/image/page_payment_msc/page_payment/bd_qr_code.png differ
diff --git a/inter/hkg/image/page_payment_msc/page_payment/bn_back_arrow2.png b/inter/hkg/image/page_payment_msc/page_payment/bn_back_arrow2.png
index 1b38f0bf..fc6539f2 100644
Binary files a/inter/hkg/image/page_payment_msc/page_payment/bn_back_arrow2.png and b/inter/hkg/image/page_payment_msc/page_payment/bn_back_arrow2.png differ
diff --git a/inter/hkg/image/page_payment_msc/page_payment/bn_credit_card.png b/inter/hkg/image/page_payment_msc/page_payment/bn_credit_card.png
new file mode 100644
index 00000000..f5ddc80d
Binary files /dev/null and b/inter/hkg/image/page_payment_msc/page_payment/bn_credit_card.png differ
diff --git a/inter/hkg/image/page_payment_msc/page_payment/bn_qr_code.png b/inter/hkg/image/page_payment_msc/page_payment/bn_qr_code.png
new file mode 100644
index 00000000..3f64e227
Binary files /dev/null and b/inter/hkg/image/page_payment_msc/page_payment/bn_qr_code.png differ
diff --git a/inter/hkg/image/page_payment_msc/page_payment/bp_credit_card.png b/inter/hkg/image/page_payment_msc/page_payment/bp_credit_card.png
new file mode 100644
index 00000000..784991cf
Binary files /dev/null and b/inter/hkg/image/page_payment_msc/page_payment/bp_credit_card.png differ
diff --git a/inter/hkg/image/page_payment_msc/page_payment/bp_qr_code.png b/inter/hkg/image/page_payment_msc/page_payment/bp_qr_code.png
new file mode 100644
index 00000000..7c4e3fe5
Binary files /dev/null and b/inter/hkg/image/page_payment_msc/page_payment/bp_qr_code.png differ
diff --git a/inter/hkg/image/page_payment_msc/page_payment/img_tap_card_5_sec.png b/inter/hkg/image/page_payment_msc/page_payment/img_tap_card_5_sec.png
new file mode 100644
index 00000000..a1f1ce1d
Binary files /dev/null and b/inter/hkg/image/page_payment_msc/page_payment/img_tap_card_5_sec.png differ
diff --git a/inter/hkg/image/page_payment_msc/page_payment/img_use_qr_code.png b/inter/hkg/image/page_payment_msc/page_payment/img_use_qr_code.png
new file mode 100644
index 00000000..44639c1f
Binary files /dev/null and b/inter/hkg/image/page_payment_msc/page_payment/img_use_qr_code.png differ
diff --git a/inter/hkg/image/page_payment_mtc/page_payment/CancelOrder.png b/inter/hkg/image/page_payment_mtc/page_payment/CancelOrder.png
index 34a9fc67..3fa07d7e 100644
Binary files a/inter/hkg/image/page_payment_mtc/page_payment/CancelOrder.png and b/inter/hkg/image/page_payment_mtc/page_payment/CancelOrder.png differ
diff --git a/inter/hkg/image/page_payment_mtc/page_payment/CancelOrder2.png b/inter/hkg/image/page_payment_mtc/page_payment/CancelOrder2.png
index 97859358..a0608398 100644
Binary files a/inter/hkg/image/page_payment_mtc/page_payment/CancelOrder2.png and b/inter/hkg/image/page_payment_mtc/page_payment/CancelOrder2.png differ
diff --git a/inter/hkg/image/page_payment_mtc/page_payment/bd_credit_card.png b/inter/hkg/image/page_payment_mtc/page_payment/bd_credit_card.png
new file mode 100644
index 00000000..f211a99b
Binary files /dev/null and b/inter/hkg/image/page_payment_mtc/page_payment/bd_credit_card.png differ
diff --git a/inter/hkg/image/page_payment_mtc/page_payment/bd_qr_code.png b/inter/hkg/image/page_payment_mtc/page_payment/bd_qr_code.png
new file mode 100644
index 00000000..8aba6b76
Binary files /dev/null and b/inter/hkg/image/page_payment_mtc/page_payment/bd_qr_code.png differ
diff --git a/inter/hkg/image/page_payment_mtc/page_payment/bn_back_arrow2.png b/inter/hkg/image/page_payment_mtc/page_payment/bn_back_arrow2.png
index 1b38f0bf..fc6539f2 100644
Binary files a/inter/hkg/image/page_payment_mtc/page_payment/bn_back_arrow2.png and b/inter/hkg/image/page_payment_mtc/page_payment/bn_back_arrow2.png differ
diff --git a/inter/hkg/image/page_payment_mtc/page_payment/bn_credit_card.png b/inter/hkg/image/page_payment_mtc/page_payment/bn_credit_card.png
new file mode 100644
index 00000000..f5ddc80d
Binary files /dev/null and b/inter/hkg/image/page_payment_mtc/page_payment/bn_credit_card.png differ
diff --git a/inter/hkg/image/page_payment_mtc/page_payment/bn_qr_code.png b/inter/hkg/image/page_payment_mtc/page_payment/bn_qr_code.png
new file mode 100644
index 00000000..5128fd4b
Binary files /dev/null and b/inter/hkg/image/page_payment_mtc/page_payment/bn_qr_code.png differ
diff --git a/inter/hkg/image/page_payment_mtc/page_payment/bp_credit_card.png b/inter/hkg/image/page_payment_mtc/page_payment/bp_credit_card.png
new file mode 100644
index 00000000..81ff8004
Binary files /dev/null and b/inter/hkg/image/page_payment_mtc/page_payment/bp_credit_card.png differ
diff --git a/inter/hkg/image/page_payment_mtc/page_payment/bp_qr_code.png b/inter/hkg/image/page_payment_mtc/page_payment/bp_qr_code.png
new file mode 100644
index 00000000..08ebafce
Binary files /dev/null and b/inter/hkg/image/page_payment_mtc/page_payment/bp_qr_code.png differ
diff --git a/inter/hkg/image/page_payment_mtc/page_payment/img_tap_card_5_sec.png b/inter/hkg/image/page_payment_mtc/page_payment/img_tap_card_5_sec.png
new file mode 100644
index 00000000..27e788b5
Binary files /dev/null and b/inter/hkg/image/page_payment_mtc/page_payment/img_tap_card_5_sec.png differ
diff --git a/inter/hkg/image/page_payment_mtc/page_payment/img_use_qr_code.png b/inter/hkg/image/page_payment_mtc/page_payment/img_use_qr_code.png
new file mode 100644
index 00000000..ff78c020
Binary files /dev/null and b/inter/hkg/image/page_payment_mtc/page_payment/img_use_qr_code.png differ
diff --git a/inter/hkg/image/user_take_cup_msc/bd_door_open_take_double_cup.png b/inter/hkg/image/user_take_cup_msc/bd_door_open_take_double_cup.png
new file mode 100644
index 00000000..b4f8edd5
Binary files /dev/null and b/inter/hkg/image/user_take_cup_msc/bd_door_open_take_double_cup.png differ
diff --git a/inter/hkg/image/user_take_cup_msc/bn_door_open.png b/inter/hkg/image/user_take_cup_msc/bn_door_open.png
new file mode 100644
index 00000000..88b91947
Binary files /dev/null and b/inter/hkg/image/user_take_cup_msc/bn_door_open.png differ
diff --git a/inter/hkg/image/user_take_cup_msc/bn_door_open_take_double_cup.png b/inter/hkg/image/user_take_cup_msc/bn_door_open_take_double_cup.png
new file mode 100644
index 00000000..bb71d542
Binary files /dev/null and b/inter/hkg/image/user_take_cup_msc/bn_door_open_take_double_cup.png differ
diff --git a/inter/hkg/image/user_take_cup_msc/bp_door_open.png b/inter/hkg/image/user_take_cup_msc/bp_door_open.png
new file mode 100644
index 00000000..5021ecdb
Binary files /dev/null and b/inter/hkg/image/user_take_cup_msc/bp_door_open.png differ
diff --git a/inter/hkg/image/user_take_cup_msc/bp_door_open_take_double_cup.png b/inter/hkg/image/user_take_cup_msc/bp_door_open_take_double_cup.png
new file mode 100644
index 00000000..3beae4e9
Binary files /dev/null and b/inter/hkg/image/user_take_cup_msc/bp_door_open_take_double_cup.png differ
diff --git a/inter/hkg/image/user_take_cup_msc/img5.png b/inter/hkg/image/user_take_cup_msc/img5.png
new file mode 100644
index 00000000..d3883173
Binary files /dev/null and b/inter/hkg/image/user_take_cup_msc/img5.png differ
diff --git a/inter/hkg/image/user_take_cup_msc/img_take_cup_for_next_brew.png b/inter/hkg/image/user_take_cup_msc/img_take_cup_for_next_brew.png
new file mode 100644
index 00000000..cba8ddc8
Binary files /dev/null and b/inter/hkg/image/user_take_cup_msc/img_take_cup_for_next_brew.png differ
diff --git a/inter/hkg/image/user_take_cup_mtc/bd_door_open_take_double_cup.png b/inter/hkg/image/user_take_cup_mtc/bd_door_open_take_double_cup.png
new file mode 100644
index 00000000..b434a7d6
Binary files /dev/null and b/inter/hkg/image/user_take_cup_mtc/bd_door_open_take_double_cup.png differ
diff --git a/inter/hkg/image/user_take_cup_mtc/bn_door_open.png b/inter/hkg/image/user_take_cup_mtc/bn_door_open.png
new file mode 100644
index 00000000..6df8d857
Binary files /dev/null and b/inter/hkg/image/user_take_cup_mtc/bn_door_open.png differ
diff --git a/inter/hkg/image/user_take_cup_mtc/bn_door_open_take_double_cup.png b/inter/hkg/image/user_take_cup_mtc/bn_door_open_take_double_cup.png
new file mode 100644
index 00000000..00ac7058
Binary files /dev/null and b/inter/hkg/image/user_take_cup_mtc/bn_door_open_take_double_cup.png differ
diff --git a/inter/hkg/image/user_take_cup_mtc/bp_door_open.png b/inter/hkg/image/user_take_cup_mtc/bp_door_open.png
new file mode 100644
index 00000000..9918de95
Binary files /dev/null and b/inter/hkg/image/user_take_cup_mtc/bp_door_open.png differ
diff --git a/inter/hkg/image/user_take_cup_mtc/bp_door_open_take_double_cup.png b/inter/hkg/image/user_take_cup_mtc/bp_door_open_take_double_cup.png
new file mode 100644
index 00000000..3056655a
Binary files /dev/null and b/inter/hkg/image/user_take_cup_mtc/bp_door_open_take_double_cup.png differ
diff --git a/inter/hkg/image/user_take_cup_mtc/img5.png b/inter/hkg/image/user_take_cup_mtc/img5.png
new file mode 100644
index 00000000..a5669f4d
Binary files /dev/null and b/inter/hkg/image/user_take_cup_mtc/img5.png differ
diff --git a/inter/hkg/image/user_take_cup_mtc/img_take_cup_for_next_brew.png b/inter/hkg/image/user_take_cup_mtc/img_take_cup_for_next_brew.png
new file mode 100644
index 00000000..267b3882
Binary files /dev/null and b/inter/hkg/image/user_take_cup_mtc/img_take_cup_for_next_brew.png differ
diff --git a/inter/hkg/image/vending_error_msc/img1.png b/inter/hkg/image/vending_error_msc/img1.png
new file mode 100644
index 00000000..c5114d1a
Binary files /dev/null and b/inter/hkg/image/vending_error_msc/img1.png differ
diff --git a/inter/hkg/image/vending_error_msc/text1.png b/inter/hkg/image/vending_error_msc/text1.png
new file mode 100644
index 00000000..cfa461a4
Binary files /dev/null and b/inter/hkg/image/vending_error_msc/text1.png differ
diff --git a/inter/hkg/image/vending_error_msc/text2.png b/inter/hkg/image/vending_error_msc/text2.png
new file mode 100644
index 00000000..65e112e6
Binary files /dev/null and b/inter/hkg/image/vending_error_msc/text2.png differ
diff --git a/inter/hkg/image/vending_error_mtc/img1.png b/inter/hkg/image/vending_error_mtc/img1.png
new file mode 100644
index 00000000..bc9f5e99
Binary files /dev/null and b/inter/hkg/image/vending_error_mtc/img1.png differ
diff --git a/inter/hkg/image/vending_error_mtc/text1.png b/inter/hkg/image/vending_error_mtc/text1.png
new file mode 100644
index 00000000..9392d4cf
Binary files /dev/null and b/inter/hkg/image/vending_error_mtc/text1.png differ
diff --git a/inter/hkg/image/vending_error_mtc/text2.png b/inter/hkg/image/vending_error_mtc/text2.png
new file mode 100644
index 00000000..fd42e487
Binary files /dev/null and b/inter/hkg/image/vending_error_mtc/text2.png differ
diff --git a/inter/hkg/xml/multi/page_catalog.lxml b/inter/hkg/xml/multi/page_catalog.lxml
index d379e92f..5dfa05b7 100644
--- a/inter/hkg/xml/multi/page_catalog.lxml
+++ b/inter/hkg/xml/multi/page_catalog.lxml
@@ -498,7 +498,7 @@
 <EventClick> 
 	If  Seeker = "next" Then 
 		RootLayoutVisible 3 "hide"
-        Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+        Open "ROOT/taobin_project/inter/hkg/xml/page_brewing3Conti.xml"  
     Else
         Open "ROOT/taobin_project/xml/page_back_to_main.xml"
     EndIf
diff --git a/inter/hkg/xml/page_brewing3Conti.xml b/inter/hkg/xml/page_brewing3Conti.xml
index 69ccdd57..3d4ac2ae 100644
--- a/inter/hkg/xml/page_brewing3Conti.xml
+++ b/inter/hkg/xml/page_brewing3Conti.xml
@@ -16,14 +16,16 @@
 
 	;Var PayCredit = 0
 
+	Var DirImageDoing = "ROOT/taobin_project/inter/hkg/image/page_doing"
+
+	Var IMG_CNT = DirImageDoing + "/bg_show_time_remaining.png"
+
 	If show_eng = "true" Then 
 		Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
 		Var DirImage2 = "ROOT/taobin_project/image/topping2_en"
-		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
 	Else
 		Var DirImage = "ROOT/taobin_project/image/page_payment"
 		Var DirImage2 = "ROOT/taobin_project/image/topping2"
-		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
 	EndIf
 
 	Var next_pic_bn = DirImage + "/bn_add_order.png"
@@ -164,7 +166,7 @@
 		Var ShowPercent = "Enable"
 		Var ShowCountdown = "Invisible"
 
-		Var IMG_CNT = "ROOT/taobin_project/inter/hkg/image/page_doing/img2_percent_eng.png"
+		Var DirImageDoing = "ROOT/taobin_project/inter/hkg/image/page_doing"
 	EndIf
 
 	If XPercent = 0 Then
@@ -1052,7 +1054,9 @@
 <X> 0 </X>
 <Y> 1655 </Y>
 <State>EnableSelectMenuBetweenBrew</State>
-<Filename> text_next_order </Filename>
+<Language>
+	<ID> 000408 </ID>
+</Language>
 <Image>
 
 <Image>
@@ -1097,12 +1101,27 @@
 <Value> XPercent </Value>
 </Text>
 
+<Text>
+<X> 816 </X>
+<Y> 429 </Y>
+<Language>
+	<ID> 000405 </ID>
+</Language>
+</Text>
+<Text>
+<X> 941 </X>
+<Y> 518 </Y>
+<Language>
+	<ID> 000406 </ID>
+</Language>
+</Text>
+
 <Button>
 <X> 792 </X>
 <Y> 1787 </Y>
 <State>EnableSelectMenuBetweenBrew</State>
-<Filename> next_pic_bn </Filename>
-<FilenamePress> next_pic_bp </FilenamePress>
+<Filename> Var( DirImageDoing + "/bn_next_order.png" ) </Filename>
+<FilenamePress> Var( DirImageDoing + "/bp_next_order.png" )"/bp_next_order.png" </FilenamePress>
 <EventClick> 
 	If MachineState_Result = 0 Then
 	
@@ -1116,6 +1135,13 @@
 		Open "ROOT/taobin_project/xml/page_catalog.xml" 
 	EndIf
 </EventClick> 
+<Language>
+	<X> 0 </X>
+	<Y> 20 </Y>
+	<Width> 297 </Width>
+	<Height> 96 </Height>
+	<ID> 000407 </ID>
+</Language>
 </Button>
 
 <Button>
diff --git a/inter/hkg/xml/page_drinkfail_hkg.lxml b/inter/hkg/xml/page_drinkfail_hkg.lxml
index b6090bef..e936d5f4 100644
--- a/inter/hkg/xml/page_drinkfail_hkg.lxml
+++ b/inter/hkg/xml/page_drinkfail_hkg.lxml
@@ -10,6 +10,14 @@
 
 	Var DirImage = CountryRootPath + "/image/collectiing/"
 
+    If LanguageShow = "MSC" Then
+        Var DirImage = CountryRootPath + "/image/collectiing_drinkfail_msc/"
+    EndIf
+
+    If LanguageShow = "MTC" Then
+        Var DirImage = CountryRootPath + "/image/collectiing_drinkfail_mtc/"
+    EndIf
+
 	
 	Var Timeout = 0
 	StopLongPlay
diff --git a/inter/hkg/xml/page_topping_select6.lxml b/inter/hkg/xml/page_topping_select6.lxml
index 29de1bba..02e5d2d2 100644
--- a/inter/hkg/xml/page_topping_select6.lxml
+++ b/inter/hkg/xml/page_topping_select6.lxml
@@ -2224,9 +2224,9 @@
 <X> 680 </X>
 <Y> 79 </Y>
 <State> SugarState5 </State>
-<Filename> SugarNormalPicLv5 </Filename>
-<FilenamePress>  SugarPressPicLv5 </FilenamePress>
-<FilenameDisable>  "ROOT/taobin_project/image/topping2_en/bu_sugarlevel_sg5.png" </FilenameDisable>
+<Filename> "ROOT/taobin_project/image/topping_inter/bn_sugar_6lvl.png" </Filename>
+<FilenamePress>  "ROOT/taobin_project/image/topping_inter/bp_sugar_6lvl.png" </FilenamePress>
+<FilenameDisable>  "ROOT/taobin_project/image/topping_inter/bd_sugar_6lvl.png" </FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
@@ -2292,9 +2292,9 @@
 <X> 820 </X>
 <Y> 79 </Y>
 <State> SugarState6 </State>
-<Filename> SugarNormalPicLv6 </Filename>
-<FilenamePress>  SugarPressPicLv6 </FilenamePress>
-<FilenameDisable>  "ROOT/taobin_project/image/topping2_en/bu_sugarlevel_sg6.png" </FilenameDisable>
+<Filename> "ROOT/taobin_project/image/topping_inter/bn_sugar_6lvl.png" </Filename>
+<FilenamePress>  "ROOT/taobin_project/image/topping_inter/bp_sugar_6lvl.png" </FilenamePress>
+<FilenameDisable>  "ROOT/taobin_project/image/topping_inter/bd_sugar_6lvl.png" </FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
diff --git a/xml/page_payment_cash-HKG.xml b/xml/page_payment_cash-HKG.xml
index d5c01b53..0dfce01f 100644
--- a/xml/page_payment_cash-HKG.xml
+++ b/xml/page_payment_cash-HKG.xml
@@ -7,6 +7,9 @@
 <Sound> PlaySoundLag </Sound>
 <EventOpen>
 
+	;HKG doesn't use New_Payment
+	Var New_Payment = 0
+
 	Var cash_disable = "0"
 	READ_FILE "/mnt/sdcard/coffeevending/cash_disable" cash_disable
 	DEBUGVAR cash_disable
@@ -1685,9 +1688,9 @@
 <X> 327 </X>
 <Y> TopRowY </Y>
 <State> CreditCardButtonState </State>
-<Filename> Var( CountryRootPath + "/image/page_payment/bn_credit_card.png") </Filename>
-<FilenamePress> Var( CountryRootPath + "/image/page_payment/bp_credit_card.png") </FilenamePress>
-<FilenameDisable> Var( CountryRootPath + "/image/page_payment/bd_credit_card.png") </FilenameDisable>
+<Filename> Var( DirImage + "/bn_credit_card.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_credit_card.png") </FilenamePress>
+<FilenameDisable> Var( DirImage + "/bd_credit_card.png") </FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
@@ -1739,9 +1742,9 @@ EndIf
 <X> 551 </X>
 <Y> TopRowY </Y>
 <State> QRCodeButtonState </State>
-<Filename> Var( CountryRootPath + "/image/page_payment/bn_qr_code.png") </Filename>
-<FilenamePress> Var( CountryRootPath + "/image/page_payment/bp_qr_code.png") </FilenamePress>
-<FilenameDisable> Var( CountryRootPath + "/image/page_payment/bd_qr_code.png") </FilenameDisable>
+<Filename> Var( DirImage + "/bn_qr_code.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_qr_code.png") </FilenamePress>
+<FilenameDisable> Var( DirImage + "/bd_qr_code.png") </FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
diff --git a/xml/page_remove_cup.xml b/xml/page_remove_cup.xml
index d00ad39e..dff9a7b1 100644
--- a/xml/page_remove_cup.xml
+++ b/xml/page_remove_cup.xml
@@ -40,11 +40,20 @@
 		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
 		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
 
+		If LanguageShow = "MSC" Then 
+			SetLanguage "MSC"
+		EndIf
+
+		If LanguageShow = "MTC" Then 
+			SetLanguage "MTC"
+		EndIf
+
 		If LanguageShow = "MYANMAR" Then 
 			SetLanguage "MYANMAR"
 		Else
 			SetLanguage "ENG"
 		EndIf
+
 	Else
 		SetLanguage "THAI"
 	EndIf
@@ -79,12 +88,12 @@
 		Var DirImage = "ROOT/taobin_project/image/user_take_cup_mmr/"
     EndIf
 	If LanguageShow = "MSC" Then 
-		Var DirImage = "ROOT/taobin_project/image/user_take_cup_en/"
+		Var DirImage = "ROOT/taobin_project/inter/hkg/image/user_take_cup_msc/"
 		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
 		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
 	EndIf
 	If LanguageShow = "MTC" Then 
-		Var DirImage = "ROOT/taobin_project/image/user_take_cup_en/"
+		Var DirImage = "ROOT/taobin_project/inter/hkg/image/user_take_cup_mtc/"
 		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
 		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
 	EndIf
diff --git a/xml/page_show_error.lxml b/xml/page_show_error.lxml
index c9e99ab9..8e7f8aff 100644
--- a/xml/page_show_error.lxml
+++ b/xml/page_show_error.lxml
@@ -223,12 +223,6 @@
 	DEBUGVAR MachineStage
 	DEBUGVAR stop_now
 	Var DirImage = "ROOT/taobin_project/image/vending_error_en"
-	If LanguageShow = "MSC" Then
-		Var DirImage = CountryRootPath + "image/vending_error_en"
-	EndIf
-	If LanguageShow = "MTC" Then
-		Var DirImage = CountryRootPath + "image/vending_error_en"
-	EndIf
 	If MachineStage = "show-menu" Then
 		If LanguageShow = "ENG" Then
 			Var DirImage = CountryRootPath + "image/vending_error_en"
@@ -249,10 +243,10 @@
 			Var DirImage = "ROOT/taobin_project/image/vending_error_mmr"
 		EndIf
 		If LanguageShow = "MSC" Then
-			Var DirImage = CountryRootPath + "image/vending_error_en"
+			Var DirImage = CountryRootPath + "image/vending_error_msc"
 		EndIf
 		If LanguageShow = "MTC" Then
-			Var DirImage = CountryRootPath + "image/vending_error_en"
+			Var DirImage = CountryRootPath + "image/vending_error_mtc"
 		EndIf
 	EndIf
 	If MachineStage = "mcu-upgrade" Then
@@ -277,6 +271,12 @@
 		If LanguageShow = "MYANMAR" Then
 			Var DirImage = "ROOT/taobin_project/image/vending_error_mmr"
 		EndIf
+		If LanguageShow = "MSC" Then
+			Var DirImage = CountryRootPath + "image/vending_error_msc"
+		EndIf
+		If LanguageShow = "MTC" Then
+			Var DirImage = CountryRootPath + "image/vending_error_mtc"
+		EndIf
 	EndIf
 
 	If NeedUpgrade = "true" Then
@@ -301,6 +301,12 @@
 		If LanguageShow = "MYANMAR" Then
 			Var DirImage = "ROOT/taobin_project/image/vending_error_mmr"
 		EndIf
+		If LanguageShow = "MSC" Then
+			Var DirImage = CountryRootPath + "image/vending_error_msc"
+		EndIf
+		If LanguageShow = "MTC" Then
+			Var DirImage = CountryRootPath + "image/vending_error_mtc"
+		EndIf
 	EndIf
 
 	DEBUGVAR MachineStage
@@ -329,6 +335,12 @@
 			If LanguageShow = "MYANMAR" Then
 				Var DirImage = "ROOT/taobin_project/image/vending_error_mmr"
 			EndIf
+			If LanguageShow = "MSC" Then
+				Var DirImage = CountryRootPath + "image/vending_error_msc"
+			EndIf
+			If LanguageShow = "MTC" Then
+				Var DirImage = CountryRootPath + "image/vending_error_mtc"
+			EndIf
 		Else
 			Var show_error_normal = "Enable"
 			Var show_error_sp1 = "Invisible"
@@ -354,6 +366,12 @@
 			If LanguageShow = "MYANMAR" Then
 				Var DirImage = CountryRootPath + "image/close_en"
 			EndIf
+			If LanguageShow = "MSC" Then
+				Var DirImage = CountryRootPath + "image/close_hkg"
+			EndIf
+			If LanguageShow = "MTC" Then
+				Var DirImage = CountryRootPath + "image/close_hkg"
+			EndIf
 		EndIf
 	EndIf
 
@@ -379,6 +397,12 @@
 			If LanguageShow = "MYANMAR" Then
 				Var DirImage = "ROOT/taobin_project/image/vending_error_mmr"
 			EndIf
+			If LanguageShow = "MSC" Then
+				Var DirImage = CountryRootPath + "image/vending_error_msc"
+			EndIf
+			If LanguageShow = "MTC" Then
+				Var DirImage = CountryRootPath + "image/vending_error_mtc"
+			EndIf
 		Else
 			Var show_error_normal = "Enable"
 			Var show_error_sp1 = "Invisible"
@@ -400,6 +424,12 @@
 			If LanguageShow = "MYANMAR" Then
 				Var DirImage = CountryRootPath + "image/close_en"
 			EndIf
+			If LanguageShow = "MSC" Then
+				Var DirImage = CountryRootPath + "image/close_hkg"
+			EndIf
+			If LanguageShow = "MTC" Then
+				Var DirImage = CountryRootPath + "image/close_hkg"
+			EndIf
 		EndIf
 	EndIf
 
@@ -422,6 +452,12 @@
 		If LanguageShow = "MYANMAR" Then
 			Var DirImage = "ROOT/taobin_project/image/vending_error_mmr"
 		EndIf
+		If LanguageShow = "MSC" Then
+			Var DirImage = CountryRootPath + "image/vending_error_msc"
+		EndIf
+		If LanguageShow = "MTC" Then
+			Var DirImage = CountryRootPath + "image/vending_error_mtc"
+		EndIf
 	EndIf
 
 	If NETCORE_EVENT_CNT_X >= 30 Then
@@ -444,6 +480,12 @@
 		If LanguageShow = "MYANMAR" Then
 			Var DirImage = "ROOT/taobin_project/image/vending_error_mmr"
 		EndIf
+		If LanguageShow = "MSC" Then
+			Var DirImage = CountryRootPath + "image/vending_error_msc"
+		EndIf
+		If LanguageShow = "MTC" Then
+			Var DirImage = CountryRootPath + "image/vending_error_mtc"
+		EndIf
 	EndIf
 
 	Var MaintenanceCard = 20