3 files changed, 1121 insertions, 1143 deletions

diff --git a/www/opencart/Makefile b/www/opencart/Makefile
index d8b62491ed24..0be7d31c2f47 100644
--- a/www/opencart/Makefile
+++ b/www/opencart/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	opencart
-PORTVERSION=	2.2.0.0
-PORTREVISION=	1
+PORTVERSION=	2.3.0.2
 CATEGORIES=	www misc
 
 MAINTAINER=	wen@FreeBSD.org
diff --git a/www/opencart/distinfo b/www/opencart/distinfo
index 6617a98637eb..16af913aa3f9 100644
--- a/www/opencart/distinfo
+++ b/www/opencart/distinfo
@@ -1,2 +1,3 @@
-SHA256 (opencart-opencart-2.2.0.0_GH0.tar.gz) = d6109eb72dc88b231007a24a0f93558e377b2c03f5a4aa573da707e5c984182c
-SIZE (opencart-opencart-2.2.0.0_GH0.tar.gz) = 10690543
+TIMESTAMP = 1470643690
+SHA256 (opencart-opencart-2.3.0.2_GH0.tar.gz) = 8f72cc8ecbd0d596033fbed6d8bc2c355a8a3b3cfbe6f2f0f2da7300a9d89579
+SIZE (opencart-opencart-2.3.0.2_GH0.tar.gz) = 11400007
diff --git a/www/opencart/pkg-plist b/www/opencart/pkg-plist
index 8d4cefe8405a..b0ed4b7078d8 100644
--- a/www/opencart/pkg-plist
+++ b/www/opencart/pkg-plist
@@ -1,7 +1,4 @@
 %%WWWDIR%%/.htaccess.txt
-%%WWWDIR%%/admin/controller/analytics/google_analytics.php
-%%WWWDIR%%/admin/controller/captcha/basic_captcha.php
-%%WWWDIR%%/admin/controller/captcha/google_captcha.php
 %%WWWDIR%%/admin/controller/catalog/attribute.php
 %%WWWDIR%%/admin/controller/catalog/attribute_group.php
 %%WWWDIR%%/admin/controller/catalog/category.php
@@ -21,46 +18,163 @@
 %%WWWDIR%%/admin/controller/common/header.php
 %%WWWDIR%%/admin/controller/common/login.php
 %%WWWDIR%%/admin/controller/common/logout.php
-%%WWWDIR%%/admin/controller/common/menu.php
-%%WWWDIR%%/admin/controller/common/profile.php
 %%WWWDIR%%/admin/controller/common/reset.php
-%%WWWDIR%%/admin/controller/common/stats.php
 %%WWWDIR%%/admin/controller/customer/custom_field.php
 %%WWWDIR%%/admin/controller/customer/customer.php
 %%WWWDIR%%/admin/controller/customer/customer_group.php
-%%WWWDIR%%/admin/controller/dashboard/activity.php
-%%WWWDIR%%/admin/controller/dashboard/chart.php
-%%WWWDIR%%/admin/controller/dashboard/customer.php
-%%WWWDIR%%/admin/controller/dashboard/map.php
-%%WWWDIR%%/admin/controller/dashboard/online.php
-%%WWWDIR%%/admin/controller/dashboard/order.php
-%%WWWDIR%%/admin/controller/dashboard/recent.php
-%%WWWDIR%%/admin/controller/dashboard/sale.php
 %%WWWDIR%%/admin/controller/design/banner.php
 %%WWWDIR%%/admin/controller/design/language.php
 %%WWWDIR%%/admin/controller/design/layout.php
+%%WWWDIR%%/admin/controller/design/menu.php
 %%WWWDIR%%/admin/controller/design/theme.php
+%%WWWDIR%%/admin/controller/design/translation.php
 %%WWWDIR%%/admin/controller/error/not_found.php
 %%WWWDIR%%/admin/controller/error/permission.php
+%%WWWDIR%%/admin/controller/event/compatibility.php
 %%WWWDIR%%/admin/controller/event/theme.php
-%%WWWDIR%%/admin/controller/extension/analytics.php
-%%WWWDIR%%/admin/controller/extension/captcha.php
-%%WWWDIR%%/admin/controller/extension/feed.php
-%%WWWDIR%%/admin/controller/extension/fraud.php
+%%WWWDIR%%/admin/controller/extension/analytics/google_analytics.php
+%%WWWDIR%%/admin/controller/extension/captcha/basic_captcha.php
+%%WWWDIR%%/admin/controller/extension/captcha/google_captcha.php
+%%WWWDIR%%/admin/controller/extension/dashboard/activity.php
+%%WWWDIR%%/admin/controller/extension/dashboard/chart.php
+%%WWWDIR%%/admin/controller/extension/dashboard/customer.php
+%%WWWDIR%%/admin/controller/extension/dashboard/map.php
+%%WWWDIR%%/admin/controller/extension/dashboard/online.php
+%%WWWDIR%%/admin/controller/extension/dashboard/order.php
+%%WWWDIR%%/admin/controller/extension/dashboard/recent.php
+%%WWWDIR%%/admin/controller/extension/dashboard/sale.php
+%%WWWDIR%%/admin/controller/extension/event.php
+%%WWWDIR%%/admin/controller/extension/extension.php
+%%WWWDIR%%/admin/controller/extension/extension/analytics.php
+%%WWWDIR%%/admin/controller/extension/extension/captcha.php
+%%WWWDIR%%/admin/controller/extension/extension/dashboard.php
+%%WWWDIR%%/admin/controller/extension/extension/feed.php
+%%WWWDIR%%/admin/controller/extension/extension/fraud.php
+%%WWWDIR%%/admin/controller/extension/extension/module.php
+%%WWWDIR%%/admin/controller/extension/extension/payment.php
+%%WWWDIR%%/admin/controller/extension/extension/shipping.php
+%%WWWDIR%%/admin/controller/extension/extension/theme.php
+%%WWWDIR%%/admin/controller/extension/extension/total.php
+%%WWWDIR%%/admin/controller/extension/feed/google_base.php
+%%WWWDIR%%/admin/controller/extension/feed/google_sitemap.php
+%%WWWDIR%%/admin/controller/extension/feed/openbaypro.php
+%%WWWDIR%%/admin/controller/extension/fraud/fraudlabspro.php
+%%WWWDIR%%/admin/controller/extension/fraud/ip.php
+%%WWWDIR%%/admin/controller/extension/fraud/maxmind.php
 %%WWWDIR%%/admin/controller/extension/installer.php
 %%WWWDIR%%/admin/controller/extension/modification.php
-%%WWWDIR%%/admin/controller/extension/module.php
+%%WWWDIR%%/admin/controller/extension/module/account.php
+%%WWWDIR%%/admin/controller/extension/module/affiliate.php
+%%WWWDIR%%/admin/controller/extension/module/amazon_login.php
+%%WWWDIR%%/admin/controller/extension/module/amazon_pay.php
+%%WWWDIR%%/admin/controller/extension/module/banner.php
+%%WWWDIR%%/admin/controller/extension/module/bestseller.php
+%%WWWDIR%%/admin/controller/extension/module/carousel.php
+%%WWWDIR%%/admin/controller/extension/module/category.php
+%%WWWDIR%%/admin/controller/extension/module/divido_calculator.php
+%%WWWDIR%%/admin/controller/extension/module/ebay_listing.php
+%%WWWDIR%%/admin/controller/extension/module/featured.php
+%%WWWDIR%%/admin/controller/extension/module/filter.php
+%%WWWDIR%%/admin/controller/extension/module/google_hangouts.php
+%%WWWDIR%%/admin/controller/extension/module/html.php
+%%WWWDIR%%/admin/controller/extension/module/information.php
+%%WWWDIR%%/admin/controller/extension/module/klarna_checkout_module.php
+%%WWWDIR%%/admin/controller/extension/module/latest.php
+%%WWWDIR%%/admin/controller/extension/module/laybuy_layout.php
+%%WWWDIR%%/admin/controller/extension/module/pilibaba_button.php
+%%WWWDIR%%/admin/controller/extension/module/pp_button.php
+%%WWWDIR%%/admin/controller/extension/module/pp_login.php
+%%WWWDIR%%/admin/controller/extension/module/sagepay_direct_cards.php
+%%WWWDIR%%/admin/controller/extension/module/sagepay_server_cards.php
+%%WWWDIR%%/admin/controller/extension/module/slideshow.php
+%%WWWDIR%%/admin/controller/extension/module/special.php
+%%WWWDIR%%/admin/controller/extension/module/store.php
 %%WWWDIR%%/admin/controller/extension/openbay.php
-%%WWWDIR%%/admin/controller/extension/payment.php
-%%WWWDIR%%/admin/controller/extension/shipping.php
-%%WWWDIR%%/admin/controller/extension/theme.php
-%%WWWDIR%%/admin/controller/extension/total.php
-%%WWWDIR%%/admin/controller/feed/google_base.php
-%%WWWDIR%%/admin/controller/feed/google_sitemap.php
-%%WWWDIR%%/admin/controller/feed/openbaypro.php
-%%WWWDIR%%/admin/controller/fraud/fraudlabspro.php
-%%WWWDIR%%/admin/controller/fraud/ip.php
-%%WWWDIR%%/admin/controller/fraud/maxmind.php
+%%WWWDIR%%/admin/controller/extension/openbay/amazon.php
+%%WWWDIR%%/admin/controller/extension/openbay/amazon_listing.php
+%%WWWDIR%%/admin/controller/extension/openbay/amazon_product.php
+%%WWWDIR%%/admin/controller/extension/openbay/amazonus.php
+%%WWWDIR%%/admin/controller/extension/openbay/amazonus_listing.php
+%%WWWDIR%%/admin/controller/extension/openbay/amazonus_product.php
+%%WWWDIR%%/admin/controller/extension/openbay/ebay.php
+%%WWWDIR%%/admin/controller/extension/openbay/ebay_profile.php
+%%WWWDIR%%/admin/controller/extension/openbay/ebay_template.php
+%%WWWDIR%%/admin/controller/extension/openbay/etsy.php
+%%WWWDIR%%/admin/controller/extension/openbay/etsy_product.php
+%%WWWDIR%%/admin/controller/extension/openbay/etsy_shipping.php
+%%WWWDIR%%/admin/controller/extension/openbay/etsy_shop.php
+%%WWWDIR%%/admin/controller/extension/openbay/fba.php
+%%WWWDIR%%/admin/controller/extension/payment/amazon_login_pay.php
+%%WWWDIR%%/admin/controller/extension/payment/authorizenet_aim.php
+%%WWWDIR%%/admin/controller/extension/payment/authorizenet_sim.php
+%%WWWDIR%%/admin/controller/extension/payment/bank_transfer.php
+%%WWWDIR%%/admin/controller/extension/payment/bluepay_hosted.php
+%%WWWDIR%%/admin/controller/extension/payment/bluepay_redirect.php
+%%WWWDIR%%/admin/controller/extension/payment/cardconnect.php
+%%WWWDIR%%/admin/controller/extension/payment/cardinity.php
+%%WWWDIR%%/admin/controller/extension/payment/cheque.php
+%%WWWDIR%%/admin/controller/extension/payment/cod.php
+%%WWWDIR%%/admin/controller/extension/payment/divido.php
+%%WWWDIR%%/admin/controller/extension/payment/eway.php
+%%WWWDIR%%/admin/controller/extension/payment/firstdata.php
+%%WWWDIR%%/admin/controller/extension/payment/firstdata_remote.php
+%%WWWDIR%%/admin/controller/extension/payment/free_checkout.php
+%%WWWDIR%%/admin/controller/extension/payment/g2apay.php
+%%WWWDIR%%/admin/controller/extension/payment/globalpay.php
+%%WWWDIR%%/admin/controller/extension/payment/globalpay_remote.php
+%%WWWDIR%%/admin/controller/extension/payment/klarna_account.php
+%%WWWDIR%%/admin/controller/extension/payment/klarna_checkout.php
+%%WWWDIR%%/admin/controller/extension/payment/klarna_invoice.php
+%%WWWDIR%%/admin/controller/extension/payment/laybuy.php
+%%WWWDIR%%/admin/controller/extension/payment/liqpay.php
+%%WWWDIR%%/admin/controller/extension/payment/nochex.php
+%%WWWDIR%%/admin/controller/extension/payment/paymate.php
+%%WWWDIR%%/admin/controller/extension/payment/paypoint.php
+%%WWWDIR%%/admin/controller/extension/payment/payza.php
+%%WWWDIR%%/admin/controller/extension/payment/perpetual_payments.php
+%%WWWDIR%%/admin/controller/extension/payment/pilibaba.php
+%%WWWDIR%%/admin/controller/extension/payment/pp_express.php
+%%WWWDIR%%/admin/controller/extension/payment/pp_payflow.php
+%%WWWDIR%%/admin/controller/extension/payment/pp_payflow_iframe.php
+%%WWWDIR%%/admin/controller/extension/payment/pp_pro.php
+%%WWWDIR%%/admin/controller/extension/payment/pp_pro_iframe.php
+%%WWWDIR%%/admin/controller/extension/payment/pp_standard.php
+%%WWWDIR%%/admin/controller/extension/payment/realex.php
+%%WWWDIR%%/admin/controller/extension/payment/realex_remote.php
+%%WWWDIR%%/admin/controller/extension/payment/sagepay_direct.php
+%%WWWDIR%%/admin/controller/extension/payment/sagepay_server.php
+%%WWWDIR%%/admin/controller/extension/payment/sagepay_us.php
+%%WWWDIR%%/admin/controller/extension/payment/securetrading_pp.php
+%%WWWDIR%%/admin/controller/extension/payment/securetrading_ws.php
+%%WWWDIR%%/admin/controller/extension/payment/skrill.php
+%%WWWDIR%%/admin/controller/extension/payment/twocheckout.php
+%%WWWDIR%%/admin/controller/extension/payment/web_payment_software.php
+%%WWWDIR%%/admin/controller/extension/payment/worldpay.php
+%%WWWDIR%%/admin/controller/extension/shipping/auspost.php
+%%WWWDIR%%/admin/controller/extension/shipping/citylink.php
+%%WWWDIR%%/admin/controller/extension/shipping/fedex.php
+%%WWWDIR%%/admin/controller/extension/shipping/flat.php
+%%WWWDIR%%/admin/controller/extension/shipping/free.php
+%%WWWDIR%%/admin/controller/extension/shipping/item.php
+%%WWWDIR%%/admin/controller/extension/shipping/parcelforce_48.php
+%%WWWDIR%%/admin/controller/extension/shipping/pickup.php
+%%WWWDIR%%/admin/controller/extension/shipping/royal_mail.php
+%%WWWDIR%%/admin/controller/extension/shipping/ups.php
+%%WWWDIR%%/admin/controller/extension/shipping/usps.php
+%%WWWDIR%%/admin/controller/extension/shipping/weight.php
+%%WWWDIR%%/admin/controller/extension/store.php
+%%WWWDIR%%/admin/controller/extension/theme/theme_default.php
+%%WWWDIR%%/admin/controller/extension/total/coupon.php
+%%WWWDIR%%/admin/controller/extension/total/credit.php
+%%WWWDIR%%/admin/controller/extension/total/handling.php
+%%WWWDIR%%/admin/controller/extension/total/klarna_fee.php
+%%WWWDIR%%/admin/controller/extension/total/low_order_fee.php
+%%WWWDIR%%/admin/controller/extension/total/reward.php
+%%WWWDIR%%/admin/controller/extension/total/shipping.php
+%%WWWDIR%%/admin/controller/extension/total/sub_total.php
+%%WWWDIR%%/admin/controller/extension/total/tax.php
+%%WWWDIR%%/admin/controller/extension/total/total.php
+%%WWWDIR%%/admin/controller/extension/total/voucher.php
 %%WWWDIR%%/admin/controller/localisation/country.php
 %%WWWDIR%%/admin/controller/localisation/currency.php
 %%WWWDIR%%/admin/controller/localisation/geo_zone.php
@@ -80,85 +194,6 @@
 %%WWWDIR%%/admin/controller/marketing/contact.php
 %%WWWDIR%%/admin/controller/marketing/coupon.php
 %%WWWDIR%%/admin/controller/marketing/marketing.php
-%%WWWDIR%%/admin/controller/module/account.php
-%%WWWDIR%%/admin/controller/module/affiliate.php
-%%WWWDIR%%/admin/controller/module/amazon_login.php
-%%WWWDIR%%/admin/controller/module/amazon_pay.php
-%%WWWDIR%%/admin/controller/module/banner.php
-%%WWWDIR%%/admin/controller/module/bestseller.php
-%%WWWDIR%%/admin/controller/module/carousel.php
-%%WWWDIR%%/admin/controller/module/category.php
-%%WWWDIR%%/admin/controller/module/ebay_listing.php
-%%WWWDIR%%/admin/controller/module/featured.php
-%%WWWDIR%%/admin/controller/module/filter.php
-%%WWWDIR%%/admin/controller/module/google_hangouts.php
-%%WWWDIR%%/admin/controller/module/html.php
-%%WWWDIR%%/admin/controller/module/information.php
-%%WWWDIR%%/admin/controller/module/latest.php
-%%WWWDIR%%/admin/controller/module/laybuy_layout.php
-%%WWWDIR%%/admin/controller/module/pp_button.php
-%%WWWDIR%%/admin/controller/module/pp_login.php
-%%WWWDIR%%/admin/controller/module/sagepay_direct_cards.php
-%%WWWDIR%%/admin/controller/module/sagepay_server_cards.php
-%%WWWDIR%%/admin/controller/module/slideshow.php
-%%WWWDIR%%/admin/controller/module/special.php
-%%WWWDIR%%/admin/controller/module/store.php
-%%WWWDIR%%/admin/controller/openbay/amazon.php
-%%WWWDIR%%/admin/controller/openbay/amazon_listing.php
-%%WWWDIR%%/admin/controller/openbay/amazon_product.php
-%%WWWDIR%%/admin/controller/openbay/amazonus.php
-%%WWWDIR%%/admin/controller/openbay/amazonus_listing.php
-%%WWWDIR%%/admin/controller/openbay/amazonus_product.php
-%%WWWDIR%%/admin/controller/openbay/ebay.php
-%%WWWDIR%%/admin/controller/openbay/ebay_profile.php
-%%WWWDIR%%/admin/controller/openbay/ebay_template.php
-%%WWWDIR%%/admin/controller/openbay/etsy.php
-%%WWWDIR%%/admin/controller/openbay/etsy_product.php
-%%WWWDIR%%/admin/controller/openbay/etsy_shipping.php
-%%WWWDIR%%/admin/controller/openbay/etsy_shop.php
-%%WWWDIR%%/admin/controller/openbay/fba.php
-%%WWWDIR%%/admin/controller/payment/amazon_login_pay.php
-%%WWWDIR%%/admin/controller/payment/authorizenet_aim.php
-%%WWWDIR%%/admin/controller/payment/authorizenet_sim.php
-%%WWWDIR%%/admin/controller/payment/bank_transfer.php
-%%WWWDIR%%/admin/controller/payment/bluepay_hosted.php
-%%WWWDIR%%/admin/controller/payment/bluepay_redirect.php
-%%WWWDIR%%/admin/controller/payment/cardinity.php
-%%WWWDIR%%/admin/controller/payment/cheque.php
-%%WWWDIR%%/admin/controller/payment/cod.php
-%%WWWDIR%%/admin/controller/payment/eway.php
-%%WWWDIR%%/admin/controller/payment/firstdata.php
-%%WWWDIR%%/admin/controller/payment/firstdata_remote.php
-%%WWWDIR%%/admin/controller/payment/free_checkout.php
-%%WWWDIR%%/admin/controller/payment/g2apay.php
-%%WWWDIR%%/admin/controller/payment/globalpay.php
-%%WWWDIR%%/admin/controller/payment/globalpay_remote.php
-%%WWWDIR%%/admin/controller/payment/klarna_account.php
-%%WWWDIR%%/admin/controller/payment/klarna_invoice.php
-%%WWWDIR%%/admin/controller/payment/laybuy.php
-%%WWWDIR%%/admin/controller/payment/liqpay.php
-%%WWWDIR%%/admin/controller/payment/nochex.php
-%%WWWDIR%%/admin/controller/payment/paymate.php
-%%WWWDIR%%/admin/controller/payment/paypoint.php
-%%WWWDIR%%/admin/controller/payment/payza.php
-%%WWWDIR%%/admin/controller/payment/perpetual_payments.php
-%%WWWDIR%%/admin/controller/payment/pp_express.php
-%%WWWDIR%%/admin/controller/payment/pp_payflow.php
-%%WWWDIR%%/admin/controller/payment/pp_payflow_iframe.php
-%%WWWDIR%%/admin/controller/payment/pp_pro.php
-%%WWWDIR%%/admin/controller/payment/pp_pro_iframe.php
-%%WWWDIR%%/admin/controller/payment/pp_standard.php
-%%WWWDIR%%/admin/controller/payment/realex.php
-%%WWWDIR%%/admin/controller/payment/realex_remote.php
-%%WWWDIR%%/admin/controller/payment/sagepay_direct.php
-%%WWWDIR%%/admin/controller/payment/sagepay_server.php
-%%WWWDIR%%/admin/controller/payment/sagepay_us.php
-%%WWWDIR%%/admin/controller/payment/securetrading_pp.php
-%%WWWDIR%%/admin/controller/payment/securetrading_ws.php
-%%WWWDIR%%/admin/controller/payment/skrill.php
-%%WWWDIR%%/admin/controller/payment/twocheckout.php
-%%WWWDIR%%/admin/controller/payment/web_payment_software.php
-%%WWWDIR%%/admin/controller/payment/worldpay.php
 %%WWWDIR%%/admin/controller/report/affiliate.php
 %%WWWDIR%%/admin/controller/report/affiliate_activity.php
 %%WWWDIR%%/admin/controller/report/affiliate_login.php
