diff --git a/src/Block/Paypal.php b/src/Block/Paypal.php
new file mode 100644
index 0000000..945427f
--- /dev/null
+++ b/src/Block/Paypal.php
@@ -0,0 +1,53 @@
+<?php
+declare(strict_types=1);
+
+namespace Rvvup\PaymentsHyvaCheckout\Block;
+
+use Magento\Checkout\Model\Session;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\View\Element\Template;
+use Magento\Quote\Api\Data\CartInterface;
+use Hyva\Theme\Service\CurrentTheme;
+
+class Paypal extends Template
+{
+    /** @var Session */
+    private $checkoutSession;
+
+    /** @var CurrentTheme */
+    private $theme;
+
+    /**
+     * @param Session $checkoutSession
+     * @param Template\Context $context
+     * @param CurrentTheme $theme
+     * @param array $data
+     */
+    public function __construct(
+        Session $checkoutSession,
+        Template\Context $context,
+        CurrentTheme $theme,
+        array $data = []
+    ) {
+        $this->checkoutSession = $checkoutSession;
+        $this->theme = $theme;
+        parent::__construct($context,$data);
+    }
+
+    /**
+     * @return CartInterface
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     */
+    public function getQuote(): CartInterface
+    {
+        return $this->checkoutSession->getQuote();
+    }
+
+    public function isHyvaThemeUsed(): bool
+    {
+        return (bool)$this->theme->isHyva();
+    }
+
+}
diff --git a/src/Magewire/Product/View/Info/Addtocart.php b/src/Magewire/Product/View/Info/Addtocart.php
index 8ec4aa7..4ae8672 100644
--- a/src/Magewire/Product/View/Info/Addtocart.php
+++ b/src/Magewire/Product/View/Info/Addtocart.php
@@ -17,6 +17,7 @@
 use Magento\Quote\Api\Data\AddressInterfaceFactory;
 use Magento\Quote\Api\Data\CartInterface;
 use Magento\Quote\Api\Data\CartInterfaceFactory;
+use Magento\Quote\Model\ShippingAddressManagementInterface;
 use Magewirephp\Magewire\Component;
 use Rvvup\Payments\Api\ExpressPaymentCreateInterface;
 use Rvvup\Payments\Exception\PaymentValidationException;
@@ -55,12 +56,16 @@ class Addtocart extends Component
     /** @var PayPal  */
     private $payPal;
 
+    /** @var ShippingAddressManagementInterface */
+    private $shippingAddressManagement;
+
     /**
      * @param Session $checkoutSession
      * @param CartInterfaceFactory $cartFactory
      * @param CartRepositoryInterface $cartRepository
      * @param ProductRepositoryInterface $productRepository
      * @param BillingAddressManagementInterface $billingAddressManagement
+     * @param ShippingAddressManagementInterface $shippingAddressManagement
      * @param AddressInterfaceFactory $addressFactory
      * @param HyvaCheckoutSession $hyvaCheckoutSession
      * @param ExpressPaymentCreateInterface $expressPaymentCreate
@@ -72,6 +77,7 @@ public function __construct(
         CartRepositoryInterface $cartRepository,
         ProductRepositoryInterface $productRepository,
         BillingAddressManagementInterface $billingAddressManagement,
+        ShippingAddressManagementInterface $shippingAddressManagement,
         AddressInterfaceFactory $addressFactory,
         HyvaCheckoutSession $hyvaCheckoutSession,
         ExpressPaymentCreateInterface $expressPaymentCreate,
@@ -82,6 +88,7 @@ public function __construct(
         $this->cartRepository = $cartRepository;
         $this->productRepository = $productRepository;
         $this->billingAddressManagement = $billingAddressManagement;
+        $this->shippingAddressManagement = $shippingAddressManagement;
         $this->addressFactory = $addressFactory;
         $this->hyvaCheckoutSession = $hyvaCheckoutSession;
         $this->expressPaymentCreate = $expressPaymentCreate;
@@ -90,20 +97,27 @@ public function __construct(
 
     /**
      * @param string $method
-     * @param string $addToCartRequest
+     * @param string|null $addToCartRequest
+     * @param bool $isCart
      * @return void
-     * @throws NoSuchEntityException
      * @throws LocalizedException
+     * @throws NoSuchEntityException
      * @throws PaymentValidationException
      */
