3 files changed, 609 insertions, 673 deletions

diff --git a/www/opencart/Makefile b/www/opencart/Makefile
index e19a28f541c7..f28166307fb5 100644
--- a/www/opencart/Makefile
+++ b/www/opencart/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	opencart
-PORTVERSION=	2.1.0.2
+PORTVERSION=	2.2.0.0
 CATEGORIES=	www misc
 
 MAINTAINER=	wen@FreeBSD.org
@@ -19,8 +19,6 @@ WRKSRC_SUBDIR=	upload
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	${MV} ${WRKSRC}/config-dist.php ${WRKSRC}/config.php
 	${MV} ${WRKSRC}/admin/config-dist.php ${WRKSRC}/admin/config.php
@@ -28,4 +26,4 @@ post-patch:
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/opencart/distinfo b/www/opencart/distinfo
index 9e92e8cda1b9..6617a98637eb 100644
--- a/www/opencart/distinfo
+++ b/www/opencart/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opencart-opencart-2.1.0.2_GH0.tar.gz) = 927bbcd90d79d43737e38144f8b20a3aa68981d5bf7086e21d0f6e122f22a8cd
-SIZE (opencart-opencart-2.1.0.2_GH0.tar.gz) = 10692089
+SHA256 (opencart-opencart-2.2.0.0_GH0.tar.gz) = d6109eb72dc88b231007a24a0f93558e377b2c03f5a4aa573da707e5c984182c
+SIZE (opencart-opencart-2.2.0.0_GH0.tar.gz) = 10690543
diff --git a/www/opencart/pkg-plist b/www/opencart/pkg-plist
index c22e085bd5b2..8d4cefe8405a 100644
--- a/www/opencart/pkg-plist
+++ b/www/opencart/pkg-plist
@@ -24,7 +24,6 @@
 %%WWWDIR%%/admin/controller/common/menu.php
 %%WWWDIR%%/admin/controller/common/profile.php
 %%WWWDIR%%/admin/controller/common/reset.php
-%%WWWDIR%%/admin/controller/common/sass.php
 %%WWWDIR%%/admin/controller/common/stats.php
 %%WWWDIR%%/admin/controller/customer/custom_field.php
 %%WWWDIR%%/admin/controller/customer/customer.php
@@ -38,9 +37,12 @@
 %%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/theme.php
 %%WWWDIR%%/admin/controller/error/not_found.php
 %%WWWDIR%%/admin/controller/error/permission.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
@@ -51,6 +53,7 @@
 %%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
@@ -92,8 +95,11 @@
 %%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
@@ -110,14 +116,17 @@
 %%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
@@ -126,6 +135,7 @@
 %%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
@@ -185,6 +195,14 @@
 %%WWWDIR%%/admin/controller/shipping/ups.php
 %%WWWDIR%%/admin/controller/shipping/usps.php
 %%WWWDIR%%/admin/controller/shipping/weight.php
+%%WWWDIR%%/admin/controller/startup/error.php
+%%WWWDIR%%/admin/controller/startup/event.php
+%%WWWDIR%%/admin/controller/startup/login.php
+%%WWWDIR%%/admin/controller/startup/permission.php
+%%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/upload.php
@@ -203,240 +221,254 @@
 %%WWWDIR%%/admin/controller/user/user.php
 %%WWWDIR%%/admin/controller/user/user_permission.php
 %%WWWDIR%%/admin/index.php