@@ -168,6 +203,7 @@
 %%WWWDIR%%/admin/controller/report/customer_online.php
 %%WWWDIR%%/admin/controller/report/customer_order.php
 %%WWWDIR%%/admin/controller/report/customer_reward.php
+%%WWWDIR%%/admin/controller/report/customer_search.php
 %%WWWDIR%%/admin/controller/report/marketing.php
 %%WWWDIR%%/admin/controller/report/product_purchased.php
 %%WWWDIR%%/admin/controller/report/product_viewed.php
@@ -183,18 +219,7 @@
 %%WWWDIR%%/admin/controller/sale/voucher_theme.php
 %%WWWDIR%%/admin/controller/setting/setting.php
 %%WWWDIR%%/admin/controller/setting/store.php
-%%WWWDIR%%/admin/controller/shipping/auspost.php
-%%WWWDIR%%/admin/controller/shipping/citylink.php
-%%WWWDIR%%/admin/controller/shipping/fedex.php
-%%WWWDIR%%/admin/controller/shipping/flat.php
-%%WWWDIR%%/admin/controller/shipping/free.php
-%%WWWDIR%%/admin/controller/shipping/item.php
-%%WWWDIR%%/admin/controller/shipping/parcelforce_48.php
-%%WWWDIR%%/admin/controller/shipping/pickup.php
-%%WWWDIR%%/admin/controller/shipping/royal_mail.php
-%%WWWDIR%%/admin/controller/shipping/ups.php
-%%WWWDIR%%/admin/controller/shipping/usps.php
-%%WWWDIR%%/admin/controller/shipping/weight.php
+%%WWWDIR%%/admin/controller/startup/compatibility.php
 %%WWWDIR%%/admin/controller/startup/error.php
 %%WWWDIR%%/admin/controller/startup/event.php
 %%WWWDIR%%/admin/controller/startup/login.php
@@ -202,28 +227,13 @@
 %%WWWDIR%%/admin/controller/startup/router.php
 %%WWWDIR%%/admin/controller/startup/sass.php
 %%WWWDIR%%/admin/controller/startup/startup.php
-%%WWWDIR%%/admin/controller/theme/theme_default.php
 %%WWWDIR%%/admin/controller/tool/backup.php
-%%WWWDIR%%/admin/controller/tool/error_log.php
+%%WWWDIR%%/admin/controller/tool/log.php
 %%WWWDIR%%/admin/controller/tool/upload.php
-%%WWWDIR%%/admin/controller/total/coupon.php
-%%WWWDIR%%/admin/controller/total/credit.php
-%%WWWDIR%%/admin/controller/total/handling.php
-%%WWWDIR%%/admin/controller/total/klarna_fee.php
-%%WWWDIR%%/admin/controller/total/low_order_fee.php
-%%WWWDIR%%/admin/controller/total/reward.php
-%%WWWDIR%%/admin/controller/total/shipping.php
-%%WWWDIR%%/admin/controller/total/sub_total.php
-%%WWWDIR%%/admin/controller/total/tax.php
-%%WWWDIR%%/admin/controller/total/total.php
-%%WWWDIR%%/admin/controller/total/voucher.php
 %%WWWDIR%%/admin/controller/user/api.php
 %%WWWDIR%%/admin/controller/user/user.php
 %%WWWDIR%%/admin/controller/user/user_permission.php
 %%WWWDIR%%/admin/index.php
-%%WWWDIR%%/admin/language/en-gb/analytics/google_analytics.php
-%%WWWDIR%%/admin/language/en-gb/captcha/basic_captcha.php
-%%WWWDIR%%/admin/language/en-gb/captcha/google_captcha.php
 %%WWWDIR%%/admin/language/en-gb/catalog/attribute.php
 %%WWWDIR%%/admin/language/en-gb/catalog/attribute_group.php
 %%WWWDIR%%/admin/language/en-gb/catalog/category.php
@@ -235,50 +245,207 @@
 %%WWWDIR%%/admin/language/en-gb/catalog/product.php
 %%WWWDIR%%/admin/language/en-gb/catalog/recurring.php
 %%WWWDIR%%/admin/language/en-gb/catalog/review.php
+%%WWWDIR%%/admin/language/en-gb/common/column_left.php
 %%WWWDIR%%/admin/language/en-gb/common/dashboard.php
 %%WWWDIR%%/admin/language/en-gb/common/filemanager.php
 %%WWWDIR%%/admin/language/en-gb/common/footer.php
 %%WWWDIR%%/admin/language/en-gb/common/forgotten.php
 %%WWWDIR%%/admin/language/en-gb/common/header.php
 %%WWWDIR%%/admin/language/en-gb/common/login.php
-%%WWWDIR%%/admin/language/en-gb/common/menu.php
 %%WWWDIR%%/admin/language/en-gb/common/reset.php
-%%WWWDIR%%/admin/language/en-gb/common/stats.php
 %%WWWDIR%%/admin/language/en-gb/customer/custom_field.php
 %%WWWDIR%%/admin/language/en-gb/customer/customer.php
 %%WWWDIR%%/admin/language/en-gb/customer/customer_group.php
-%%WWWDIR%%/admin/language/en-gb/dashboard/activity.php
-%%WWWDIR%%/admin/language/en-gb/dashboard/chart.php
-%%WWWDIR%%/admin/language/en-gb/dashboard/customer.php
-%%WWWDIR%%/admin/language/en-gb/dashboard/map.php
-%%WWWDIR%%/admin/language/en-gb/dashboard/online.php
-%%WWWDIR%%/admin/language/en-gb/dashboard/order.php
-%%WWWDIR%%/admin/language/en-gb/dashboard/recent.php
-%%WWWDIR%%/admin/language/en-gb/dashboard/sale.php
 %%WWWDIR%%/admin/language/en-gb/design/banner.php
+%%WWWDIR%%/admin/language/en-gb/design/language.php
 %%WWWDIR%%/admin/language/en-gb/design/layout.php
+%%WWWDIR%%/admin/language/en-gb/design/menu.php
+%%WWWDIR%%/admin/language/en-gb/design/theme.php
+%%WWWDIR%%/admin/language/en-gb/design/translation.php
 %%WWWDIR%%/admin/language/en-gb/en-gb.php
 %%WWWDIR%%/admin/language/en-gb/en-gb.png
 %%WWWDIR%%/admin/language/en-gb/error/not_found.php
 %%WWWDIR%%/admin/language/en-gb/error/permission.php
-%%WWWDIR%%/admin/language/en-gb/extension/analytics.php
-%%WWWDIR%%/admin/language/en-gb/extension/captcha.php
-%%WWWDIR%%/admin/language/en-gb/extension/feed.php
-%%WWWDIR%%/admin/language/en-gb/extension/fraud.php
+%%WWWDIR%%/admin/language/en-gb/extension/analytics/google_analytics.php
+%%WWWDIR%%/admin/language/en-gb/extension/captcha/basic_captcha.php
+%%WWWDIR%%/admin/language/en-gb/extension/captcha/google_captcha.php
+%%WWWDIR%%/admin/language/en-gb/extension/dashboard/activity.php
+%%WWWDIR%%/admin/language/en-gb/extension/dashboard/chart.php
+%%WWWDIR%%/admin/language/en-gb/extension/dashboard/customer.php
+%%WWWDIR%%/admin/language/en-gb/extension/dashboard/map.php
+%%WWWDIR%%/admin/language/en-gb/extension/dashboard/online.php
+%%WWWDIR%%/admin/language/en-gb/extension/dashboard/order.php
+%%WWWDIR%%/admin/language/en-gb/extension/dashboard/recent.php
+%%WWWDIR%%/admin/language/en-gb/extension/dashboard/sale.php
+%%WWWDIR%%/admin/language/en-gb/extension/event.php
+%%WWWDIR%%/admin/language/en-gb/extension/extension.php
+%%WWWDIR%%/admin/language/en-gb/extension/extension/analytics.php
+%%WWWDIR%%/admin/language/en-gb/extension/extension/captcha.php
+%%WWWDIR%%/admin/language/en-gb/extension/extension/dashboard.php
+%%WWWDIR%%/admin/language/en-gb/extension/extension/feed.php
+%%WWWDIR%%/admin/language/en-gb/extension/extension/fraud.php
+%%WWWDIR%%/admin/language/en-gb/extension/extension/module.php
+%%WWWDIR%%/admin/language/en-gb/extension/extension/openbay.php
+%%WWWDIR%%/admin/language/en-gb/extension/extension/payment.php
+%%WWWDIR%%/admin/language/en-gb/extension/extension/shipping.php
+%%WWWDIR%%/admin/language/en-gb/extension/extension/theme.php
+%%WWWDIR%%/admin/language/en-gb/extension/extension/total.php
+%%WWWDIR%%/admin/language/en-gb/extension/feed/google_base.php
+%%WWWDIR%%/admin/language/en-gb/extension/feed/google_sitemap.php
+%%WWWDIR%%/admin/language/en-gb/extension/feed/openbaypro.php
+%%WWWDIR%%/admin/language/en-gb/extension/fraud/fraudlabspro.php
+%%WWWDIR%%/admin/language/en-gb/extension/fraud/ip.php
+%%WWWDIR%%/admin/language/en-gb/extension/fraud/maxmind.php
 %%WWWDIR%%/admin/language/en-gb/extension/installer.php
 %%WWWDIR%%/admin/language/en-gb/extension/modification.php
-%%WWWDIR%%/admin/language/en-gb/extension/module.php
+%%WWWDIR%%/admin/language/en-gb/extension/module/account.php
+%%WWWDIR%%/admin/language/en-gb/extension/module/affiliate.php
+%%WWWDIR%%/admin/language/en-gb/extension/module/amazon_login.php
+%%WWWDIR%%/admin/language/en-gb/extension/module/amazon_pay.php
+%%WWWDIR%%/admin/language/en-gb/extension/module/banner.php
+%%WWWDIR%%/admin/language/en-gb/extension/module/bestseller.php
+%%WWWDIR%%/admin/language/en-gb/extension/module/carousel.php
+%%WWWDIR%%/admin/language/en-gb/extension/module/category.php
+%%WWWDIR%%/admin/language/en-gb/extension/module/divido_calculator.php
+%%WWWDIR%%/admin/language/en-gb/extension/module/ebay_listing.php
+%%WWWDIR%%/admin/language/en-gb/extension/module/featured.php
+%%WWWDIR%%/admin/language/en-gb/extension/module/filter.php
+%%WWWDIR%%/admin/language/en-gb/extension/module/google_hangouts.php
+%%WWWDIR%%/admin/language/en-gb/extension/module/html.php
+%%WWWDIR%%/admin/language/en-gb/extension/module/information.php
+%%WWWDIR%%/admin/language/en-gb/extension/module/klarna_checkout_module.php
+%%WWWDIR%%/admin/language/en-gb/extension/module/latest.php
+%%WWWDIR%%/admin/language/en-gb/extension/module/laybuy_layout.php
+%%WWWDIR%%/admin/language/en-gb/extension/module/pilibaba_button.php
+%%WWWDIR%%/admin/language/en-gb/extension/module/pp_button.php
+%%WWWDIR%%/admin/language/en-gb/extension/module/pp_login.php
+%%WWWDIR%%/admin/language/en-gb/extension/module/sagepay_direct_cards.php
+%%WWWDIR%%/admin/language/en-gb/extension/module/sagepay_server_cards.php
+%%WWWDIR%%/admin/language/en-gb/extension/module/slideshow.php
+%%WWWDIR%%/admin/language/en-gb/extension/module/special.php
+%%WWWDIR%%/admin/language/en-gb/extension/module/store.php
 %%WWWDIR%%/admin/language/en-gb/extension/openbay.php
-%%WWWDIR%%/admin/language/en-gb/extension/payment.php
-%%WWWDIR%%/admin/language/en-gb/extension/shipping.php
-%%WWWDIR%%/admin/language/en-gb/extension/theme.php
-%%WWWDIR%%/admin/language/en-gb/extension/total.php
-%%WWWDIR%%/admin/language/en-gb/feed/google_base.php
-%%WWWDIR%%/admin/language/en-gb/feed/google_sitemap.php
-%%WWWDIR%%/admin/language/en-gb/feed/openbaypro.php
-%%WWWDIR%%/admin/language/en-gb/fraud/fraudlabspro.php
-%%WWWDIR%%/admin/language/en-gb/fraud/ip.php
-%%WWWDIR%%/admin/language/en-gb/fraud/maxmind.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/amazon.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/amazon_bulk_linking.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/amazon_bulk_listing.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/amazon_links.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/amazon_listing.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/amazon_listingsaved.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/amazon_settings.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/amazon_stockupdates.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/amazon_subscription.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/amazonus.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/amazonus_bulk_linking.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/amazonus_bulk_listing.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/amazonus_links.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/amazonus_listing.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/amazonus_listingsaved.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/amazonus_settings.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/amazonus_stockupdates.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/amazonus_subscription.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/ebay.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/ebay_edit.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/ebay_import.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/ebay_links.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/ebay_new.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/ebay_newbulk.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/ebay_orders.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/ebay_profile.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/ebay_settings.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/ebay_subscription.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/ebay_summary.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/ebay_syncronise.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/ebay_template.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/ebay_usage.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/etsy.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/etsy_create.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/etsy_edit.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/etsy_links.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/etsy_listings.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/etsy_settings.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/fba.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/fba_fulfillment.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/fba_fulfillment_list.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/fba_order.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/fba_settings.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/openbay_itemlist.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/openbay_menu.php
+%%WWWDIR%%/admin/language/en-gb/extension/openbay/openbay_order.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/amazon_login_pay.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/authorizenet_aim.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/authorizenet_sim.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/bank_transfer.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/bluepay_hosted.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/bluepay_redirect.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/cardconnect.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/cardinity.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/cheque.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/cod.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/divido.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/eway.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/firstdata.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/firstdata_remote.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/free_checkout.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/g2apay.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/globalpay.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/globalpay_remote.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/klarna_account.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/klarna_checkout.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/klarna_invoice.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/laybuy.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/liqpay.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/nochex.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/paymate.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/paypoint.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/payza.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/perpetual_payments.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/pilibaba.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/pp_express.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/pp_express_order.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/pp_express_refund.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/pp_express_search.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/pp_express_view.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/pp_payflow.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/pp_payflow_iframe.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/pp_pro.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/pp_pro_iframe.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/pp_standard.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/realex.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/realex_remote.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/sagepay_direct.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/sagepay_server.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/sagepay_us.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/securetrading_pp.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/securetrading_ws.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/skrill.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/twocheckout.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/web_payment_software.php
+%%WWWDIR%%/admin/language/en-gb/extension/payment/worldpay.php
+%%WWWDIR%%/admin/language/en-gb/extension/shipping/auspost.php
+%%WWWDIR%%/admin/language/en-gb/extension/shipping/citylink.php
+%%WWWDIR%%/admin/language/en-gb/extension/shipping/fedex.php
+%%WWWDIR%%/admin/language/en-gb/extension/shipping/flat.php
+%%WWWDIR%%/admin/language/en-gb/extension/shipping/free.php
+%%WWWDIR%%/admin/language/en-gb/extension/shipping/item.php
+%%WWWDIR%%/admin/language/en-gb/extension/shipping/parcelforce_48.php
+%%WWWDIR%%/admin/language/en-gb/extension/shipping/pickup.php
+%%WWWDIR%%/admin/language/en-gb/extension/shipping/royal_mail.php
+%%WWWDIR%%/admin/language/en-gb/extension/shipping/ups.php
+%%WWWDIR%%/admin/language/en-gb/extension/shipping/usps.php
+%%WWWDIR%%/admin/language/en-gb/extension/shipping/weight.php
+%%WWWDIR%%/admin/language/en-gb/extension/store.php
+%%WWWDIR%%/admin/language/en-gb/extension/theme/theme_default.php
+%%WWWDIR%%/admin/language/en-gb/extension/total/coupon.php
+%%WWWDIR%%/admin/language/en-gb/extension/total/credit.php
+%%WWWDIR%%/admin/language/en-gb/extension/total/handling.php
+%%WWWDIR%%/admin/language/en-gb/extension/total/klarna_fee.php
+%%WWWDIR%%/admin/language/en-gb/extension/total/low_order_fee.php
+%%WWWDIR%%/admin/language/en-gb/extension/total/reward.php
+%%WWWDIR%%/admin/language/en-gb/extension/total/shipping.php
+%%WWWDIR%%/admin/language/en-gb/extension/total/sub_total.php
+%%WWWDIR%%/admin/language/en-gb/extension/total/tax.php
+%%WWWDIR%%/admin/language/en-gb/extension/total/total.php
+%%WWWDIR%%/admin/language/en-gb/extension/total/voucher.php
 %%WWWDIR%%/admin/language/en-gb/localisation/country.php
 %%WWWDIR%%/admin/language/en-gb/localisation/currency.php
 %%WWWDIR%%/admin/language/en-gb/localisation/geo_zone.php
@@ -303,120 +470,6 @@
 %%WWWDIR%%/admin/language/en-gb/marketing/contact.php
 %%WWWDIR%%/admin/language/en-gb/marketing/coupon.php
 %%WWWDIR%%/admin/language/en-gb/marketing/marketing.php
