diff --git a/composer.json b/composer.json
index 98d19a9b..365a670a 100644
--- a/composer.json
+++ b/composer.json
@@ -19,6 +19,7 @@
     "require": {
         "php": "^8.0|^8.1|^8.2",
         "blade-ui-kit/blade-heroicons": "^2.0",
+        "rapidez/account": "^3.0",
         "rapidez/core": "^3.0"
     },
     "autoload": {
diff --git a/lang/nl.json b/lang/nl.json
index 7e5f6b25..799af5af 100644
--- a/lang/nl.json
+++ b/lang/nl.json
@@ -1,17 +1,14 @@
 {
     "Account features": "Account voordelen",
-    "Account overview": "Account overzicht",
     "Account registration successful.": "Accountregistratie succesvol.",
     "Account settings": "Account instellingen",
     "Add a new address": "Voeg een nieuw adres toe",
     "Add address and save": "Voeg adres toe en sla op",
-    "Address": "Adres",
     "Address changed successfully": "Adres succesvol gewijzigd",
     "Address created successfully": "Adres succesvol aangemaakt",
     "Address data": "Adresgegevens",
     "Already logged in": "Al ingelogd",
     "Amount": "Bedrag",
-    "An email is send with a password reset link if an account exists with the provided email address.": "Een e-mail is verzonden met een link om het wachtwoord te resetten, als er een account bestaat met het opgegeven e-mailadres.",
     "Back to account": "Terug naar account",
     "Back to cart": "Terug naar winkelwagen",
     "Back to credentials": "Terug naar inloggegevens",
@@ -22,23 +19,15 @@
     "Change address and save": "Adres wijzigen en opslaan",
     "Change credentials / Add addresses / Newsletters": "Wijzig gegevens / Voeg adressen toe / Nieuwsbrieven",
     "Change e-mail address": "E-mailadres wijzigen",
-    "Change password": "Wachtwoord wijzigen",
-    "Changed successfully!": "Succesvol gewijzigd!",
-    "Contact information": "Contactgegevens",
     "Continue shopping": "Verder winkelen",
     "Coupon code": "Kortingscode",
-    "Current password": "Huidig wachtwoord",
     "Customer centre": "Klantenservice",
     "Decrease quantity": "Aantal verlagen",
-    "Default billing address": "Standaard factuuradres",
-    "Default shipping address": "Standaard verzendadres",
     "Delete address": "Adres verwijderen",
     "Delivery method": "Bezorgmethode",
     "Deselect as billing": "Deselecteer als factuuradres",
     "Deselect as shipping": "Deselecteer als verzendadres",
     "Don't have an account yet? Create an account and enjoy faster ordering, repeat orders, status of your order, easy returns and more!": "Nog geen account? Maak een account aan en geniet van sneller bestellen, herhaalde bestellingen, bestelstatus, gemakkelijke retouren en meer!",
-    "Edit": "Bewerken",
-    "Email": "E-mail",
     "Enter your e-mail address": "Voer uw e-mailadres in",
     "Enter your email address": "Voer uw e-mailadres in",
     "Enter your email address below, you will receive an email within minutes to reset the password.": "Voer hieronder uw e-mailadres in, u ontvangt binnen enkele minuten een e-mail om het wachtwoord te resetten.",
@@ -52,21 +41,18 @@
     "Log out": "Uitloggen",
     "Logout from your account": "Uitloggen van uw account",
     "My addresses": "Mijn adressen",
-    "New password": "Nieuw wachtwoord",
+    "Newsletter": "Nieuwsbrief",
     "No account yet? Create an account and benefit instantly from repeat orders, order statuses and easy returns!": "Nog geen account? Maak direct een account aan en profiteer van herhaalde bestellingen, bestelstatus en gemakkelijke retouren!",
     "No default address has been set yet.": "Er is nog geen standaardadres ingesteld.",
     "Number of products": "Aantal producten",
-    "Order": "Bestelling",
     "Order again": "Bestelling herhalen",
     "Order date": "Besteldatum",
     "Order overview": "Bestellingsoverzicht",
     "Ordered within 2 minutes": "Besteld binnen 2 minuten",
     "Place repeat order / View orders": "Herhaal bestelling / Bekijk bestellingen",
     "Please select an address": "Selecteer een adres",
-    "Price": "Prijs",
     "Product": "Product",
     "Quick and easy ordering without having to fill in your details every time": "Snel en eenvoudig bestellen zonder elke keer uw gegevens in te vullen",
-    "Register": "Registreren",
     "Register account": "Account registreren",
     "Register within 1 minute": "Registreer binnen 1 minuut",
     "Return to home": "Terug naar home",
@@ -80,7 +66,6 @@
     "Thank you for subscribing": "Bedankt voor uw inschrijving",
     "Thank you for your order": "Bedankt voor uw bestelling",
     "This is a business account": "Dit is een zakelijke account",
-    "This product is out of stock, remove it to continue your order.": "Dit product is op dit moment niet op voorraad, verwijder deze om verder te gaan met de bestelling.",
     "This product it out of stock, remove it to continue your order.": "Dit product is niet op voorraad, verwijder het om verder te gaan met je bestelling.",
     "To checkout": "Naar afrekenen",
     "Total price": "Totale prijs",
@@ -89,7 +74,8 @@
     "Use a new address": "Gebruik een nieuw adres",
     "Vat ID": "BTW-nummer",
     "We will also check if you already have an account so you can checkout more efficiently.": "We zullen ook controleren of u al een account heeft, zodat u efficiënter kunt afrekenen.",
-    "We will send your order confirmation to this e-mail address.": "We sturen uw orderbevestiging naar dit e-mailadres.",
+    "We will send a confirmation of your order :orderid to :email": "We sturen een orderbevestiging van bestelling :orderid naar :email",
+    "We will send your order confirmation to this e-mail address. We will also check if you already have an account so you can checkout more efficiently.": "We sturen uw orderbevestiging naar dit e-mailadres. We zullen ook controleren of u al een account heeft om het bestelproces te versnellen.",
     "Welcome back": "Welkom terug",
     "Yes, I want to subscribe to the newsletter": "Ja, ik wil me inschrijven voor de nieuwsbrief",
     "You already have an account with this e-mail address. Please log in to continue.": "U heeft al een account met dit e-mailadres. Log in om verder te gaan.",
@@ -97,4 +83,5 @@
     "You will receive this newsletter approximately 2x a year": "U ontvangt deze nieuwsbrief ongeveer 2x per jaar",
     "Your password has been changed, please login.": "Uw wachtwoord is gewijzigd, log alstublieft in.",
     "and use a different e-mail address.": "en gebruik een ander e-mailadres."
+    "Your order is currently": "Uw bestelling is momenteel"
 }
diff --git a/resources/core-overwrites/layouts/checkout/header.blade.php b/resources/core-overwrites/layouts/checkout/header.blade.php
index 41bf46aa..4b70579e 100644
--- a/resources/core-overwrites/layouts/checkout/header.blade.php
+++ b/resources/core-overwrites/layouts/checkout/header.blade.php
@@ -1,4 +1,4 @@
-<div class="bg-inactive-100 text-muted relative py-3 text-xs font-semibold">
+<div class="bg text-muted relative py-3 text-xs font-semibold">
     <slider reference="header-usp-slider" autoplay>
         <ul
             ref="header-usp-slider"
diff --git a/resources/views/account/address-edit.blade.php b/resources/views/account/address-edit.blade.php
index ae14c345..61b2af42 100644
--- a/resources/views/account/address-edit.blade.php
+++ b/resources/views/account/address-edit.blade.php
@@ -15,6 +15,7 @@
                 <graphql-mutation
                     query="@include('rapidez::account.partials.queries.address-edit')"
                     :variables="data.customer.addresses.find(a => a.id == {{ request()->id }})"
+                    :callback="refreshUserInfoCallback"
                     :notify="{ 'message': '@lang('Address changed successfully')' }"
                     redirect="{{ route('account.edit') }}"
                 >
diff --git a/resources/views/account/address-new.blade.php b/resources/views/account/address-new.blade.php
index 12782639..f636db94 100644
--- a/resources/views/account/address-new.blade.php
+++ b/resources/views/account/address-new.blade.php
@@ -10,6 +10,7 @@
             query="@include('rapidez::account.partials.queries.address-create')"
             :variables="{ street: [] }"
             :watch="false"
+            :callback="refreshUserInfoCallback"
             :notify="{ 'message': '@lang('Address created successfully')' }"
             redirect="{{ route('account.edit') }}"
         >
diff --git a/resources/views/account/forgotpassword.blade.php b/resources/views/account/forgotpassword.blade.php
index 2df9f2a8..c861d6cf 100644
--- a/resources/views/account/forgotpassword.blade.php
+++ b/resources/views/account/forgotpassword.blade.php
@@ -1,6 +1,6 @@
 @extends('rapidez::layouts.app')
 
-@section('title', __('Forgot password'))
+@section('title', __('Forgot your password?'))
 
 @section('robots', 'NOINDEX,NOFOLLOW')
 
diff --git a/resources/views/account/partials/address-cards.blade.php b/resources/views/account/partials/address-cards.blade.php
index a64b7673..6ab72c58 100644
--- a/resources/views/account/partials/address-cards.blade.php
+++ b/resources/views/account/partials/address-cards.blade.php
@@ -12,7 +12,7 @@
         </template>
         <a href="/account/address/new" class="min-h-[180px] flex flex-col items-center justify-center gap-y-2 font-medium bg-emphasis rounded max-md:hidden">
             <span>+</span>
-            <span>@lang('Add new address')</span>
+            <span>@lang('Add a new address')</span>
         </a>
     </template>
     <template v-else>
diff --git a/resources/views/account/partials/address-cards/delete.blade.php b/resources/views/account/partials/address-cards/delete.blade.php
index dd9977f7..950f63da 100644
--- a/resources/views/account/partials/address-cards/delete.blade.php
+++ b/resources/views/account/partials/address-cards/delete.blade.php
@@ -1,4 +1,9 @@
-<graphql-mutation query="mutation deleteCustomerAddress($id: Int!){ deleteCustomerAddress ( id: $id ) }" :variables="{ id: userAddress.id }" v-slot="{ mutate }">
+<graphql-mutation
+    query="mutation deleteCustomerAddress($id: Int!){ deleteCustomerAddress ( id: $id ) }"
+    :variables="{ id: userAddress.id }"
+    :callback="refreshUserInfoCallback"
+    v-slot="{ mutate }"
+>
     <x-rapidez-ct::button.link v-if="!userAddress.default_billing && !userAddress.default_shipping" v-on:click="data.customer.addresses.splice(addressIndex,1);mutate()">
         @lang('Delete address')
     </x-rapidez-ct::button.link>
diff --git a/resources/views/account/partials/forgotpassword.blade.php b/resources/views/account/partials/forgotpassword.blade.php
index c1afd991..611bfd8a 100644
--- a/resources/views/account/partials/forgotpassword.blade.php
+++ b/resources/views/account/partials/forgotpassword.blade.php
@@ -3,11 +3,11 @@
     query="mutation reset($email: String!) { requestPasswordResetEmail ( email: $email ) }"
     v-slot="{ mutate, variables }"
     :clear="true"
-    :notify="{ message: '@lang('An email is send with a password reset link if an account exists with the provided email address.')' }"
+    :notify="{ message: '@lang('An email has been sent with a password reset link if an account exists with the provided email address.')' }"
 >
     <form v-on:submit.prevent="mutate">
         <x-rapidez-ct::title.lg class="mb-4">
-            @lang('Forgot Your Password?')
+            @lang('Forgot your password?')
         </x-rapidez-ct::title.lg>
         <p class="mb-5 text-sm">
             @lang('Enter your email address below, you will receive an email within minutes to reset the password.')
diff --git a/resources/views/account/partials/register-account-address.blade.php b/resources/views/account/partials/register-account-address.blade.php
index 1784d589..a0cd8de5 100644
--- a/resources/views/account/partials/register-account-address.blade.php
+++ b/resources/views/account/partials/register-account-address.blade.php
@@ -110,7 +110,7 @@
             <span class="relative flex flex-col gap-y-1.5 sm:gap-y-2 text-sm !mb-3">
                 <label>
                     <x-rapidez::label>@lang('Country')</x-rapidez::label>
-                    <x-rapidez::country-select
+                    <x-rapidez::input.select.country
                         name="country_code"
                         v-model="addressVariables.country_code"
                         v-on:change="window.app.$emit('postcode-change', addressVariables)"
diff --git a/resources/views/cart/coupon.blade.php b/resources/views/cart/coupon.blade.php
index 7010b847..854749f1 100644
--- a/resources/views/cart/coupon.blade.php
+++ b/resources/views/cart/coupon.blade.php
@@ -4,7 +4,7 @@
             <x-rapidez-ct::coupon-field />
             <template v-if="cart.applied_coupons?.length" v-for="coupon in cart.applied_coupons" v-cloak>
                 <graphql-mutation
-                    :query="'mutation ($cart_id: String!) { removeCouponFromCart(input: { cart_id: $cart_id }) { cart { ' + config.queries.cart + ' } } }'"
+                    :query="'mutation ($cart_id: String!) { removeCouponFromCart(input: { cart_id: $cart_id })  { ...cart } } ' + config.fragments.cart"
                     :variables="{ cart_id: mask }"
                     :callback="updateCart"
                     :error-callback="checkResponseForExpiredCart"
diff --git a/resources/views/cart/partials/product/remove-button.blade.php b/resources/views/cart/partials/product/remove-button.blade.php
index ea814842..b909ca1d 100644
--- a/resources/views/cart/partials/product/remove-button.blade.php
+++ b/resources/views/cart/partials/product/remove-button.blade.php
@@ -1,5 +1,5 @@
 <graphql-mutation
-    :query="'mutation ($cart_id: String!, $cart_item_id: Int) { removeItemFromCart(input: { cart_id: $cart_id, cart_item_id: $cart_item_id }) { cart { ' + config.queries.cart + ' } } }'"
+    :query="'mutation ($cart_id: String!, $cart_item_id: Int) { removeItemFromCart(input: { cart_id: $cart_id, cart_item_id: $cart_item_id })  { ...cart } } ' + config.fragments.cart"
     :variables="{ cart_id: mask, cart_item_id: item.id }"
     :notify="{ message: item.product.name+' '+config.translations.cart.remove }"
     :callback="updateCart"
@@ -9,4 +9,4 @@
     <button v-on:click="mutate" class="text-muted mt-1 text-xs hover:underline" :dusk="'item-delete-' + index">
         @lang('Remove')
     </button>
-</graphql-mutation>
\ No newline at end of file
+</graphql-mutation>
diff --git a/resources/views/checkout/partials/address-cards.blade.php b/resources/views/checkout/partials/address-cards.blade.php
index 3525c981..cc542675 100644
--- a/resources/views/checkout/partials/address-cards.blade.php
+++ b/resources/views/checkout/partials/address-cards.blade.php
@@ -1,6 +1,6 @@
 <div class="grid gap-5 md:grid-cols-2">
     <template v-if="cart.billing_address?.same_as_shipping">
-        <x-rapidez-ct::card.address v-bind:address="cart.shipping_addresses[0]" shipping billing check>
+        <x-rapidez-ct::card.address v-bind:address="cart.shipping_addresses[0]" shipping billing check="cart.shipping_addresses[0]">
             <x-rapidez-ct::button.link v-on:click.prevent="toggleEdit">
                 @lang('Edit')
             </x-rapidez-ct::button.link>
@@ -8,7 +8,7 @@
         @include('rapidez-ct::checkout.partials.buttons.new-address')
     </template>
     <template v-else>
-        <x-rapidez-ct::card.address v-bind:address="cart.shipping_addresses[0]" shipping check class="h-full">
+        <x-rapidez-ct::card.address v-bind:address="cart.shipping_addresses[0]" shipping check="cart.shipping_addresses[0]" class="h-full">
             <x-rapidez-ct::button.link v-on:click.prevent="toggleEdit">
                 @lang('Edit')
             </x-rapidez-ct::button.link>
@@ -20,7 +20,7 @@
                 <input type="checkbox" oninvalid="this.setCustomValidity('{{ __('Please select an address') }}')" required class="absolute w-full h-full inset-0 opacity-0 pointer-events-none">
             </x-slot>
         </x-rapidez-ct::card.address>
-        <x-rapidez-ct::card.address v-bind:address="cart.billing_address" billing check class="h-full">
+        <x-rapidez-ct::card.address v-bind:address="cart.billing_address" billing check="cart.billing_address" class="h-full">
             <x-rapidez-ct::button.link v-on:click.prevent="toggleEdit">
                 @lang('Edit')
             </x-rapidez-ct::button.link>
diff --git a/resources/views/checkout/partials/buttons/new-address.blade.php b/resources/views/checkout/partials/buttons/new-address.blade.php
index 7ff3560e..4722ee24 100644
--- a/resources/views/checkout/partials/buttons/new-address.blade.php
+++ b/resources/views/checkout/partials/buttons/new-address.blade.php
@@ -1,4 +1,4 @@
 <button v-on:click.prevent="toggleEdit" class="flex flex-col items-center justify-center gap-y-2 font-medium bg-emphasis rounded max-md:hidden">
     <span>+</span>
-    <span>@lang('Add new address')</span>
+    <span>@lang('Add a new address')</span>
 </button>
\ No newline at end of file
diff --git a/resources/views/checkout/partials/sections/address.blade.php b/resources/views/checkout/partials/sections/address.blade.php
index f3608fe8..0df82c9f 100644
--- a/resources/views/checkout/partials/sections/address.blade.php
+++ b/resources/views/checkout/partials/sections/address.blade.php
@@ -16,7 +16,6 @@
                     country_code: cart.shipping_addresses[0]?.country.code || window.address_defaults.country_code
                 }"
                 group="shipping"
