diff --git a/.github/workflows/ci_pipe.yml b/.github/workflows/ci_pipe.yml
index f70171a1e..e24d4af56 100644
--- a/.github/workflows/ci_pipe.yml
+++ b/.github/workflows/ci_pipe.yml
@@ -340,6 +340,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - shopware: '6.6.1.0'
+            php: '8.2'
           - shopware: '6.5.8.8'
             php: '8.2'
           - shopware: '6.5.6.1'
diff --git a/.github/workflows/nightly_pipe.yml b/.github/workflows/nightly_pipe.yml
index 81b798699..938f22886 100644
--- a/.github/workflows/nightly_pipe.yml
+++ b/.github/workflows/nightly_pipe.yml
@@ -334,6 +334,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - shopware: '6.6.1.0'
+            php: '8.2'
           - shopware: '6.5.8.8'
             php: '8.2'
           - shopware: '6.5.6.1'
diff --git a/.github/workflows/pr_pipe.yml b/.github/workflows/pr_pipe.yml
index 443752682..968cc6c57 100644
--- a/.github/workflows/pr_pipe.yml
+++ b/.github/workflows/pr_pipe.yml
@@ -333,6 +333,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - shopware: '6.6.1.0'
+            php: '8.2'
           - shopware: '6.5.8.8'
             php: '8.2'
           - shopware: '6.5.5.2'
diff --git a/composer.lock b/composer.lock
index 7f834bfea..01cb399f7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -63,16 +63,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.301.6",
+            "version": "3.301.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "18c0ebd71d3071304f1ea02aa9af75f95863177a"
+                "reference": "23eda9eeb6c44a3ed6a12951b61020dc6048f7f5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/18c0ebd71d3071304f1ea02aa9af75f95863177a",
-                "reference": "18c0ebd71d3071304f1ea02aa9af75f95863177a",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/23eda9eeb6c44a3ed6a12951b61020dc6048f7f5",
+                "reference": "23eda9eeb6c44a3ed6a12951b61020dc6048f7f5",
                 "shasum": ""
             },
             "require": {
@@ -152,9 +152,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.301.6"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.301.9"
             },
-            "time": "2024-03-22T18:05:21+00:00"
+            "time": "2024-03-27T18:26:04+00:00"
         },
         {
             "name": "boxblinkracer/phpunuhi",
@@ -5751,16 +5751,16 @@
         },
         {
             "name": "php-http/discovery",
-            "version": "1.19.2",
+            "version": "1.19.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-http/discovery.git",
-                "reference": "61e1a1eb69c92741f5896d9e05fb8e9d7e8bb0cb"
+                "reference": "7fbed2f92518827eb0ece6bf869f8c6b054d5730"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-http/discovery/zipball/61e1a1eb69c92741f5896d9e05fb8e9d7e8bb0cb",
-                "reference": "61e1a1eb69c92741f5896d9e05fb8e9d7e8bb0cb",
+                "url": "https://api.github.com/repos/php-http/discovery/zipball/7fbed2f92518827eb0ece6bf869f8c6b054d5730",
+                "reference": "7fbed2f92518827eb0ece6bf869f8c6b054d5730",
                 "shasum": ""
             },
             "require": {
@@ -5769,6 +5769,7 @@
             },
             "conflict": {
                 "nyholm/psr7": "<1.0",
+                "sebastian/comparator": ">=5.0",
                 "zendframework/zend-diactoros": "*"
             },
             "provide": {
@@ -5784,7 +5785,7 @@
                 "php-http/httplug": "^1.0 || ^2.0",
                 "php-http/message-factory": "^1.0",
                 "phpspec/phpspec": "^5.1 || ^6.1 || ^7.3",
-                "symfony/phpunit-bridge": "^6.2"
+                "symfony/phpunit-bridge": "^6.4.4 || ^7.0.1"
             },
             "type": "composer-plugin",
             "extra": {
@@ -5823,9 +5824,9 @@
             ],
             "support": {
                 "issues": "https://github.com/php-http/discovery/issues",
-                "source": "https://github.com/php-http/discovery/tree/1.19.2"
+                "source": "https://github.com/php-http/discovery/tree/1.19.3"
             },
-            "time": "2023-11-30T16:49:05+00:00"
+            "time": "2024-03-28T07:38:36+00:00"
         },
         {
             "name": "php-http/multipart-stream-builder",
diff --git a/polyfill/Shopware/Core/Checkout/Payment/Exception/PaymentProcessException.php b/polyfill/Shopware/Core/Checkout/Payment/Exception/PaymentProcessException.php
new file mode 100644
index 000000000..42b8aff71
--- /dev/null
+++ b/polyfill/Shopware/Core/Checkout/Payment/Exception/PaymentProcessException.php
@@ -0,0 +1,36 @@
+<?php declare(strict_types=1);
+
+namespace Shopware\Core\Checkout\Payment\Exception;
+if (class_exists(__NAMESPACE__ . '/PaymentProcessException')) {
+    return;
+}
+use Shopware\Core\Framework\Log\Package;
+use Shopware\Core\Framework\ShopwareHttpException;
+use Symfony\Component\HttpFoundation\Response;
+
+#[Package('checkout')]
+abstract class PaymentProcessException extends ShopwareHttpException
+{
+    private string $orderTransactionId;
+
+    public function __construct(
+        string $orderTransactionId,
+        string $message,
+        array $parameters = [],
+        ?\Throwable $e = null
+    ) {
+        $this->orderTransactionId = $orderTransactionId;
+
+        parent::__construct($message, $parameters, $e);
+    }
+
+    public function getStatusCode(): int
+    {
+        return Response::HTTP_BAD_REQUEST;
+    }
+
+    public function getOrderTransactionId(): string
+    {
+        return $this->orderTransactionId;
+    }
+}
diff --git a/polyfill/Shopware/Core/Checkout/Payment/PaymentException.php b/polyfill/Shopware/Core/Checkout/Payment/PaymentException.php
new file mode 100644
index 000000000..566a68708
--- /dev/null
+++ b/polyfill/Shopware/Core/Checkout/Payment/PaymentException.php
@@ -0,0 +1,25 @@
+<?php
+declare(strict_types=1);
+
+namespace Shopware\Core\Checkout\Payment;
+
+
+if (class_exists(__NAMESPACE__ . '/PaymentException')) {
+    return;
+}
+
+use Shopware\Core\Checkout\Payment\Exception\AsyncPaymentFinalizeException;
+use Shopware\Core\Checkout\Payment\Exception\CustomerCanceledAsyncPaymentException;
+
+class PaymentException
+{
+    public static function asyncFinalizeInterrupted(string $orderTransactionId, string $errorMessage, ?\Throwable $e = null): self
+    {
+        return new AsyncPaymentFinalizeException($orderTransactionId, $errorMessage, $e);
+    }
+
+    public static function customerCanceled(string $orderTransactionId, string $additionalInformation, ?\Throwable $e = null): self
+    {
+        return new CustomerCanceledAsyncPaymentException($orderTransactionId, $additionalInformation, $e);
+    }
+}
\ No newline at end of file
diff --git a/polyfill/Shopware/Core/System/Snippet/Files/AbstractSnippetFile.php b/polyfill/Shopware/Core/System/Snippet/Files/AbstractSnippetFile.php
new file mode 100644
index 000000000..59b4ab1c9
--- /dev/null
+++ b/polyfill/Shopware/Core/System/Snippet/Files/AbstractSnippetFile.php
@@ -0,0 +1,58 @@
+<?php declare(strict_types=1);
+
+namespace Shopware\Core\System\Snippet\Files;
+
+
+if (class_exists(__NAMESPACE__.'/AbstractSnippetFile')) {
+    return;
+}
+
+use Shopware\Core\Framework\Log\Package;
+
+#[Package('system-settings')]
+abstract class AbstractSnippetFile implements SnippetFileInterface
+{
+    /**
+     * Returns the displayed name.
+     *
+     * Example:
+     * storefront.en-GB
+     */
+    abstract public function getName(): string;
+
+    /**
+     * Returns the path to the json language file.
+     *
+     * Example:
+     * /appPath/subDirectory/storefront.en-GB.json
+     */
+    abstract public function getPath(): string;
+
+    /**
+     * Returns the associated language ISO.
+     *
+     * Example:
+     * en-GB
+     * de-DE
+     */
+    abstract public function getIso(): string;
+
+    /**
+     * Return the snippet author, which will be used when editing a file snippet in a snippet set
+     *
+     * Example:
+     * shopware
+     * pluginName
+     */
+    abstract public function getAuthor(): string;
+
+    /**
+     * Returns a boolean which determines if its a base language file
+     */
+    abstract public function isBase(): bool;
+
+    /**
+     * Returns a technical name of the bundle or app that the file is belonged to
+     */
+    abstract public function getTechnicalName(): string;
+}
diff --git a/src/Compatibility/DependencyLoader.php b/src/Compatibility/DependencyLoader.php
index 876795255..4f2e6a166 100644
--- a/src/Compatibility/DependencyLoader.php
+++ b/src/Compatibility/DependencyLoader.php
@@ -40,14 +40,6 @@ public function loadServices(): void
 
         $loader = new XmlFileLoader($containerBuilder, new FileLocator(__DIR__ . '/../Resources/config'));
 
-        # load all our base services that
-        # we need all the time
-        $loader->load('services.xml');
-
-        # now load our base compatibility services
-        # that already wrap our functions for different shopware versions
-        $loader->load('compatibility/base.xml');
-
 
         # load Flow Builder
         $loader->load('compatibility/flowbuilder/all_versions.xml');
@@ -56,25 +48,6 @@ public function loadServices(): void
             $loader->load('compatibility/flowbuilder/6.4.6.0.xml');
         }
 
-        # load other data
-        if ($versionCompare->gte('6.4')) {
-            $loader->load('compatibility/services_6.4.xml');
-        } elseif ($versionCompare->gte('6.3.5.0')) {
-            $loader->load('compatibility/services_6.3.5.0.xml');
-        }
-
-        if ($versionCompare->gte('6.5')) {
-            $loader->load('compatibility/snippets_6.5.xml');
-        } else {
-            $loader->load('compatibility/snippets.xml');
-        }
-
-        if ($versionCompare->gte('6.5')) {
-            $loader->load('compatibility/controller_6.5.xml');
-        } else {
-            $loader->load('compatibility/controller.xml');
-        }
-
 
         $composerDevReqsInstalled = file_exists(__DIR__ . '/../../vendor/bin/phpunit');
 
@@ -126,22 +99,4 @@ public function prepareStorefrontBuild(): void
             # copy($file, $target);
         }
     }
-
-    /**
-     * @param string $pluginPath
-     * @return string
-     */
-    public function getRoutesPath(string $pluginPath): string
-    {
-        /** @var string $version */
-        $version = $this->container->getParameter('kernel.shopware_version');
-
-        $versionCompare = new VersionCompare($version);
-
-        if ($versionCompare->gte('6.5')) {
-            return $pluginPath . '/Resources/config/compatibility/routes/sw65';
-        }
-
-        return $pluginPath . '/Resources/config/compatibility/routes/sw6';
-    }
 }
diff --git a/src/Compatibility/Storefront/Route/PaymentMethodRoute/RemovePaymentMethodRoute63.php b/src/Compatibility/Storefront/Route/PaymentMethodRoute/RemovePaymentMethodRoute63.php
deleted file mode 100644
index 0a4112bfb..000000000
--- a/src/Compatibility/Storefront/Route/PaymentMethodRoute/RemovePaymentMethodRoute63.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Compatibility\Storefront\Route\PaymentMethodRoute;
-
-use Kiener\MolliePayments\Service\Payment\Remover\PaymentMethodRemoverInterface;
-use Shopware\Core\Checkout\Payment\SalesChannel\AbstractPaymentMethodRoute;
-use Shopware\Core\Checkout\Payment\SalesChannel\PaymentMethodRouteResponse;
-use Shopware\Core\System\SalesChannel\SalesChannelContext;
-use Symfony\Component\HttpFoundation\Request;
-
-class RemovePaymentMethodRoute63 extends AbstractPaymentMethodRoute
-{
-    /**
-     * @var AbstractPaymentMethodRoute
-     */
-    private $corePaymentMethodRoute;
-
-    /**
-     * @var PaymentMethodRemoverInterface[]
-     */
-    private $paymentMethodRemovers;
-
-    /**
-     * @param AbstractPaymentMethodRoute                  $corePaymentMethodRoute
-     * @param \Traversable<PaymentMethodRemoverInterface> $paymentMethodRemovers
-     */
-    public function __construct(AbstractPaymentMethodRoute $corePaymentMethodRoute, \Traversable $paymentMethodRemovers)
-    {
-        $this->corePaymentMethodRoute = $corePaymentMethodRoute;
-        $this->paymentMethodRemovers = iterator_to_array($paymentMethodRemovers);
-    }
-
-    /**
-     * @return AbstractPaymentMethodRoute
-     */
-    public function getDecorated(): AbstractPaymentMethodRoute
-    {
-        return $this->corePaymentMethodRoute;
-    }
-
-    /**
-     * @param Request             $request
-     * @param SalesChannelContext $context
-     * @return PaymentMethodRouteResponse
-     */
-    public function load(Request $request, SalesChannelContext $context): PaymentMethodRouteResponse
-    {
-        $originalData = $this->corePaymentMethodRoute->load($request, $context);
-
-        foreach ($this->paymentMethodRemovers as $paymentMethodRemover) {
-            $originalData = $paymentMethodRemover->removePaymentMethods($originalData, $context);
-        }
-
-        return $originalData;
-    }
-}
diff --git a/src/Components/Subscription/DAL/Currency/CurrencyExtension.php b/src/Components/Subscription/DAL/Currency/CurrencyExtension.php
new file mode 100644
index 000000000..889219c04
--- /dev/null
+++ b/src/Components/Subscription/DAL/Currency/CurrencyExtension.php
@@ -0,0 +1,24 @@
+<?php
+declare(strict_types=1);
+
+namespace Kiener\MolliePayments\Components\Subscription\DAL\Currency;
+
+use Kiener\MolliePayments\Components\Subscription\DAL\Subscription\SubscriptionDefinition;
+use Shopware\Core\Framework\DataAbstractionLayer\EntityExtension;
+use Shopware\Core\Framework\DataAbstractionLayer\Field\Flag\CascadeDelete;
+use Shopware\Core\Framework\DataAbstractionLayer\Field\OneToManyAssociationField;
+use Shopware\Core\Framework\DataAbstractionLayer\FieldCollection;
+use Shopware\Core\System\Currency\CurrencyDefinition;
+
+class CurrencyExtension extends EntityExtension
+{
+    public function getDefinitionClass(): string
+    {
+        return CurrencyDefinition::class;
+    }
+
+    public function extendFields(FieldCollection $collection): void
+    {
+        $collection->add((new OneToManyAssociationField('subscriptions', SubscriptionDefinition::class, 'currency_id'))->addFlags(new CascadeDelete()));
+    }
+}
diff --git a/src/Components/Subscription/DAL/Repository/SubscriptionRepository.php b/src/Components/Subscription/DAL/Repository/SubscriptionRepository.php
index d233a3615..e8ad06a4d 100644
--- a/src/Components/Subscription/DAL/Repository/SubscriptionRepository.php
+++ b/src/Components/Subscription/DAL/Repository/SubscriptionRepository.php
@@ -11,6 +11,7 @@
 use Kiener\MolliePayments\Components\Subscription\Exception\SubscriptionNotFoundException;
 use Shopware\Core\Framework\Context;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
+use Shopware\Core\Framework\DataAbstractionLayer\Pricing\CashRoundingConfig;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\EntitySearchResult;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
@@ -61,6 +62,7 @@ public function findById(string $id, Context $context): SubscriptionEntity
         $criteria = new Criteria([$id]);
         $criteria->addAssociation('customer');
         $criteria->addAssociation('historyEntries');
+        $criteria->addAssociation('currency');
 
         $result = $this->repoSubscriptions->search($criteria, $context);
 