-%%WWWDIR%%/admin/language/en-gb/module/account.php
-%%WWWDIR%%/admin/language/en-gb/module/affiliate.php
-%%WWWDIR%%/admin/language/en-gb/module/amazon_login.php
-%%WWWDIR%%/admin/language/en-gb/module/amazon_pay.php
-%%WWWDIR%%/admin/language/en-gb/module/banner.php
-%%WWWDIR%%/admin/language/en-gb/module/bestseller.php
-%%WWWDIR%%/admin/language/en-gb/module/carousel.php
-%%WWWDIR%%/admin/language/en-gb/module/category.php
-%%WWWDIR%%/admin/language/en-gb/module/ebay_listing.php
-%%WWWDIR%%/admin/language/en-gb/module/featured.php
-%%WWWDIR%%/admin/language/en-gb/module/filter.php
-%%WWWDIR%%/admin/language/en-gb/module/google_hangouts.php
-%%WWWDIR%%/admin/language/en-gb/module/html.php
-%%WWWDIR%%/admin/language/en-gb/module/information.php
-%%WWWDIR%%/admin/language/en-gb/module/latest.php
-%%WWWDIR%%/admin/language/en-gb/module/laybuy_layout.php
-%%WWWDIR%%/admin/language/en-gb/module/pp_button.php
-%%WWWDIR%%/admin/language/en-gb/module/pp_login.php
-%%WWWDIR%%/admin/language/en-gb/module/sagepay_direct_cards.php
-%%WWWDIR%%/admin/language/en-gb/module/sagepay_server_cards.php
-%%WWWDIR%%/admin/language/en-gb/module/slideshow.php
-%%WWWDIR%%/admin/language/en-gb/module/special.php
-%%WWWDIR%%/admin/language/en-gb/module/store.php
-%%WWWDIR%%/admin/language/en-gb/openbay/amazon.php
-%%WWWDIR%%/admin/language/en-gb/openbay/amazon_bulk_linking.php
-%%WWWDIR%%/admin/language/en-gb/openbay/amazon_bulk_listing.php
-%%WWWDIR%%/admin/language/en-gb/openbay/amazon_links.php
-%%WWWDIR%%/admin/language/en-gb/openbay/amazon_listing.php
-%%WWWDIR%%/admin/language/en-gb/openbay/amazon_listingsaved.php
-%%WWWDIR%%/admin/language/en-gb/openbay/amazon_settings.php
-%%WWWDIR%%/admin/language/en-gb/openbay/amazon_stockupdates.php
-%%WWWDIR%%/admin/language/en-gb/openbay/amazon_subscription.php
-%%WWWDIR%%/admin/language/en-gb/openbay/amazonus.php
-%%WWWDIR%%/admin/language/en-gb/openbay/amazonus_bulk_linking.php
-%%WWWDIR%%/admin/language/en-gb/openbay/amazonus_bulk_listing.php
-%%WWWDIR%%/admin/language/en-gb/openbay/amazonus_links.php
-%%WWWDIR%%/admin/language/en-gb/openbay/amazonus_listing.php
-%%WWWDIR%%/admin/language/en-gb/openbay/amazonus_listingsaved.php
-%%WWWDIR%%/admin/language/en-gb/openbay/amazonus_settings.php
-%%WWWDIR%%/admin/language/en-gb/openbay/amazonus_stockupdates.php
-%%WWWDIR%%/admin/language/en-gb/openbay/amazonus_subscription.php
-%%WWWDIR%%/admin/language/en-gb/openbay/ebay.php
-%%WWWDIR%%/admin/language/en-gb/openbay/ebay_edit.php
-%%WWWDIR%%/admin/language/en-gb/openbay/ebay_import.php
-%%WWWDIR%%/admin/language/en-gb/openbay/ebay_links.php
-%%WWWDIR%%/admin/language/en-gb/openbay/ebay_new.php
-%%WWWDIR%%/admin/language/en-gb/openbay/ebay_newbulk.php
-%%WWWDIR%%/admin/language/en-gb/openbay/ebay_orders.php
-%%WWWDIR%%/admin/language/en-gb/openbay/ebay_profile.php
-%%WWWDIR%%/admin/language/en-gb/openbay/ebay_settings.php
-%%WWWDIR%%/admin/language/en-gb/openbay/ebay_subscription.php
-%%WWWDIR%%/admin/language/en-gb/openbay/ebay_summary.php
-%%WWWDIR%%/admin/language/en-gb/openbay/ebay_syncronise.php
-%%WWWDIR%%/admin/language/en-gb/openbay/ebay_template.php
-%%WWWDIR%%/admin/language/en-gb/openbay/ebay_usage.php
-%%WWWDIR%%/admin/language/en-gb/openbay/etsy.php
-%%WWWDIR%%/admin/language/en-gb/openbay/etsy_create.php
-%%WWWDIR%%/admin/language/en-gb/openbay/etsy_edit.php
-%%WWWDIR%%/admin/language/en-gb/openbay/etsy_links.php
-%%WWWDIR%%/admin/language/en-gb/openbay/etsy_listings.php
-%%WWWDIR%%/admin/language/en-gb/openbay/etsy_settings.php
-%%WWWDIR%%/admin/language/en-gb/openbay/fba.php
-%%WWWDIR%%/admin/language/en-gb/openbay/fba_fulfillment.php
-%%WWWDIR%%/admin/language/en-gb/openbay/fba_fulfillment_list.php
-%%WWWDIR%%/admin/language/en-gb/openbay/fba_order.php
-%%WWWDIR%%/admin/language/en-gb/openbay/fba_settings.php
-%%WWWDIR%%/admin/language/en-gb/openbay/openbay_itemlist.php
-%%WWWDIR%%/admin/language/en-gb/openbay/openbay_order.php
-%%WWWDIR%%/admin/language/en-gb/payment/amazon_login_pay.php
-%%WWWDIR%%/admin/language/en-gb/payment/authorizenet_aim.php
-%%WWWDIR%%/admin/language/en-gb/payment/authorizenet_sim.php
-%%WWWDIR%%/admin/language/en-gb/payment/bank_transfer.php
-%%WWWDIR%%/admin/language/en-gb/payment/bluepay_hosted.php
-%%WWWDIR%%/admin/language/en-gb/payment/bluepay_redirect.php
-%%WWWDIR%%/admin/language/en-gb/payment/cardinity.php
-%%WWWDIR%%/admin/language/en-gb/payment/cheque.php
-%%WWWDIR%%/admin/language/en-gb/payment/cod.php
-%%WWWDIR%%/admin/language/en-gb/payment/eway.php
-%%WWWDIR%%/admin/language/en-gb/payment/firstdata.php
-%%WWWDIR%%/admin/language/en-gb/payment/firstdata_remote.php
-%%WWWDIR%%/admin/language/en-gb/payment/free_checkout.php
-%%WWWDIR%%/admin/language/en-gb/payment/g2apay.php
-%%WWWDIR%%/admin/language/en-gb/payment/globalpay.php
-%%WWWDIR%%/admin/language/en-gb/payment/globalpay_remote.php
-%%WWWDIR%%/admin/language/en-gb/payment/klarna_account.php
-%%WWWDIR%%/admin/language/en-gb/payment/klarna_invoice.php
-%%WWWDIR%%/admin/language/en-gb/payment/laybuy.php
-%%WWWDIR%%/admin/language/en-gb/payment/liqpay.php
-%%WWWDIR%%/admin/language/en-gb/payment/nochex.php
-%%WWWDIR%%/admin/language/en-gb/payment/paymate.php
-%%WWWDIR%%/admin/language/en-gb/payment/paypoint.php
-%%WWWDIR%%/admin/language/en-gb/payment/payza.php
-%%WWWDIR%%/admin/language/en-gb/payment/perpetual_payments.php
-%%WWWDIR%%/admin/language/en-gb/payment/pp_express.php
-%%WWWDIR%%/admin/language/en-gb/payment/pp_express_order.php
-%%WWWDIR%%/admin/language/en-gb/payment/pp_express_refund.php
-%%WWWDIR%%/admin/language/en-gb/payment/pp_express_search.php
-%%WWWDIR%%/admin/language/en-gb/payment/pp_express_view.php
-%%WWWDIR%%/admin/language/en-gb/payment/pp_payflow.php
-%%WWWDIR%%/admin/language/en-gb/payment/pp_payflow_iframe.php
-%%WWWDIR%%/admin/language/en-gb/payment/pp_pro.php
-%%WWWDIR%%/admin/language/en-gb/payment/pp_pro_iframe.php
-%%WWWDIR%%/admin/language/en-gb/payment/pp_standard.php
-%%WWWDIR%%/admin/language/en-gb/payment/realex.php
-%%WWWDIR%%/admin/language/en-gb/payment/realex_remote.php
-%%WWWDIR%%/admin/language/en-gb/payment/sagepay_direct.php
-%%WWWDIR%%/admin/language/en-gb/payment/sagepay_server.php
-%%WWWDIR%%/admin/language/en-gb/payment/sagepay_us.php
-%%WWWDIR%%/admin/language/en-gb/payment/securetrading_pp.php
-%%WWWDIR%%/admin/language/en-gb/payment/securetrading_ws.php
-%%WWWDIR%%/admin/language/en-gb/payment/skrill.php
-%%WWWDIR%%/admin/language/en-gb/payment/twocheckout.php
-%%WWWDIR%%/admin/language/en-gb/payment/web_payment_software.php
-%%WWWDIR%%/admin/language/en-gb/payment/worldpay.php
 %%WWWDIR%%/admin/language/en-gb/report/affiliate.php
 %%WWWDIR%%/admin/language/en-gb/report/affiliate_activity.php
 %%WWWDIR%%/admin/language/en-gb/report/customer_activity.php
@@ -424,6 +477,7 @@
 %%WWWDIR%%/admin/language/en-gb/report/customer_online.php
 %%WWWDIR%%/admin/language/en-gb/report/customer_order.php
 %%WWWDIR%%/admin/language/en-gb/report/customer_reward.php
+%%WWWDIR%%/admin/language/en-gb/report/customer_search.php
 %%WWWDIR%%/admin/language/en-gb/report/marketing.php
 %%WWWDIR%%/admin/language/en-gb/report/product_purchased.php
 %%WWWDIR%%/admin/language/en-gb/report/product_viewed.php
@@ -439,33 +493,9 @@
 %%WWWDIR%%/admin/language/en-gb/sale/voucher_theme.php
 %%WWWDIR%%/admin/language/en-gb/setting/setting.php
 %%WWWDIR%%/admin/language/en-gb/setting/store.php
-%%WWWDIR%%/admin/language/en-gb/shipping/auspost.php
-%%WWWDIR%%/admin/language/en-gb/shipping/citylink.php
-%%WWWDIR%%/admin/language/en-gb/shipping/fedex.php
-%%WWWDIR%%/admin/language/en-gb/shipping/flat.php
-%%WWWDIR%%/admin/language/en-gb/shipping/free.php
-%%WWWDIR%%/admin/language/en-gb/shipping/item.php
-%%WWWDIR%%/admin/language/en-gb/shipping/parcelforce_48.php
-%%WWWDIR%%/admin/language/en-gb/shipping/pickup.php
-%%WWWDIR%%/admin/language/en-gb/shipping/royal_mail.php
-%%WWWDIR%%/admin/language/en-gb/shipping/ups.php
-%%WWWDIR%%/admin/language/en-gb/shipping/usps.php
-%%WWWDIR%%/admin/language/en-gb/shipping/weight.php
-%%WWWDIR%%/admin/language/en-gb/theme/theme_default.php
 %%WWWDIR%%/admin/language/en-gb/tool/backup.php
-%%WWWDIR%%/admin/language/en-gb/tool/error_log.php
+%%WWWDIR%%/admin/language/en-gb/tool/log.php
 %%WWWDIR%%/admin/language/en-gb/tool/upload.php
-%%WWWDIR%%/admin/language/en-gb/total/coupon.php
-%%WWWDIR%%/admin/language/en-gb/total/credit.php
-%%WWWDIR%%/admin/language/en-gb/total/handling.php
-%%WWWDIR%%/admin/language/en-gb/total/klarna_fee.php
-%%WWWDIR%%/admin/language/en-gb/total/low_order_fee.php
-%%WWWDIR%%/admin/language/en-gb/total/reward.php
-%%WWWDIR%%/admin/language/en-gb/total/shipping.php
-%%WWWDIR%%/admin/language/en-gb/total/sub_total.php
-%%WWWDIR%%/admin/language/en-gb/total/tax.php
-%%WWWDIR%%/admin/language/en-gb/total/total.php
-%%WWWDIR%%/admin/language/en-gb/total/voucher.php
 %%WWWDIR%%/admin/language/en-gb/user/api.php
 %%WWWDIR%%/admin/language/en-gb/user/user.php
 %%WWWDIR%%/admin/language/en-gb/user/user_group.php
@@ -485,15 +515,57 @@
 %%WWWDIR%%/admin/model/customer/customer.php
 %%WWWDIR%%/admin/model/customer/customer_group.php
 %%WWWDIR%%/admin/model/design/banner.php
+%%WWWDIR%%/admin/model/design/language.php
 %%WWWDIR%%/admin/model/design/layout.php
+%%WWWDIR%%/admin/model/design/menu.php
+%%WWWDIR%%/admin/model/design/theme.php
 %%WWWDIR%%/admin/model/extension/event.php
 %%WWWDIR%%/admin/model/extension/extension.php
+%%WWWDIR%%/admin/model/extension/feed/google_base.php
+%%WWWDIR%%/admin/model/extension/fraud/fraudlabspro.php
+%%WWWDIR%%/admin/model/extension/fraud/ip.php
+%%WWWDIR%%/admin/model/extension/fraud/maxmind.php
 %%WWWDIR%%/admin/model/extension/modification.php
 %%WWWDIR%%/admin/model/extension/module.php
-%%WWWDIR%%/admin/model/feed/google_base.php
-%%WWWDIR%%/admin/model/fraud/fraudlabspro.php
-%%WWWDIR%%/admin/model/fraud/ip.php
-%%WWWDIR%%/admin/model/fraud/maxmind.php
+%%WWWDIR%%/admin/model/extension/openbay/amazon.php
+%%WWWDIR%%/admin/model/extension/openbay/amazon_listing.php
+%%WWWDIR%%/admin/model/extension/openbay/amazonus.php
+%%WWWDIR%%/admin/model/extension/openbay/amazonus_listing.php
+%%WWWDIR%%/admin/model/extension/openbay/ebay.php
+%%WWWDIR%%/admin/model/extension/openbay/ebay_product.php
+%%WWWDIR%%/admin/model/extension/openbay/ebay_profile.php
+%%WWWDIR%%/admin/model/extension/openbay/ebay_template.php
+%%WWWDIR%%/admin/model/extension/openbay/etsy.php
+%%WWWDIR%%/admin/model/extension/openbay/etsy_product.php
+%%WWWDIR%%/admin/model/extension/openbay/fba.php
+%%WWWDIR%%/admin/model/extension/openbay/openbay.php
+%%WWWDIR%%/admin/model/extension/openbay/order.php
+%%WWWDIR%%/admin/model/extension/openbay/version.php
+%%WWWDIR%%/admin/model/extension/payment/amazon_login_pay.php
+%%WWWDIR%%/admin/model/extension/payment/bluepay_hosted.php
+%%WWWDIR%%/admin/model/extension/payment/bluepay_redirect.php
+%%WWWDIR%%/admin/model/extension/payment/cardconnect.php
+%%WWWDIR%%/admin/model/extension/payment/cardinity.php
+%%WWWDIR%%/admin/model/extension/payment/divido.php
+%%WWWDIR%%/admin/model/extension/payment/eway.php
+%%WWWDIR%%/admin/model/extension/payment/firstdata.php
+%%WWWDIR%%/admin/model/extension/payment/firstdata_remote.php
+%%WWWDIR%%/admin/model/extension/payment/g2apay.php
+%%WWWDIR%%/admin/model/extension/payment/globalpay.php
+%%WWWDIR%%/admin/model/extension/payment/globalpay_remote.php
+%%WWWDIR%%/admin/model/extension/payment/klarna_checkout.php
+%%WWWDIR%%/admin/model/extension/payment/laybuy.php
+%%WWWDIR%%/admin/model/extension/payment/pilibaba.php
+%%WWWDIR%%/admin/model/extension/payment/pp_express.php
+%%WWWDIR%%/admin/model/extension/payment/pp_payflow_iframe.php
+%%WWWDIR%%/admin/model/extension/payment/pp_pro_iframe.php
+%%WWWDIR%%/admin/model/extension/payment/realex.php
+%%WWWDIR%%/admin/model/extension/payment/realex_remote.php
+%%WWWDIR%%/admin/model/extension/payment/sagepay_direct.php
+%%WWWDIR%%/admin/model/extension/payment/sagepay_server.php
+%%WWWDIR%%/admin/model/extension/payment/securetrading_pp.php
+%%WWWDIR%%/admin/model/extension/payment/securetrading_ws.php
+%%WWWDIR%%/admin/model/extension/payment/worldpay.php
 %%WWWDIR%%/admin/model/localisation/country.php
 %%WWWDIR%%/admin/model/localisation/currency.php
 %%WWWDIR%%/admin/model/localisation/geo_zone.php
@@ -512,41 +584,6 @@
 %%WWWDIR%%/admin/model/marketing/affiliate.php
 %%WWWDIR%%/admin/model/marketing/coupon.php
 %%WWWDIR%%/admin/model/marketing/marketing.php
-%%WWWDIR%%/admin/model/openbay/amazon.php
-%%WWWDIR%%/admin/model/openbay/amazon_listing.php
-%%WWWDIR%%/admin/model/openbay/amazonus.php
-%%WWWDIR%%/admin/model/openbay/amazonus_listing.php
-%%WWWDIR%%/admin/model/openbay/ebay.php
-%%WWWDIR%%/admin/model/openbay/ebay_product.php
-%%WWWDIR%%/admin/model/openbay/ebay_profile.php
-%%WWWDIR%%/admin/model/openbay/ebay_template.php
-%%WWWDIR%%/admin/model/openbay/etsy.php
-%%WWWDIR%%/admin/model/openbay/etsy_product.php
-%%WWWDIR%%/admin/model/openbay/fba.php
-%%WWWDIR%%/admin/model/openbay/openbay.php
-%%WWWDIR%%/admin/model/openbay/order.php
-%%WWWDIR%%/admin/model/openbay/version.php
-%%WWWDIR%%/admin/model/payment/amazon_login_pay.php
-%%WWWDIR%%/admin/model/payment/bluepay_hosted.php
-%%WWWDIR%%/admin/model/payment/bluepay_redirect.php
-%%WWWDIR%%/admin/model/payment/cardinity.php
-%%WWWDIR%%/admin/model/payment/eway.php
-%%WWWDIR%%/admin/model/payment/firstdata.php
-%%WWWDIR%%/admin/model/payment/firstdata_remote.php
-%%WWWDIR%%/admin/model/payment/g2apay.php
-%%WWWDIR%%/admin/model/payment/globalpay.php
-%%WWWDIR%%/admin/model/payment/globalpay_remote.php
-%%WWWDIR%%/admin/model/payment/laybuy.php
-%%WWWDIR%%/admin/model/payment/pp_express.php
-%%WWWDIR%%/admin/model/payment/pp_payflow_iframe.php
-%%WWWDIR%%/admin/model/payment/pp_pro_iframe.php
-%%WWWDIR%%/admin/model/payment/realex.php
-%%WWWDIR%%/admin/model/payment/realex_remote.php
-%%WWWDIR%%/admin/model/payment/sagepay_direct.php
-%%WWWDIR%%/admin/model/payment/sagepay_server.php
-%%WWWDIR%%/admin/model/payment/securetrading_pp.php
-%%WWWDIR%%/admin/model/payment/securetrading_ws.php
-%%WWWDIR%%/admin/model/payment/worldpay.php
 %%WWWDIR%%/admin/model/report/activity.php
 %%WWWDIR%%/admin/model/report/affiliate.php
 %%WWWDIR%%/admin/model/report/coupon.php
@@ -575,7 +612,9 @@
 %%WWWDIR%%/admin/view/image/payment/amazon.png
 %%WWWDIR%%/admin/view/image/payment/authorizenet.png
 %%WWWDIR%%/admin/view/image/payment/bluepay.jpg
+%%WWWDIR%%/admin/view/image/payment/cardconnect.png
 %%WWWDIR%%/admin/view/image/payment/cardinity.png
+%%WWWDIR%%/admin/view/image/payment/divido.png
 %%WWWDIR%%/admin/view/image/payment/eway.png
 %%WWWDIR%%/admin/view/image/payment/eway_au.jpg
 %%WWWDIR%%/admin/view/image/payment/firstdata.png
@@ -588,6 +627,7 @@
 %%WWWDIR%%/admin/view/image/payment/paymate.png
 %%WWWDIR%%/admin/view/image/payment/paypal.png
 %%WWWDIR%%/admin/view/image/payment/paypoint.png
+%%WWWDIR%%/admin/view/image/payment/pilibaba.png
 %%WWWDIR%%/admin/view/image/payment/realex.png
 %%WWWDIR%%/admin/view/image/payment/sagepay.png
 %%WWWDIR%%/admin/view/image/payment/secure_trading.png
@@ -608,6 +648,55 @@
 %%WWWDIR%%/admin/view/javascript/bootstrap/js/bootstrap.js
 %%WWWDIR%%/admin/view/javascript/bootstrap/js/bootstrap.min.js
 %%WWWDIR%%/admin/view/javascript/bootstrap/js/npm.js
+%%WWWDIR%%/admin/view/javascript/codemirror/lib/codemirror.css
+%%WWWDIR%%/admin/view/javascript/codemirror/lib/codemirror.js
+%%WWWDIR%%/admin/view/javascript/codemirror/lib/formatting.js
+%%WWWDIR%%/admin/view/javascript/codemirror/lib/xml.js
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/3024-day.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/3024-night.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/abcdef.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/ambiance-mobile.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/ambiance.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/base16-dark.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/base16-light.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/bespin.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/blackboard.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/cobalt.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/colorforth.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/dracula.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/eclipse.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/elegant.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/erlang-dark.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/hopscotch.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/icecoder.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/isotope.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/lesser-dark.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/liquibyte.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/material.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/mbo.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/mdn-like.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/midnight.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/monokai.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/neat.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/neo.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/night.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/paraiso-dark.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/paraiso-light.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/pastel-on-dark.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/railscasts.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/rubyblue.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/seti.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/solarized.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/the-matrix.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/tomorrow-night-bright.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/tomorrow-night-eighties.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/ttcn.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/twilight.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/vibrant-ink.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/xq-dark.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/xq-light.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/yeti.css
+%%WWWDIR%%/admin/view/javascript/codemirror/theme/zenburn.css
 %%WWWDIR%%/admin/view/javascript/common.js
 %%WWWDIR%%/admin/view/javascript/font-awesome/css/font-awesome.css
 %%WWWDIR%%/admin/view/javascript/font-awesome/css/font-awesome.min.css
@@ -760,6 +849,22 @@
 %%WWWDIR%%/admin/view/javascript/jquery/flot/jquery.min.js
 %%WWWDIR%%/admin/view/javascript/jquery/jquery-2.1.1.min.js
 %%WWWDIR%%/admin/view/javascript/jquery/jquery-2.1.1.min.map