-%%WWWDIR%%/admin/language/english/analytics/google_analytics.php
-%%WWWDIR%%/admin/language/english/captcha/basic_captcha.php
-%%WWWDIR%%/admin/language/english/captcha/google_captcha.php
-%%WWWDIR%%/admin/language/english/catalog/attribute.php
-%%WWWDIR%%/admin/language/english/catalog/attribute_group.php
-%%WWWDIR%%/admin/language/english/catalog/category.php
-%%WWWDIR%%/admin/language/english/catalog/download.php
-%%WWWDIR%%/admin/language/english/catalog/filter.php
-%%WWWDIR%%/admin/language/english/catalog/information.php
-%%WWWDIR%%/admin/language/english/catalog/manufacturer.php
-%%WWWDIR%%/admin/language/english/catalog/option.php
-%%WWWDIR%%/admin/language/english/catalog/product.php
-%%WWWDIR%%/admin/language/english/catalog/recurring.php
-%%WWWDIR%%/admin/language/english/catalog/review.php
-%%WWWDIR%%/admin/language/english/common/dashboard.php
-%%WWWDIR%%/admin/language/english/common/filemanager.php
-%%WWWDIR%%/admin/language/english/common/footer.php
-%%WWWDIR%%/admin/language/english/common/forgotten.php
-%%WWWDIR%%/admin/language/english/common/header.php
-%%WWWDIR%%/admin/language/english/common/login.php
-%%WWWDIR%%/admin/language/english/common/menu.php
-%%WWWDIR%%/admin/language/english/common/reset.php
-%%WWWDIR%%/admin/language/english/common/stats.php
-%%WWWDIR%%/admin/language/english/customer/custom_field.php
-%%WWWDIR%%/admin/language/english/customer/customer.php
-%%WWWDIR%%/admin/language/english/customer/customer_group.php
-%%WWWDIR%%/admin/language/english/dashboard/activity.php
-%%WWWDIR%%/admin/language/english/dashboard/chart.php
-%%WWWDIR%%/admin/language/english/dashboard/customer.php
-%%WWWDIR%%/admin/language/english/dashboard/map.php
-%%WWWDIR%%/admin/language/english/dashboard/online.php
-%%WWWDIR%%/admin/language/english/dashboard/order.php
-%%WWWDIR%%/admin/language/english/dashboard/recent.php
-%%WWWDIR%%/admin/language/english/dashboard/sale.php
-%%WWWDIR%%/admin/language/english/design/banner.php
-%%WWWDIR%%/admin/language/english/design/layout.php
-%%WWWDIR%%/admin/language/english/english.php
-%%WWWDIR%%/admin/language/english/error/not_found.php
-%%WWWDIR%%/admin/language/english/error/permission.php
-%%WWWDIR%%/admin/language/english/extension/analytics.php
-%%WWWDIR%%/admin/language/english/extension/captcha.php
-%%WWWDIR%%/admin/language/english/extension/feed.php
-%%WWWDIR%%/admin/language/english/extension/fraud.php
-%%WWWDIR%%/admin/language/english/extension/installer.php
-%%WWWDIR%%/admin/language/english/extension/modification.php
-%%WWWDIR%%/admin/language/english/extension/module.php
-%%WWWDIR%%/admin/language/english/extension/openbay.php
-%%WWWDIR%%/admin/language/english/extension/payment.php
-%%WWWDIR%%/admin/language/english/extension/shipping.php
-%%WWWDIR%%/admin/language/english/extension/total.php
-%%WWWDIR%%/admin/language/english/feed/google_base.php
-%%WWWDIR%%/admin/language/english/feed/google_sitemap.php
-%%WWWDIR%%/admin/language/english/feed/openbaypro.php
-%%WWWDIR%%/admin/language/english/fraud/fraudlabspro.php
-%%WWWDIR%%/admin/language/english/fraud/ip.php
-%%WWWDIR%%/admin/language/english/fraud/maxmind.php
-%%WWWDIR%%/admin/language/english/localisation/country.php
-%%WWWDIR%%/admin/language/english/localisation/currency.php
-%%WWWDIR%%/admin/language/english/localisation/geo_zone.php
-%%WWWDIR%%/admin/language/english/localisation/language.php
-%%WWWDIR%%/admin/language/english/localisation/length_class.php
-%%WWWDIR%%/admin/language/english/localisation/location.php
-%%WWWDIR%%/admin/language/english/localisation/order_status.php
-%%WWWDIR%%/admin/language/english/localisation/return_action.php
-%%WWWDIR%%/admin/language/english/localisation/return_reason.php
-%%WWWDIR%%/admin/language/english/localisation/return_status.php
-%%WWWDIR%%/admin/language/english/localisation/stock_status.php
-%%WWWDIR%%/admin/language/english/localisation/tax_class.php
-%%WWWDIR%%/admin/language/english/localisation/tax_rate.php
-%%WWWDIR%%/admin/language/english/localisation/weight_class.php
-%%WWWDIR%%/admin/language/english/localisation/zone.php
-%%WWWDIR%%/admin/language/english/mail/affiliate.php
-%%WWWDIR%%/admin/language/english/mail/customer.php
-%%WWWDIR%%/admin/language/english/mail/forgotten.php
-%%WWWDIR%%/admin/language/english/mail/return.php
-%%WWWDIR%%/admin/language/english/mail/voucher.php
-%%WWWDIR%%/admin/language/english/marketing/affiliate.php
-%%WWWDIR%%/admin/language/english/marketing/contact.php
-%%WWWDIR%%/admin/language/english/marketing/coupon.php
-%%WWWDIR%%/admin/language/english/marketing/marketing.php
-%%WWWDIR%%/admin/language/english/module/account.php
-%%WWWDIR%%/admin/language/english/module/affiliate.php
-%%WWWDIR%%/admin/language/english/module/amazon_login.php
-%%WWWDIR%%/admin/language/english/module/amazon_pay.php
-%%WWWDIR%%/admin/language/english/module/banner.php
-%%WWWDIR%%/admin/language/english/module/bestseller.php
-%%WWWDIR%%/admin/language/english/module/carousel.php
-%%WWWDIR%%/admin/language/english/module/category.php
-%%WWWDIR%%/admin/language/english/module/ebay_listing.php
-%%WWWDIR%%/admin/language/english/module/featured.php
-%%WWWDIR%%/admin/language/english/module/filter.php
-%%WWWDIR%%/admin/language/english/module/google_hangouts.php
-%%WWWDIR%%/admin/language/english/module/html.php
-%%WWWDIR%%/admin/language/english/module/information.php
-%%WWWDIR%%/admin/language/english/module/latest.php
-%%WWWDIR%%/admin/language/english/module/pp_button.php
-%%WWWDIR%%/admin/language/english/module/pp_login.php
-%%WWWDIR%%/admin/language/english/module/slideshow.php
-%%WWWDIR%%/admin/language/english/module/special.php
-%%WWWDIR%%/admin/language/english/module/store.php
-%%WWWDIR%%/admin/language/english/openbay/amazon.php
-%%WWWDIR%%/admin/language/english/openbay/amazon_bulk_linking.php
-%%WWWDIR%%/admin/language/english/openbay/amazon_bulk_listing.php
-%%WWWDIR%%/admin/language/english/openbay/amazon_links.php
-%%WWWDIR%%/admin/language/english/openbay/amazon_listing.php
-%%WWWDIR%%/admin/language/english/openbay/amazon_listingsaved.php
-%%WWWDIR%%/admin/language/english/openbay/amazon_settings.php
-%%WWWDIR%%/admin/language/english/openbay/amazon_stockupdates.php
-%%WWWDIR%%/admin/language/english/openbay/amazon_subscription.php
-%%WWWDIR%%/admin/language/english/openbay/amazonus.php
-%%WWWDIR%%/admin/language/english/openbay/amazonus_bulk_linking.php
-%%WWWDIR%%/admin/language/english/openbay/amazonus_bulk_listing.php
-%%WWWDIR%%/admin/language/english/openbay/amazonus_links.php
-%%WWWDIR%%/admin/language/english/openbay/amazonus_listing.php
-%%WWWDIR%%/admin/language/english/openbay/amazonus_listingsaved.php
-%%WWWDIR%%/admin/language/english/openbay/amazonus_settings.php
-%%WWWDIR%%/admin/language/english/openbay/amazonus_stockupdates.php
-%%WWWDIR%%/admin/language/english/openbay/amazonus_subscription.php
-%%WWWDIR%%/admin/language/english/openbay/ebay.php
-%%WWWDIR%%/admin/language/english/openbay/ebay_edit.php
-%%WWWDIR%%/admin/language/english/openbay/ebay_import.php
-%%WWWDIR%%/admin/language/english/openbay/ebay_links.php
-%%WWWDIR%%/admin/language/english/openbay/ebay_new.php
-%%WWWDIR%%/admin/language/english/openbay/ebay_newbulk.php
-%%WWWDIR%%/admin/language/english/openbay/ebay_orders.php
-%%WWWDIR%%/admin/language/english/openbay/ebay_profile.php
-%%WWWDIR%%/admin/language/english/openbay/ebay_settings.php
-%%WWWDIR%%/admin/language/english/openbay/ebay_subscription.php
-%%WWWDIR%%/admin/language/english/openbay/ebay_summary.php
-%%WWWDIR%%/admin/language/english/openbay/ebay_syncronise.php
-%%WWWDIR%%/admin/language/english/openbay/ebay_template.php
-%%WWWDIR%%/admin/language/english/openbay/ebay_usage.php
-%%WWWDIR%%/admin/language/english/openbay/etsy.php
-%%WWWDIR%%/admin/language/english/openbay/etsy_create.php
-%%WWWDIR%%/admin/language/english/openbay/etsy_edit.php
-%%WWWDIR%%/admin/language/english/openbay/etsy_links.php
-%%WWWDIR%%/admin/language/english/openbay/etsy_listings.php
-%%WWWDIR%%/admin/language/english/openbay/etsy_settings.php
-%%WWWDIR%%/admin/language/english/openbay/openbay_itemlist.php
-%%WWWDIR%%/admin/language/english/openbay/openbay_order.php
-%%WWWDIR%%/admin/language/english/payment/amazon_login_pay.php
-%%WWWDIR%%/admin/language/english/payment/authorizenet_aim.php
-%%WWWDIR%%/admin/language/english/payment/authorizenet_sim.php
-%%WWWDIR%%/admin/language/english/payment/bank_transfer.php
-%%WWWDIR%%/admin/language/english/payment/bluepay_hosted.php
-%%WWWDIR%%/admin/language/english/payment/bluepay_redirect.php
-%%WWWDIR%%/admin/language/english/payment/cheque.php
-%%WWWDIR%%/admin/language/english/payment/cod.php
-%%WWWDIR%%/admin/language/english/payment/firstdata.php
-%%WWWDIR%%/admin/language/english/payment/firstdata_remote.php
-%%WWWDIR%%/admin/language/english/payment/free_checkout.php
-%%WWWDIR%%/admin/language/english/payment/g2apay.php
-%%WWWDIR%%/admin/language/english/payment/globalpay.php
-%%WWWDIR%%/admin/language/english/payment/globalpay_remote.php
-%%WWWDIR%%/admin/language/english/payment/klarna_account.php
-%%WWWDIR%%/admin/language/english/payment/klarna_invoice.php
-%%WWWDIR%%/admin/language/english/payment/liqpay.php
-%%WWWDIR%%/admin/language/english/payment/nochex.php
-%%WWWDIR%%/admin/language/english/payment/paymate.php
-%%WWWDIR%%/admin/language/english/payment/paypoint.php
-%%WWWDIR%%/admin/language/english/payment/payza.php
-%%WWWDIR%%/admin/language/english/payment/perpetual_payments.php
-%%WWWDIR%%/admin/language/english/payment/pp_express.php
-%%WWWDIR%%/admin/language/english/payment/pp_express_order.php
-%%WWWDIR%%/admin/language/english/payment/pp_express_refund.php
-%%WWWDIR%%/admin/language/english/payment/pp_express_search.php
-%%WWWDIR%%/admin/language/english/payment/pp_express_view.php
-%%WWWDIR%%/admin/language/english/payment/pp_payflow.php
-%%WWWDIR%%/admin/language/english/payment/pp_payflow_iframe.php
-%%WWWDIR%%/admin/language/english/payment/pp_pro.php
-%%WWWDIR%%/admin/language/english/payment/pp_pro_iframe.php
-%%WWWDIR%%/admin/language/english/payment/pp_standard.php
-%%WWWDIR%%/admin/language/english/payment/realex.php
-%%WWWDIR%%/admin/language/english/payment/realex_remote.php
-%%WWWDIR%%/admin/language/english/payment/sagepay_direct.php
-%%WWWDIR%%/admin/language/english/payment/sagepay_server.php
-%%WWWDIR%%/admin/language/english/payment/sagepay_us.php
-%%WWWDIR%%/admin/language/english/payment/securetrading_pp.php
-%%WWWDIR%%/admin/language/english/payment/securetrading_ws.php
-%%WWWDIR%%/admin/language/english/payment/skrill.php
-%%WWWDIR%%/admin/language/english/payment/twocheckout.php
-%%WWWDIR%%/admin/language/english/payment/web_payment_software.php
-%%WWWDIR%%/admin/language/english/payment/worldpay.php
-%%WWWDIR%%/admin/language/english/report/affiliate.php
-%%WWWDIR%%/admin/language/english/report/affiliate_activity.php
-%%WWWDIR%%/admin/language/english/report/customer_activity.php
-%%WWWDIR%%/admin/language/english/report/customer_credit.php
-%%WWWDIR%%/admin/language/english/report/customer_online.php
-%%WWWDIR%%/admin/language/english/report/customer_order.php
-%%WWWDIR%%/admin/language/english/report/customer_reward.php
-%%WWWDIR%%/admin/language/english/report/marketing.php
-%%WWWDIR%%/admin/language/english/report/product_purchased.php
-%%WWWDIR%%/admin/language/english/report/product_viewed.php
-%%WWWDIR%%/admin/language/english/report/sale_coupon.php
-%%WWWDIR%%/admin/language/english/report/sale_order.php
-%%WWWDIR%%/admin/language/english/report/sale_return.php
-%%WWWDIR%%/admin/language/english/report/sale_shipping.php
-%%WWWDIR%%/admin/language/english/report/sale_tax.php
-%%WWWDIR%%/admin/language/english/sale/order.php
-%%WWWDIR%%/admin/language/english/sale/recurring.php
-%%WWWDIR%%/admin/language/english/sale/return.php
-%%WWWDIR%%/admin/language/english/sale/voucher.php
-%%WWWDIR%%/admin/language/english/sale/voucher_theme.php
-%%WWWDIR%%/admin/language/english/setting/setting.php
-%%WWWDIR%%/admin/language/english/setting/store.php
-%%WWWDIR%%/admin/language/english/shipping/auspost.php
-%%WWWDIR%%/admin/language/english/shipping/citylink.php
-%%WWWDIR%%/admin/language/english/shipping/fedex.php
-%%WWWDIR%%/admin/language/english/shipping/flat.php
-%%WWWDIR%%/admin/language/english/shipping/free.php
-%%WWWDIR%%/admin/language/english/shipping/item.php
-%%WWWDIR%%/admin/language/english/shipping/parcelforce_48.php
-%%WWWDIR%%/admin/language/english/shipping/pickup.php
-%%WWWDIR%%/admin/language/english/shipping/royal_mail.php
-%%WWWDIR%%/admin/language/english/shipping/ups.php
-%%WWWDIR%%/admin/language/english/shipping/usps.php
-%%WWWDIR%%/admin/language/english/shipping/weight.php
-%%WWWDIR%%/admin/language/english/tool/backup.php
-%%WWWDIR%%/admin/language/english/tool/error_log.php
-%%WWWDIR%%/admin/language/english/tool/upload.php
-%%WWWDIR%%/admin/language/english/total/coupon.php
-%%WWWDIR%%/admin/language/english/total/credit.php
-%%WWWDIR%%/admin/language/english/total/handling.php
-%%WWWDIR%%/admin/language/english/total/klarna_fee.php
-%%WWWDIR%%/admin/language/english/total/low_order_fee.php
-%%WWWDIR%%/admin/language/english/total/reward.php
-%%WWWDIR%%/admin/language/english/total/shipping.php
-%%WWWDIR%%/admin/language/english/total/sub_total.php
-%%WWWDIR%%/admin/language/english/total/tax.php
-%%WWWDIR%%/admin/language/english/total/total.php
-%%WWWDIR%%/admin/language/english/total/voucher.php
-%%WWWDIR%%/admin/language/english/user/api.php
-%%WWWDIR%%/admin/language/english/user/user.php
-%%WWWDIR%%/admin/language/english/user/user_group.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
+%%WWWDIR%%/admin/language/en-gb/catalog/download.php
+%%WWWDIR%%/admin/language/en-gb/catalog/filter.php
+%%WWWDIR%%/admin/language/en-gb/catalog/information.php
+%%WWWDIR%%/admin/language/en-gb/catalog/manufacturer.php
+%%WWWDIR%%/admin/language/en-gb/catalog/option.php
+%%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/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/layout.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/installer.php
+%%WWWDIR%%/admin/language/en-gb/extension/modification.php
+%%WWWDIR%%/admin/language/en-gb/extension/module.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/localisation/country.php
+%%WWWDIR%%/admin/language/en-gb/localisation/currency.php
+%%WWWDIR%%/admin/language/en-gb/localisation/geo_zone.php
+%%WWWDIR%%/admin/language/en-gb/localisation/language.php
+%%WWWDIR%%/admin/language/en-gb/localisation/length_class.php
+%%WWWDIR%%/admin/language/en-gb/localisation/location.php
+%%WWWDIR%%/admin/language/en-gb/localisation/order_status.php
+%%WWWDIR%%/admin/language/en-gb/localisation/return_action.php
+%%WWWDIR%%/admin/language/en-gb/localisation/return_reason.php
+%%WWWDIR%%/admin/language/en-gb/localisation/return_status.php
+%%WWWDIR%%/admin/language/en-gb/localisation/stock_status.php
+%%WWWDIR%%/admin/language/en-gb/localisation/tax_class.php
+%%WWWDIR%%/admin/language/en-gb/localisation/tax_rate.php
+%%WWWDIR%%/admin/language/en-gb/localisation/weight_class.php
+%%WWWDIR%%/admin/language/en-gb/localisation/zone.php
+%%WWWDIR%%/admin/language/en-gb/mail/affiliate.php
+%%WWWDIR%%/admin/language/en-gb/mail/customer.php
+%%WWWDIR%%/admin/language/en-gb/mail/forgotten.php
+%%WWWDIR%%/admin/language/en-gb/mail/return.php
+%%WWWDIR%%/admin/language/en-gb/mail/voucher.php
+%%WWWDIR%%/admin/language/en-gb/marketing/affiliate.php
+%%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
+%%WWWDIR%%/admin/language/en-gb/report/customer_credit.php
+%%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/marketing.php
+%%WWWDIR%%/admin/language/en-gb/report/product_purchased.php
+%%WWWDIR%%/admin/language/en-gb/report/product_viewed.php
+%%WWWDIR%%/admin/language/en-gb/report/sale_coupon.php
+%%WWWDIR%%/admin/language/en-gb/report/sale_order.php
+%%WWWDIR%%/admin/language/en-gb/report/sale_return.php
+%%WWWDIR%%/admin/language/en-gb/report/sale_shipping.php
+%%WWWDIR%%/admin/language/en-gb/report/sale_tax.php
+%%WWWDIR%%/admin/language/en-gb/sale/order.php
+%%WWWDIR%%/admin/language/en-gb/sale/recurring.php
+%%WWWDIR%%/admin/language/en-gb/sale/return.php
+%%WWWDIR%%/admin/language/en-gb/sale/voucher.php
+%%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/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
 %%WWWDIR%%/admin/model/catalog/attribute.php
 %%WWWDIR%%/admin/model/catalog/attribute_group.php
 %%WWWDIR%%/admin/model/catalog/category.php