-                :before-request="(query, variables, options) => [variables.customer_address_id ? config.queries.setExistingShippingAddressesOnCart : query, variables, options]"
                 :callback="updateCart"
                 :error-callback="checkResponseForExpiredCart"
                 :watch="false"
@@ -37,7 +36,6 @@
                     same_as_shipping: !cart.is_virtual && (cart?.billing_address?.same_as_shipping ?? true),
                     country_code: cart.billing_address?.country.code || window.address_defaults.country_code
                 }))"
-                :before-request="(query, variables, options) => [variables.customer_address_id ? config.queries.setExistingBillingAddressOnCart : query, variables, options]"
                 :callback="updateCart"
                 :error-callback="checkResponseForExpiredCart"
                 :watch="false"
diff --git a/resources/views/checkout/partials/sections/login/logged-out.blade.php b/resources/views/checkout/partials/sections/login/logged-out.blade.php
index 3202588e..5ae2aef0 100644
--- a/resources/views/checkout/partials/sections/login/logged-out.blade.php
+++ b/resources/views/checkout/partials/sections/login/logged-out.blade.php
@@ -14,7 +14,7 @@ class="justify-center"
         </label>
 
         <p v-if="checkoutLogin.isEmailAvailable" class="self-end text-muted">
-            @lang('We will send your order confirmation to this e-mail address. We will also check if you already have an account so you can checkout more efficiently.')
+            @lang('We\'ll email your order confirmation and check if you have an account for faster checkout.')
         </p>
 
         <template v-if="!loggedIn && (!checkoutLogin.isEmailAvailable || checkoutLogin.createAccount)">