+%%WWWDIR%%/admin/view/javascript/jquery/jquery-ui/external/jquery/jquery.js
+%%WWWDIR%%/admin/view/javascript/jquery/jquery-ui/images/ui-icons_444444_256x240.png
+%%WWWDIR%%/admin/view/javascript/jquery/jquery-ui/images/ui-icons_555555_256x240.png
+%%WWWDIR%%/admin/view/javascript/jquery/jquery-ui/images/ui-icons_777620_256x240.png
+%%WWWDIR%%/admin/view/javascript/jquery/jquery-ui/images/ui-icons_777777_256x240.png
+%%WWWDIR%%/admin/view/javascript/jquery/jquery-ui/images/ui-icons_cc0000_256x240.png
+%%WWWDIR%%/admin/view/javascript/jquery/jquery-ui/images/ui-icons_ffffff_256x240.png
+%%WWWDIR%%/admin/view/javascript/jquery/jquery-ui/index.html
+%%WWWDIR%%/admin/view/javascript/jquery/jquery-ui/jquery-ui.css
+%%WWWDIR%%/admin/view/javascript/jquery/jquery-ui/jquery-ui.js
+%%WWWDIR%%/admin/view/javascript/jquery/jquery-ui/jquery-ui.min.css
+%%WWWDIR%%/admin/view/javascript/jquery/jquery-ui/jquery-ui.min.js
+%%WWWDIR%%/admin/view/javascript/jquery/jquery-ui/jquery-ui.structure.css
+%%WWWDIR%%/admin/view/javascript/jquery/jquery-ui/jquery-ui.structure.min.css
+%%WWWDIR%%/admin/view/javascript/jquery/jquery-ui/jquery-ui.theme.css
+%%WWWDIR%%/admin/view/javascript/jquery/jquery-ui/jquery-ui.theme.min.css
 %%WWWDIR%%/admin/view/javascript/jquery/jqvmap/data/jquery.vmap.sampledata.js
 %%WWWDIR%%/admin/view/javascript/jquery/jqvmap/jquery.vmap.js
 %%WWWDIR%%/admin/view/javascript/jquery/jqvmap/jquery.vmap.min.js
@@ -784,6 +889,9 @@
 %%WWWDIR%%/admin/view/javascript/openbay/js/codemirror.js
 %%WWWDIR%%/admin/view/javascript/openbay/js/faq.js
 %%WWWDIR%%/admin/view/javascript/openbay/js/openbay.js
+%%WWWDIR%%/admin/view/javascript/summernote/font/summernote.eot
+%%WWWDIR%%/admin/view/javascript/summernote/font/summernote.ttf
+%%WWWDIR%%/admin/view/javascript/summernote/font/summernote.woff
 %%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-ar-AR.js
 %%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-bg-BG.js
 %%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-ca-ES.js
@@ -820,6 +928,7 @@
 %%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-vi-VN.js
 %%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-zh-CN.js
 %%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-zh-TW.js
+%%WWWDIR%%/admin/view/javascript/summernote/opencart.js
 %%WWWDIR%%/admin/view/javascript/summernote/plugin/hello/summernote-ext-hello.js
 %%WWWDIR%%/admin/view/javascript/summernote/plugin/specialchars/summernote-ext-specialchars.js
 %%WWWDIR%%/admin/view/javascript/summernote/summernote.css
@@ -901,9 +1010,6 @@
 %%WWWDIR%%/admin/view/stylesheet/sass/bootstrap/mixins/_text-overflow.scss
 %%WWWDIR%%/admin/view/stylesheet/sass/bootstrap/mixins/_vendor-prefixes.scss
 %%WWWDIR%%/admin/view/stylesheet/stylesheet.css
-%%WWWDIR%%/admin/view/template/analytics/google_analytics.tpl
-%%WWWDIR%%/admin/view/template/captcha/basic_captcha.tpl
-%%WWWDIR%%/admin/view/template/captcha/google_captcha.tpl
 %%WWWDIR%%/admin/view/template/catalog/attribute_form.tpl
 %%WWWDIR%%/admin/view/template/catalog/attribute_group_form.tpl
 %%WWWDIR%%/admin/view/template/catalog/attribute_group_list.tpl
@@ -933,10 +1039,7 @@
 %%WWWDIR%%/admin/view/template/common/forgotten.tpl
 %%WWWDIR%%/admin/view/template/common/header.tpl
 %%WWWDIR%%/admin/view/template/common/login.tpl
-%%WWWDIR%%/admin/view/template/common/menu.tpl
-%%WWWDIR%%/admin/view/template/common/profile.tpl
 %%WWWDIR%%/admin/view/template/common/reset.tpl
-%%WWWDIR%%/admin/view/template/common/stats.tpl
 %%WWWDIR%%/admin/view/template/customer/custom_field_form.tpl
 %%WWWDIR%%/admin/view/template/customer/custom_field_list.tpl
 %%WWWDIR%%/admin/view/template/customer/customer_form.tpl
@@ -947,42 +1050,262 @@
 %%WWWDIR%%/admin/view/template/customer/customer_list.tpl
 %%WWWDIR%%/admin/view/template/customer/customer_reward.tpl
 %%WWWDIR%%/admin/view/template/customer/customer_transaction.tpl
-%%WWWDIR%%/admin/view/template/dashboard/activity.tpl
-%%WWWDIR%%/admin/view/template/dashboard/chart.tpl
-%%WWWDIR%%/admin/view/template/dashboard/customer.tpl
-%%WWWDIR%%/admin/view/template/dashboard/map.tpl
-%%WWWDIR%%/admin/view/template/dashboard/online.tpl
-%%WWWDIR%%/admin/view/template/dashboard/order.tpl
-%%WWWDIR%%/admin/view/template/dashboard/recent.tpl
-%%WWWDIR%%/admin/view/template/dashboard/sale.tpl
 %%WWWDIR%%/admin/view/template/design/banner_form.tpl
 %%WWWDIR%%/admin/view/template/design/banner_list.tpl
+%%WWWDIR%%/admin/view/template/design/language.tpl
+%%WWWDIR%%/admin/view/template/design/language_translation.tpl
 %%WWWDIR%%/admin/view/template/design/layout_form.tpl
 %%WWWDIR%%/admin/view/template/design/layout_list.tpl
+%%WWWDIR%%/admin/view/template/design/menu_form.tpl
+%%WWWDIR%%/admin/view/template/design/menu_list.tpl
+%%WWWDIR%%/admin/view/template/design/theme.tpl
+%%WWWDIR%%/admin/view/template/design/translation.tpl
 %%WWWDIR%%/admin/view/template/error/not_found.tpl
 %%WWWDIR%%/admin/view/template/error/permission.tpl
-%%WWWDIR%%/admin/view/template/extension/analytics.tpl
-%%WWWDIR%%/admin/view/template/extension/captcha.tpl
-%%WWWDIR%%/admin/view/template/extension/feed.tpl
-%%WWWDIR%%/admin/view/template/extension/fraud.tpl
+%%WWWDIR%%/admin/view/template/extension/analytics/google_analytics.tpl
+%%WWWDIR%%/admin/view/template/extension/captcha/basic_captcha.tpl
+%%WWWDIR%%/admin/view/template/extension/captcha/google_captcha.tpl
+%%WWWDIR%%/admin/view/template/extension/dashboard/activity_form.tpl
+%%WWWDIR%%/admin/view/template/extension/dashboard/activity_info.tpl
+%%WWWDIR%%/admin/view/template/extension/dashboard/chart_form.tpl
+%%WWWDIR%%/admin/view/template/extension/dashboard/chart_info.tpl
+%%WWWDIR%%/admin/view/template/extension/dashboard/customer_form.tpl
+%%WWWDIR%%/admin/view/template/extension/dashboard/customer_info.tpl
+%%WWWDIR%%/admin/view/template/extension/dashboard/map_form.tpl
+%%WWWDIR%%/admin/view/template/extension/dashboard/map_info.tpl
+%%WWWDIR%%/admin/view/template/extension/dashboard/online_form.tpl
+%%WWWDIR%%/admin/view/template/extension/dashboard/online_info.tpl
+%%WWWDIR%%/admin/view/template/extension/dashboard/order_form.tpl
+%%WWWDIR%%/admin/view/template/extension/dashboard/order_info.tpl
+%%WWWDIR%%/admin/view/template/extension/dashboard/recent_form.tpl
+%%WWWDIR%%/admin/view/template/extension/dashboard/recent_info.tpl
+%%WWWDIR%%/admin/view/template/extension/dashboard/sale_form.tpl
+%%WWWDIR%%/admin/view/template/extension/dashboard/sale_info.tpl
+%%WWWDIR%%/admin/view/template/extension/event.tpl
+%%WWWDIR%%/admin/view/template/extension/extension.tpl
+%%WWWDIR%%/admin/view/template/extension/extension/analytics.tpl
+%%WWWDIR%%/admin/view/template/extension/extension/captcha.tpl
+%%WWWDIR%%/admin/view/template/extension/extension/dashboard.tpl
+%%WWWDIR%%/admin/view/template/extension/extension/feed.tpl
+%%WWWDIR%%/admin/view/template/extension/extension/fraud.tpl
+%%WWWDIR%%/admin/view/template/extension/extension/menu.tpl
+%%WWWDIR%%/admin/view/template/extension/extension/module.tpl
+%%WWWDIR%%/admin/view/template/extension/extension/payment.tpl
+%%WWWDIR%%/admin/view/template/extension/extension/shipping.tpl
+%%WWWDIR%%/admin/view/template/extension/extension/theme.tpl
+%%WWWDIR%%/admin/view/template/extension/extension/total.tpl
+%%WWWDIR%%/admin/view/template/extension/feed/google_base.tpl
+%%WWWDIR%%/admin/view/template/extension/feed/google_base_category.tpl
+%%WWWDIR%%/admin/view/template/extension/feed/google_sitemap.tpl
+%%WWWDIR%%/admin/view/template/extension/feed/openbaypro.tpl
+%%WWWDIR%%/admin/view/template/extension/fraud/fraudlabspro.tpl
+%%WWWDIR%%/admin/view/template/extension/fraud/fraudlabspro_info.tpl
+%%WWWDIR%%/admin/view/template/extension/fraud/ip.tpl
+%%WWWDIR%%/admin/view/template/extension/fraud/ip_ip.tpl
+%%WWWDIR%%/admin/view/template/extension/fraud/maxmind.tpl
+%%WWWDIR%%/admin/view/template/extension/fraud/maxmind_info.tpl
 %%WWWDIR%%/admin/view/template/extension/installer.tpl
 %%WWWDIR%%/admin/view/template/extension/modification.tpl
-%%WWWDIR%%/admin/view/template/extension/module.tpl
+%%WWWDIR%%/admin/view/template/extension/module/account.tpl
+%%WWWDIR%%/admin/view/template/extension/module/affiliate.tpl
+%%WWWDIR%%/admin/view/template/extension/module/amazon_login.tpl
+%%WWWDIR%%/admin/view/template/extension/module/amazon_pay.tpl
+%%WWWDIR%%/admin/view/template/extension/module/banner.tpl
+%%WWWDIR%%/admin/view/template/extension/module/bestseller.tpl
+%%WWWDIR%%/admin/view/template/extension/module/carousel.tpl
+%%WWWDIR%%/admin/view/template/extension/module/category.tpl
+%%WWWDIR%%/admin/view/template/extension/module/divido_calculator.tpl
+%%WWWDIR%%/admin/view/template/extension/module/ebay_listing.tpl
+%%WWWDIR%%/admin/view/template/extension/module/featured.tpl
+%%WWWDIR%%/admin/view/template/extension/module/filter.tpl
+%%WWWDIR%%/admin/view/template/extension/module/google_hangouts.tpl
+%%WWWDIR%%/admin/view/template/extension/module/html.tpl
+%%WWWDIR%%/admin/view/template/extension/module/information.tpl
+%%WWWDIR%%/admin/view/template/extension/module/klarna_checkout_module.tpl
+%%WWWDIR%%/admin/view/template/extension/module/latest.tpl
+%%WWWDIR%%/admin/view/template/extension/module/laybuy_layout.tpl
+%%WWWDIR%%/admin/view/template/extension/module/pilibaba_button.tpl
+%%WWWDIR%%/admin/view/template/extension/module/pp_button.tpl
+%%WWWDIR%%/admin/view/template/extension/module/pp_login.tpl
+%%WWWDIR%%/admin/view/template/extension/module/sagepay_direct_cards.tpl
+%%WWWDIR%%/admin/view/template/extension/module/sagepay_server_cards.tpl
+%%WWWDIR%%/admin/view/template/extension/module/slideshow.tpl
+%%WWWDIR%%/admin/view/template/extension/module/special.tpl
+%%WWWDIR%%/admin/view/template/extension/module/store.tpl
 %%WWWDIR%%/admin/view/template/extension/openbay.tpl
-%%WWWDIR%%/admin/view/template/extension/payment.tpl
-%%WWWDIR%%/admin/view/template/extension/shipping.tpl
-%%WWWDIR%%/admin/view/template/extension/theme.tpl
-%%WWWDIR%%/admin/view/template/extension/total.tpl
-%%WWWDIR%%/admin/view/template/feed/google_base.tpl
-%%WWWDIR%%/admin/view/template/feed/google_base_category.tpl
-%%WWWDIR%%/admin/view/template/feed/google_sitemap.tpl
-%%WWWDIR%%/admin/view/template/feed/openbaypro.tpl
-%%WWWDIR%%/admin/view/template/fraud/fraudlabspro.tpl
-%%WWWDIR%%/admin/view/template/fraud/fraudlabspro_info.tpl
-%%WWWDIR%%/admin/view/template/fraud/ip.tpl
-%%WWWDIR%%/admin/view/template/fraud/ip_ip.tpl
-%%WWWDIR%%/admin/view/template/fraud/maxmind.tpl
-%%WWWDIR%%/admin/view/template/fraud/maxmind_info.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/amazon.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/amazon_ajax_shippinginfo.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/amazon_bulk_linking.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/amazon_bulk_listing.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/amazon_item_links.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/amazon_listing.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/amazon_listing_advanced.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/amazon_listing_edit.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/amazon_saved_listings.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/amazon_settings.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/amazon_stock_updates.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/amazon_subscription.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/amazonus.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/amazonus_ajax_shippinginfo.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/amazonus_bulk_linking.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/amazonus_bulk_listing.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/amazonus_item_links.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/amazonus_listing.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/amazonus_listing_advanced.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/amazonus_listing_edit.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/amazonus_saved_listings.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/amazonus_settings.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/amazonus_stock_updates.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/amazonus_subscription.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/ebay.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/ebay_ajax_shippinginfo.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/ebay_edit.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/ebay_item_import.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/ebay_item_link.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/ebay_new.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/ebay_new_bulk.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/ebay_order_import.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/ebay_profile_form_generic.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/ebay_profile_form_returns.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/ebay_profile_form_shipping.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/ebay_profile_form_template.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/ebay_profile_list.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/ebay_profile_shipping_international_calculated.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/ebay_profile_shipping_international_flat.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/ebay_profile_shipping_national_calculated.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/ebay_profile_shipping_national_flat.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/ebay_settings.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/ebay_subscription.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/ebay_summary.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/ebay_syncronise.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/ebay_template_form.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/ebay_template_list.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/ebay_usage.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/etsy.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/etsy_create.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/etsy_edit.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/etsy_links.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/etsy_listings.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/etsy_settings.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/fba.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/fba_fulfillment_form.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/fba_fulfillment_list.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/fba_order_info.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/fba_order_list.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/fba_settings.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/openbay_itemlist.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/openbay_manage.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/openbay_orderlist.tpl
+%%WWWDIR%%/admin/view/template/extension/openbay/openbay_orderlist_confirm.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/amazon_login_pay.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/amazon_login_pay_order.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/authorizenet_aim.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/authorizenet_sim.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/bank_transfer.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/bluepay_hosted.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/bluepay_hosted_order.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/bluepay_redirect.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/bluepay_redirect_order.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/buttons.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/cardconnect.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/cardconnect_order.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/cardinity.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/cardinity_order.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/cardinity_order_ajax.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/cheque.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/cod.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/divido.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/divido_order.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/eway.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/eway_order.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/firstdata.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/firstdata_order.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/firstdata_remote.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/firstdata_remote_order.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/free_checkout.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/g2apay.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/g2apay_order.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/globalpay.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/globalpay_order.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/globalpay_remote.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/globalpay_remote_order.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/klarna_account.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/klarna_checkout.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/klarna_checkout_order.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/klarna_checkout_order_ajax.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/klarna_invoice.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/laybuy.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/laybuy_order.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/laybuy_transaction.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/liqpay.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/nochex.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/paymate.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/paypoint.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/payza.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/perpetual_payments.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/pilibaba.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/pilibaba_order.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/pp_express.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/pp_express_order.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/pp_express_refund.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/pp_express_search.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/pp_express_transaction.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/pp_express_view.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/pp_payflow.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/pp_payflow_iframe.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/pp_payflow_iframe_order.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/pp_payflow_iframe_refund.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/pp_pro.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/pp_pro_iframe.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/pp_pro_iframe_order.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/pp_pro_iframe_refund.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/pp_pro_iframe_transaction.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/pp_standard.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/realex.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/realex_order.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/realex_remote.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/realex_remote_order.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/sagepay_direct.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/sagepay_direct_order.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/sagepay_server.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/sagepay_server_order.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/sagepay_us.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/securetrading_pp.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/securetrading_pp_order.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/securetrading_ws.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/securetrading_ws_order.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/securetrading_ws_transactions.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/skrill.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/twocheckout.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/web_payment_software.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/worldpay.tpl
+%%WWWDIR%%/admin/view/template/extension/payment/worldpay_order.tpl
+%%WWWDIR%%/admin/view/template/extension/shipping/auspost.tpl
+%%WWWDIR%%/admin/view/template/extension/shipping/citylink.tpl
+%%WWWDIR%%/admin/view/template/extension/shipping/fedex.tpl
+%%WWWDIR%%/admin/view/template/extension/shipping/flat.tpl
+%%WWWDIR%%/admin/view/template/extension/shipping/free.tpl
+%%WWWDIR%%/admin/view/template/extension/shipping/item.tpl
+%%WWWDIR%%/admin/view/template/extension/shipping/parcelforce_48.tpl
+%%WWWDIR%%/admin/view/template/extension/shipping/pickup.tpl
+%%WWWDIR%%/admin/view/template/extension/shipping/royal_mail.tpl
+%%WWWDIR%%/admin/view/template/extension/shipping/ups.tpl
+%%WWWDIR%%/admin/view/template/extension/shipping/usps.tpl
+%%WWWDIR%%/admin/view/template/extension/shipping/weight.tpl
+%%WWWDIR%%/admin/view/template/extension/store_info.tpl
+%%WWWDIR%%/admin/view/template/extension/store_list.tpl
+%%WWWDIR%%/admin/view/template/extension/theme/theme_default.tpl
+%%WWWDIR%%/admin/view/template/extension/total/coupon.tpl
+%%WWWDIR%%/admin/view/template/extension/total/credit.tpl
+%%WWWDIR%%/admin/view/template/extension/total/handling.tpl
+%%WWWDIR%%/admin/view/template/extension/total/klarna_fee.tpl
+%%WWWDIR%%/admin/view/template/extension/total/low_order_fee.tpl
+%%WWWDIR%%/admin/view/template/extension/total/reward.tpl
+%%WWWDIR%%/admin/view/template/extension/total/shipping.tpl
+%%WWWDIR%%/admin/view/template/extension/total/sub_total.tpl
+%%WWWDIR%%/admin/view/template/extension/total/tax.tpl
+%%WWWDIR%%/admin/view/template/extension/total/total.tpl
+%%WWWDIR%%/admin/view/template/extension/total/voucher.tpl
 %%WWWDIR%%/admin/view/template/localisation/country_form.tpl
 %%WWWDIR%%/admin/view/template/localisation/country_list.tpl
 %%WWWDIR%%/admin/view/template/localisation/currency_form.tpl
@@ -1023,167 +1346,6 @@
 %%WWWDIR%%/admin/view/template/marketing/coupon_list.tpl
 %%WWWDIR%%/admin/view/template/marketing/marketing_form.tpl
 %%WWWDIR%%/admin/view/template/marketing/marketing_list.tpl
