diff --git a/lib/simpleshop_theme_web/live/shop_live/cart.ex b/lib/simpleshop_theme_web/live/shop_live/cart.ex
index 3e2caf3..337e974 100644
--- a/lib/simpleshop_theme_web/live/shop_live/cart.ex
+++ b/lib/simpleshop_theme_web/live/shop_live/cart.ex
@@ -65,22 +65,10 @@ defmodule SimpleshopThemeWeb.ShopLive.Cart do
 
   @impl true
   def render(assigns) do
-    cart_page_subtotal = Cart.calculate_subtotal(assigns.cart_items)
-    assigns = assign(assigns, :cart_page_subtotal, cart_page_subtotal)
+    assigns = assign(assigns, :cart_page_subtotal, Cart.calculate_subtotal(assigns.cart_items))
 
     ~H"""
-    <SimpleshopThemeWeb.PageTemplates.cart
-      theme_settings={@theme_settings}
-      logo_image={@logo_image}
-      header_image={@header_image}
-      cart_items={@cart_items}
-      cart_page_subtotal={@cart_page_subtotal}
-      mode={@mode}
-      cart_count={@cart_count}
-      cart_subtotal={@cart_subtotal}
-      cart_drawer_open={@cart_drawer_open}
-      cart_status={@cart_status}
-    />
+    <SimpleshopThemeWeb.PageTemplates.cart {assigns} />
     """
   end
 end
diff --git a/lib/simpleshop_theme_web/live/shop_live/checkout_success.ex b/lib/simpleshop_theme_web/live/shop_live/checkout_success.ex
index 613d2b6..5dff297 100644
--- a/lib/simpleshop_theme_web/live/shop_live/checkout_success.ex
+++ b/lib/simpleshop_theme_web/live/shop_live/checkout_success.ex
@@ -65,18 +65,7 @@ defmodule SimpleshopThemeWeb.ShopLive.CheckoutSuccess do
   @impl true
   def render(assigns) do
     ~H"""
-    <SimpleshopThemeWeb.PageTemplates.checkout_success
-      theme_settings={@theme_settings}
-      logo_image={@logo_image}
-      header_image={@header_image}
-      mode={@mode}
-      cart_items={@cart_items}
-      cart_count={@cart_count}
-      cart_subtotal={@cart_subtotal}
-      cart_drawer_open={@cart_drawer_open}
-      cart_status={@cart_status}
-      order={@order}
-    />
+    <SimpleshopThemeWeb.PageTemplates.checkout_success {assigns} />
     """
   end
 end
diff --git a/lib/simpleshop_theme_web/live/shop_live/contact.ex b/lib/simpleshop_theme_web/live/shop_live/contact.ex
index 1523193..07c9183 100644
--- a/lib/simpleshop_theme_web/live/shop_live/contact.ex
+++ b/lib/simpleshop_theme_web/live/shop_live/contact.ex
@@ -38,17 +38,7 @@ defmodule SimpleshopThemeWeb.ShopLive.Contact do
   @impl true
   def render(assigns) do
     ~H"""
-    <SimpleshopThemeWeb.PageTemplates.contact
-      theme_settings={@theme_settings}
-      logo_image={@logo_image}
-      header_image={@header_image}
-      mode={@mode}
-      cart_items={@cart_items}
-      cart_count={@cart_count}
-      cart_subtotal={@cart_subtotal}
-      cart_drawer_open={@cart_drawer_open}
-      cart_status={@cart_status}
-    />
+    <SimpleshopThemeWeb.PageTemplates.contact {assigns} />
     """
   end
 end
diff --git a/lib/simpleshop_theme_web/live/shop_live/home.ex b/lib/simpleshop_theme_web/live/shop_live/home.ex
index 6a2099b..793eb58 100644
--- a/lib/simpleshop_theme_web/live/shop_live/home.ex
+++ b/lib/simpleshop_theme_web/live/shop_live/home.ex
@@ -44,18 +44,7 @@ defmodule SimpleshopThemeWeb.ShopLive.Home do
   @impl true
   def render(assigns) do
     ~H"""
-    <SimpleshopThemeWeb.PageTemplates.home
-      theme_settings={@theme_settings}
-      logo_image={@logo_image}
-      header_image={@header_image}
-      preview_data={@preview_data}
-      mode={@mode}
-      cart_items={@cart_items}
-      cart_count={@cart_count}
-      cart_subtotal={@cart_subtotal}
-      cart_drawer_open={@cart_drawer_open}
-      cart_status={@cart_status}
-    />
+    <SimpleshopThemeWeb.PageTemplates.home {assigns} />
     """
   end
 end
diff --git a/lib/simpleshop_theme_web/live/shop_live/product_show.ex b/lib/simpleshop_theme_web/live/shop_live/product_show.ex
index d9092a0..0962eb4 100644
--- a/lib/simpleshop_theme_web/live/shop_live/product_show.ex
+++ b/lib/simpleshop_theme_web/live/shop_live/product_show.ex
@@ -173,25 +173,7 @@ defmodule SimpleshopThemeWeb.ShopLive.ProductShow do
   @impl true
   def render(assigns) do
     ~H"""
-    <SimpleshopThemeWeb.PageTemplates.pdp
-      theme_settings={@theme_settings}
-      logo_image={@logo_image}
-      header_image={@header_image}
-      product={@product}
-      gallery_images={@gallery_images}
-      related_products={@related_products}
-      quantity={@quantity}
-      mode={@mode}
-      cart_items={@cart_items}
-      cart_count={@cart_count}
-      cart_subtotal={@cart_subtotal}
-      cart_drawer_open={@cart_drawer_open}
-      cart_status={@cart_status}
-      option_types={@option_types}
-      selected_options={@selected_options}
-      available_options={@available_options}
-      display_price={@display_price}
-    />
+    <SimpleshopThemeWeb.PageTemplates.pdp {assigns} />
     """
   end
 end