-    public function createExpressPayment(string $method, string $addToCartRequest): void
+    public function createExpressPayment(
+        string $method,
+        ?string $addToCartRequest = null,
+        bool $isCart = false
+    ): void
     {
-        $cart = $this->checkoutSession->getQuote()->removeAllItems();
-
-        $message = $this->addProductToCart($addToCartRequest, $cart);
-        if ($message) {
-            $this->dispatchErrorMessage($message);
-            return;
+        $cart = $this->checkoutSession->getQuote();
+        if (!$isCart) {
+            $cart = $cart->removeAllItems();
+            $message = $this->addProductToCart($addToCartRequest, $cart);
+            if ($message) {
+                $this->dispatchErrorMessage($message);
+                return;
+            }
         }
 
         $paymentActions = $this->expressPaymentCreate->execute(
@@ -122,7 +136,7 @@ public function createExpressPayment(string $method, string $addToCartRequest):
      * @throws CheckoutException
      * @throws InputException
      */
-    public function saveAddress(array $billingAddressInput): void
+    public function saveBillingAddress(array $billingAddressInput): void
     {
         $cart = $this->checkoutSession->getQuote();
 
@@ -133,7 +147,7 @@ public function saveAddress(array $billingAddressInput): void
             $cart->setCustomerEmail($billingAddress->getEmail());
         }
 
-        $this->billingAddressManagement->assign($cart->getId(), $billingAddress, true);
+        $this->billingAddressManagement->assign($cart->getId(), $billingAddress);
 
         if ($this->hyvaCheckoutSession->getSteps()) {
             $this->hyvaCheckoutSession->restart();
@@ -142,15 +156,40 @@ public function saveAddress(array $billingAddressInput): void
         $this->redirect('checkout');
     }
 
+    /**
+     * @param array $shippingAddressInput
+     * @return void
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     * @throws CheckoutException
+     * @throws InputException
+     */
+    public function saveShippingAddress(array $shippingAddressInput): void
+    {
+        $cart = $this->checkoutSession->getQuote();
+
+        $shippingAddress = $this->addressFactory->create();
+        $shippingAddress->setData($shippingAddressInput);
+
+        if (!$cart->getCustomerEmail()) {
+            $cart->setCustomerEmail($shippingAddress->getEmail());
+        }
+
+        if(!$cart->isVirtual()) {
+            $this->shippingAddressManagement->assign($cart->getId(), $shippingAddress);
+        }
+    }
+
     /** Cancel Express Paypal Payment */
-    public function cancelExpressPayment(): void
+    public function cancelExpressPayment(bool $isCart = false): void
     {
         $cart = $this->checkoutSession->getQuote();
         $payment = $cart->getPayment();
-        $cart->removeAllItems();
-        $this->cartRepository->save($cart);
-        $payment->setAdditionalInformation(Method::EXPRESS_PAYMENT_KEY, true);
-
+        if (!$isCart) {
+            $cart->removeAllItems();
+            $this->cartRepository->save($cart);
+        }
+        $payment->setAdditionalInformation(Method::EXPRESS_PAYMENT_KEY, false);
         $this->payPal->cancel($payment);
     }
 
diff --git a/src/view/frontend/layout/catalog_product_view.xml b/src/view/frontend/layout/catalog_product_view.xml
index d951e75..4e92f17 100644
--- a/src/view/frontend/layout/catalog_product_view.xml
+++ b/src/view/frontend/layout/catalog_product_view.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0"?>
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <move element="rvvup_payments.product.catalog_product_view.product.info.addtocart"
-          destination="addtocart.shortcut.buttons"
-    />
-
-    <referenceBlock name="rvvup_payments.product.catalog_product_view.product.info.addtocart">
-        <arguments>
-            <argument name="magewire" xsi:type="object">Rvvup\PaymentsHyvaCheckout\Magewire\Product\View\Info\Addtocart</argument>
-        </arguments>
-    </referenceBlock>
+    <body>
+        <move element="rvvup_payments.product.catalog_product_view.product.info.addtocart"
+              destination="addtocart.shortcut.buttons"
+        />
+        <referenceBlock name="rvvup_payments.product.catalog_product_view.product.info.addtocart">
+            <arguments>
+                <argument name="magewire" xsi:type="object">Rvvup\PaymentsHyvaCheckout\Magewire\Product\View\Info\Addtocart</argument>
+            </arguments>
+        </referenceBlock>
+    </body>
 </page>
diff --git a/src/view/frontend/layout/checkout_cart_index.xml b/src/view/frontend/layout/checkout_cart_index.xml
deleted file mode 100644
index ef7f993..0000000
--- a/src/view/frontend/layout/checkout_cart_index.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column"
-      xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <referenceBlock name="rvvup_payments.checkout_cart_index.methods">
-        <arguments>
-            <argument name="magewire" xsi:type="object">Rvvup\PaymentsHyvaCheckout\Magewire\Checkout\Cart\Clearpay</argument>
-        </arguments>
-    </referenceBlock>
-</page>
diff --git a/src/view/frontend/layout/default_hyva.xml b/src/view/frontend/layout/default_hyva.xml
new file mode 100644
index 0000000..c5ce030
--- /dev/null
+++ b/src/view/frontend/layout/default_hyva.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<page xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceBlock name="head.additional">
+            <block class="Magento\Framework\View\Element\Template"
+                   name="rvvup_payments.checkout_index_index.head.additional.assets"
+                   template="Rvvup_Payments::head/additional/assets.phtml"
+                   ifconfig="payment/rvvup/active">
+                <arguments>
+                    <argument name="rvvup_payments_assets_view_model"
+                              xsi:type="object">Rvvup\Payments\ViewModel\Assets</argument>
+                </arguments>
+            </block>
+        </referenceBlock>
+        <referenceBlock name="extra_actions">
+            <block name="rvvup-paypal-minicart-block"
+                   template="Rvvup_PaymentsHyvaCheckout::cart/paypal.phtml"
+                   class="Rvvup\PaymentsHyvaCheckout\Block\Paypal" ifconfig="payment/rvvup/active">
+                <arguments>
+                    <argument name="magewire" xsi:type="object">
+                        Rvvup\PaymentsHyvaCheckout\Magewire\Product\View\Info\Addtocart
+                    </argument>
+                    <argument name="rvvup_payments_paypal_view_model" xsi:type="object">
+                        Rvvup\Payments\ViewModel\PayPal
+                    </argument>
+                </arguments>
+            </block>
+        </referenceBlock>
+    </body>
+</page>
diff --git a/src/view/frontend/layout/hyva_checkout_cart_index.xml b/src/view/frontend/layout/hyva_checkout_cart_index.xml
new file mode 100644
index 0000000..a34d4dc
--- /dev/null
+++ b/src/view/frontend/layout/hyva_checkout_cart_index.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column"
+      xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceBlock name="rvvup_payments.checkout_cart_index.methods">
+            <arguments>
+                <argument name="magewire" xsi:type="object">Rvvup\PaymentsHyvaCheckout\Magewire\Checkout\Cart\Clearpay</argument>
+            </arguments>
+        </referenceBlock>
+        <referenceContainer name="cart.summary">
+            <block name="rvvup-paypal-cart-block" after="checkout.cart.methods.bottom"
+                   template="Rvvup_PaymentsHyvaCheckout::cart/paypal.phtml"
+                   class="Rvvup\PaymentsHyvaCheckout\Block\Paypal">
+                <arguments>
+                    <argument name="magewire" xsi:type="object">
+                        Rvvup\PaymentsHyvaCheckout\Magewire\Product\View\Info\Addtocart
+                    </argument>
+                    <argument name="is_cart_page" xsi:type="boolean">true</argument>
+                    <argument name="rvvup_payments_paypal_view_model" xsi:type="object">
+                        Rvvup\Payments\ViewModel\PayPal
+                    </argument>
+                </arguments>
+            </block>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/src/view/frontend/templates/cart/paypal.phtml b/src/view/frontend/templates/cart/paypal.phtml
new file mode 100644
index 0000000..678f15c
--- /dev/null
+++ b/src/view/frontend/templates/cart/paypal.phtml
@@ -0,0 +1,182 @@
+<?php
+/**
+ * @var \Magento\Framework\Escaper $escaper
+ * @var \Rvvup\PaymentsHyvaCheckout\Block\Paypal $block
+ * @var \Rvvup\Payments\ViewModel\PayPal $paypalViewModel
+ */
+$paypalViewModel = $block->getData('rvvup_payments_paypal_view_model');
+
+if (!$block->isHyvaThemeUsed()) {
+    return;
+}
+
+if ($paypalViewModel === null ||
+    $block->getQuote() === null ||
+    !$paypalViewModel->isAvailable((string) $block->getQuote()->getGrandTotal())) {
+    // This is required for magewire
+    echo '<div></div>';
+    return;
+}
+?>
+
+<div class="rvvup-paypal-express grow z-0"
+     x-data="rvvupPayPalExpressButton()"
+     wire:ignore>
+    <div class="<?= $block->getNameInLayout() ?>-container"></div>
+</div>
+<script>
+    'use strict';
+    function rvvupPayPalExpressButton() {
+        const isCart = '<?= $block->getData("is_cart_page") ?>';
+        const scope = isCart ? 'cart' : 'miniCart';
+        return {
+            init() {
+                let orderStarted = false;
+                const buttonElement = document.querySelector('.<?= $block->getNameInLayout() ?>-container');
+                Magewire.rescan();
+                const component = Magewire.find('rvvup-paypal-minicart-block');
+                if (!window.rvvup_paypal) {
+                    console.error('PayPal SDK not loaded');
+                    return;
+                }
+
+                if (!rvvup_parameters?.settings?.paypal?.[scope]?.button?.enabled) {
+                    return;
+                }
+
+                rvvup_paypal.Buttons({
+                    style: this.getButtonStyle(),
+
+                    onClick: (data, actions) => {
+                        if (orderStarted) {
+                            return component.createExpressPayment('paypal', null, true)
+                                .then(() => actions.resolve())
+                        }
+                    },
+
+                    createOrder: () => {
+                        // If the token is already set, don't create a new one.
+                        if (component.authorizationToken) {
+                            return component.authorizationToken;
+                        }
+
+                        return new Promise((resolve) => {
+                            orderStarted = true;
+                            component.createExpressPayment('paypal', null, true)
+                                .then(() => resolve(component.authorizationToken))
+                        });
+                    },
+
+                    onApprove: (data, actions) => {
+                        return actions.order.get().then((orderData) => {
+                            const shippingAddress = this.getShippingAddressFromOrderData(orderData);
+                            component.saveShippingAddress(shippingAddress);
+                            const billingAddress = this.getBillingAddressFromOrderData(orderData, shippingAddress);
+                            return component.saveBillingAddress(billingAddress);
+                        });
+                    },
+
+                    onCancel: () => {
+                        component.cancelExpressPayment(true);
+                    }
+                }).render(buttonElement);
+            },
+
+            getButtonStyle() {
+                if (typeof rvvup_parameters !== 'object') {
+                    return {
+                        layout: 'vertical',
+                        color: 'gold',
+                        shape: 'rect',
+                        label: 'paypal',
+                        tagline: false,
+                    };
+                }
+
+                const layout = rvvup_parameters?.settings?.paypal?.[scope]?.button?.layout?.value || 'vertical';
+                const color = rvvup_parameters?.settings?.paypal?.[scope]?.button?.color?.value || 'gold';
+                const shape = rvvup_parameters?.settings?.paypal?.[scope]?.button?.shape?.value || 'rect';
+                const label = rvvup_parameters?.settings?.paypal?.[scope]?.button?.label?.value || 'paypal';
+                const tagline = rvvup_parameters?.settings?.paypal?.[scope]?.button?.tagline || false;
+                const size = rvvup_parameters?.settings?.paypal?.[scope]?.button?.size || null;
+
+                let style = {
+                    layout: layout,
+                    color: color,
+                    shape: shape,
+                    label: label,
+                    tagline: tagline,
+                };
+
+                if (size !== null) {
+                    style.height = size;
+                }
+
+                return style;
+            },
+
+            getBillingAddressFromOrderData(orderData, shippingAddress) {
+                return {
+                    firstname: orderData.payer.name.given_name,
+                    lastname: orderData.payer.name.surname,
+                    email: orderData.payer.email_address,
+                    telephone: shippingAddress.telephone,
+                    company: '',
+                    street: shippingAddress.street,
+                    city: shippingAddress.city,
+                    region: shippingAddress.region,
+                    postcode: shippingAddress.postcode,
+                    country_id: shippingAddress.country_id,
+                }
+            },
+
+            getShippingAddressFromOrderData(orderData) {
+                let address = {
+                    firstname: '',
+                    lastname: '',
+                    email: orderData.payer.email_address,
+                    telephone: '',
+                    street: [],
+                    city: '',
+                    region: '',
+                    postcode: '',
+                    country_id: '',
+                }
+
+                /* Return empty object if no shipping property */
+                if (orderData.purchase_units.length === 0 ||
+                    !orderData.purchase_units[0].hasOwnProperty("shipping")
+                ) {
+                    return address;
+                }
+
+                let shippingFullName =
+                    orderData.purchase_units[0].shipping.hasOwnProperty('name') &&
+                    orderData.purchase_units[0].shipping.name.hasOwnProperty('full_name')
+                        ? orderData.purchase_units[0].shipping.name.full_name
+                        : '';
+                let shippingFullNameArray = shippingFullName.split(' ');
+
+                address.firstname = shippingFullNameArray.shift();
+                if (shippingFullNameArray.length > 0) {
+                    address.lastname = shippingFullNameArray.join(' ');
+                }
+
+                /* Return object if no address property */
+                if (!orderData.purchase_units[0].shipping.hasOwnProperty('address')) {
+                    return address;
+                }
+
+                const shippingAddress = orderData.purchase_units[0].shipping.address;
+                address.street.push(shippingAddress?.address_line_1 ?? '');
+                address.street.push(shippingAddress?.address_line_2 ?? '');
+                address.city = shippingAddress?.admin_area_2 ?? '';
+                address.region = shippingAddress?.admin_area_1 ?? '';
+                address.postcode = shippingAddress?.postal_code ?? '';
+                address.country_id = shippingAddress?.country_code ?? '';
+
+                return address;
+            },
+        }
+    }
+</script>
diff --git a/src/view/frontend/templates/component/payment/method/paypal.phtml b/src/view/frontend/templates/component/payment/method/paypal.phtml
index 8a15581..e377285 100644
--- a/src/view/frontend/templates/component/payment/method/paypal.phtml
+++ b/src/view/frontend/templates/component/payment/method/paypal.phtml
@@ -24,7 +24,8 @@
             <?= __(
                 'You are currently paying with %1. If you want to cancel this process, please click <a %2>here</a>',
                 'PayPal',
-                'href="#" onclick="hyvaCheckout.loader.start()" wire:click.prevent="cancel" class="underline"'
+                'href="#" onclick="hyvaCheckout.loader.start();window.location.reload();"
+                 wire:click.prevent="cancel" class="underline"'
             );
             ?>
         </div>
diff --git a/src/view/frontend/templates/product/view/info/addtocart.phtml b/src/view/frontend/templates/product/view/info/addtocart.phtml
index 49beaf1..ef615bb 100644
--- a/src/view/frontend/templates/product/view/info/addtocart.phtml
+++ b/src/view/frontend/templates/product/view/info/addtocart.phtml
@@ -36,18 +36,23 @@ if ($product) {
     'use strict';
     function rvvupPayPalExpressButton() {
         var addToCartForm = document.getElementById('product_addtocart_form');
-        const component = Magewire.find('<?= $escaper->escapeJs($block->getNameInLayout()) ?>');
 
         return {
             init() {
                 const buttonElement = document.querySelector('.rvvup-paypal-express-button-container');
                 let orderStarted = false;
-
+                Magewire.rescan();
+                const component = Magewire.find('rvvup-paypal-minicart-block');
+                const isAvailable = rvvup_parameters?.settings?.paypal?.product?.button?.enabled;
                 if (!window.rvvup_paypal) {
                     console.error('PayPal SDK not loaded');
                     return;
                 }
 
+                if (!isAvailable) {
+                    return;
+                }
+
                 rvvup_paypal.Buttons({
                     style: this.getButtonStyle(),
 
@@ -89,9 +94,9 @@ if ($product) {
                     onApprove: (data, actions) => {
                         return actions.order.get().then((orderData) => {
                             const shippingAddress = this.getShippingAddressFromOrderData(orderData);
+                            component.saveShippingAddress(shippingAddress);
                             const billingAddress = this.getBillingAddressFromOrderData(orderData, shippingAddress);
-
-                            return component.saveAddress(billingAddress);
+                            return component.saveBillingAddress(billingAddress);
                         });
                     },