-%%WWWDIR%%/admin/view/template/module/account.tpl
-%%WWWDIR%%/admin/view/template/module/affiliate.tpl
-%%WWWDIR%%/admin/view/template/module/amazon_login.tpl
-%%WWWDIR%%/admin/view/template/module/amazon_pay.tpl
-%%WWWDIR%%/admin/view/template/module/banner.tpl
-%%WWWDIR%%/admin/view/template/module/bestseller.tpl
-%%WWWDIR%%/admin/view/template/module/carousel.tpl
-%%WWWDIR%%/admin/view/template/module/category.tpl
-%%WWWDIR%%/admin/view/template/module/ebay_listing.tpl
-%%WWWDIR%%/admin/view/template/module/featured.tpl
-%%WWWDIR%%/admin/view/template/module/filter.tpl
-%%WWWDIR%%/admin/view/template/module/google_hangouts.tpl
-%%WWWDIR%%/admin/view/template/module/html.tpl
-%%WWWDIR%%/admin/view/template/module/information.tpl
-%%WWWDIR%%/admin/view/template/module/latest.tpl
-%%WWWDIR%%/admin/view/template/module/laybuy_layout.tpl
-%%WWWDIR%%/admin/view/template/module/pp_button.tpl
-%%WWWDIR%%/admin/view/template/module/pp_login.tpl
-%%WWWDIR%%/admin/view/template/module/sagepay_direct_cards.tpl
-%%WWWDIR%%/admin/view/template/module/sagepay_server_cards.tpl
-%%WWWDIR%%/admin/view/template/module/slideshow.tpl
-%%WWWDIR%%/admin/view/template/module/special.tpl
-%%WWWDIR%%/admin/view/template/module/store.tpl
-%%WWWDIR%%/admin/view/template/openbay/amazon.tpl
-%%WWWDIR%%/admin/view/template/openbay/amazon_ajax_shippinginfo.tpl
-%%WWWDIR%%/admin/view/template/openbay/amazon_bulk_linking.tpl
-%%WWWDIR%%/admin/view/template/openbay/amazon_bulk_listing.tpl
-%%WWWDIR%%/admin/view/template/openbay/amazon_item_links.tpl
-%%WWWDIR%%/admin/view/template/openbay/amazon_listing.tpl
-%%WWWDIR%%/admin/view/template/openbay/amazon_listing_advanced.tpl
-%%WWWDIR%%/admin/view/template/openbay/amazon_listing_edit.tpl
-%%WWWDIR%%/admin/view/template/openbay/amazon_saved_listings.tpl
-%%WWWDIR%%/admin/view/template/openbay/amazon_settings.tpl
-%%WWWDIR%%/admin/view/template/openbay/amazon_stock_updates.tpl
-%%WWWDIR%%/admin/view/template/openbay/amazon_subscription.tpl
-%%WWWDIR%%/admin/view/template/openbay/amazonus.tpl
-%%WWWDIR%%/admin/view/template/openbay/amazonus_ajax_shippinginfo.tpl
-%%WWWDIR%%/admin/view/template/openbay/amazonus_bulk_linking.tpl
-%%WWWDIR%%/admin/view/template/openbay/amazonus_bulk_listing.tpl
-%%WWWDIR%%/admin/view/template/openbay/amazonus_item_links.tpl
-%%WWWDIR%%/admin/view/template/openbay/amazonus_listing.tpl
-%%WWWDIR%%/admin/view/template/openbay/amazonus_listing_advanced.tpl
-%%WWWDIR%%/admin/view/template/openbay/amazonus_listing_edit.tpl
-%%WWWDIR%%/admin/view/template/openbay/amazonus_saved_listings.tpl
-%%WWWDIR%%/admin/view/template/openbay/amazonus_settings.tpl
-%%WWWDIR%%/admin/view/template/openbay/amazonus_stock_updates.tpl
-%%WWWDIR%%/admin/view/template/openbay/amazonus_subscription.tpl
-%%WWWDIR%%/admin/view/template/openbay/ebay.tpl
-%%WWWDIR%%/admin/view/template/openbay/ebay_ajax_shippinginfo.tpl
-%%WWWDIR%%/admin/view/template/openbay/ebay_edit.tpl
-%%WWWDIR%%/admin/view/template/openbay/ebay_item_import.tpl
-%%WWWDIR%%/admin/view/template/openbay/ebay_item_link.tpl
-%%WWWDIR%%/admin/view/template/openbay/ebay_new.tpl
-%%WWWDIR%%/admin/view/template/openbay/ebay_new_bulk.tpl
-%%WWWDIR%%/admin/view/template/openbay/ebay_order_import.tpl
-%%WWWDIR%%/admin/view/template/openbay/ebay_profile_form_generic.tpl
-%%WWWDIR%%/admin/view/template/openbay/ebay_profile_form_returns.tpl
-%%WWWDIR%%/admin/view/template/openbay/ebay_profile_form_shipping.tpl
-%%WWWDIR%%/admin/view/template/openbay/ebay_profile_form_template.tpl
-%%WWWDIR%%/admin/view/template/openbay/ebay_profile_list.tpl
-%%WWWDIR%%/admin/view/template/openbay/ebay_profile_shipping_international_calculated.tpl
-%%WWWDIR%%/admin/view/template/openbay/ebay_profile_shipping_international_flat.tpl
-%%WWWDIR%%/admin/view/template/openbay/ebay_profile_shipping_national_calculated.tpl
-%%WWWDIR%%/admin/view/template/openbay/ebay_profile_shipping_national_flat.tpl
-%%WWWDIR%%/admin/view/template/openbay/ebay_settings.tpl
-%%WWWDIR%%/admin/view/template/openbay/ebay_subscription.tpl
-%%WWWDIR%%/admin/view/template/openbay/ebay_summary.tpl
-%%WWWDIR%%/admin/view/template/openbay/ebay_syncronise.tpl
-%%WWWDIR%%/admin/view/template/openbay/ebay_template_form.tpl
-%%WWWDIR%%/admin/view/template/openbay/ebay_template_list.tpl
-%%WWWDIR%%/admin/view/template/openbay/ebay_usage.tpl
-%%WWWDIR%%/admin/view/template/openbay/etsy.tpl
-%%WWWDIR%%/admin/view/template/openbay/etsy_create.tpl
-%%WWWDIR%%/admin/view/template/openbay/etsy_edit.tpl
-%%WWWDIR%%/admin/view/template/openbay/etsy_links.tpl
-%%WWWDIR%%/admin/view/template/openbay/etsy_listings.tpl
-%%WWWDIR%%/admin/view/template/openbay/etsy_settings.tpl
-%%WWWDIR%%/admin/view/template/openbay/fba.tpl
-%%WWWDIR%%/admin/view/template/openbay/fba_fulfillment_form.tpl
-%%WWWDIR%%/admin/view/template/openbay/fba_fulfillment_list.tpl
-%%WWWDIR%%/admin/view/template/openbay/fba_order_info.tpl
-%%WWWDIR%%/admin/view/template/openbay/fba_order_list.tpl
-%%WWWDIR%%/admin/view/template/openbay/fba_settings.tpl
-%%WWWDIR%%/admin/view/template/openbay/openbay_itemlist.tpl
-%%WWWDIR%%/admin/view/template/openbay/openbay_manage.tpl
-%%WWWDIR%%/admin/view/template/openbay/openbay_orderlist.tpl
-%%WWWDIR%%/admin/view/template/openbay/openbay_orderlist_confirm.tpl
-%%WWWDIR%%/admin/view/template/payment/amazon_login_pay.tpl
-%%WWWDIR%%/admin/view/template/payment/amazon_login_pay_order.tpl
-%%WWWDIR%%/admin/view/template/payment/authorizenet_aim.tpl
-%%WWWDIR%%/admin/view/template/payment/authorizenet_sim.tpl
-%%WWWDIR%%/admin/view/template/payment/bank_transfer.tpl
-%%WWWDIR%%/admin/view/template/payment/bluepay_hosted.tpl
-%%WWWDIR%%/admin/view/template/payment/bluepay_hosted_order.tpl
-%%WWWDIR%%/admin/view/template/payment/bluepay_redirect.tpl
-%%WWWDIR%%/admin/view/template/payment/bluepay_redirect_order.tpl
-%%WWWDIR%%/admin/view/template/payment/buttons.tpl
-%%WWWDIR%%/admin/view/template/payment/cardinity.tpl
-%%WWWDIR%%/admin/view/template/payment/cardinity_order.tpl
-%%WWWDIR%%/admin/view/template/payment/cardinity_order_ajax.tpl
-%%WWWDIR%%/admin/view/template/payment/cheque.tpl
-%%WWWDIR%%/admin/view/template/payment/cod.tpl
-%%WWWDIR%%/admin/view/template/payment/eway.tpl
-%%WWWDIR%%/admin/view/template/payment/eway_order.tpl
-%%WWWDIR%%/admin/view/template/payment/firstdata.tpl
-%%WWWDIR%%/admin/view/template/payment/firstdata_order.tpl
-%%WWWDIR%%/admin/view/template/payment/firstdata_remote.tpl
-%%WWWDIR%%/admin/view/template/payment/firstdata_remote_order.tpl
-%%WWWDIR%%/admin/view/template/payment/free_checkout.tpl
-%%WWWDIR%%/admin/view/template/payment/g2apay.tpl
-%%WWWDIR%%/admin/view/template/payment/g2apay_order.tpl
-%%WWWDIR%%/admin/view/template/payment/globalpay.tpl
-%%WWWDIR%%/admin/view/template/payment/globalpay_order.tpl
-%%WWWDIR%%/admin/view/template/payment/globalpay_remote.tpl
-%%WWWDIR%%/admin/view/template/payment/globalpay_remote_order.tpl
-%%WWWDIR%%/admin/view/template/payment/klarna_account.tpl
-%%WWWDIR%%/admin/view/template/payment/klarna_invoice.tpl
-%%WWWDIR%%/admin/view/template/payment/laybuy.tpl
-%%WWWDIR%%/admin/view/template/payment/laybuy_order.tpl
-%%WWWDIR%%/admin/view/template/payment/laybuy_transaction.tpl
-%%WWWDIR%%/admin/view/template/payment/liqpay.tpl
-%%WWWDIR%%/admin/view/template/payment/nochex.tpl
-%%WWWDIR%%/admin/view/template/payment/paymate.tpl
-%%WWWDIR%%/admin/view/template/payment/paypoint.tpl
-%%WWWDIR%%/admin/view/template/payment/payza.tpl
-%%WWWDIR%%/admin/view/template/payment/perpetual_payments.tpl
-%%WWWDIR%%/admin/view/template/payment/pp_express.tpl
-%%WWWDIR%%/admin/view/template/payment/pp_express_order.tpl
-%%WWWDIR%%/admin/view/template/payment/pp_express_refund.tpl
-%%WWWDIR%%/admin/view/template/payment/pp_express_search.tpl
-%%WWWDIR%%/admin/view/template/payment/pp_express_transaction.tpl
-%%WWWDIR%%/admin/view/template/payment/pp_express_view.tpl
-%%WWWDIR%%/admin/view/template/payment/pp_payflow.tpl
-%%WWWDIR%%/admin/view/template/payment/pp_payflow_iframe.tpl
-%%WWWDIR%%/admin/view/template/payment/pp_payflow_iframe_order.tpl
-%%WWWDIR%%/admin/view/template/payment/pp_payflow_iframe_refund.tpl
-%%WWWDIR%%/admin/view/template/payment/pp_pro.tpl
-%%WWWDIR%%/admin/view/template/payment/pp_pro_iframe.tpl
-%%WWWDIR%%/admin/view/template/payment/pp_pro_iframe_order.tpl
-%%WWWDIR%%/admin/view/template/payment/pp_pro_iframe_refund.tpl
-%%WWWDIR%%/admin/view/template/payment/pp_pro_iframe_transaction.tpl
-%%WWWDIR%%/admin/view/template/payment/pp_standard.tpl
-%%WWWDIR%%/admin/view/template/payment/realex.tpl
-%%WWWDIR%%/admin/view/template/payment/realex_order.tpl
-%%WWWDIR%%/admin/view/template/payment/realex_remote.tpl
-%%WWWDIR%%/admin/view/template/payment/realex_remote_order.tpl
-%%WWWDIR%%/admin/view/template/payment/sagepay_direct.tpl
-%%WWWDIR%%/admin/view/template/payment/sagepay_direct_order.tpl
-%%WWWDIR%%/admin/view/template/payment/sagepay_server.tpl
-%%WWWDIR%%/admin/view/template/payment/sagepay_server_order.tpl
-%%WWWDIR%%/admin/view/template/payment/sagepay_us.tpl
-%%WWWDIR%%/admin/view/template/payment/securetrading_pp.tpl
-%%WWWDIR%%/admin/view/template/payment/securetrading_pp_order.tpl
-%%WWWDIR%%/admin/view/template/payment/securetrading_ws.tpl
-%%WWWDIR%%/admin/view/template/payment/securetrading_ws_order.tpl
-%%WWWDIR%%/admin/view/template/payment/securetrading_ws_transactions.tpl
-%%WWWDIR%%/admin/view/template/payment/skrill.tpl
-%%WWWDIR%%/admin/view/template/payment/twocheckout.tpl
-%%WWWDIR%%/admin/view/template/payment/web_payment_software.tpl
-%%WWWDIR%%/admin/view/template/payment/worldpay.tpl
-%%WWWDIR%%/admin/view/template/payment/worldpay_order.tpl
 %%WWWDIR%%/admin/view/template/report/affiliate.tpl
 %%WWWDIR%%/admin/view/template/report/affiliate_activity.tpl
 %%WWWDIR%%/admin/view/template/report/customer_activity.tpl
@@ -1191,6 +1353,7 @@
 %%WWWDIR%%/admin/view/template/report/customer_online.tpl
 %%WWWDIR%%/admin/view/template/report/customer_order.tpl
 %%WWWDIR%%/admin/view/template/report/customer_reward.tpl
+%%WWWDIR%%/admin/view/template/report/customer_search.tpl
 %%WWWDIR%%/admin/view/template/report/marketing.tpl
 %%WWWDIR%%/admin/view/template/report/product_purchased.tpl
 %%WWWDIR%%/admin/view/template/report/product_viewed.tpl
@@ -1219,33 +1382,9 @@
 %%WWWDIR%%/admin/view/template/setting/setting.tpl
 %%WWWDIR%%/admin/view/template/setting/store_form.tpl
 %%WWWDIR%%/admin/view/template/setting/store_list.tpl
-%%WWWDIR%%/admin/view/template/shipping/auspost.tpl
-%%WWWDIR%%/admin/view/template/shipping/citylink.tpl
-%%WWWDIR%%/admin/view/template/shipping/fedex.tpl
-%%WWWDIR%%/admin/view/template/shipping/flat.tpl
-%%WWWDIR%%/admin/view/template/shipping/free.tpl
-%%WWWDIR%%/admin/view/template/shipping/item.tpl
-%%WWWDIR%%/admin/view/template/shipping/parcelforce_48.tpl
-%%WWWDIR%%/admin/view/template/shipping/pickup.tpl
-%%WWWDIR%%/admin/view/template/shipping/royal_mail.tpl
-%%WWWDIR%%/admin/view/template/shipping/ups.tpl
-%%WWWDIR%%/admin/view/template/shipping/usps.tpl
-%%WWWDIR%%/admin/view/template/shipping/weight.tpl
-%%WWWDIR%%/admin/view/template/theme/theme_default.tpl
 %%WWWDIR%%/admin/view/template/tool/backup.tpl
-%%WWWDIR%%/admin/view/template/tool/error_log.tpl
+%%WWWDIR%%/admin/view/template/tool/log.tpl
 %%WWWDIR%%/admin/view/template/tool/upload.tpl
-%%WWWDIR%%/admin/view/template/total/coupon.tpl
-%%WWWDIR%%/admin/view/template/total/credit.tpl
-%%WWWDIR%%/admin/view/template/total/handling.tpl
-%%WWWDIR%%/admin/view/template/total/klarna_fee.tpl
-%%WWWDIR%%/admin/view/template/total/low_order_fee.tpl
-%%WWWDIR%%/admin/view/template/total/reward.tpl
-%%WWWDIR%%/admin/view/template/total/shipping.tpl
-%%WWWDIR%%/admin/view/template/total/sub_total.tpl
-%%WWWDIR%%/admin/view/template/total/tax.tpl
-%%WWWDIR%%/admin/view/template/total/total.tpl
-%%WWWDIR%%/admin/view/template/total/voucher.tpl
 %%WWWDIR%%/admin/view/template/user/api_form.tpl
 %%WWWDIR%%/admin/view/template/user/api_list.tpl
 %%WWWDIR%%/admin/view/template/user/user_form.tpl
@@ -1282,7 +1421,6 @@
 %%WWWDIR%%/catalog/controller/affiliate/success.php
 %%WWWDIR%%/catalog/controller/affiliate/tracking.php
 %%WWWDIR%%/catalog/controller/affiliate/transaction.php
-%%WWWDIR%%/catalog/controller/analytics/google_analytics.php
 %%WWWDIR%%/catalog/controller/api/cart.php
 %%WWWDIR%%/catalog/controller/api/coupon.php
 %%WWWDIR%%/catalog/controller/api/currency.php
@@ -1293,8 +1431,6 @@
 %%WWWDIR%%/catalog/controller/api/reward.php
 %%WWWDIR%%/catalog/controller/api/shipping.php
 %%WWWDIR%%/catalog/controller/api/voucher.php
-%%WWWDIR%%/catalog/controller/captcha/basic_captcha.php
-%%WWWDIR%%/catalog/controller/captcha/google_captcha.php
 %%WWWDIR%%/catalog/controller/checkout/cart.php
 %%WWWDIR%%/catalog/controller/checkout/checkout.php
 %%WWWDIR%%/catalog/controller/checkout/confirm.php
@@ -1320,94 +1456,110 @@
 %%WWWDIR%%/catalog/controller/common/language.php
 %%WWWDIR%%/catalog/controller/common/maintenance.php
 %%WWWDIR%%/catalog/controller/common/search.php
-%%WWWDIR%%/catalog/controller/credit_card/sagepay_direct.php
-%%WWWDIR%%/catalog/controller/credit_card/sagepay_server.php
 %%WWWDIR%%/catalog/controller/ebay/openbay.php
 %%WWWDIR%%/catalog/controller/error/not_found.php
+%%WWWDIR%%/catalog/controller/event/compatibility.php
 %%WWWDIR%%/catalog/controller/event/debug.php
 %%WWWDIR%%/catalog/controller/event/theme.php