diff --git a/resources/views/checkout/partials/sections/payment.blade.php b/resources/views/checkout/partials/sections/payment.blade.php
index 893d3cc1..3673e352 100644
--- a/resources/views/checkout/partials/sections/payment.blade.php
+++ b/resources/views/checkout/partials/sections/payment.blade.php
@@ -11,7 +11,7 @@
     mutate-event="setPaymentMethodOnCart"
     v-slot="{ mutate, variables }"
 >
-    <div partial-submit="mutate" class="flex flex-col gap-4">
+    <div partial-submit="mutate" class="flex flex-col gap-3">
         <div v-for="(method, index) in cart.available_payment_methods">
             @include('rapidez-ct::checkout.partials.sections.payment.payment-methods')
         </div>
diff --git a/resources/views/checkout/partials/sections/success/create-account-title.blade.php b/resources/views/checkout/partials/sections/success/create-account-title.blade.php
index 63452c59..a0b12339 100644
--- a/resources/views/checkout/partials/sections/success/create-account-title.blade.php
+++ b/resources/views/checkout/partials/sections/success/create-account-title.blade.php
@@ -1,3 +1,3 @@
 <x-rapidez-ct::title.lg>
-    @lang('Create account')
+    @lang('Create an account')
 </x-rapidez-ct::title.lg>