@@ -490,17 +522,21 @@
 %%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
@@ -534,254 +570,19 @@
 %%WWWDIR%%/admin/model/user/user_group.php
 %%WWWDIR%%/admin/php.ini
 %%WWWDIR%%/admin/view/image/checkmark.png
-%%WWWDIR%%/admin/view/image/flags/ad.png
-%%WWWDIR%%/admin/view/image/flags/ae.png
-%%WWWDIR%%/admin/view/image/flags/af.png
-%%WWWDIR%%/admin/view/image/flags/ag.png
-%%WWWDIR%%/admin/view/image/flags/ai.png
-%%WWWDIR%%/admin/view/image/flags/al.png
-%%WWWDIR%%/admin/view/image/flags/am.png
-%%WWWDIR%%/admin/view/image/flags/an.png
-%%WWWDIR%%/admin/view/image/flags/ao.png
-%%WWWDIR%%/admin/view/image/flags/ar.png
-%%WWWDIR%%/admin/view/image/flags/as.png
-%%WWWDIR%%/admin/view/image/flags/at.png
-%%WWWDIR%%/admin/view/image/flags/au.png
-%%WWWDIR%%/admin/view/image/flags/aw.png
-%%WWWDIR%%/admin/view/image/flags/ax.png
-%%WWWDIR%%/admin/view/image/flags/az.png
-%%WWWDIR%%/admin/view/image/flags/ba.png
-%%WWWDIR%%/admin/view/image/flags/bb.png
-%%WWWDIR%%/admin/view/image/flags/bd.png
-%%WWWDIR%%/admin/view/image/flags/be.png
-%%WWWDIR%%/admin/view/image/flags/bf.png
-%%WWWDIR%%/admin/view/image/flags/bg.png
-%%WWWDIR%%/admin/view/image/flags/bh.png
-%%WWWDIR%%/admin/view/image/flags/bi.png
-%%WWWDIR%%/admin/view/image/flags/bj.png
-%%WWWDIR%%/admin/view/image/flags/bm.png
-%%WWWDIR%%/admin/view/image/flags/bn.png
-%%WWWDIR%%/admin/view/image/flags/bo.png
-%%WWWDIR%%/admin/view/image/flags/br.png
-%%WWWDIR%%/admin/view/image/flags/bs.png
-%%WWWDIR%%/admin/view/image/flags/bt.png
-%%WWWDIR%%/admin/view/image/flags/bv.png
-%%WWWDIR%%/admin/view/image/flags/bw.png
-%%WWWDIR%%/admin/view/image/flags/by.png
-%%WWWDIR%%/admin/view/image/flags/bz.png
-%%WWWDIR%%/admin/view/image/flags/ca.png
-%%WWWDIR%%/admin/view/image/flags/cc.png
-%%WWWDIR%%/admin/view/image/flags/cd.png
-%%WWWDIR%%/admin/view/image/flags/cf.png
-%%WWWDIR%%/admin/view/image/flags/cg.png
-%%WWWDIR%%/admin/view/image/flags/ch.png
-%%WWWDIR%%/admin/view/image/flags/ci.png
-%%WWWDIR%%/admin/view/image/flags/ck.png
-%%WWWDIR%%/admin/view/image/flags/cl.png
-%%WWWDIR%%/admin/view/image/flags/cm.png
-%%WWWDIR%%/admin/view/image/flags/cn.png
-%%WWWDIR%%/admin/view/image/flags/co.png
-%%WWWDIR%%/admin/view/image/flags/cr.png
-%%WWWDIR%%/admin/view/image/flags/cs.png
-%%WWWDIR%%/admin/view/image/flags/cu.png
-%%WWWDIR%%/admin/view/image/flags/cv.png
-%%WWWDIR%%/admin/view/image/flags/cx.png
-%%WWWDIR%%/admin/view/image/flags/cy.png
-%%WWWDIR%%/admin/view/image/flags/cz.png
-%%WWWDIR%%/admin/view/image/flags/de.png
-%%WWWDIR%%/admin/view/image/flags/dj.png
-%%WWWDIR%%/admin/view/image/flags/dk.png
-%%WWWDIR%%/admin/view/image/flags/dm.png
-%%WWWDIR%%/admin/view/image/flags/do.png
-%%WWWDIR%%/admin/view/image/flags/dz.png
-%%WWWDIR%%/admin/view/image/flags/ec.png
-%%WWWDIR%%/admin/view/image/flags/ee.png
-%%WWWDIR%%/admin/view/image/flags/eg.png
-%%WWWDIR%%/admin/view/image/flags/eh.png
-%%WWWDIR%%/admin/view/image/flags/england.png
-%%WWWDIR%%/admin/view/image/flags/er.png
-%%WWWDIR%%/admin/view/image/flags/es.png
-%%WWWDIR%%/admin/view/image/flags/et.png
-%%WWWDIR%%/admin/view/image/flags/fam.png
-%%WWWDIR%%/admin/view/image/flags/fi.png
-%%WWWDIR%%/admin/view/image/flags/fj.png
-%%WWWDIR%%/admin/view/image/flags/fk.png
-%%WWWDIR%%/admin/view/image/flags/fm.png
-%%WWWDIR%%/admin/view/image/flags/fo.png
-%%WWWDIR%%/admin/view/image/flags/fr.png
-%%WWWDIR%%/admin/view/image/flags/ga.png
-%%WWWDIR%%/admin/view/image/flags/gb.png
-%%WWWDIR%%/admin/view/image/flags/gd.png
-%%WWWDIR%%/admin/view/image/flags/ge.png
-%%WWWDIR%%/admin/view/image/flags/gh.png
-%%WWWDIR%%/admin/view/image/flags/gi.png
-%%WWWDIR%%/admin/view/image/flags/gl.png
-%%WWWDIR%%/admin/view/image/flags/gm.png
-%%WWWDIR%%/admin/view/image/flags/gn.png
-%%WWWDIR%%/admin/view/image/flags/gp.png
-%%WWWDIR%%/admin/view/image/flags/gq.png
-%%WWWDIR%%/admin/view/image/flags/gr.png
-%%WWWDIR%%/admin/view/image/flags/gs.png
-%%WWWDIR%%/admin/view/image/flags/gt.png
-%%WWWDIR%%/admin/view/image/flags/gu.png
-%%WWWDIR%%/admin/view/image/flags/gw.png
-%%WWWDIR%%/admin/view/image/flags/gy.png
-%%WWWDIR%%/admin/view/image/flags/hk.png
-%%WWWDIR%%/admin/view/image/flags/hn.png
-%%WWWDIR%%/admin/view/image/flags/hr.png
-%%WWWDIR%%/admin/view/image/flags/ht.png
-%%WWWDIR%%/admin/view/image/flags/hu.png
-%%WWWDIR%%/admin/view/image/flags/id.png
-%%WWWDIR%%/admin/view/image/flags/ie.png
-%%WWWDIR%%/admin/view/image/flags/il.png
-%%WWWDIR%%/admin/view/image/flags/in.png
-%%WWWDIR%%/admin/view/image/flags/io.png
-%%WWWDIR%%/admin/view/image/flags/iq.png
-%%WWWDIR%%/admin/view/image/flags/ir.png
-%%WWWDIR%%/admin/view/image/flags/is.png
-%%WWWDIR%%/admin/view/image/flags/it.png
-%%WWWDIR%%/admin/view/image/flags/jm.png
-%%WWWDIR%%/admin/view/image/flags/jo.png
-%%WWWDIR%%/admin/view/image/flags/jp.png
-%%WWWDIR%%/admin/view/image/flags/ke.png
-%%WWWDIR%%/admin/view/image/flags/kg.png
-%%WWWDIR%%/admin/view/image/flags/kh.png
-%%WWWDIR%%/admin/view/image/flags/ki.png
-%%WWWDIR%%/admin/view/image/flags/km.png
-%%WWWDIR%%/admin/view/image/flags/kn.png
-%%WWWDIR%%/admin/view/image/flags/kp.png
-%%WWWDIR%%/admin/view/image/flags/kr.png
-%%WWWDIR%%/admin/view/image/flags/kw.png
-%%WWWDIR%%/admin/view/image/flags/ky.png
-%%WWWDIR%%/admin/view/image/flags/kz.png
-%%WWWDIR%%/admin/view/image/flags/la.png
-%%WWWDIR%%/admin/view/image/flags/lb.png
-%%WWWDIR%%/admin/view/image/flags/lc.png
-%%WWWDIR%%/admin/view/image/flags/li.png
-%%WWWDIR%%/admin/view/image/flags/lk.png
-%%WWWDIR%%/admin/view/image/flags/lr.png
-%%WWWDIR%%/admin/view/image/flags/ls.png
-%%WWWDIR%%/admin/view/image/flags/lt.png
-%%WWWDIR%%/admin/view/image/flags/lu.png
-%%WWWDIR%%/admin/view/image/flags/lv.png
-%%WWWDIR%%/admin/view/image/flags/ly.png
-%%WWWDIR%%/admin/view/image/flags/ma.png
-%%WWWDIR%%/admin/view/image/flags/mc.png
-%%WWWDIR%%/admin/view/image/flags/md.png
-%%WWWDIR%%/admin/view/image/flags/mg.png
-%%WWWDIR%%/admin/view/image/flags/mh.png
-%%WWWDIR%%/admin/view/image/flags/mk.png
-%%WWWDIR%%/admin/view/image/flags/ml.png
-%%WWWDIR%%/admin/view/image/flags/mm.png
-%%WWWDIR%%/admin/view/image/flags/mn.png
-%%WWWDIR%%/admin/view/image/flags/mo.png
-%%WWWDIR%%/admin/view/image/flags/mp.png
-%%WWWDIR%%/admin/view/image/flags/mq.png
-%%WWWDIR%%/admin/view/image/flags/mr.png
-%%WWWDIR%%/admin/view/image/flags/ms.png
-%%WWWDIR%%/admin/view/image/flags/mt.png
-%%WWWDIR%%/admin/view/image/flags/mu.png
-%%WWWDIR%%/admin/view/image/flags/mv.png
-%%WWWDIR%%/admin/view/image/flags/mw.png
-%%WWWDIR%%/admin/view/image/flags/mx.png
-%%WWWDIR%%/admin/view/image/flags/my.png
-%%WWWDIR%%/admin/view/image/flags/mz.png
-%%WWWDIR%%/admin/view/image/flags/na.png
-%%WWWDIR%%/admin/view/image/flags/nc.png
-%%WWWDIR%%/admin/view/image/flags/ne.png
-%%WWWDIR%%/admin/view/image/flags/nf.png
-%%WWWDIR%%/admin/view/image/flags/ng.png
-%%WWWDIR%%/admin/view/image/flags/ni.png
-%%WWWDIR%%/admin/view/image/flags/nl.png
-%%WWWDIR%%/admin/view/image/flags/no.png
-%%WWWDIR%%/admin/view/image/flags/np.png
-%%WWWDIR%%/admin/view/image/flags/nr.png
-%%WWWDIR%%/admin/view/image/flags/nu.png
-%%WWWDIR%%/admin/view/image/flags/nz.png
-%%WWWDIR%%/admin/view/image/flags/om.png
-%%WWWDIR%%/admin/view/image/flags/pa.png
-%%WWWDIR%%/admin/view/image/flags/pe.png
-%%WWWDIR%%/admin/view/image/flags/pf.png
-%%WWWDIR%%/admin/view/image/flags/pg.png
-%%WWWDIR%%/admin/view/image/flags/ph.png
-%%WWWDIR%%/admin/view/image/flags/pk.png
-%%WWWDIR%%/admin/view/image/flags/pl.png
-%%WWWDIR%%/admin/view/image/flags/pm.png
-%%WWWDIR%%/admin/view/image/flags/pn.png
-%%WWWDIR%%/admin/view/image/flags/pr.png
-%%WWWDIR%%/admin/view/image/flags/ps.png
-%%WWWDIR%%/admin/view/image/flags/pt.png
-%%WWWDIR%%/admin/view/image/flags/pw.png
-%%WWWDIR%%/admin/view/image/flags/py.png
-%%WWWDIR%%/admin/view/image/flags/qa.png
-%%WWWDIR%%/admin/view/image/flags/ro.png
-%%WWWDIR%%/admin/view/image/flags/ru.png
-%%WWWDIR%%/admin/view/image/flags/rw.png
-%%WWWDIR%%/admin/view/image/flags/sa.png
-%%WWWDIR%%/admin/view/image/flags/sb.png
-%%WWWDIR%%/admin/view/image/flags/sc.png
-%%WWWDIR%%/admin/view/image/flags/scotland.png
-%%WWWDIR%%/admin/view/image/flags/sd.png
-%%WWWDIR%%/admin/view/image/flags/se.png
-%%WWWDIR%%/admin/view/image/flags/sg.png
-%%WWWDIR%%/admin/view/image/flags/sh.png
-%%WWWDIR%%/admin/view/image/flags/si.png
-%%WWWDIR%%/admin/view/image/flags/sk.png
-%%WWWDIR%%/admin/view/image/flags/sl.png
-%%WWWDIR%%/admin/view/image/flags/sm.png
-%%WWWDIR%%/admin/view/image/flags/sn.png
-%%WWWDIR%%/admin/view/image/flags/so.png
-%%WWWDIR%%/admin/view/image/flags/sr.png
-%%WWWDIR%%/admin/view/image/flags/st.png
-%%WWWDIR%%/admin/view/image/flags/sv.png
-%%WWWDIR%%/admin/view/image/flags/sy.png
-%%WWWDIR%%/admin/view/image/flags/sz.png
-%%WWWDIR%%/admin/view/image/flags/tc.png
-%%WWWDIR%%/admin/view/image/flags/td.png
-%%WWWDIR%%/admin/view/image/flags/tf.png
-%%WWWDIR%%/admin/view/image/flags/tg.png
-%%WWWDIR%%/admin/view/image/flags/th.png
-%%WWWDIR%%/admin/view/image/flags/tj.png
-%%WWWDIR%%/admin/view/image/flags/tk.png
-%%WWWDIR%%/admin/view/image/flags/tl.png
-%%WWWDIR%%/admin/view/image/flags/tm.png
-%%WWWDIR%%/admin/view/image/flags/tn.png
-%%WWWDIR%%/admin/view/image/flags/to.png
-%%WWWDIR%%/admin/view/image/flags/tr.png
-%%WWWDIR%%/admin/view/image/flags/tt.png
-%%WWWDIR%%/admin/view/image/flags/tv.png
-%%WWWDIR%%/admin/view/image/flags/tw.png
-%%WWWDIR%%/admin/view/image/flags/tz.png
-%%WWWDIR%%/admin/view/image/flags/ua.png
-%%WWWDIR%%/admin/view/image/flags/ug.png
-%%WWWDIR%%/admin/view/image/flags/um.png
-%%WWWDIR%%/admin/view/image/flags/us.png
-%%WWWDIR%%/admin/view/image/flags/uy.png
-%%WWWDIR%%/admin/view/image/flags/uz.png
-%%WWWDIR%%/admin/view/image/flags/va.png
-%%WWWDIR%%/admin/view/image/flags/vc.png
-%%WWWDIR%%/admin/view/image/flags/ve.png
-%%WWWDIR%%/admin/view/image/flags/vg.png
-%%WWWDIR%%/admin/view/image/flags/vi.png
-%%WWWDIR%%/admin/view/image/flags/vn.png
-%%WWWDIR%%/admin/view/image/flags/vu.png
-%%WWWDIR%%/admin/view/image/flags/wales.png
-%%WWWDIR%%/admin/view/image/flags/wf.png
-%%WWWDIR%%/admin/view/image/flags/ws.png
-%%WWWDIR%%/admin/view/image/flags/ye.png
-%%WWWDIR%%/admin/view/image/flags/yt.png
-%%WWWDIR%%/admin/view/image/flags/za.png
-%%WWWDIR%%/admin/view/image/flags/zm.png
-%%WWWDIR%%/admin/view/image/flags/zw.png
 %%WWWDIR%%/admin/view/image/logo.png
 %%WWWDIR%%/admin/view/image/payment/2checkout.png
 %%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/cardinity.png