-%%WWWDIR%%/catalog/controller/feed/google_base.php
-%%WWWDIR%%/catalog/controller/feed/google_sitemap.php
+%%WWWDIR%%/catalog/controller/event/translation.php
+%%WWWDIR%%/catalog/controller/extension/analytics/google_analytics.php
+%%WWWDIR%%/catalog/controller/extension/captcha/basic_captcha.php
+%%WWWDIR%%/catalog/controller/extension/captcha/google_captcha.php
+%%WWWDIR%%/catalog/controller/extension/credit_card/sagepay_direct.php
+%%WWWDIR%%/catalog/controller/extension/credit_card/sagepay_server.php
+%%WWWDIR%%/catalog/controller/extension/feed/google_base.php
+%%WWWDIR%%/catalog/controller/extension/feed/google_sitemap.php
+%%WWWDIR%%/catalog/controller/extension/module/account.php
+%%WWWDIR%%/catalog/controller/extension/module/affiliate.php
+%%WWWDIR%%/catalog/controller/extension/module/amazon_login.php
+%%WWWDIR%%/catalog/controller/extension/module/amazon_pay.php
+%%WWWDIR%%/catalog/controller/extension/module/banner.php
+%%WWWDIR%%/catalog/controller/extension/module/bestseller.php
+%%WWWDIR%%/catalog/controller/extension/module/carousel.php
+%%WWWDIR%%/catalog/controller/extension/module/category.php
+%%WWWDIR%%/catalog/controller/extension/module/divido_calculator.php
+%%WWWDIR%%/catalog/controller/extension/module/ebay_listing.php
+%%WWWDIR%%/catalog/controller/extension/module/featured.php
+%%WWWDIR%%/catalog/controller/extension/module/filter.php
+%%WWWDIR%%/catalog/controller/extension/module/google_hangouts.php
+%%WWWDIR%%/catalog/controller/extension/module/html.php
+%%WWWDIR%%/catalog/controller/extension/module/information.php
+%%WWWDIR%%/catalog/controller/extension/module/klarna_checkout_module.php
+%%WWWDIR%%/catalog/controller/extension/module/latest.php
+%%WWWDIR%%/catalog/controller/extension/module/laybuy_layout.php
+%%WWWDIR%%/catalog/controller/extension/module/pilibaba_button.php
+%%WWWDIR%%/catalog/controller/extension/module/pp_button.php
+%%WWWDIR%%/catalog/controller/extension/module/pp_login.php
+%%WWWDIR%%/catalog/controller/extension/module/sagepay_direct_cards.php
+%%WWWDIR%%/catalog/controller/extension/module/sagepay_server_cards.php
+%%WWWDIR%%/catalog/controller/extension/module/slideshow.php
+%%WWWDIR%%/catalog/controller/extension/module/special.php
+%%WWWDIR%%/catalog/controller/extension/module/store.php
+%%WWWDIR%%/catalog/controller/extension/openbay/amazon.php
+%%WWWDIR%%/catalog/controller/extension/openbay/amazonus.php
+%%WWWDIR%%/catalog/controller/extension/openbay/ebay.php
+%%WWWDIR%%/catalog/controller/extension/openbay/etsy.php
+%%WWWDIR%%/catalog/controller/extension/openbay/fba.php
+%%WWWDIR%%/catalog/controller/extension/payment/amazon_login_pay.php
+%%WWWDIR%%/catalog/controller/extension/payment/authorizenet_aim.php
+%%WWWDIR%%/catalog/controller/extension/payment/authorizenet_sim.php
+%%WWWDIR%%/catalog/controller/extension/payment/bank_transfer.php
+%%WWWDIR%%/catalog/controller/extension/payment/bluepay_hosted.php
+%%WWWDIR%%/catalog/controller/extension/payment/bluepay_redirect.php
+%%WWWDIR%%/catalog/controller/extension/payment/cardconnect.php
+%%WWWDIR%%/catalog/controller/extension/payment/cardinity.php
+%%WWWDIR%%/catalog/controller/extension/payment/cheque.php
+%%WWWDIR%%/catalog/controller/extension/payment/cod.php
+%%WWWDIR%%/catalog/controller/extension/payment/divido.php
+%%WWWDIR%%/catalog/controller/extension/payment/eway.php
+%%WWWDIR%%/catalog/controller/extension/payment/firstdata.php
+%%WWWDIR%%/catalog/controller/extension/payment/firstdata_remote.php
+%%WWWDIR%%/catalog/controller/extension/payment/free_checkout.php
+%%WWWDIR%%/catalog/controller/extension/payment/g2apay.php
+%%WWWDIR%%/catalog/controller/extension/payment/globalpay.php
+%%WWWDIR%%/catalog/controller/extension/payment/globalpay_remote.php
+%%WWWDIR%%/catalog/controller/extension/payment/klarna_account.php
+%%WWWDIR%%/catalog/controller/extension/payment/klarna_checkout.php
+%%WWWDIR%%/catalog/controller/extension/payment/klarna_invoice.php
+%%WWWDIR%%/catalog/controller/extension/payment/laybuy.php
+%%WWWDIR%%/catalog/controller/extension/payment/liqpay.php
+%%WWWDIR%%/catalog/controller/extension/payment/nochex.php
+%%WWWDIR%%/catalog/controller/extension/payment/paymate.php
+%%WWWDIR%%/catalog/controller/extension/payment/paypoint.php
+%%WWWDIR%%/catalog/controller/extension/payment/payza.php
+%%WWWDIR%%/catalog/controller/extension/payment/perpetual_payments.php
+%%WWWDIR%%/catalog/controller/extension/payment/pilibaba.php
+%%WWWDIR%%/catalog/controller/extension/payment/pp_express.php
+%%WWWDIR%%/catalog/controller/extension/payment/pp_payflow.php
+%%WWWDIR%%/catalog/controller/extension/payment/pp_payflow_iframe.php
+%%WWWDIR%%/catalog/controller/extension/payment/pp_pro.php
+%%WWWDIR%%/catalog/controller/extension/payment/pp_pro_iframe.php
+%%WWWDIR%%/catalog/controller/extension/payment/pp_standard.php
+%%WWWDIR%%/catalog/controller/extension/payment/realex.php
+%%WWWDIR%%/catalog/controller/extension/payment/realex_remote.php
+%%WWWDIR%%/catalog/controller/extension/payment/sagepay_direct.php
+%%WWWDIR%%/catalog/controller/extension/payment/sagepay_server.php
+%%WWWDIR%%/catalog/controller/extension/payment/sagepay_us.php
+%%WWWDIR%%/catalog/controller/extension/payment/securetrading_pp.php
+%%WWWDIR%%/catalog/controller/extension/payment/securetrading_ws.php
+%%WWWDIR%%/catalog/controller/extension/payment/skrill.php
+%%WWWDIR%%/catalog/controller/extension/payment/twocheckout.php
+%%WWWDIR%%/catalog/controller/extension/payment/web_payment_software.php
+%%WWWDIR%%/catalog/controller/extension/payment/worldpay.php
+%%WWWDIR%%/catalog/controller/extension/recurring/pp_express.php
+%%WWWDIR%%/catalog/controller/extension/total/coupon.php
+%%WWWDIR%%/catalog/controller/extension/total/reward.php
+%%WWWDIR%%/catalog/controller/extension/total/shipping.php
+%%WWWDIR%%/catalog/controller/extension/total/voucher.php
 %%WWWDIR%%/catalog/controller/information/contact.php
 %%WWWDIR%%/catalog/controller/information/information.php
 %%WWWDIR%%/catalog/controller/information/sitemap.php
-%%WWWDIR%%/catalog/controller/module/account.php
-%%WWWDIR%%/catalog/controller/module/affiliate.php
-%%WWWDIR%%/catalog/controller/module/amazon_login.php
-%%WWWDIR%%/catalog/controller/module/amazon_pay.php
-%%WWWDIR%%/catalog/controller/module/banner.php
-%%WWWDIR%%/catalog/controller/module/bestseller.php
-%%WWWDIR%%/catalog/controller/module/carousel.php
-%%WWWDIR%%/catalog/controller/module/category.php
-%%WWWDIR%%/catalog/controller/module/ebay_listing.php
-%%WWWDIR%%/catalog/controller/module/featured.php
-%%WWWDIR%%/catalog/controller/module/filter.php
-%%WWWDIR%%/catalog/controller/module/google_hangouts.php
-%%WWWDIR%%/catalog/controller/module/html.php
-%%WWWDIR%%/catalog/controller/module/information.php
-%%WWWDIR%%/catalog/controller/module/latest.php
-%%WWWDIR%%/catalog/controller/module/laybuy_layout.php
-%%WWWDIR%%/catalog/controller/module/pp_button.php
-%%WWWDIR%%/catalog/controller/module/pp_login.php
-%%WWWDIR%%/catalog/controller/module/sagepay_direct_cards.php
-%%WWWDIR%%/catalog/controller/module/sagepay_server_cards.php
-%%WWWDIR%%/catalog/controller/module/slideshow.php
-%%WWWDIR%%/catalog/controller/module/special.php
-%%WWWDIR%%/catalog/controller/module/store.php
-%%WWWDIR%%/catalog/controller/openbay/amazon.php
-%%WWWDIR%%/catalog/controller/openbay/amazonus.php
-%%WWWDIR%%/catalog/controller/openbay/ebay.php
-%%WWWDIR%%/catalog/controller/openbay/etsy.php
-%%WWWDIR%%/catalog/controller/openbay/fba.php
-%%WWWDIR%%/catalog/controller/payment/amazon_login_pay.php
-%%WWWDIR%%/catalog/controller/payment/authorizenet_aim.php
-%%WWWDIR%%/catalog/controller/payment/authorizenet_sim.php
-%%WWWDIR%%/catalog/controller/payment/bank_transfer.php
-%%WWWDIR%%/catalog/controller/payment/bluepay_hosted.php
-%%WWWDIR%%/catalog/controller/payment/bluepay_redirect.php
-%%WWWDIR%%/catalog/controller/payment/cardinity.php
-%%WWWDIR%%/catalog/controller/payment/cheque.php
-%%WWWDIR%%/catalog/controller/payment/cod.php
-%%WWWDIR%%/catalog/controller/payment/eway.php
-%%WWWDIR%%/catalog/controller/payment/firstdata.php
-%%WWWDIR%%/catalog/controller/payment/firstdata_remote.php
-%%WWWDIR%%/catalog/controller/payment/free_checkout.php
-%%WWWDIR%%/catalog/controller/payment/g2apay.php
-%%WWWDIR%%/catalog/controller/payment/globalpay.php
-%%WWWDIR%%/catalog/controller/payment/globalpay_remote.php
-%%WWWDIR%%/catalog/controller/payment/klarna_account.php
-%%WWWDIR%%/catalog/controller/payment/klarna_invoice.php
-%%WWWDIR%%/catalog/controller/payment/laybuy.php
-%%WWWDIR%%/catalog/controller/payment/liqpay.php
-%%WWWDIR%%/catalog/controller/payment/nochex.php
-%%WWWDIR%%/catalog/controller/payment/paymate.php
-%%WWWDIR%%/catalog/controller/payment/paypoint.php
-%%WWWDIR%%/catalog/controller/payment/payza.php
-%%WWWDIR%%/catalog/controller/payment/perpetual_payments.php
-%%WWWDIR%%/catalog/controller/payment/pp_express.php
-%%WWWDIR%%/catalog/controller/payment/pp_payflow.php
-%%WWWDIR%%/catalog/controller/payment/pp_payflow_iframe.php
-%%WWWDIR%%/catalog/controller/payment/pp_pro.php
-%%WWWDIR%%/catalog/controller/payment/pp_pro_iframe.php
-%%WWWDIR%%/catalog/controller/payment/pp_standard.php
-%%WWWDIR%%/catalog/controller/payment/realex.php
-%%WWWDIR%%/catalog/controller/payment/realex_remote.php
-%%WWWDIR%%/catalog/controller/payment/sagepay_direct.php
-%%WWWDIR%%/catalog/controller/payment/sagepay_server.php
-%%WWWDIR%%/catalog/controller/payment/sagepay_us.php
-%%WWWDIR%%/catalog/controller/payment/securetrading_pp.php
-%%WWWDIR%%/catalog/controller/payment/securetrading_ws.php
-%%WWWDIR%%/catalog/controller/payment/skrill.php
-%%WWWDIR%%/catalog/controller/payment/twocheckout.php
-%%WWWDIR%%/catalog/controller/payment/web_payment_software.php
-%%WWWDIR%%/catalog/controller/payment/worldpay.php
 %%WWWDIR%%/catalog/controller/product/category.php
 %%WWWDIR%%/catalog/controller/product/compare.php
 %%WWWDIR%%/catalog/controller/product/manufacturer.php
 %%WWWDIR%%/catalog/controller/product/product.php
 %%WWWDIR%%/catalog/controller/product/search.php
 %%WWWDIR%%/catalog/controller/product/special.php
-%%WWWDIR%%/catalog/controller/recurring/pp_express.php
 %%WWWDIR%%/catalog/controller/startup/error.php
 %%WWWDIR%%/catalog/controller/startup/event.php
 %%WWWDIR%%/catalog/controller/startup/maintenance.php
@@ -1416,10 +1568,6 @@
 %%WWWDIR%%/catalog/controller/startup/session.php
 %%WWWDIR%%/catalog/controller/startup/startup.php
 %%WWWDIR%%/catalog/controller/tool/upload.php
-%%WWWDIR%%/catalog/controller/total/coupon.php
-%%WWWDIR%%/catalog/controller/total/reward.php
-%%WWWDIR%%/catalog/controller/total/shipping.php
-%%WWWDIR%%/catalog/controller/total/voucher.php
 %%WWWDIR%%/catalog/language/en-gb/account/account.php
 %%WWWDIR%%/catalog/language/en-gb/account/address.php
 %%WWWDIR%%/catalog/language/en-gb/account/download.php
@@ -1460,8 +1608,6 @@
 %%WWWDIR%%/catalog/language/en-gb/api/reward.php
 %%WWWDIR%%/catalog/language/en-gb/api/shipping.php
 %%WWWDIR%%/catalog/language/en-gb/api/voucher.php
-%%WWWDIR%%/catalog/language/en-gb/captcha/basic_captcha.php
-%%WWWDIR%%/catalog/language/en-gb/captcha/google_captcha.php
 %%WWWDIR%%/catalog/language/en-gb/checkout/cart.php
 %%WWWDIR%%/catalog/language/en-gb/checkout/checkout.php
 %%WWWDIR%%/catalog/language/en-gb/checkout/failure.php
@@ -1473,11 +1619,103 @@
 %%WWWDIR%%/catalog/language/en-gb/common/language.php
 %%WWWDIR%%/catalog/language/en-gb/common/maintenance.php
 %%WWWDIR%%/catalog/language/en-gb/common/search.php
-%%WWWDIR%%/catalog/language/en-gb/credit_card/sagepay_direct.php
-%%WWWDIR%%/catalog/language/en-gb/credit_card/sagepay_server.php
 %%WWWDIR%%/catalog/language/en-gb/en-gb.php
 %%WWWDIR%%/catalog/language/en-gb/en-gb.png
 %%WWWDIR%%/catalog/language/en-gb/error/not_found.php
+%%WWWDIR%%/catalog/language/en-gb/extension/captcha/basic_captcha.php
+%%WWWDIR%%/catalog/language/en-gb/extension/captcha/google_captcha.php
+%%WWWDIR%%/catalog/language/en-gb/extension/credit_card/sagepay_direct.php
+%%WWWDIR%%/catalog/language/en-gb/extension/credit_card/sagepay_server.php
+%%WWWDIR%%/catalog/language/en-gb/extension/module/account.php
+%%WWWDIR%%/catalog/language/en-gb/extension/module/affiliate.php
+%%WWWDIR%%/catalog/language/en-gb/extension/module/amazon_login.php
+%%WWWDIR%%/catalog/language/en-gb/extension/module/amazon_pay.php
+%%WWWDIR%%/catalog/language/en-gb/extension/module/bestseller.php
+%%WWWDIR%%/catalog/language/en-gb/extension/module/category.php
+%%WWWDIR%%/catalog/language/en-gb/extension/module/divido_calculator.php
+%%WWWDIR%%/catalog/language/en-gb/extension/module/ebay_listing.php
+%%WWWDIR%%/catalog/language/en-gb/extension/module/featured.php
+%%WWWDIR%%/catalog/language/en-gb/extension/module/filter.php
+%%WWWDIR%%/catalog/language/en-gb/extension/module/google_hangouts.php
+%%WWWDIR%%/catalog/language/en-gb/extension/module/information.php
+%%WWWDIR%%/catalog/language/en-gb/extension/module/latest.php
+%%WWWDIR%%/catalog/language/en-gb/extension/module/laybuy_layout.php
+%%WWWDIR%%/catalog/language/en-gb/extension/module/special.php
+%%WWWDIR%%/catalog/language/en-gb/extension/module/store.php
+%%WWWDIR%%/catalog/language/en-gb/extension/openbay/amazon_order.php
+%%WWWDIR%%/catalog/language/en-gb/extension/openbay/amazonus_order.php
+%%WWWDIR%%/catalog/language/en-gb/extension/openbay/ebay_order.php
+%%WWWDIR%%/catalog/language/en-gb/extension/openbay/etsy_order.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/amazon_login_pay.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/authorizenet_aim.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/authorizenet_sim.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/bank_transfer.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/bluepay_hosted.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/bluepay_redirect.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/cardconnect.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/cardinity.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/cheque.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/cod.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/divido.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/eway.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/firstdata.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/firstdata_remote.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/free_checkout.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/g2apay.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/globalpay.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/globalpay_remote.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/klarna_account.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/klarna_checkout.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/klarna_invoice.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/laybuy.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/liqpay.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/nochex.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/paymate.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/paypoint.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/payza.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/perpetual_payments.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/pilibaba.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/pp_express.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/pp_payflow.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/pp_payflow_iframe.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/pp_pro.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/pp_pro_iframe.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/pp_standard.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/realex.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/realex_remote.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/sagepay_direct.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/sagepay_server.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/sagepay_us.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/securetrading_pp.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/securetrading_ws.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/skrill.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/twocheckout.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/web_payment_software.php
+%%WWWDIR%%/catalog/language/en-gb/extension/payment/worldpay.php
+%%WWWDIR%%/catalog/language/en-gb/extension/recurring/pp_express.php
+%%WWWDIR%%/catalog/language/en-gb/extension/shipping/auspost.php
+%%WWWDIR%%/catalog/language/en-gb/extension/shipping/citylink.php
+%%WWWDIR%%/catalog/language/en-gb/extension/shipping/fedex.php
+%%WWWDIR%%/catalog/language/en-gb/extension/shipping/flat.php
+%%WWWDIR%%/catalog/language/en-gb/extension/shipping/free.php
+%%WWWDIR%%/catalog/language/en-gb/extension/shipping/item.php
+%%WWWDIR%%/catalog/language/en-gb/extension/shipping/parcelforce_48.php
+%%WWWDIR%%/catalog/language/en-gb/extension/shipping/pickup.php
+%%WWWDIR%%/catalog/language/en-gb/extension/shipping/pilibaba.php
+%%WWWDIR%%/catalog/language/en-gb/extension/shipping/royal_mail.php
+%%WWWDIR%%/catalog/language/en-gb/extension/shipping/ups.php
+%%WWWDIR%%/catalog/language/en-gb/extension/shipping/usps.php
+%%WWWDIR%%/catalog/language/en-gb/extension/shipping/weight.php
+%%WWWDIR%%/catalog/language/en-gb/extension/total/coupon.php
+%%WWWDIR%%/catalog/language/en-gb/extension/total/credit.php
+%%WWWDIR%%/catalog/language/en-gb/extension/total/handling.php
+%%WWWDIR%%/catalog/language/en-gb/extension/total/klarna_fee.php
+%%WWWDIR%%/catalog/language/en-gb/extension/total/low_order_fee.php
+%%WWWDIR%%/catalog/language/en-gb/extension/total/reward.php
+%%WWWDIR%%/catalog/language/en-gb/extension/total/shipping.php
+%%WWWDIR%%/catalog/language/en-gb/extension/total/sub_total.php
+%%WWWDIR%%/catalog/language/en-gb/extension/total/total.php
+%%WWWDIR%%/catalog/language/en-gb/extension/total/voucher.php
 %%WWWDIR%%/catalog/language/en-gb/information/contact.php
 %%WWWDIR%%/catalog/language/en-gb/information/information.php
 %%WWWDIR%%/catalog/language/en-gb/information/sitemap.php
@@ -1487,95 +1725,13 @@
 %%WWWDIR%%/catalog/language/en-gb/mail/order.php
 %%WWWDIR%%/catalog/language/en-gb/mail/review.php
 %%WWWDIR%%/catalog/language/en-gb/mail/voucher.php
-%%WWWDIR%%/catalog/language/en-gb/module/account.php
-%%WWWDIR%%/catalog/language/en-gb/module/affiliate.php
-%%WWWDIR%%/catalog/language/en-gb/module/bestseller.php
-%%WWWDIR%%/catalog/language/en-gb/module/category.php
-%%WWWDIR%%/catalog/language/en-gb/module/ebay_listing.php
-%%WWWDIR%%/catalog/language/en-gb/module/featured.php
-%%WWWDIR%%/catalog/language/en-gb/module/filter.php
-%%WWWDIR%%/catalog/language/en-gb/module/google_hangouts.php
-%%WWWDIR%%/catalog/language/en-gb/module/information.php
-%%WWWDIR%%/catalog/language/en-gb/module/latest.php
-%%WWWDIR%%/catalog/language/en-gb/module/laybuy_layout.php
-%%WWWDIR%%/catalog/language/en-gb/module/special.php
-%%WWWDIR%%/catalog/language/en-gb/module/store.php
-%%WWWDIR%%/catalog/language/en-gb/openbay/amazon_order.php
-%%WWWDIR%%/catalog/language/en-gb/openbay/amazonus_order.php
-%%WWWDIR%%/catalog/language/en-gb/openbay/ebay_order.php
-%%WWWDIR%%/catalog/language/en-gb/openbay/etsy_order.php
-%%WWWDIR%%/catalog/language/en-gb/payment/amazon_login_pay.php
-%%WWWDIR%%/catalog/language/en-gb/payment/authorizenet_aim.php
-%%WWWDIR%%/catalog/language/en-gb/payment/authorizenet_sim.php
-%%WWWDIR%%/catalog/language/en-gb/payment/bank_transfer.php
-%%WWWDIR%%/catalog/language/en-gb/payment/bluepay_hosted.php
-%%WWWDIR%%/catalog/language/en-gb/payment/bluepay_redirect.php
-%%WWWDIR%%/catalog/language/en-gb/payment/cardinity.php
-%%WWWDIR%%/catalog/language/en-gb/payment/cheque.php
-%%WWWDIR%%/catalog/language/en-gb/payment/cod.php
-%%WWWDIR%%/catalog/language/en-gb/payment/eway.php
-%%WWWDIR%%/catalog/language/en-gb/payment/firstdata.php
-%%WWWDIR%%/catalog/language/en-gb/payment/firstdata_remote.php
-%%WWWDIR%%/catalog/language/en-gb/payment/free_checkout.php
-%%WWWDIR%%/catalog/language/en-gb/payment/g2apay.php
-%%WWWDIR%%/catalog/language/en-gb/payment/globalpay.php
-%%WWWDIR%%/catalog/language/en-gb/payment/globalpay_remote.php
-%%WWWDIR%%/catalog/language/en-gb/payment/klarna_account.php
-%%WWWDIR%%/catalog/language/en-gb/payment/klarna_invoice.php
-%%WWWDIR%%/catalog/language/en-gb/payment/laybuy.php
-%%WWWDIR%%/catalog/language/en-gb/payment/liqpay.php
-%%WWWDIR%%/catalog/language/en-gb/payment/nochex.php
-%%WWWDIR%%/catalog/language/en-gb/payment/paymate.php
-%%WWWDIR%%/catalog/language/en-gb/payment/paypoint.php
-%%WWWDIR%%/catalog/language/en-gb/payment/payza.php
-%%WWWDIR%%/catalog/language/en-gb/payment/perpetual_payments.php
-%%WWWDIR%%/catalog/language/en-gb/payment/pp_express.php
-%%WWWDIR%%/catalog/language/en-gb/payment/pp_payflow.php
-%%WWWDIR%%/catalog/language/en-gb/payment/pp_payflow_iframe.php
-%%WWWDIR%%/catalog/language/en-gb/payment/pp_pro.php
-%%WWWDIR%%/catalog/language/en-gb/payment/pp_pro_iframe.php
-%%WWWDIR%%/catalog/language/en-gb/payment/pp_standard.php
-%%WWWDIR%%/catalog/language/en-gb/payment/realex.php
-%%WWWDIR%%/catalog/language/en-gb/payment/realex_remote.php
-%%WWWDIR%%/catalog/language/en-gb/payment/sagepay_direct.php
-%%WWWDIR%%/catalog/language/en-gb/payment/sagepay_server.php
-%%WWWDIR%%/catalog/language/en-gb/payment/sagepay_us.php
-%%WWWDIR%%/catalog/language/en-gb/payment/securetrading_pp.php
-%%WWWDIR%%/catalog/language/en-gb/payment/securetrading_ws.php
-%%WWWDIR%%/catalog/language/en-gb/payment/skrill.php
-%%WWWDIR%%/catalog/language/en-gb/payment/twocheckout.php
-%%WWWDIR%%/catalog/language/en-gb/payment/web_payment_software.php
-%%WWWDIR%%/catalog/language/en-gb/payment/worldpay.php
 %%WWWDIR%%/catalog/language/en-gb/product/category.php
 %%WWWDIR%%/catalog/language/en-gb/product/compare.php
 %%WWWDIR%%/catalog/language/en-gb/product/manufacturer.php
 %%WWWDIR%%/catalog/language/en-gb/product/product.php
 %%WWWDIR%%/catalog/language/en-gb/product/search.php
 %%WWWDIR%%/catalog/language/en-gb/product/special.php