\ No newline at end of file
diff --git a/resources/views/checkout/partials/sections/success/create-account.button.blade.php b/resources/views/checkout/partials/sections/success/create-account.button.blade.php
index df3a271f..9cf8dae7 100644
--- a/resources/views/checkout/partials/sections/success/create-account.button.blade.php
+++ b/resources/views/checkout/partials/sections/success/create-account.button.blade.php
@@ -1,3 +1,3 @@
 <x-rapidez::button.seconary class="self-end justify-self-start" loader>
-    @lang('Create account')
+    @lang('Create an account')
 </x-rapidez::button.seconary>
\ No newline at end of file
diff --git a/resources/views/checkout/partials/sections/success/features.blade.php b/resources/views/checkout/partials/sections/success/features.blade.php
index 1cf2c64d..7552633d 100644
--- a/resources/views/checkout/partials/sections/success/features.blade.php
+++ b/resources/views/checkout/partials/sections/success/features.blade.php
@@ -1,19 +1,19 @@
 <x-rapidez-ct::card>
     <x-rapidez-ct::title.lg class="mb-5">
-        @lang('Success usps')
+        Success usps
     </x-rapidez-ct::title.lg>
     <x-rapidez-ct::usp-list>
         <li>
-            <x-heroicon-o-check class="absolute left-0 top-0 size-5 text-primary" stroke-width="2.5" />
-            <span>@lang('Success usp 1')</span>
+            <x-heroicon-o-check class="absolute left-0 top-0 h-5 text-primary" stroke-width="2.5" />
+            <span>Success usp 1</span>
         </li>
         <li>