@@ -80,6 +82,7 @@ public function findById(string $id, Context $context): SubscriptionEntity
     public function findByMandateId(string $customerId, string $mandateId, Context $context): SubscriptionCollection
     {
         $criteria = new Criteria();
+        $criteria->addAssociation('currency');
         $criteria->addFilter(new EqualsFilter('customerId', $customerId));
         $criteria->addFilter(new EqualsFilter('mandateId', $mandateId));
 
@@ -111,6 +114,7 @@ public function findByCustomer(string $swCustomerId, bool $includedPending, Cont
         $criteria = new Criteria();
         $criteria->addAssociation('customer');
         $criteria->addAssociation('historyEntries');
+        $criteria->addAssociation('currency');
         $criteria->addFilter(new EqualsFilter('customerId', $swCustomerId));
 
         if (!$includedPending) {
@@ -137,7 +141,7 @@ public function findByReminderRangeReached(string $salesChannelId, Context $cont
 
         $criteria = new Criteria();
         $criteria->addAssociation('customer');
-
+        $criteria->addAssociation('currency');
         # subscription is not canceled
         $criteria->addFilter(new EqualsFilter('canceledAt', null));
         $criteria->addFilter(new EqualsFilter('salesChannelId', $salesChannelId));
@@ -157,6 +161,7 @@ public function findPendingSubscriptions(string $orderId, Context $context): Ent
     {
         $criteria = new Criteria();
         $criteria->addAssociation('customer');
+        $criteria->addAssociation('currency');
 
         $criteria->addFilter(new EqualsFilter('orderId', $orderId));
         $criteria->addFilter(new EqualsFilter('mollieId', null));
@@ -185,6 +190,18 @@ public function search(Criteria $criteria, Context $context): EntitySearchResult
      */
     public function insertSubscription(SubscriptionEntity $subscription, string $status, Context $context): void
     {
+        $totalRoundingValue = null;
+        $totalRounding = $subscription->getTotalRounding();
+        if ($totalRounding instanceof CashRoundingConfig) {
+            $totalRoundingValue = $totalRounding->jsonSerialize();
+        }
+
+        $itemRoundingValue = null;
+        $itemRounding = $subscription->getItemRounding();
+        if ($itemRounding instanceof CashRoundingConfig) {
+            $itemRoundingValue = $itemRounding->jsonSerialize();
+        }
+
         $this->repoSubscriptions->create(
             [
                 [
@@ -204,11 +221,13 @@ public function insertSubscription(SubscriptionEntity $subscription, string $sta
                     'description' => $subscription->getDescription(),
                     'amount' => $subscription->getAmount(),
                     'quantity' => $subscription->getQuantity(),
-                    'currency' => $subscription->getCurrency(),
+                    'currencyId' => $subscription->getCurrencyId(),
                     'metadata' => $subscription->getMetadata()->toArray(),
                     'productId' => $subscription->getProductId(),
                     'orderId' => $subscription->getOrderId(),
                     'salesChannelId' => $subscription->getSalesChannelId(),
+                    'totalRounding' => $totalRoundingValue,
+                    'itemRounding' => $itemRoundingValue,
                 ]
             ],
             $context
diff --git a/src/Components/Subscription/DAL/Subscription/SubscriptionDefinition.php b/src/Components/Subscription/DAL/Subscription/SubscriptionDefinition.php
index af111697a..981c1f921 100755
--- a/src/Components/Subscription/DAL/Subscription/SubscriptionDefinition.php
+++ b/src/Components/Subscription/DAL/Subscription/SubscriptionDefinition.php
@@ -8,6 +8,7 @@
 use Shopware\Core\Checkout\Order\OrderDefinition;
 use Shopware\Core\Content\Product\ProductDefinition;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityDefinition;
+use Shopware\Core\Framework\DataAbstractionLayer\Field\CashRoundingConfigField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\CreatedAtField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\DateTimeField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\FkField;
@@ -25,6 +26,7 @@
 use Shopware\Core\Framework\DataAbstractionLayer\Field\StringField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\UpdatedAtField;
 use Shopware\Core\Framework\DataAbstractionLayer\FieldCollection;
+use Shopware\Core\System\Currency\CurrencyDefinition;
 use Shopware\Core\System\SalesChannel\SalesChannelDefinition;
 
 class SubscriptionDefinition extends EntityDefinition
@@ -72,7 +74,7 @@ protected function defineFields(): FieldCollection
             (new StringField('description', 'description'))->addFlags(new ApiAware()),
             (new FloatField('amount', 'amount'))->addFlags(new ApiAware()),
             (new IntField('quantity', 'quantity'))->addFlags(new ApiAware()),
-            (new StringField('currency', 'currency'))->addFlags(new ApiAware()),
+            (new FkField('currency_id', 'currencyId', CurrencyDefinition::class))->addFlags(new ApiAware(), new Required()),
             (new JsonField('metadata', 'metadata')),
 
             # --------------------------------------------------------------------------------------------------------------------------
@@ -94,7 +96,7 @@ protected function defineFields(): FieldCollection
 
             (new FkField('billing_address_id', 'billingAddressId', SalesChannelDefinition::class))->addFlags(new ApiAware()),
             (new FkField('shipping_address_id', 'shippingAddressId', SalesChannelDefinition::class))->addFlags(new ApiAware()),
-
+            (new FkField('currency_id', 'currencyId', CurrencyDefinition::class))->addFlags(new ApiAware()),
             new CreatedAtField(),
             new UpdatedAtField(),
 
@@ -106,13 +108,15 @@ protected function defineFields(): FieldCollection
             # --------------------------------------------------------------------------------------------------------------------------
 
             new ManyToOneAssociationField('customer', 'customer_id', CustomerDefinition::class, 'id', false),
-
+            new ManyToOneAssociationField('currency', 'currency_id', CurrencyDefinition::class, 'id', false),
             new OneToManyAssociationField('addresses', SubscriptionAddressDefinition::class, 'subscription_id'),
             new OneToManyAssociationField('historyEntries', SubscriptionHistoryDefinition::class, 'subscription_id'),
 
             new OneToOneAssociationField('billingAddress', 'billing_address_id', 'id', SubscriptionAddressDefinition::class, true),
             new OneToOneAssociationField('shippingAddress', 'shipping_address_id', 'id', SubscriptionAddressDefinition::class, true),
 
+            (new CashRoundingConfigField('total_rounding', 'totalRounding'))->addFlags(new Required()),
+            (new CashRoundingConfigField('item_rounding', 'itemRounding'))->addFlags(new Required()),
         ]);
     }
 }
diff --git a/src/Components/Subscription/DAL/Subscription/SubscriptionEntity.php b/src/Components/Subscription/DAL/Subscription/SubscriptionEntity.php
index dfae15c2a..ac739b570 100644
--- a/src/Components/Subscription/DAL/Subscription/SubscriptionEntity.php
+++ b/src/Components/Subscription/DAL/Subscription/SubscriptionEntity.php
@@ -11,6 +11,8 @@
 use Shopware\Core\Checkout\Customer\CustomerEntity;
 use Shopware\Core\Framework\DataAbstractionLayer\Entity;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityIdTrait;
+use Shopware\Core\Framework\DataAbstractionLayer\Pricing\CashRoundingConfig;
+use Shopware\Core\System\Currency\CurrencyEntity;
 
 class SubscriptionEntity extends Entity
 {
@@ -58,7 +60,7 @@ class SubscriptionEntity extends Entity
     protected $quantity;
 
     /**
-     * @var string
+     * @var ?CurrencyEntity
      */
     protected $currency;
 
@@ -143,6 +145,20 @@ class SubscriptionEntity extends Entity
      */
     protected $historyEntries;
 
+    /**
+     * @var string
+     */
+    protected $currencyId;
+
+    /**
+     * @var ?CashRoundingConfig
+     */
+    protected $totalRounding;
+
+    /**
+     * @var ?CashRoundingConfig
+     */
+    protected $itemRounding;
     # --------------------------------------------------------------------------------
 
     /**
@@ -277,17 +293,17 @@ public function setQuantity(int $quantity): void
     }
 
     /**
-     * @return string
+     * @return ?CurrencyEntity
      */
-    public function getCurrency(): string
+    public function getCurrency(): ?CurrencyEntity
     {
-        return (string)$this->currency;
+        return $this->currency;
     }
 
     /**
-     * @param string $currency
+     * @param CurrencyEntity $currency
      */
-    public function setCurrency(string $currency): void
+    public function setCurrency(CurrencyEntity $currency): void
     {
         $this->currency = $currency;
     }
@@ -669,4 +685,35 @@ public function setHistoryEntries(SubscriptionHistoryCollection $historyEntries)
     {
         $this->historyEntries = $historyEntries;
     }
+
+    public function setCurrencyId(string $currencyId):void
+    {
+        $this->currencyId = $currencyId;
+    }
+
+    public function getCurrencyId(): ?string
+    {
+        return $this->currencyId;
+    }
+
+
+    public function setTotalRounding(?CashRoundingConfig $totalRounding): void
+    {
+        $this->totalRounding = $totalRounding;
+    }
+
+    public function getTotalRounding(): ?CashRoundingConfig
+    {
+        return $this->totalRounding;
+    }
+
+    public function getItemRounding(): ?CashRoundingConfig
+    {
+        return $this->itemRounding;
+    }
+
+    public function setItemRounding(?CashRoundingConfig $itemRounding): void
+    {
+        $this->itemRounding = $itemRounding;
+    }
 }
diff --git a/src/Components/Subscription/Services/Builder/MollieDataBuilder.php b/src/Components/Subscription/Services/Builder/MollieDataBuilder.php
index 5989d793b..1fbcd911e 100755
--- a/src/Components/Subscription/Services/Builder/MollieDataBuilder.php
+++ b/src/Components/Subscription/Services/Builder/MollieDataBuilder.php
@@ -35,10 +35,15 @@ public function buildRequestPayload(SubscriptionEntity $subscription, string $st
     {
         $intervalValue = $interval . ' ' . $intervalUnit;
         $timesValue = ($times > 0) ? $times : null;
+        $currency = $subscription->getCurrency();
+        $currencyIso = '';
 
+        if ($currency !== null) {
+            $currencyIso = $currency->getIsoCode();
+        }
         return [
             'amount' => [
-                'currency' => $subscription->getCurrency(),
+                'currency' => $currencyIso,
                 'value' => number_format($subscription->getAmount(), 2, '.', '')
             ],
             'description' => $subscription->getDescription(),
diff --git a/src/Components/Subscription/Services/Builder/SubscriptionBuilder.php b/src/Components/Subscription/Services/Builder/SubscriptionBuilder.php
index c253d8c21..6c957fbce 100755
--- a/src/Components/Subscription/Services/Builder/SubscriptionBuilder.php
+++ b/src/Components/Subscription/Services/Builder/SubscriptionBuilder.php
@@ -91,7 +91,10 @@ private function buildItemSubscription(OrderLineItemEntity $lineItem, OrderEntit
         # as promotions.  because we only offer subscriptions as a 1-item order without mixed carts,
         # this is the perfect way to still have shopware doing every calculation.
         $subscriptionEntity->setAmount($order->getAmountTotal());
-        $subscriptionEntity->setCurrency($order->getCurrency()->getIsoCode());
+        $subscriptionEntity->setCurrencyId($order->getCurrency()->getId());
+        $subscriptionEntity->setTotalRounding($order->getTotalRounding());
+
+        $subscriptionEntity->setCurrency($order->getCurrency());
 
         $subscriptionEntity->setQuantity($lineItem->getQuantity());
 
@@ -99,7 +102,8 @@ private function buildItemSubscription(OrderLineItemEntity $lineItem, OrderEntit
         $subscriptionEntity->setProductId((string)$lineItem->getProductId());
         $subscriptionEntity->setOrderId($order->getId());
         $subscriptionEntity->setSalesChannelId($order->getSalesChannelId());
-
+        $subscriptionEntity->setTotalRounding($order->getTotalRounding());
+        $subscriptionEntity->setItemRounding($order->getItemRounding());
 
         # calculate our first start date.
         # this is our current date (now) + 1x the planned interval.
diff --git a/src/Components/Subscription/Services/Installer/MailTemplateInstaller.php b/src/Components/Subscription/Services/Installer/MailTemplateInstaller.php
index 613895408..7e4ae45ca 100644
--- a/src/Components/Subscription/Services/Installer/MailTemplateInstaller.php
+++ b/src/Components/Subscription/Services/Installer/MailTemplateInstaller.php
@@ -14,6 +14,7 @@
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
 use Shopware\Core\Framework\Uuid\Uuid;
+use Shopware\Core\System\Currency\CurrencyEntity;
 use Shopware\Core\System\SalesChannel\SalesChannelEntity;
 
 class MailTemplateInstaller
@@ -77,11 +78,14 @@ public function install(Context $context): void
         # ----------------------------------------------------------------------------------------------
         # update our sample data for the admin mail preview
 
+        $currencyEntity = new CurrencyEntity();
+        $currencyEntity->setIsoCode('EUR');
+
         $subscription = new SubscriptionEntity();
         $subscription->setDescription('1x Sample Product (Order #1233, 24.99 EUR)');
         $subscription->setQuantity(1);
         $subscription->setAmount(24.99);
-        $subscription->setCurrency('EUR');
+        $subscription->setCurrency($currencyEntity);
         $subscription->setMollieCustomerId('cst_123456');
         $subscription->setMollieId('sub_123456');
         $subscription->setNextPaymentAt(new \DateTime());
diff --git a/src/Controller/Api/Order/OrderControllerBase.php b/src/Controller/Api/Order/OrderControllerBase.php
index cea234cda..fcf6a8b30 100644
--- a/src/Controller/Api/Order/OrderControllerBase.php
+++ b/src/Controller/Api/Order/OrderControllerBase.php
@@ -27,7 +27,6 @@ public function __construct(OrderService $orderService, Order $mollieOrderServic
     }
 
     /**
-     * @Route("/api/_action/mollie/order/payment-url", name="api.action.mollie.order.payment-url", methods={"POST"})
      *
      * @param Request $request
      *
@@ -41,7 +40,6 @@ public function paymentUrl(Request $request, Context $context): JsonResponse
     }
 
     /**
-     * @Route("/api/v{version}/_action/mollie/order/payment-url", name="api.action.mollie.order.payment-url.legacy", methods={"POST"})
      *
      * @param Request $request
      *
diff --git a/src/Controller/Api/Order/RefundControllerBase.php b/src/Controller/Api/Order/RefundControllerBase.php
index 28db68e53..1e1628dc8 100644
--- a/src/Controller/Api/Order/RefundControllerBase.php
+++ b/src/Controller/Api/Order/RefundControllerBase.php
@@ -65,7 +65,6 @@ public function __construct(OrderService $orderService, RefundManagerInterface $
     # OPERATIONAL APIs
 
     /**
-     * @Route("/api/mollie/refund/order", name="api.mollie.refund.order", methods={"GET"})
      *
      * @param QueryDataBag $query
      * @param Context $context
@@ -104,7 +103,6 @@ public function refundOrderNumber(QueryDataBag $query, Context $context): JsonRe
     # TECHNICAL ADMIN APIs
 
     /**
-     * @Route("/api/_action/mollie/refund-manager/data", name="api.action.mollie.refund-manager.data", methods={"POST"})
      *
      * @param RequestDataBag $data
      * @param Context $context
@@ -132,7 +130,6 @@ public function refundManagerData(RequestDataBag $data, Context $context): JsonR
     }
 
     /**
-     * @Route("/api/_action/mollie/refund/list",name="api.action.mollie.refund.list", methods={"POST"})
      *
      * @param RequestDataBag $data
      * @param Context $context
@@ -144,7 +141,6 @@ public function list(RequestDataBag $data, Context $context): JsonResponse
     }
 
     /**
-     * @Route("/api/_action/mollie/refund/total", name="api.action.mollie.refund.total", methods={"POST"})
      *
      * @param RequestDataBag $data
      * @param Context $context
@@ -156,7 +152,6 @@ public function total(RequestDataBag $data, Context $context): JsonResponse
     }
 
     /**
-     * @Route("/api/_action/mollie/refund", name="api.action.mollie.refund", methods={"POST"})
      *
      * @param RequestDataBag $data
      * @param Context $context
@@ -188,7 +183,6 @@ public function refundOrderID(RequestDataBag $data, Context $context): JsonRespo
     }
 
     /**
-     * @Route("/api/_action/mollie/refund/cancel", name="api.action.mollie.refund.cancel", methods={"POST"})
      *
      * @param RequestDataBag $data
      * @param Context $context
@@ -200,7 +194,6 @@ public function cancel(RequestDataBag $data, Context $context): JsonResponse
     }
 
     /**
-     * @Route("/api/v{version}/_action/mollie/refund-manager/data", name="api.action.mollie.refund-manager.data.legacy", methods={"POST"})
      *
      * @param RequestDataBag $data
      * @param Context $context
@@ -212,7 +205,6 @@ public function refundManagerDataLegacy(RequestDataBag $data, Context $context):
     }
 
     /**
-     * @Route("/api/v{version}/_action/mollie/refund/list", name="api.action.mollie.refund.list.legacy", methods={"POST"})
      *
      * @param RequestDataBag $data
      * @param Context $context
@@ -224,7 +216,6 @@ public function listLegacy(RequestDataBag $data, Context $context): JsonResponse
     }
 
     /**
-     * @Route("/api/v{version}/_action/mollie/refund/total", name="api.action.mollie.refund.total.legacy", methods={"POST"})
      *
      * @param RequestDataBag $data
      * @param Context $context
@@ -236,7 +227,6 @@ public function totalLegacy(RequestDataBag $data, Context $context): JsonRespons
     }
 
     /**
-     * @Route("/api/v{version}/_action/mollie/refund", name="api.action.mollie.refund.legacy", methods={"POST"})
      *
      * @param RequestDataBag $data
      * @param Context $context
@@ -248,7 +238,6 @@ public function refundLegacy(RequestDataBag $data, Context $context): JsonRespon
     }
 
     /**
-     * @Route("/api/v{version}/_action/mollie/refund/cancel", name="api.action.mollie.refund.cancel.legacy", methods={"POST"})
      *
      * @param RequestDataBag $data
      * @param Context $context
diff --git a/src/Controller/Api/Order/ShippingControllerBase.php b/src/Controller/Api/Order/ShippingControllerBase.php
index 5c6adc1fe..91cc3dafd 100644
--- a/src/Controller/Api/Order/ShippingControllerBase.php
+++ b/src/Controller/Api/Order/ShippingControllerBase.php
@@ -57,7 +57,6 @@ public function __construct(ShipmentManager $shipmentFacade, OrderService $order
 
 
     /**
-     * @Route("/api/_action/mollie/ship/status", name="api.action.mollie.ship.status", methods={"POST"})
      *
      * @param RequestDataBag $data
      * @param Context $context
@@ -69,7 +68,6 @@ public function status(RequestDataBag $data, Context $context): JsonResponse
     }
 
     /**
-     * @Route("/api/v{version}/_action/mollie/ship/status", name="api.action.mollie.ship.status.legacy", methods={"POST"})
      *
      * @param RequestDataBag $data
      * @param Context $context
@@ -81,7 +79,6 @@ public function statusLegacy(RequestDataBag $data, Context $context): JsonRespon
     }
 
     /**
-     * @Route("/api/_action/mollie/ship/total", name="api.action.mollie.ship.total", methods={"POST"})
      *
      * @param RequestDataBag $data
      * @param Context $context
@@ -93,7 +90,6 @@ public function total(RequestDataBag $data, Context $context): JsonResponse
     }
 
     /**
-     * @Route("/api/v{version}/_action/mollie/ship/total", name="api.action.mollie.ship.total.legacy", methods={"POST"})
      *
      * @param RequestDataBag $data
      * @param Context $context
@@ -110,8 +106,6 @@ public function totalLegacy(RequestDataBag $data, Context $context): JsonRespons
      * This shipment is based on ship all or rest of items automatically.
      * It can be used by 3rd parties, ERP systems and more.
      *
-     * @Route("/api/mollie/ship/order", name="api.mollie.ship.order", methods={"POST"})
-     *
      * @param Request $request
      * @param Context $context
      * @return JsonResponse
@@ -172,8 +166,6 @@ public function shipOrderOperational(Request $request, Context $context): JsonRe
      * It can be used by 3rd parties, ERP systems and more.
      * This comes without tracking information. Please use the POST version.
      *
-     * @Route("/api/mollie/ship/order", name="api.mollie.ship.order.deprecated", methods={"GET"})
-     *
      * @param QueryDataBag $query
      * @param Context $context
      * @return JsonResponse
@@ -219,8 +211,6 @@ public function shipOrderOperationalDeprecated(QueryDataBag $query, Context $con
      * This shipment requires a valid list of line items to be provided.
      * It can be used by 3rd parties, ERP systems and more.
      *
-     * @Route("/api/mollie/ship/order/batch", name="api.mollie.ship.order.batch", methods={"POST"})
-     *
      * @param Request $request
      * @param Context $context
      * @return JsonResponse
@@ -323,8 +313,6 @@ public function shipOrderBatchOperational(Request $request, Context $context): J
      * This is the custom operational route for shipping items using the API.
      * It can be used by 3rd parties, ERP systems and more.
      *
-     * @Route("/api/mollie/ship/item", name="api.mollie.ship.item", methods={"POST"})
-     *
      * @param Request $request
      * @param Context $context
      * @throws \Exception
@@ -397,8 +385,6 @@ public function shipItemOperational(Request $request, Context $context): JsonRes
      * It can be used by 3rd parties, ERP systems and more.
      *  This comes without tracking information. Please use the POST version.
      *
-     * @Route("/api/mollie/ship/item", name="api.mollie.ship.item.deprecated", methods={"GET"})
-     *
      * @param QueryDataBag $query
      * @param Context $context
      * @throws \Exception
@@ -455,8 +441,6 @@ public function shipItemOperationalDeprecated(QueryDataBag $query, Context $cont
     /**
      * This is the plain action API route that is used in the Shopware Administration.
      *
-     * @Route("/api/_action/mollie/ship", name="api.action.mollie.ship.order", methods={"POST"})
-     *
      * @param RequestDataBag $data
      * @param Context $context
      * @return JsonResponse
@@ -485,7 +469,6 @@ public function shipOrderAdmin(RequestDataBag $data, Context $context): JsonResp
     }
 
     /**
-     * @Route("/api/v{version}/_action/mollie/ship", name="api.action.mollie.ship.order.legacy", methods={"POST"})
      *
      * @param RequestDataBag $data
      * @param Context $context
@@ -517,8 +500,6 @@ public function shipOrderAdminLegacy(RequestDataBag $data, Context $context): Js
     /**
      * This is the plain action API route that is used in the Shopware Administration.
      *
-     * @Route("/api/_action/mollie/ship/item", name="api.action.mollie.ship.item", methods={"POST"})
-     *
      * @param RequestDataBag $data
      * @param Context $context
      * @return JsonResponse
@@ -544,7 +525,6 @@ public function shipItemAdmin(RequestDataBag $data, Context $context): JsonRespo
     }
 
     /**
-     * @Route("/api/v{version}/_action/mollie/ship/item", name="api.action.mollie.ship.item.legacy", methods={"POST"})
      *
      * @param RequestDataBag $data
      * @param Context $context
diff --git a/src/Controller/Api/Order/Sw6/OrderController.php b/src/Controller/Api/Order/Sw6/OrderController.php
deleted file mode 100644
index eeef3cfad..000000000
--- a/src/Controller/Api/Order/Sw6/OrderController.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Kiener\MolliePayments\Controller\Api\Order\Sw6;
-
-use Kiener\MolliePayments\Controller\Api\Order\OrderControllerBase;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @RouteScope(scopes={"api"})
- * @Route(defaults={"auth_required"=true, "auth_enabled"=true})
- */
-class OrderController extends OrderControllerBase
-{
-}
diff --git a/src/Controller/Api/Order/Sw6/RefundController.php b/src/Controller/Api/Order/Sw6/RefundController.php
deleted file mode 100644
index 012b9059a..000000000
--- a/src/Controller/Api/Order/Sw6/RefundController.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Kiener\MolliePayments\Controller\Api\Order\Sw6;
-
-use Kiener\MolliePayments\Controller\Api\Order\RefundControllerBase;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @RouteScope(scopes={"api"})
- * @Route(defaults={"auth_required"=true, "auth_enabled"=true})
- */
-class RefundController extends RefundControllerBase
-{
-}
diff --git a/src/Controller/Api/Order/Sw6/ShippingController.php b/src/Controller/Api/Order/Sw6/ShippingController.php
deleted file mode 100644
index c7a9086f2..000000000
--- a/src/Controller/Api/Order/Sw6/ShippingController.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\Api\Order\Sw6;
-
-use Kiener\MolliePayments\Controller\Api\Order\ShippingControllerBase;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @RouteScope(scopes={"api"})
- * @Route(defaults={"auth_required"=true, "auth_enabled"=true})
- */
-class ShippingController extends ShippingControllerBase
-{
-}
diff --git a/src/Controller/Api/Order/Sw65/OrderController.php b/src/Controller/Api/Order/Sw65/OrderController.php
deleted file mode 100644
index 2a285ee37..000000000
--- a/src/Controller/Api/Order/Sw65/OrderController.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Kiener\MolliePayments\Controller\Api\Order\Sw65;
-
-use Kiener\MolliePayments\Controller\Api\Order\OrderControllerBase;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @Route(defaults={"_routeScope"={"api"}, "auth_required"=true, "auth_enabled"=true})
- */
-class OrderController extends OrderControllerBase
-{
-}
diff --git a/src/Controller/Api/Order/Sw65/RefundController.php b/src/Controller/Api/Order/Sw65/RefundController.php
deleted file mode 100644
index e7b8e5b97..000000000
--- a/src/Controller/Api/Order/Sw65/RefundController.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Kiener\MolliePayments\Controller\Api\Order\Sw65;
-
-use Kiener\MolliePayments\Controller\Api\Order\RefundControllerBase;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @Route(defaults={"_routeScope"={"api"}, "auth_required"=true, "auth_enabled"=true})
- */
-class RefundController extends RefundControllerBase
-{
-}
diff --git a/src/Controller/Api/Order/Sw65/ShippingController.php b/src/Controller/Api/Order/Sw65/ShippingController.php
deleted file mode 100644
index 4de34ce1e..000000000
--- a/src/Controller/Api/Order/Sw65/ShippingController.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\Api\Order\Sw65;
-
-use Kiener\MolliePayments\Controller\Api\Order\ShippingControllerBase;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @Route(defaults={"_routeScope"={"api"}, "auth_required"=true, "auth_enabled"=true})
- */
-class ShippingController extends ShippingControllerBase
-{
-}
diff --git a/src/Controller/Api/Payment/ReturnControllerBase.php b/src/Controller/Api/Payment/ReturnControllerBase.php
index 5a4f01300..9e5c58fe8 100644
--- a/src/Controller/Api/Payment/ReturnControllerBase.php
+++ b/src/Controller/Api/Payment/ReturnControllerBase.php
@@ -29,7 +29,6 @@ public function __construct(PaymentReturnFacade $returnFacade)
 
 
     /**
-     * @Route("/api/mollie/payment/return/{swTransactionId}", name="api.mollie.payment-return", methods={"GET", "POST"})
      *
      * @param string $swTransactionId
      * @param Context $context
@@ -42,7 +41,6 @@ public function returnAction(string $swTransactionId, Context $context): ?Respon
     }
 
     /**
-     * @Route("/api/v{version}/mollie/payment/return/{swTransactionId}", name="api.mollie.payment-return-legacy", methods={"GET", "POST"})
      *
      * @param string $swTransactionId
      * @param Context $context
diff --git a/src/Controller/Api/Payment/Sw6/ReturnController.php b/src/Controller/Api/Payment/Sw6/ReturnController.php
deleted file mode 100644
index 2ce3887b9..000000000
--- a/src/Controller/Api/Payment/Sw6/ReturnController.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Kiener\MolliePayments\Controller\Api\Payment\Sw6;
-
-use Kiener\MolliePayments\Controller\Api\Payment\ReturnControllerBase;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @RouteScope(scopes={"api"})
- * @Route(defaults={"auth_required"=false, "auth_enabled"=false})
- */
-class ReturnController extends ReturnControllerBase
-{
-}
diff --git a/src/Controller/Api/Payment/Sw65/ReturnController.php b/src/Controller/Api/Payment/Sw65/ReturnController.php
deleted file mode 100644
index b2c079a0e..000000000
--- a/src/Controller/Api/Payment/Sw65/ReturnController.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Kiener\MolliePayments\Controller\Api\Payment\Sw65;
-
-use Kiener\MolliePayments\Controller\Api\Payment\ReturnControllerBase;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @Route(defaults={"_routeScope"={"api"}, "auth_required"=false, "auth_enabled"=false})
- */
-class ReturnController extends ReturnControllerBase
-{
-}
diff --git a/src/Controller/Api/PaymentMethod/PaymentMethodControllerBase.php b/src/Controller/Api/PaymentMethod/PaymentMethodControllerBase.php
index d18a9aca5..1924ed530 100644
--- a/src/Controller/Api/PaymentMethod/PaymentMethodControllerBase.php
+++ b/src/Controller/Api/PaymentMethod/PaymentMethodControllerBase.php
@@ -35,7 +35,6 @@ public function __construct(PaymentMethodService $paymentMethodService, LoggerIn
     }
 
     /**
-     * @Route("/api/_action/mollie/payment-method/update-methods", name="api.mollie.payment-method.update-methods", methods={"GET"})
      *
      * @param Context $context
      * @return JsonResponse
@@ -46,7 +45,6 @@ public function updatePaymentMethods(Context $context): JsonResponse
     }
 
     /**
-     * @Route("/api/v{version}/_action/mollie/payment-method/update-methods", name="api.mollie.payment-method.update-methods.legacy", methods={"GET"})
      *
      * @param Context $context
      * @return JsonResponse
diff --git a/src/Controller/Api/PaymentMethod/Sw6/PaymentMethodController.php b/src/Controller/Api/PaymentMethod/Sw6/PaymentMethodController.php
deleted file mode 100644
index ee0e442e6..000000000
--- a/src/Controller/Api/PaymentMethod/Sw6/PaymentMethodController.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\Api\PaymentMethod\Sw6;
-
-use Kiener\MolliePayments\Controller\Api\PaymentMethod\PaymentMethodControllerBase;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @RouteScope(scopes={"api"})
- * @Route(defaults={"auth_required"=true, "auth_enabled"=true})
- */
-class PaymentMethodController extends PaymentMethodControllerBase
-{
-}
diff --git a/src/Controller/Api/PaymentMethod/Sw65/PaymentMethodController.php b/src/Controller/Api/PaymentMethod/Sw65/PaymentMethodController.php
deleted file mode 100644
index e3ea4a3df..000000000
--- a/src/Controller/Api/PaymentMethod/Sw65/PaymentMethodController.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\Api\PaymentMethod\Sw65;
-
-use Kiener\MolliePayments\Controller\Api\PaymentMethod\PaymentMethodControllerBase;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @Route(defaults={"_routeScope"={"api"}, "auth_required"=true, "auth_enabled"=true})
- */
-class PaymentMethodController extends PaymentMethodControllerBase
-{
-}
diff --git a/src/Controller/Api/PluginConfig/ConfigControllerBase.php b/src/Controller/Api/PluginConfig/ConfigControllerBase.php
index a3b65a153..99e58cdfd 100644
--- a/src/Controller/Api/PluginConfig/ConfigControllerBase.php
+++ b/src/Controller/Api/PluginConfig/ConfigControllerBase.php
@@ -43,7 +43,6 @@ public function __construct(SettingsService $settings, SnippetFinderInterface $s
     }
 
     /**
-     * @Route("/api/v{version}/_action/mollie/config/test-api-keys", name="api.action.mollie.config.test-api-keys", methods={"POST"})
      *
      * @param Request $request
      * @return JsonResponse
@@ -57,7 +56,6 @@ public function testApiKeys(Request $request): JsonResponse
     }
 
     /**
-     * @Route("/api/_action/mollie/config/test-api-keys", name="api.action.mollie.config.test-api-keys-64", methods={"POST"})
      *
      * @param Request $request
      * @return JsonResponse
@@ -74,7 +72,6 @@ public function testApiKeys64(Request $request): JsonResponse
      * This route can be used to verify if there might be any warnings when using the flow builder.
      * Some automation settings might interfere with the flow builder and thus we try to
      * at least let the merchant know about it.
-     * @Route("/api/_action/mollie/config/validate/flowbuilder", name="api.action.mollie.config.validate.flowbuilder", methods={"POST"})
      *
      * @param Request $request
      * @return JsonResponse
@@ -166,8 +163,6 @@ private function testApiKeysAction(string $liveApiKey, string $testApiKey): Json
      * Depending on these settings, the merchant might have configured a different behaviour
      * for fields, flows and actions.
      *
-     * @Route("/api/_action/mollie/config/refund-manager", name="api.action.mollie.config.refund-manager", methods={"POST"})
-     *
      * @param Request $request
      * @param Context $context
      * @return JsonResponse
@@ -195,7 +190,6 @@ public function getRefundManagerConfig(Request $request, Context $context): Json
     }
 
     /**
-     * @Route("/api/v{version}/_action/mollie/config/refund-manager", name="api.action.mollie.config.refund-manager.legacy", methods={"POST"})
      *
      * @param Request $request
      * @param Context $context
@@ -207,7 +201,6 @@ public function getRefundManagerConfigLegacy(Request $request, Context $context)
     }
 
     /**
-     * @Route("/api/_action/mollie/config/subscription", name="api.action.mollie.config.subscription", methods={"POST"})
      * @return JsonResponse
      */
     public function getSubscriptionConfig(): JsonResponse
diff --git a/src/Controller/Api/PluginConfig/Sw6/ConfigController.php b/src/Controller/Api/PluginConfig/Sw6/ConfigController.php
deleted file mode 100644
index fe2ec2cfe..000000000
--- a/src/Controller/Api/PluginConfig/Sw6/ConfigController.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Kiener\MolliePayments\Controller\Api\PluginConfig\Sw6;
-
-use Kiener\MolliePayments\Controller\Api\PluginConfig\ConfigControllerBase;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @RouteScope(scopes={"api"})
- * @Route(defaults={"auth_required"=true, "auth_enabled"=true})
- */
-class ConfigController extends ConfigControllerBase
-{
-}
diff --git a/src/Controller/Api/PluginConfig/Sw65/ConfigController.php b/src/Controller/Api/PluginConfig/Sw65/ConfigController.php
deleted file mode 100644
index f9201a373..000000000
--- a/src/Controller/Api/PluginConfig/Sw65/ConfigController.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Kiener\MolliePayments\Controller\Api\PluginConfig\Sw65;
-
-use Kiener\MolliePayments\Controller\Api\PluginConfig\ConfigControllerBase;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @Route(defaults={"_routeScope"={"api"}, "auth_required"=true, "auth_enabled"=true})
- */
-class ConfigController extends ConfigControllerBase
-{
-}
diff --git a/src/Controller/Api/Subscription/SubscriptionControllerBase.php b/src/Controller/Api/Subscription/SubscriptionControllerBase.php
index e715b8037..a975c124a 100755
--- a/src/Controller/Api/Subscription/SubscriptionControllerBase.php
+++ b/src/Controller/Api/Subscription/SubscriptionControllerBase.php
@@ -31,7 +31,6 @@ public function __construct(SubscriptionManager $subscriptionManager)
     }
 
     /**
-     * @Route("/api/_action/mollie/subscriptions/cancel", name="api.action.mollie.subscription.cancel", methods={"POST"})
      *
      * @param RequestDataBag $data
      * @param Context $context
@@ -52,7 +51,6 @@ public function cancel(RequestDataBag $data, Context $context): JsonResponse
     }
 
     /**
-     * @Route("/api/v{version}/_action/mollie/subscriptions/cancel", name="api.action.mollie.subscription.cancel_legacy", methods={"POST"})
      *
      * @param RequestDataBag $data
      * @param Context $context
@@ -64,7 +62,6 @@ public function cancelLegacy(RequestDataBag $data, Context $context): JsonRespon
     }
 
     /**
-     * @Route("/api/_action/mollie/subscriptions/pause", name="api.action.mollie.subscription.pause", methods={"POST"})
      *
      * @param RequestDataBag $data
      * @param Context $context
@@ -85,7 +82,6 @@ public function pause(RequestDataBag $data, Context $context): JsonResponse
     }
 
     /**
-     * @Route("/api/v{version}/_action/mollie/subscriptions/pause", name="api.action.mollie.subscription.pause_legacy", methods={"POST"})
      *
      * @param RequestDataBag $data
      * @param Context $context
@@ -97,7 +93,6 @@ public function pauseLegacy(RequestDataBag $data, Context $context): JsonRespons
     }
 
     /**
-     * @Route("/api/_action/mollie/subscriptions/resume", name="api.action.mollie.subscription.resume", methods={"POST"})
      *
      * @param RequestDataBag $data
      * @param Context $context
@@ -118,7 +113,6 @@ public function resume(RequestDataBag $data, Context $context): JsonResponse
     }
 
     /**
-     * @Route("/api/v{version}/_action/mollie/subscriptions/resume", name="api.action.mollie.subscription.resume_legacy", methods={"POST"})
      *
      * @param RequestDataBag $data
      * @param Context $context
@@ -130,7 +124,6 @@ public function resumeLegacy(RequestDataBag $data, Context $context): JsonRespon
     }
 
     /**
-     * @Route("/api/_action/mollie/subscriptions/skip", name="api.action.mollie.subscription.skip", methods={"POST"})
      *
      * @param RequestDataBag $data
      * @param Context $context
@@ -152,7 +145,6 @@ public function skip(RequestDataBag $data, Context $context): JsonResponse
     }
 
     /**
-     * @Route("/api/v{version}/_action/mollie/subscriptions/skip", name="api.action.mollie.subscription.skip_legacy", methods={"POST"})
      *
      * @param RequestDataBag $data
      * @param Context $context
diff --git a/src/Controller/Api/Subscription/Sw6/SubscriptionController.php b/src/Controller/Api/Subscription/Sw6/SubscriptionController.php
deleted file mode 100755
index dfa011bbc..000000000
--- a/src/Controller/Api/Subscription/Sw6/SubscriptionController.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Kiener\MolliePayments\Controller\Api\Subscription\Sw6;
-
-use Kiener\MolliePayments\Controller\Api\Subscription\SubscriptionControllerBase;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @RouteScope(scopes={"api"})
- * @Route(defaults={"auth_required"=true, "auth_enabled"=true})
- */
-class SubscriptionController extends SubscriptionControllerBase
-{
-}
diff --git a/src/Controller/Api/Subscription/Sw65/SubscriptionController.php b/src/Controller/Api/Subscription/Sw65/SubscriptionController.php
deleted file mode 100755
index fd46e86de..000000000
--- a/src/Controller/Api/Subscription/Sw65/SubscriptionController.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Kiener\MolliePayments\Controller\Api\Subscription\Sw65;
-
-use Kiener\MolliePayments\Controller\Api\Subscription\SubscriptionControllerBase;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @Route(defaults={"_routeScope"={"api"}, "auth_required"=true, "auth_enabled"=true})
- */
-class SubscriptionController extends SubscriptionControllerBase
-{
-}
diff --git a/src/Controller/Api/Support/SupportControllerBase.php b/src/Controller/Api/Support/SupportControllerBase.php
index f9751e436..c14430b31 100644
--- a/src/Controller/Api/Support/SupportControllerBase.php
+++ b/src/Controller/Api/Support/SupportControllerBase.php
@@ -36,7 +36,6 @@ public function __construct(MollieSupportFacade $supportFacade, LoggerInterface
     }
 
     /**
-     * @Route("/api/_action/mollie/support/request", name="api.action.mollie.support.request", methods={"POST"})
      *
      * @param Request $request
      * @param Context $context
@@ -64,7 +63,6 @@ public function requestSupport(Request $request, Context $context): JsonResponse
     }
 
     /**
-     * @Route("/api/v{version}/_action/mollie/support/request", name="api.action.mollie.support.request.legacy", methods={"POST"})
      *
      * @param Request $request
      * @param Context $context
diff --git a/src/Controller/Api/Support/Sw6/SupportController.php b/src/Controller/Api/Support/Sw6/SupportController.php
deleted file mode 100644
index 9cec02f01..000000000
--- a/src/Controller/Api/Support/Sw6/SupportController.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Kiener\MolliePayments\Controller\Api\Support\Sw6;
-
-use Kiener\MolliePayments\Controller\Api\Support\SupportControllerBase;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @RouteScope(scopes={"api"})
- * @Route(defaults={"auth_required"=true, "auth_enabled"=true})
- */
-class SupportController extends SupportControllerBase
-{
-}
diff --git a/src/Controller/Api/Support/Sw65/SupportController.php b/src/Controller/Api/Support/Sw65/SupportController.php
deleted file mode 100644
index 4a4a44b59..000000000
--- a/src/Controller/Api/Support/Sw65/SupportController.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Kiener\MolliePayments\Controller\Api\Support\Sw65;
-
-use Kiener\MolliePayments\Controller\Api\Support\SupportControllerBase;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @Route(defaults={"_routeScope"={"api"}, "auth_enabled"=true})
- */
-class SupportController extends SupportControllerBase
-{
-}
diff --git a/src/Controller/Api/Webhook/Sw6/WebhookController.php b/src/Controller/Api/Webhook/Sw6/WebhookController.php
deleted file mode 100644
index ec196b66b..000000000
--- a/src/Controller/Api/Webhook/Sw6/WebhookController.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Kiener\MolliePayments\Controller\Api\Webhook\Sw6;
-
-use Kiener\MolliePayments\Components\Subscription\Exception\SubscriptionSkippedException;
-use Kiener\MolliePayments\Components\Subscription\SubscriptionManager;
-use Kiener\MolliePayments\Controller\Api\Webhook\WebhookControllerBase;
-use Kiener\MolliePayments\Controller\Storefront\Webhook\NotificationFacade;
-use Kiener\MolliePayments\Repository\Order\OrderRepository;
-use Kiener\MolliePayments\Repository\Order\OrderRepositoryInterface;
-use Psr\Log\LoggerInterface;
-use Shopware\Core\Checkout\Order\Aggregate\OrderTransaction\OrderTransactionEntity;
-use Shopware\Core\Framework\Context;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Shopware\Core\Framework\Validation\DataBag\RequestDataBag;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @RouteScope(scopes={"api"})
- * @Route(defaults={"auth_required"=false, "auth_enabled"=false})
- */
-class WebhookController extends WebhookControllerBase
-{
-}
diff --git a/src/Controller/Api/Webhook/Sw65/WebhookController.php b/src/Controller/Api/Webhook/Sw65/WebhookController.php
deleted file mode 100644
index d7ed115eb..000000000
--- a/src/Controller/Api/Webhook/Sw65/WebhookController.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Kiener\MolliePayments\Controller\Api\Webhook\Sw65;
-
-use Kiener\MolliePayments\Components\Subscription\Exception\SubscriptionSkippedException;
-use Kiener\MolliePayments\Components\Subscription\SubscriptionManager;
-use Kiener\MolliePayments\Controller\Api\Webhook\WebhookControllerBase;
-use Kiener\MolliePayments\Controller\Storefront\Webhook\NotificationFacade;
-use Kiener\MolliePayments\Repository\Order\OrderRepository;
-use Kiener\MolliePayments\Repository\Order\OrderRepositoryInterface;
-use Psr\Log\LoggerInterface;
-use Shopware\Core\Checkout\Order\Aggregate\OrderTransaction\OrderTransactionEntity;
-use Shopware\Core\Framework\Context;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Shopware\Core\Framework\Validation\DataBag\RequestDataBag;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @Route(defaults={"_routeScope"={"api"}, "auth_required"=false, "auth_enabled"=false})
- */
-class WebhookController extends WebhookControllerBase
-{
-}
diff --git a/src/Controller/Api/Webhook/WebhookControllerBase.php b/src/Controller/Api/Webhook/WebhookControllerBase.php
index e40b8e591..452e6a75f 100644
--- a/src/Controller/Api/Webhook/WebhookControllerBase.php
+++ b/src/Controller/Api/Webhook/WebhookControllerBase.php
@@ -64,7 +64,6 @@ public function __construct(NotificationFacade $notificationFacade, Subscription
 
 
     /**
-     * @Route("/api/mollie/webhook/{swTransactionId}", name="api.mollie.webhook", methods={"GET", "POST"})
      *
      * @param string $swTransactionId
      * @param Request $request
@@ -98,7 +97,6 @@ public function webhookAction(string $swTransactionId, Request $request, Context
     }
 
     /**
-     * @Route("/api/v{version}/mollie/webhook/{swTransactionId}", name="api.mollie.webhook-legacy", methods={"GET", "POST"})
      *
      * @param string $swTransactionId
      * @param Request $request
@@ -112,7 +110,6 @@ public function webhookLegacyAction(string $swTransactionId, Request $request, C
 
 
     /**
-     * @Route("/api/mollie/webhook/subscription/{swSubscriptionId}", name="api.mollie.webhook_subscription", methods={"GET", "POST"})
      *
      * @param string $swSubscriptionId
      * @param Request $request
@@ -199,7 +196,6 @@ public function webhookSubscriptionAction(string $swSubscriptionId, Request $req
     }
 
     /**
-     * @Route("/api/v{version}/mollie/webhook/subscription/{swSubscriptionId}", name="api.mollie.webhook_subscription-legacy", methods={"GET", "POST"})
      *
      * @param string $swSubscriptionId
      * @param Request $request
@@ -213,7 +209,6 @@ public function webhookSubscriptionLegacyAction(string $swSubscriptionId, Reques
     }
 
     /**
-     * @Route("/api/mollie/webhook/subscription/{swSubscriptionId}/renew", name="api.mollie.webhook_subscription_renew", methods={"GET", "POST"})
      *
      * @param string $swSubscriptionId
      * @param Request $request
@@ -227,7 +222,6 @@ public function webhookSubscriptionRenewAction(string $swSubscriptionId, Request
     }
 
     /**
-     * @Route("/api/v{version}/mollie/webhook/subscription/{swSubscriptionId}/renew", name="api.mollie.webhook_subscription_renew-legacy", methods={"GET", "POST"})
      *
      * @param string $swSubscriptionId
      * @param Request $request
@@ -242,7 +236,6 @@ public function webhookSubscriptionRenewLegacyAction(string $swSubscriptionId, R
 
 
     /**
-     * @Route("/api/mollie/webhook/subscription/{swSubscriptionId}/mandate/update", name="api.mollie.webhook_subscription_paymentmethod", methods={"GET", "POST"})
      *
      * @param string $swSubscriptionId
      * @param Request $request
@@ -272,7 +265,6 @@ public function webhookSubscriptionMandateUpdatedAction(string $swSubscriptionId
     }
 
     /**
-     * @Route("/api/v{version}/mollie/webhook/subscription/{swSubscriptionId}/mandate/update", name="api.mollie.webhook_subscription_paymentmethod-legacy", methods={"GET", "POST"})
      *
      * @param string $swSubscriptionId
      * @param Request $request
diff --git a/src/Controller/StoreApi/ApplePayDirect/ApplePayDirectControllerBase.php b/src/Controller/StoreApi/ApplePayDirect/ApplePayDirectControllerBase.php
index fda6ae1ef..42c810685 100644
--- a/src/Controller/StoreApi/ApplePayDirect/ApplePayDirectControllerBase.php
+++ b/src/Controller/StoreApi/ApplePayDirect/ApplePayDirectControllerBase.php
@@ -45,7 +45,6 @@ public function __construct(ApplePayDirect $applePay, LoggerInterface $logger)
 
 
     /**
-     * @Route("/store-api/mollie/applepay/enabled", name="store-api.mollie.apple-pay.enabled", methods={"GET"})
      *
      * @param SalesChannelContext $context
      * @throws \Exception
@@ -59,7 +58,6 @@ public function isEnabled(SalesChannelContext $context): StoreApiResponse
     }
 
     /**
-     * @Route("/store-api/mollie/applepay/id", name="store-api.mollie.apple-pay.id", methods={"GET"})
      *
      * @param SalesChannelContext $context
      * @throws \Exception
@@ -82,7 +80,6 @@ public function getId(SalesChannelContext $context): StoreApiResponse
     }
 
     /**
-     * @Route("/store-api/mollie/applepay/add-product", name="store-api.mollie.apple-pay.add-product", methods={"POST"})
      *
      * @param RequestDataBag $data
      * @param SalesChannelContext $context
@@ -108,7 +105,6 @@ public function addProduct(RequestDataBag $data, SalesChannelContext $context):
     }
 
     /**
-     * @Route("/store-api/mollie/applepay/validate", name="store-api.mollie.apple-pay.validate", methods={"POST"})
      *
      * @param RequestDataBag $data
      * @param SalesChannelContext $context
@@ -129,7 +125,6 @@ public function createPaymentSession(RequestDataBag $data, SalesChannelContext $
     }
 
     /**
-     * @Route("/store-api/mollie/applepay/cart", name="store-api.mollie.apple-pay.cart", methods={"GET"})
      *
      * @param SalesChannelContext $context
      * @throws \Throwable
@@ -144,7 +139,6 @@ public function getCart(SalesChannelContext $context): StoreApiResponse
 
 
     /**
-     * @Route("/store-api/mollie/applepay/shipping-methods", name="store-api.mollie.apple-pay.shipping-methods", methods={"POST"})
      *
      * @param RequestDataBag $data
      * @param SalesChannelContext $context
@@ -165,7 +159,6 @@ public function getShippingMethods(RequestDataBag $data, SalesChannelContext $co
     }
 
     /**
-     * @Route("/store-api/mollie/applepay/shipping-method", name="store-api.mollie.apple-pay.set-shipping-methods", methods={"POST"})
      *
      * @param RequestDataBag $data
      * @param SalesChannelContext $context
@@ -186,7 +179,6 @@ public function setShippingMethod(RequestDataBag $data, SalesChannelContext $con
     }
 
     /**
-     * @Route("/store-api/mollie/applepay/pay",  name="store-api.mollie.apple-pay.pay", methods={"POST"})
      *
      * @param RequestDataBag $data
      * @param SalesChannelContext $context
@@ -259,7 +251,6 @@ public function pay(RequestDataBag $data, SalesChannelContext $context): StoreAp
     }
 
     /**
-     * @Route("/store-api/mollie/applepay/restore-cart", name="store-api.mollie.apple-pay.restore-cart", methods={"POST"})
      *
      * @param SalesChannelContext $context
      * @return StoreApiResponse
diff --git a/src/Controller/StoreApi/ApplePayDirect/Sw6/ApplePayDirectController.php b/src/Controller/StoreApi/ApplePayDirect/Sw6/ApplePayDirectController.php
deleted file mode 100644
index b197e5256..000000000
--- a/src/Controller/StoreApi/ApplePayDirect/Sw6/ApplePayDirectController.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\StoreApi\ApplePayDirect\Sw6;
-
-use Kiener\MolliePayments\Controller\StoreApi\ApplePayDirect\ApplePayDirectControllerBase;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @RouteScope(scopes={"store-api"})
- */
-class ApplePayDirectController extends ApplePayDirectControllerBase
-{
-}
diff --git a/src/Controller/StoreApi/ApplePayDirect/Sw65/ApplePayDirectController.php b/src/Controller/StoreApi/ApplePayDirect/Sw65/ApplePayDirectController.php
deleted file mode 100644
index bbed9f7fa..000000000
--- a/src/Controller/StoreApi/ApplePayDirect/Sw65/ApplePayDirectController.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\StoreApi\ApplePayDirect\Sw65;
-
-use Kiener\MolliePayments\Controller\StoreApi\ApplePayDirect\ApplePayDirectControllerBase;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @Route(defaults={"_routeScope"={"store-api"}})
- */
-class ApplePayDirectController extends ApplePayDirectControllerBase
-{
-}
diff --git a/src/Controller/StoreApi/Config/ConfigControllerBase.php b/src/Controller/StoreApi/Config/ConfigControllerBase.php
index b46f70e36..0df653d54 100644
--- a/src/Controller/StoreApi/Config/ConfigControllerBase.php
+++ b/src/Controller/StoreApi/Config/ConfigControllerBase.php
@@ -50,7 +50,6 @@ public function __construct(SettingsService $settingsService, ConfigService $con
 
 
     /**
-     * @Route("/store-api/mollie/config", name="store-api.mollie.config", methods={"GET"})
      *
      * @param SalesChannelContext $context
      * @throws \Exception
diff --git a/src/Controller/StoreApi/Config/Sw6/ConfigController.php b/src/Controller/StoreApi/Config/Sw6/ConfigController.php
deleted file mode 100644
index bdc470999..000000000
--- a/src/Controller/StoreApi/Config/Sw6/ConfigController.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\StoreApi\Config\Sw6;
-
-use Kiener\MolliePayments\Controller\StoreApi\Config\ConfigControllerBase;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @RouteScope(scopes={"store-api"})
- */
-class ConfigController extends ConfigControllerBase
-{
-}
diff --git a/src/Controller/StoreApi/Config/Sw65/ConfigController.php b/src/Controller/StoreApi/Config/Sw65/ConfigController.php
deleted file mode 100644
index 97635557c..000000000
--- a/src/Controller/StoreApi/Config/Sw65/ConfigController.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\StoreApi\Config\Sw65;
-
-use Kiener\MolliePayments\Controller\StoreApi\Config\ConfigControllerBase;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @Route(defaults={"_routeScope"={"store-api"}})
- */
-class ConfigController extends ConfigControllerBase
-{
-}
diff --git a/src/Controller/StoreApi/CreditCard/CreditCardControllerBase.php b/src/Controller/StoreApi/CreditCard/CreditCardControllerBase.php
index 6c71d2454..9e1f0c4ea 100644
--- a/src/Controller/StoreApi/CreditCard/CreditCardControllerBase.php
+++ b/src/Controller/StoreApi/CreditCard/CreditCardControllerBase.php
@@ -42,7 +42,6 @@ public function __construct(CustomerService $customerService, MandateServiceInte
 
 
     /**
-     * @Route("/store-api/mollie/creditcard/store-token/{customerId}/{cardToken}", name="store-api.mollie.creditcard.store-token", methods={"POST"})
      *
      * @param string $customerId
      * @param string $cardToken
@@ -69,7 +68,6 @@ public function saveCardToken(string $customerId, string $cardToken, RequestData
     }
 
     /**
-     * @Route("/store-api/mollie/creditcard/store-mandate-id/{customerId}/{mandateId}", name="store-api.mollie.creditcard.store-mandate-id", methods={"POST"})
      *
      * @param string $customerId
      * @param string $mandateId
@@ -94,7 +92,6 @@ public function saveMandateId(string $customerId, string $mandateId, SalesChanne
     }
 
     /**
-     * @Route("/store-api/mollie/mandate/revoke/{customerId}/{mandateId}", name="store-api.mollie.mandate.revoke", methods={"POST"})
      *
      * @param string $customerId
      * @param string $mandateId
@@ -110,7 +107,6 @@ public function revokeMandate(string $customerId, string $mandateId, SalesChanne
     }
 
     /**
-     * @Route("/store-api/mollie/mandates/{customerId}", name="store-api.mollie.mandates", methods={"GET"})
      *
      * @param string $customerId
      * @param SalesChannelContext $context
diff --git a/src/Controller/StoreApi/CreditCard/Sw6/CreditCardController.php b/src/Controller/StoreApi/CreditCard/Sw6/CreditCardController.php
deleted file mode 100644
index b73ce693b..000000000
--- a/src/Controller/StoreApi/CreditCard/Sw6/CreditCardController.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\StoreApi\CreditCard\Sw6;
-
-use Kiener\MolliePayments\Controller\StoreApi\CreditCard\CreditCardControllerBase;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @RouteScope(scopes={"store-api"})
- */
-class CreditCardController extends CreditCardControllerBase
-{
-}
diff --git a/src/Controller/StoreApi/CreditCard/Sw65/CreditCardController.php b/src/Controller/StoreApi/CreditCard/Sw65/CreditCardController.php
deleted file mode 100644
index 4bc51ce04..000000000
--- a/src/Controller/StoreApi/CreditCard/Sw65/CreditCardController.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\StoreApi\CreditCard\Sw65;
-
-use Kiener\MolliePayments\Controller\StoreApi\CreditCard\CreditCardControllerBase;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @Route(defaults={"_routeScope"={"store-api"}})
- */
-class CreditCardController extends CreditCardControllerBase
-{
-}
diff --git a/src/Controller/StoreApi/POS/PosControllerBase.php b/src/Controller/StoreApi/POS/PosControllerBase.php
index 72649d14b..1107bd4be 100644
--- a/src/Controller/StoreApi/POS/PosControllerBase.php
+++ b/src/Controller/StoreApi/POS/PosControllerBase.php
@@ -38,7 +38,6 @@ public function __construct(CustomerService $customerService, MollieGatewayInter
 
 
     /**
-     * @Route("/store-api/mollie/pos/terminals", name="store-api.mollie.pos.terminals", methods={"GET"})
      *
      * @param SalesChannelContext $context
      * @return StoreApiResponse
@@ -62,7 +61,6 @@ public function getIssuers(SalesChannelContext $context): StoreApiResponse
     }
 
     /**
-     * @Route("/store-api/mollie/pos/store-terminal/{customerId}/{terminalID}", name="store-api.mollie.pos.store-terminal", methods={"POST"})
      *
      * @param string $customerId
      * @param string $terminalID
diff --git a/src/Controller/StoreApi/POS/Sw6/PosController.php b/src/Controller/StoreApi/POS/Sw6/PosController.php
deleted file mode 100644
index 850f6e02b..000000000
--- a/src/Controller/StoreApi/POS/Sw6/PosController.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\StoreApi\POS\Sw6;
-
-use Kiener\MolliePayments\Controller\StoreApi\POS\PosControllerBase;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-
-/**
- * @RouteScope(scopes={"store-api"})
- */
-class PosController extends PosControllerBase
-{
-}
diff --git a/src/Controller/StoreApi/POS/Sw65/PosController.php b/src/Controller/StoreApi/POS/Sw65/PosController.php
deleted file mode 100644
index 2bcbce1a6..000000000
--- a/src/Controller/StoreApi/POS/Sw65/PosController.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\StoreApi\POS\Sw65;
-
-use Kiener\MolliePayments\Controller\StoreApi\POS\PosControllerBase;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @Route(defaults={"_routeScope"={"store-api"}})
- */
-class PosController extends PosControllerBase
-{
-}
diff --git a/src/Controller/StoreApi/Subscription/SubscriptionControllerBase.php b/src/Controller/StoreApi/Subscription/SubscriptionControllerBase.php
index e696e21b5..93bc6e3b5 100644
--- a/src/Controller/StoreApi/Subscription/SubscriptionControllerBase.php
+++ b/src/Controller/StoreApi/Subscription/SubscriptionControllerBase.php
@@ -56,7 +56,6 @@ public function __construct(SubscriptionManager $subscriptionManager, Subscripti
 
 
     /**
-     * @Route("/store-api/mollie/subscription", name="store-api.mollie.subscription", methods={"GET"})
      *
      * @param SalesChannelContext $context
      * @throws \Throwable
@@ -85,7 +84,6 @@ public function getSubscriptions(SalesChannelContext $context): StoreApiResponse
     }
 
     /**
-     * @Route("/store-api/mollie/subscription/{subscriptionId}/billing/update", name="store-api.mollie.subscription.billing_update", methods={"POST"})
      *
      * @param string $subscriptionId
      * @param RequestDataBag $data
@@ -142,7 +140,6 @@ public function updateBilling(string $subscriptionId, RequestDataBag $data, Sale
     }
 
     /**
-     * @Route("/store-api/mollie/subscription/{subscriptionId}/shipping/update", name="store-api.mollie.subscription.shipping_update", methods={"POST"})
      *
      * @param string $subscriptionId
      * @param RequestDataBag $data
@@ -200,7 +197,6 @@ public function updateShipping(string $subscriptionId, RequestDataBag $data, Sal
     }
 
     /**
-     * @Route("/store-api/mollie/subscription/{subscriptionId}/payment/update", name="store-api.mollie.subscription.payment_update", methods={"POST"})
      *
      * @param string $subscriptionId
      * @param RequestDataBag $data
@@ -230,7 +226,6 @@ public function updatePayment(string $subscriptionId, RequestDataBag $data, Sale
     }
 
     /**
-     * @Route("/store-api/mollie/subscription/{subscriptionId}/pause", name="store-api.mollie.subscription.pause", methods={"POST"})
      *
      * @param string $subscriptionId
      * @param SalesChannelContext $context
@@ -256,7 +251,6 @@ public function pause(string $subscriptionId, SalesChannelContext $context): Sto
     }
 
     /**
-     * @Route("/store-api/mollie/subscription/{subscriptionId}/resume", name="store-api.mollie.subscription.resume", methods={"POST"})
      *
      * @param string $subscriptionId
      * @param SalesChannelContext $context
@@ -282,7 +276,6 @@ public function resume(string $subscriptionId, SalesChannelContext $context): St
     }
 
     /**
-     * @Route("/store-api/mollie/subscription/{subscriptionId}/skip", name="store-api.mollie.subscription.skip", methods={"POST"})
      *
      * @param string $subscriptionId
      * @param SalesChannelContext $context
@@ -308,7 +301,6 @@ public function skip(string $subscriptionId, SalesChannelContext $context): Stor
     }
 
     /**
-     * @Route("/store-api/mollie/subscription/{subscriptionId}/cancel", name="store-api.mollie.subscription.cancel", methods={"POST"})
      *
      * @param string $subscriptionId
      * @param SalesChannelContext $context
diff --git a/src/Controller/StoreApi/Subscription/Sw6/SubscriptionController.php b/src/Controller/StoreApi/Subscription/Sw6/SubscriptionController.php
deleted file mode 100644
index 429d85ac2..000000000
--- a/src/Controller/StoreApi/Subscription/Sw6/SubscriptionController.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\StoreApi\Subscription\Sw6;
-
-use Kiener\MolliePayments\Controller\StoreApi\Subscription\SubscriptionControllerBase;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @RouteScope(scopes={"store-api"})
- */
-class SubscriptionController extends SubscriptionControllerBase
-{
-}
diff --git a/src/Controller/StoreApi/Subscription/Sw65/SubscriptionController.php b/src/Controller/StoreApi/Subscription/Sw65/SubscriptionController.php
deleted file mode 100644
index 0a49332a7..000000000
--- a/src/Controller/StoreApi/Subscription/Sw65/SubscriptionController.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\StoreApi\Subscription\Sw65;
-
-use Kiener\MolliePayments\Controller\StoreApi\Subscription\SubscriptionControllerBase;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @Route(defaults={"_routeScope"={"store-api"}})
- */
-class SubscriptionController extends SubscriptionControllerBase
-{
-}
diff --git a/src/Controller/StoreApi/iDEAL/Sw6/iDealController.php b/src/Controller/StoreApi/iDEAL/Sw6/iDealController.php
deleted file mode 100644
index 2a0248091..000000000
--- a/src/Controller/StoreApi/iDEAL/Sw6/iDealController.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\StoreApi\iDEAL\Sw6;
-
-use Kiener\MolliePayments\Controller\StoreApi\iDEAL\iDealControllerBase;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @RouteScope(scopes={"store-api"})
- */
-class iDealController extends iDealControllerBase
-{
-}
diff --git a/src/Controller/StoreApi/iDEAL/Sw65/iDealController.php b/src/Controller/StoreApi/iDEAL/Sw65/iDealController.php
deleted file mode 100644
index 33e5deadc..000000000
--- a/src/Controller/StoreApi/iDEAL/Sw65/iDealController.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\StoreApi\iDEAL\Sw65;
-
-use Kiener\MolliePayments\Controller\StoreApi\iDEAL\iDealControllerBase;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @Route(defaults={"_routeScope"={"store-api"}})
- */
-class iDealController extends iDealControllerBase
-{
-}
diff --git a/src/Controller/StoreApi/iDEAL/iDealControllerBase.php b/src/Controller/StoreApi/iDEAL/iDealControllerBase.php
index 77e8560a5..07f45bf4b 100644
--- a/src/Controller/StoreApi/iDEAL/iDealControllerBase.php
+++ b/src/Controller/StoreApi/iDEAL/iDealControllerBase.php
@@ -39,7 +39,6 @@ public function __construct(CustomerService $customerService, MollieGatewayInter
 
 
     /**
-     * @Route("/store-api/mollie/ideal/issuers", name="store-api.mollie.ideal.issuers", methods={"GET"})
      *
      * @param SalesChannelContext $context
      * @return StoreApiResponse
@@ -68,7 +67,6 @@ public function getIssuers(SalesChannelContext $context): StoreApiResponse
     }
 
     /**
-     * @Route("/store-api/mollie/ideal/store-issuer/{customerId}/{issuerId}", name="store-api.mollie.ideal.store-issuer", methods={"POST"})
      *
      * @param string $customerId
      * @param string $issuerId
diff --git a/src/Controller/Storefront/AbstractStoreFrontController.php b/src/Controller/Storefront/AbstractStoreFrontController.php
new file mode 100644
index 000000000..c49b54dc0
--- /dev/null
+++ b/src/Controller/Storefront/AbstractStoreFrontController.php
@@ -0,0 +1,26 @@
+<?php
+declare(strict_types=1);
+namespace Kiener\MolliePayments\Controller\Storefront;
+
+use Psr\Container\ContainerInterface;
+use Shopware\Storefront\Controller\StorefrontController;
+
+abstract class AbstractStoreFrontController extends StorefrontController
+{
+
+    /**
+     * Since Shopware 6.6.0.0 twig must be set with setTwig method, prior the method does not exists
+     * @param ContainerInterface $container
+     * @throws \Psr\Container\ContainerExceptionInterface
+     * @throws \Psr\Container\NotFoundExceptionInterface
+     * @return null|ContainerInterface
+     */
+    public function setContainer(ContainerInterface $container): ?ContainerInterface
+    {
+        $container = parent::setContainer($container);
+        if ($container instanceof ContainerInterface && method_exists($this, 'setTwig')) {
+            $this->setTwig($container->get('twig'));
+        }
+        return  $container;
+    }
+}
diff --git a/src/Controller/Storefront/Account/AccountControllerBase.php b/src/Controller/Storefront/Account/AccountControllerBase.php
index 76d1d2595..7c333b751 100755
--- a/src/Controller/Storefront/Account/AccountControllerBase.php
+++ b/src/Controller/Storefront/Account/AccountControllerBase.php
@@ -4,19 +4,17 @@
 
 use Kiener\MolliePayments\Components\Subscription\Page\Account\SubscriptionPageLoader;
 use Kiener\MolliePayments\Components\Subscription\SubscriptionManager;
+use Kiener\MolliePayments\Controller\Storefront\AbstractStoreFrontController;
 use Psr\Log\LoggerInterface;
 use Shopware\Core\Checkout\Customer\CustomerEntity;
-use Shopware\Core\Content\Media\Pathname\UrlGeneratorInterface;
 use Shopware\Core\Framework\Validation\DataBag\RequestDataBag;
 use Shopware\Core\System\SalesChannel\SalesChannelContext;
-use Shopware\Storefront\Controller\StorefrontController;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\Generator\UrlGenerator;
 
-class AccountControllerBase extends StorefrontController
+class AccountControllerBase extends AbstractStoreFrontController
 {
     /**
      * @var SubscriptionPageLoader
@@ -47,9 +45,6 @@ public function __construct(SubscriptionPageLoader $pageLoader, SubscriptionMana
     }
 
 
-    /**
-     * @Route("/account/mollie/subscriptions", name="frontend.account.mollie.subscriptions.page", options={"seo"="false"}, methods={"GET", "POST"}, defaults={"XmlHttpRequest"=true})
-     */
     public function subscriptionsList(Request $request, SalesChannelContext $salesChannelContext): Response
     {
         if (!$this->isLoggedIn($salesChannelContext)) {
@@ -67,7 +62,6 @@ public function subscriptionsList(Request $request, SalesChannelContext $salesCh
     }
 
     /**
-     * @Route("/account/mollie/subscriptions/{subscriptionId}/billing/update", name="frontend.account.mollie.subscriptions.billing.update", methods={"POST"})
      *
      * @param string $subscriptionId
      * @param RequestDataBag $data
@@ -132,7 +126,6 @@ public function updateBilling(string $subscriptionId, RequestDataBag $data, Sale
     }
 
     /**
-     * @Route("/account/mollie/subscriptions/{subscriptionId}/shipping/update", name="frontend.account.mollie.subscriptions.shipping.update", methods={"POST"})
      *
      * @param string $subscriptionId
      * @param RequestDataBag $data
@@ -197,7 +190,6 @@ public function updateShipping(string $subscriptionId, RequestDataBag $data, Sal
     }
 
     /**
-     * @Route("/account/mollie/subscriptions/{swSubscriptionId}/payment/update", name="frontend.account.mollie.subscriptions.payment.update", methods={"POST"})
      *
      * @param string $swSubscriptionId
      * @param SalesChannelContext $salesChannelContext
@@ -230,7 +222,6 @@ public function updatePaymentStart(string $swSubscriptionId, SalesChannelContext
     }
 
     /**
-     * @Route("/account/mollie/subscriptions/{swSubscriptionId}/payment/update/finish", name="frontend.account.mollie.subscriptions.payment.update-success", methods={"GET", "POST"})
      *
      * @param string $swSubscriptionId
      * @param SalesChannelContext $salesChannelContext
@@ -257,7 +248,6 @@ public function updatePaymentFinish(string $swSubscriptionId, SalesChannelContex
     }
 
     /**
-     * @Route("/account/mollie/subscriptions/{swSubscriptionId}/pause", name="frontend.account.mollie.subscriptions.pause", methods={"POST"})
      * @param string $swSubscriptionId
      */
     public function pauseSubscription(string $swSubscriptionId, SalesChannelContext $context): Response
@@ -281,7 +271,6 @@ public function pauseSubscription(string $swSubscriptionId, SalesChannelContext
     }
 
     /**
-     * @Route("/account/mollie/subscriptions/{swSubscriptionId}/skip", name="frontend.account.mollie.subscriptions.skip", methods={"POST"})
      * @param string $swSubscriptionId
      */
     public function skipSubscription(string $swSubscriptionId, SalesChannelContext $context): Response
@@ -305,7 +294,6 @@ public function skipSubscription(string $swSubscriptionId, SalesChannelContext $
     }
 
     /**
-     * @Route("/account/mollie/subscriptions/{swSubscriptionId}/resume", name="frontend.account.mollie.subscriptions.resume", methods={"POST"})
      * @param string $swSubscriptionId
      */
     public function resumeSubscription(string $swSubscriptionId, SalesChannelContext $context): Response
@@ -329,7 +317,6 @@ public function resumeSubscription(string $swSubscriptionId, SalesChannelContext
     }
 
     /**
-     * @Route("/account/mollie/subscriptions/{subscriptionId}/cancel", name="frontend.account.mollie.subscriptions.cancel", methods={"POST"})
      * @param mixed $subscriptionId
      */
     public function cancelSubscription($subscriptionId, SalesChannelContext $context): Response
diff --git a/src/Controller/Storefront/Account/Sw6/AccountController.php b/src/Controller/Storefront/Account/Sw6/AccountController.php
deleted file mode 100755
index cef8f57c1..000000000
--- a/src/Controller/Storefront/Account/Sw6/AccountController.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Kiener\MolliePayments\Controller\Storefront\Account\Sw6;
-
-use Kiener\MolliePayments\Components\Subscription\Page\Account\SubscriptionPageLoader;
-use Kiener\MolliePayments\Components\Subscription\SubscriptionManager;
-use Kiener\MolliePayments\Controller\Storefront\Account\AccountControllerBase;
-use Psr\Log\LoggerInterface;
-use Shopware\Core\Checkout\Customer\CustomerEntity;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Shopware\Core\Framework\Validation\DataBag\RequestDataBag;
-use Shopware\Core\System\SalesChannel\SalesChannelContext;
-use Shopware\Storefront\Controller\StorefrontController;
-use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @RouteScope(scopes={"storefront"})
- */
-class AccountController extends AccountControllerBase
-{
-}
diff --git a/src/Controller/Storefront/Account/Sw65/AccountController.php b/src/Controller/Storefront/Account/Sw65/AccountController.php
deleted file mode 100755
index 88a27175d..000000000
--- a/src/Controller/Storefront/Account/Sw65/AccountController.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Kiener\MolliePayments\Controller\Storefront\Account\Sw65;
-
-use Kiener\MolliePayments\Components\Subscription\Page\Account\SubscriptionPageLoader;
-use Kiener\MolliePayments\Components\Subscription\SubscriptionManager;
-use Kiener\MolliePayments\Controller\Storefront\Account\AccountControllerBase;
-use Psr\Log\LoggerInterface;
-use Shopware\Core\Checkout\Customer\CustomerEntity;
-use Shopware\Core\Framework\Validation\DataBag\RequestDataBag;
-use Shopware\Core\System\SalesChannel\SalesChannelContext;
-use Shopware\Storefront\Controller\StorefrontController;
-use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @Route(defaults={"_routeScope"={"storefront"}})
- */
-class AccountController extends AccountControllerBase
-{
-}
diff --git a/src/Controller/Storefront/ApplePayDirect/ApplePayDirectControllerBase.php b/src/Controller/Storefront/ApplePayDirect/ApplePayDirectControllerBase.php
index 1b87765f3..801b83e50 100644
--- a/src/Controller/Storefront/ApplePayDirect/ApplePayDirectControllerBase.php
+++ b/src/Controller/Storefront/ApplePayDirect/ApplePayDirectControllerBase.php
@@ -6,6 +6,7 @@
 use Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderEventFactory;
 use Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderFactory;
 use Kiener\MolliePayments\Components\ApplePayDirect\ApplePayDirect;
+use Kiener\MolliePayments\Controller\Storefront\AbstractStoreFrontController;
 use Kiener\MolliePayments\Repository\Customer\CustomerRepositoryInterface;
 use Kiener\MolliePayments\Service\Cart\CartBackupService;
 use Kiener\MolliePayments\Service\OrderService;
@@ -15,19 +16,16 @@
 use Shopware\Core\Checkout\Order\OrderEntity;
 use Shopware\Core\Framework\Context;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
 use Shopware\Core\System\SalesChannel\SalesChannelContext;
-use Shopware\Storefront\Controller\StorefrontController;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
-use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\RouterInterface;
 use Throwable;
 
-class ApplePayDirectControllerBase extends StorefrontController
+class ApplePayDirectControllerBase extends AbstractStoreFrontController
 {
     use RedirectTrait;
 
@@ -113,7 +111,6 @@ public function __construct(ApplePayDirect $applePay, RouterInterface $router, L
 
 
     /**
-     * @Route("/mollie/apple-pay/available", defaults={"csrf_protected"=true}, name="frontend.mollie.apple-pay.available", options={"seo"="false"}, methods={"GET"})
      *
      * @param SalesChannelContext $context
      * @return JsonResponse
@@ -144,8 +141,6 @@ public function isPaymentAvailable(SalesChannelContext $context): JsonResponse
      * this is not about Apple Pay Direct - but the namespace of the URL is a good one (/apple-pay)
      * and I don't want to create all kinds of new controllers
      *
-     * @Route("/mollie/apple-pay/applepay-id", defaults={"csrf_protected"=true}, name="frontend.mollie.apple-pay.id", options={"seo"="false"}, methods={"GET"})
-     *
      * @param SalesChannelContext $context
      * @return JsonResponse
      */
@@ -169,7 +164,6 @@ public function getApplePayID(SalesChannelContext $context): JsonResponse
     }
 
     /**
-     * @Route("/mollie/apple-pay/add-product", defaults={"csrf_protected"=false}, name="frontend.mollie.apple-pay.add-product", options={"seo"="false"}, methods={"POST"})
      *
      * @param SalesChannelContext $context
      * @param Request $request
@@ -214,7 +208,6 @@ public function addProduct(SalesChannelContext $context, Request $request): Json
     }
 
     /**
-     * @Route("/mollie/apple-pay/validate", defaults={"csrf_protected"=false}, name="frontend.mollie.apple-pay.validate", options={"seo"="false"}, methods={"POST"})
      *
      * @param SalesChannelContext $context
      * @param Request $request
@@ -246,7 +239,6 @@ public function createPaymentSession(SalesChannelContext $context, Request $requ
     }
 
     /**
-     * @Route("/mollie/apple-pay/shipping-methods", defaults={"XmlHttpRequest"=true, "csrf_protected"=false}, name="frontend.mollie.apple-pay.shipping-methods", options={"seo"="false"}, methods={"POST"})
      *
      * @param SalesChannelContext $context
      * @param Request $request
@@ -288,7 +280,6 @@ public function getShippingMethods(SalesChannelContext $context, Request $reques
     }
 
     /**
-     * @Route("/mollie/apple-pay/set-shipping", defaults={"XmlHttpRequest"=true, "csrf_protected"=false}, name="frontend.mollie.apple-pay.set-shipping", options={"seo"="false"}, methods={"POST"})
      *
      * @param SalesChannelContext $context
      * @param Request $request
@@ -330,7 +321,6 @@ public function setShippingMethod(SalesChannelContext $context, Request $request
     }
 
     /**
-     * @Route("/mollie/apple-pay/start-payment", defaults={"XmlHttpRequest"=true, "csrf_protected"=false}, name="frontend.mollie.apple-pay.start-payment", options={"seo"="false"}, methods={"POST"})
      *
      * @param SalesChannelContext $context
      * @param Request $request
@@ -392,7 +382,6 @@ public function startPayment(SalesChannelContext $context, Request $request): Re
     }
 
     /**
-     * @Route("/mollie/apple-pay/finish-payment", defaults={"XmlHttpRequest"=true, "csrf_protected"=false}, name="frontend.mollie.apple-pay.finish-payment", options={"seo"="false"}, methods={"GET"})
      *
      * @param SalesChannelContext $context
      * @param Request $request
@@ -484,7 +473,6 @@ public function finishPayment(SalesChannelContext $context, Request $request): R
     }
 
     /**
-     * @Route("/mollie/apple-pay/restore-cart", defaults={"csrf_protected"=false}, name="frontend.mollie.apple-pay.restore-cart", options={"seo"="false"}, methods={"POST"})
      *
      * @param SalesChannelContext $context
      * @return JsonResponse
diff --git a/src/Controller/Storefront/ApplePayDirect/Sw6/ApplePayDirectController.php b/src/Controller/Storefront/ApplePayDirect/Sw6/ApplePayDirectController.php
deleted file mode 100644
index b5135d69a..000000000
--- a/src/Controller/Storefront/ApplePayDirect/Sw6/ApplePayDirectController.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\Storefront\ApplePayDirect\Sw6;
-
-use Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderDispatcherAdapterInterface;
-use Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderEventFactory;
-use Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderFactory;
-use Kiener\MolliePayments\Components\ApplePayDirect\ApplePayDirect;
-use Kiener\MolliePayments\Controller\Storefront\ApplePayDirect\ApplePayDirectControllerBase;
-use Kiener\MolliePayments\Repository\Customer\CustomerRepositoryInterface;
-use Kiener\MolliePayments\Service\Cart\CartBackupService;
-use Kiener\MolliePayments\Service\OrderService;
-use Kiener\MolliePayments\Traits\Storefront\RedirectTrait;
-use Psr\Log\LoggerInterface;
-use Shopware\Core\Checkout\Order\Aggregate\OrderCustomer\OrderCustomerEntity;
-use Shopware\Core\Checkout\Order\OrderEntity;
-use Shopware\Core\Framework\Context;
-use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Shopware\Core\System\SalesChannel\SalesChannelContext;
-use Shopware\Storefront\Controller\StorefrontController;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
-use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\Routing\RouterInterface;
-use Throwable;
-
-/**
- * @RouteScope(scopes={"storefront"})
- */
-class ApplePayDirectController extends ApplePayDirectControllerBase
-{
-}
diff --git a/src/Controller/Storefront/ApplePayDirect/Sw65/ApplePayDirectController.php b/src/Controller/Storefront/ApplePayDirect/Sw65/ApplePayDirectController.php
deleted file mode 100644
index cc184d86a..000000000
--- a/src/Controller/Storefront/ApplePayDirect/Sw65/ApplePayDirectController.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\Storefront\ApplePayDirect\Sw65;
-
-use Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderDispatcherAdapterInterface;
-use Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderEventFactory;
-use Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderFactory;
-use Kiener\MolliePayments\Components\ApplePayDirect\ApplePayDirect;
-use Kiener\MolliePayments\Controller\Storefront\ApplePayDirect\ApplePayDirectControllerBase;
-use Kiener\MolliePayments\Repository\Customer\CustomerRepositoryInterface;
-use Kiener\MolliePayments\Service\Cart\CartBackupService;
-use Kiener\MolliePayments\Service\OrderService;
-use Kiener\MolliePayments\Traits\Storefront\RedirectTrait;
-use Psr\Log\LoggerInterface;
-use Shopware\Core\Checkout\Order\Aggregate\OrderCustomer\OrderCustomerEntity;
-use Shopware\Core\Checkout\Order\OrderEntity;
-use Shopware\Core\Framework\Context;
-use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Shopware\Core\System\SalesChannel\SalesChannelContext;
-use Shopware\Storefront\Controller\StorefrontController;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
-use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\Routing\RouterInterface;
-use Throwable;
-
-/**
- * @Route(defaults={"_routeScope"={"storefront"}})
- */
-class ApplePayDirectController extends ApplePayDirectControllerBase
-{
-}
diff --git a/src/Controller/Storefront/CreditCard/CreditCardControllerBase.php b/src/Controller/Storefront/CreditCard/CreditCardControllerBase.php
index 1536086a0..95670cd8d 100644
--- a/src/Controller/Storefront/CreditCard/CreditCardControllerBase.php
+++ b/src/Controller/Storefront/CreditCard/CreditCardControllerBase.php
@@ -3,18 +3,16 @@
 namespace Kiener\MolliePayments\Controller\Storefront\CreditCard;
 
 use Exception;
+use Kiener\MolliePayments\Controller\Storefront\AbstractStoreFrontController;
 use Kiener\MolliePayments\Service\CustomerServiceInterface;
 use Kiener\MolliePayments\Service\MandateServiceInterface;
 use Psr\Log\LoggerInterface;
 use Shopware\Core\Checkout\Customer\CustomerEntity;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
 use Shopware\Core\System\SalesChannel\SalesChannelContext;
-use Shopware\Storefront\Controller\StorefrontController;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Routing\Annotation\Route;
 
-class CreditCardControllerBase extends StorefrontController
+class CreditCardControllerBase extends AbstractStoreFrontController
 {
     /**
      * @var CustomerServiceInterface
@@ -45,7 +43,6 @@ public function __construct(CustomerServiceInterface $customerService, MandateSe
     }
 
     /**
-     * @Route("/mollie/components/store-card-token/{customerId}/{cardToken}", name="frontend.mollie.components.storeCardToken", options={"seo"="false"}, methods={"GET"})
      *
      * @param SalesChannelContext $context
      * @param string $customerId
@@ -80,7 +77,6 @@ public function storeCardToken(SalesChannelContext $context, string $customerId,
     }
 
     /**
-     * @Route("/mollie/components/store-mandate-id/{customerId}/{mandateId}", name="frontend.mollie.components.storeMandateId", options={"seo"="false"}, methods={"GET"})
      *
      * @param SalesChannelContext $context
      * @param string $customerId
@@ -113,7 +109,6 @@ public function storeMandateId(string $customerId, string $mandateId, SalesChann
     }
 
     /**
-     * @Route("/mollie/components/revoke-mandate/{customerId}/{mandateId}", name="frontend.mollie.components.revokeMandate", options={"seo"="false"}, methods={"GET"})
      *
      * @param SalesChannelContext $context
      * @param string $customerId
diff --git a/src/Controller/Storefront/CreditCard/Sw6/CreditCardController.php b/src/Controller/Storefront/CreditCard/Sw6/CreditCardController.php
deleted file mode 100644
index b9edf6fa6..000000000
--- a/src/Controller/Storefront/CreditCard/Sw6/CreditCardController.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\Storefront\CreditCard\Sw6;
-
-use Kiener\MolliePayments\Controller\Storefront\CreditCard\CreditCardControllerBase;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @RouteScope(scopes={"storefront"})
- */
-class CreditCardController extends CreditCardControllerBase
-{
-}
diff --git a/src/Controller/Storefront/CreditCard/Sw65/CreditCardController.php b/src/Controller/Storefront/CreditCard/Sw65/CreditCardController.php
deleted file mode 100644
index 8a00e384e..000000000
--- a/src/Controller/Storefront/CreditCard/Sw65/CreditCardController.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\Storefront\CreditCard\Sw65;
-
-use Kiener\MolliePayments\Controller\Storefront\CreditCard\CreditCardControllerBase;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @Route(defaults={"_routeScope"={"storefront"}})
- */
-class CreditCardController extends CreditCardControllerBase
-{
-}
diff --git a/src/Controller/Storefront/POS/PosControllerBase.php b/src/Controller/Storefront/POS/PosControllerBase.php
index 3a3500935..14e54d409 100644
--- a/src/Controller/Storefront/POS/PosControllerBase.php
+++ b/src/Controller/Storefront/POS/PosControllerBase.php
@@ -2,6 +2,7 @@
 
 namespace Kiener\MolliePayments\Controller\Storefront\POS;
 
+use Kiener\MolliePayments\Controller\Storefront\AbstractStoreFrontController;
 use Kiener\MolliePayments\Gateway\MollieGatewayInterface;
 use Kiener\MolliePayments\Repository\OrderTransaction\OrderTransactionRepositoryInterface;
 use Kiener\MolliePayments\Service\CustomerService;
@@ -11,14 +12,12 @@
 use Kiener\MolliePayments\Traits\Storefront\RedirectTrait;
 use Shopware\Core\Checkout\Customer\CustomerEntity;
 use Shopware\Core\System\SalesChannel\SalesChannelContext;
-use Shopware\Storefront\Controller\StorefrontController;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\RouterInterface;
 
-class PosControllerBase extends StorefrontController
+class PosControllerBase extends AbstractStoreFrontController
 {
     use RedirectTrait;
 
@@ -71,7 +70,6 @@ public function __construct(CustomerService $customerService, MollieGatewayInter
     }
 
     /**
-     * @Route("/mollie/pos/store-terminal/{customerId}/{terminalId}", name="frontend.mollie.pos.storeTerminal", options={"seo"="false"}, methods={"GET"})
      *
      * @param SalesChannelContext $context
      * @param string $customerId
@@ -102,7 +100,6 @@ public function storeTerminal(SalesChannelContext $context, string $customerId,
     }
 
     /**
-     * @Route("/mollie/pos/checkout", name="frontend.mollie.pos.checkout", options={"seo"="false"}, methods={"GET"})
      *
      * @param Request $request
      * @param SalesChannelContext $salesChannelContext
@@ -127,7 +124,6 @@ public function checkoutAction(Request $request, SalesChannelContext $salesChann
     }
 
     /**
-     * @Route("/mollie/pos/{orderId}/{molliePaymentId}/status", name="frontend.mollie.pos.checkout_status", options={"seo"="false"}, methods={"GET"})
      *
      * @param SalesChannelContext $context
      * @param string $orderId
diff --git a/src/Controller/Storefront/POS/Sw6/PosController.php b/src/Controller/Storefront/POS/Sw6/PosController.php
deleted file mode 100644
index aa46ec5c4..000000000
--- a/src/Controller/Storefront/POS/Sw6/PosController.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\Storefront\POS\Sw6;
-
-use Kiener\MolliePayments\Controller\Storefront\iDEAL\iDealControllerBase;
-use Kiener\MolliePayments\Controller\Storefront\POS\PosControllerBase;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @RouteScope(scopes={"storefront"})
- */
-class PosController extends PosControllerBase
-{
-}
diff --git a/src/Controller/Storefront/POS/Sw65/PosController.php b/src/Controller/Storefront/POS/Sw65/PosController.php
deleted file mode 100644
index 14486e7ba..000000000
--- a/src/Controller/Storefront/POS/Sw65/PosController.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\Storefront\POS\Sw65;
-
-use Kiener\MolliePayments\Controller\Storefront\iDEAL\iDealControllerBase;
-use Kiener\MolliePayments\Controller\Storefront\POS\PosControllerBase;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @Route(defaults={"_routeScope"={"storefront"}})
- */
-class PosController extends PosControllerBase
-{
-}
diff --git a/src/Controller/Storefront/Payment/MollieFailureControllerBase.php b/src/Controller/Storefront/Payment/MollieFailureControllerBase.php
index 1aa7d03e8..fd078947b 100644
--- a/src/Controller/Storefront/Payment/MollieFailureControllerBase.php
+++ b/src/Controller/Storefront/Payment/MollieFailureControllerBase.php
@@ -6,6 +6,7 @@
 use Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderDispatcherAdapterInterface;
 use Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderFactoryInterface;
 use Kiener\MolliePayments\Compatibility\Gateway\CompatibilityGatewayInterface;
+use Kiener\MolliePayments\Controller\Storefront\AbstractStoreFrontController;
 use Kiener\MolliePayments\Event\PaymentPageFailEvent;
 use Kiener\MolliePayments\Exception\CouldNotFetchTransactionException;
 use Kiener\MolliePayments\Exception\MissingMollieOrderIdException;
@@ -25,22 +26,17 @@
 use Mollie\Api\Exceptions\ApiException;
 use Mollie\Api\Resources\Order;
 use Psr\Log\LoggerInterface;
-use Shopware\Core\Checkout\Cart\Exception\OrderNotFoundException;
 use Shopware\Core\Checkout\Order\Aggregate\OrderCustomer\OrderCustomerEntity;
 use Shopware\Core\Checkout\Order\Aggregate\OrderLineItem\OrderLineItemCollection;
 use Shopware\Core\Checkout\Order\Aggregate\OrderTransaction\OrderTransactionEntity;
 use Shopware\Core\Checkout\Order\OrderEntity;
 use Shopware\Core\Checkout\Order\OrderStates;
-use Shopware\Core\Framework\Event\BusinessEventDispatcher;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
 use Shopware\Core\System\SalesChannel\SalesChannelContext;
-use Shopware\Storefront\Controller\StorefrontController;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\RouterInterface;
 
-class MollieFailureControllerBase extends StorefrontController
+class MollieFailureControllerBase extends AbstractStoreFrontController
 {
     /**
      * @var RouterInterface
@@ -131,8 +127,8 @@ public function __construct(RouterInterface $router, CompatibilityGatewayInterfa
         $this->customerService = $customerService;
     }
 
+
     /**
-     * @Route("/mollie/payment/failed/{transactionId}", defaults={"csrf_protected"=false}, name="frontend.mollie.payment-failed", options={"seo"="false"}, methods={"GET", "POST"})
      *
      * @param SalesChannelContext $salesChannelContext
      * @param string $transactionId
@@ -205,7 +201,6 @@ public function paymentFailedAction(SalesChannelContext $salesChannelContext, st
 
 
     /**
-     * @Route("/mollie/payment/retry/{transactionId}", defaults={"csrf_protected"=false}, name="frontend.mollie.payment.retry", options={"seo"="false"}, methods={"GET", "POST"})
      *
      * @param SalesChannelContext $context
      * @param string $transactionId
diff --git a/src/Controller/Storefront/Payment/ReturnControllerBase.php b/src/Controller/Storefront/Payment/ReturnControllerBase.php
index 67147c3f8..738495ef9 100644
--- a/src/Controller/Storefront/Payment/ReturnControllerBase.php
+++ b/src/Controller/Storefront/Payment/ReturnControllerBase.php
@@ -2,15 +2,13 @@
 
 namespace Kiener\MolliePayments\Controller\Storefront\Payment;
 
+use Kiener\MolliePayments\Controller\Storefront\AbstractStoreFrontController;
 use Kiener\MolliePayments\Facade\Controller\PaymentReturnFacade;
 use Mollie\Api\Exceptions\ApiException;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
 use Shopware\Core\System\SalesChannel\SalesChannelContext;
-use Shopware\Storefront\Controller\StorefrontController;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
 
-class ReturnControllerBase extends StorefrontController
+class ReturnControllerBase extends AbstractStoreFrontController
 {
     /**
      * @var PaymentReturnFacade
@@ -27,7 +25,6 @@ public function __construct(PaymentReturnFacade $returnFacade)
     }
 
     /**
-     * @Route("/mollie/payment/{swTransactionId}", defaults={"csrf_protected"=false}, name="frontend.mollie.payment", options={"seo"="false"}, methods={"GET", "POST"})
      *
      * @param SalesChannelContext $salesChannelContext
      * @param string $swTransactionId
diff --git a/src/Controller/Storefront/Payment/Sw6/MollieFailureController.php b/src/Controller/Storefront/Payment/Sw6/MollieFailureController.php
deleted file mode 100644
index dd638452d..000000000
--- a/src/Controller/Storefront/Payment/Sw6/MollieFailureController.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\Storefront\Payment\Sw6;
-
-use Kiener\MolliePayments\Controller\Storefront\Payment\MollieFailureControllerBase;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @RouteScope(scopes={"storefront"})
- */
-class MollieFailureController extends MollieFailureControllerBase
-{
-}
diff --git a/src/Controller/Storefront/Payment/Sw6/ReturnController.php b/src/Controller/Storefront/Payment/Sw6/ReturnController.php
deleted file mode 100644
index 123f82d16..000000000
--- a/src/Controller/Storefront/Payment/Sw6/ReturnController.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\Storefront\Payment\Sw6;
-
-use Kiener\MolliePayments\Controller\Storefront\Payment\ReturnControllerBase;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @RouteScope(scopes={"storefront"})
- */
-class ReturnController extends ReturnControllerBase
-{
-}
diff --git a/src/Controller/Storefront/Payment/Sw65/MollieFailureController.php b/src/Controller/Storefront/Payment/Sw65/MollieFailureController.php
deleted file mode 100644
index 41d12c287..000000000
--- a/src/Controller/Storefront/Payment/Sw65/MollieFailureController.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\Storefront\Payment\Sw65;
-
-use Kiener\MolliePayments\Controller\Storefront\Payment\MollieFailureControllerBase;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @Route(defaults={"_routeScope"={"storefront"}})
- */
-class MollieFailureController extends MollieFailureControllerBase
-{
-}
diff --git a/src/Controller/Storefront/Payment/Sw65/ReturnController.php b/src/Controller/Storefront/Payment/Sw65/ReturnController.php
deleted file mode 100644
index 9ed51c571..000000000
--- a/src/Controller/Storefront/Payment/Sw65/ReturnController.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\Storefront\Payment\Sw65;
-
-use Kiener\MolliePayments\Controller\Storefront\Payment\ReturnControllerBase;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @Route(defaults={"_routeScope"={"storefront"}})
- */
-class ReturnController extends ReturnControllerBase
-{
-}
diff --git a/src/Controller/Storefront/Webhook/Sw6/WebhookController.php b/src/Controller/Storefront/Webhook/Sw6/WebhookController.php
deleted file mode 100644
index 4849cd7b0..000000000
--- a/src/Controller/Storefront/Webhook/Sw6/WebhookController.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\Storefront\Webhook\Sw6;
-
-use Kiener\MolliePayments\Controller\Storefront\Webhook\WebhookControllerBase;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-
-/**
- * @RouteScope(scopes={"storefront"})
- */
-class WebhookController extends WebhookControllerBase
-{
-}
diff --git a/src/Controller/Storefront/Webhook/Sw65/WebhookController.php b/src/Controller/Storefront/Webhook/Sw65/WebhookController.php
deleted file mode 100644
index eb19139f1..000000000
--- a/src/Controller/Storefront/Webhook/Sw65/WebhookController.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\Storefront\Webhook\Sw65;
-
-use Kiener\MolliePayments\Components\Subscription\Exception\SubscriptionSkippedException;
-use Kiener\MolliePayments\Components\Subscription\SubscriptionManager;
-use Kiener\MolliePayments\Controller\Storefront\Webhook\WebhookControllerBase;
-use Kiener\MolliePayments\Repository\Order\OrderRepository;
-use Kiener\MolliePayments\Repository\Order\OrderRepositoryInterface;
-use Psr\Log\LoggerInterface;
-use Shopware\Core\Checkout\Order\Aggregate\OrderTransaction\OrderTransactionEntity;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Shopware\Core\Framework\Validation\DataBag\RequestDataBag;
-use Shopware\Core\System\SalesChannel\SalesChannelContext;
-use Shopware\Storefront\Controller\StorefrontController;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @Route(defaults={"_routeScope"={"storefront"}})
- */
-class WebhookController extends WebhookControllerBase
-{
-}
diff --git a/src/Controller/Storefront/Webhook/WebhookControllerBase.php b/src/Controller/Storefront/Webhook/WebhookControllerBase.php
index 1c0b8d714..2a5aa0156 100644
--- a/src/Controller/Storefront/Webhook/WebhookControllerBase.php
+++ b/src/Controller/Storefront/Webhook/WebhookControllerBase.php
@@ -4,20 +4,16 @@
 
 use Kiener\MolliePayments\Components\Subscription\Exception\SubscriptionSkippedException;
 use Kiener\MolliePayments\Components\Subscription\SubscriptionManager;
-use Kiener\MolliePayments\Repository\Order\OrderRepository;
+use Kiener\MolliePayments\Controller\Storefront\AbstractStoreFrontController;
 use Kiener\MolliePayments\Repository\Order\OrderRepositoryInterface;
 use Kiener\MolliePayments\Repository\OrderTransaction\OrderTransactionRepositoryInterface;
 use Psr\Log\LoggerInterface;
-use Shopware\Core\Checkout\Order\Aggregate\OrderTransaction\OrderTransactionEntity;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
 use Shopware\Core\Framework\Validation\DataBag\RequestDataBag;
 use Shopware\Core\System\SalesChannel\SalesChannelContext;
-use Shopware\Storefront\Controller\StorefrontController;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Routing\Annotation\Route;
 
-class WebhookControllerBase extends StorefrontController
+class WebhookControllerBase extends AbstractStoreFrontController
 {
     /**
      * @var NotificationFacade
@@ -62,7 +58,6 @@ public function __construct(NotificationFacade $notificationFacade, Subscription
     }
 
     /**
-     * @Route("/mollie/webhook/{swTransactionId}", defaults={"csrf_protected"=false}, name="frontend.mollie.webhook", options={"seo"="false"}, methods={"GET", "POST"})
      *
      * @param SalesChannelContext $context
      * @param string $swTransactionId
@@ -93,7 +88,6 @@ public function onWebhookReceived(SalesChannelContext $context, string $swTransa
     }
 
     /**
-     * @Route("/mollie/webhook/subscription/{swSubscriptionId}", defaults={"csrf_protected"=false}, name="frontend.mollie.webhook.subscription", options={"seo"="false"}, methods={"GET", "POST"})
      *
      * @param string $swSubscriptionId
      * @param Request $request
@@ -107,7 +101,6 @@ public function onWebhookSubscriptionReceived(string $swSubscriptionId, Request
     }
 
     /**
-     * @Route("/mollie/webhook/subscription/{swSubscriptionId}/renew", defaults={"csrf_protected"=false}, name="frontend.mollie.webhook.subscription.renew", options={"seo"="false"}, methods={"GET", "POST"})
      *
      * @param string $swSubscriptionId
      * @param Request $request
diff --git a/src/Controller/Storefront/iDEAL/Sw6/iDealController.php b/src/Controller/Storefront/iDEAL/Sw6/iDealController.php
deleted file mode 100644
index f9b0e39bc..000000000
--- a/src/Controller/Storefront/iDEAL/Sw6/iDealController.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\Storefront\iDEAL\Sw6;
-
-use Kiener\MolliePayments\Controller\Storefront\iDEAL\iDealControllerBase;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @RouteScope(scopes={"storefront"})
- */
-class iDealController extends iDealControllerBase
-{
-}
diff --git a/src/Controller/Storefront/iDEAL/Sw65/iDealController.php b/src/Controller/Storefront/iDEAL/Sw65/iDealController.php
deleted file mode 100644
index e5a033a37..000000000
--- a/src/Controller/Storefront/iDEAL/Sw65/iDealController.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Kiener\MolliePayments\Controller\Storefront\iDEAL\Sw65;
-
-use Kiener\MolliePayments\Controller\Storefront\iDEAL\iDealControllerBase;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * @Route(defaults={"_routeScope"={"storefront"}})
- */
-class iDealController extends iDealControllerBase
-{
-}
diff --git a/src/Controller/Storefront/iDEAL/iDealControllerBase.php b/src/Controller/Storefront/iDEAL/iDealControllerBase.php
index 1c764cca3..712b6da10 100644
--- a/src/Controller/Storefront/iDEAL/iDealControllerBase.php
+++ b/src/Controller/Storefront/iDEAL/iDealControllerBase.php
@@ -2,22 +2,14 @@
 
 namespace Kiener\MolliePayments\Controller\Storefront\iDEAL;
 
+use Kiener\MolliePayments\Controller\Storefront\AbstractStoreFrontController;
 use Kiener\MolliePayments\Handler\Method\iDealPayment;
 use Kiener\MolliePayments\Service\CustomerService;
-use Kiener\MolliePayments\Service\SettingsService;
-use Kiener\MolliePayments\Setting\MollieSettingStruct;
-use Mollie\Api\Exceptions\ApiException;
-use Mollie\Api\MollieApiClient;
 use Shopware\Core\Checkout\Customer\CustomerEntity;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
 use Shopware\Core\System\SalesChannel\SalesChannelContext;
-use Shopware\Storefront\Controller\StorefrontController;
 use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\Routing\Router;
 
-class iDealControllerBase extends StorefrontController
+class iDealControllerBase extends AbstractStoreFrontController
 {
     /**
      * @var CustomerService
@@ -34,7 +26,6 @@ public function __construct(CustomerService $customerService)
     }
 
     /**
-     * @Route("/mollie/ideal/store-issuer/{customerId}/{issuerId}", name="frontend.mollie.ideal.storeIssuer", options={"seo"="false"}, methods={"GET"})
      *
      * @param SalesChannelContext $context
      * @param string $customerId
diff --git a/src/Facade/MolliePaymentFinalize.php b/src/Facade/MolliePaymentFinalize.php
index 208198740..772296bee 100644
--- a/src/Facade/MolliePaymentFinalize.php
+++ b/src/Facade/MolliePaymentFinalize.php
@@ -19,8 +19,7 @@
 use Shopware\Core\Checkout\Order\Aggregate\OrderCustomer\OrderCustomerEntity;
 use Shopware\Core\Checkout\Order\OrderEntity;
 use Shopware\Core\Checkout\Payment\Cart\AsyncPaymentTransactionStruct;
-use Shopware\Core\Checkout\Payment\Exception\AsyncPaymentFinalizeException;
-use Shopware\Core\Checkout\Payment\Exception\CustomerCanceledAsyncPaymentException;
+use Shopware\Core\Checkout\Payment\PaymentException;
 use Shopware\Core\Checkout\Payment\PaymentMethodEntity;
 use Shopware\Core\Framework\Context;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
@@ -167,15 +166,16 @@ public function finalize(AsyncPaymentTransactionStruct $transactionStruct, Sales
 
                 # fire flow builder event
                 $this->fireFlowBuilderEvent(self::FLOWBUILDER_CANCELED, $order, $salesChannelContext->getContext());
-
-                throw new CustomerCanceledAsyncPaymentException($orderTransactionID, $message);
+                /** @phpstan-ignore-next-line  */
+                throw PaymentException::customerCanceled($orderTransactionID, $message);
             } else {
                 $message = sprintf('Payment for order %s (%s) failed. The Mollie payment status was not successful for this payment attempt.', $order->getOrderNumber(), $mollieOrder->id);
 
                 # fire flow builder event
                 $this->fireFlowBuilderEvent(self::FLOWBUILDER_FAILED, $order, $salesChannelContext->getContext());
 
-                throw new AsyncPaymentFinalizeException($orderTransactionID, $message);
+                /** @phpstan-ignore-next-line  */
+                throw PaymentException::asyncFinalizeInterrupted($orderTransactionID, $message);
             }
         }
 
diff --git a/src/Handler/PaymentHandler.php b/src/Handler/PaymentHandler.php
index 664b5ddfb..62189f776 100644
--- a/src/Handler/PaymentHandler.php
+++ b/src/Handler/PaymentHandler.php
@@ -17,8 +17,7 @@
 use Shopware\Core\Checkout\Order\OrderEntity;
 use Shopware\Core\Checkout\Payment\Cart\AsyncPaymentTransactionStruct;
 use Shopware\Core\Checkout\Payment\Cart\PaymentHandler\AsynchronousPaymentHandlerInterface;
-use Shopware\Core\Checkout\Payment\Exception\AsyncPaymentFinalizeException;
-use Shopware\Core\Checkout\Payment\Exception\CustomerCanceledAsyncPaymentException;
+use Shopware\Core\Checkout\Payment\PaymentException;
 use Shopware\Core\Framework\Validation\DataBag\RequestDataBag;
 use Shopware\Core\System\SalesChannel\SalesChannelContext;
 use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -173,7 +172,8 @@ public function finalize(AsyncPaymentTransactionStruct $transaction, Request $re
 
         try {
             $this->finalizeFacade->finalize($transaction, $salesChannelContext);
-        } catch (AsyncPaymentFinalizeException|CustomerCanceledAsyncPaymentException $ex) {
+            /** @phpstan-ignore-next-line  */
+        } catch (PaymentException $ex) {
             $this->logger->error(
                 'Error when finalizing order ' . $transaction->getOrder()->getOrderNumber() . ', Mollie ID: ' . $molliedID . ', ' . $ex->getMessage()
             );
@@ -190,11 +190,8 @@ public function finalize(AsyncPaymentTransactionStruct $transaction, Request $re
             $this->logger->error(
                 'Unknown Error when finalizing order ' . $transaction->getOrder()->getOrderNumber() . ', Mollie ID: ' . $molliedID . ', ' . $ex->getMessage()
             );
-
-            throw new AsyncPaymentFinalizeException(
-                $transaction->getOrderTransaction()->getId(),
-                'An unknown error happened when finalizing the order. Please see the Shopware logs for more. It can be that the payment in Mollie was succesful and the Shopware order is now cancelled or failed!'
-            );
+            /** @phpstan-ignore-next-line  */
+            throw PaymentException::asyncFinalizeInterrupted($transaction->getOrderTransaction()->getId(), 'An unknown error happened when finalizing the order. Please see the Shopware logs for more. It can be that the payment in Mollie was succesful and the Shopware order is now cancelled or failed!');
         }
     }
 
diff --git a/src/Migration/Migration1711618833SubscriptionCurrency.php b/src/Migration/Migration1711618833SubscriptionCurrency.php
new file mode 100644
index 000000000..6ea1edbb0
--- /dev/null
+++ b/src/Migration/Migration1711618833SubscriptionCurrency.php
@@ -0,0 +1,78 @@
+<?php declare(strict_types=1);
+
+namespace Kiener\MolliePayments\Migration;
+
+use Doctrine\DBAL\Connection;
+use Shopware\Core\Framework\Log\Package;
+use Shopware\Core\Framework\Migration\MigrationStep;
+use Shopware\Core\Framework\Uuid\Uuid;
+
+/**
+ * @internal
+ */
+#[Package('core')]
+class Migration1711618833SubscriptionCurrency extends MigrationStep
+{
+    public function getCreationTimestamp(): int
+    {
+        return 1711618833;
+    }
+
+    public function update(Connection $connection): void
+    {
+        // add new columns
+        $sql = "ALTER TABLE `mollie_subscription` 
+                ADD COLUMN `currency_id` BINARY(16) NULL AFTER `currency`,
+                ADD COLUMN `total_rounding` JSON NULL,
+                ADD COLUMN `item_rounding` JSON NULL
+                ";
+        $connection->executeStatement($sql);
+
+        //add foreign key
+        $sql = "ALTER TABLE `mollie_subscription` ADD CONSTRAINT `fk.mollie_subscription.currency_id` FOREIGN KEY (`currency_id`) REFERENCES `currency` (`id`) ON DELETE SET NULL ON UPDATE CASCADE";
+        $connection->executeStatement($sql);
+
+        //load used currencies
+        $sql = "SELECT DISTINCT `currency` FROM `mollie_subscription`";
+        $statement = $connection->executeQuery($sql);
+        $currencies = [];
+        while ($row = $statement->fetchAssociative()) {
+            $currencies[]=$row['currency'];
+        }
+        //get the data for each currency
+        $sql = "SELECT HEX(`id`) as `id`,`iso_code`,`item_rounding`,`total_rounding` FROM `currency` WHERE `iso_code` IN(:currencies)";
+        $statement = $connection->executeQuery($sql, [
+            'currencies' => $currencies
+        ], [
+            'currencies' => Connection::PARAM_STR_ARRAY
+        ]);
+
+
+        //update currency information
+        $sql = "UPDATE `mollie_subscription` SET `currency_id` = :currencyId, `item_rounding` = :itemRounding,`total_rounding` =:totalRounding  WHERE `currency` = :currencyIso";
+
+        $updateStatement = $connection->prepare($sql);
+
+        while ($row = $statement->fetchAssociative()) {
+            $updateStatement->executeStatement([
+                'currencyId' => Uuid::fromHexToBytes($row['id']),
+                'itemRounding' => $row['item_rounding'],
+                'totalRounding' => $row['total_rounding'],
+                'currencyIso' => $row['iso_code']
+            ]);
+        }
+
+        //delete unsused column
+        $sql = "ALTER TABLE  `mollie_subscription` DROP COLUMN `currency`";
+        $connection->executeStatement($sql);
+    }
+
+    /**
+     * @param Connection $connection
+     * @return void
+     */
+    public function updateDestructive(Connection $connection): void
+    {
+        // implement update destructive
+    }
+}
diff --git a/src/MolliePayments.php b/src/MolliePayments.php
index 75db7594c..7169068ae 100644
--- a/src/MolliePayments.php
+++ b/src/MolliePayments.php
@@ -45,42 +45,6 @@ public function build(ContainerBuilder $container): void
     }
 
 
-    /**
-     * @return void
-     */
-    public function boot(): void
-    {
-        parent::boot();
-    }
-
-    /**
-     * @param RoutingConfigurator $routes
-     * @param string $environment
-     * @return void
-     */
-    public function configureRoutes(RoutingConfigurator $routes, string $environment): void
-    {
-        if (!$this->isActive()) {
-            return;
-        }
-
-        /** @var Container $container */
-        $container = $this->container;
-
-        $loader = new DependencyLoader($container);
-
-        $routeDir = $loader->getRoutesPath($this->getPath());
-
-        $fileSystem = new Filesystem();
-
-        if ($fileSystem->exists($routeDir)) {
-            $routes->import($routeDir . '/{routes}/*' . Kernel::CONFIG_EXTS, 'glob');
-            $routes->import($routeDir . '/{routes}/' . $environment . '/**/*' . Kernel::CONFIG_EXTS, 'glob');
-            $routes->import($routeDir . '/{routes}' . Kernel::CONFIG_EXTS, 'glob');
-            $routes->import($routeDir . '/{routes}_' . $environment . Kernel::CONFIG_EXTS, 'glob');
-        }
-    }
-
     /**
      * @param InstallContext $context
      * @return void
@@ -121,25 +85,6 @@ public function update(UpdateContext $context): void
             $this->runDbMigrations($context->getMigrationCollection());
         }
     }
-
-    /**
-     * @param InstallContext $context
-     * @return void
-     */
-    public function postInstall(InstallContext $context): void
-    {
-        parent::postInstall($context);
-    }
-
-    /**
-     * @param UninstallContext $context
-     * @return void
-     */
-    public function uninstall(UninstallContext $context): void
-    {
-        parent::uninstall($context);
-    }
-
     /**
      * @param ActivateContext $context
      * @throws \Doctrine\DBAL\Exception
@@ -154,14 +99,6 @@ public function activate(ActivateContext $context): void
         $this->runDbMigrations($context->getMigrationCollection());
     }
 
-    /**
-     * @param DeactivateContext $context
-     * @return void
-     */
-    public function deactivate(DeactivateContext $context): void
-    {
-        parent::deactivate($context);
-    }
 
     /**
      * @param Context $context
diff --git a/src/Repository/OrderTransaction/OrderTransactionRepository.php b/src/Repository/OrderTransaction/OrderTransactionRepository.php
index 20113771f..8dd256922 100644
--- a/src/Repository/OrderTransaction/OrderTransactionRepository.php
+++ b/src/Repository/OrderTransaction/OrderTransactionRepository.php
@@ -57,6 +57,7 @@ public function getLatestOrderTransaction(string $orderID, Context $context): Or
         $criteria = new Criteria();
         $criteria->addFilter(new EqualsFilter('order.id', $orderID));
         $criteria->addAssociation('order');
+        $criteria->addAssociation('stateMachineState');
         $criteria->addAssociation('paymentMethod');
         $criteria->addSorting(new FieldSorting('createdAt'));
 
diff --git a/src/Repository/StateMachineState/StateMachineStateRepository.php b/src/Repository/StateMachineState/StateMachineStateRepository.php
new file mode 100644
index 000000000..4ba7ea578
--- /dev/null
+++ b/src/Repository/StateMachineState/StateMachineStateRepository.php
@@ -0,0 +1,39 @@
+<?php
+declare(strict_types=1);
+
+namespace Kiener\MolliePayments\Repository\StateMachineState;
+
+use Shopware\Core\Framework\Context;
+use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
+use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
+use Shopware\Core\System\StateMachine\Aggregation\StateMachineState\StateMachineStateEntity;
+
+class StateMachineStateRepository implements StateMachineStateRepositoryInterface
+{
+    /**
+     * @var EntityRepository
+     */
+    private $stateMachineStateRepository;
+
+    /**
+     * @param EntityRepository $stateMachineStateRepository
+     */
+    public function __construct(EntityRepository $stateMachineStateRepository)
+    {
+        $this->stateMachineStateRepository = $stateMachineStateRepository;
+    }
+
+
+    public function findByStateId(string $stateId, Context $context): ?StateMachineStateEntity
+    {
+        $criteria = new Criteria([$stateId]);
+        $searchResult = $this->stateMachineStateRepository->search($criteria, $context);
+        if ($searchResult->count() === 0) {
+            return null;
+        }
+        /** @var StateMachineStateEntity $entity */
+        $entity = $searchResult->first();
+
+        return $entity;
+    }
+}
diff --git a/src/Repository/StateMachineState/StateMachineStateRepositoryInterface.php b/src/Repository/StateMachineState/StateMachineStateRepositoryInterface.php
new file mode 100644
index 000000000..3d7b8dbda
--- /dev/null
+++ b/src/Repository/StateMachineState/StateMachineStateRepositoryInterface.php
@@ -0,0 +1,12 @@
+<?php
+declare(strict_types=1);
+
+namespace Kiener\MolliePayments\Repository\StateMachineState;
+
+use Shopware\Core\Framework\Context;
+use Shopware\Core\System\StateMachine\Aggregation\StateMachineState\StateMachineStateEntity;
+
+interface StateMachineStateRepositoryInterface
+{
+    public function findByStateId(string $stateId, Context $context): ?StateMachineStateEntity;
+}
diff --git a/src/Resources/app/administration/src/module/mollie-payments/components/mollie-pluginconfig-section-payments-format/index.js b/src/Resources/app/administration/src/module/mollie-payments/components/mollie-pluginconfig-section-payments-format/index.js
index 71d70d139..7ab2b870d 100644
--- a/src/Resources/app/administration/src/module/mollie-payments/components/mollie-pluginconfig-section-payments-format/index.js
+++ b/src/Resources/app/administration/src/module/mollie-payments/components/mollie-pluginconfig-section-payments-format/index.js
@@ -7,7 +7,7 @@ const {Component} = Shopware;
 
 Component.register('mollie-pluginconfig-section-payments-format', {
     template,
-
+    inject:['actualConfigData','currentSalesChannelId'],
     computed: {
 
         /**
@@ -47,7 +47,7 @@ Component.register('mollie-pluginconfig-section-payments-format', {
          */
         getFormat(ordernumber, customerNumber) {
 
-            const template = this.getConfigData('MolliePayments.config.formatOrderNumber');
+            const template = this.actualConfigData[this.currentSalesChannelId]['MolliePayments.config.formatOrderNumber'];
 
             const stringUtils = new StringUtils();
 
@@ -57,49 +57,6 @@ Component.register('mollie-pluginconfig-section-payments-format', {
 
             return text;
         },
-
-        /**
-         *
-         * @returns {*}
-         */
-        getConfigData(key) {
-            // Shopware > 6.4.7.0
-            const configRootNew = this.$parent.$parent.$parent.$parent.$parent;
-            // Shopware <= 6.4.7.0
-            const configRootOld = this.$parent.$parent.$parent.$parent;
-
-            var value = null;
-
-            if (configRootNew !== null) {
-                var scId = null;
-                if (configRootNew.currentSalesChannelId !== undefined) {
-                    scId = configRootNew.currentSalesChannelId;
-                }
-
-                if (configRootNew.actualConfigData !== undefined) {
-
-                    // try to grab it from our current sales channel, if existing
-                    if (scId !== null) {
-                        value = configRootNew.actualConfigData[scId][key];
-                    }
-
-                    // if we are in AllSalesChannel, or didnt find a value,
-                    // then use the inherited one from our parent (condition => value is NULL)
-                    if (value === null) {
-                        value = configRootNew.actualConfigData.null[key];
-                    }
-                }
-            }
-
-            if (configRootOld !== null && configRootOld.actualConfigData !== undefined) {
-                return configRootOld.actualConfigData.null[key];
-            }
-
-            // does not exist e.g. in Shopware 6.3.5.2
-            return value;
-        },
-
     },
 
-})
-;
+});
\ No newline at end of file
diff --git a/src/Resources/app/administration/src/module/mollie-payments/components/mollie-pluginconfig-support-modal/mollie-pluginconfig-support-modal.html.twig b/src/Resources/app/administration/src/module/mollie-payments/components/mollie-pluginconfig-support-modal/mollie-pluginconfig-support-modal.html.twig
index 96db470ff..f34682dca 100644
--- a/src/Resources/app/administration/src/module/mollie-payments/components/mollie-pluginconfig-support-modal/mollie-pluginconfig-support-modal.html.twig
+++ b/src/Resources/app/administration/src/module/mollie-payments/components/mollie-pluginconfig-support-modal/mollie-pluginconfig-support-modal.html.twig
@@ -15,29 +15,31 @@
             </sw-alert>
 
             <sw-container columns="1fr 1fr" gap="16px">
-                <sw-text-field v-model="name"
+                <sw-text-field v-model:value="name" v-model="name"
+                               class="input-name"
                                :label="$tc('mollie-payments.config.support.form.name')"
                                :placeholder="userName"
                                size="medium">
-
                 </sw-text-field>
-                <sw-email-field v-model="email"
+                <sw-email-field v-model:value="email" v-model="email"
+                                class="input-email"
                                 :label="$tc('mollie-payments.config.support.form.email')"
                                 :placeholder="user.email"
                                 size="medium">
-
                 </sw-email-field>
             </sw-container>
-            <sw-single-select v-model="recipientLocale"
+            <sw-single-select v-model:value="recipientLocale" v-model="recipientLocale"
+                              class="input-recepient"
                               :label="$tc('mollie-payments.config.support.form.recipient')"
                               :options="recipientOptions"
                               size="medium">
             </sw-single-select>
-            <sw-text-field v-model="subject"
+            <sw-text-field v-model:value="subject"  v-model="subject"
+                           class="input-subject"
                            :label="$tc('mollie-payments.config.support.form.subject')"
                            size="medium">
             </sw-text-field>
-            <sw-text-editor v-model="message"
+            <sw-text-editor v-model="message"  v-model:value="message"  class="input-message"
                             :label="$tc('mollie-payments.config.support.form.message')">
             </sw-text-editor>
         </sw-container>
diff --git a/src/Resources/app/administration/src/module/mollie-payments/components/mollie-refund-manager/index.js b/src/Resources/app/administration/src/module/mollie-payments/components/mollie-refund-manager/index.js
index 5f83fd8ba..7c2c833d2 100644
--- a/src/Resources/app/administration/src/module/mollie-payments/components/mollie-refund-manager/index.js
+++ b/src/Resources/app/administration/src/module/mollie-payments/components/mollie-refund-manager/index.js
@@ -5,7 +5,7 @@ import MollieRefundsGrid from './grids/MollieRefundsGrid';
 import RefundItemService from './services/RefundItemService';
 
 // eslint-disable-next-line no-undef
-const {Component, Mixin} = Shopware;
+const {Component, Mixin, Filter} = Shopware;
 
 
 Component.register('mollie-refund-manager', {
@@ -132,6 +132,13 @@ Component.register('mollie-refund-manager', {
             return this.$tc('mollie-payments.refund-manager.summary.lblDescription', 0, {characters: this.refundDescription.length})
         },
 
+        currencyFilter() {
+            return Filter.getByName('currency');
+        },
+
+        dateFilter() {
+            return Filter.getByName('date');
+        },
     },
 
     methods: {
diff --git a/src/Resources/app/administration/src/module/mollie-payments/components/mollie-refund-manager/mollie-refund-manager.html.twig b/src/Resources/app/administration/src/module/mollie-payments/components/mollie-refund-manager/mollie-refund-manager.html.twig
index f7f718e42..423db00ed 100644
--- a/src/Resources/app/administration/src/module/mollie-payments/components/mollie-refund-manager/mollie-refund-manager.html.twig
+++ b/src/Resources/app/administration/src/module/mollie-payments/components/mollie-refund-manager/mollie-refund-manager.html.twig
@@ -42,14 +42,14 @@
                     {{ item.shopware.label }}
                 </template>
                 <template #column-shopware.unitPrice="{ item }">
-                    {{ item.shopware.unitPrice | currency(order.currency.shortName) }}
+                    {{ currencyFilter( item.shopware.unitPrice, order.currency.isoCode, order.totalRounding.decimals) }}
                 </template>
                 <template #column-shopware.totalPrice="{ item }">
                     <div v-if="isItemPromotion(item)">
                         -
                     </div>
                     <div v-if="!isItemPromotion(item)">
-                        {{ item.shopware.totalPrice | currency(order.currency.shortName) }}
+                        {{ currencyFilter( item.shopware.totalPrice , order.currency.isoCode, order.totalRounding.decimals) }}
                     </div>
                 </template>
                 <template #column-shopware.quantity="{ item }">
@@ -61,6 +61,7 @@
                 <template #column-inputQuantity="{ item }">
                     <sw-number-field numberType="float"
                                      v-model="item.refundQuantity"
+                                     v-model:value="item.refundQuantity"
                                      v-if="isItemRefundable(item)"
                                      :allowEmpty="true"
                                      :class="{ 'tutorial-active' : tutorialPartialQuantityVisible || tutorialPartialPromotionsVisible || (tutorialRefundShipping && isItemDelivery(item)), 'input-mode-active' : item.refundMode == 'quantity', 'input-mode-inactive' : item.refundMode == 'amount' }"
@@ -73,16 +74,17 @@
                 <template #column-inputAmount="{ item }">
                     <sw-number-field numberType="float"
                                      v-model="item.refundAmount"
+                                     v-model:value="item.refundAmount"
                                      v-if="isItemRefundable(item) && !isItemPromotion(item)"
                                      :allowEmpty="true"
-                                     :class="{ 'tutorial-active' : tutorialPartialQuantityVisible || tutorialPartialPromotionsVisible || (tutorialRefundShipping && isItemDelivery(item)), 'input-mode-active' : item.refundMode == 'amount', 'input-mode-inactive' : item.refundMode == 'quantity' }"
+                                     :class="{ 'tutorial-active' : tutorialPartialQuantityVisible || tutorialPartialPromotionsVisible || (tutorialRefundShipping && isItemDelivery(item)), 'input-mode-active' : item.refundMode == 'amount', 'input-mode-inactive' : item.refundMode == 'quantity'}"
                                      @change="onItemAmountChanged(item)">
                         <template #suffix>
                             {{ order.currency.symbol }}
                         </template>
                     </sw-number-field>
                     <div v-if="isItemPromotion(item)">
-                        {{ item.refundAmount | currency(order.currency.shortName) }}
+                        {{ currencyFilter(  item.refundAmount, order.currency.isoCode, order.totalRounding.decimals) }}
                     </div>
                 </template>
                 <template #column-inputConsiderTax="{ item }">
@@ -100,6 +102,7 @@
                     <div v-if="isItemRefundable(item) && !isItemPromotion(item) && isItemDiscounted(item)">
                         <sw-checkbox-field :label="$tc('mollie-payments.refund-manager.cart.grid.checkDeductPromotion')"
                                            v-model="item.refundPromotion"
+                                           v-model:value="item.refundPromotion"
                                            class="check-deduct-promotion"
                                            :class="{ 'tutorial-active': tutorialPartialPromotionsVisible }"
                                            @change="onItemPromotionDeductionChanged(item)">
@@ -109,6 +112,7 @@
                 <template #column-inputStock=" { item }">
                     <sw-number-field numberType="float"
                                      v-model="item.resetStock"
+                                     v-model:value="item.resetStock"
                                      v-if="isItemRefundable(item) && !isItemPromotion(item) && !isItemDelivery(item)"
                                      :class="{ 'tutorial-active' : tutorialResetStock }"
                                      :allowEmpty="true">
@@ -119,7 +123,7 @@
                 </template>
             </sw-data-grid>
             <div v-if="roundingDiff > 0" class="rounding-item-info-container color-rounding-item">
-                {{ $tc('mollie-payments.refund-manager.cart.roundDiffItemAdded') }} ({{ roundingDiff | currency(order.currency.shortName) }})
+                {{ $tc('mollie-payments.refund-manager.cart.roundDiffItemAdded') }} ({{ currencyFilter( roundingDiff , order.currency.isoCode, order.totalRounding.decimals) }})
             </div>
         </sw-card>
         {# --------------------------------------------------------------------------------------------- #}
@@ -250,10 +254,10 @@
                                         {{ $tc('mollie-payments.refund-manager.summary.captionTotal') }}
                                     </dt>
                                     <dd class="summary-item-value">
-                                        {{ order.amountNet | currency(order.currency.shortName) }}
+                                        {{ currencyFilter( order.amountNet , order.currency.isoCode, order.totalRounding.decimals) }}
                                     </dd>
                                     <dd class="summary-item-value">
-                                        {{ order.amountTotal | currency(order.currency.shortName) }}
+                                        {{ currencyFilter( order.amountTotal , order.currency.isoCode, order.totalRounding.decimals) }}
                                     </dd>
                                 </template>
                             {% endblock %}
@@ -264,7 +268,7 @@
                                     </dt>
                                     <dd class="summary-item-value"></dd>
                                     <dd class="summary-item-value">
-                                        {{ order.positionPrice | currency(order.currency.translated.shortName) }}
+                                        {{ currencyFilter( order.positionPrice , order.currency.isoCode, order.totalRounding.decimals) }}
                                     </dd>
                                 </template>
                             {% endblock %}
@@ -276,7 +280,7 @@
                                     </dt>
                                     <dd class="summary-item-value"></dd>
                                     <dd class="summary-item-value">
-                                        ({{ roundingDiff | currency(order.currency.shortName) }})
+                                        ({{ currencyFilter( roundingDiff , order.currency.isoCode, order.totalRounding.decimals) }})
                                     </dd>
                                 </template>
                             {% endblock %}
@@ -287,7 +291,7 @@
                                     </dt>
                                     <dd class="summary-item-value"></dd>
                                     <dd class="summary-item-value">
-                                        - {{ voucherAmount | currency(order.currency.shortName) }}
+                                        - {{ currencyFilter( voucherAmount , order.currency.isoCode, order.totalRounding.decimals) }}
                                     </dd>
                                 </template>
                             {% endblock %}
@@ -297,7 +301,7 @@
                                 </dt>
                                 <dd class="summary-item-value"></dd>
                                 <dd class="summary-item-value">
-                                    - {{ pendingRefunds | currency(order.currency.shortName) }}
+                                    - {{ currencyFilter( pendingRefunds , order.currency.isoCode, order.totalRounding.decimals) }}
                                 </dd>
                             {% endblock %}
                             {% block sw_order_line_items_grid_refund_summary_amount_refunded %}
@@ -306,7 +310,7 @@
                                 </dt>
                                 <dd class="summary-item-value"></dd>
                                 <dd class="summary-item-value">
-                                    - {{ refundedAmount | currency(order.currency.shortName) }}
+                                    - {{ currencyFilter( refundedAmount , order.currency.isoCode, order.totalRounding.decimals) }}
                                 </dd>
                             {% endblock %}
                             {% block sw_order_line_items_grid_refund_summary_amount_remaining %}
@@ -318,7 +322,7 @@
                                     <sw-label variant="neutral"
                                               size="medium"
                                               :class="{ 'summary-item-value-remaining' : true,  'summary-fix-available' : isButtonFixDiffAvailable() }">
-                                        = {{ remainingAmount | currency(order.currency.shortName) }}
+                                        = {{ currencyFilter( remainingAmount , order.currency.isoCode, order.totalRounding.decimals) }}
                                     </sw-label>
                                 </dd>
                             {% endblock %}
@@ -330,8 +334,11 @@
                                          numberType="float"
                                          size="medium"
                                          v-model="refundAmount"
+                                         v-model:value="refundAmount"
                                          :min="0"
-                                         :class="{ 'tutorial-active' : tutorialPartialAmountRefundVisible || tutorialPartialQuantityVisible || tutorialPartialPromotionsVisible || tutorialRefundShipping }">
+                                         :class="{ 'tutorial-active' : tutorialPartialAmountRefundVisible || tutorialPartialQuantityVisible || tutorialPartialPromotionsVisible || tutorialRefundShipping }"
+                                         class="refund-amount"
+                        >
                             <template #suffix>
                                 {{ order.currency.symbol }}
                             </template>
@@ -347,7 +354,8 @@
                     <sw-textarea-field v-if="isAclRefundAllowed"
                                        type="textarea"
                                        v-model="refundDescription"
-                                       class="field-description"
+                                       v-model:value="refundDescription"
+                                       class="field-description refund-description"
                                        :label="descriptionCharacterCountingTitle"
                                        :placeholder="$tc('mollie-payments.refund-manager.summary.placeholderDescription')"
                                        :helpText="$tc('mollie-payments.refund-manager.summary.descriptionHelp')">
@@ -356,7 +364,8 @@
                     <sw-textarea-field v-if="isAclRefundAllowed"
                                        type="textarea"
                                        v-model="refundInternalDescription"
-                                       class="field-description"
+                                       v-model:value="refundInternalDescription"
+                                       class="field-description refund-internal-description"
                                        :label="$tc('mollie-payments.refund-manager.summary.lblInternalDescription')"
                                        :placeholder="$tc('mollie-payments.refund-manager.summary.placeholderInternalDescription')"
                                        :helpText="$tc('mollie-payments.refund-manager.summary.internalDescriptionHelp')">
@@ -364,6 +373,7 @@
                     {# --------------------------------------------------------------------------------------------- #}
                     <sw-checkbox-field v-if="isAclRefundAllowed && configVerifyRefund"
                                        v-model="checkVerifyRefund"
+                                       v-model:value="checkVerifyRefund"
                                        :label="$tc('mollie-payments.refund-manager.summary.checkVerification')"
                                        :bordered="true">
                     </sw-checkbox-field>
@@ -412,7 +422,7 @@
                           :isLoading="isRefundDataLoading">
                 <template #column-amount.value="{ item }">
                     <sw-container columns="1fr auto" gap="8px" align="center">
-                        {{ item.amount.value | currency(item.amount.currency) }}
+                        {{ currencyFilter(  item.amount.value  , order.currency.isoCode, order.totalRounding.decimals) }}
                         <sw-help-text :text="item.description"></sw-help-text>
                     </sw-container>
                 </template>
@@ -430,7 +440,7 @@
                     </sw-container>
                 </template>
                 <template #column-createdAt="{ item }">
-                    {{ item.createdAt | date({hour: '2-digit', minute: '2-digit'}) }}
+                    {{ dateFilter(item.createdAt, { hour: '2-digit', minute: '2-digit' }) }}
                 </template>
                 <template #column-composition="{ item }">
                     <sw-label v-for="composition in getRefundCompositions(item)"
diff --git a/src/Resources/app/administration/src/module/mollie-payments/components/mollie-ship-order/mollie-ship-order.html.twig b/src/Resources/app/administration/src/module/mollie-payments/components/mollie-ship-order/mollie-ship-order.html.twig
index 6c841680a..894d987f4 100644
--- a/src/Resources/app/administration/src/module/mollie-payments/components/mollie-ship-order/mollie-ship-order.html.twig
+++ b/src/Resources/app/administration/src/module/mollie-payments/components/mollie-ship-order/mollie-ship-order.html.twig
@@ -22,14 +22,18 @@
             <template #column-itemselect="{ item }">
                 <sw-checkbox-field v-if="item.originalQuantity > 0"
                                    :bordered="false"
-                                   v-model="item.selected">
+                                   v-model="item.selected"
+                                   v-model:value="item.selected"
+                >
                 </sw-checkbox-field>
             </template>
 
             <template #column-quantity="{ item }">
                 <sw-text-field :disabled="item.originalQuantity === 0"
                                class="mollie-ship-order-grid-quantity"
-                               v-model="item.quantity">
+                               v-model="item.quantity"
+                               v-model:value="item.quantity"
+                >
                 </sw-text-field>
             </template>
 
@@ -48,7 +52,7 @@
     </sw-container>
 
     {% block sw_order_line_items_grid_grid_mollie_ship_item_modal_tracking %}
-        <sw-switch-field v-model="showTrackingInfo"
+        <sw-switch-field v-model:value="showTrackingInfo" v-model="showTrackingInfo"
                          :label="$tc('mollie-payments.modals.shipping.showTracking')"
                          :noMarginTop="true"
                          size="small">
diff --git a/src/Resources/app/administration/src/module/mollie-payments/components/mollie-tracking-info/mollie-tracking-info.html.twig b/src/Resources/app/administration/src/module/mollie-payments/components/mollie-tracking-info/mollie-tracking-info.html.twig
index 5841c9c39..c4f452706 100644
--- a/src/Resources/app/administration/src/module/mollie-payments/components/mollie-tracking-info/mollie-tracking-info.html.twig
+++ b/src/Resources/app/administration/src/module/mollie-payments/components/mollie-tracking-info/mollie-tracking-info.html.twig
@@ -18,15 +18,15 @@
         </sw-base-field>
 
         <sw-container columns="1fr" justify="start" gap="16px">
-            <sw-text-field v-model="tracking.carrier"
+            <sw-text-field v-model:value="tracking.carrier"  v-model="tracking.carrier"
                            :label="$tc('mollie-payments.modals.shipping.tracking.carrier')"
                            size="medium"
                            required/>
-            <sw-text-field v-model="tracking.code"
+            <sw-text-field v-model:value="tracking.code" v-model="tracking.code"
                            :label="$tc('mollie-payments.modals.shipping.tracking.code')"
                            size="medium"
                            required/>
-            <sw-text-field v-model="tracking.url"
+            <sw-text-field v-model:value="tracking.url" v-model="tracking.url"
                            size="medium"
                            :label="$tc('mollie-payments.modals.shipping.tracking.url')"/>
         </sw-container>
diff --git a/src/Resources/app/administration/src/module/mollie-payments/extension/sw-order/component/sw-order-line-items-grid/sw-order-line-items-grid.html.twig b/src/Resources/app/administration/src/module/mollie-payments/extension/sw-order/component/sw-order-line-items-grid/sw-order-line-items-grid.html.twig
index 2d892fbe6..779ed4e09 100644
--- a/src/Resources/app/administration/src/module/mollie-payments/extension/sw-order/component/sw-order-line-items-grid/sw-order-line-items-grid.html.twig
+++ b/src/Resources/app/administration/src/module/mollie-payments/extension/sw-order/component/sw-order-line-items-grid/sw-order-line-items-grid.html.twig
@@ -117,12 +117,6 @@ SHOPWARE 6.4
     </template>
 {% endblock %}
 
-{% block sw_order_line_items_grid_grid_actions %}
-    {% parent %}
-    <template #action-modals="{ item }">
-        {% block sw_order_line_items_grid_grid_actions_modals_items %}{% endblock %}
-    </template>
-{% endblock %}
 
 {% block sw_order_line_items_grid_grid_actions_modals_items %}
     {% parent %}
@@ -160,7 +154,9 @@ SHOPWARE 6.4
                                      :step="1"
                                      :min="0"
                                      :max="shippableQuantity(item)"
-                                     v-model="shipQuantity">
+                                     v-model:value="shipQuantity"
+                                     v-model="shipQuantity"
+                    >
                         <template #prefix>
                             {{ $tc('mollie-payments.modals.shipping.item.summary.quantity') }}
                         </template>
@@ -175,7 +171,7 @@ SHOPWARE 6.4
                 {% endblock %}
 
                 {% block sw_order_line_items_grid_grid_mollie_ship_item_modal_tracking %}
-                    <sw-switch-field v-model="showTrackingInfo"
+                    <sw-switch-field v-model:value="showTrackingInfo"  v-model="showTrackingInfo"
                                      :label="$tc('mollie-payments.modals.shipping.showTracking')"
                                      :noMarginTop="true"
                                      size="small">
diff --git a/src/Resources/app/administration/src/module/mollie-payments/extension/sw-order/view/sw-order-detail-base/index.js b/src/Resources/app/administration/src/module/mollie-payments/extension/sw-order/view/sw-order-detail-base/index.js
index 0ff6ca29d..20a77d587 100644
--- a/src/Resources/app/administration/src/module/mollie-payments/extension/sw-order/view/sw-order-detail-base/index.js
+++ b/src/Resources/app/administration/src/module/mollie-payments/extension/sw-order/view/sw-order-detail-base/index.js
@@ -3,7 +3,7 @@ import OrderAttributes from '../../../../../../core/models/OrderAttributes';
 import MollieShippingEvents from '../../../../components/mollie-ship-order/MollieShippingEvents';
 
 // eslint-disable-next-line no-undef
-const {Component, Mixin} = Shopware;
+const {Component, Mixin, Filter} = Shopware;
 
 Component.override('sw-order-detail-base', {
     template,
@@ -41,6 +41,10 @@ Component.override('sw-order-detail-base', {
             const attr = new OrderAttributes(this.order);
             return attr.isMollieOrder();
         },
+
+        currencyFilter() {
+            return Filter.getByName('currency');
+        },
     },
 
     watch: {
diff --git a/src/Resources/app/administration/src/module/mollie-payments/extension/sw-order/view/sw-order-detail-base/sw-order-detail-base.html.twig b/src/Resources/app/administration/src/module/mollie-payments/extension/sw-order/view/sw-order-detail-base/sw-order-detail-base.html.twig
index d26adab7f..9ad2b1efa 100644
--- a/src/Resources/app/administration/src/module/mollie-payments/extension/sw-order/view/sw-order-detail-base/sw-order-detail-base.html.twig
+++ b/src/Resources/app/administration/src/module/mollie-payments/extension/sw-order/view/sw-order-detail-base/sw-order-detail-base.html.twig
@@ -14,21 +14,21 @@ SHOPWARE 6.4
         <strong>{{ $tc('sw-order.detailExtended.totalRefunds') }}</strong>
     </dt>
     <dd v-if="isMollieOrder && refundedAmount > 0">
-        <strong>{{ refundedAmount | currency(order.currency.shortName) }}</strong>
+        <strong>{{ currencyFilter( refundedAmount, order.currency.isoCode, order.totalRounding.decimals) }}</strong>
     </dd>
 
     <dt v-if="isMollieOrder && refundAmountPending > 0">
         <strong>{{ $tc('sw-order.detailExtended.totalRefundsPending') }}</strong>
     </dt>
     <dd v-if="isMollieOrder && refundAmountPending > 0">
-        <strong>{{ refundAmountPending | currency(order.currency.shortName) }}</strong>
+        <strong>{{ currencyFilter( refundAmountPending, order.currency.isoCode, order.totalRounding.decimals) }}</strong>
     </dd>
 
     <dt v-if="isMollieOrder && shippedQuantity > 0">
         <strong>{{ $tc('sw-order.detailExtended.totalShipments', 0, { quantity: shippedQuantity }) }}</strong>
     </dt>
     <dd v-if="isMollieOrder && shippedQuantity > 0">
-        <strong>{{ shippedAmount | currency(order.currency.shortName) }}</strong>
+        <strong>{{ currencyFilter( shippedAmount, order.currency.isoCode, order.totalRounding.decimals) }}</strong>
     </dd>
 {% endblock %}
 
diff --git a/src/Resources/app/administration/src/module/mollie-payments/extension/sw-order/view/sw-order-detail-general/index.js b/src/Resources/app/administration/src/module/mollie-payments/extension/sw-order/view/sw-order-detail-general/index.js
index 9ca91b566..1ddccfe91 100644
--- a/src/Resources/app/administration/src/module/mollie-payments/extension/sw-order/view/sw-order-detail-general/index.js
+++ b/src/Resources/app/administration/src/module/mollie-payments/extension/sw-order/view/sw-order-detail-general/index.js
@@ -6,7 +6,7 @@ import MollieShipping from '../../../../components/mollie-ship-order/MollieShipp
 import MollieShippingEvents from '../../../../components/mollie-ship-order/MollieShippingEvents';
 
 // eslint-disable-next-line no-undef
-const {Component, Mixin} = Shopware;
+const {Component, Mixin, Filter} = Shopware;
 
 Component.override('sw-order-detail-general', {
     template,
@@ -135,6 +135,10 @@ Component.override('sw-order-detail-general', {
             return this.molliePaymentUrl !== '';
         },
 
+        currencyFilter() {
+            return Filter.getByName('currency');
+        },
+
     },
 
     watch: {
diff --git a/src/Resources/app/administration/src/module/mollie-payments/extension/sw-order/view/sw-order-detail-general/sw-order-detail-general.html.twig b/src/Resources/app/administration/src/module/mollie-payments/extension/sw-order/view/sw-order-detail-general/sw-order-detail-general.html.twig
index 74fe784fe..c71dc655e 100644
--- a/src/Resources/app/administration/src/module/mollie-payments/extension/sw-order/view/sw-order-detail-general/sw-order-detail-general.html.twig
+++ b/src/Resources/app/administration/src/module/mollie-payments/extension/sw-order/view/sw-order-detail-general/sw-order-detail-general.html.twig
@@ -159,18 +159,18 @@ SHOPWARE 6.5
         <strong>{{ $tc('sw-order.detailExtended.totalRefunds') }}</strong>
     </dt>
     <dd v-if="isMollieOrder && refundedAmount > 0">
-        {{ refundedAmount | currency(order.currency.shortName) }}
+        {{ currencyFilter( refundedAmount, order.currency.isoCode, order.totalRounding.decimals) }}
     </dd>
     <dt v-if="isMollieOrder && refundAmountPending > 0">
         <strong>{{ $tc('sw-order.detailExtended.totalRefundsPending') }}</strong>
     </dt>
     <dd v-if="isMollieOrder && refundAmountPending > 0">
-        {{ refundAmountPending | currency(order.currency.shortName) }}
+        {{ currencyFilter( refundAmountPending, order.currency.isoCode, order.totalRounding.decimals) }}
     </dd>
     <dt v-if="isMollieOrder && shippedQuantity > 0">
         <strong>{{ $tc('sw-order.detailExtended.totalShipments', 0, { quantity: shippedQuantity }) }}</strong>
     </dt>
     <dd v-if="isMollieOrder && shippedQuantity > 0">
-        {{ shippedAmount | currency(order.currency.shortName) }}
+        {{ currencyFilter( shippedAmount, order.currency.isoCode, order.totalRounding.decimals) }}
     </dd>
 {% endblock %}
diff --git a/src/Resources/app/administration/src/module/mollie-payments/extension/sw-settings/components/sw-system-config/index.js b/src/Resources/app/administration/src/module/mollie-payments/extension/sw-settings/components/sw-system-config/index.js
new file mode 100644
index 000000000..518c0255b
--- /dev/null
+++ b/src/Resources/app/administration/src/module/mollie-payments/extension/sw-settings/components/sw-system-config/index.js
@@ -0,0 +1,12 @@
+
+// eslint-disable-next-line no-undef
+const {Component} = Shopware;
+
+Component.override('sw-system-config', {
+    provide() {
+        return {
+            'actualConfigData': this.actualConfigData,
+            'currentSalesChannelId':this.currentSalesChannelId, //TODO: currentSalesChannelId is not reactive and does not change when you select a new saleschannel in config. because of this the preview does work only for all saleschannels but not for a specific one. we have to fix the preview later
+        };
+    },
+});
\ No newline at end of file
diff --git a/src/Resources/app/administration/src/module/mollie-payments/extension/sw-settings/index.js b/src/Resources/app/administration/src/module/mollie-payments/extension/sw-settings/index.js
new file mode 100644
index 000000000..6a996f1f0
--- /dev/null
+++ b/src/Resources/app/administration/src/module/mollie-payments/extension/sw-settings/index.js
@@ -0,0 +1 @@
+import './components/sw-system-config';
\ No newline at end of file
diff --git a/src/Resources/app/administration/src/module/mollie-payments/index.js b/src/Resources/app/administration/src/module/mollie-payments/index.js
index 433f91e1a..300bfb80d 100644
--- a/src/Resources/app/administration/src/module/mollie-payments/index.js
+++ b/src/Resources/app/administration/src/module/mollie-payments/index.js
@@ -1,6 +1,7 @@
 import './acl';
 import './extension/sw-customer';
 import './extension/sw-order';
+import './extension/sw-settings';
 import './components/mollie-pluginconfig-element-orderstate-select';
 import './components/mollie-pluginconfig-section-info';
 import './components/mollie-pluginconfig-section-api';
diff --git a/src/Resources/app/administration/src/module/mollie-payments/page/mollie-subscriptions-detail/index.js b/src/Resources/app/administration/src/module/mollie-payments/page/mollie-subscriptions-detail/index.js
index 5e431bedc..89ca7c41a 100644
--- a/src/Resources/app/administration/src/module/mollie-payments/page/mollie-subscriptions-detail/index.js
+++ b/src/Resources/app/administration/src/module/mollie-payments/page/mollie-subscriptions-detail/index.js
@@ -3,7 +3,7 @@ import './mollie-subscriptions-detail.scss';
 import SubscriptionService from '../../../../core/service/subscription/subscription.service';
 
 // eslint-disable-next-line no-undef
-const {Component, Mixin, Application, ApiService} = Shopware;
+const {Component, Mixin, Application, ApiService, Filter} = Shopware;
 
 // eslint-disable-next-line no-undef
 const {Criteria} = Shopware.Data;
@@ -124,6 +124,10 @@ Component.register('mollie-subscriptions-detail', {
             return this.$tc('mollie-payments.subscriptions.detail.history.cardTitle') + ' (' + this.history.length + ')';
         },
 
+
+        dateFilter() {
+            return Filter.getByName('date');
+        },
     },
 
     created() {
@@ -150,6 +154,7 @@ Component.register('mollie-subscriptions-detail', {
             criteria.addAssociation('addresses');
             criteria.addAssociation('historyEntries');
             criteria.addAssociation('customer');
+            criteria.addAssociation('currency');
 
             // eslint-disable-next-line no-undef
             this.repoSubscriptions.search(criteria, Shopware.Context.api).then((result) => {
diff --git a/src/Resources/app/administration/src/module/mollie-payments/page/mollie-subscriptions-detail/mollie-subscriptions-detail.html.twig b/src/Resources/app/administration/src/module/mollie-payments/page/mollie-subscriptions-detail/mollie-subscriptions-detail.html.twig
index 74ac6e42c..32840cee4 100644
--- a/src/Resources/app/administration/src/module/mollie-payments/page/mollie-subscriptions-detail/mollie-subscriptions-detail.html.twig
+++ b/src/Resources/app/administration/src/module/mollie-payments/page/mollie-subscriptions-detail/mollie-subscriptions-detail.html.twig
@@ -71,7 +71,7 @@
 
                         <sw-container columns="1fr" gap="0px 30px">
                             {% block sw_order_detail_card_basic_field_description %}
-                                <sw-text-field v-model="subscription.description"
+                                <sw-text-field v-model:value="subscription.description" v-model="subscription.description"
                                                :label="$tc('mollie-payments.subscriptions.detail.labelDescription')"
                                                disabled="disabled">
                                 </sw-text-field>
@@ -80,7 +80,7 @@
 
                         <sw-container columns="1fr 1fr" gap="0px 30px">
                             {% block sw_order_detail_card_basic_field_amount %}
-                                <sw-text-field v-model="subscription.amount"
+                                <sw-text-field v-model:value="subscription.amount" v-model="subscription.amount"
                                                :label="$tc('mollie-payments.subscriptions.detail.labelAmount')"
                                                disabled="disabled">
                                     <template slot="suffix">
@@ -89,7 +89,7 @@
                                 </sw-text-field>
                             {% endblock %}
                             {% block sw_order_detail_card_basic_field_quantity %}
-                                <sw-text-field v-model="subscription.quantity"
+                                <sw-text-field v-model:value="subscription.quantity" v-model="subscription.quantity"
                                                :label="$tc('mollie-payments.subscriptions.detail.labelQuantity')"
                                                disabled="disabled">
                                 </sw-text-field>
@@ -97,13 +97,13 @@
                         </sw-container>
                         <sw-container columns="1fr 1fr" gap="0px 30px">
                             {% block sw_order_detail_card_basic_field_customer_name %}
-                                <sw-text-field v-model="customerFullName"
+                                <sw-text-field v-model:value="customerFullName" v-model="customerFullName"
                                                :label="$tc('mollie-payments.subscriptions.detail.labelShopwareCustomer')"
                                                disabled="disabled">
                                 </sw-text-field>
                             {% endblock %}
                             {% block sw_order_detail_card_basic_field_mollie_customer_id %}
-                                <sw-text-field v-model="subscription.mollieCustomerId"
+                                <sw-text-field class="cy-subscription-customer-id" v-model:value="subscription.mollieCustomerId" v-model="subscription.mollieCustomerId"
                                                :label="$tc('mollie-payments.subscriptions.detail.labelMollieCustomer')"
                                                disabled="disabled">
                                 </sw-text-field>
@@ -111,7 +111,8 @@
                         </sw-container>
                         <sw-container columns="1fr 1fr" gap="0px 30px">
                             {% block sw_order_detail_card_basic_field_created_at %}
-                                <sw-text-field v-model="formattedCreateAt"
+                                <sw-text-field v-model:value="formattedCreateAt" v-model="formattedCreateAt"
+                                               class="cy-subscription-formatted-created-at"
                                                :label="$tc('mollie-payments.subscriptions.detail.labelCreatedAt')"
                                                disabled="disabled">
                                 </sw-text-field>
@@ -135,43 +136,49 @@
                     <sw-card :title="$tc('mollie-payments.subscriptions.detail.cardTitleStatus')" :hero="false" :isLoading="false" :large="false">
                         <sw-container columns="1fr 1fr" gap="0px 30px">
                             {% block sw_order_detail_card_status_field_status %}
-                                <sw-text-field v-model="translatedStatus"
+                                <sw-text-field v-model:value="translatedStatus" v-model="translatedStatus"
                                                :label="$tc('mollie-payments.subscriptions.detail.labelStatus')"
+                                               class="cy-subscription-translated-status"
                                                disabled="disabled">
                                 </sw-text-field>
                             {% endblock %}
                             {% block sw_order_detail_card_status_field_canceled_at %}
-                                <sw-text-field v-model="formattedCanceledAt"
+                                <sw-text-field v-model:value="formattedCanceledAt" v-model="formattedCanceledAt"
                                                :label="$tc('mollie-payments.subscriptions.detail.labelCanceledAt')"
+                                               class="cy-subscription-formatted-canceled-at"
                                                disabled="disabled">
                                 </sw-text-field>
                             {% endblock %}
                         </sw-container>
                         <sw-container columns="1fr 1fr" gap="0px 30px">
                             {% block sw_order_detail_card_status_field_mollie_id %}
-                                <sw-text-field v-model="subscription.mollieId"
+                                <sw-text-field v-model:value="subscription.mollieId"  v-model="subscription.mollieId"
                                                :label="$tc('mollie-payments.subscriptions.detail.labelMollieSubscription')"
+                                               class="cy-subscription-mollie-id"
                                                disabled="disabled">
                                 </sw-text-field>
                             {% endblock %}
                             {% block sw_order_detail_card_status_field_mandate_id %}
-                                <sw-text-field v-model="subscription.mandateId"
+                                <sw-text-field v-model:value="subscription.mandateId"  v-model="subscription.mandateId"
                                                :label="$tc('mollie-payments.subscriptions.detail.labelMandateId')"
+                                               class="cy-subscription-mandate-id"
                                                disabled="disabled">
                                 </sw-text-field>
                             {% endblock %}
                         </sw-container>
                         <sw-container columns="1fr 1fr" gap="0px 30px">
                             {% block sw_order_detail_card_status_field_next_payment_at %}
-                                <sw-text-field v-model="formattedNextPaymentAt"
+                                <sw-text-field v-model:value="formattedNextPaymentAt" v-model="formattedNextPaymentAt"
+                                               class="cy-subscription-formatted-next-payment-at"
                                                :label="$tc('mollie-payments.subscriptions.detail.labelNextPaymentAt')"
                                                disabled="disabled">
                                 </sw-text-field>
                             {% endblock %}
                             {% block sw_order_detail_card_status_field_reminded_at %}
                                 <sw-text-field
-                                        v-model="formattedLastRemindedAt"
+                                        v-model:value="formattedLastRemindedAt" v-model="formattedLastRemindedAt"
                                         :label="$tc('mollie-payments.subscriptions.detail.labelLastRemindedAt')"
+                                        class="cy-subscription-formatted-last-reminded-at"
                                         disabled="disabled">
                                 </sw-text-field>
                             {% endblock %}
@@ -216,7 +223,7 @@
                                      :allowInlineEdit="false">
                                 <template #columns="{ item }">
                                     <sw-grid-column flex="minmax(100px, 1fr)" :label="$tc('mollie-payments.subscriptions.detail.history.colDate')">
-                                        {{ item.createdAt | date({hour: '2-digit',minute: '2-digit',day: '2-digit',month: '2-digit',year: 'numeric'}) }}
+                                        {{ dateFilter(item.createdAt, { hour: '2-digit', minute: '2-digit', day: '2-digit',month: '2-digit',year: 'numeric' }) }}
                                     </sw-grid-column>
 
                                     {% block sw_order_detail_card_history_grid_columns %}
diff --git a/src/Resources/app/administration/src/module/mollie-payments/page/mollie-subscriptions-list/index.js b/src/Resources/app/administration/src/module/mollie-payments/page/mollie-subscriptions-list/index.js
index 91467c61d..e61a7ee11 100755
--- a/src/Resources/app/administration/src/module/mollie-payments/page/mollie-subscriptions-list/index.js
+++ b/src/Resources/app/administration/src/module/mollie-payments/page/mollie-subscriptions-list/index.js
@@ -4,7 +4,7 @@ import MollieSubscriptionGrid from './grids/MollieSubscriptionGrid';
 import SubscriptionService from '../../../../core/service/subscription/subscription.service';
 
 // eslint-disable-next-line no-undef
-const {Component, Mixin, Application} = Shopware;
+const {Component, Mixin, Application, Filter} = Shopware;
 
 // eslint-disable-next-line no-undef
 const {Criteria} = Shopware.Data;
@@ -102,6 +102,14 @@ Component.register('mollie-subscriptions-list', {
                 refresh: map.has('icons-regular-undo') ? 'regular-undo' : 'default-arrow-360-left',
             };
         },
+        currencyFilter() {
+            return Filter.getByName('currency');
+        },
+
+
+        dateFilter() {
+            return Filter.getByName('date');
+        },
     },
 
     methods: {
@@ -133,6 +141,7 @@ Component.register('mollie-subscriptions-list', {
 
             criteria.addSorting(Criteria.sort(this.sortBy, this.sortDirection, this.naturalSorting));
             criteria.addAssociation('customer');
+            criteria.addAssociation('currency');
 
             // eslint-disable-next-line no-undef
             this.repoSubscriptions.search(criteria, Shopware.Context.api).then((result) => {
diff --git a/src/Resources/app/administration/src/module/mollie-payments/page/mollie-subscriptions-list/mollie-subscriptions-list.html.twig b/src/Resources/app/administration/src/module/mollie-payments/page/mollie-subscriptions-list/mollie-subscriptions-list.html.twig
index 7d7476199..c18a4753a 100755
--- a/src/Resources/app/administration/src/module/mollie-payments/page/mollie-subscriptions-list/mollie-subscriptions-list.html.twig
+++ b/src/Resources/app/administration/src/module/mollie-payments/page/mollie-subscriptions-list/mollie-subscriptions-list.html.twig
@@ -62,7 +62,7 @@
 
                     {% block mollie_payments_subscription_list_content_amount %}
                         <template #column-amount="{ item }">
-                            {{ item.amount | currency(item.currency) }}
+                            {{ currencyFilter( item.amount , item.currency.isoCode, item.totalRounding.decimals) }}
                         </template>
                     {% endblock %}
 
@@ -81,27 +81,27 @@
 
                     {% block mollie_payments_subscription_list_content_next_payment_date %}
                         <template #column-nextPaymentAt="{ item }">
-                            {{ item.nextPaymentAt | date({hour: '2-digit',minute: '2-digit',day: '2-digit',month: '2-digit',year: 'numeric'}) }}
+                            {{ dateFilter(item.nextPaymentAt, { hour: '2-digit', minute: '2-digit', day: '2-digit',month: '2-digit',year: 'numeric' }) }}
                         </template>
                     {% endblock %}
 
                     {% block mollie_payments_subscription_list_content_pre_payment_reminder %}
                         <template #column-lastRemindedAt="{ item }">
-                            {{ item.lastRemindedAt | date({hour: '2-digit',minute: '2-digit',day: '2-digit',month: '2-digit',year: 'numeric'}) }}
+                            {{ dateFilter(item.lastRemindedAt, { hour: '2-digit', minute: '2-digit', day: '2-digit',month: '2-digit',year: 'numeric' }) }}
                         </template>
                     {% endblock %}
 
                     {% block mollie_payments_subscription_list_content_created_at %}
                         <template #column-createdAt="{ item }">
                             <router-link :to="{ name: 'mollie.payments.subscription_detail', params: { id: item.id } }">
-                                {{ item.createdAt | date({hour: '2-digit',minute: '2-digit',day: '2-digit',month: '2-digit',year: 'numeric'}) }}
+                                {{ dateFilter(item.createdAt, { hour: '2-digit', minute: '2-digit', day: '2-digit',month: '2-digit',year: 'numeric' }) }}
                             </router-link>
                         </template>
                     {% endblock %}
 
                     {% block mollie_payments_subscription_list_content_canceled_at %}
                         <template #column-canceledAt="{ item }">
-                            {{ item.canceledAt | date({hour: '2-digit',minute: '2-digit',day: '2-digit',month: '2-digit',year: 'numeric'}) }}
+                            {{ dateFilter(item.canceledAt, { hour: '2-digit', minute: '2-digit', day: '2-digit',month: '2-digit',year: 'numeric' }) }}
                         </template>
                     {% endblock %}
 
diff --git a/src/Resources/app/administration/src/module/mollie-payments/rules/mollie-cart-subscription-rule/mollie-cart-subscription-rule.html.twig b/src/Resources/app/administration/src/module/mollie-payments/rules/mollie-cart-subscription-rule/mollie-cart-subscription-rule.html.twig
index 088d5d605..4809f297c 100644
--- a/src/Resources/app/administration/src/module/mollie-payments/rules/mollie-cart-subscription-rule/mollie-cart-subscription-rule.html.twig
+++ b/src/Resources/app/administration/src/module/mollie-payments/rules/mollie-cart-subscription-rule/mollie-cart-subscription-rule.html.twig
@@ -3,6 +3,7 @@
                       id="mollie-cart-subscription-rule"
                       size="medium"
                       :options="selectValues"
+                      v-model:value="isSubscription"
                       v-model="isSubscription"
                       class="field--main">
     </sw-single-select>
diff --git a/src/Resources/app/administration/src/module/mollie-payments/rules/mollie-lineitem-subscription-rule/mollie-lineitem-subscription-rule.html.twig b/src/Resources/app/administration/src/module/mollie-payments/rules/mollie-lineitem-subscription-rule/mollie-lineitem-subscription-rule.html.twig
index 8a93d3378..e85a56e71 100644
--- a/src/Resources/app/administration/src/module/mollie-payments/rules/mollie-lineitem-subscription-rule/mollie-lineitem-subscription-rule.html.twig
+++ b/src/Resources/app/administration/src/module/mollie-payments/rules/mollie-lineitem-subscription-rule/mollie-lineitem-subscription-rule.html.twig
@@ -3,6 +3,7 @@
                       id="mollie-lineitem-subscription-rule"
                       size="medium"
                       :options="selectValues"
+                      v-model:value="isSubscription"
                       v-model="isSubscription"
                       class="field--main">
     </sw-single-select>
diff --git a/src/Resources/app/administration/src/module/sw-product/view/sw-product-detail-mollie/sw-product-detail-mollie.html.twig b/src/Resources/app/administration/src/module/sw-product/view/sw-product-detail-mollie/sw-product-detail-mollie.html.twig
index f03a8ec24..749b0b088 100644
--- a/src/Resources/app/administration/src/module/sw-product/view/sw-product-detail-mollie/sw-product-detail-mollie.html.twig
+++ b/src/Resources/app/administration/src/module/sw-product/view/sw-product-detail-mollie/sw-product-detail-mollie.html.twig
@@ -32,6 +32,7 @@
                     <sw-inherit-wrapper
                             :label="$tc('mollie-payments.vouchers.VOUCHER_TYPE_CAPTION')"
                             v-model="product.customFields.mollie_payments_product_voucher_type"
+                            v-model:value="product.customFields.mollie_payments_product_voucher_type"
                             :has-parent="!!parentProduct.id"
                             :inherited-value="parentProduct.customFields.mollie_payments_product_voucher_type">
                         <template #content="props">
@@ -93,6 +94,7 @@
                     <sw-container columns="1fr" v-if="isDefaultLanguage">
                         <sw-inherit-wrapper
                                 v-model="product.customFields.mollie_payments_product_subscription_enabled"
+                                v-model:value="product.customFields.mollie_payments_product_subscription_enabled"
                                 :has-parent="!!parentProduct.id"
                                 :inherited-value="parentProduct.customFields.mollie_payments_product_subscription_enabled">
                             <template #content="props">
@@ -114,6 +116,7 @@
                         <sw-inherit-wrapper
                                 :label="$tc('mollie-payments.subscriptions.product.mollieSubscriptionIntervalAmount')"
                                 v-model="product.customFields.mollie_payments_product_subscription_interval"
+                                v-model:value="product.customFields.mollie_payments_product_subscription_interval"
                                 :has-parent="!!parentProduct.id"
                                 :inherited-value="parentProduct.customFields.mollie_payments_product_subscription_interval">
                             <template #content="props">
@@ -128,6 +131,7 @@
                         <sw-inherit-wrapper
                                 :label="$tc('mollie-payments.subscriptions.product.mollieSubscriptionIntervalType')"
                                 v-model="product.customFields.mollie_payments_product_subscription_interval_unit"
+                                v-model:value="product.customFields.mollie_payments_product_subscription_interval_unit"
                                 :has-parent="!!parentProduct.id"
                                 :inherited-value="parentProduct.customFields.mollie_payments_product_subscription_interval_unit">
                             <template #content="props">
@@ -147,6 +151,7 @@
                         <sw-inherit-wrapper
                                 :label="$tc('mollie-payments.subscriptions.product.mollieSubscriptionRepetitionAmount')"
                                 v-model="product.customFields.mollie_payments_product_subscription_repetition"
+                                v-model:value="product.customFields.mollie_payments_product_subscription_repetition"
                                 :has-parent="!!parentProduct.id"
                                 :inherited-value="parentProduct.customFields.mollie_payments_product_subscription_repetition">
                             <template #content="props">
diff --git a/src/Resources/app/administration/tests/core/models/ProductAttributes.spec.js b/src/Resources/app/administration/tests/core/models/ProductAttributes.spec.js
index 840ab4db8..53ca35427 100644
--- a/src/Resources/app/administration/tests/core/models/ProductAttributes.spec.js
+++ b/src/Resources/app/administration/tests/core/models/ProductAttributes.spec.js
@@ -1,4 +1,4 @@
-import ProductAttributes from "../../../src/core/models/ProductAttributes";
+import ProductAttributes from '../../../src/core/models/ProductAttributes';
 
 
 test('Attributes do not crash with NULL custom fields', () => {
diff --git a/src/Resources/app/administration/tests/core/service/product/ProductService.spec.js b/src/Resources/app/administration/tests/core/service/product/ProductService.spec.js
index 77eeb806d..93b242cf7 100644
--- a/src/Resources/app/administration/tests/core/service/product/ProductService.spec.js
+++ b/src/Resources/app/administration/tests/core/service/product/ProductService.spec.js
@@ -1,5 +1,5 @@
-import ProductService from "../../../../src/core/service/product/product.service";
-import ProductAttributes from "../../../../src/core/models/ProductAttributes";
+import ProductService from '../../../../src/core/service/product/product.service';
+import ProductAttributes from '../../../../src/core/models/ProductAttributes';
 
 const productService = new ProductService();
 
diff --git a/src/Resources/app/administration/tests/core/utils/array-utils.service.spec.js b/src/Resources/app/administration/tests/core/utils/array-utils.service.spec.js
index f44e0e620..c0138291d 100644
--- a/src/Resources/app/administration/tests/core/utils/array-utils.service.spec.js
+++ b/src/Resources/app/administration/tests/core/utils/array-utils.service.spec.js
@@ -1,4 +1,4 @@
-import ArrayUtilsService from "../../../src/core/service/utils/array-utils.service";
+import ArrayUtilsService from '../../../src/core/service/utils/array-utils.service';
 
 const utils = new ArrayUtilsService();
 
diff --git a/src/Resources/app/administration/tests/core/utils/string-utils.service.spec.js b/src/Resources/app/administration/tests/core/utils/string-utils.service.spec.js
index e502a5342..7962e2cb6 100644
--- a/src/Resources/app/administration/tests/core/utils/string-utils.service.spec.js
+++ b/src/Resources/app/administration/tests/core/utils/string-utils.service.spec.js
@@ -1,4 +1,4 @@
-import StringUtils from "../../../src/core/service/utils/string-utils.service";
+import StringUtils from '../../../src/core/service/utils/string-utils.service';
 
 const stringUtils = new StringUtils();
 
diff --git a/src/Resources/app/storefront/src/mollie-payments/plugins/apple-pay-direct.plugin.js b/src/Resources/app/storefront/src/mollie-payments/plugins/apple-pay-direct.plugin.js
index d4abb1394..ab95242ec 100644
--- a/src/Resources/app/storefront/src/mollie-payments/plugins/apple-pay-direct.plugin.js
+++ b/src/Resources/app/storefront/src/mollie-payments/plugins/apple-pay-direct.plugin.js
@@ -21,11 +21,9 @@ export default class MollieApplePayDirect extends Plugin {
         // register our off-canvas listener
         // we need to re-init all apple pay button
         // once the offcanvas is loaded (lazy) into the DOM
-        const elementOffcanvas = document.querySelector('[data-offcanvas-cart]');
-        if (elementOffcanvas instanceof HTMLElement) {
-            const pluginOffCanvas = window.PluginManager.getPluginInstanceFromElement(elementOffcanvas, 'OffCanvasCart');
-            pluginOffCanvas.$emitter.subscribe('offCanvasOpened', me.onOffCanvasOpened.bind(me));
-        }
+
+        const pluginOffCanvas = window.PluginManager.getPluginList().OffCanvasCart.get("instances")[0];
+        pluginOffCanvas.$emitter.subscribe('offCanvasOpened', me.onOffCanvasOpened.bind(me));
 
         // now update our current page
         this.initCurrentPage();
@@ -58,10 +56,12 @@ export default class MollieApplePayDirect extends Plugin {
         if (!window.ApplePaySession || !window.ApplePaySession.canMakePayments()) {
             // hide our wrapping Apple Pay containers
             // to avoid any wrong margins being displayed
+
             if (applePayContainers) {
-                for (let i = 0; i < applePayContainers.length; i++) {
-                    applePayContainers[i].style.display = 'none';
-                }
+                applePayContainers.forEach(function (container){
+                    container.style.display = 'none';
+                    container.classList.add('d-none');
+                });
             }
             return;
         }
@@ -74,8 +74,8 @@ export default class MollieApplePayDirect extends Plugin {
         // we start by fetching the shop url from the data attribute.
         // we need this as prefix for our ajax calls, so that we always
         // call the correct sales channel and its controllers.
-        const button = applePayButtons[0];
-        const shopUrl = me.getShopUrl(button);
+
+        const shopUrl = me.getShopUrl(applePayButtons[0]);
 
         // verify if apple pay is even allowed
         // in our current sales channel
@@ -86,6 +86,10 @@ export default class MollieApplePayDirect extends Plugin {
                     return;
                 }
 
+                applePayContainers.forEach(function (container){
+                    container.classList.remove('d-none');
+                });
+
                 applePayButtons.forEach(function (button) {
                     // Remove display none
                     button.classList.remove('d-none');
diff --git a/src/Resources/app/storefront/src/mollie-payments/plugins/apple-pay-direct.plugin.scss b/src/Resources/app/storefront/src/mollie-payments/plugins/apple-pay-direct.plugin.scss
index a7c9af5b0..4d31f4e98 100644
--- a/src/Resources/app/storefront/src/mollie-payments/plugins/apple-pay-direct.plugin.scss
+++ b/src/Resources/app/storefront/src/mollie-payments/plugins/apple-pay-direct.plugin.scss
@@ -34,6 +34,7 @@
     min-height: 32px;
     max-height: 64px;
   }
+
   .apple-pay-button-black-with-text {
     background-color: black;
     color: white;
@@ -75,4 +76,8 @@
     margin-left: calc(2px * var(--apple-pay-scale));
     border: none;
   }
+}
+
+.d-none{
+  display:none !important;
 }
\ No newline at end of file
diff --git a/src/Resources/config/compatibility/base.xml b/src/Resources/config/compatibility/base.xml
deleted file mode 100644
index 3a65c2d88..000000000
--- a/src/Resources/config/compatibility/base.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" ?>
-
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
-    <services>
-
-        <service id="Kiener\MolliePayments\Compatibility\CompatibilityFactory" class="Kiener\MolliePayments\Compatibility\CompatibilityFactory">
-            <argument>%kernel.shopware_version%</argument>
-            <argument type="service" id="Shopware\Core\System\SalesChannel\Context\SalesChannelContextService"/>
-            <argument type="service" id="Shopware\Core\Checkout\Cart\SalesChannel\CartService"/>
-        </service>
-
-        <service id="Kiener\MolliePayments\Compatibility\Gateway\CompatibilityGateway" class="Kiener\MolliePayments\Compatibility\Gateway\CompatibilityGateway">
-            <factory service="Kiener\MolliePayments\Compatibility\CompatibilityFactory" method="createGateway"/>
-        </service>
-
-    </services>
-</container>
diff --git a/src/Resources/config/compatibility/controller_6.5.xml b/src/Resources/config/compatibility/controller_6.5.xml
deleted file mode 100644
index 3d59f398e..000000000
--- a/src/Resources/config/compatibility/controller_6.5.xml
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" ?>
-
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
-    <services>
-
-
-        <!-- ////////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-        <!-- Admin API Controller -->
-
-        <service id="Kiener\MolliePayments\Controller\Api\PluginConfig\Sw65\ConfigController" public="true">
-            <argument type="service" id="Kiener\MolliePayments\Service\SettingsService"/>
-            <argument type="service" id="Shopware\Administration\Snippet\CachedSnippetFinder"/>
-            <argument type="service" id="Kiener\MolliePayments\Service\MollieApi\ApiKeyValidator"/>
-
-            <call method="setContainer">
-                <argument type="service" id="service_container"/>
-            </call>
-        </service>
-
-        <service id="Kiener\MolliePayments\Controller\Api\PaymentMethod\Sw65\PaymentMethodController" public="true">
-            <argument type="service" id="Kiener\MolliePayments\Service\PaymentMethodService"/>
-            <argument type="service" id="mollie_payments.logger"/>
-
-            <call method="setContainer">
-                <argument type="service" id="service_container"/>
-            </call>
-        </service>
-
-        <service id="Kiener\MolliePayments\Controller\Api\Order\Sw65\OrderController" public="true">
-            <argument type="service" id="Kiener\MolliePayments\Service\OrderService"/>
-            <argument type="service" id="Kiener\MolliePayments\Service\MollieApi\Order"/>
-            <call method="setContainer">
-                <argument type="service" id="service_container"/>
-            </call>
-        </service>
-
-        <service id="Kiener\MolliePayments\Controller\Api\Order\Sw65\RefundController" public="true">
-            <argument type="service" id="Kiener\MolliePayments\Service\OrderService"/>
-            <argument type="service" id="Kiener\MolliePayments\Components\RefundManager\RefundManager"/>
-            <argument type="service" id="Kiener\MolliePayments\Service\Refund\RefundService"/>
-            <argument type="service" id="mollie_payments.logger"/>
-            <call method="setContainer">
-                <argument type="service" id="service_container"/>
-            </call>
-        </service>
-
-        <service id="Kiener\MolliePayments\Controller\Api\Order\Sw65\ShippingController" public="true">
-            <argument type="service" id="Kiener\MolliePayments\Components\ShipmentManager\ShipmentManager"/>
-            <argument type="service" id="Kiener\MolliePayments\Service\OrderService"/>
-            <argument type="service" id="mollie_payments.logger"/>
-
-            <call method="setContainer">
-                <argument type="service" id="service_container"/>
-            </call>
-        </service>
-
-        <service id="Kiener\MolliePayments\Controller\Api\Support\Sw65\SupportController" public="true">
-            <argument type="service" id="Kiener\MolliePayments\Facade\MollieSupportFacade"/>
-            <argument type="service" id="mollie_payments.logger"/>
-            <call method="setContainer">
-                <argument type="service" id="service_container"/>
-            </call>
-        </service>
-
-        <service id="Kiener\MolliePayments\Controller\Api\Payment\Sw65\ReturnController" public="true">
-            <argument type="service" id="Kiener\MolliePayments\Facade\Controller\PaymentReturnFacade"/>
-            <call method="setContainer">
-                <argument type="service" id="service_container"/>
-            </call>
-        </service>
-
-        <service id="Kiener\MolliePayments\Controller\Api\Webhook\Sw65\WebhookController" public="true">
-            <argument type="service" id="Kiener\MolliePayments\Controller\Storefront\Webhook\NotificationFacade"/>
-            <argument type="service" id="Kiener\MolliePayments\Components\Subscription\SubscriptionManager"/>
-            <argument type="service" id="Kiener\MolliePayments\Repository\Order\OrderRepository"/>
-            <argument type="service" id="Kiener\MolliePayments\Repository\OrderTransaction\OrderTransactionRepository"/>
-            <argument type="service" id="mollie_payments.logger"/>
-            <call method="setContainer">
-                <argument type="service" id="service_container"/>
-            </call>
-        </service>
-
-        <!-- ////////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-        <!-- Storefront Controller -->
-
-        <service id="Kiener\MolliePayments\Controller\Storefront\Payment\Sw65\ReturnController" public="true">
-            <argument type="service" id="Kiener\MolliePayments\Facade\Controller\PaymentReturnFacade"/>
-            <call method="setContainer">
-                <argument type="service" id="service_container"/>
-            </call>
-        </service>
-
-        <service id="Kiener\MolliePayments\Controller\Storefront\Payment\Sw65\MollieFailureController" public="true">
-            <argument type="service" id="router"/>
-            <argument type="service" id="Kiener\MolliePayments\Compatibility\Gateway\CompatibilityGateway"/>
-            <argument type="service" id="Kiener\MolliePayments\Factory\MollieApiFactory"/>
-            <argument type="service" id="Kiener\MolliePayments\Service\Order\OrderStateService"/>
-            <argument type="service" id="Kiener\MolliePayments\Service\TransactionService"/>
-            <argument type="service" id="mollie_payments.logger"/>
-            <argument type="service" id="Kiener\MolliePayments\Service\Transition\TransactionTransitionService"/>
-            <argument type="service" id="Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderFactory"/>
-            <argument type="service" id="Kiener\MolliePayments\Service\MollieApi\Order"/>
-            <argument type="service" id="Kiener\MolliePayments\Service\Mollie\OrderStatusConverter"/>
-            <argument type="service" id="Kiener\MolliePayments\Service\SettingsService"/>
-            <argument type="service" id="Kiener\MolliePayments\Service\CustomerService"/>
-            <call method="setContainer">
-                <argument type="service" id="service_container"/>
-            </call>
-            <call method="setTwig">
-                <argument type="service" id="twig"/>
-            </call>
-        </service>
-
-        <service id="Kiener\MolliePayments\Controller\Storefront\Webhook\Sw65\WebhookController" public="true">
-            <argument type="service" id="Kiener\MolliePayments\Controller\Storefront\Webhook\NotificationFacade"/>
-            <argument type="service" id="Kiener\MolliePayments\Components\Subscription\SubscriptionManager"/>
-            <argument type="service" id="Kiener\MolliePayments\Repository\Order\OrderRepository"/>
-            <argument type="service" id="Kiener\MolliePayments\Repository\OrderTransaction\OrderTransactionRepository"/>
-            <argument type="service" id="mollie_payments.logger"/>
-            <call method="setContainer">
-                <argument type="service" id="service_container"/>
-            </call>
-        </service>
-
-        <service id="Kiener\MolliePayments\Controller\Storefront\CreditCard\Sw65\CreditCardController" public="true">
-            <argument type="service" id="Kiener\MolliePayments\Service\CustomerService"/>
-            <argument type="service" id="Kiener\MolliePayments\Service\MandateService"/>
-            <argument type="service" id="mollie_payments.logger"/>
-            <call method="setContainer">
-                <argument type="service" id="service_container"/>
-            </call>
-        </service>
-
-        <service id="Kiener\MolliePayments\Controller\Storefront\iDEAL\Sw65\iDealController" public="true">
-            <argument type="service" id="Kiener\MolliePayments\Service\CustomerService"/>
-            <call method="setContainer">
-                <argument type="service" id="service_container"/>
-            </call>
-        </service>
-
-        <service id="Kiener\MolliePayments\Controller\Storefront\POS\Sw65\PosController" public="true">
-            <argument type="service" id="Kiener\MolliePayments\Service\CustomerService"/>
-            <argument type="service" id="Kiener\MolliePayments\Gateway\Mollie\MollieGateway"/>
-            <argument type="service" id="Shopware\Storefront\Framework\Routing\Router"/>
-            <argument type="service" id="Kiener\MolliePayments\Service\Order\OrderStatusUpdater"/>
-            <argument type="service" id="Kiener\MolliePayments\Service\Mollie\OrderStatusConverter"/>
-            <argument type="service" id="Kiener\MolliePayments\Repository\OrderTransaction\OrderTransactionRepository"/>
-            <call method="setContainer">
-                <argument type="service" id="service_container"/>
-            </call>
-            <call method="setTwig">
-                <argument type="service" id="twig"/>
-            </call>
-        </service>
-
-        <service id="Kiener\MolliePayments\Controller\Storefront\ApplePayDirect\Sw65\ApplePayDirectController"
-                 public="true">
-            <argument type="service" id="Kiener\MolliePayments\Components\ApplePayDirect\ApplePayDirect"/>
-            <argument type="service" id="router"/>
-            <argument type="service" id="mollie_payments.logger"/>
-            <argument type="service" id="Kiener\MolliePayments\Service\Cart\CartBackupService"/>
-            <argument type="service" id="session.flash_bag" on-invalid="null"/>
-            <argument type="service" id="Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderFactory"/>
-            <argument type="service"
-                      id="Kiener\MolliePayments\Compatibility\Bundles\FlowBuilder\FlowBuilderEventFactory"/>
-            <argument type="service" id="Kiener\MolliePayments\Repository\Customer\CustomerRepository"/>
-            <argument type="service" id="Kiener\MolliePayments\Service\OrderService"/>
-            <call method="setContainer">
-                <argument type="service" id="service_container"/>
-            </call>
-        </service>
-
-        <service id="Kiener\MolliePayments\Controller\Api\Subscription\Sw65\SubscriptionController" public="true">
-            <argument type="service" id="Kiener\MolliePayments\Components\Subscription\SubscriptionManager"/>
-            <call method="setContainer">
-                <argument type="service" id="service_container"/>
-            </call>
-        </service>
-
-        <service id="Kiener\MolliePayments\Controller\Storefront\Account\Sw65\AccountController" public="true">
-            <argument type="service"
-                      id="Kiener\MolliePayments\Components\Subscription\Page\Account\SubscriptionPageLoader"/>
-            <argument type="service" id="Kiener\MolliePayments\Components\Subscription\SubscriptionManager"/>
-            <argument type="service" id="mollie_payments.logger"/>
-            <call method="setContainer">
-                <argument type="service" id="service_container"/>
-            </call>
-            <call method="setTwig">
-                <argument type="service" id="twig"/>
-            </call>
-        </service>
-
-        <!-- ////////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-        <!-- Store API Controller -->
-
-        <service id="Kiener\MolliePayments\Controller\StoreApi\Config\Sw65\ConfigController" public="true">
-            <argument type="service" id="Kiener\MolliePayments\Service\SettingsService"/>
-            <argument type="service" id="Kiener\MolliePayments\Service\ConfigService"/>
-            <argument type="service" id="Kiener\MolliePayments\Service\SalesChannel\SalesChannelLocale"/>
-            <argument type="service" id="mollie_payments.logger"/>
-        </service>
-
-        <service id="Kiener\MolliePayments\Controller\StoreApi\ApplePayDirect\Sw65\ApplePayDirectController"
-                 public="true">
-            <argument type="service" id="Kiener\MolliePayments\Components\ApplePayDirect\ApplePayDirect"/>
-            <argument type="service" id="mollie_payments.logger"/>
-        </service>
-
-        <service id="Kiener\MolliePayments\Controller\StoreApi\CreditCard\Sw65\CreditCardController" public="true">
-            <argument type="service" id="Kiener\MolliePayments\Service\CustomerService"/>
-            <argument type="service" id="Kiener\MolliePayments\Service\MandateService"/>
-        </service>
-
-        <service id="Kiener\MolliePayments\Controller\StoreApi\iDEAL\Sw65\iDealController" public="true">
-            <argument type="service" id="Kiener\MolliePayments\Service\CustomerService"/>
-            <argument type="service" id="Kiener\MolliePayments\Gateway\Mollie\MollieGateway"/>
-        </service>
-
-        <service id="Kiener\MolliePayments\Controller\StoreApi\Subscription\Sw65\SubscriptionController" public="true">
-            <argument type="service" id="Kiener\MolliePayments\Components\Subscription\SubscriptionManager"/>
-            <argument type="service"
-                      id="Kiener\MolliePayments\Components\Subscription\DAL\Repository\SubscriptionRepository"/>
-            <argument type="service" id="mollie_payments.logger"/>
-        </service>
-
-        <service id="Kiener\MolliePayments\Controller\StoreApi\POS\Sw65\PosController" public="true">
-            <argument type="service" id="Kiener\MolliePayments\Service\CustomerService"/>
-            <argument type="service" id="Kiener\MolliePayments\Gateway\Mollie\MollieGateway"/>
-        </service>
-
-    </services>
-</container>
diff --git a/src/Resources/config/compatibility/routes/sw6/routes.xml b/src/Resources/config/compatibility/routes/sw6/routes.xml
deleted file mode 100644
index 0e6babde5..000000000
--- a/src/Resources/config/compatibility/routes/sw6/routes.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<routes xmlns="http://symfony.com/schema/routing"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://symfony.com/schema/routing
-        https://symfony.com/schema/routing/routing-1.0.xsd">
-
-    <import resource="../../../../../Controller/**/Sw6/*Controller.php" type="annotation"/>
-
-</routes>
diff --git a/src/Resources/config/compatibility/routes/sw65/routes.xml b/src/Resources/config/compatibility/routes/sw65/routes.xml
deleted file mode 100644
index 466f68e74..000000000
--- a/src/Resources/config/compatibility/routes/sw65/routes.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<routes xmlns="http://symfony.com/schema/routing"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://symfony.com/schema/routing
-        https://symfony.com/schema/routing/routing-1.0.xsd">
-
-    <import resource="../../../../../Controller/**/Sw65/*Controller.php" type="annotation"/>
-
-</routes>
diff --git a/src/Resources/config/compatibility/services_6.2.xml b/src/Resources/config/compatibility/services_6.2.xml
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/Resources/config/compatibility/services_6.3.5.0.xml b/src/Resources/config/compatibility/services_6.3.5.0.xml
deleted file mode 100644
index 6ea7930c7..000000000
--- a/src/Resources/config/compatibility/services_6.3.5.0.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" ?>
-
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
-    <services>
-
-        <service id="Kiener\MolliePayments\Compatibility\Storefront\Route\PaymentMethodRoute\RemovePaymentMethodRoute63"
-                 decorates="Shopware\Core\Checkout\Payment\SalesChannel\PaymentMethodRoute">
-            <argument type="service" id="Kiener\MolliePayments\Compatibility\Storefront\Route\PaymentMethodRoute\RemovePaymentMethodRoute63.inner"/>
-
-            <argument type="tagged" tag="mollie_payments.payment_method.remover.sw63"/>
-        </service>
-
-        <service id="mollie_payments.mail_service" class="Kiener\MolliePayments\Service\Mail\MailService63">
-            <argument type="service" id="Shopware\Core\Framework\Validation\DataValidator"/>
-            <argument type="service" id="Shopware\Core\Content\MailTemplate\Service\MessageFactory"/>
-            <argument type="service" id="Shopware\Core\Content\MailTemplate\Service\MailSender"/>
-        </service>
-
-    </services>
-
-</container>
diff --git a/src/Resources/config/compatibility/services_6.4.xml b/src/Resources/config/compatibility/services_6.4.xml
deleted file mode 100644
index aaf9560fd..000000000
--- a/src/Resources/config/compatibility/services_6.4.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" ?>
-
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
-    <services>
-
-        <service id="Kiener\MolliePayments\Compatibility\Storefront\Route\PaymentMethodRoute\RemovePaymentMethodRoute64"
-                 decorates="Shopware\Core\Checkout\Payment\SalesChannel\PaymentMethodRoute">
-            <argument type="service" id="Kiener\MolliePayments\Compatibility\Storefront\Route\PaymentMethodRoute\RemovePaymentMethodRoute64.inner"/>
-
-            <argument type="tagged" tag="mollie_payments.payment_method.remover.sw64"/>
-        </service>
-
-        <service id="Kiener\MolliePayments\Compatibility\Storefront\Route\PaymentMethodRoute\Cache\CachedPaymentMethodRoute64">
-            <argument type="service" id="Kiener\MolliePayments\Service\SettingsService"/>
-            <argument type="service" id="Shopware\Core\Checkout\Cart\SalesChannel\CartService"/>
-            <tag name="kernel.event_subscriber"/>
-        </service>
-
-        <!-- Mail -->
-        <service id="mollie_payments.mail_service" class="Kiener\MolliePayments\Service\Mail\MailService">
-            <argument type="service" id="Shopware\Core\Framework\Validation\DataValidator"/>
-            <argument type="service" id="Shopware\Core\Content\Mail\Service\MailFactory"/>
-            <argument type="service" id="Shopware\Core\Content\Mail\Service\MailSender"/>
-        </service>
-    </services>
-
-</container>
diff --git a/src/Resources/config/compatibility/snippets_6.5.xml b/src/Resources/config/compatibility/snippets_6.5.xml
deleted file mode 100644
index f18487b10..000000000
--- a/src/Resources/config/compatibility/snippets_6.5.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" ?>
-
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
-    <services>
-        <service id="Kiener\MolliePayments\Resources\snippet\en_GB\SnippetFile_en_GB_65" public="true">
-            <tag name="shopware.snippet.file"/>
-        </service>
-
-        <service id="Kiener\MolliePayments\Resources\snippet\de_DE\SnippetFile_de_DE_65" public="true">
-            <tag name="shopware.snippet.file"/>
-        </service>
-
-        <service id="Kiener\MolliePayments\Resources\snippet\nl_NL\SnippetFile_nl_NL_65" public="true">
-            <tag name="shopware.snippet.file"/>
-        </service>
-    </services>
-</container>
diff --git a/src/Resources/config/routes.xml b/src/Resources/config/routes.xml
index 0b0630af4..0760c8dd5 100644
--- a/src/Resources/config/routes.xml
+++ b/src/Resources/config/routes.xml
@@ -3,5 +3,5 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://symfony.com/schema/routing
         https://symfony.com/schema/routing/routing-1.0.xsd">
-
+    <import resource="routes/**/*.xml"/>
 </routes>
diff --git a/src/Resources/config/routes/admin-api/config.xml b/src/Resources/config/routes/admin-api/config.xml
new file mode 100644
index 000000000..1fb24a29a
--- /dev/null
+++ b/src/Resources/config/routes/admin-api/config.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="api.action.mollie.config.test-api-keys"
+           path="/api/v{version}/_action/mollie/config/test-api-keys"
+           methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\PluginConfig\ConfigControllerBase::testApiKeys</default>
+        <default key="_routeScope">api</default>
+        <default key="_auth_required">true</default>
+        <default key="_auth_enabled">true</default>
+    </route>
+
+    <route id="api.action.mollie.config.test-api-keys-64"
+           path="/api/_action/mollie/config/test-api-keys"
+           methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\PluginConfig\ConfigControllerBase::testApiKeys64</default>
+        <default key="_routeScope">api</default>
+        <default key="_auth_required">true</default>
+        <default key="_auth_enabled">true</default>
+    </route>
+
+    <route id="api.action.mollie.config.validate.flowbuilder"
+           path="/api/_action/mollie/config/validate/flowbuilder"
+           methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\PluginConfig\ConfigControllerBase::validateFlowBuilder</default>
+        <default key="_routeScope">api</default>
+        <default key="_auth_required">true</default>
+        <default key="_auth_enabled">true</default>
+    </route>
+
+    <route id="api.action.mollie.config.refund-manager"
+           path="/api/_action/mollie/config/refund-manager"
+           methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\PluginConfig\ConfigControllerBase::getRefundManagerConfig</default>
+        <default key="_routeScope">api</default>
+        <default key="_auth_required">true</default>
+        <default key="_auth_enabled">true</default>
+    </route>
+
+    <route id="api.action.mollie.config.refund-manager.legacy"
+           path="/api/v{version}/_action/mollie/config/refund-manager"
+           methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\PluginConfig\ConfigControllerBase::getRefundManagerConfigLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="_auth_required">true</default>
+        <default key="_auth_enabled">true</default>
+    </route>
+
+    <route id="api.action.mollie.config.subscription"
+           path="/api/_action/mollie/config/subscription"
+           methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\PluginConfig\ConfigControllerBase::getSubscriptionConfig</default>
+        <default key="_routeScope">api</default>
+        <default key="_auth_required">true</default>
+        <default key="_auth_enabled">true</default>
+    </route>
+
+</routes>
\ No newline at end of file
diff --git a/src/Resources/config/routes/admin-api/order.xml b/src/Resources/config/routes/admin-api/order.xml
new file mode 100644
index 000000000..8163d0007
--- /dev/null
+++ b/src/Resources/config/routes/admin-api/order.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+    <route id="api.action.mollie.order.payment-url" path="/api/_action/mollie/order/payment-url" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\OrderControllerBase::paymentUrl</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.order.payment-url.legacy" path="/api/v{version}/_action/mollie/order/payment-url" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\OrderControllerBase::paymentUrlLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+</routes>
diff --git a/src/Resources/config/routes/admin-api/payment_method.xml b/src/Resources/config/routes/admin-api/payment_method.xml
new file mode 100644
index 000000000..9169bc0c4
--- /dev/null
+++ b/src/Resources/config/routes/admin-api/payment_method.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="api.mollie.payment-method.update-methods" path="/api/_action/mollie/payment-method/update-methods" methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\PaymentMethod\PaymentMethodControllerBase::updatePaymentMethods</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.mollie.payment-method.update-methods.legacy" path="/api/v{version}/_action/mollie/payment-method/update-methods" methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\PaymentMethod\PaymentMethodControllerBase::updatePaymentMethodsLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+</routes>
diff --git a/src/Resources/config/routes/admin-api/refund.xml b/src/Resources/config/routes/admin-api/refund.xml
new file mode 100644
index 000000000..e952ff1ea
--- /dev/null
+++ b/src/Resources/config/routes/admin-api/refund.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+    <route id="api.mollie.refund.order" path="/api/mollie/refund/order" methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\RefundControllerBase::refundOrderNumber</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.refund-manager.data" path="/api/_action/mollie/refund-manager/data" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\RefundControllerBase::refundManagerData</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.refund.list" path="/api/_action/mollie/refund/list" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\RefundControllerBase::list</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.refund.total" path="/api/_action/mollie/refund/total" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\RefundControllerBase::total</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.refund" path="/api/_action/mollie/refund" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\RefundControllerBase::refundOrderID</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.refund.cancel" path="/api/_action/mollie/refund/cancel" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\RefundControllerBase::cancel</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.refund-manager.data.legacy" path="/api/v{version}/_action/mollie/refund-manager/data" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\RefundControllerBase::refundManagerDataLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.refund.list.legacy" path="/api/v{version}/_action/mollie/refund/list" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\RefundControllerBase::listLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.refund.total.legacy" path="/api/v{version}/_action/mollie/refund/total" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\RefundControllerBase::totalLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.refund.legacy" path="/api/v{version}/_action/mollie/refund" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\RefundControllerBase::refundLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.refund.cancel.legacy" path="/api/v{version}/_action/mollie/refund/cancel" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\RefundControllerBase::cancelLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+</routes>
diff --git a/src/Resources/config/routes/admin-api/return.xml b/src/Resources/config/routes/admin-api/return.xml
new file mode 100644
index 000000000..f23b5ee55
--- /dev/null
+++ b/src/Resources/config/routes/admin-api/return.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+    <route id="api.mollie.payment-return" path="/api/mollie/payment/return/{swTransactionId}" methods="GET|POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Payment\ReturnControllerBase::returnAction</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>false</bool></default>
+        <default key="auth_enabled"><bool>false</bool></default>
+    </route>
+
+    <route id="api.mollie.payment-return-legacy" path="/api/v{version}/mollie/payment/return/{swTransactionId}" methods="GET|POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Payment\ReturnControllerBase::returnActionLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>false</bool></default>
+        <default key="auth_enabled"><bool>false</bool></default>
+    </route>
+</routes>
diff --git a/src/Resources/config/routes/admin-api/shipping.xml b/src/Resources/config/routes/admin-api/shipping.xml
new file mode 100644
index 000000000..41ae4ea5c
--- /dev/null
+++ b/src/Resources/config/routes/admin-api/shipping.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+
+    <route id="api.action.mollie.ship.status" path="/api/_action/mollie/ship/status" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\ShippingControllerBase::status</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.ship.status.legacy" path="/api/v{version}/_action/mollie/ship/status" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\ShippingControllerBase::statusLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.ship.total" path="/api/_action/mollie/ship/total" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\ShippingControllerBase::total</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.ship.total.legacy" path="/api/v{version}/_action/mollie/ship/total" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\ShippingControllerBase::totalLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.mollie.ship.order" path="/api/mollie/ship/order" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\ShippingControllerBase::shipOrderOperational</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.mollie.ship.order.deprecated" path="/api/mollie/ship/order" methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\ShippingControllerBase::shipOrderOperationalDeprecated</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.mollie.ship.order.batch" path="/api/mollie/ship/order/batch" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\ShippingControllerBase::shipOrderBatchOperational</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.mollie.ship.item" path="/api/mollie/ship/item" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\ShippingControllerBase::shipItemOperational</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.mollie.ship.item.deprecated" path="/api/mollie/ship/item" methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\ShippingControllerBase::shipItemOperationalDeprecated</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.ship.order" path="/api/_action/mollie/ship" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\ShippingControllerBase::shipOrderAdmin</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.ship.order.legacy" path="/api/v{version}/_action/mollie/ship" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\ShippingControllerBase::shipOrderAdminLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.ship.item" path="/api/_action/mollie/ship/item" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\ShippingControllerBase::shipItemAdmin</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.ship.item.legacy" path="/api/v{version}/_action/mollie/ship/item" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Order\ShippingControllerBase::shipItemAdminLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+</routes>
diff --git a/src/Resources/config/routes/admin-api/subscription.xml b/src/Resources/config/routes/admin-api/subscription.xml
new file mode 100644
index 000000000..02d652105
--- /dev/null
+++ b/src/Resources/config/routes/admin-api/subscription.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="api.action.mollie.subscription.cancel" path="/api/_action/mollie/subscriptions/cancel" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Subscription\SubscriptionControllerBase::cancel</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.subscription.cancel_legacy" path="/api/v{version}/_action/mollie/subscriptions/cancel" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Subscription\SubscriptionControllerBase::cancelLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.subscription.pause" path="/api/_action/mollie/subscriptions/pause" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Subscription\SubscriptionControllerBase::pause</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.subscription.pause_legacy" path="/api/v{version}/_action/mollie/subscriptions/pause" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Subscription\SubscriptionControllerBase::pauseLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.subscription.resume" path="/api/_action/mollie/subscriptions/resume" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Subscription\SubscriptionControllerBase::resume</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.subscription.resume_legacy" path="/api/v{version}/_action/mollie/subscriptions/resume" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Subscription\SubscriptionControllerBase::resumeLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.subscription.skip" path="/api/_action/mollie/subscriptions/skip" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Subscription\SubscriptionControllerBase::skip</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.subscription.skip_legacy" path="/api/v{version}/_action/mollie/subscriptions/skip" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Subscription\SubscriptionControllerBase::skipLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+</routes>
diff --git a/src/Resources/config/routes/admin-api/support.xml b/src/Resources/config/routes/admin-api/support.xml
new file mode 100644
index 000000000..a033c838a
--- /dev/null
+++ b/src/Resources/config/routes/admin-api/support.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="api.action.mollie.support.request" path="/api/_action/mollie/support/request" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Support\SupportControllerBase::requestSupport</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+    <route id="api.action.mollie.support.request.legacy" path="/api/v{version}/_action/mollie/support/request" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Support\SupportControllerBase::requestSupportLegacy</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>true</bool></default>
+        <default key="auth_enabled"><bool>true</bool></default>
+    </route>
+
+</routes>
diff --git a/src/Resources/config/routes/admin-api/webhook.xml b/src/Resources/config/routes/admin-api/webhook.xml
new file mode 100644
index 000000000..9268f416a
--- /dev/null
+++ b/src/Resources/config/routes/admin-api/webhook.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="api.mollie.webhook" path="/api/mollie/webhook/{swTransactionId}" methods="GET|POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Webhook\WebhookControllerBase::webhookAction</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>false</bool></default>
+        <default key="auth_enabled"><bool>false</bool></default>
+    </route>
+
+    <route id="api.mollie.webhook-legacy" path="/api/v{version}/mollie/webhook/{swTransactionId}" methods="GET|POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Webhook\WebhookControllerBase::webhookLegacyAction</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>false</bool></default>
+        <default key="auth_enabled"><bool>false</bool></default>
+    </route>
+
+    <route id="api.mollie.webhook_subscription" path="/api/mollie/webhook/subscription/{swSubscriptionId}" methods="GET|POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Webhook\WebhookControllerBase::webhookSubscriptionAction</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>false</bool></default>
+        <default key="auth_enabled"><bool>false</bool></default>
+    </route>
+
+    <route id="api.mollie.webhook_subscription-legacy" path="/api/v{version}/mollie/webhook/subscription/{swSubscriptionId}" methods="GET|POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Webhook\WebhookControllerBase::webhookSubscriptionLegacyAction</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>false</bool></default>
+        <default key="auth_enabled"><bool>false</bool></default>
+    </route>
+
+    <route id="api.mollie.webhook_subscription_renew" path="/api/mollie/webhook/subscription/{swSubscriptionId}/renew" methods="GET|POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Webhook\WebhookControllerBase::webhookSubscriptionRenewAction</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>false</bool></default>
+        <default key="auth_enabled"><bool>false</bool></default>
+    </route>
+
+    <route id="api.mollie.webhook_subscription_renew-legacy" path="/api/v{version}/mollie/webhook/subscription/{swSubscriptionId}/renew" methods="GET|POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Webhook\WebhookControllerBase::webhookSubscriptionRenewLegacyAction</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>false</bool></default>
+        <default key="auth_enabled"><bool>false</bool></default>
+    </route>
+
+    <route id="api.mollie.webhook_subscription_paymentmethod" path="/api/mollie/webhook/subscription/{swSubscriptionId}/mandate/update" methods="GET|POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Webhook\WebhookControllerBase::webhookSubscriptionMandateUpdatedAction</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>false</bool></default>
+        <default key="auth_enabled"><bool>false</bool></default>
+    </route>
+
+    <route id="api.mollie.webhook_subscription_paymentmethod-legacy" path="/api/v{version}/mollie/webhook/subscription/{swSubscriptionId}/mandate/update" methods="GET|POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Api\Webhook\WebhookControllerBase::webhookSubscriptionMandateUpdatedLegacyAction</default>
+        <default key="_routeScope">api</default>
+        <default key="auth_required"><bool>false</bool></default>
+        <default key="auth_enabled"><bool>false</bool></default>
+    </route>
+</routes>
diff --git a/src/Resources/config/routes/store-api/apple_pay_direct.xml b/src/Resources/config/routes/store-api/apple_pay_direct.xml
new file mode 100644
index 000000000..fd0103525
--- /dev/null
+++ b/src/Resources/config/routes/store-api/apple_pay_direct.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+
+
+    <route id="store-api.mollie.apple-pay.enabled"
+           path="/store-api/mollie/applepay/enabled"
+           methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\StoreApi\ApplePayDirect\ApplePayDirectControllerBase::isEnabled</default>
+        <default key="_routeScope">store-api</default>
+    </route>
+
+    <route id="store-api.mollie.apple-pay.id"
+           path="/store-api/mollie/applepay/id"
+           methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\StoreApi\ApplePayDirect\ApplePayDirectControllerBase::getId</default>
+        <default key="_routeScope">store-api</default>
+    </route>
+
+    <route id="store-api.mollie.apple-pay.add-product"
+           path="/store-api/mollie/applepay/add-product"
+           methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\StoreApi\ApplePayDirect\ApplePayDirectControllerBase::addProduct</default>
+        <default key="_routeScope">store-api</default>
+    </route>
+
+    <route id="store-api.mollie.apple-pay.validate"
+           path="/store-api/mollie/applepay/validate"
+           methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\StoreApi\ApplePayDirect\ApplePayDirectControllerBase::createPaymentSession</default>
+        <default key="_routeScope">store-api</default>
+    </route>
+
+    <route id="store-api.mollie.apple-pay.cart"
+           path="/store-api/mollie/applepay/cart"
+           methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\StoreApi\ApplePayDirect\ApplePayDirectControllerBase::getCart</default>
+        <default key="_routeScope">store-api</default>
+    </route>
+
+    <route id="store-api.mollie.apple-pay.shipping-methods"
+           path="/store-api/mollie/applepay/shipping-methods"
+           methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\StoreApi\ApplePayDirect\ApplePayDirectControllerBase::getShippingMethods</default>
+        <default key="_routeScope">store-api</default>
+    </route>
+
+    <route id="store-api.mollie.apple-pay.set-shipping-methods"
+           path="/store-api/mollie/applepay/shipping-method"
+           methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\StoreApi\ApplePayDirect\ApplePayDirectControllerBase::setShippingMethod</default>
+        <default key="_routeScope">store-api</default>
+    </route>
+
+    <route id="store-api.mollie.apple-pay.pay"
+           path="/store-api/mollie/applepay/pay"
+           methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\StoreApi\ApplePayDirect\ApplePayDirectControllerBase::pay</default>
+        <default key="_routeScope">store-api</default>
+    </route>
+
+    <route id="store-api.mollie.apple-pay.restore-cart"
+           path="/store-api/mollie/applepay/restore-cart"
+           methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\StoreApi\ApplePayDirect\ApplePayDirectControllerBase::restoreCart</default>
+        <default key="_routeScope">store-api</default>
+    </route>
+
+</routes>
diff --git a/src/Resources/config/routes/store-api/config.xml b/src/Resources/config/routes/store-api/config.xml
new file mode 100644
index 000000000..f637f840f
--- /dev/null
+++ b/src/Resources/config/routes/store-api/config.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+
+    <route id="store-api.mollie.config"
+           path="/store-api/mollie/config"
+           methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\StoreApi\Config\ConfigControllerBase::getConfig</default>
+        <default key="_routeScope">store-api</default>
+    </route>
+</routes>
diff --git a/src/Resources/config/routes/store-api/credit_card.xml b/src/Resources/config/routes/store-api/credit_card.xml
new file mode 100644
index 000000000..576548b72
--- /dev/null
+++ b/src/Resources/config/routes/store-api/credit_card.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="store-api.mollie.creditcard.store-token"
+           path="/store-api/mollie/creditcard/store-token/{customerId}/{cardToken}"
+           methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\StoreApi\CreditCard\CreditCardControllerBase::saveCardToken</default>
+        <default key="_routeScope">store-api</default>
+    </route>
+
+    <route id="store-api.mollie.creditcard.store-mandate-id"
+           path="/store-api/mollie/creditcard/store-mandate-id/{customerId}/{mandateId}"
+           methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\StoreApi\CreditCard\CreditCardControllerBase::saveMandateId</default>
+        <default key="_routeScope">store-api</default>
+    </route>
+
+    <route id="store-api.mollie.mandate.revoke"
+           path="/store-api/mollie/mandate/revoke/{customerId}/{mandateId}"
+           methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\StoreApi\CreditCard\CreditCardControllerBase::revokeMandate</default>
+        <default key="_routeScope">store-api</default>
+    </route>
+
+    <route id="store-api.mollie.mandates"
+           path="/store-api/mollie/mandates/{customerId}"
+           methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\StoreApi\CreditCard\CreditCardControllerBase::getMandates</default>
+        <default key="_routeScope">store-api</default>
+    </route>
+</routes>
diff --git a/src/Resources/config/routes/store-api/ideal.xml b/src/Resources/config/routes/store-api/ideal.xml
new file mode 100644
index 000000000..a5cc18668
--- /dev/null
+++ b/src/Resources/config/routes/store-api/ideal.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="store-api.mollie.ideal.issuers"
+           path="/store-api/mollie/ideal/issuers"
+           methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\StoreApi\iDEAL\iDealControllerBase::getIssuers</default>
+        <default key="_routeScope">store-api</default>
+    </route>
+
+    <route id="store-api.mollie.ideal.store-issuer"
+           path="/store-api/mollie/ideal/store-issuer/{customerId}/{issuerId}"
+           methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\StoreApi\iDEAL\iDealControllerBase::saveIssuer</default>
+        <default key="_routeScope">store-api</default>
+    </route>
+
+</routes>
diff --git a/src/Resources/config/routes/store-api/pos.xml b/src/Resources/config/routes/store-api/pos.xml
new file mode 100644
index 000000000..a37cb0f56
--- /dev/null
+++ b/src/Resources/config/routes/store-api/pos.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="store-api.mollie.pos.terminals"
+           path="/store-api/mollie/pos/terminals"
+           methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\StoreApi\POS\PosControllerBase::getIssuers</default>
+        <default key="_routeScope">store-api</default>
+    </route>
+
+    <route id="store-api.mollie.pos.store-terminal"
+           path="/store-api/mollie/pos/store-terminal/{customerId}/{terminalID}"
+           methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\StoreApi\POS\PosControllerBase::saveTerminalId</default>
+        <default key="_routeScope">store-api</default>
+    </route>
+</routes>
diff --git a/src/Resources/config/routes/store-api/subscription.xml b/src/Resources/config/routes/store-api/subscription.xml
new file mode 100644
index 000000000..5f97d3f3f
--- /dev/null
+++ b/src/Resources/config/routes/store-api/subscription.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="store-api.mollie.subscription"
+           path="/store-api/mollie/subscription"
+           methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\StoreApi\Subscription\SubscriptionControllerBase::getSubscriptions</default>
+        <default key="_routeScope">store-api</default>
+    </route>
+
+    <route id="store-api.mollie.subscription.billing_update"
+           path="/store-api/mollie/subscription/{subscriptionId}/billing/update"
+           methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\StoreApi\Subscription\SubscriptionControllerBase::updateBilling</default>
+        <default key="_routeScope">store-api</default>
+    </route>
+
+    <route id="store-api.mollie.subscription.shipping_update"
+           path="/store-api/mollie/subscription/{subscriptionId}/shipping/update"
+           methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\StoreApi\Subscription\SubscriptionControllerBase::updateShipping</default>
+        <default key="_routeScope">store-api</default>
+    </route>
+
+    <route id="store-api.mollie.subscription.payment_update"
+           path="/store-api/mollie/subscription/{subscriptionId}/payment/update"
+           methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\StoreApi\Subscription\SubscriptionControllerBase::updatePayment</default>
+        <default key="_routeScope">store-api</default>
+    </route>
+
+    <route id="store-api.mollie.subscription.pause"
+           path="/store-api/mollie/subscription/{subscriptionId}/pause"
+           methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\StoreApi\Subscription\SubscriptionControllerBase::pause</default>
+        <default key="_routeScope">store-api</default>
+    </route>
+
+    <route id="store-api.mollie.subscription.resume"
+           path="/store-api/mollie/subscription/{subscriptionId}/resume"
+           methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\StoreApi\Subscription\SubscriptionControllerBase::resume</default>
+        <default key="_routeScope">store-api</default>
+    </route>
+
+    <route id="store-api.mollie.subscription.skip"
+           path="/store-api/mollie/subscription/{subscriptionId}/skip"
+           methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\StoreApi\Subscription\SubscriptionControllerBase::skip</default>
+        <default key="_routeScope">store-api</default>
+    </route>
+
+    <route id="store-api.mollie.subscription.cancel"
+           path="/store-api/mollie/subscription/{subscriptionId}/cancel"
+           methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\StoreApi\Subscription\SubscriptionControllerBase::cancel</default>
+        <default key="_routeScope">store-api</default>
+    </route>
+
+</routes>
diff --git a/src/Resources/config/routes/storefront/account.xml b/src/Resources/config/routes/storefront/account.xml
new file mode 100644
index 000000000..688ad4725
--- /dev/null
+++ b/src/Resources/config/routes/storefront/account.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="frontend.account.mollie.subscriptions.page"
+           path="/account/mollie/subscriptions"
+           methods="GET|POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\Account\AccountControllerBase::subscriptionsList</default>
+        <default key="_routeScope">storefront</default>
+        <default key="XmlHttpRequest"><bool>true</bool></default>
+        <option key="seo">false</option>
+    </route>
+
+    <route id="frontend.account.mollie.subscriptions.billing.update"
+           path="/account/mollie/subscriptions/{subscriptionId}/billing/update"
+           methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\Account\AccountControllerBase::updateBilling</default>
+        <default key="_routeScope">storefront</default>
+    </route>
+
+    <route id="frontend.account.mollie.subscriptions.shipping.update"
+           path="/account/mollie/subscriptions/{subscriptionId}/shipping/update"
+           methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\Account\AccountControllerBase::updateShipping</default>
+        <default key="_routeScope">storefront</default>
+    </route>
+
+    <route id="frontend.account.mollie.subscriptions.payment.update"
+           path="/account/mollie/subscriptions/{swSubscriptionId}/payment/update"
+           methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\Account\AccountControllerBase::updatePaymentStart</default>
+        <default key="_routeScope">storefront</default>
+    </route>
+
+    <route id="frontend.account.mollie.subscriptions.payment.update-success"
+           path="/account/mollie/subscriptions/{swSubscriptionId}/payment/update/finish"
+           methods="GET|POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\Account\AccountControllerBase::updatePaymentFinish</default>
+        <default key="_routeScope">storefront</default>
+    </route>
+
+    <route id="frontend.account.mollie.subscriptions.pause"
+           path="/account/mollie/subscriptions/{swSubscriptionId}/pause"
+           methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\Account\AccountControllerBase::pauseSubscription</default>
+        <default key="_routeScope">storefront</default>
+    </route>
+
+    <route id="frontend.account.mollie.subscriptions.skip"
+           path="/account/mollie/subscriptions/{swSubscriptionId}/skip"
+           methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\Account\AccountControllerBase::skipSubscription</default>
+        <default key="_routeScope">storefront</default>
+    </route>
+
+    <route id="frontend.account.mollie.subscriptions.resume"
+           path="/account/mollie/subscriptions/{swSubscriptionId}/resume"
+           methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\Account\AccountControllerBase::resumeSubscription</default>
+        <default key="_routeScope">storefront</default>
+    </route>
+
+    <route id="frontend.account.mollie.subscriptions.cancel"
+           path="/account/mollie/subscriptions/{subscriptionId}/cancel"
+           methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\Account\AccountControllerBase::cancelSubscription</default>
+        <default key="_routeScope">storefront</default>
+    </route>
+
+    
+</routes>
diff --git a/src/Resources/config/routes/storefront/apple_pay_direct.xml b/src/Resources/config/routes/storefront/apple_pay_direct.xml
new file mode 100644
index 000000000..ef6177a5d
--- /dev/null
+++ b/src/Resources/config/routes/storefront/apple_pay_direct.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="frontend.mollie.apple-pay.available" path="/mollie/apple-pay/available" methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\ApplePayDirect\ApplePayDirectControllerBase::isPaymentAvailable</default>
+        <default key="_routeScope">storefront</default>
+        <default key="csrf_protected"><bool>true</bool></default>
+        <option key="seo">false</option>
+    </route>
+
+    <route id="frontend.mollie.apple-pay.id" path="/mollie/apple-pay/applepay-id" methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\ApplePayDirect\ApplePayDirectControllerBase::getApplePayID</default>
+        <default key="_routeScope">storefront</default>
+        <default key="csrf_protected"><bool>true</bool></default>
+        <option key="seo">false</option>
+    </route>
+
+    <route id="frontend.mollie.apple-pay.add-product" path="/mollie/apple-pay/add-product" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\ApplePayDirect\ApplePayDirectControllerBase::addProduct</default>
+        <default key="_routeScope">storefront</default>
+        <default key="csrf_protected"><bool>false</bool></default>
+        <option key="seo">false</option>
+    </route>
+
+    <route id="frontend.mollie.apple-pay.validate" path="/mollie/apple-pay/validate" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\ApplePayDirect\ApplePayDirectControllerBase::createPaymentSession</default>
+        <default key="_routeScope">storefront</default>
+        <default key="csrf_protected"><bool>false</bool></default>
+        <option key="seo">false</option>
+    </route>
+
+    <route id="frontend.mollie.apple-pay.shipping-methods" path="/mollie/apple-pay/shipping-methods" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\ApplePayDirect\ApplePayDirectControllerBase::getShippingMethods</default>
+        <default key="_routeScope">storefront</default>
+        <default key="csrf_protected"><bool>false</bool></default>
+        <default key="XmlHttpRequest"><bool>true</bool></default>
+        <option key="seo">false</option>
+    </route>
+
+    <route id="frontend.mollie.apple-pay.set-shipping" path="/mollie/apple-pay/set-shipping" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\ApplePayDirect\ApplePayDirectControllerBase::setShippingMethod</default>
+        <default key="_routeScope">storefront</default>
+        <default key="csrf_protected"><bool>false</bool></default>
+        <default key="XmlHttpRequest"><bool>true</bool></default>
+        <option key="seo">false</option>
+    </route>
+
+    <route id="frontend.mollie.apple-pay.start-payment" path="/mollie/apple-pay/start-payment" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\ApplePayDirect\ApplePayDirectControllerBase::startPayment</default>
+        <default key="_routeScope">storefront</default>
+        <default key="csrf_protected"><bool>false</bool></default>
+        <default key="XmlHttpRequest"><bool>true</bool></default>
+        <option key="seo">false</option>
+    </route>
+
+    <route id="frontend.mollie.apple-pay.finish-payment" path="/mollie/apple-pay/finish-payment" methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\ApplePayDirect\ApplePayDirectControllerBase::finishPayment</default>
+        <default key="_routeScope">storefront</default>
+        <default key="csrf_protected"><bool>false</bool></default>
+        <default key="XmlHttpRequest"><bool>true</bool></default>
+        <option key="seo">false</option>
+    </route>
+
+    <route id="frontend.mollie.apple-pay.restore-cart" path="/mollie/apple-pay/restore-cart" methods="POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\ApplePayDirect\ApplePayDirectControllerBase::restoreCart</default>
+        <default key="_routeScope">storefront</default>
+        <default key="csrf_protected"><bool>false</bool></default>
+        <option key="seo">false</option>
+    </route>
+
+</routes>
diff --git a/src/Resources/config/routes/storefront/credit_card.xml b/src/Resources/config/routes/storefront/credit_card.xml
new file mode 100644
index 000000000..209ae9215
--- /dev/null
+++ b/src/Resources/config/routes/storefront/credit_card.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="frontend.mollie.components.storeCardToken" path="/mollie/components/store-card-token/{customerId}/{cardToken}" methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\CreditCard\CreditCardControllerBase::storeCardToken</default>
+        <default key="_routeScope">storefront</default>
+        <option key="seo">false</option>
+    </route>
+
+    <route id="frontend.mollie.components.storeMandateId" path="/mollie/components/store-mandate-id/{customerId}/{mandateId}" methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\CreditCard\CreditCardControllerBase::storeMandateId</default>
+        <default key="_routeScope">storefront</default>
+        <option key="seo">false</option>
+    </route>
+
+    <route id="frontend.mollie.components.revokeMandate" path="/mollie/components/revoke-mandate/{customerId}/{mandateId}" methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\CreditCard\CreditCardControllerBase::revokeMandate</default>
+        <default key="_routeScope">storefront</default>
+        <option key="seo">false</option>
+    </route>
+</routes>
diff --git a/src/Resources/config/routes/storefront/ideal.xml b/src/Resources/config/routes/storefront/ideal.xml
new file mode 100644
index 000000000..dc9fe5d92
--- /dev/null
+++ b/src/Resources/config/routes/storefront/ideal.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="frontend.mollie.ideal.storeIssuer" path="/mollie/ideal/store-issuer/{customerId}/{issuerId}" methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\iDEAL\iDealControllerBase::storeIssuer</default>
+        <default key="_routeScope">storefront</default>
+        <option key="seo">false</option>
+    </route>
+
+</routes>
diff --git a/src/Resources/config/routes/storefront/mollie_failure.xml b/src/Resources/config/routes/storefront/mollie_failure.xml
new file mode 100644
index 000000000..bfa1a6648
--- /dev/null
+++ b/src/Resources/config/routes/storefront/mollie_failure.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="frontend.mollie.payment-failed"
+           path="/mollie/payment/failed/{transactionId}"
+           methods="GET|POST">
+        <requirement key="transactionId">.*</requirement>
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\Payment\MollieFailureControllerBase::paymentFailedAction</default>
+        <default key="_routeScope">storefront</default>
+        <default key="csrf_protected"><bool>false</bool></default>
+        <option key="seo">false</option>
+    </route>
+
+    <route id="frontend.mollie.payment.retry"
+           path="/mollie/payment/retry/{transactionId}"
+           methods="GET|POST">
+        <requirement key="transactionId">.*</requirement>
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\Payment\MollieFailureControllerBase::retry</default>
+        <default key="_routeScope">storefront</default>
+        <default key="csrf_protected"><bool>false</bool></default>
+        <option key="seo">false</option>
+    </route>
+</routes>
diff --git a/src/Resources/config/routes/storefront/pos.xml b/src/Resources/config/routes/storefront/pos.xml
new file mode 100644
index 000000000..07b7e72d2
--- /dev/null
+++ b/src/Resources/config/routes/storefront/pos.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="frontend.mollie.pos.storeTerminal" path="/mollie/pos/store-terminal/{customerId}/{terminalId}" methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\POS\PosControllerBase::storeTerminal</default>
+        <default key="_routeScope">storefront</default>
+        <option key="seo">false</option>
+    </route>
+
+    <route id="frontend.mollie.pos.checkout" path="/mollie/pos/checkout" methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\POS\PosControllerBase::checkoutAction</default>
+        <default key="_routeScope">storefront</default>
+        <option key="seo">false</option>
+    </route>
+
+    <route id="frontend.mollie.pos.checkout_status" path="/mollie/pos/{orderId}/{molliePaymentId}/status" methods="GET">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\POS\PosControllerBase::statusAction</default>
+        <default key="_routeScope">storefront</default>
+        <option key="seo">false</option>
+    </route>
+
+</routes>
diff --git a/src/Resources/config/routes/storefront/return.xml b/src/Resources/config/routes/storefront/return.xml
new file mode 100644
index 000000000..95a9adc25
--- /dev/null
+++ b/src/Resources/config/routes/storefront/return.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+
+    <route id="frontend.mollie.payment"
+           path="/mollie/payment/{swTransactionId}"
+           methods="GET|POST">
+        <requirement key="swTransactionId">.*</requirement>
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\Payment\ReturnControllerBase::payment</default>
+        <default key="csrf_protected"><bool>false</bool></default>
+        <default key="_routeScope">storefront</default>
+        <option key="seo">false</option>
+    </route>
+</routes>
diff --git a/src/Resources/config/routes/storefront/webhook.xml b/src/Resources/config/routes/storefront/webhook.xml
new file mode 100644
index 000000000..e0166d0f0
--- /dev/null
+++ b/src/Resources/config/routes/storefront/webhook.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="frontend.mollie.webhook" path="/mollie/webhook/{swTransactionId}" methods="GET|POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\Webhook\WebhookControllerBase::onWebhookReceived</default>
+        <default key="_routeScope">storefront</default>
+        <default key="csrf_protected"><bool>false</bool></default>
+        <option key="seo">false</option>
+    </route>
+
+    <route id="frontend.mollie.webhook.subscription" path="/mollie/webhook/subscription/{swSubscriptionId}" methods="GET|POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\Webhook\WebhookControllerBase::onWebhookSubscriptionReceived</default>
+        <default key="_routeScope">storefront</default>
+        <default key="csrf_protected"><bool>false</bool></default>
+        <option key="seo">false</option>
+    </route>
+
+    <route id="frontend.mollie.webhook.subscription.renew" path="/mollie/webhook/subscription/{swSubscriptionId}/renew" methods="GET|POST">
+        <default key="_controller">Kiener\MolliePayments\Controller\Storefront\Webhook\WebhookControllerBase::onWebhookSubscriptionLegacyReceived</default>
+        <default key="_routeScope">storefront</default>
+        <default key="csrf_protected"><bool>false</bool></default>
+        <option key="seo">false</option>
+    </route>
+</routes>
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
index 6f13b9128..3b1ba8c64 100644
--- a/src/Resources/config/services.xml
+++ b/src/Resources/config/services.xml
@@ -21,6 +21,8 @@
         <import resource="services/scheduled_tasks.xml"/>
         <import resource="services/subscription/services.xml"/>
         <import resource="services/refundmanager/services.xml"/>
+        <import resource="services/controller.xml"/>
+        <import resource="services/snippets.xml"/>
     </imports>
 
 
@@ -177,6 +179,41 @@
         <service id="Kiener\MolliePayments\Service\TrackingInfoStructFactory"/>
 
 
+        <service id="Kiener\MolliePayments\Subscriber\KernelSubscriber">
+            <tag name="kernel.event_subscriber"/>
+        </service>
+
+        <service id="Kiener\MolliePayments\Compatibility\CompatibilityFactory" class="Kiener\MolliePayments\Compatibility\CompatibilityFactory">
+            <argument>%kernel.shopware_version%</argument>
+            <argument type="service" id="Shopware\Core\System\SalesChannel\Context\SalesChannelContextService"/>
+            <argument type="service" id="Shopware\Core\Checkout\Cart\SalesChannel\CartService"/>
+        </service>
+
+        <service id="Kiener\MolliePayments\Compatibility\Gateway\CompatibilityGateway" class="Kiener\MolliePayments\Compatibility\Gateway\CompatibilityGateway">
+            <factory service="Kiener\MolliePayments\Compatibility\CompatibilityFactory" method="createGateway"/>
+        </service>
+
+
+        <service id="Kiener\MolliePayments\Compatibility\Storefront\Route\PaymentMethodRoute\RemovePaymentMethodRoute64"
+                 decorates="Shopware\Core\Checkout\Payment\SalesChannel\PaymentMethodRoute">
+            <argument type="service" id="Kiener\MolliePayments\Compatibility\Storefront\Route\PaymentMethodRoute\RemovePaymentMethodRoute64.inner"/>
+
+            <argument type="tagged" tag="mollie_payments.payment_method.remover.sw64"/>
+        </service>
+
+        <service id="Kiener\MolliePayments\Compatibility\Storefront\Route\PaymentMethodRoute\Cache\CachedPaymentMethodRoute64">
+            <argument type="service" id="Kiener\MolliePayments\Service\SettingsService"/>
+            <argument type="service" id="Shopware\Core\Checkout\Cart\SalesChannel\CartService"/>
+            <tag name="kernel.event_subscriber"/>
+        </service>
+
+        <!-- Mail -->
+        <service id="mollie_payments.mail_service" class="Kiener\MolliePayments\Service\Mail\MailService">
+            <argument type="service" id="Shopware\Core\Framework\Validation\DataValidator"/>
+            <argument type="service" id="Shopware\Core\Content\Mail\Service\MailFactory"/>
+            <argument type="service" id="Shopware\Core\Content\Mail\Service\MailSender"/>
+        </service>
+
     </services>
 
 </container>
diff --git a/src/Resources/config/compatibility/controller.xml b/src/Resources/config/services/controller.xml
similarity index 85%
rename from src/Resources/config/compatibility/controller.xml
rename to src/Resources/config/services/controller.xml
index 4925d940d..078c98d5d 100644
--- a/src/Resources/config/compatibility/controller.xml
+++ b/src/Resources/config/services/controller.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" ?>
 
+
 <container xmlns="http://symfony.com/schema/dic/services"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
@@ -10,7 +11,7 @@
         <!-- ////////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
         <!-- Admin API Controller -->
 
-        <service id="Kiener\MolliePayments\Controller\Api\PluginConfig\Sw6\ConfigController" public="true">
+        <service id="Kiener\MolliePayments\Controller\Api\PluginConfig\ConfigControllerBase">
             <argument type="service" id="Kiener\MolliePayments\Service\SettingsService"/>
             <argument type="service" id="Shopware\Administration\Snippet\CachedSnippetFinder"/>
             <argument type="service" id="Kiener\MolliePayments\Service\MollieApi\ApiKeyValidator"/>
@@ -18,26 +19,29 @@
             <call method="setContainer">
                 <argument type="service" id="service_container"/>
             </call>
+            <tag name="controller.service_arguments"/>
         </service>
 
-        <service id="Kiener\MolliePayments\Controller\Api\PaymentMethod\Sw6\PaymentMethodController" public="true">
+        <service id="Kiener\MolliePayments\Controller\Api\PaymentMethod\PaymentMethodControllerBase">
             <argument type="service" id="Kiener\MolliePayments\Service\PaymentMethodService"/>
             <argument type="service" id="mollie_payments.logger"/>
 
             <call method="setContainer">
                 <argument type="service" id="service_container"/>
             </call>
+            <tag name="controller.service_arguments"/>
         </service>
 
-        <service id="Kiener\MolliePayments\Controller\Api\Order\Sw6\OrderController" public="true">
+        <service id="Kiener\MolliePayments\Controller\Api\Order\OrderControllerBase">
             <argument type="service" id="Kiener\MolliePayments\Service\OrderService"/>
             <argument type="service" id="Kiener\MolliePayments\Service\MollieApi\Order"/>
             <call method="setContainer">
                 <argument type="service" id="service_container"/>
             </call>
+            <tag name="controller.service_arguments"/>
         </service>
 
-        <service id="Kiener\MolliePayments\Controller\Api\Order\Sw6\RefundController" public="true">
+        <service id="Kiener\MolliePayments\Controller\Api\Order\RefundControllerBase">
             <argument type="service" id="Kiener\MolliePayments\Service\OrderService"/>
             <argument type="service" id="Kiener\MolliePayments\Components\RefundManager\RefundManager"/>
             <argument type="service" id="Kiener\MolliePayments\Service\Refund\RefundService"/>
@@ -45,9 +49,10 @@
             <call method="setContainer">
                 <argument type="service" id="service_container"/>
             </call>
+            <tag name="controller.service_arguments"/>
         </service>
 
-        <service id="Kiener\MolliePayments\Controller\Api\Order\Sw6\ShippingController" public="true">
+        <service id="Kiener\MolliePayments\Controller\Api\Order\ShippingControllerBase">
             <argument type="service" id="Kiener\MolliePayments\Components\ShipmentManager\ShipmentManager"/>
             <argument type="service" id="Kiener\MolliePayments\Service\OrderService"/>
             <argument type="service" id="mollie_payments.logger"/>
@@ -55,25 +60,28 @@
             <call method="setContainer">
                 <argument type="service" id="service_container"/>
             </call>
+            <tag name="controller.service_arguments"/>
         </service>
 
-        <service id="Kiener\MolliePayments\Controller\Api\Support\Sw6\SupportController" public="true">
+        <service id="Kiener\MolliePayments\Controller\Api\Support\SupportControllerBase" >
             <argument type="service" id="Kiener\MolliePayments\Facade\MollieSupportFacade"/>
             <argument type="service" id="mollie_payments.logger"/>
 
             <call method="setContainer">
                 <argument type="service" id="service_container"/>
             </call>
+            <tag name="controller.service_arguments"/>
         </service>
 
-        <service id="Kiener\MolliePayments\Controller\Api\Payment\Sw6\ReturnController" public="true">
+        <service id="Kiener\MolliePayments\Controller\Api\Payment\ReturnControllerBase" >
             <argument type="service" id="Kiener\MolliePayments\Facade\Controller\PaymentReturnFacade"/>
             <call method="setContainer">
                 <argument type="service" id="service_container"/>
             </call>
+            <tag name="controller.service_arguments"/>
         </service>
 
-        <service id="Kiener\MolliePayments\Controller\Api\Webhook\Sw6\WebhookController" public="true">
+        <service id="Kiener\MolliePayments\Controller\Api\Webhook\WebhookControllerBase" >
             <argument type="service" id="Kiener\MolliePayments\Controller\Storefront\Webhook\NotificationFacade"/>
             <argument type="service" id="Kiener\MolliePayments\Components\Subscription\SubscriptionManager"/>
             <argument type="service" id="Kiener\MolliePayments\Repository\Order\OrderRepository"/>
@@ -82,19 +90,29 @@
             <call method="setContainer">
                 <argument type="service" id="service_container"/>
             </call>
+            <tag name="controller.service_arguments"/>
+        </service>
+
+        <service id="Kiener\MolliePayments\Controller\Api\Subscription\SubscriptionControllerBase">
+            <argument type="service" id="Kiener\MolliePayments\Components\Subscription\SubscriptionManager"/>
+            <call method="setContainer">
+                <argument type="service" id="service_container"/>
+            </call>
+            <tag name="controller.service_arguments"/>
         </service>
 
         <!-- ////////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
         <!-- Storefront Controller -->
 
-        <service id="Kiener\MolliePayments\Controller\Storefront\Payment\Sw6\ReturnController" public="true">
+        <service id="Kiener\MolliePayments\Controller\Storefront\Payment\ReturnControllerBase" >
             <argument type="service" id="Kiener\MolliePayments\Facade\Controller\PaymentReturnFacade"/>
             <call method="setContainer">
                 <argument type="service" id="service_container"/>
             </call>
+            <tag name="controller.service_arguments"/>
         </service>
 
-        <service id="Kiener\MolliePayments\Controller\Storefront\Payment\Sw6\MollieFailureController" public="true">
+        <service id="Kiener\MolliePayments\Controller\Storefront\Payment\MollieFailureControllerBase" >
             <argument type="service" id="router"/>
             <argument type="service" id="Kiener\MolliePayments\Compatibility\Gateway\CompatibilityGateway"/>
             <argument type="service" id="Kiener\MolliePayments\Factory\MollieApiFactory"/>
@@ -110,9 +128,10 @@
             <call method="setContainer">
                 <argument type="service" id="service_container"/>
             </call>
+            <tag name="controller.service_arguments"/>
         </service>
 
-        <service id="Kiener\MolliePayments\Controller\Storefront\Webhook\Sw6\WebhookController" public="true">
+        <service id="Kiener\MolliePayments\Controller\Storefront\Webhook\WebhookControllerBase">
             <argument type="service" id="Kiener\MolliePayments\Controller\Storefront\Webhook\NotificationFacade"/>
             <argument type="service" id="Kiener\MolliePayments\Components\Subscription\SubscriptionManager"/>
             <argument type="service" id="Kiener\MolliePayments\Repository\Order\OrderRepository"/>
@@ -121,25 +140,28 @@
             <call method="setContainer">
                 <argument type="service" id="service_container"/>
             </call>
+            <tag name="controller.service_arguments"/>
         </service>
 
-        <service id="Kiener\MolliePayments\Controller\Storefront\CreditCard\Sw6\CreditCardController" public="true">
+        <service id="Kiener\MolliePayments\Controller\Storefront\CreditCard\CreditCardControllerBase" >
             <argument type="service" id="Kiener\MolliePayments\Service\CustomerService"/>
             <argument type="service" id="Kiener\MolliePayments\Service\MandateService"/>
             <argument type="service" id="mollie_payments.logger"/>
             <call method="setContainer">
                 <argument type="service" id="service_container"/>
             </call>
+            <tag name="controller.service_arguments"/>
         </service>
 
-        <service id="Kiener\MolliePayments\Controller\Storefront\iDEAL\Sw6\iDealController" public="true">
+        <service id="Kiener\MolliePayments\Controller\Storefront\iDEAL\iDealControllerBase" >
             <argument type="service" id="Kiener\MolliePayments\Service\CustomerService"/>
             <call method="setContainer">
                 <argument type="service" id="service_container"/>
             </call>
+            <tag name="controller.service_arguments"/>
         </service>
 
-        <service id="Kiener\MolliePayments\Controller\Storefront\POS\Sw6\PosController" public="true">
+        <service id="Kiener\MolliePayments\Controller\Storefront\POS\PosControllerBase">
             <argument type="service" id="Kiener\MolliePayments\Service\CustomerService"/>
             <argument type="service" id="Kiener\MolliePayments\Gateway\Mollie\MollieGateway"/>
             <argument type="service" id="Shopware\Storefront\Framework\Routing\Router"/>
@@ -149,10 +171,10 @@
             <call method="setContainer">
                 <argument type="service" id="service_container"/>
             </call>
+            <tag name="controller.service_arguments"/>
         </service>
 
-        <service id="Kiener\MolliePayments\Controller\Storefront\ApplePayDirect\Sw6\ApplePayDirectController"
-                 public="true">
+        <service id="Kiener\MolliePayments\Controller\Storefront\ApplePayDirect\ApplePayDirectControllerBase">
             <argument type="service" id="Kiener\MolliePayments\Components\ApplePayDirect\ApplePayDirect"/>
             <argument type="service" id="router"/>
             <argument type="service" id="mollie_payments.logger"/>
@@ -166,16 +188,11 @@
             <call method="setContainer">
                 <argument type="service" id="service_container"/>
             </call>
+            <tag name="controller.service_arguments"/>
         </service>
 
-        <service id="Kiener\MolliePayments\Controller\Api\Subscription\Sw6\SubscriptionController" public="true">
-            <argument type="service" id="Kiener\MolliePayments\Components\Subscription\SubscriptionManager"/>
-            <call method="setContainer">
-                <argument type="service" id="service_container"/>
-            </call>
-        </service>
 
-        <service id="Kiener\MolliePayments\Controller\Storefront\Account\Sw6\AccountController" public="true">
+        <service id="Kiener\MolliePayments\Controller\Storefront\Account\AccountControllerBase">
             <argument type="service"
                       id="Kiener\MolliePayments\Components\Subscription\Page\Account\SubscriptionPageLoader"/>
             <argument type="service" id="Kiener\MolliePayments\Components\Subscription\SubscriptionManager"/>
@@ -183,45 +200,52 @@
             <call method="setContainer">
                 <argument type="service" id="service_container"/>
             </call>
+            <tag name="controller.service_arguments"/>
         </service>
 
         <!-- ////////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
         <!-- Store API Controller -->
 
-        <service id="Kiener\MolliePayments\Controller\StoreApi\Config\Sw6\ConfigController" public="true">
+        <service id="Kiener\MolliePayments\Controller\StoreApi\Config\ConfigControllerBase">
             <argument type="service" id="Kiener\MolliePayments\Service\SettingsService"/>
             <argument type="service" id="Kiener\MolliePayments\Service\ConfigService"/>
             <argument type="service" id="Kiener\MolliePayments\Service\SalesChannel\SalesChannelLocale"/>
             <argument type="service" id="mollie_payments.logger"/>
+            <tag name="controller.service_arguments"/>
         </service>
 
-        <service id="Kiener\MolliePayments\Controller\StoreApi\ApplePayDirect\Sw6\ApplePayDirectController"
-                 public="true">
+        <service id="Kiener\MolliePayments\Controller\StoreApi\ApplePayDirect\ApplePayDirectControllerBase">
             <argument type="service" id="Kiener\MolliePayments\Components\ApplePayDirect\ApplePayDirect"/>
             <argument type="service" id="mollie_payments.logger"/>
+            <tag name="controller.service_arguments"/>
         </service>
 
-        <service id="Kiener\MolliePayments\Controller\StoreApi\CreditCard\Sw6\CreditCardController" public="true">
+        <service id="Kiener\MolliePayments\Controller\StoreApi\CreditCard\CreditCardControllerBase">
             <argument type="service" id="Kiener\MolliePayments\Service\CustomerService"/>
             <argument type="service" id="Kiener\MolliePayments\Service\MandateService"/>
+            <tag name="controller.service_arguments"/>
         </service>
 
-        <service id="Kiener\MolliePayments\Controller\StoreApi\iDEAL\Sw6\iDealController" public="true">
+        <service id="Kiener\MolliePayments\Controller\StoreApi\iDEAL\iDealControllerBase">
             <argument type="service" id="Kiener\MolliePayments\Service\CustomerService"/>
             <argument type="service" id="Kiener\MolliePayments\Gateway\Mollie\MollieGateway"/>
+            <tag name="controller.service_arguments"/>
         </service>
 
-        <service id="Kiener\MolliePayments\Controller\StoreApi\Subscription\Sw6\SubscriptionController" public="true">
+        <service id="Kiener\MolliePayments\Controller\StoreApi\Subscription\SubscriptionControllerBase">
             <argument type="service" id="Kiener\MolliePayments\Components\Subscription\SubscriptionManager"/>
             <argument type="service"
                       id="Kiener\MolliePayments\Components\Subscription\DAL\Repository\SubscriptionRepository"/>
             <argument type="service" id="mollie_payments.logger"/>
+            <tag name="controller.service_arguments"/>
         </service>
 
-        <service id="Kiener\MolliePayments\Controller\StoreApi\POS\Sw6\PosController" public="true">
+        <service id="Kiener\MolliePayments\Controller\StoreApi\POS\PosControllerBase">
             <argument type="service" id="Kiener\MolliePayments\Service\CustomerService"/>
             <argument type="service" id="Kiener\MolliePayments\Gateway\Mollie\MollieGateway"/>
+            <tag name="controller.service_arguments"/>
         </service>
 
     </services>
-</container>
+
+</container>
\ No newline at end of file
diff --git a/src/Resources/config/services/repositories.xml b/src/Resources/config/services/repositories.xml
index 710b18f78..29163ce72 100644
--- a/src/Resources/config/services/repositories.xml
+++ b/src/Resources/config/services/repositories.xml
@@ -89,6 +89,11 @@
             <argument type="service" id="mollie_subscription_history.repository"/>
         </service>
 
+        <service id="Kiener\MolliePayments\Repository\StateMachineState\StateMachineStateRepository">
+            <argument type="service" id="state_machine_state.repository"/>
+        </service>
+
+
 
     </services>
 </container>
diff --git a/src/Resources/config/services/services.xml b/src/Resources/config/services/services.xml
index f2859303a..0007e36d9 100644
--- a/src/Resources/config/services/services.xml
+++ b/src/Resources/config/services/services.xml
@@ -120,13 +120,14 @@
             <argument type="service" id="Kiener\MolliePayments\Service\Order\OrderStateService"/>
             <argument type="service" id="Kiener\MolliePayments\Repository\Order\OrderRepository"/>
             <argument type="service" id="Kiener\MolliePayments\Service\Transition\TransactionTransitionService"/>
+            <argument type="service" id="Kiener\MolliePayments\Repository\StateMachineState\StateMachineStateRepository"/>
             <argument type="service" id="mollie_payments.logger"/>
         </service>
 
         <service id="Kiener\MolliePayments\Service\CartService" class="Kiener\MolliePayments\Service\CartService" public="true">
             <argument type="service" id="Shopware\Core\Checkout\Cart\SalesChannel\CartService"/>
             <argument type="service" id="Shopware\Core\System\SalesChannel\SalesChannel\SalesChannelContextSwitcher"/>
-            <argument type="service" id="Shopware\Core\Content\Product\Cart\ProductLineItemFactory"/>
+            <argument type="service" id="Shopware\Core\Checkout\Cart\LineItemFactoryHandler\ProductLineItemFactory"/>
             <argument type="service" id="Kiener\MolliePayments\Compatibility\Gateway\CompatibilityGateway"/>
         </service>
 
diff --git a/src/Resources/config/compatibility/snippets.xml b/src/Resources/config/services/snippets.xml
similarity index 100%
rename from src/Resources/config/compatibility/snippets.xml
rename to src/Resources/config/services/snippets.xml
diff --git a/src/Resources/config/services/subscription/services.xml b/src/Resources/config/services/subscription/services.xml
index 3319e5aab..4e07bfcea 100755
--- a/src/Resources/config/services/subscription/services.xml
+++ b/src/Resources/config/services/subscription/services.xml
@@ -37,6 +37,11 @@
             <tag name="shopware.entity.extension"/>
         </service>
 
+        <service id="Kiener\MolliePayments\Components\Subscription\DAL\Currency\CurrencyExtension">
+            <tag name="shopware.entity.extension"/>
+        </service>
+
+
 
         <service id="Kiener\MolliePayments\Components\Subscription\DAL\Subscription\Enricher\LiveDataEnricher">
             <argument type="service" id="Kiener\MolliePayments\Service\SettingsService"/>
diff --git a/src/Resources/snippet/de_DE/SnippetFile_de_DE_65.php b/src/Resources/snippet/de_DE/SnippetFile_de_DE_65.php
deleted file mode 100644
index e56b519ee..000000000
--- a/src/Resources/snippet/de_DE/SnippetFile_de_DE_65.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Kiener\MolliePayments\Resources\snippet\de_DE;
-
-use Shopware\Core\System\Snippet\Files\AbstractSnippetFile;
-
-class SnippetFile_de_DE_65 extends AbstractSnippetFile
-{
-
-    public function getName(): string
-    {
-        return 'mollie-payments.de-DE';
-    }
-
-    public function getTechnicalName(): string
-    {
-        return $this->getName();
-    }
-
-    public function getPath(): string
-    {
-        return __DIR__ . '/mollie-payments.de-DE.json';
-    }
-
-    public function getIso(): string
-    {
-        return 'de-DE';
-    }
-
-    public function getAuthor(): string
-    {
-        return 'Mollie B.V.';
-    }
-
-    public function isBase(): bool
-    {
-        return false;
-    }
-
-}
diff --git a/src/Resources/snippet/en_GB/SnippetFile_en_GB.php b/src/Resources/snippet/en_GB/SnippetFile_en_GB.php
index baadf35c3..8442af31b 100644
--- a/src/Resources/snippet/en_GB/SnippetFile_en_GB.php
+++ b/src/Resources/snippet/en_GB/SnippetFile_en_GB.php
@@ -2,9 +2,10 @@
 
 namespace Kiener\MolliePayments\Resources\snippet\en_GB;
 
+use Shopware\Core\System\Snippet\Files\AbstractSnippetFile;
 use Shopware\Core\System\Snippet\Files\SnippetFileInterface;
 
-class SnippetFile_en_GB implements SnippetFileInterface
+class SnippetFile_en_GB extends AbstractSnippetFile implements SnippetFileInterface
 {
     public function getName(): string
     {
diff --git a/src/Resources/snippet/en_GB/SnippetFile_en_GB_65.php b/src/Resources/snippet/en_GB/SnippetFile_en_GB_65.php
deleted file mode 100644
index f0214d415..000000000
--- a/src/Resources/snippet/en_GB/SnippetFile_en_GB_65.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Kiener\MolliePayments\Resources\snippet\en_GB;
-
-use Shopware\Core\System\Snippet\Files\AbstractSnippetFile;
-
-class SnippetFile_en_GB_65 extends AbstractSnippetFile
-{
-    public function getName(): string
-    {
-        return 'mollie-payments.en-GB';
-    }
-
-    public function getTechnicalName(): string
-    {
-        return $this->getName();
-    }
-
-    public function getPath(): string
-    {
-        return __DIR__ . '/mollie-payments.en-GB.json';
-    }
-
-    public function getIso(): string
-    {
-        return 'en-GB';
-    }
-
-    public function getAuthor(): string
-    {
-        return 'Mollie B.V.';
-    }
-
-    public function isBase(): bool
-    {
-        return false;
-    }
-}
diff --git a/src/Resources/snippet/nl_NL/SnippetFile_nl_NL_65.php b/src/Resources/snippet/nl_NL/SnippetFile_nl_NL_65.php
deleted file mode 100644
index 9260ca2ae..000000000
--- a/src/Resources/snippet/nl_NL/SnippetFile_nl_NL_65.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Kiener\MolliePayments\Resources\snippet\nl_NL;
-
-use Shopware\Core\System\Snippet\Files\AbstractSnippetFile;
-
-class SnippetFile_nl_NL_65 extends AbstractSnippetFile
-{
-    public function getName(): string
-    {
-        return 'mollie-payments.nl-NL';
-    }
-
-    public function getTechnicalName(): string
-    {
-        return $this->getName();
-    }
-
-    public function getPath(): string
-    {
-        return __DIR__ . '/mollie-payments.nl-NL.json';
-    }
-
-    public function getIso(): string
-    {
-        return 'nl-NL';
-    }
-
-    public function getAuthor(): string
-    {
-        return 'Mollie B.V.';
-    }
-
-    public function isBase(): bool
-    {
-        return false;
-    }
-}
diff --git a/src/Resources/views/storefront/component/line-item/type/product.html.twig b/src/Resources/views/storefront/component/line-item/type/product.html.twig
index 7a0dd8f97..db344da60 100644
--- a/src/Resources/views/storefront/component/line-item/type/product.html.twig
+++ b/src/Resources/views/storefront/component/line-item/type/product.html.twig
@@ -8,4 +8,14 @@
             {{ lineItem.extensions.mollieSubscription.translatedInterval }}
         </div>
     {% endif %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+
+{% block component_line_item_type_product_number %}
+    {{ parent() }}
+    {% if  lineItem.extensions.mollieSubscription.isSubscriptionProduct %}
+        <div class="line-item-product-number">
+            {{ lineItem.extensions.mollieSubscription.translatedInterval }}
+        </div>
+    {% endif %}
+{% endblock %}
+
diff --git a/src/Resources/views/storefront/component/payment/payment-method.html.twig b/src/Resources/views/storefront/component/payment/payment-method.html.twig
index af3746b8b..cc2b689dc 100644
--- a/src/Resources/views/storefront/component/payment/payment-method.html.twig
+++ b/src/Resources/views/storefront/component/payment/payment-method.html.twig
@@ -12,6 +12,8 @@
 
 
 {% block component_payment_method_description %}
+
+
     {% if "MolliePayments" in payment.handlerIdentifier and page.extensions.MollieTestModePageExtension.testMode == true %}
         <div class="payment-method-description">
             <strong>{{ payment.translated.name }} ({{ "molliePayments.testMode.label"|trans }})</strong>
diff --git a/src/Service/CartService.php b/src/Service/CartService.php
index ce91264af..e62c5f2c3 100644
--- a/src/Service/CartService.php
+++ b/src/Service/CartService.php
@@ -5,8 +5,8 @@
 use Kiener\MolliePayments\Compatibility\Gateway\CompatibilityGateway;
 use Kiener\MolliePayments\Compatibility\Gateway\CompatibilityGatewayInterface;
 use Shopware\Core\Checkout\Cart\Cart;
+use Shopware\Core\Checkout\Cart\LineItemFactoryHandler\ProductLineItemFactory;
 use Shopware\Core\Checkout\Cart\SalesChannel\CartService as SalesChannelCartService;
-use Shopware\Core\Content\Product\Cart\ProductLineItemFactory;
 use Shopware\Core\Framework\Validation\DataBag\DataBag;
 use Shopware\Core\System\SalesChannel\Context\SalesChannelContextService;
 use Shopware\Core\System\SalesChannel\SalesChannel\SalesChannelContextSwitcher;
@@ -59,8 +59,12 @@ public function __construct(SalesChannelCartService $swCartService, SalesChannel
     public function addProduct(string $productId, int $quantity, SalesChannelContext $context): Cart
     {
         $cart = $this->getCalculatedMainCart($context);
-
-        $productItem = $this->productItemFactory->create($productId, ['quantity' => $quantity]);
+        $data = [
+            'id' => $productId,
+            'referencedId' => $productId,
+            'quantity' => $quantity
+        ];
+        $productItem = $this->productItemFactory->create($data, $context);
 
         return $this->swCartService->add($cart, $productItem, $context);
     }
diff --git a/src/Service/Order/OrderStatusUpdater.php b/src/Service/Order/OrderStatusUpdater.php
index 069a36127..a3ac1754e 100644
--- a/src/Service/Order/OrderStatusUpdater.php
+++ b/src/Service/Order/OrderStatusUpdater.php
@@ -4,6 +4,8 @@
 
 use Kiener\MolliePayments\Repository\Order\OrderRepository;
 use Kiener\MolliePayments\Repository\Order\OrderRepositoryInterface;
+use Kiener\MolliePayments\Repository\OrderTransaction\OrderTransactionRepositoryInterface;
+use Kiener\MolliePayments\Repository\StateMachineState\StateMachineStateRepositoryInterface;
 use Kiener\MolliePayments\Service\Mollie\MolliePaymentStatus;
 use Kiener\MolliePayments\Service\Transition\TransactionTransitionServiceInterface;
 use Kiener\MolliePayments\Setting\MollieSettingStruct;
@@ -31,11 +33,17 @@ class OrderStatusUpdater
      */
     private $transactionTransitionService;
 
+
     /**
      * @var LoggerInterface
      */
     private $logger;
 
+    /**
+     * @var StateMachineStateRepositoryInterface
+     */
+    private $stateMachineStateRepository;
+
 
     /**
      * @param OrderStateService $orderHandler
@@ -43,12 +51,14 @@ class OrderStatusUpdater
      * @param TransactionTransitionServiceInterface $transactionTransitionService
      * @param LoggerInterface $logger
      */
-    public function __construct(OrderStateService $orderHandler, OrderRepositoryInterface $repoOrders, TransactionTransitionServiceInterface $transactionTransitionService, LoggerInterface $logger)
+    public function __construct(OrderStateService $orderHandler, OrderRepositoryInterface $repoOrders, TransactionTransitionServiceInterface $transactionTransitionService, StateMachineStateRepositoryInterface $stateMachineStateRepository, LoggerInterface $logger)
     {
         $this->orderHandler = $orderHandler;
         $this->repoOrders = $repoOrders;
         $this->transactionTransitionService = $transactionTransitionService;
         $this->logger = $logger;
+
+        $this->stateMachineStateRepository = $stateMachineStateRepository;
     }
 
 
@@ -63,13 +73,17 @@ public function updatePaymentStatus(OrderTransactionEntity $transaction, string
     {
         $currentShopwareState = $transaction->getStateMachineState();
 
-        if (!$currentShopwareState instanceof StateMachineStateEntity) {
-            return;
+
+        if (! $currentShopwareState instanceof StateMachineStateEntity) {
+            $currentShopwareState = $this->stateMachineStateRepository->findByStateId($transaction->getStateId(), $context);
+            if (! $currentShopwareState instanceof StateMachineStateEntity) {
+                return;
+            }
         }
 
         $order = $transaction->getOrder();
 
-        if (!$order instanceof OrderEntity) {
+        if (! $order instanceof OrderEntity) {
             return;
         }
 
@@ -171,7 +185,7 @@ public function updateOrderStatus(OrderEntity $order, string $statusTo, MollieSe
 
         # let's check if we have configured a final order state.
         # if so, we need to verify, if a transition is even allowed
-        if (!empty($settings->getOrderStateFinalState())) {
+        if (! empty($settings->getOrderStateFinalState())) {
             $currentId = ($stateMachine instanceof StateMachineStateEntity) ? $stateMachine->getId() : '';
 
             # test if our current order does already have
@@ -186,7 +200,7 @@ public function updateOrderStatus(OrderEntity $order, string $statusTo, MollieSe
                 # once our final state is reached, we only allow transitions
                 # to chargebacks and refunds.
                 # all other transitions will not happen.
-                if (!in_array($statusTo, $allowedList)) {
+                if (! in_array($statusTo, $allowedList)) {
                     return;
                 }
             }
diff --git a/src/Subscriber/KernelSubscriber.php b/src/Subscriber/KernelSubscriber.php
new file mode 100644
index 000000000..59b0a1364
--- /dev/null
+++ b/src/Subscriber/KernelSubscriber.php
@@ -0,0 +1,38 @@
+<?php
+declare(strict_types=1);
+
+namespace Kiener\MolliePayments\Subscriber;
+
+use Shopware\Core\Framework\Routing\Annotation\RouteScope;
+use Shopware\Core\PlatformRequest;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpKernel\Event\ControllerEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+class KernelSubscriber implements EventSubscriberInterface
+{
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            KernelEvents::CONTROLLER => 'onModifyRouteScope'
+        ];
+    }
+
+    public function onModifyRouteScope(ControllerEvent $event): void
+    {
+        $attributes = $event->getRequest()->attributes;
+
+        /** @var null|RouteScope|string $routeScopeValue */
+        $routeScopeValue = $attributes->get(PlatformRequest::ATTRIBUTE_ROUTE_SCOPE);
+
+        if (is_string($routeScopeValue)) {
+            $routeScope = [$routeScopeValue];
+            
+            if (class_exists(RouteScope::class)) {
+                $routeScope = new RouteScope(['scopes' => [$routeScopeValue]]);
+            }
+
+            $attributes->set(PlatformRequest::ATTRIBUTE_ROUTE_SCOPE, $routeScope);
+        }
+    }
+}
diff --git a/switch-composer.php b/switch-composer.php
index 83b073117..35cdb52ad 100644
--- a/switch-composer.php
+++ b/switch-composer.php
@@ -8,7 +8,7 @@
 
 
 // >= 6.4.0.0 
-const SW_VERSIONS_RELEASE = '6.4.0.0 - 6.6.0.0';
+const SW_VERSIONS_RELEASE = '6.4.0.0 - 6.7.0.0';
 const SW_VERSIONS_DEV = '*';
 
 
diff --git a/tests/Cypress/cypress/e2e/admin/plugin-config.cy.js b/tests/Cypress/cypress/e2e/admin/plugin-config.cy.js
index f3a48d086..398ec69de 100644
--- a/tests/Cypress/cypress/e2e/admin/plugin-config.cy.js
+++ b/tests/Cypress/cypress/e2e/admin/plugin-config.cy.js
@@ -64,19 +64,19 @@ context("Plugin Config", () => {
             cy.contains('Request support from Mollie');
 
             // the modal should show the Shopware version number
-            cy.contains("v" + shopware.getVersion());
+            cy.contains("v" + shopware.getDisplayedVersion());
 
             // the send button is disabled until data is filled in
             cy.get('.sw-button-process').should('be.disabled');
 
             // now fill in our data
-            cy.get('#sw-field--name').type('John');
-            cy.get('#sw-field--email').type('test@localhost.com');
-            cy.get('#sw-field--subject').type('Cypress Test Request');
-            cy.get('.sw-text-editor').type('This is an automated request by Cypress and should not be sent.');
+            cy.get('.input-name input').type('John');
+            cy.get('.input-email input').type('test@localhost.com');
+            cy.get('.input-subject input').type('Cypress Test Request');
+            cy.get('.input-message [contenteditable="true"]').type('This is an automated request by Cypress and should not be sent.');
 
             // now click somewhere else
-            cy.get('#sw-field--name').click();
+            cy.get('.input-name input').click();
 
             // the send button should be enabled now
             cy.get('.sw-button-process').should('not.be.disabled');
diff --git a/tests/Cypress/cypress/support/actions/admin/AdminLoginAction.js b/tests/Cypress/cypress/support/actions/admin/AdminLoginAction.js
index 8b76a678e..baf876a86 100644
--- a/tests/Cypress/cypress/support/actions/admin/AdminLoginAction.js
+++ b/tests/Cypress/cypress/support/actions/admin/AdminLoginAction.js
@@ -9,12 +9,17 @@ export default class AdminLoginAction {
         // otherwise we don't see a lot (page height)
         cy.viewport(1920, 1500);
 
+
+
+
         cy.visit('/admin');
 
         cy.get('#sw-field--username').type('admin');
         cy.get('#sw-field--password').type('shopware');
 
+        cy.intercept('/admin').as('admin');
         cy.get('.sw-button').click();
+        cy.wait('@admin');
     }
 
 }
diff --git a/tests/Cypress/cypress/support/actions/admin/AdminOrdersAction.js b/tests/Cypress/cypress/support/actions/admin/AdminOrdersAction.js
index 8c25e7251..e67a108db 100644
--- a/tests/Cypress/cypress/support/actions/admin/AdminOrdersAction.js
+++ b/tests/Cypress/cypress/support/actions/admin/AdminOrdersAction.js
@@ -17,11 +17,12 @@ export default class AdminOrdersAction {
      *
      */
     openOrders() {
-        cy.wait(1000);
+        cy.intercept('**').as('page')
         repoMainMenu.getOrders().click({force: true});
-        cy.wait(1000);
+        cy.wait('@page');
+        cy.intercept('**').as('page')
         repoMainMenu.getOrdersOverview().click({force: true});
-        cy.wait(4000);
+        cy.wait('@page');
     }
 
     /**
@@ -36,18 +37,17 @@ export default class AdminOrdersAction {
      *
      */
     openRefundManager() {
-        cy.wait(1000);
+        cy.intercept('**').as('page')
 
         if (shopware.isVersionLower('6.5')) {
             // forceClick because if a Shopware update exists, that dialog is above our button
             repoOrdersDetails.getMollieActionsButton().click({force: true, waitForAnimations: false});
         }
 
-        cy.wait(2000);
         repoOrdersDetails.getMollieRefundManagerButton().click({force: true, waitForAnimations: false});
         // here are automatic reloads and things as it seems
         // I really want to test the real UX, so we just wait like a human
-        cy.wait(4000);
+        cy.wait('@page');
     }
 
 
@@ -59,7 +59,6 @@ export default class AdminOrdersAction {
 
         this.openOrders();
 
-        cy.wait(800);
 
         // match with case-insensitive option because shopware
         // switched from "In progress" to "In Progress" with 6.4.11.0 for example
@@ -74,7 +73,6 @@ export default class AdminOrdersAction {
 
         this.openOrders();
 
-        cy.wait(800);
         cy.contains(repoOrdersList.getLatestPaymentStatusLabelSelector(), status);
     }
 
@@ -82,10 +80,10 @@ export default class AdminOrdersAction {
      *
      */
     openShipThroughMollie() {
-
+        cy.intercept('**').as('page')
         if (shopware.isVersionLower('6.5')) {
             repoOrdersDetails.getMollieActionsButton().click({force: true});
-            cy.wait(2000);
+            cy.wait('@page');
         }
 
         repoOrdersDetails.getMollieActionButtonShipThroughMollie().should('not.have.class', 'sw-button--disabled');
@@ -93,7 +91,7 @@ export default class AdminOrdersAction {
 
         // here are automatic reloads and things as it seems
         // I really want to test the real UX, so we just wait like a human
-        cy.wait(4000);
+        cy.wait('@page');
     }
 
     /**
@@ -102,8 +100,8 @@ export default class AdminOrdersAction {
      */
     openLineItemShipping(nthItem) {
 
-        cy.wait(2000);
 
+        cy.intercept('**').as('page')
         repoOrdersDetails.getLineItemActionsButton(nthItem).click({force: true})
 
         repoOrdersDetails.getLineItemActionsButtonShipThroughMollie().should('not.have.class', 'is--disabled');
@@ -112,7 +110,7 @@ export default class AdminOrdersAction {
 
         // here are automatic reloads and things as it seems
         // I really want to test the real UX, so we just wait like a human
-        cy.wait(4000);
+        cy.wait('@page');
     }
 
     /**
@@ -120,35 +118,35 @@ export default class AdminOrdersAction {
      * @param trackingCode
      */
     setTrackingCode(trackingCode) {
-
+        cy.intercept('**').as('page')
         if (shopware.isVersionLower('6.5')) {
             repoOrdersDetails.getEditButton().click();
         }
 
-        cy.wait(2000);
+
 
         // Tracking Code is added on OrderDetails Tab, therefore we need to open a new tab first
         // and navigating back after tracking code is set. since 6.5
         if (shopware.isVersionGreaterEqual('6.5')) {
-            cy.wait(1000);
+
             repoOrdersDetails.getOrderDetailsTab().click();
         }
 
         repoOrdersDetails.getTrackingCode(trackingCode).type(trackingCode, forceOption);
         repoOrdersDetails.getTrackingCodeAddButton().click();
 
-        cy.wait(1000);
+
 
         repoOrdersDetails.getSaveButton().click();
 
         if (shopware.isVersionGreaterEqual('6.5')) {
-            cy.wait(2000);
+
             repoOrdersDetails.getOrderDetailsGeneralTab().click();
         }
 
         // here are automatic reloads and things as it seems
         // I really want to test the real UX, so we just wait like a human
-        cy.wait(4000);
+        cy.wait('@page');
     }
 
     addTrackingCodeToLineItem(quantity, shippingMethodName, trackingCode) {
diff --git a/tests/Cypress/cypress/support/actions/admin/AdminPluginAction.js b/tests/Cypress/cypress/support/actions/admin/AdminPluginAction.js
index 5daef65a8..a4c2c9e0a 100644
--- a/tests/Cypress/cypress/support/actions/admin/AdminPluginAction.js
+++ b/tests/Cypress/cypress/support/actions/admin/AdminPluginAction.js
@@ -9,19 +9,20 @@ export default class AdminPluginAction {
      *
      */
     openPluginConfiguration() {
-
+        cy.intercept('**').as('admin');
         if (shopware.isVersionGreaterEqual('6.4')) {
             cy.visit('/admin#/sw/extension/config/MolliePayments');
         } else {
             cy.visit('/admin#/sw/plugin/settings/MolliePayments');
         }
 
-        cy.wait(4000);
+        cy.wait('@admin');
     }
 
     savePlugConfiguration() {
+        cy.intercept('**').as('admin');
         cy.get('.sw-extension-config__save-action').click();
-        cy.wait(4000);
+        cy.wait('@admin');
     }
 
 }
diff --git a/tests/Cypress/cypress/support/actions/admin/RefundManagerAction.js b/tests/Cypress/cypress/support/actions/admin/RefundManagerAction.js
index e45f27095..eb225bce3 100644
--- a/tests/Cypress/cypress/support/actions/admin/RefundManagerAction.js
+++ b/tests/Cypress/cypress/support/actions/admin/RefundManagerAction.js
@@ -21,6 +21,7 @@ export default class RefundManagerAction {
      * @param privateDesc
      */
     fullRefund(publicDesc, privateDesc) {
+        cy.intercept('**').as('page')
         repoRefundManager.getDescription().clear(forceOption).type(publicDesc, forceOption);
 
         if (privateDesc !== null && privateDesc.trim() !== '') {
@@ -33,7 +34,7 @@ export default class RefundManagerAction {
 
         // here are automatic reloads and things as it seems
         // I really want to test the real UX, so we just wait like a human
-        cy.wait(4000);
+        cy.wait('@page');
     }
 
     /**
@@ -42,6 +43,7 @@ export default class RefundManagerAction {
      * @param description
      */
     partialAmountRefund(amount, description) {
+        cy.intercept('**').as('page')
         repoRefundManager.getAmountField().clear(forceOption).type(amount, forceOption);
         repoRefundManager.getDescription().clear(forceOption).type(description, forceOption);
         repoRefundManager.getVerifyCheckbox().click(forceOption);
@@ -49,19 +51,20 @@ export default class RefundManagerAction {
 
         // here are automatic reloads and things as it seems
         // I really want to test the real UX, so we just wait like a human
-        cy.wait(4000);
+        cy.wait('@page');
     }
 
     /**
      *
      */
     cancelPendingRefund() {
+        cy.intercept('**').as('page')
         repoRefundManager.getFirstRefundContextButton().click(forceOption);
         repoRefundManager.getFirstRefundCancelButton().click(forceOption);
 
         // here are automatic reloads and things as it seems
         // I really want to test the real UX, so we just wait like a human
-        cy.wait(4000);
+        cy.wait('@page');
     }
 
     /**
diff --git a/tests/Cypress/cypress/support/actions/store-api/StoreApiLoginAction.js b/tests/Cypress/cypress/support/actions/store-api/StoreApiLoginAction.js
index 021365eca..c8c834e7b 100644
--- a/tests/Cypress/cypress/support/actions/store-api/StoreApiLoginAction.js
+++ b/tests/Cypress/cypress/support/actions/store-api/StoreApiLoginAction.js
@@ -95,7 +95,10 @@ export default class StoreApiLoginAction {
                     );
 
                     cy.wrap(loginPromise).then((response) => {
-                        const loginToken = response.data.contextToken;
+                        let loginToken = response.data.contextToken;
+                        if(loginToken === undefined){
+                            loginToken = response.headers["sw-context-token"];
+                        }
                         this.client.setContextToken(loginToken);
                         cy.log('Context-Token: ' + loginToken);
                     });
diff --git a/tests/Cypress/cypress/support/repositories/admin/refund-manager/RefundManagerRepository.js b/tests/Cypress/cypress/support/repositories/admin/refund-manager/RefundManagerRepository.js
index 00e47c07a..18026d0b6 100644
--- a/tests/Cypress/cypress/support/repositories/admin/refund-manager/RefundManagerRepository.js
+++ b/tests/Cypress/cypress/support/repositories/admin/refund-manager/RefundManagerRepository.js
@@ -6,7 +6,7 @@ export default class RefundManagerRepository {
      * @returns {Cypress.Chainable<JQuery<HTMLElement>>}
      */
     getAmountField() {
-        return cy.get('#sw-field--refundAmount');
+        return cy.get('.refund-amount input');
     }
 
     /**
@@ -22,7 +22,7 @@ export default class RefundManagerRepository {
      * @returns {Cypress.Chainable<JQuery<HTMLElement>>}
      */
     getDescription() {
-        return cy.get('#sw-field--refundDescription');
+        return cy.get('.refund-description textarea');
     }
 
     /**
@@ -30,7 +30,7 @@ export default class RefundManagerRepository {
      * @returns {Cypress.Chainable<JQuery<HTMLElement>>}
      */
     getInternalDescription() {
-        return cy.get('#sw-field--refundInternalDescription');
+        return cy.get('.refund-internal-description textarea');
     }
 
     /**
diff --git a/tests/Cypress/cypress/support/repositories/admin/subscriptions/SubscriptionDetailsRepository.js b/tests/Cypress/cypress/support/repositories/admin/subscriptions/SubscriptionDetailsRepository.js
index 5a65331e8..0efb796fa 100644
--- a/tests/Cypress/cypress/support/repositories/admin/subscriptions/SubscriptionDetailsRepository.js
+++ b/tests/Cypress/cypress/support/repositories/admin/subscriptions/SubscriptionDetailsRepository.js
@@ -1,35 +1,35 @@
 export default class SubscriptionDetailsRepository {
 
     getMollieCustomerIdField() {
-        return cy.get('#sw-field--subscription-mollieCustomerId');
+        return cy.get('.cy-subscription-customer-id input');
     }
 
     getCreatedAtField() {
-        return cy.get('#sw-field--formattedCreateAt');
+        return cy.get('.cy-subscription-formatted-created-at input');
     }
 
     getMollieSubscriptionIdField() {
-        return cy.get('#sw-field--subscription-mollieId');
+        return cy.get('.cy-subscription-mollie-id input');
     }
 
     getMandateField() {
-        return cy.get('#sw-field--subscription-mandateId');
+        return cy.get('.cy-subscription-mandate-id input');
     }
 
     getCanceledAtField() {
-        return cy.get('#sw-field--formattedCanceledAt');
+        return cy.get('.cy-subscription-formatted-canceled-at input');
     }
 
     getStatusField() {
-        return cy.get('#sw-field--translatedStatus');
+        return cy.get('.cy-subscription-translated-status input');
     }
 
     getNextPaymentAtField() {
-        return cy.get('#sw-field--formattedNextPaymentAt');
+        return cy.get('.cy-subscription-formatted-next-payment-at input');
     }
 
     getLastRemindedAtField() {
-        return cy.get('#sw-field--formattedLastRemindedAt');
+        return cy.get('.cy-subscription-formatted-last-reminded-at input');
     }
 
     getPauseButton() {
diff --git a/tests/Cypress/cypress/support/services/shopware/Shopware.js b/tests/Cypress/cypress/support/services/shopware/Shopware.js
index 932c85b7b..ca1b5ac97 100644
--- a/tests/Cypress/cypress/support/services/shopware/Shopware.js
+++ b/tests/Cypress/cypress/support/services/shopware/Shopware.js
@@ -13,6 +13,14 @@ export default class Shopware {
         return Cypress.env().SHOPWARE;
     }
 
+    /**
+     * sometimes we test RC versions, and shopware display the version differently in the admin
+     * @returns {string}
+     */
+    getDisplayedVersion(){
+        return Cypress.env().SHOPWARE.replace('-rc',' RC ');
+    }
+
     /**
      *
      * @returns {string}
diff --git a/tests/PHPUnit/Components/Subscription/Services/Builder/MollieDataBuilderTest.php b/tests/PHPUnit/Components/Subscription/Services/Builder/MollieDataBuilderTest.php
index 7afeb9493..617e5081c 100644
--- a/tests/PHPUnit/Components/Subscription/Services/Builder/MollieDataBuilderTest.php
+++ b/tests/PHPUnit/Components/Subscription/Services/Builder/MollieDataBuilderTest.php
@@ -11,6 +11,7 @@
 use MolliePayments\Tests\Fakes\FakeRouter;
 use MolliePayments\Tests\Traits\BuilderTestTrait;
 use PHPUnit\Framework\TestCase;
+use Shopware\Core\System\Currency\CurrencyEntity;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 
@@ -32,7 +33,9 @@ public function testBuildSubscriptionPayload()
 
         $subscription = new SubscriptionEntity();
         $subscription->setId('ID123');
-        $subscription->setCurrency('USD');
+        $currency = new CurrencyEntity();
+        $currency->setIsoCode('USD');
+        $subscription->setCurrency($currency);
         $subscription->setAmount(10.5);
         $subscription->setDescription('Subscription Product A');