-%%WWWDIR%%/catalog/language/en-gb/recurring/pp_express.php
-%%WWWDIR%%/catalog/language/en-gb/shipping/auspost.php
-%%WWWDIR%%/catalog/language/en-gb/shipping/citylink.php
-%%WWWDIR%%/catalog/language/en-gb/shipping/fedex.php
-%%WWWDIR%%/catalog/language/en-gb/shipping/flat.php
-%%WWWDIR%%/catalog/language/en-gb/shipping/free.php
-%%WWWDIR%%/catalog/language/en-gb/shipping/item.php
-%%WWWDIR%%/catalog/language/en-gb/shipping/parcelforce_48.php
-%%WWWDIR%%/catalog/language/en-gb/shipping/pickup.php
-%%WWWDIR%%/catalog/language/en-gb/shipping/royal_mail.php
-%%WWWDIR%%/catalog/language/en-gb/shipping/ups.php
-%%WWWDIR%%/catalog/language/en-gb/shipping/usps.php
-%%WWWDIR%%/catalog/language/en-gb/shipping/weight.php
 %%WWWDIR%%/catalog/language/en-gb/tool/upload.php
-%%WWWDIR%%/catalog/language/en-gb/total/coupon.php
-%%WWWDIR%%/catalog/language/en-gb/total/credit.php
-%%WWWDIR%%/catalog/language/en-gb/total/handling.php
-%%WWWDIR%%/catalog/language/en-gb/total/klarna_fee.php
-%%WWWDIR%%/catalog/language/en-gb/total/low_order_fee.php
-%%WWWDIR%%/catalog/language/en-gb/total/reward.php
-%%WWWDIR%%/catalog/language/en-gb/total/shipping.php
-%%WWWDIR%%/catalog/language/en-gb/total/sub_total.php
-%%WWWDIR%%/catalog/language/en-gb/total/total.php
-%%WWWDIR%%/catalog/language/en-gb/total/voucher.php
 %%WWWDIR%%/catalog/model/account/activity.php
 %%WWWDIR%%/catalog/model/account/address.php
 %%WWWDIR%%/catalog/model/account/api.php
@@ -1587,6 +1743,7 @@
 %%WWWDIR%%/catalog/model/account/recurring.php
 %%WWWDIR%%/catalog/model/account/return.php
 %%WWWDIR%%/catalog/model/account/reward.php
+%%WWWDIR%%/catalog/model/account/search.php
 %%WWWDIR%%/catalog/model/account/transaction.php
 %%WWWDIR%%/catalog/model/account/wishlist.php
 %%WWWDIR%%/catalog/model/affiliate/activity.php
@@ -1602,104 +1759,111 @@
 %%WWWDIR%%/catalog/model/checkout/recurring.php
 %%WWWDIR%%/catalog/model/design/banner.php
 %%WWWDIR%%/catalog/model/design/layout.php
+%%WWWDIR%%/catalog/model/design/theme.php
+%%WWWDIR%%/catalog/model/design/translation.php
 %%WWWDIR%%/catalog/model/extension/event.php
 %%WWWDIR%%/catalog/model/extension/extension.php
+%%WWWDIR%%/catalog/model/extension/feed/google_base.php
+%%WWWDIR%%/catalog/model/extension/fraud/fraudlabspro.php
+%%WWWDIR%%/catalog/model/extension/fraud/ip.php
+%%WWWDIR%%/catalog/model/extension/fraud/maxmind.php
 %%WWWDIR%%/catalog/model/extension/module.php
-%%WWWDIR%%/catalog/model/feed/google_base.php
-%%WWWDIR%%/catalog/model/fraud/fraudlabspro.php
-%%WWWDIR%%/catalog/model/fraud/ip.php
-%%WWWDIR%%/catalog/model/fraud/maxmind.php
+%%WWWDIR%%/catalog/model/extension/module/laybuy_layout.php
+%%WWWDIR%%/catalog/model/extension/module/pp_login.php
+%%WWWDIR%%/catalog/model/extension/openbay/amazon_listing.php
+%%WWWDIR%%/catalog/model/extension/openbay/amazon_order.php
+%%WWWDIR%%/catalog/model/extension/openbay/amazon_product.php
+%%WWWDIR%%/catalog/model/extension/openbay/amazonus_listing.php
+%%WWWDIR%%/catalog/model/extension/openbay/amazonus_order.php
+%%WWWDIR%%/catalog/model/extension/openbay/amazonus_product.php
+%%WWWDIR%%/catalog/model/extension/openbay/ebay_openbay.php
+%%WWWDIR%%/catalog/model/extension/openbay/ebay_order.php
+%%WWWDIR%%/catalog/model/extension/openbay/ebay_product.php
+%%WWWDIR%%/catalog/model/extension/openbay/etsy_order.php
+%%WWWDIR%%/catalog/model/extension/openbay/etsy_product.php
+%%WWWDIR%%/catalog/model/extension/payment/amazon_login_pay.php
+%%WWWDIR%%/catalog/model/extension/payment/authorizenet_aim.php
+%%WWWDIR%%/catalog/model/extension/payment/authorizenet_sim.php
+%%WWWDIR%%/catalog/model/extension/payment/bank_transfer.php
+%%WWWDIR%%/catalog/model/extension/payment/bluepay_hosted.php
+%%WWWDIR%%/catalog/model/extension/payment/bluepay_redirect.php
+%%WWWDIR%%/catalog/model/extension/payment/cardconnect.php
+%%WWWDIR%%/catalog/model/extension/payment/cardinity.php
+%%WWWDIR%%/catalog/model/extension/payment/cheque.php
+%%WWWDIR%%/catalog/model/extension/payment/cod.php
+%%WWWDIR%%/catalog/model/extension/payment/divido.php
+%%WWWDIR%%/catalog/model/extension/payment/eway.php
+%%WWWDIR%%/catalog/model/extension/payment/firstdata.php
+%%WWWDIR%%/catalog/model/extension/payment/firstdata_remote.php
+%%WWWDIR%%/catalog/model/extension/payment/free_checkout.php
+%%WWWDIR%%/catalog/model/extension/payment/g2apay.php
+%%WWWDIR%%/catalog/model/extension/payment/globalpay.php
+%%WWWDIR%%/catalog/model/extension/payment/globalpay_remote.php
+%%WWWDIR%%/catalog/model/extension/payment/klarna_account.php
+%%WWWDIR%%/catalog/model/extension/payment/klarna_checkout.php
+%%WWWDIR%%/catalog/model/extension/payment/klarna_invoice.php
+%%WWWDIR%%/catalog/model/extension/payment/laybuy.php
+%%WWWDIR%%/catalog/model/extension/payment/liqpay.php
+%%WWWDIR%%/catalog/model/extension/payment/nochex.php
+%%WWWDIR%%/catalog/model/extension/payment/paymate.php
+%%WWWDIR%%/catalog/model/extension/payment/paypoint.php
+%%WWWDIR%%/catalog/model/extension/payment/payza.php
+%%WWWDIR%%/catalog/model/extension/payment/perpetual_payments.php
+%%WWWDIR%%/catalog/model/extension/payment/pilibaba.php
+%%WWWDIR%%/catalog/model/extension/payment/pp_express.php
+%%WWWDIR%%/catalog/model/extension/payment/pp_payflow.php
+%%WWWDIR%%/catalog/model/extension/payment/pp_payflow_iframe.php
+%%WWWDIR%%/catalog/model/extension/payment/pp_pro.php
+%%WWWDIR%%/catalog/model/extension/payment/pp_pro_iframe.php
+%%WWWDIR%%/catalog/model/extension/payment/pp_standard.php
+%%WWWDIR%%/catalog/model/extension/payment/realex.php
+%%WWWDIR%%/catalog/model/extension/payment/realex_remote.php
+%%WWWDIR%%/catalog/model/extension/payment/sagepay_direct.php
+%%WWWDIR%%/catalog/model/extension/payment/sagepay_server.php
+%%WWWDIR%%/catalog/model/extension/payment/sagepay_us.php
+%%WWWDIR%%/catalog/model/extension/payment/securetrading_pp.php
+%%WWWDIR%%/catalog/model/extension/payment/securetrading_ws.php
+%%WWWDIR%%/catalog/model/extension/payment/skrill.php
+%%WWWDIR%%/catalog/model/extension/payment/twocheckout.php
+%%WWWDIR%%/catalog/model/extension/payment/web_payment_software.php
+%%WWWDIR%%/catalog/model/extension/payment/worldpay.php
+%%WWWDIR%%/catalog/model/extension/shipping/auspost.php
+%%WWWDIR%%/catalog/model/extension/shipping/citylink.php
+%%WWWDIR%%/catalog/model/extension/shipping/fedex.php
+%%WWWDIR%%/catalog/model/extension/shipping/flat.php
+%%WWWDIR%%/catalog/model/extension/shipping/free.php
+%%WWWDIR%%/catalog/model/extension/shipping/item.php
+%%WWWDIR%%/catalog/model/extension/shipping/parcelforce_48.php
+%%WWWDIR%%/catalog/model/extension/shipping/pickup.php
+%%WWWDIR%%/catalog/model/extension/shipping/pilibaba.php
+%%WWWDIR%%/catalog/model/extension/shipping/royal_mail.php
+%%WWWDIR%%/catalog/model/extension/shipping/ups.php
+%%WWWDIR%%/catalog/model/extension/shipping/usps.php
+%%WWWDIR%%/catalog/model/extension/shipping/weight.php
+%%WWWDIR%%/catalog/model/extension/total/coupon.php
+%%WWWDIR%%/catalog/model/extension/total/credit.php
+%%WWWDIR%%/catalog/model/extension/total/handling.php
+%%WWWDIR%%/catalog/model/extension/total/klarna_fee.php
+%%WWWDIR%%/catalog/model/extension/total/low_order_fee.php
+%%WWWDIR%%/catalog/model/extension/total/reward.php
+%%WWWDIR%%/catalog/model/extension/total/shipping.php
+%%WWWDIR%%/catalog/model/extension/total/sub_total.php
+%%WWWDIR%%/catalog/model/extension/total/tax.php
+%%WWWDIR%%/catalog/model/extension/total/total.php
+%%WWWDIR%%/catalog/model/extension/total/voucher.php
+%%WWWDIR%%/catalog/model/extension/total/voucher_theme.php
 %%WWWDIR%%/catalog/model/localisation/country.php
 %%WWWDIR%%/catalog/model/localisation/currency.php
 %%WWWDIR%%/catalog/model/localisation/language.php
 %%WWWDIR%%/catalog/model/localisation/location.php
 %%WWWDIR%%/catalog/model/localisation/return_reason.php
 %%WWWDIR%%/catalog/model/localisation/zone.php
-%%WWWDIR%%/catalog/model/module/laybuy_layout.php
-%%WWWDIR%%/catalog/model/module/pp_login.php
-%%WWWDIR%%/catalog/model/openbay/amazon_listing.php
-%%WWWDIR%%/catalog/model/openbay/amazon_order.php
-%%WWWDIR%%/catalog/model/openbay/amazon_product.php
-%%WWWDIR%%/catalog/model/openbay/amazonus_listing.php
-%%WWWDIR%%/catalog/model/openbay/amazonus_order.php
-%%WWWDIR%%/catalog/model/openbay/amazonus_product.php
-%%WWWDIR%%/catalog/model/openbay/ebay_openbay.php
-%%WWWDIR%%/catalog/model/openbay/ebay_order.php
-%%WWWDIR%%/catalog/model/openbay/ebay_product.php
-%%WWWDIR%%/catalog/model/openbay/etsy_order.php
-%%WWWDIR%%/catalog/model/openbay/etsy_product.php
-%%WWWDIR%%/catalog/model/payment/amazon_login_pay.php
-%%WWWDIR%%/catalog/model/payment/authorizenet_aim.php
-%%WWWDIR%%/catalog/model/payment/authorizenet_sim.php
-%%WWWDIR%%/catalog/model/payment/bank_transfer.php
-%%WWWDIR%%/catalog/model/payment/bluepay_hosted.php
-%%WWWDIR%%/catalog/model/payment/bluepay_redirect.php
-%%WWWDIR%%/catalog/model/payment/cardinity.php
-%%WWWDIR%%/catalog/model/payment/cheque.php
-%%WWWDIR%%/catalog/model/payment/cod.php
-%%WWWDIR%%/catalog/model/payment/eway.php
-%%WWWDIR%%/catalog/model/payment/firstdata.php
-%%WWWDIR%%/catalog/model/payment/firstdata_remote.php
-%%WWWDIR%%/catalog/model/payment/free_checkout.php
-%%WWWDIR%%/catalog/model/payment/g2apay.php
-%%WWWDIR%%/catalog/model/payment/globalpay.php
-%%WWWDIR%%/catalog/model/payment/globalpay_remote.php
-%%WWWDIR%%/catalog/model/payment/klarna_account.php
-%%WWWDIR%%/catalog/model/payment/klarna_invoice.php
-%%WWWDIR%%/catalog/model/payment/laybuy.php
-%%WWWDIR%%/catalog/model/payment/liqpay.php
-%%WWWDIR%%/catalog/model/payment/nochex.php
-%%WWWDIR%%/catalog/model/payment/paymate.php
-%%WWWDIR%%/catalog/model/payment/paypoint.php
-%%WWWDIR%%/catalog/model/payment/payza.php
-%%WWWDIR%%/catalog/model/payment/perpetual_payments.php
-%%WWWDIR%%/catalog/model/payment/pp_express.php
-%%WWWDIR%%/catalog/model/payment/pp_payflow.php
-%%WWWDIR%%/catalog/model/payment/pp_payflow_iframe.php
-%%WWWDIR%%/catalog/model/payment/pp_pro.php
-%%WWWDIR%%/catalog/model/payment/pp_pro_iframe.php
-%%WWWDIR%%/catalog/model/payment/pp_standard.php
-%%WWWDIR%%/catalog/model/payment/realex.php
-%%WWWDIR%%/catalog/model/payment/realex_remote.php
-%%WWWDIR%%/catalog/model/payment/sagepay_direct.php
-%%WWWDIR%%/catalog/model/payment/sagepay_server.php
-%%WWWDIR%%/catalog/model/payment/sagepay_us.php
-%%WWWDIR%%/catalog/model/payment/securetrading_pp.php
-%%WWWDIR%%/catalog/model/payment/securetrading_ws.php
-%%WWWDIR%%/catalog/model/payment/skrill.php
-%%WWWDIR%%/catalog/model/payment/twocheckout.php
-%%WWWDIR%%/catalog/model/payment/web_payment_software.php
-%%WWWDIR%%/catalog/model/payment/worldpay.php
 %%WWWDIR%%/catalog/model/setting/api.php
 %%WWWDIR%%/catalog/model/setting/setting.php
 %%WWWDIR%%/catalog/model/setting/store.php
-%%WWWDIR%%/catalog/model/shipping/auspost.php
-%%WWWDIR%%/catalog/model/shipping/citylink.php
-%%WWWDIR%%/catalog/model/shipping/fedex.php
-%%WWWDIR%%/catalog/model/shipping/flat.php
-%%WWWDIR%%/catalog/model/shipping/free.php
-%%WWWDIR%%/catalog/model/shipping/item.php
-%%WWWDIR%%/catalog/model/shipping/parcelforce_48.php
-%%WWWDIR%%/catalog/model/shipping/pickup.php
-%%WWWDIR%%/catalog/model/shipping/royal_mail.php
-%%WWWDIR%%/catalog/model/shipping/ups.php
-%%WWWDIR%%/catalog/model/shipping/usps.php
-%%WWWDIR%%/catalog/model/shipping/weight.php
 %%WWWDIR%%/catalog/model/tool/image.php
 %%WWWDIR%%/catalog/model/tool/online.php
 %%WWWDIR%%/catalog/model/tool/upload.php
-%%WWWDIR%%/catalog/model/total/coupon.php
-%%WWWDIR%%/catalog/model/total/credit.php
-%%WWWDIR%%/catalog/model/total/handling.php
-%%WWWDIR%%/catalog/model/total/klarna_fee.php
-%%WWWDIR%%/catalog/model/total/low_order_fee.php
-%%WWWDIR%%/catalog/model/total/reward.php
-%%WWWDIR%%/catalog/model/total/shipping.php
-%%WWWDIR%%/catalog/model/total/sub_total.php
-%%WWWDIR%%/catalog/model/total/tax.php
-%%WWWDIR%%/catalog/model/total/total.php
-%%WWWDIR%%/catalog/model/total/voucher.php
-%%WWWDIR%%/catalog/model/total/voucher_theme.php
 %%WWWDIR%%/catalog/view/javascript/bootstrap/css/bootstrap-theme.css
 %%WWWDIR%%/catalog/view/javascript/bootstrap/css/bootstrap-theme.css.map
 %%WWWDIR%%/catalog/view/javascript/bootstrap/css/bootstrap-theme.min.css
@@ -1778,6 +1942,7 @@
 %%WWWDIR%%/catalog/view/theme/default/image/klarna_green_middle.png
 %%WWWDIR%%/catalog/view/theme/default/image/klarna_nld_banner.png
 %%WWWDIR%%/catalog/view/theme/default/image/paypal_express_mobile.png
+%%WWWDIR%%/catalog/view/theme/default/image/pilibaba_button.png
 %%WWWDIR%%/catalog/view/theme/default/stylesheet/stylesheet.css
 %%WWWDIR%%/catalog/view/theme/default/template/account/account.tpl
 %%WWWDIR%%/catalog/view/theme/default/template/account/address_form.tpl
@@ -1810,8 +1975,6 @@
 %%WWWDIR%%/catalog/view/theme/default/template/affiliate/register.tpl
 %%WWWDIR%%/catalog/view/theme/default/template/affiliate/tracking.tpl
 %%WWWDIR%%/catalog/view/theme/default/template/affiliate/transaction.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/captcha/basic_captcha.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/captcha/google_captcha.tpl
 %%WWWDIR%%/catalog/view/theme/default/template/checkout/cart.tpl
 %%WWWDIR%%/catalog/view/theme/default/template/checkout/checkout.tpl
 %%WWWDIR%%/catalog/view/theme/default/template/checkout/confirm.tpl