+%%WWWDIR%%/admin/view/image/payment/eway.png
+%%WWWDIR%%/admin/view/image/payment/eway_au.jpg
 %%WWWDIR%%/admin/view/image/payment/firstdata.png
 %%WWWDIR%%/admin/view/image/payment/g2apay.png
 %%WWWDIR%%/admin/view/image/payment/globalpay.png
 %%WWWDIR%%/admin/view/image/payment/klarna_banner.gif
+%%WWWDIR%%/admin/view/image/payment/laybuys.png
 %%WWWDIR%%/admin/view/image/payment/liqpay.png
 %%WWWDIR%%/admin/view/image/payment/nochex.png
 %%WWWDIR%%/admin/view/image/payment/paymate.png
@@ -983,8 +784,44 @@
 %%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/summernote-bs2.css
-%%WWWDIR%%/admin/view/javascript/summernote/summernote-bs3.css
+%%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
+%%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-cs-CZ.js
+%%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-da-DK.js
+%%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-de-DE.js
+%%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-es-ES.js
+%%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-es-EU.js
+%%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-fa-IR.js
+%%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-fi-FI.js
+%%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-fr-FR.js
+%%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-he-IL.js
+%%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-hu-HU.js
+%%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-id-ID.js
+%%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-it-IT.js
+%%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-ja-JP.js
+%%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-ko-KR.js
+%%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-lt-LT.js
+%%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-nb-NO.js
+%%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-nl-NL.js
+%%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-pl-PL.js
+%%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-pt-BR.js
+%%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-pt-PT.js
+%%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-ro-RO.js
+%%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-ru-RU.js
+%%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-sk-SK.js
+%%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-sl-SI.js
+%%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-sr-RS-Latin.js
+%%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-sr-RS.js
+%%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-sv-SE.js
+%%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-th-TH.js
+%%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-tr-TR.js
+%%WWWDIR%%/admin/view/javascript/summernote/lang/summernote-uk-UA.js
+%%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/plugin/hello/summernote-ext-hello.js
+%%WWWDIR%%/admin/view/javascript/summernote/plugin/specialchars/summernote-ext-specialchars.js
 %%WWWDIR%%/admin/view/javascript/summernote/summernote.css
 %%WWWDIR%%/admin/view/javascript/summernote/summernote.js
 %%WWWDIR%%/admin/view/javascript/summernote/summernote.min.js