-            <x-heroicon-o-check class="absolute left-0 top-0 size-5 text-primary" stroke-width="2.5" />
-            <span>@lang('Success usp 2')</span>
+            <x-heroicon-o-check class="absolute left-0 top-0 h-5 text-primary" stroke-width="2.5" />
+            <span>Success usp 2</span>
         </li>
         <li>
-            <x-heroicon-o-check class="absolute left-0 top-0 size-5 text-primary" stroke-width="2.5" />
-            <span>@lang('Success usp 3')</span>
+            <x-heroicon-o-check class="absolute left-0 top-0 h-5 text-primary" stroke-width="2.5" />
+            <span>Success usp 3</span>
         </li>
     </x-rapidez-ct::usp-list>
 </x-rapidez-ct::card>
diff --git a/resources/views/components/address-form.blade.php b/resources/views/components/address-form.blade.php
index 8af9b955..c62c673a 100644
--- a/resources/views/components/address-form.blade.php
+++ b/resources/views/components/address-form.blade.php
@@ -26,7 +26,7 @@
     @endif
     <label class="sm:col-span-2">
         <x-rapidez::label>@lang('Country')</x-rapidez::label>
-        <x-rapidez::country-select
+        <x-rapidez::input.select.country
             name="{{ $type }}_country"
             v-model="{{ $address }}.{{ $countryKey }}"
             required
