diff --git a/admin/controller/extension/payment/mollie/base.php b/admin/controller/extension/payment/mollie/base.php
index 1e555ab9..5bd1cd17 100644
--- a/admin/controller/extension/payment/mollie/base.php
+++ b/admin/controller/extension/payment/mollie/base.php
@@ -171,6 +171,18 @@ protected function uninstallAllModules ()
 	 */
 	public function index ()
 	{
+		// Double-check if clean-up has been done - For upgrades
+		$adminThemeDir = DIR_APPLICATION . 'view/template/extension/payment/';
+		if (MollieHelper::isOpenCart3x() || MollieHelper::isOpenCart2x()) {
+			if(file_exists($adminThemeDir . 'mollie_1.tpl')) {
+				$this->cleanUp();
+			}
+		} else {
+			if(file_exists($adminThemeDir . 'mollie.tpl')) {
+				$this->cleanUp();
+			}
+		}
+		
 		// Load essential models
 		$this->load->language("extension/payment/mollie");
 		$this->load->model("setting/setting");
diff --git a/admin/controller/extension/payment/mollie_inghomepay.php b/admin/controller/extension/payment/mollie_inghomepay.php
new file mode 100644
index 00000000..5a936fb9
--- /dev/null
+++ b/admin/controller/extension/payment/mollie_inghomepay.php
@@ -0,0 +1,7 @@
+<?php
+require_once(dirname(__FILE__) . "/mollie/base.php");
+
+class ControllerExtensionPaymentMollieINGHOMEPAY extends ControllerExtensionPaymentMollieBase
+{
+	const MODULE_NAME = MollieHelper::MODULE_NAME_INGHOMEPAY;
+}
diff --git a/admin/language/dutch/extension/payment/mollie.php b/admin/language/dutch/extension/payment/mollie.php
index 13542239..5413067d 100644
--- a/admin/language/dutch/extension/payment/mollie.php
+++ b/admin/language/dutch/extension/payment/mollie.php
@@ -45,6 +45,7 @@
 $_['text_mollie_paysafecard']   = $method_list_logo;
 $_['text_mollie_sofort']        = $method_list_logo;
 $_['text_mollie_giftcard']      = $method_list_logo;
+$_['text_mollie_inghomepay']    = $method_list_logo;
 
 // Heading
 $_['heading_title']         = "Mollie";
@@ -66,6 +67,7 @@
 $_['name_mollie_paysafecard']   = "paysafecard";
 $_['name_mollie_sofort']        = "SOFORT Banking";
 $_['name_mollie_giftcard']      = 'Giftcard';
+$_['name_mollie_inghomepay']    = 'ING Home\'Pay';
 
 // Text
 $_['text_edit']                    = "Bewerk Mollie";
diff --git a/admin/language/dutch/extension/payment/mollie_inghomepay.php b/admin/language/dutch/extension/payment/mollie_inghomepay.php
new file mode 100644
index 00000000..da0693c8
--- /dev/null
+++ b/admin/language/dutch/extension/payment/mollie_inghomepay.php
@@ -0,0 +1,4 @@
+<?php
+require(dirname(__FILE__) . "/mollie.php");
+
+$_['heading_title'] .= " &ndash; " . $_['name_mollie_inghomepay'];
diff --git a/admin/language/en-gb/extension/payment/mollie.php b/admin/language/en-gb/extension/payment/mollie.php
index e8d58912..23f08925 100644
--- a/admin/language/en-gb/extension/payment/mollie.php
+++ b/admin/language/en-gb/extension/payment/mollie.php
@@ -45,6 +45,7 @@
 $_['text_mollie_paysafecard']   = $method_list_logo;
 $_['text_mollie_sofort']        = $method_list_logo;
 $_['text_mollie_giftcard']      = $method_list_logo;
+$_['text_mollie_inghomepay']    = $method_list_logo;
 
 // Heading
 $_['heading_title']           = "Mollie";
@@ -66,6 +67,8 @@
 $_['name_mollie_paysafecard']   = "paysafecard";
 $_['name_mollie_sofort']        = "SOFORT Banking";
 $_['name_mollie_giftcard']      = 'Giftcard';
+$_['name_mollie_inghomepay']    = 'ING Home\'pay';
+
 // Text
 $_['text_edit']                    = "Edit";
 $_['text_payment']                 = "Payment";
diff --git a/admin/language/en-gb/extension/payment/mollie_inghomepay.php b/admin/language/en-gb/extension/payment/mollie_inghomepay.php
new file mode 100644
index 00000000..da0693c8
--- /dev/null
+++ b/admin/language/en-gb/extension/payment/mollie_inghomepay.php
@@ -0,0 +1,4 @@
+<?php
+require(dirname(__FILE__) . "/mollie.php");
+
+$_['heading_title'] .= " &ndash; " . $_['name_mollie_inghomepay'];
diff --git a/admin/language/english/extension/payment/mollie.php b/admin/language/english/extension/payment/mollie.php
index dc9d1fbf..9bc94042 100644
--- a/admin/language/english/extension/payment/mollie.php
+++ b/admin/language/english/extension/payment/mollie.php
@@ -45,6 +45,7 @@
 $_['text_mollie_paysafecard']   = $method_list_logo;
 $_['text_mollie_sofort']        = $method_list_logo;
 $_['text_mollie_giftcard']      = $method_list_logo;
+$_['text_mollie_inghomepay']    = $method_list_logo;
 
 // Heading
 $_['heading_title']           = "Mollie";
@@ -66,6 +67,7 @@
 $_['name_mollie_paysafecard']   = "paysafecard";
 $_['name_mollie_sofort']        = "SOFORT Banking";
 $_['name_mollie_giftcard']      = 'Giftcard';
+$_['name_mollie_inghomepay']    = 'ING Home\'pay';
 
 // Text
 $_['text_edit']                    = "Edit";
diff --git a/admin/language/english/extension/payment/mollie_inghomepay.php b/admin/language/english/extension/payment/mollie_inghomepay.php
new file mode 100644
index 00000000..da0693c8
--- /dev/null
+++ b/admin/language/english/extension/payment/mollie_inghomepay.php
@@ -0,0 +1,4 @@
+<?php
+require(dirname(__FILE__) . "/mollie.php");
+
+$_['heading_title'] .= " &ndash; " . $_['name_mollie_inghomepay'];
diff --git a/admin/language/fr-fr/extension/payment/mollie.php b/admin/language/fr-fr/extension/payment/mollie.php
index e47b4f4b..60565ae2 100644
--- a/admin/language/fr-fr/extension/payment/mollie.php
+++ b/admin/language/fr-fr/extension/payment/mollie.php
@@ -45,6 +45,7 @@
 $_['text_mollie_paysafecard']   = $method_list_logo;
 $_['text_mollie_sofort']        = $method_list_logo;
 $_['text_mollie_giftcard']      = $method_list_logo;
+$_['text_mollie_inghomepay']    = $method_list_logo;
 
 // Heading
 $_['heading_title']           = "Mollie";
@@ -66,7 +67,7 @@
 $_['name_mollie_paysafecard']   = "paysafecard";
 $_['name_mollie_sofort']        = "SOFORT Banking";
 $_['name_mollie_giftcard']      = 'Giftcard';
-
+$_['name_mollie_inghomepay']    = 'ING Home\'pay';
 
 // Text
 $_['text_edit']                    = "Éditer Mollie";
diff --git a/admin/language/fr-fr/extension/payment/mollie_inghomepay.php b/admin/language/fr-fr/extension/payment/mollie_inghomepay.php
new file mode 100644
index 00000000..da0693c8
--- /dev/null
+++ b/admin/language/fr-fr/extension/payment/mollie_inghomepay.php
@@ -0,0 +1,4 @@
+<?php
+require(dirname(__FILE__) . "/mollie.php");
+
+$_['heading_title'] .= " &ndash; " . $_['name_mollie_inghomepay'];
diff --git a/admin/language/french/extension/payment/mollie.php b/admin/language/french/extension/payment/mollie.php
index e47b4f4b..60565ae2 100644
--- a/admin/language/french/extension/payment/mollie.php
+++ b/admin/language/french/extension/payment/mollie.php
@@ -45,6 +45,7 @@
 $_['text_mollie_paysafecard']   = $method_list_logo;
 $_['text_mollie_sofort']        = $method_list_logo;
 $_['text_mollie_giftcard']      = $method_list_logo;
+$_['text_mollie_inghomepay']    = $method_list_logo;
 
 // Heading
 $_['heading_title']           = "Mollie";
@@ -66,7 +67,7 @@
 $_['name_mollie_paysafecard']   = "paysafecard";
 $_['name_mollie_sofort']        = "SOFORT Banking";
 $_['name_mollie_giftcard']      = 'Giftcard';
-
+$_['name_mollie_inghomepay']    = 'ING Home\'pay';
 
 // Text
 $_['text_edit']                    = "Éditer Mollie";
diff --git a/admin/language/french/extension/payment/mollie_inghomepay.php b/admin/language/french/extension/payment/mollie_inghomepay.php
new file mode 100644
index 00000000..da0693c8
--- /dev/null
+++ b/admin/language/french/extension/payment/mollie_inghomepay.php
@@ -0,0 +1,4 @@
+<?php
+require(dirname(__FILE__) . "/mollie.php");
+
+$_['heading_title'] .= " &ndash; " . $_['name_mollie_inghomepay'];
diff --git a/admin/language/nl-nl/extension/payment/mollie.php b/admin/language/nl-nl/extension/payment/mollie.php
index 13542239..b5ec8954 100644
--- a/admin/language/nl-nl/extension/payment/mollie.php
+++ b/admin/language/nl-nl/extension/payment/mollie.php
@@ -45,6 +45,7 @@
 $_['text_mollie_paysafecard']   = $method_list_logo;
 $_['text_mollie_sofort']        = $method_list_logo;
 $_['text_mollie_giftcard']      = $method_list_logo;
+$_['text_mollie_inghomepay']    = $method_list_logo;
 
 // Heading
 $_['heading_title']         = "Mollie";
@@ -66,6 +67,7 @@
 $_['name_mollie_paysafecard']   = "paysafecard";
 $_['name_mollie_sofort']        = "SOFORT Banking";
 $_['name_mollie_giftcard']      = 'Giftcard';
+$_['name_mollie_inghomepay']    = 'ING Home\'pay';
 
 // Text
 $_['text_edit']                    = "Bewerk Mollie";
diff --git a/admin/language/nl-nl/extension/payment/mollie_inghomepay.php b/admin/language/nl-nl/extension/payment/mollie_inghomepay.php
new file mode 100644
index 00000000..da0693c8
--- /dev/null
+++ b/admin/language/nl-nl/extension/payment/mollie_inghomepay.php
@@ -0,0 +1,4 @@
+<?php
+require(dirname(__FILE__) . "/mollie.php");
+
+$_['heading_title'] .= " &ndash; " . $_['name_mollie_inghomepay'];
diff --git a/catalog/controller/extension/payment/mollie/helper.php b/catalog/controller/extension/payment/mollie/helper.php
index e0c58a58..a7620f8d 100644
--- a/catalog/controller/extension/payment/mollie/helper.php
+++ b/catalog/controller/extension/payment/mollie/helper.php
@@ -1,7 +1,7 @@
 <?php
 class MollieHelper
 {
-	const PLUGIN_VERSION = "8.2.3";
+	const PLUGIN_VERSION = "8.3.0";
 
 	// All available modules. These should correspond to the Mollie_API_Object_Method constants.
 	const MODULE_NAME_BANKTRANSFER  = "banktransfer";
@@ -16,6 +16,7 @@ class MollieHelper
 	const MODULE_NAME_SOFORT        = "sofort";
 	const MODULE_NAME_KBC           = "kbc";
 	const MODULE_NAME_GIFTCARD      = "giftcard";
+	const MODULE_NAME_INGHOMEPAY    = "inghomepay";
 
 
 	// List of all available module names.
@@ -32,6 +33,7 @@ class MollieHelper
 		self::MODULE_NAME_SOFORT,
 		self::MODULE_NAME_KBC,
 		self::MODULE_NAME_GIFTCARD,
+		self::MODULE_NAME_INGHOMEPAY
 	);
 
 	static protected $api_client;
diff --git a/catalog/controller/extension/payment/mollie_inghomepay.php b/catalog/controller/extension/payment/mollie_inghomepay.php
new file mode 100644
index 00000000..5a936fb9
--- /dev/null
+++ b/catalog/controller/extension/payment/mollie_inghomepay.php
@@ -0,0 +1,7 @@
+<?php
+require_once(dirname(__FILE__) . "/mollie/base.php");
+
+class ControllerExtensionPaymentMollieINGHOMEPAY extends ControllerExtensionPaymentMollieBase
+{
+	const MODULE_NAME = MollieHelper::MODULE_NAME_INGHOMEPAY;
+}
diff --git a/catalog/language/dutch/extension/payment/mollie.php b/catalog/language/dutch/extension/payment/mollie.php
index 0e8113d3..f730c13e 100644
--- a/catalog/language/dutch/extension/payment/mollie.php
+++ b/catalog/language/dutch/extension/payment/mollie.php
@@ -77,4 +77,5 @@
 $_['method_sofort']                     = 'SOFORT Banking';
 $_['method_paypal']                     = 'PayPal';
 $_['method_paysafecard']                = 'paysafecard';
-$_['method_giftcard']                   = 'Giftcard';
\ No newline at end of file
+$_['method_giftcard']                   = 'Giftcard';
+$_['method_inghomepay']                 = 'ING Home\'Pay';
diff --git a/catalog/language/en-gb/extension/payment/mollie.php b/catalog/language/en-gb/extension/payment/mollie.php
index a6bb11e9..82dbf60c 100644
--- a/catalog/language/en-gb/extension/payment/mollie.php
+++ b/catalog/language/en-gb/extension/payment/mollie.php
@@ -78,3 +78,4 @@
 $_['method_paypal']       = 'PayPal';
 $_['method_paysafecard']  = 'paysafecard';
 $_['method_giftcard']     = 'Giftcard';
+$_['method_inghomepay']   = 'ING Home\'Pay';
diff --git a/catalog/language/english/extension/payment/mollie.php b/catalog/language/english/extension/payment/mollie.php
index f8c5bdc3..b40801b5 100644
--- a/catalog/language/english/extension/payment/mollie.php
+++ b/catalog/language/english/extension/payment/mollie.php
@@ -78,3 +78,4 @@
 $_['method_paypal']       = 'PayPal';
 $_['method_paysafecard']  = 'paysafecard';
 $_['method_giftcard']     = 'Webshop Giftcard';
+$_['method_inghomepay']   = 'ING Home\'Pay';
diff --git a/catalog/language/fr-fr/extension/payment/mollie.php b/catalog/language/fr-fr/extension/payment/mollie.php
index 92467aad..6027c239 100644
--- a/catalog/language/fr-fr/extension/payment/mollie.php
+++ b/catalog/language/fr-fr/extension/payment/mollie.php
@@ -77,4 +77,5 @@
 $_['method_sofort']                     = 'SOFORT Banking';
 $_['method_paypal']                     = 'PayPal';
 $_['method_paysafecard']                = 'paysafecard';
-$_['method_giftcard']                   = 'Giftcard';
\ No newline at end of file
+$_['method_giftcard']                   = 'Giftcard';
+$_['method_inghomepay']   = 'ING Home\'Pay';
diff --git a/catalog/language/french/extension/payment/mollie.php b/catalog/language/french/extension/payment/mollie.php
index ab844aad..1bae1bf8 100644
--- a/catalog/language/french/extension/payment/mollie.php
+++ b/catalog/language/french/extension/payment/mollie.php
@@ -77,4 +77,5 @@
 $_['method_sofort']       = 'SOFORT Banking';
 $_['method_paypal']       = 'PayPal';
 $_['method_paysafecard']  = 'paysafecard';
-$_['method_giftcard']     = 'Giftcard';
\ No newline at end of file
+$_['method_giftcard']     = 'Giftcard';
+$_['method_inghomepay']   = 'ING Home\'Pay';
diff --git a/catalog/language/nl-nl/extension/payment/mollie.php b/catalog/language/nl-nl/extension/payment/mollie.php
index c3313058..2ff554b7 100644
--- a/catalog/language/nl-nl/extension/payment/mollie.php
+++ b/catalog/language/nl-nl/extension/payment/mollie.php
@@ -77,4 +77,5 @@
 $_['method_sofort']       = 'SOFORT Banking';
 $_['method_paypal']       = 'PayPal';
 $_['method_paysafecard']  = 'paysafecard';
-$_['method_giftcard']     = 'Giftcard';
\ No newline at end of file
+$_['method_giftcard']     = 'Giftcard';
+$_['method_inghomepay']   = 'ING Home\'Pay';
diff --git a/catalog/model/extension/payment/mollie_inghomepay.php b/catalog/model/extension/payment/mollie_inghomepay.php
new file mode 100644
index 00000000..7e6f718b
--- /dev/null
+++ b/catalog/model/extension/payment/mollie_inghomepay.php
@@ -0,0 +1,7 @@
+<?php
+require_once(dirname(__FILE__) . "/mollie/base.php");
+
+class ModelExtensionPaymentMollieINGHOMEPAY extends ModelExtensionPaymentMollieBase
+{
+	const MODULE_NAME = MollieHelper::MODULE_NAME_INGHOMEPAY;
+}