@@ -1134,6 +971,7 @@
 %%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
@@ -1200,8 +1038,11 @@
 %%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
@@ -1259,6 +1100,12 @@
 %%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
@@ -1273,8 +1120,13 @@
 %%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
@@ -1288,6 +1140,9 @@
 %%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
@@ -1298,6 +1153,7 @@
 %%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
@@ -1349,6 +1205,7 @@
 %%WWWDIR%%/admin/view/template/sale/order_invoice.tpl
 %%WWWDIR%%/admin/view/template/sale/order_list.tpl
 %%WWWDIR%%/admin/view/template/sale/order_shipping.tpl
+%%WWWDIR%%/admin/view/template/sale/recurring_button.tpl
 %%WWWDIR%%/admin/view/template/sale/recurring_info.tpl
 %%WWWDIR%%/admin/view/template/sale/recurring_list.tpl
 %%WWWDIR%%/admin/view/template/sale/return_form.tpl
@@ -1374,6 +1231,7 @@
 %%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/upload.tpl
@@ -1406,6 +1264,7 @@
 %%WWWDIR%%/catalog/controller/account/password.php
 %%WWWDIR%%/catalog/controller/account/recurring.php
 %%WWWDIR%%/catalog/controller/account/register.php
+%%WWWDIR%%/catalog/controller/account/reset.php
 %%WWWDIR%%/catalog/controller/account/return.php
 %%WWWDIR%%/catalog/controller/account/reward.php
 %%WWWDIR%%/catalog/controller/account/success.php
@@ -1461,9 +1320,12 @@
 %%WWWDIR%%/catalog/controller/common/language.php
 %%WWWDIR%%/catalog/controller/common/maintenance.php
 %%WWWDIR%%/catalog/controller/common/search.php
-%%WWWDIR%%/catalog/controller/common/seo_url.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/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/information/contact.php
@@ -1484,8 +1346,11 @@
 %%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
@@ -1493,14 +1358,17 @@
 %%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
@@ -1509,6 +1377,7 @@
 %%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
@@ -1538,158 +1407,175 @@
 %%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