@@ -1836,94 +1999,113 @@
 %%WWWDIR%%/catalog/view/theme/default/template/common/maintenance.tpl
 %%WWWDIR%%/catalog/view/theme/default/template/common/search.tpl
 %%WWWDIR%%/catalog/view/theme/default/template/common/success.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/credit_card/sagepay_direct_form.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/credit_card/sagepay_direct_list.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/credit_card/sagepay_server_list.tpl
 %%WWWDIR%%/catalog/view/theme/default/template/error/not_found.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/captcha/basic_captcha.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/captcha/google_captcha.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/credit_card/sagepay_direct_form.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/credit_card/sagepay_direct_list.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/credit_card/sagepay_server_list.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/module/account.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/module/affiliate.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/module/amazon_login.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/module/amazon_pay.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/module/banner.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/module/bestseller.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/module/carousel.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/module/category.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/module/divido_calculator.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/module/ebay_listing.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/module/featured.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/module/filter.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/module/google_hangouts.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/module/html.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/module/information.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/module/klarna_checkout_module.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/module/latest.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/module/laybuy_layout.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/module/pilibaba_button.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/module/pp_button.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/module/pp_login.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/module/sagepay_direct_cards.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/module/sagepay_server_cards.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/module/slideshow.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/module/special.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/module/store.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/amazon_login_pay_address.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/amazon_login_pay_confirm.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/amazon_login_pay_failure.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/amazon_login_pay_payment.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/authorizenet_aim.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/authorizenet_sim.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/bank_transfer.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/bluepay_hosted.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/bluepay_redirect.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/cardconnect.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/cardinity.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/cardinity_3ds.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/cheque.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/cod.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/divido.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/divido_calculator.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/divido_widget.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/eway.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/eway_iframe.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/firstdata.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/firstdata_remote.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/free_checkout.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/g2apay.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/globalpay.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/globalpay_remote.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/globalpay_response.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/klarna_account.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/klarna_checkout.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/klarna_checkout_main.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/klarna_checkout_sidebar.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/klarna_checkout_success.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/klarna_invoice.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/laybuy.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/liqpay.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/nochex.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/paymate.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/paypoint.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/paypoint_failure.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/paypoint_success.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/payza.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/perpetual_payments.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/pilibaba.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/pp_express.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/pp_express_confirm.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/pp_payflow.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/pp_payflow_iframe.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/pp_payflow_iframe_return.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/pp_pro.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/pp_pro_iframe.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/pp_pro_iframe_body.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/pp_standard.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/realex.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/realex_remote.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/realex_response.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/sagepay_direct.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/sagepay_server.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/sagepay_us.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/securetrading_pp.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/securetrading_ws.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/skrill.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/twocheckout.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/web_payment_software.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/worldpay.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/worldpay_failure.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/payment/worldpay_success.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/recurring/pp_express.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/total/coupon.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/total/reward.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/total/shipping.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/extension/total/voucher.tpl
 %%WWWDIR%%/catalog/view/theme/default/template/information/contact.tpl
 %%WWWDIR%%/catalog/view/theme/default/template/information/information.tpl
 %%WWWDIR%%/catalog/view/theme/default/template/information/sitemap.tpl
 %%WWWDIR%%/catalog/view/theme/default/template/mail/order.tpl
 %%WWWDIR%%/catalog/view/theme/default/template/mail/voucher.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/module/account.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/module/affiliate.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/module/amazon_login.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/module/amazon_pay.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/module/banner.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/module/bestseller.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/module/carousel.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/module/category.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/module/ebay_listing.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/module/featured.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/module/filter.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/module/google_hangouts.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/module/html.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/module/information.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/module/latest.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/module/laybuy_layout.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/module/pp_button.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/module/pp_login.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/module/sagepay_direct_cards.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/module/sagepay_server_cards.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/module/slideshow.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/module/special.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/module/store.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/amazon_login_pay_address.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/amazon_login_pay_confirm.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/amazon_login_pay_failure.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/amazon_login_pay_payment.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/authorizenet_aim.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/authorizenet_sim.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/bank_transfer.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/bluepay_hosted.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/bluepay_redirect.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/cardinity.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/cardinity_3ds.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/cheque.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/cod.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/eway.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/eway_iframe.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/firstdata.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/firstdata_remote.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/free_checkout.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/g2apay.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/globalpay.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/globalpay_remote.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/globalpay_response.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/klarna_account.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/klarna_invoice.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/laybuy.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/liqpay.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/nochex.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/paymate.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/paypoint.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/paypoint_failure.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/paypoint_success.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/payza.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/perpetual_payments.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/pp_express.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/pp_express_confirm.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/pp_payflow.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/pp_payflow_iframe.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/pp_payflow_iframe_return.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/pp_pro.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/pp_pro_iframe.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/pp_pro_iframe_body.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/pp_standard.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/realex.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/realex_remote.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/realex_response.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/sagepay_direct.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/sagepay_server.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/sagepay_us.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/securetrading_pp.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/securetrading_ws.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/skrill.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/twocheckout.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/web_payment_software.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/worldpay.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/worldpay_failure.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/payment/worldpay_success.tpl
 %%WWWDIR%%/catalog/view/theme/default/template/product/category.tpl
 %%WWWDIR%%/catalog/view/theme/default/template/product/compare.tpl
 %%WWWDIR%%/catalog/view/theme/default/template/product/manufacturer_info.tpl
@@ -1932,11 +2114,6 @@
 %%WWWDIR%%/catalog/view/theme/default/template/product/review.tpl
 %%WWWDIR%%/catalog/view/theme/default/template/product/search.tpl
 %%WWWDIR%%/catalog/view/theme/default/template/product/special.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/recurring/pp_express.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/total/coupon.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/total/reward.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/total/shipping.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/total/voucher.tpl
 %%WWWDIR%%/image/cache/index.html
 %%WWWDIR%%/image/catalog/cart.png
 %%WWWDIR%%/image/catalog/demo/apple_cinema_30.jpg
@@ -2043,245 +2220,44 @@
 %%WWWDIR%%/image/catalog/index.html
 %%WWWDIR%%/image/catalog/logo.png
 %%WWWDIR%%/image/catalog/opencart.ico
-%%WWWDIR%%/image/flags/ad.png
-%%WWWDIR%%/image/flags/ae.png
-%%WWWDIR%%/image/flags/af.png
-%%WWWDIR%%/image/flags/ag.png
-%%WWWDIR%%/image/flags/ai.png
-%%WWWDIR%%/image/flags/al.png
-%%WWWDIR%%/image/flags/am.png
-%%WWWDIR%%/image/flags/an.png
-%%WWWDIR%%/image/flags/ao.png
-%%WWWDIR%%/image/flags/ar.png
-%%WWWDIR%%/image/flags/as.png
-%%WWWDIR%%/image/flags/at.png
-%%WWWDIR%%/image/flags/au.png
-%%WWWDIR%%/image/flags/aw.png
-%%WWWDIR%%/image/flags/ax.png
-%%WWWDIR%%/image/flags/az.png
-%%WWWDIR%%/image/flags/ba.png
-%%WWWDIR%%/image/flags/bb.png
-%%WWWDIR%%/image/flags/bd.png
-%%WWWDIR%%/image/flags/be.png
-%%WWWDIR%%/image/flags/bf.png
-%%WWWDIR%%/image/flags/bg.png
-%%WWWDIR%%/image/flags/bh.png
-%%WWWDIR%%/image/flags/bi.png
-%%WWWDIR%%/image/flags/bj.png
-%%WWWDIR%%/image/flags/bm.png
-%%WWWDIR%%/image/flags/bn.png
-%%WWWDIR%%/image/flags/bo.png
-%%WWWDIR%%/image/flags/br.png
-%%WWWDIR%%/image/flags/bs.png
-%%WWWDIR%%/image/flags/bt.png
-%%WWWDIR%%/image/flags/bv.png
-%%WWWDIR%%/image/flags/bw.png
-%%WWWDIR%%/image/flags/by.png
-%%WWWDIR%%/image/flags/bz.png
-%%WWWDIR%%/image/flags/ca.png
-%%WWWDIR%%/image/flags/cc.png
-%%WWWDIR%%/image/flags/cd.png
-%%WWWDIR%%/image/flags/cf.png
-%%WWWDIR%%/image/flags/cg.png
-%%WWWDIR%%/image/flags/ch.png
-%%WWWDIR%%/image/flags/ci.png
-%%WWWDIR%%/image/flags/ck.png
-%%WWWDIR%%/image/flags/cl.png
-%%WWWDIR%%/image/flags/cm.png
-%%WWWDIR%%/image/flags/cn.png
-%%WWWDIR%%/image/flags/co.png
-%%WWWDIR%%/image/flags/cr.png
-%%WWWDIR%%/image/flags/cs.png
-%%WWWDIR%%/image/flags/cu.png
-%%WWWDIR%%/image/flags/cv.png
-%%WWWDIR%%/image/flags/cx.png
-%%WWWDIR%%/image/flags/cy.png
-%%WWWDIR%%/image/flags/cz.png
-%%WWWDIR%%/image/flags/de.png
-%%WWWDIR%%/image/flags/dj.png
-%%WWWDIR%%/image/flags/dk.png
-%%WWWDIR%%/image/flags/dm.png
-%%WWWDIR%%/image/flags/do.png
-%%WWWDIR%%/image/flags/dz.png
-%%WWWDIR%%/image/flags/ec.png
-%%WWWDIR%%/image/flags/ee.png
-%%WWWDIR%%/image/flags/eg.png
-%%WWWDIR%%/image/flags/eh.png
-%%WWWDIR%%/image/flags/england.png
-%%WWWDIR%%/image/flags/er.png
-%%WWWDIR%%/image/flags/es.png
-%%WWWDIR%%/image/flags/et.png
-%%WWWDIR%%/image/flags/fam.png
-%%WWWDIR%%/image/flags/fi.png
-%%WWWDIR%%/image/flags/fj.png
-%%WWWDIR%%/image/flags/fk.png
-%%WWWDIR%%/image/flags/fm.png
-%%WWWDIR%%/image/flags/fo.png
-%%WWWDIR%%/image/flags/fr.png
-%%WWWDIR%%/image/flags/ga.png
-%%WWWDIR%%/image/flags/gd.png
-%%WWWDIR%%/image/flags/ge.png
-%%WWWDIR%%/image/flags/gh.png
-%%WWWDIR%%/image/flags/gi.png
-%%WWWDIR%%/image/flags/gl.png
-%%WWWDIR%%/image/flags/gm.png
-%%WWWDIR%%/image/flags/gn.png
-%%WWWDIR%%/image/flags/gp.png
-%%WWWDIR%%/image/flags/gq.png
-%%WWWDIR%%/image/flags/gr.png
-%%WWWDIR%%/image/flags/gs.png
-%%WWWDIR%%/image/flags/gt.png
-%%WWWDIR%%/image/flags/gu.png
-%%WWWDIR%%/image/flags/gw.png
-%%WWWDIR%%/image/flags/gy.png
-%%WWWDIR%%/image/flags/hk.png
-%%WWWDIR%%/image/flags/hn.png
-%%WWWDIR%%/image/flags/hr.png
-%%WWWDIR%%/image/flags/ht.png
-%%WWWDIR%%/image/flags/hu.png
-%%WWWDIR%%/image/flags/id.png
-%%WWWDIR%%/image/flags/ie.png
-%%WWWDIR%%/image/flags/il.png
-%%WWWDIR%%/image/flags/in.png
-%%WWWDIR%%/image/flags/io.png
-%%WWWDIR%%/image/flags/iq.png
-%%WWWDIR%%/image/flags/ir.png
-%%WWWDIR%%/image/flags/is.png
-%%WWWDIR%%/image/flags/it.png
-%%WWWDIR%%/image/flags/jm.png
-%%WWWDIR%%/image/flags/jo.png
-%%WWWDIR%%/image/flags/jp.png
-%%WWWDIR%%/image/flags/ke.png
-%%WWWDIR%%/image/flags/kg.png
-%%WWWDIR%%/image/flags/kh.png
-%%WWWDIR%%/image/flags/ki.png
-%%WWWDIR%%/image/flags/km.png
-%%WWWDIR%%/image/flags/kn.png
-%%WWWDIR%%/image/flags/kp.png
-%%WWWDIR%%/image/flags/kr.png
-%%WWWDIR%%/image/flags/kw.png
-%%WWWDIR%%/image/flags/ky.png
-%%WWWDIR%%/image/flags/kz.png
-%%WWWDIR%%/image/flags/la.png
-%%WWWDIR%%/image/flags/lb.png
-%%WWWDIR%%/image/flags/lc.png
-%%WWWDIR%%/image/flags/li.png
-%%WWWDIR%%/image/flags/lk.png
-%%WWWDIR%%/image/flags/lr.png
-%%WWWDIR%%/image/flags/ls.png
-%%WWWDIR%%/image/flags/lt.png
-%%WWWDIR%%/image/flags/lu.png
-%%WWWDIR%%/image/flags/lv.png
-%%WWWDIR%%/image/flags/ly.png
-%%WWWDIR%%/image/flags/ma.png
-%%WWWDIR%%/image/flags/mc.png
-%%WWWDIR%%/image/flags/md.png
-%%WWWDIR%%/image/flags/mg.png
-%%WWWDIR%%/image/flags/mh.png
-%%WWWDIR%%/image/flags/mk.png
-%%WWWDIR%%/image/flags/ml.png
-%%WWWDIR%%/image/flags/mm.png
-%%WWWDIR%%/image/flags/mn.png
-%%WWWDIR%%/image/flags/mo.png
-%%WWWDIR%%/image/flags/mp.png
-%%WWWDIR%%/image/flags/mq.png
-%%WWWDIR%%/image/flags/mr.png
-%%WWWDIR%%/image/flags/ms.png
-%%WWWDIR%%/image/flags/mt.png
-%%WWWDIR%%/image/flags/mu.png
-%%WWWDIR%%/image/flags/mv.png
-%%WWWDIR%%/image/flags/mw.png
-%%WWWDIR%%/image/flags/mx.png
-%%WWWDIR%%/image/flags/my.png
-%%WWWDIR%%/image/flags/mz.png
-%%WWWDIR%%/image/flags/na.png
-%%WWWDIR%%/image/flags/nc.png
-%%WWWDIR%%/image/flags/ne.png
-%%WWWDIR%%/image/flags/nf.png
-%%WWWDIR%%/image/flags/ng.png
-%%WWWDIR%%/image/flags/ni.png
-%%WWWDIR%%/image/flags/nl.png
-%%WWWDIR%%/image/flags/no.png
-%%WWWDIR%%/image/flags/np.png
-%%WWWDIR%%/image/flags/nr.png
-%%WWWDIR%%/image/flags/nu.png
-%%WWWDIR%%/image/flags/nz.png
-%%WWWDIR%%/image/flags/om.png
-%%WWWDIR%%/image/flags/pa.png
-%%WWWDIR%%/image/flags/pe.png
-%%WWWDIR%%/image/flags/pf.png
-%%WWWDIR%%/image/flags/pg.png
-%%WWWDIR%%/image/flags/ph.png
-%%WWWDIR%%/image/flags/pk.png
-%%WWWDIR%%/image/flags/pl.png
-%%WWWDIR%%/image/flags/pm.png
-%%WWWDIR%%/image/flags/pn.png
-%%WWWDIR%%/image/flags/pr.png
-%%WWWDIR%%/image/flags/ps.png
-%%WWWDIR%%/image/flags/pt.png
-%%WWWDIR%%/image/flags/pw.png
-%%WWWDIR%%/image/flags/py.png
-%%WWWDIR%%/image/flags/qa.png
-%%WWWDIR%%/image/flags/ro.png
-%%WWWDIR%%/image/flags/ru.png
-%%WWWDIR%%/image/flags/rw.png
-%%WWWDIR%%/image/flags/sa.png
-%%WWWDIR%%/image/flags/sb.png
-%%WWWDIR%%/image/flags/sc.png
-%%WWWDIR%%/image/flags/scotland.png
-%%WWWDIR%%/image/flags/sd.png
-%%WWWDIR%%/image/flags/se.png
-%%WWWDIR%%/image/flags/sg.png
-%%WWWDIR%%/image/flags/sh.png
-%%WWWDIR%%/image/flags/si.png
-%%WWWDIR%%/image/flags/sk.png
-%%WWWDIR%%/image/flags/sl.png
-%%WWWDIR%%/image/flags/sm.png
-%%WWWDIR%%/image/flags/sn.png
-%%WWWDIR%%/image/flags/so.png
-%%WWWDIR%%/image/flags/sr.png
-%%WWWDIR%%/image/flags/st.png
-%%WWWDIR%%/image/flags/sv.png
-%%WWWDIR%%/image/flags/sy.png
-%%WWWDIR%%/image/flags/sz.png
-%%WWWDIR%%/image/flags/tc.png
-%%WWWDIR%%/image/flags/td.png
-%%WWWDIR%%/image/flags/tf.png
-%%WWWDIR%%/image/flags/tg.png
-%%WWWDIR%%/image/flags/th.png
-%%WWWDIR%%/image/flags/tj.png
-%%WWWDIR%%/image/flags/tk.png
-%%WWWDIR%%/image/flags/tl.png
-%%WWWDIR%%/image/flags/tm.png
-%%WWWDIR%%/image/flags/tn.png
-%%WWWDIR%%/image/flags/to.png
-%%WWWDIR%%/image/flags/tr.png
-%%WWWDIR%%/image/flags/tt.png
-%%WWWDIR%%/image/flags/tv.png
-%%WWWDIR%%/image/flags/tw.png
-%%WWWDIR%%/image/flags/tz.png
-%%WWWDIR%%/image/flags/ua.png
-%%WWWDIR%%/image/flags/ug.png
-%%WWWDIR%%/image/flags/um.png
-%%WWWDIR%%/image/flags/us.png
-%%WWWDIR%%/image/flags/uy.png
-%%WWWDIR%%/image/flags/uz.png
-%%WWWDIR%%/image/flags/va.png
-%%WWWDIR%%/image/flags/vc.png
-%%WWWDIR%%/image/flags/ve.png
-%%WWWDIR%%/image/flags/vg.png
-%%WWWDIR%%/image/flags/vi.png
-%%WWWDIR%%/image/flags/vn.png
-%%WWWDIR%%/image/flags/vu.png
-%%WWWDIR%%/image/flags/wales.png
-%%WWWDIR%%/image/flags/wf.png
-%%WWWDIR%%/image/flags/ws.png
-%%WWWDIR%%/image/flags/ye.png
-%%WWWDIR%%/image/flags/yt.png
-%%WWWDIR%%/image/flags/za.png
-%%WWWDIR%%/image/flags/zm.png
-%%WWWDIR%%/image/flags/zw.png
 %%WWWDIR%%/image/no_image.png
+%%WWWDIR%%/image/payment/panasia/PanAsiaPayment_logo.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/PanAsiaPayment_logo.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/abc.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/b1065.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/b1504.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/b1532.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/b1535.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/b1541.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/b1543.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/b1547.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/b1613.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/b1641.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/bob.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/boc.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/bos.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/cbhb.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/ccb.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/ceb.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/cgb.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/cib.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/citic.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/cmb.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/cmbc.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/comm.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/czbank.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/egb.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/hkbea.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/hxb.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/icbc.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/logo_vbank.png
+%%WWWDIR%%/image/payment/panasia/bank-images/nb_unionpay.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/nbcb.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/pingan.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/psbc.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/smartpay.png
+%%WWWDIR%%/image/payment/panasia/bank-images/spdb.jpg
+%%WWWDIR%%/image/payment/panasia/bank-images/unionpay.jpg
 %%WWWDIR%%/image/placeholder.png
 %%WWWDIR%%/index.php
 %%WWWDIR%%/install/cli_install.php
@@ -2324,6 +2300,7 @@
 %%WWWDIR%%/install/model/upgrade/1005.php
 %%WWWDIR%%/install/model/upgrade/1006.php
 %%WWWDIR%%/install/model/upgrade/1007.php
+%%WWWDIR%%/install/model/upgrade/1008.php
 %%WWWDIR%%/install/opencart.sql
 %%WWWDIR%%/install/php.ini
 %%WWWDIR%%/install/view/image/amazon.png
@@ -2395,6 +2372,7 @@
 %%WWWDIR%%/install/view/template/install/step_4.tpl
 %%WWWDIR%%/install/view/template/upgrade/upgrade.tpl
 %%WWWDIR%%/php.ini
+%%WWWDIR%%/system/.htaccess
 %%WWWDIR%%/system/config/admin.php
 %%WWWDIR%%/system/config/catalog.php
 %%WWWDIR%%/system/config/default.php
@@ -2410,10 +2388,8 @@
 %%WWWDIR%%/system/engine/registry.php
 %%WWWDIR%%/system/framework.php
 %%WWWDIR%%/system/helper/general.php
-%%WWWDIR%%/system/helper/hash_equals.php
 %%WWWDIR%%/system/helper/json.php
 %%WWWDIR%%/system/helper/utf8.php
-%%WWWDIR%%/system/helper/vat.php
 %%WWWDIR%%/system/library/cache.php
 %%WWWDIR%%/system/library/cache/apc.php
 %%WWWDIR%%/system/library/cache/file.php
@@ -2451,8 +2427,10 @@
 %%WWWDIR%%/system/library/session.php
 %%WWWDIR%%/system/library/session/db.php
 %%WWWDIR%%/system/library/session/file.php
+%%WWWDIR%%/system/library/session/native.php
 %%WWWDIR%%/system/library/template.php
-%%WWWDIR%%/system/library/template/basic.php
+%%WWWDIR%%/system/library/template/php.php
+%%WWWDIR%%/system/library/template/tiwg.php
 %%WWWDIR%%/system/library/url.php
 %%WWWDIR%%/system/modification.xml
 %%WWWDIR%%/system/startup.php