diff --git a/src/app/blog/page.tsx b/src/app/blog/page.tsx
index b60f44e..77a55da 100644
--- a/src/app/blog/page.tsx
+++ b/src/app/blog/page.tsx
@@ -28,13 +28,9 @@ export default function BlogPage() {
                         brandName="Baba's Bakery"
                         navItems={[
                             { name: "Home", id: "/" },
-                            { name: "About Us", id: "about" },
-                            { name: "Products", id: "products" },
-                            { name: "Testimonials", id: "testimonials" },
-                            { name: "FAQ", id: "faq" },
-                            { name: "Contact", id: "contact" },
+                            { name: "Shop", id: "/shop" }
                         ]}
-                        button={{ text: "Order Now", href: "#contact" }}
+                        button={{ text: "Shop Now", href: "/shop" }}
                         className="py-4 px-6 md:px-8 lg:px-12 xl:px-16"
                     />
                 </div>
diff --git a/src/app/page.tsx b/src/app/page.tsx
index a16a82e..860ee20 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -41,7 +41,7 @@ export default function LandingPage() {
         <HeroOverlay
           title="Authentic Ukrainian Baking, Made with Love"
           description="Step into Baba's Bakery and discover a taste of tradition. We craft exquisite breads, pastries, and savory delights using time-honored recipes passed down through generations."
-          imageSrc="https://img.b2bpic.net/free-photo/vertical-view-whole-black-bread-brown-towel-potteries-dark-colors-surface_179666-24652.jpg?_wi=1"
+          imageSrc="https://img.b2bpic.net/free-photo/vertical-view-whole-black-bread-brown-towel-potteries-dark-colors-surface_179666-24652.jpg"
           imageAlt="Warm Ukrainian bakery interior with fresh baked goods"
           textPosition="bottom-left"
           showBlur={true}
@@ -134,7 +134,7 @@ export default function LandingPage() {
           textarea={{ name: "message", placeholder: "Your Message or Order Request...", rows: 5, required: true }}
           buttonText="Send Message"
           mediaAnimation="opacity"
-          imageSrc="https://img.b2bpic.net/free-photo/vertical-view-whole-black-bread-brown-towel-potteries-dark-colors-surface_179666-24652.jpg?_wi=2"
+          imageSrc="https://img.b2bpic.net/free-photo/vertical-view-whole-black-bread-brown-towel-potteries-dark-colors-surface_179666-24652.jpg"
           imageAlt="Cozy bakery interior with counter"
           mediaPosition="right"
           useInvertedBackground={false}
diff --git a/src/app/shop/[id]/page.tsx b/src/app/shop/[id]/page.tsx
index a7e3267..1f981bc 100644
--- a/src/app/shop/[id]/page.tsx
+++ b/src/app/shop/[id]/page.tsx
@@ -73,10 +73,6 @@ function ProductPageContent({ params }: ProductPageProps) {
         await checkout(getCheckoutItems(), { successUrl: currentUrl.toString() });
     }, [cartItems, checkout, getCheckoutItems]);
 
-    const themeProviderProps = {
-        defaultButtonVariant: "shift-hover",        defaultTextAnimation: "entrance-slide",        borderRadius: "rounded",        contentWidth: "small",        sizing: "largeSmallSizeLargeTitles",        background: "floatingGradient",        cardStyle: "glass-elevated",        primaryButtonStyle: "shadow",        secondaryButtonStyle: "glass",        headingFontWeight: "bold"
-    };
-
     const navbarProps = {
         brandName: "Baba's Bakery",        navItems: [
             { name: "Home", id: "/" },
@@ -88,7 +84,18 @@ function ProductPageContent({ params }: ProductPageProps) {
 
     if (isLoading) {
         return (
-            <ThemeProvider {...themeProviderProps}>
+            <ThemeProvider
+                defaultButtonVariant="shift-hover"
+                defaultTextAnimation="entrance-slide"
+                borderRadius="rounded"
+                contentWidth="small"
+                sizing="largeSmallSizeLargeTitles"
+                background="floatingGradient"
+                cardStyle="glass-elevated"
+                primaryButtonStyle="shadow"
+                secondaryButtonStyle="glass"
+                headingFontWeight="bold"
+            >
                 <ReactLenis root>
                     <div id="navbar" data-section="navbar">
                         <NavbarLayoutFloatingOverlay {...navbarProps} />
@@ -103,7 +110,18 @@ function ProductPageContent({ params }: ProductPageProps) {
 
     if (!product) {
         return (
-            <ThemeProvider {...themeProviderProps}>
+            <ThemeProvider
+                defaultButtonVariant="shift-hover"
+                defaultTextAnimation="entrance-slide"
+                borderRadius="rounded"
+                contentWidth="small"
+                sizing="largeSmallSizeLargeTitles"
+                background="floatingGradient"
+                cardStyle="glass-elevated"
+                primaryButtonStyle="shadow"
+                secondaryButtonStyle="glass"
+                headingFontWeight="bold"
+            >
                 <ReactLenis root>
                     <div id="navbar" data-section="navbar">
                         <NavbarLayoutFloatingOverlay {...navbarProps} />
@@ -125,7 +143,18 @@ function ProductPageContent({ params }: ProductPageProps) {
     }
 
     return (
-        <ThemeProvider {...themeProviderProps}>
+        <ThemeProvider
+            defaultButtonVariant="shift-hover"
+            defaultTextAnimation="entrance-slide"
+            borderRadius="rounded"
+            contentWidth="small"
+            sizing="largeSmallSizeLargeTitles"
+            background="floatingGradient"
+            cardStyle="glass-elevated"
+            primaryButtonStyle="shadow"
+            secondaryButtonStyle="glass"
+            headingFontWeight="bold"
+        >
             <ReactLenis root>
                 <div id="navbar" data-section="navbar">
                     <NavbarLayoutFloatingOverlay {...navbarProps} />
diff --git a/src/app/shop/page.tsx b/src/app/shop/page.tsx
index 5281186..6a048da 100644
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -40,10 +40,6 @@ function ShopPageContent() {
         await checkout(getCheckoutItems(), { successUrl: currentUrl.toString() });
     }, [cartItems, checkout, getCheckoutItems]);
 
-    const themeProviderProps = {
-        defaultButtonVariant: "shift-hover",        defaultTextAnimation: "entrance-slide",        borderRadius: "rounded",        contentWidth: "small",        sizing: "largeSmallSizeLargeTitles",        background: "floatingGradient",        cardStyle: "glass-elevated",        primaryButtonStyle: "shadow",        secondaryButtonStyle: "glass",        headingFontWeight: "bold"
-    };
-
     const navbarProps = {
         brandName: "Baba's Bakery",        navItems: [
             { name: "Home", id: "/" },
@@ -55,7 +51,18 @@ function ShopPageContent() {
 
     if (isLoading) {
         return (
-            <ThemeProvider {...themeProviderProps}>
+            <ThemeProvider
+                defaultButtonVariant="shift-hover"
+                defaultTextAnimation="entrance-slide"
+                borderRadius="rounded"
+                contentWidth="small"
+                sizing="largeSmallSizeLargeTitles"
+                background="floatingGradient"
+                cardStyle="glass-elevated"
+                primaryButtonStyle="shadow"
+                secondaryButtonStyle="glass"
+                headingFontWeight="bold"
+            >
                 <ReactLenis root>
                     <div id="navbar" data-section="navbar">
                         <NavbarLayoutFloatingOverlay {...navbarProps} />
@@ -69,7 +76,18 @@ function ShopPageContent() {
     }
 
     return (
-        <ThemeProvider {...themeProviderProps}>
+        <ThemeProvider
+            defaultButtonVariant="shift-hover"
+            defaultTextAnimation="entrance-slide"
+            borderRadius="rounded"
+            contentWidth="small"
+            sizing="largeSmallSizeLargeTitles"
+            background="floatingGradient"
+            cardStyle="glass-elevated"
+            primaryButtonStyle="shadow"
+            secondaryButtonStyle="glass"
+            headingFontWeight="bold"
+        >
             <ReactLenis root>
                 <div id="navbar" data-section="navbar">
                     <NavbarLayoutFloatingOverlay {...navbarProps} />