+%%WWWDIR%%/catalog/controller/startup/router.php
+%%WWWDIR%%/catalog/controller/startup/seo_url.php
+%%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/english/account/account.php
-%%WWWDIR%%/catalog/language/english/account/address.php
-%%WWWDIR%%/catalog/language/english/account/download.php
-%%WWWDIR%%/catalog/language/english/account/edit.php
-%%WWWDIR%%/catalog/language/english/account/forgotten.php
-%%WWWDIR%%/catalog/language/english/account/login.php
-%%WWWDIR%%/catalog/language/english/account/logout.php
-%%WWWDIR%%/catalog/language/english/account/newsletter.php
-%%WWWDIR%%/catalog/language/english/account/order.php
-%%WWWDIR%%/catalog/language/english/account/password.php
-%%WWWDIR%%/catalog/language/english/account/recurring.php
-%%WWWDIR%%/catalog/language/english/account/register.php
-%%WWWDIR%%/catalog/language/english/account/return.php
-%%WWWDIR%%/catalog/language/english/account/reward.php
-%%WWWDIR%%/catalog/language/english/account/success.php
-%%WWWDIR%%/catalog/language/english/account/transaction.php
-%%WWWDIR%%/catalog/language/english/account/voucher.php
-%%WWWDIR%%/catalog/language/english/account/wishlist.php
-%%WWWDIR%%/catalog/language/english/affiliate/account.php
-%%WWWDIR%%/catalog/language/english/affiliate/edit.php
-%%WWWDIR%%/catalog/language/english/affiliate/forgotten.php
-%%WWWDIR%%/catalog/language/english/affiliate/login.php
-%%WWWDIR%%/catalog/language/english/affiliate/logout.php
-%%WWWDIR%%/catalog/language/english/affiliate/password.php
-%%WWWDIR%%/catalog/language/english/affiliate/payment.php
-%%WWWDIR%%/catalog/language/english/affiliate/register.php
-%%WWWDIR%%/catalog/language/english/affiliate/success.php
-%%WWWDIR%%/catalog/language/english/affiliate/tracking.php
-%%WWWDIR%%/catalog/language/english/affiliate/transaction.php
-%%WWWDIR%%/catalog/language/english/api/cart.php
-%%WWWDIR%%/catalog/language/english/api/coupon.php
-%%WWWDIR%%/catalog/language/english/api/currency.php
-%%WWWDIR%%/catalog/language/english/api/customer.php
-%%WWWDIR%%/catalog/language/english/api/login.php
-%%WWWDIR%%/catalog/language/english/api/order.php
-%%WWWDIR%%/catalog/language/english/api/payment.php
-%%WWWDIR%%/catalog/language/english/api/reward.php
-%%WWWDIR%%/catalog/language/english/api/shipping.php
-%%WWWDIR%%/catalog/language/english/api/voucher.php
-%%WWWDIR%%/catalog/language/english/captcha/basic_captcha.php
-%%WWWDIR%%/catalog/language/english/captcha/google_captcha.php
-%%WWWDIR%%/catalog/language/english/checkout/cart.php
-%%WWWDIR%%/catalog/language/english/checkout/checkout.php
-%%WWWDIR%%/catalog/language/english/checkout/failure.php
-%%WWWDIR%%/catalog/language/english/checkout/success.php
-%%WWWDIR%%/catalog/language/english/common/cart.php
-%%WWWDIR%%/catalog/language/english/common/currency.php
-%%WWWDIR%%/catalog/language/english/common/footer.php
-%%WWWDIR%%/catalog/language/english/common/header.php
-%%WWWDIR%%/catalog/language/english/common/language.php
-%%WWWDIR%%/catalog/language/english/common/maintenance.php
-%%WWWDIR%%/catalog/language/english/common/search.php
-%%WWWDIR%%/catalog/language/english/english.php
-%%WWWDIR%%/catalog/language/english/error/not_found.php
-%%WWWDIR%%/catalog/language/english/information/contact.php
-%%WWWDIR%%/catalog/language/english/information/information.php
-%%WWWDIR%%/catalog/language/english/information/sitemap.php
-%%WWWDIR%%/catalog/language/english/mail/affiliate.php
-%%WWWDIR%%/catalog/language/english/mail/customer.php
-%%WWWDIR%%/catalog/language/english/mail/forgotten.php
-%%WWWDIR%%/catalog/language/english/mail/order.php
-%%WWWDIR%%/catalog/language/english/mail/review.php
-%%WWWDIR%%/catalog/language/english/mail/voucher.php
-%%WWWDIR%%/catalog/language/english/module/account.php
-%%WWWDIR%%/catalog/language/english/module/affiliate.php
-%%WWWDIR%%/catalog/language/english/module/bestseller.php
-%%WWWDIR%%/catalog/language/english/module/category.php
-%%WWWDIR%%/catalog/language/english/module/ebay_listing.php
-%%WWWDIR%%/catalog/language/english/module/featured.php
-%%WWWDIR%%/catalog/language/english/module/filter.php
-%%WWWDIR%%/catalog/language/english/module/google_hangouts.php
-%%WWWDIR%%/catalog/language/english/module/information.php
-%%WWWDIR%%/catalog/language/english/module/latest.php
-%%WWWDIR%%/catalog/language/english/module/special.php
-%%WWWDIR%%/catalog/language/english/module/store.php
-%%WWWDIR%%/catalog/language/english/openbay/amazon_order.php
-%%WWWDIR%%/catalog/language/english/openbay/amazonus_order.php
-%%WWWDIR%%/catalog/language/english/openbay/ebay_order.php
-%%WWWDIR%%/catalog/language/english/openbay/etsy_order.php
-%%WWWDIR%%/catalog/language/english/payment/amazon_login_pay.php
-%%WWWDIR%%/catalog/language/english/payment/authorizenet_aim.php
-%%WWWDIR%%/catalog/language/english/payment/authorizenet_sim.php
-%%WWWDIR%%/catalog/language/english/payment/bank_transfer.php
-%%WWWDIR%%/catalog/language/english/payment/bluepay_hosted.php
-%%WWWDIR%%/catalog/language/english/payment/bluepay_redirect.php
-%%WWWDIR%%/catalog/language/english/payment/cheque.php
-%%WWWDIR%%/catalog/language/english/payment/cod.php
-%%WWWDIR%%/catalog/language/english/payment/firstdata.php
-%%WWWDIR%%/catalog/language/english/payment/firstdata_remote.php
-%%WWWDIR%%/catalog/language/english/payment/free_checkout.php
-%%WWWDIR%%/catalog/language/english/payment/g2apay.php
-%%WWWDIR%%/catalog/language/english/payment/globalpay.php
-%%WWWDIR%%/catalog/language/english/payment/globalpay_remote.php
-%%WWWDIR%%/catalog/language/english/payment/klarna_account.php
-%%WWWDIR%%/catalog/language/english/payment/klarna_invoice.php
-%%WWWDIR%%/catalog/language/english/payment/liqpay.php
-%%WWWDIR%%/catalog/language/english/payment/nochex.php
-%%WWWDIR%%/catalog/language/english/payment/paymate.php
-%%WWWDIR%%/catalog/language/english/payment/paypoint.php
-%%WWWDIR%%/catalog/language/english/payment/payza.php
-%%WWWDIR%%/catalog/language/english/payment/perpetual_payments.php
-%%WWWDIR%%/catalog/language/english/payment/pp_express.php
-%%WWWDIR%%/catalog/language/english/payment/pp_payflow.php
-%%WWWDIR%%/catalog/language/english/payment/pp_payflow_iframe.php
-%%WWWDIR%%/catalog/language/english/payment/pp_pro.php
-%%WWWDIR%%/catalog/language/english/payment/pp_pro_iframe.php
-%%WWWDIR%%/catalog/language/english/payment/pp_standard.php
-%%WWWDIR%%/catalog/language/english/payment/realex.php
-%%WWWDIR%%/catalog/language/english/payment/realex_remote.php
-%%WWWDIR%%/catalog/language/english/payment/sagepay_direct.php
-%%WWWDIR%%/catalog/language/english/payment/sagepay_server.php
-%%WWWDIR%%/catalog/language/english/payment/sagepay_us.php
-%%WWWDIR%%/catalog/language/english/payment/securetrading_pp.php
-%%WWWDIR%%/catalog/language/english/payment/securetrading_ws.php
-%%WWWDIR%%/catalog/language/english/payment/skrill.php
-%%WWWDIR%%/catalog/language/english/payment/twocheckout.php
-%%WWWDIR%%/catalog/language/english/payment/web_payment_software.php
-%%WWWDIR%%/catalog/language/english/payment/worldpay.php
-%%WWWDIR%%/catalog/language/english/product/category.php
-%%WWWDIR%%/catalog/language/english/product/compare.php
-%%WWWDIR%%/catalog/language/english/product/manufacturer.php
-%%WWWDIR%%/catalog/language/english/product/product.php
-%%WWWDIR%%/catalog/language/english/product/search.php
-%%WWWDIR%%/catalog/language/english/product/special.php
-%%WWWDIR%%/catalog/language/english/shipping/auspost.php
-%%WWWDIR%%/catalog/language/english/shipping/citylink.php
-%%WWWDIR%%/catalog/language/english/shipping/fedex.php
-%%WWWDIR%%/catalog/language/english/shipping/flat.php
-%%WWWDIR%%/catalog/language/english/shipping/free.php
-%%WWWDIR%%/catalog/language/english/shipping/item.php
-%%WWWDIR%%/catalog/language/english/shipping/parcelforce_48.php
-%%WWWDIR%%/catalog/language/english/shipping/pickup.php
-%%WWWDIR%%/catalog/language/english/shipping/royal_mail.php
-%%WWWDIR%%/catalog/language/english/shipping/ups.php
-%%WWWDIR%%/catalog/language/english/shipping/usps.php
-%%WWWDIR%%/catalog/language/english/shipping/weight.php
-%%WWWDIR%%/catalog/language/english/tool/upload.php
-%%WWWDIR%%/catalog/language/english/total/coupon.php
-%%WWWDIR%%/catalog/language/english/total/credit.php
-%%WWWDIR%%/catalog/language/english/total/handling.php
-%%WWWDIR%%/catalog/language/english/total/klarna_fee.php
-%%WWWDIR%%/catalog/language/english/total/low_order_fee.php
-%%WWWDIR%%/catalog/language/english/total/reward.php
-%%WWWDIR%%/catalog/language/english/total/shipping.php
-%%WWWDIR%%/catalog/language/english/total/sub_total.php
-%%WWWDIR%%/catalog/language/english/total/total.php
-%%WWWDIR%%/catalog/language/english/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
+%%WWWDIR%%/catalog/language/en-gb/account/edit.php
+%%WWWDIR%%/catalog/language/en-gb/account/forgotten.php
+%%WWWDIR%%/catalog/language/en-gb/account/login.php
+%%WWWDIR%%/catalog/language/en-gb/account/logout.php
+%%WWWDIR%%/catalog/language/en-gb/account/newsletter.php
+%%WWWDIR%%/catalog/language/en-gb/account/order.php
+%%WWWDIR%%/catalog/language/en-gb/account/password.php
+%%WWWDIR%%/catalog/language/en-gb/account/recurring.php
+%%WWWDIR%%/catalog/language/en-gb/account/register.php
+%%WWWDIR%%/catalog/language/en-gb/account/reset.php
+%%WWWDIR%%/catalog/language/en-gb/account/return.php
+%%WWWDIR%%/catalog/language/en-gb/account/reward.php
+%%WWWDIR%%/catalog/language/en-gb/account/success.php
+%%WWWDIR%%/catalog/language/en-gb/account/transaction.php
+%%WWWDIR%%/catalog/language/en-gb/account/voucher.php
+%%WWWDIR%%/catalog/language/en-gb/account/wishlist.php
+%%WWWDIR%%/catalog/language/en-gb/affiliate/account.php
+%%WWWDIR%%/catalog/language/en-gb/affiliate/edit.php
+%%WWWDIR%%/catalog/language/en-gb/affiliate/forgotten.php
+%%WWWDIR%%/catalog/language/en-gb/affiliate/login.php
+%%WWWDIR%%/catalog/language/en-gb/affiliate/logout.php
+%%WWWDIR%%/catalog/language/en-gb/affiliate/password.php
+%%WWWDIR%%/catalog/language/en-gb/affiliate/payment.php
+%%WWWDIR%%/catalog/language/en-gb/affiliate/register.php
+%%WWWDIR%%/catalog/language/en-gb/affiliate/success.php
+%%WWWDIR%%/catalog/language/en-gb/affiliate/tracking.php
+%%WWWDIR%%/catalog/language/en-gb/affiliate/transaction.php
+%%WWWDIR%%/catalog/language/en-gb/api/cart.php
+%%WWWDIR%%/catalog/language/en-gb/api/coupon.php
+%%WWWDIR%%/catalog/language/en-gb/api/currency.php
+%%WWWDIR%%/catalog/language/en-gb/api/customer.php
+%%WWWDIR%%/catalog/language/en-gb/api/login.php
+%%WWWDIR%%/catalog/language/en-gb/api/order.php
+%%WWWDIR%%/catalog/language/en-gb/api/payment.php
+%%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
+%%WWWDIR%%/catalog/language/en-gb/checkout/success.php
+%%WWWDIR%%/catalog/language/en-gb/common/cart.php
+%%WWWDIR%%/catalog/language/en-gb/common/currency.php
+%%WWWDIR%%/catalog/language/en-gb/common/footer.php
+%%WWWDIR%%/catalog/language/en-gb/common/header.php
+%%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/information/contact.php
+%%WWWDIR%%/catalog/language/en-gb/information/information.php
+%%WWWDIR%%/catalog/language/en-gb/information/sitemap.php
+%%WWWDIR%%/catalog/language/en-gb/mail/affiliate.php
+%%WWWDIR%%/catalog/language/en-gb/mail/customer.php
+%%WWWDIR%%/catalog/language/en-gb/mail/forgotten.php
+%%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
@@ -1716,6 +1602,7 @@
 %%WWWDIR%%/catalog/model/checkout/recurring.php
 %%WWWDIR%%/catalog/model/design/banner.php
 %%WWWDIR%%/catalog/model/design/layout.php