diff --git a/resources/views/components/coupon-field.blade.php b/resources/views/components/coupon-field.blade.php
index 8d7d474a..5a7709fa 100644
--- a/resources/views/components/coupon-field.blade.php
+++ b/resources/views/components/coupon-field.blade.php
@@ -1,5 +1,5 @@
 <graphql-mutation
-    :query="'mutation ($cart_id: String!, $coupon_code: String!) { applyCouponToCart(input: { cart_id: $cart_id, coupon_code: $coupon_code }) { cart { ' + config.queries.cart + ' } } }'"
+    :query="'mutation ($cart_id: String!, $coupon_code: String!) { applyCouponToCart(input: { cart_id: $cart_id, coupon_code: $coupon_code })  { ...cart } } ' + config.fragments.cart"
     :variables="{ cart_id: mask, coupon_code: '' }"
     :notify="{ message: config.translations.cart.coupon.applied }"
     :clear="true"
diff --git a/resources/views/components/input/checkbox/tile.blade.php b/resources/views/components/input/checkbox/tile.blade.php
index e796fdd0..7585ca27 100644
--- a/resources/views/components/input/checkbox/tile.blade.php
+++ b/resources/views/components/input/checkbox/tile.blade.php
@@ -1,5 +1,5 @@
 @props(['name' => '', 'id' => uniqid('checkbox-')])
