diff --git a/lib/simpleshop_theme_web/components/layouts/shop.html.heex b/lib/simpleshop_theme_web/components/layouts/shop.html.heex
index 66a1217..0543398 100644
--- a/lib/simpleshop_theme_web/components/layouts/shop.html.heex
+++ b/lib/simpleshop_theme_web/components/layouts/shop.html.heex
@@ -1,31 +1 @@
-<!DOCTYPE html>
-<html lang="en" class="h-full">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="csrf-token" content={get_csrf_token()} />
-    <.live_title><%= assigns[:page_title] || @theme_settings.site_name %></.live_title>
-    <link phx-track-static rel="stylesheet" href={~p"/assets/css/app.css"} />
-    <script defer phx-track-static type="text/javascript" src={~p"/assets/js/app.js"}>
-    </script>
-    <!-- Generated theme CSS (only active values, not all variants) -->
-    <style id="theme-css"><%= Phoenix.HTML.raw(@generated_css) %></style>
-  </head>
-  <body class="h-full">
-    <div
-      class="themed shop-root h-full"
-      data-mood={@theme_settings.mood}
-      data-typography={@theme_settings.typography}
-      data-shape={@theme_settings.shape}
-      data-density={@theme_settings.density}
-      data-grid={@theme_settings.grid_columns}
-      data-header={@theme_settings.header_layout}
-      data-sticky={to_string(@theme_settings.sticky_header)}
-      data-layout={@theme_settings.layout_width}
-      data-shadow={@theme_settings.card_shadow}
-      data-button-style={@theme_settings.button_style}
-    >
-      <%= @inner_content %>
-    </div>
-  </body>
-</html>
+<%= @inner_content %>
diff --git a/lib/simpleshop_theme_web/components/layouts/shop_root.html.heex b/lib/simpleshop_theme_web/components/layouts/shop_root.html.heex
index 09c1730..e185c1b 100644
--- a/lib/simpleshop_theme_web/components/layouts/shop_root.html.heex
+++ b/lib/simpleshop_theme_web/components/layouts/shop_root.html.heex
@@ -4,14 +4,28 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="csrf-token" content={get_csrf_token()} />
-    <.live_title default="SimpleshopTheme">
-      {assigns[:page_title]}
-    </.live_title>
+    <.live_title><%= assigns[:page_title] || @theme_settings.site_name %></.live_title>
     <link phx-track-static rel="stylesheet" href={~p"/assets/css/app.css"} />
     <script defer phx-track-static type="text/javascript" src={~p"/assets/js/app.js"}>
     </script>
+    <!-- Generated theme CSS (only active values, not all variants) -->
+    <style id="theme-css"><%= Phoenix.HTML.raw(@generated_css) %></style>
   </head>
   <body class="h-full">
-    {@inner_content}
+    <div
+      class="themed shop-root h-full"
+      data-mood={@theme_settings.mood}
+      data-typography={@theme_settings.typography}
+      data-shape={@theme_settings.shape}
+      data-density={@theme_settings.density}
+      data-grid={@theme_settings.grid_columns}
+      data-header={@theme_settings.header_layout}
+      data-sticky={to_string(@theme_settings.sticky_header)}
+      data-layout={@theme_settings.layout_width}
+      data-shadow={@theme_settings.card_shadow}
+      data-button-style={@theme_settings.button_style}
+    >
+      {@inner_content}
+    </div>
   </body>
 </html>