+%%WWWDIR%%/catalog/model/extension/event.php
 %%WWWDIR%%/catalog/model/extension/extension.php
 %%WWWDIR%%/catalog/model/extension/module.php
 %%WWWDIR%%/catalog/model/feed/google_base.php
@@ -1728,6 +1615,7 @@
 %%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
@@ -1746,8 +1634,10 @@
 %%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
@@ -1756,6 +1646,7 @@
 %%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
@@ -1874,6 +1765,15 @@
 %%WWWDIR%%/catalog/view/javascript/jquery/owl-carousel/owl.carousel.min.js
 %%WWWDIR%%/catalog/view/javascript/jquery/owl-carousel/owl.theme.css
 %%WWWDIR%%/catalog/view/javascript/jquery/owl-carousel/owl.transitions.css
+%%WWWDIR%%/catalog/view/theme/default/image/default.png
+%%WWWDIR%%/catalog/view/theme/default/image/eway_creditcard_amex.png
+%%WWWDIR%%/catalog/view/theme/default/image/eway_creditcard_diners.png
+%%WWWDIR%%/catalog/view/theme/default/image/eway_creditcard_jcb.png
+%%WWWDIR%%/catalog/view/theme/default/image/eway_creditcard_master.png
+%%WWWDIR%%/catalog/view/theme/default/image/eway_creditcard_visa.png
+%%WWWDIR%%/catalog/view/theme/default/image/eway_masterpass.png
+%%WWWDIR%%/catalog/view/theme/default/image/eway_paypal.png
+%%WWWDIR%%/catalog/view/theme/default/image/eway_vme.png
 %%WWWDIR%%/catalog/view/theme/default/image/klarna_green_full.png
 %%WWWDIR%%/catalog/view/theme/default/image/klarna_green_middle.png
 %%WWWDIR%%/catalog/view/theme/default/image/klarna_nld_banner.png
@@ -1893,6 +1793,7 @@
 %%WWWDIR%%/catalog/view/theme/default/template/account/recurring_info.tpl
 %%WWWDIR%%/catalog/view/theme/default/template/account/recurring_list.tpl
 %%WWWDIR%%/catalog/view/theme/default/template/account/register.tpl
+%%WWWDIR%%/catalog/view/theme/default/template/account/reset.tpl
 %%WWWDIR%%/catalog/view/theme/default/template/account/return_form.tpl
 %%WWWDIR%%/catalog/view/theme/default/template/account/return_info.tpl
 %%WWWDIR%%/catalog/view/theme/default/template/account/return_list.tpl
@@ -1922,7 +1823,6 @@
 %%WWWDIR%%/catalog/view/theme/default/template/checkout/register.tpl
 %%WWWDIR%%/catalog/view/theme/default/template/checkout/shipping_address.tpl
 %%WWWDIR%%/catalog/view/theme/default/template/checkout/shipping_method.tpl
-%%WWWDIR%%/catalog/view/theme/default/template/common/buttons.tpl
 %%WWWDIR%%/catalog/view/theme/default/template/common/cart.tpl
 %%WWWDIR%%/catalog/view/theme/default/template/common/column_left.tpl
 %%WWWDIR%%/catalog/view/theme/default/template/common/column_right.tpl
@@ -1936,6 +1836,9 @@
 %%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/information/contact.tpl
 %%WWWDIR%%/catalog/view/theme/default/template/information/information.tpl
@@ -1957,8 +1860,11 @@
 %%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
@@ -1971,8 +1877,12 @@
 %%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
@@ -1982,6 +1892,7 @@
 %%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
@@ -2021,11 +1932,11 @@
 %%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%%/crossdomain.xml
 %%WWWDIR%%/image/cache/index.html
 %%WWWDIR%%/image/catalog/cart.png
 %%WWWDIR%%/image/catalog/demo/apple_cinema_30.jpg
@@ -2208,7 +2119,6 @@
 %%WWWDIR%%/image/flags/fo.png
 %%WWWDIR%%/image/flags/fr.png
 %%WWWDIR%%/image/flags/ga.png
-%%WWWDIR%%/image/flags/gb.png
 %%WWWDIR%%/image/flags/gd.png
 %%WWWDIR%%/image/flags/ge.png
 %%WWWDIR%%/image/flags/gh.png
@@ -2373,37 +2283,56 @@
 %%WWWDIR%%/image/flags/zw.png
 %%WWWDIR%%/image/no_image.png
 %%WWWDIR%%/image/placeholder.png
-%%WWWDIR%%/image/templates/default.png
 %%WWWDIR%%/index.php
 %%WWWDIR%%/install/cli_install.php