-<label for="{{ $id }}" {{ $attributes->only('class')->class('relative flex cursor-pointer select-none flex-wrap gap-x-3 text-sm') }}>
+<label for="{{ $id }}" {{ $attributes->only('class')->class('relative flex cursor-pointer select-none gap-x-3 text-sm') }}>
     <x-rapidez::input.checkbox.base
         class="size-6 text-primary peer"
         id="{{ $id }}"
diff --git a/resources/views/components/input/quantity.blade.php b/resources/views/components/input/quantity.blade.php
index f0bbd73c..6870b032 100644
--- a/resources/views/components/input/quantity.blade.php
+++ b/resources/views/components/input/quantity.blade.php
@@ -1,6 +1,6 @@
 
 <graphql-mutation
-    :query="'mutation ($cart_id: String!, $cart_item_id: Int, $quantity: Float) { updateCartItems(input: { cart_id: $cart_id, cart_items: [{ cart_item_id: $cart_item_id, quantity: $quantity }] }) { cart { ' + config.queries.cart + ' } } }'"
+    :query="'mutation ($cart_id: String!, $cart_item_id: Int, $quantity: Float) { updateCartItems(input: { cart_id: $cart_id, cart_items: [{ cart_item_id: $cart_item_id, quantity: $quantity }] }) { cart { ...cart } } } ' + config.fragments.cart"
     :variables="{ cart_id: mask, cart_item_id: item.id, quantity: item.quantity }"
     :callback="updateCart"
     :error-callback="checkResponseForExpiredCart"
diff --git a/resources/views/components/input/radio/tile.blade.php b/resources/views/components/input/radio/tile.blade.php
index aad7f17d..44387944 100644
--- a/resources/views/components/input/radio/tile.blade.php
+++ b/resources/views/components/input/radio/tile.blade.php
@@ -1,11 +1,13 @@
 <label {{ $attributes->only('class')->class('relative flex w-full cursor-pointer items-center justify-start gap-x-3 rounded border bg-white px-5 sm:px-7 py-7') }}>
