diff --git a/README.md b/README.md
index d21dba7..5b4f625 100644
--- a/README.md
+++ b/README.md
@@ -11,8 +11,8 @@ This repository contains the OpenCart  PostFinance Checkout payment module that
 
 ## Documentation
 
-* [English](https://plugin-documentation.postfinance-checkout.ch/pfpayments/opencart-2.1/1.0.10/docs/en/documentation.html)
+* [English](https://plugin-documentation.postfinance-checkout.ch/pfpayments/opencart-2.1/1.0.11/docs/en/documentation.html)
 
 ## License
 
-Please see the [license file](https://github.com/pfpayments/opencart-2.1/blob/1.0.10/LICENSE) for more information.
\ No newline at end of file
+Please see the [license file](https://github.com/pfpayments/opencart-2.1/blob/1.0.11/LICENSE) for more information.
\ No newline at end of file
diff --git a/docs/en/documentation.html b/docs/en/documentation.html
index eca9e52..00bd543 100644
--- a/docs/en/documentation.html
+++ b/docs/en/documentation.html
@@ -21,7 +21,7 @@ <h2>Documentation</h2>				</div>
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/pfpayments/opencart-2.1/releases/tag/1.0.10/">
+		<a href="https://github.com/pfpayments/opencart-2.1/releases/tag/1.0.11/">
 			Source
 		</a>
 	</li>
@@ -48,7 +48,7 @@ <h1>
 					<div class="olist arabic">
 <ol class="arabic">
 <li>
-<p><a href="https://github.com/pfpayments/opencart-2.1/releases/tag/1.0.10/">Download</a> the extension.</p>
+<p><a href="https://github.com/pfpayments/opencart-2.1/releases/tag/1.0.11/">Download</a> the extension.</p>
 </li>
 <li>
 <p>Extract the files and upload the content of the <code>Upload</code> directory into the root directory of your store using FTP/SSH.</p>
diff --git a/upload/catalog/controller/extension/postfinancecheckout/event.php b/upload/catalog/controller/extension/postfinancecheckout/event.php
index 1060aba..9bd8edd 100644
--- a/upload/catalog/controller/extension/postfinancecheckout/event.php
+++ b/upload/catalog/controller/extension/postfinancecheckout/event.php
@@ -19,7 +19,7 @@ public function includeDeviceIdentifier(){
 		$script .= '/s/[spaceId]/payment/device.js?sessionIdentifier=[UniqueSessionIdentifier]';
 		
 		$this->setDeviceCookie();
-
+		
 		$script = str_replace(array(
 			'[spaceId]',
 			'[UniqueSessionIdentifier]' 
@@ -81,15 +81,29 @@ public function canSaveOrder($order_info){
 		}
 		
 		if (!empty($new_order)) {
-			\PostFinanceCheckoutHelper::instance($this->registry)->log($this->language->get('error_order_edit') . " ($order_id)", \PostFinanceCheckoutHelper::LOG_ERROR);
+			\PostFinanceCheckoutHelper::instance($this->registry)->log($this->language->get('error_order_edit') . " ($order_id)",
+					\PostFinanceCheckoutHelper::LOG_ERROR);
 			
-			$this->language->load('payment/postfinancecheckout');
-			$this->response->addHeader('Content-Type: application/json');
-			$this->response->setOutput(json_encode(array(
-				'error' => $this->language->get('error_order_edit') 
-			)));
-			$this->response->output();
-			die();
+			if ($this->request->get['route'] == 'checkout/checkout') {
+				// ensure reload without order_id
+				unset($this->session->data['order_id']);
+				\PostFinanceCheckout\Service\Transaction::instance($this->registry)->waitForStates($this->request->get['order_id'],
+						array(
+							\PostFinanceCheckout\Sdk\Model\TransactionState::FAILED 
+						), 5);
+				$transaction_info = \PostFinanceCheckout\Entity\TransactionInfo::loadByOrderId($this->registry, $order_id);
+				$this->session->data['error'] = $transaction_info->getFailureReason();
+				$this->response->redirect($this->createUrl('checkout/checkout', $this->request->get));
+			}
+			else {
+				$this->language->load('payment/postfinancecheckout');
+				$this->response->addHeader('Content-Type: application/json');
+				$this->response->setOutput(json_encode(array(
+					'error' => $this->language->get('error_order_edit') 
+				)));
+				$this->response->output();
+				die();
+			}
 		}
 	}
 
diff --git a/upload/catalog/controller/extension/postfinancecheckout/transaction.php b/upload/catalog/controller/extension/postfinancecheckout/transaction.php
new file mode 100644
index 0000000..96a20e3
--- /dev/null
+++ b/upload/catalog/controller/extension/postfinancecheckout/transaction.php
@@ -0,0 +1,26 @@
+<?php
+require_once modification(DIR_SYSTEM . 'library/postfinancecheckout/helper.php');
+use PostFinanceCheckout\Controller\AbstractController;
+
+class ControllerExtensionPostFinanceCheckoutTransaction extends AbstractController {
+
+	public function fail(){
+		if (isset($this->request->get['order_id']) &&
+				 \PostFinanceCheckout\Service\Transaction::instance($this->registry)->waitForStates($this->request->get['order_id'],
+						array(
+							\PostFinanceCheckout\Sdk\Model\TransactionState::FAILED 
+						), 5)) {
+			$transaction_info = \PostFinanceCheckout\Entity\TransactionInfo::loadByOrderId($this->registry, $this->request->get['order_id']);
+			unset($this->registry->get('session')->data['order_id']);
+			$this->session->data['error'] = $transaction_info->getFailureReason();
+		}
+		else {
+			$this->session->data['error'] = $this->language->get('error'); //TODO error text
+		}
+		$this->response->redirect($this->createUrl('checkout/checkout', ''));
+	}
+
+	protected function getRequiredPermission(){
+		return '';
+	}
+}
\ No newline at end of file
diff --git a/upload/catalog/view/javascript/postfinancecheckout.js b/upload/catalog/view/javascript/postfinancecheckout.js
index c5557f1..8df0d4d 100644
--- a/upload/catalog/view/javascript/postfinancecheckout.js
+++ b/upload/catalog/view/javascript/postfinancecheckout.js
@@ -80,7 +80,11 @@
 				PostFinanceCheckout.handler
 						.setInitializeCallback(this.initialized);
 				PostFinanceCheckout.handler
-						.setValidationCallback(this.validated);
+					.setValidationCallback(this.validated);
+				PostFinanceCheckout.handler
+					.setEnableSubmitCallback(this.enableConfirmButton);
+				PostFinanceCheckout.handler
+					.setDisableSubmitCallback(this.disableConfirmButton);
 				PostFinanceCheckout.handler
 						.create('postfinancecheckout-iframe-container');
 			}
diff --git a/upload/catalog/view/theme/default/template/payment/postfinancecheckout/iframe.tpl b/upload/catalog/view/theme/default/template/payment/postfinancecheckout/iframe.tpl
index aee8804..3038c21 100644
--- a/upload/catalog/view/theme/default/template/payment/postfinancecheckout/iframe.tpl
+++ b/upload/catalog/view/theme/default/template/payment/postfinancecheckout/iframe.tpl
@@ -5,13 +5,12 @@
 	</div>
 	<div style="padding: 15px;">
 		<div id="postfinancecheckout-iframe-spinner" class="text-center">
-			<i style="font-size: 12em;"
-				class='fa fa-spinner fa-spin '></i>
-		</div>
-		<div id="postfinancecheckout-iframe-container" class="text-center" style="display:none;">
+			<i style="font-size: 12em;" class='fa fa-spinner fa-spin '></i>
 		</div>
+		<div id="postfinancecheckout-iframe-container" class="text-center"
+			style="display: none;"></div>
 
-		<div class="buttons" style="overflow:hidden;">
+		<div class="buttons" style="overflow: hidden;">
 			<div class="pull-right">
 				<input type="button" value="<?php echo $button_confirm; ?>"
 					id="button-confirm" class="btn btn-primary"
@@ -24,11 +23,14 @@
 	<script type="text/javascript">
     function initPostFinanceCheckoutIframe(){
     	if(typeof PostFinanceCheckout === 'undefined') {
-    		setTimeout(initPostFinanceCheckoutIframe, 500);
+    		Window.loadPostFinanceCheckoutTimeout = setTimeout(initPostFinanceCheckoutIframe, 500);
     	} else {
     		PostFinanceCheckout.init('<?php echo $configuration_id; ?>');
     	}
     }
+    if(typeof Window.loadPostFinanceCheckoutTimeout !== 'undefined') {
+		clearTimeout(Window.loadPostFinanceCheckoutTimeout);
+    }
     jQuery().ready(initPostFinanceCheckoutIframe);
     </script>
 </div>
\ No newline at end of file
diff --git a/upload/system/library/postfinancecheckout/dynamic/catalog/controller.php b/upload/system/library/postfinancecheckout/dynamic/catalog/controller.php
index 694a018..15fca2a 100644
--- a/upload/system/library/postfinancecheckout/dynamic/catalog/controller.php
+++ b/upload/system/library/postfinancecheckout/dynamic/catalog/controller.php
@@ -40,6 +40,7 @@ public function confirm(){
 		catch (Exception $e) {
 			\PostFinanceCheckoutHelper::instance($this->registry)->dbTransactionRollback();
 			\PostFinanceCheckoutHelper::instance($this->registry)->log($e->getMessage(), \PostFinanceCheckoutHelper::LOG_ERROR);
+			$this->load->language('payment/postfinancecheckout');
 			$result['message'] = $this->language->get('error_confirmation'); 
 			unset($this->session->data['order_id']); // this order number cannot be used anymore
 		}
@@ -49,7 +50,7 @@ public function confirm(){
 	}
 
 	private function confirmTransaction(){
-		$transaction = PostFinanceCheckout\Service\Transaction::instance($this->registry)->getTransaction(array(), false,
+		$transaction = PostFinanceCheckout\Service\Transaction::instance($this->registry)->getTransaction($this->getOrderInfo(), false,
 				array(
 					\PostFinanceCheckout\Sdk\Model\TransactionState::PENDING 
 				));
@@ -63,6 +64,14 @@ private function confirmTransaction(){
 		
 		throw new Exception('Transaction is not pending.');
 	}
+	
+	private function getOrderInfo() {
+		if(!isset($this->session->data['order_id'])) {
+			throw new Exception("No order_id to confirm.");
+		}
+		$this->load->model('checkout/order');
+		return $this->model_checkout_order->getOrder($this->session->data['order_id']);
+	}
 
 	protected function getRequiredPermission(){
 		return '';
diff --git a/upload/system/library/postfinancecheckout/helper.php b/upload/system/library/postfinancecheckout/helper.php
index 34cc989..d466cb2 100644
--- a/upload/system/library/postfinancecheckout/helper.php
+++ b/upload/system/library/postfinancecheckout/helper.php
@@ -14,6 +14,7 @@ class PostFinanceCheckoutHelper {
 	 * @var Registry
 	 */
 	private $registry;
+	private $xfeepro;
 	private static $instance;
 	private $catalog_url;
 	const LOG_INFO = 2;
@@ -302,7 +303,7 @@ public function getCustomer(){
 		}
 		return array();
 	}
-	
+
 	/**
 	 * Formats the given amount for the given currency.
 	 * If no currency is given, the current session currency is used. If that is not set the shop configuration is used.
@@ -317,7 +318,7 @@ public function formatAmount($amount, $currency = null){
 		}
 		return $this->registry->get('currency')->format($amount, $currency, false, false);
 	}
-	
+
 	/**
 	 * Rounds the amount like Xfee would
 	 *
@@ -331,7 +332,7 @@ public function roundXfeeAmount($amount, $currency = null){
 		}
 		$decimals = $this->registry->get('currency')->getDecimalPlace();
 		$mode = PHP_ROUND_HALF_UP;
-		if($amount < 0) {
+		if ($amount < 0) {
 			$mode = PHP_ROUND_HALF_DOWN;
 		}
 		return round($amount, $decimals, $mode);
@@ -461,15 +462,18 @@ public function getCache(){
 	}
 
 	public function getSuccessUrl(){
-		return PostFinanceCheckoutVersionHelper::createUrl($this->getCatalogUrl(), 'checkout/success', '',
-				$this->registry->get('config')->get('config_secure'));
+		return PostFinanceCheckoutVersionHelper::createUrl($this->getCatalogUrl(), 'checkout/success', array(
+			'utm_nooverride' => 1 
+		), $this->registry->get('config')->get('config_secure'));
 	}
 
 	public function getFailedUrl($order_id){
 		return str_replace('&amp;', '&',
-				PostFinanceCheckoutVersionHelper::createUrl($this->getCatalogUrl(), 'checkout/checkout', array(
-					'order_id' => $order_id 
-				), $this->registry->get('config')->get('config_secure')));
+				PostFinanceCheckoutVersionHelper::createUrl($this->getCatalogUrl(), 'extension/postfinancecheckout/transaction/fail',
+						array(
+							'order_id' => $order_id,
+							'utm_nooverride' => 1 
+						), $this->registry->get('config')->get('config_secure')));
 	}
 
 	public function getWebhookUrl(){
@@ -605,6 +609,31 @@ public function getLimitEnd($page){
 		$limit = $this->registry->get('config')->get('config_limit_admin');
 		return $page * $limit;
 	}
+	
+	/**
+	 * Disable inc vat setting in xfeepro. Necessary to ensure taxes are calculated and transmitted correctly.
+	 */
+	public function xfeeproDisableIncVat() {
+		$config = $this->registry->get('config');
+		$xfeepro = $config->get('xfeepro');
+		if($xfeepro) {
+			$xfeepro = unserialize(base64_decode($xfeepro));
+			$this->xfeepro = $xfeepro;
+			foreach($xfeepro['inc_vat'] as $i => $value) {
+				$xfeepro['inc_vat'][$i] = 0;
+			}
+			$config->set('xfeepro', base64_encode(serialize($xfeepro)));
+		}
+	}
+	
+	/**
+	 * Restore xfeepro settings.
+	 */
+	public function xfeeProRestoreIncVat() {
+		if($this->xfeepro) {
+			$this->registry->get('config')->set('xfeepro', base64_encode(serialize($this->xfeepro)));
+		}
+	}
 
 	public static function instance(Registry $registry){
 		if (self::$instance === null) {
diff --git a/upload/system/library/postfinancecheckout/modification/PostFinanceCheckoutAdministration.ocmod.xml b/upload/system/library/postfinancecheckout/modification/PostFinanceCheckoutAdministration.ocmod.xml
index 9120b15..399a133 100644
--- a/upload/system/library/postfinancecheckout/modification/PostFinanceCheckoutAdministration.ocmod.xml
+++ b/upload/system/library/postfinancecheckout/modification/PostFinanceCheckoutAdministration.ocmod.xml
@@ -3,7 +3,7 @@
 	<code>PostFinanceCheckoutAdministration</code>
 	<name>postfinancecheckout administration: complete, refund and void from the OpenCart backend.
 	</name>
-	<version>1.0.2</version>
+	<version>1.1.0</version>
 	<author>Customweb GmbH</author>
 	<link>http://github.com/postfinancecheckout-payment/opencart</link>
 	<file path="admin/controller/sale/order.php">
@@ -15,35 +15,12 @@
 			$this->load->model('extension/postfinancecheckout/order');
 			$data['postfinancecheckout_buttons'] = $this->model_extension_postfinancecheckout_order->getButtons((int)$this->request->get['order_id']);
 			$data['postfinancecheckout_failed_jobs'] = $this->model_extension_postfinancecheckout_order->getFailedJobs((int)$this->request->get['order_id']);
-			$data['postfinancecheckout_tab'] = $this->load->controller('payment/' . $order_info['payment_code'] . '/order');
             ]]></add>
 		</operation>
 	</file>
 	<!-- order_info.tpl ajax api callback autoremoves all alerts, so must add 
 		with delay. -->
 	<file path="admin/view/template/sale/order_info.tpl">
-			<operation>
-			<search><![CDATA[
-<li><a href="#tab-history" data-toggle="tab"><?php echo $tab_history; ?></a></li>
-            ]]></search>
-			<add position="before"><![CDATA[
-<?php if($postfinancecheckout_tab): ?>
-<li><a href="#tab-postfinancecheckout" data-toggle="tab"><?php echo $postfinancecheckout_tab['title']; ?></a></li>
-<?php endif; ?>
-]]></add>
-		</operation>
-			<operation>
-			<search><![CDATA[
-          <div class="tab-pane" id="tab-history">
-            ]]></search>
-			<add position="before"><![CDATA[
-          <?php if($postfinancecheckout_tab) : ?>
-          <div class="tab-pane" id="tab-postfinancecheckout">
-          <?php echo $postfinancecheckout_tab['content']; ?>
-          </div>
-          <?php endif; ?>
-]]></add>
-		</operation>
 		<operation>
 			<search><![CDATA[
 <div id="content">
diff --git a/upload/system/library/postfinancecheckout/modification/PostFinanceCheckoutCore.ocmod.xml b/upload/system/library/postfinancecheckout/modification/PostFinanceCheckoutCore.ocmod.xml
index 4d4d7c4..c11aa53 100644
--- a/upload/system/library/postfinancecheckout/modification/PostFinanceCheckoutCore.ocmod.xml
+++ b/upload/system/library/postfinancecheckout/modification/PostFinanceCheckoutCore.ocmod.xml
@@ -3,25 +3,9 @@
 	<code>PostFinanceCheckoutCore</code>
 	<name>postfinancecheckout core: load payment methods.
 	</name>
-	<version>1.0.2</version>
+	<version>1.1.2</version>
 	<author>Customweb GmbH</author>
 	<link>http://github.com/postfinancecheckout-payment/opencart</link>
-	<file path="catalog/controller/checkout/checkout.php">
-		<operation>
-			<search><![CDATA[
-		if (isset($this->session->data['error'])) {
-            ]]></search>
-			<add position="before"><![CDATA[
-		require_once modification(DIR_SYSTEM . 'library/postfinancecheckout/helper.php');
-		if (isset($this->request->get['order_id']) && \PostFinanceCheckoutHelper::instance($this->registry)->isValidOrder($this->request->get['order_id'])
-			&& \PostFinanceCheckout\Service\Transaction::instance($this->registry)->waitForStates($this->request->get['order_id'], array(\PostFinanceCheckout\Sdk\Model\TransactionState::FAILED), 5)) {
-			$transaction_info = \PostFinanceCheckout\Entity\TransactionInfo::loadByOrderId($this->registry, $this->request->get['order_id']);
-			unset($this->registry->get('session')->data['order_id']);
-			$data['error_warning'] = $transaction_info->getFailureReason();
-		} else 
-            ]]></add>
-		</operation>
-	</file>
 	<file path="admin/controller/extension/payment.php">
 		<operation>
 			<search><![CDATA[
@@ -81,16 +65,6 @@
             ]]></add>
 		</operation>
 	</file>
-	<file path="admin/controller/sale/order.php">
-		<operation>
-			<search><![CDATA[
-				if (is_file(DIR_CATALOG . 'controller/payment/' . $order_info['payment_code'] . '.php')) {
-            ]]></search>
-			<add position="replace"><![CDATA[
-				if (is_file(DIR_CATALOG . 'controller/payment/' . $order_info['payment_code'] . '.php') || strpos($order_info['payment_code'], 'postfinancecheckout_') === 0) {
-            ]]></add>
-		</operation>
-	</file>
 	
 	<file path="system/engine/action.php">
 		<operation>
diff --git a/upload/system/library/postfinancecheckout/modification/PostFinanceCheckoutEvents.ocmod.xml b/upload/system/library/postfinancecheckout/modification/PostFinanceCheckoutEvents.ocmod.xml
index e3f5542..6f0ee66 100644
--- a/upload/system/library/postfinancecheckout/modification/PostFinanceCheckoutEvents.ocmod.xml
+++ b/upload/system/library/postfinancecheckout/modification/PostFinanceCheckoutEvents.ocmod.xml
@@ -3,15 +3,15 @@
 	<code>PostFinanceCheckoutEvents</code>
 	<name>postfinancecheckout events: handle events unavailable in Opencart 2.0.x and 2.1.x.
 	</name>
-	<version>1.0.1</version>
+	<version>1.1.0</version>
 	<author>Customweb GmbH</author>
 	<link>http://github.com/postfinancecheckout-payment/opencart</link>
 	<file path="catalog/controller/common/header.php">
 		<operation>
 			<search><![CDATA[
-		$data['cart'] = $this->load->controller('common/cart');
+		$data['analytics'] = array();
             ]]></search>
-			<add position="after"><![CDATA[
+			<add position="before"><![CDATA[
 		try{
 			$this->load->controller('extension/postfinancecheckout/event/includeDeviceIdentifier');
 			
@@ -26,20 +26,10 @@
             ]]></add>
 		</operation>
 	</file>
-	<file path="catalog/view/theme/*/template/common/header.tpl">
-		<operation>
-			<search><![CDATA[
-		<head>
-            ]]></search>
-			<add position="after"><![CDATA[
-		<?php if (isset($postfinancecheckout_cron)) : ?> <img src="<?php echo $postfinancecheckout_cron; ?>" style="display:none;"> <?php endif; ?>
-            ]]></add>
-		</operation>
-	</file>
 	<file path="admin/controller/extension/modification.php">
 		<operation>
 			<search><![CDATA[
-		// Just after modifications are complete, if config settings say maintenance mode is on AND is different org state, then turn it back on
+		// Maintance mode back to original settings
             ]]></search>
 			<add position="before"><![CDATA[
 		$this->load->controller('extension/postfinancecheckout/event/createMethodConfigurationFiles');
diff --git a/upload/system/library/postfinancecheckout/modification/PostFinanceCheckoutJournalCompatibility.ocmod.xml b/upload/system/library/postfinancecheckout/modification/PostFinanceCheckoutJournalCompatibility.ocmod.xml
deleted file mode 100644
index 5a3c302..0000000
--- a/upload/system/library/postfinancecheckout/modification/PostFinanceCheckoutJournalCompatibility.ocmod.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<modification>
-	<code>PostFinanceCheckoutJournalCompatibility</code>
-	<name>postfinancecheckout compatibility: patch for Journal Theme.
-	</name>
-	<version>1.0.1</version>
-	<author>Customweb GmbH</author>
-	<link>http://github.com/postfinancecheckout-payment/opencart</link>
-	<file path="catalog/controller/{journal2,journal3}/checkout.php">
-		<operation>
-			<search><![CDATA[
-		if (isset($this->session->data['error'])) {
-            ]]></search>
-			<add position="before"><![CDATA[
-		require_once modification(DIR_SYSTEM . 'library/postfinancecheckout/helper.php');
-		if (isset($this->request->get['order_id']) && \PostFinanceCheckoutHelper::instance($this->registry)->isValidOrder($this->request->get['order_id'])
-			&& \PostFinanceCheckout\Service\Transaction::instance($this->registry)->waitForStates($this->request->get['order_id'], array(\PostFinanceCheckout\Sdk\Model\TransactionState::FAILED), 5)) {
-			$transaction_info = \PostFinanceCheckout\Entity\TransactionInfo::loadByOrderId($this->registry, $this->request->get['order_id']);
-			unset($this->registry->get('session')->data['order_id']);
-			$this->data['error_warning'] = $transaction_info->getFailureReason();
-		} else 
-            ]]></add>
-		</operation>
-	</file>
-</modification>
diff --git a/upload/system/library/postfinancecheckout/modification/WalleeAdministration.ocmod.xml b/upload/system/library/postfinancecheckout/modification/WalleeAdministration.ocmod.xml
deleted file mode 100644
index d626e83..0000000
--- a/upload/system/library/postfinancecheckout/modification/WalleeAdministration.ocmod.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<modification>
-	<code>PostFinanceCheckoutAdministration</code>
-	<name>postfinancecheckout administration: complete, refund and void from the OpenCart backend.
-	</name>
-	<version>1.0.0</version>
-	<author>Customweb GmbH</author>
-	<link>http://github.com/postfinancecheckout-payment/opencart</link>
-	<file path="admin/controller/sale/order.php">
-		<operation>
-			<search><![CDATA[
-			$this->response->setOutput($this->load->view('sale/order_info.tpl', $data));
-            ]]></search>
-			<add position="before"><![CDATA[
-			$this->load->model('extension/postfinancecheckout/order');
-			$data['postfinancecheckout_buttons'] = $this->model_extension_postfinancecheckout_order->getButtons((int)$this->request->get['order_id']);
-			$data['postfinancecheckout_failed_jobs'] = $this->model_extension_postfinancecheckout_order->getFailedJobs((int)$this->request->get['order_id']);
-            ]]></add>
-		</operation>
-	</file>
-	<!-- order_info.tpl ajax api callback autoremoves all alerts, so must add 
-		with delay. -->
-	<file path="admin/view/template/sale/order_info.tpl">
-		<operation>
-			<search><![CDATA[
-<div id="content">
-            ]]></search>
-			<add position="after"><![CDATA[
-<script src="view/javascript/postfinancecheckout/order.js"></script>
-]]></add>
-		</operation>
-		<operation>
-			<search><![CDATA[
-//--></script>
-            ]]></search>
-			<add position="before"><![CDATA[
-document.orderId = '<?php echo $order_id; ?>';
-document.adminToken = '<?php echo $token; ?>';
-setPostFinanceCheckoutButtons(<?php echo json_encode($postfinancecheckout_buttons); ?>);
-var postfinancecheckout_failed_jobs = <?php echo json_encode($postfinancecheckout_failed_jobs); ?>;
-window.setTimeout(function() {
-	for (var i = 0; i < postfinancecheckout_failed_jobs.length; i++) {
-		addPostFinanceCheckoutError(postfinancecheckout_failed_jobs[i]);
-	}
-}, 500);
-]]></add>
-		</operation>
-	</file>
-</modification>
diff --git a/upload/system/library/postfinancecheckout/modification/WalleeCore.ocmod.xml b/upload/system/library/postfinancecheckout/modification/WalleeCore.ocmod.xml
deleted file mode 100644
index c206816..0000000
--- a/upload/system/library/postfinancecheckout/modification/WalleeCore.ocmod.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<modification>
-	<code>PostFinanceCheckoutCore</code>
-	<name>postfinancecheckout core: load payment methods.
-	</name>
-	<version>1.0.1</version>
-	<author>Customweb GmbH</author>
-	<link>http://github.com/postfinancecheckout-payment/opencart</link>
-	<file path="catalog/controller/checkout/checkout.php">
-		<operation>
-			<search><![CDATA[
-		if (isset($this->session->data['error'])) {
-            ]]></search>
-			<add position="before"><![CDATA[
-		require_once modification(DIR_SYSTEM . 'library/postfinancecheckout/helper.php');
-		if (isset($this->request->get['order_id']) && \PostFinanceCheckoutHelper::instance($this->registry)->isValidOrder($this->request->get['order_id'])
-			&& \PostFinanceCheckout\Service\Transaction::instance($this->registry)->waitForStates($this->request->get['order_id'], array(\PostFinanceCheckout\Sdk\Model\TransactionState::FAILED), 5)) {
-			$transaction_info = \PostFinanceCheckout\Entity\TransactionInfo::loadByOrderId($this->registry, $this->request->get['order_id']);
-			$data['error_warning'] = $transaction_info->getFailureReason();
-		} else 
-            ]]></add>
-		</operation>
-	</file>
-	<file path="admin/controller/extension/payment.php">
-		<operation>
-			<search><![CDATA[
-       				$this->model_extension_extension->uninstall('payment', $value);
-            ]]></search>
-			<add position="replace" offset="2"><![CDATA[
-		            if (strpos($value, 'postfinancecheckout_') === false) {
-		            	$this->model_extension_extension->uninstall('payment', $value);
-		            }
-            ]]></add>
-		</operation>
-		<operation>
-			<search><![CDATA[
-       				unset($extensions[$key]);
-            ]]></search>
-			<add position="replace" offset="2"><![CDATA[
-		            if (strpos($value, 'postfinancecheckout_') === false) {
-		            	unset($extensions[$key]);
-		            }
-            ]]></add>
-		</operation>
-	</file>
-	<file path="admin/controller/error/permission.php">
-		<operation>
-			<search><![CDATA[
-				$ignore = array(
-            ]]></search>
-			<add position="after"><![CDATA[
-					'extension/postfinancecheckout',
-            ]]></add>
-		</operation>
-	</file>
-	<!-- order info -->
-	<file path="system/library/language.php">
-		<operation>
-			<search><![CDATA[
-				is_file($file)
-            ]]></search>
-			<add position="replace"><![CDATA[
-				is_file(modification($file))
-            ]]></add>
-		</operation>
-		<operation>
-			<search><![CDATA[
-				file_exists($file)
-            ]]></search>
-			<add position="replace"><![CDATA[
-				file_exists(modification($file))
-            ]]></add>
-		</operation>
-		<operation>
-			<search><![CDATA[
-				require($file)
-            ]]></search>
-			<add position="replace"><![CDATA[
-				require(modification($file))
-            ]]></add>
-		</operation>
-	</file>
-	
-	<file path="system/engine/action.php">
-		<operation>
-			<search><![CDATA[
-	is_file($file)
-            ]]></search>
-			<add position="replace"><![CDATA[
-	is_file(modification($file))
-            ]]></add>
-		</operation>
-		<operation>
-			<search><![CDATA[
-	is_file($this->file)
-            ]]></search>
-			<add position="replace"><![CDATA[
-	is_file(modification($this->file))
-            ]]></add>
-		</operation>
-		<operation>
-			<search><![CDATA[
-	include_once($file)
-            ]]></search>
-			<add position="replace"><![CDATA[
-	include_once(modification($file))
-            ]]></add>
-		</operation>
-	</file>
-	<file path="system/engine/loader.php">
-		<operation>
-			<search><![CDATA[
-	is_file($file)
-            ]]></search>
-			<add position="replace"><![CDATA[
-	is_file(modification($file))
-            ]]></add>
-		</operation>
-		<operation>
-			<search><![CDATA[
-	file_exists($file)
-            ]]></search>
-			<add position="replace"><![CDATA[
-	file_exists(modification($file))
-            ]]></add>
-		</operation>
-		<operation>
-			<search><![CDATA[
-	require($file)
-            ]]></search>
-			<add position="replace"><![CDATA[
-	require(modification($file))
-            ]]></add>
-		</operation>
-		<operation>
-			<search><![CDATA[
-	include_once($file)
-            ]]></search>
-			<add position="replace"><![CDATA[
-	include_once(modification($file))
-            ]]></add>
-		</operation>
-	</file>
-</modification>
diff --git a/upload/system/library/postfinancecheckout/modification/WalleeEvents.ocmod.xml b/upload/system/library/postfinancecheckout/modification/WalleeEvents.ocmod.xml
deleted file mode 100644
index ed380c9..0000000
--- a/upload/system/library/postfinancecheckout/modification/WalleeEvents.ocmod.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<modification>
-	<code>PostFinanceCheckoutEvents</code>
-	<name>postfinancecheckout events: handle events unavailable in Opencart 2.0.x and 2.1.x.
-	</name>
-	<version>1.0.0</version>
-	<author>Customweb GmbH</author>
-	<link>http://github.com/postfinancecheckout-payment/opencart</link>
-	<file path="catalog/controller/common/header.php">
-		<operation>
-			<search><![CDATA[
-		$data['analytics'] = array();
-            ]]></search>
-			<add position="before"><![CDATA[
-		try{
-			$this->load->controller('extension/postfinancecheckout/event/includeDeviceIdentifier');
-			
-			\PostFinanceCheckoutHelper::instance($this->registry)->refreshWebhook();
-			\PostFinanceCheckout\Entity\Cron::cleanUpHangingCrons($this->registry);
-			\PostFinanceCheckout\Entity\Cron::insertNewPendingCron($this->registry);
-			$postfinancecheckout_cron_token = \PostFinanceCheckout\Entity\Cron::getCurrentSecurityTokenForPendingCron($this->registry);
-			if($postfinancecheckout_cron_token) {
-				$data['postfinancecheckout_cron'] = \PostFinanceCheckoutVersionHelper::createUrl($this->url, 'extension/postfinancecheckout/cron', array('security_token' => $postfinancecheckout_cron_token), $this->config->get('config_secure'));
-			}
-		} catch (Exception $e) { \PostFinanceCheckoutHelper::instance($this->registry)->log($e->getMessage()); }
-            ]]></add>
-		</operation>
-	</file>
-	<file path="admin/controller/extension/modification.php">
-		<operation>
-			<search><![CDATA[
-		// Maintance mode back to original settings
-            ]]></search>
-			<add position="before"><![CDATA[
-		$this->load->controller('extension/postfinancecheckout/event/createMethodConfigurationFiles');
-            ]]></add>
-		</operation>
-	</file>
-</modification>
diff --git a/upload/system/library/postfinancecheckout/service/line_item.php b/upload/system/library/postfinancecheckout/service/line_item.php
index 94e672c..e36adc4 100644
--- a/upload/system/library/postfinancecheckout/service/line_item.php
+++ b/upload/system/library/postfinancecheckout/service/line_item.php
@@ -18,21 +18,12 @@ class LineItem extends AbstractService {
 	private $coupon;
 	private $voucher;
 	private $total;
+	private $xfeepro;
 
 	public static function instance(\Registry $registry){
 		return new self($registry);
 	}
 
-	public function getTotalLineItem($total){
-		$line_item = new \PostFinanceCheckout\Sdk\Model\LineItemCreate();
-		$line_item->setAmountIncludingTax($total);
-		$line_item->setQuantity(1);
-		$line_item->setType(\PostFinanceCheckout\Sdk\Model\LineItemType::PRODUCT);
-		$line_item->setName('temp');
-		$line_item->setUniqueId('temp');
-		return $line_item;
-	}
-
 	/**
 	 * Gets the current order items, with all succesfull refunds applied.
 	 *
@@ -46,7 +37,9 @@ public function getReducedItemsFromOrder(array $order_info, $transaction_id, $sp
 		$this->tax->setShippingAddress($order_info['shipping_country_id'], $order_info['shipping_zone_id']);
 		$this->tax->setPaymentAddress($order_info['payment_country_id'], $order_info['payment_zone_id']);
 		
+		\PostFinanceCheckoutHelper::instance($this->registry)->xfeeproDisableIncVat();
 		$line_items = $this->getItemsFromOrder($order_info, $transaction_id, $space_id);
+		\PostFinanceCheckoutHelper::instance($this->registry)->xfeeproRestoreIncVat();
 		
 		// get all succesfully reduced items
 		$refund_jobs = \PostFinanceCheckout\Entity\RefundJob::loadByOrder($this->registry, $order_info['order_id']);
@@ -127,7 +120,7 @@ public function getItemsFromOrder(array $order_info){
 				break;
 			}
 		}
-		
+				
 		$this->coupon = $this->getCoupon($transaction_info->getCouponCode(), $sub_total, $order_info['customer_id']);
 		
 		return $this->createLineItems($order_info['currency_code']);
@@ -136,10 +129,13 @@ public function getItemsFromOrder(array $order_info){
 	public function getItemsFromSession(){
 		$this->tax = $this->registry->get('tax');
 		
-		$i = 0;
-		$items = array();
-		$fees = array();
-		
+		$session = $this->registry->get('session');
+		if (isset($session->data['shipping_country_id']) && isset($session->data['shipping_country_id'])) {
+			$this->tax->setShippingAddress($session->data['shipping_country_id'], $session->data['shipping_zone_id']);
+		}
+		if (isset($session->data['payment_country_id']) && isset($session->data['payment_zone_id'])) {
+			$this->tax->setPaymentAddress($session->data['payment_country_id'], $session->data['payment_zone_id']);
+		}
 		$this->products = $this->registry->get('cart')->getProducts();
 		
 		if (!empty($this->registry->get('session')->data['vouchers'])) {
@@ -159,7 +155,9 @@ public function getItemsFromSession(){
 			$this->shipping = false;
 		}
 		
+		\PostFinanceCheckoutHelper::instance($this->registry)->xfeeproDisableIncVat();
 		$this->total = \PostFinanceCheckoutVersionHelper::getSessionTotals($this->registry);
+		\PostFinanceCheckoutHelper::instance($this->registry)->xfeeProRestoreIncVat();
 		
 		$sub_total = 0;
 		foreach ($this->total as $total) {
@@ -295,7 +293,7 @@ private function createXFeeLineItem($total){
 		$line_item = new LineItemCreate();
 		$line_item->setName($total['title']);
 		$line_item->setSku($total['code']);
-		$line_item->setUniqueId($total['code']);
+		$line_item->setUniqueId($this->createUniqueIdFromXfee($total));
 		$line_item->setQuantity(1);
 		$line_item->setType(LineItemType::FEE);
 		if ($total['value'] < 0) {
@@ -304,14 +302,49 @@ private function createXFeeLineItem($total){
 		$line_item->setAmountIncludingTax(
 				\PostFinanceCheckoutHelper::instance($this->registry)->formatAmount(
 						\PostFinanceCheckoutHelper::instance($this->registry)->roundXfeeAmount($total['value'])));
-		$fee_id = substr($total['code'], 4);
-		if ($config->get('xfee_tax_class_id' . $fee_id)) {
-			$tax_amount = $this->addTaxesToLineItem($line_item, $total['value'], $config->get('xfee_tax_class_id' . $fee_id));
+		$taxClass = $this->getXfeeTaxClass($total);
+		if ($taxClass) {
+			$tax_amount = $this->addTaxesToLineItem($line_item, $total['value'], $taxClass);
 			$line_item->setAmountIncludingTax(\PostFinanceCheckoutHelper::instance($this->registry)->formatAmount($total['value'] + $tax_amount));
 		}
 		return $this->cleanLineItem($line_item);
 	}
 
+	private function createUniqueIdFromXfee($total){
+		if (isset($total['xcode'])) {
+			return $total['xcode'];
+		}
+		else {
+			return substr($total['code'] . preg_replace("/\W/", "-", $total['title']), 0, 200);
+		}
+	}
+
+	private function getXfeeTaxClass($total){
+		$config = $this->registry->get('config');
+		if ($total['code'] == 'xfee') {
+			for ($i = 0; $i < 12; $i++) {
+				// TODO value comparison percentages
+				if ($config->get('xfee_name' . $i) == $total['title'] /* && $config->get('xfee_value') == $total['value']*/) {
+					return $config->get('xfee_tax_class_id' . $i);
+				}
+			}
+		}
+		else if ($total['code'] == 'xfeepro') {
+			$i = substr($total['xcode'], strlen('xfeepro.xfeepro'));
+			$xfeepro = $this->getXfeePro();
+			return $xfeepro['tax_class_id'][$i];
+		}
+		return null;
+	}
+	
+	private function getXfeePro() {
+		if($this->xfeepro === null) {
+			$config = $this->registry->get('config');
+			$this->xfeepro = $xfeepro = unserialize(base64_decode($config->get('xfeepro')));
+		}
+		return $this->xfeepro;
+	}
+
 	private function createLineItemFromProduct($product){
 		$line_item = new LineItemCreate();
 		$amount_excluding_tax = $product['total'];
@@ -362,7 +395,7 @@ private function createUniqueIdFromProduct($product){
 					$id .= '=' . $option['option_value_id'];
 				}
 			}
-			if(isset($option['value']) && !$hasValue) {
+			if (isset($option['value']) && !$hasValue) {
 				$id .= '_v=' . $option['value'];
 			}
 		}
diff --git a/upload/system/library/postfinancecheckout/service/transaction.php b/upload/system/library/postfinancecheckout/service/transaction.php
index 2480d14..980db25 100644
--- a/upload/system/library/postfinancecheckout/service/transaction.php
+++ b/upload/system/library/postfinancecheckout/service/transaction.php
@@ -281,8 +281,10 @@ public function updateLineItemsFromOrder($order_id){
 		$order_info = \PostFinanceCheckoutHelper::instance($this->registry)->getOrder($order_id);
 		$transaction_info = \PostFinanceCheckout\Entity\TransactionInfo::loadByOrderId($this->registry, $order_id);
 		
+		\PostFinanceCheckoutHelper::instance($this->registry)->xfeeproDisableIncVat();
 		$line_items = \PostFinanceCheckout\Service\LineItem::instance($this->registry)->getItemsFromOrder($order_info,
 				$transaction_info->getTransactionId(), $transaction_info->getSpaceId());
+		\PostFinanceCheckoutHelper::instance($this->registry)->xfeeproRestoreIncVat();
 		
 		$update_request = new \PostFinanceCheckout\Sdk\Model\TransactionLineItemUpdateRequest();
 		$update_request->setTransactionId($transaction_info->getTransactionId());
diff --git a/upload/system/library/postfinancecheckout/version_helper.php b/upload/system/library/postfinancecheckout/version_helper.php
index 8ba154e..321cfdc 100644
--- a/upload/system/library/postfinancecheckout/version_helper.php
+++ b/upload/system/library/postfinancecheckout/version_helper.php
@@ -28,10 +28,6 @@ public static function getModifications(){
 				'file' => 'PostFinanceCheckoutQuickCheckoutCompatibility.ocmod.xml',
 				'default_status' => 0
 			),
-			'PostFinanceCheckoutJournalCompatibility' => array(
-				'file' => 'PostFinanceCheckoutJournalCompatibility.ocmod.xml',
-				'default_status' => 0
-			),
 			'PostFinanceCheckoutXFeeProCompatibility' => array(
 				'file' => 'PostFinanceCheckoutXFeeProCompatibility.ocmod.xml',
 				'default_status' => 0