-%%WWWDIR%%/install/controller/footer.php
-%%WWWDIR%%/install/controller/header.php
-%%WWWDIR%%/install/controller/maxmind.php
-%%WWWDIR%%/install/controller/openbay.php
-%%WWWDIR%%/install/controller/step_1.php
-%%WWWDIR%%/install/controller/step_2.php
-%%WWWDIR%%/install/controller/step_3.php
-%%WWWDIR%%/install/controller/step_4.php
-%%WWWDIR%%/install/controller/upgrade.php
+%%WWWDIR%%/install/controller/3rd_party/extension.php
+%%WWWDIR%%/install/controller/3rd_party/maxmind.php
+%%WWWDIR%%/install/controller/3rd_party/openbay.php
+%%WWWDIR%%/install/controller/common/column_left.php
+%%WWWDIR%%/install/controller/common/footer.php
+%%WWWDIR%%/install/controller/common/header.php
+%%WWWDIR%%/install/controller/error/not_found.php
+%%WWWDIR%%/install/controller/install/step_1.php
+%%WWWDIR%%/install/controller/install/step_2.php
+%%WWWDIR%%/install/controller/install/step_3.php
+%%WWWDIR%%/install/controller/install/step_4.php
+%%WWWDIR%%/install/controller/startup/database.php
+%%WWWDIR%%/install/controller/startup/language.php
+%%WWWDIR%%/install/controller/startup/router.php
+%%WWWDIR%%/install/controller/startup/upgrade.php
+%%WWWDIR%%/install/controller/upgrade/upgrade.php
 %%WWWDIR%%/install/index.php
-%%WWWDIR%%/install/language/english/english.php
-%%WWWDIR%%/install/model/install.php
-%%WWWDIR%%/install/model/upgrade.php
+%%WWWDIR%%/install/language/en-gb/3rd_party/maxmind.php
+%%WWWDIR%%/install/language/en-gb/3rd_party/openbay.php
+%%WWWDIR%%/install/language/en-gb/common/column_left.php
+%%WWWDIR%%/install/language/en-gb/common/footer.php
+%%WWWDIR%%/install/language/en-gb/common/header.php
+%%WWWDIR%%/install/language/en-gb/en-gb.php
+%%WWWDIR%%/install/language/en-gb/en-gb.png
+%%WWWDIR%%/install/language/en-gb/install/step_1.php
+%%WWWDIR%%/install/language/en-gb/install/step_2.php
+%%WWWDIR%%/install/language/en-gb/install/step_3.php
+%%WWWDIR%%/install/language/en-gb/install/step_4.php
+%%WWWDIR%%/install/language/en-gb/upgrade/upgrade.php
+%%WWWDIR%%/install/model/3rd_party/maxmind.php
+%%WWWDIR%%/install/model/install/install.php
+%%WWWDIR%%/install/model/upgrade/1000.php
+%%WWWDIR%%/install/model/upgrade/1001.php
+%%WWWDIR%%/install/model/upgrade/1002.php
+%%WWWDIR%%/install/model/upgrade/1003.php
+%%WWWDIR%%/install/model/upgrade/1004.php
+%%WWWDIR%%/install/model/upgrade/1005.php
+%%WWWDIR%%/install/model/upgrade/1006.php
+%%WWWDIR%%/install/model/upgrade/1007.php
 %%WWWDIR%%/install/opencart.sql
 %%WWWDIR%%/install/php.ini
 %%WWWDIR%%/install/view/image/amazon.png
 %%WWWDIR%%/install/view/image/background.png
-%%WWWDIR%%/install/view/image/button.png
 %%WWWDIR%%/install/view/image/ebay.png
 %%WWWDIR%%/install/view/image/heading.png
-%%WWWDIR%%/install/view/image/icon-admin.png
-%%WWWDIR%%/install/view/image/icon-mail.png
-%%WWWDIR%%/install/view/image/icon-store.png
 %%WWWDIR%%/install/view/image/logo.png
 %%WWWDIR%%/install/view/image/maxmind.gif
 %%WWWDIR%%/install/view/image/openbay_pro.gif
-%%WWWDIR%%/install/view/image/screenshot_1.png
-%%WWWDIR%%/install/view/image/screenshot_2.png
 %%WWWDIR%%/install/view/javascript/bootstrap/css/bootstrap-theme.css
 %%WWWDIR%%/install/view/javascript/bootstrap/css/bootstrap-theme.min.css
 %%WWWDIR%%/install/view/javascript/bootstrap/css/bootstrap.css
@@ -2454,38 +2383,50 @@
 %%WWWDIR%%/install/view/javascript/jquery/jquery-2.1.1.min.js
 %%WWWDIR%%/install/view/javascript/jquery/jquery-2.1.1.min.map
 %%WWWDIR%%/install/view/stylesheet/stylesheet.css
-%%WWWDIR%%/install/view/template/footer.tpl
-%%WWWDIR%%/install/view/template/header.tpl
-%%WWWDIR%%/install/view/template/maxmind.tpl
-%%WWWDIR%%/install/view/template/openbay.tpl
-%%WWWDIR%%/install/view/template/step_1.tpl
-%%WWWDIR%%/install/view/template/step_2.tpl
-%%WWWDIR%%/install/view/template/step_3.tpl
-%%WWWDIR%%/install/view/template/step_4.tpl
-%%WWWDIR%%/install/view/template/success.tpl
-%%WWWDIR%%/install/view/template/upgrade.tpl
+%%WWWDIR%%/install/view/template/3rd_party/maxmind.tpl
+%%WWWDIR%%/install/view/template/3rd_party/openbay.tpl
+%%WWWDIR%%/install/view/template/common/column_left.tpl
+%%WWWDIR%%/install/view/template/common/footer.tpl
+%%WWWDIR%%/install/view/template/common/header.tpl
+%%WWWDIR%%/install/view/template/error/not_found.tpl
+%%WWWDIR%%/install/view/template/install/step_1.tpl
+%%WWWDIR%%/install/view/template/install/step_2.tpl
+%%WWWDIR%%/install/view/template/install/step_3.tpl
+%%WWWDIR%%/install/view/template/install/step_4.tpl
+%%WWWDIR%%/install/view/template/upgrade/upgrade.tpl
 %%WWWDIR%%/php.ini
+%%WWWDIR%%/system/config/admin.php
+%%WWWDIR%%/system/config/catalog.php
+%%WWWDIR%%/system/config/default.php
 %%WWWDIR%%/system/config/index.html
+%%WWWDIR%%/system/config/install.php
 %%WWWDIR%%/system/engine/action.php
 %%WWWDIR%%/system/engine/controller.php
 %%WWWDIR%%/system/engine/event.php
 %%WWWDIR%%/system/engine/front.php
 %%WWWDIR%%/system/engine/loader.php
 %%WWWDIR%%/system/engine/model.php
+%%WWWDIR%%/system/engine/proxy.php
 %%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/affiliate.php
 %%WWWDIR%%/system/library/cache.php
 %%WWWDIR%%/system/library/cache/apc.php
 %%WWWDIR%%/system/library/cache/file.php
 %%WWWDIR%%/system/library/cache/mem.php
-%%WWWDIR%%/system/library/cart.php
+%%WWWDIR%%/system/library/cart/affiliate.php
+%%WWWDIR%%/system/library/cart/cart.php
+%%WWWDIR%%/system/library/cart/currency.php
+%%WWWDIR%%/system/library/cart/customer.php
+%%WWWDIR%%/system/library/cart/length.php
+%%WWWDIR%%/system/library/cart/tax.php
+%%WWWDIR%%/system/library/cart/user.php
+%%WWWDIR%%/system/library/cart/weight.php
 %%WWWDIR%%/system/library/config.php
-%%WWWDIR%%/system/library/currency.php
-%%WWWDIR%%/system/library/customer.php
 %%WWWDIR%%/system/library/db.php
 %%WWWDIR%%/system/library/db/mpdo.php
 %%WWWDIR%%/system/library/db/mssql.php
@@ -2496,7 +2437,6 @@
 %%WWWDIR%%/system/library/encryption.php
 %%WWWDIR%%/system/library/image.php
 %%WWWDIR%%/system/library/language.php
-%%WWWDIR%%/system/library/length.php
 %%WWWDIR%%/system/library/log.php
 %%WWWDIR%%/system/library/mail.php
 %%WWWDIR%%/system/library/openbay.php
@@ -2504,16 +2444,16 @@
 %%WWWDIR%%/system/library/openbay/amazonus.php
 %%WWWDIR%%/system/library/openbay/ebay.php
 %%WWWDIR%%/system/library/openbay/etsy.php
+%%WWWDIR%%/system/library/openbay/fba.php
 %%WWWDIR%%/system/library/pagination.php
 %%WWWDIR%%/system/library/request.php
 %%WWWDIR%%/system/library/response.php
 %%WWWDIR%%/system/library/session.php
-%%WWWDIR%%/system/library/tax.php
+%%WWWDIR%%/system/library/session/db.php
+%%WWWDIR%%/system/library/session/file.php
 %%WWWDIR%%/system/library/template.php
-%%WWWDIR%%/system/library/template/php.php
+%%WWWDIR%%/system/library/template/basic.php
 %%WWWDIR%%/system/library/url.php
-%%WWWDIR%%/system/library/user.php
-%%WWWDIR%%/system/library/weight.php
 %%WWWDIR%%/system/modification.xml
 %%WWWDIR%%/system/startup.php
 %%WWWDIR%%/system/storage/cache/index.html
@@ -2521,8 +2461,6 @@
 %%WWWDIR%%/system/storage/logs/index.html
 %%WWWDIR%%/system/storage/modification/index.html
 %%WWWDIR%%/system/storage/upload/index.html
-%%WWWDIR%%/system/vendor/index.html
-%%WWWDIR%%/system/vendor/scssc.php
 @owner www
 @group www
 @mode 0755