-    <span class="flex aspect-square size-6 items-center justify-center rounded-full border bg-white">
-        <input type="radio" {{ $attributes->except('class') }} class="peer size-3 border-none text-primary transition checked:bg-none focus:ring-0 focus:ring-offset-0" />
-        <span class="absolute -inset-y-px -left-px w-1 rounded-l bg-primary opacity-0 transition-all peer-checked:opacity-100"></span>
-    </span>
+    <x-rapidez::input.radio.base
+        class="size-6 text-primary peer"
+        name="{{ $name }}"
+        {{ $attributes->except('class') }}
+    />
     @isset($slot)
         <span class="flex w-full flex-wrap items-center justify-between gap-x-3">
             {{ $slot }}
         </span>
     @endisset
+    <div class="absolute -inset-y-px -left-px w-1 rounded-l bg-primary opacity-0 transition-all peer-checked:opacity-100"></div>
 </label>
diff --git a/resources/views/components/newsletter-visual.blade.php b/resources/views/components/newsletter-visual.blade.php
index 5b845792..5eb8311a 100644
--- a/resources/views/components/newsletter-visual.blade.php
+++ b/resources/views/components/newsletter-visual.blade.php
@@ -1,5 +1,5 @@
 <div class="absolute right-7 top-1/2 -translate-y-1/2 max-lg:hidden">
-    <div class="bg text-muted items-center justify-center rounded-full p-4">
+    <div class="bg text-muted items-center justify-center rounded-full p-3">
         <svg class="size-6" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" d="M21.75 9v.906a2.25 2.25 0 01-1.183 1.981l-6.478 3.488M2.25 9v.906a2.25 2.25 0 001.183 1.981l6.478 3.488m8.839 2.51l-4.66-2.51m0 0l-1.023-.55a2.25 2.25 0 00-2.134 0l-1.022.55m0 0l-4.661 2.51m16.5 1.615a2.25 2.25 0 01-2.25 2.25h-15a2.25 2.25 0 01-2.25-2.25V8.844a2.25 2.25 0 011.183-1.98l7.5-4.04a2.25 2.25 0 012.134 0l7.5 4.04a2.25 2.25 0 011.183 1.98V19.5z"/></svg>
     </div>
 </div>
diff --git a/resources/views/components/newsletter/partials/checkbox.blade.php b/resources/views/components/newsletter/partials/checkbox.blade.php
index 8f49d59d..dba33836 100644
--- a/resources/views/components/newsletter/partials/checkbox.blade.php
+++ b/resources/views/components/newsletter/partials/checkbox.blade.php
@@ -1,7 +1,7 @@
 @props(['isPartOfAnotherForm' => false, 'id'])
 
 <x-rapidez-ct::input.checkbox.tile :attributes="$attributes->merge([
-    'class' => 'relative flex w-full cursor-pointer !items-start rounded border bg-white p-7',
+    'class' => 'relative flex w-full cursor-pointer !items-start rounded-md border bg-white px-7 py-5',
     'id' => $id,
 ])" v-on:change="() => {
         if (typeof mutate === 'function' && (!{{ (int)$isPartOfAnotherForm }})) { mutate() }
diff --git a/resources/views/components/popup.blade.php b/resources/views/components/popup.blade.php
index 56f0debf..cf8e61d1 100644
--- a/resources/views/components/popup.blade.php
+++ b/resources/views/components/popup.blade.php
@@ -15,5 +15,5 @@
             {{ $slot }}
         </x-rapidez-ct::card.inactive>
     </x-rapidez-ct::sections>
-    <label class="absolute inset-0 bg-overlay/60 cursor-pointer" for="{{ $id }}"></label>
+    <label class="absolute inset-0 bg-black/60 cursor-pointer" for="{{ $id }}"></label>
 </div>