diff --git a/src/pages/HomePage.tsx b/src/pages/HomePage.tsx
index 8a36859..91d2084 100644
--- a/src/pages/HomePage.tsx
+++ b/src/pages/HomePage.tsx
@@ -1,179 +1,146 @@
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import NavbarFloatingLogo from '@/components/ui/NavbarFloatingLogo';
+import HeroCenteredLogos from '@/components/sections/hero/HeroCenteredLogos';
 import AboutFeaturesSplit from '@/components/sections/about/AboutFeaturesSplit';
-import ContactCta from '@/components/sections/contact/ContactCta';
-import FaqTabbedAccordion from '@/components/sections/faq/FaqTabbedAccordion';
 import FeaturesBento from '@/components/sections/features/FeaturesBento';
 import FeaturesImageBento from '@/components/sections/features/FeaturesImageBento';
-import HeroCenteredLogos from '@/components/sections/hero/HeroCenteredLogos';
 import MetricsSimpleCards from '@/components/sections/metrics/MetricsSimpleCards';
 import TestimonialColumnMarqueeCards from '@/components/sections/testimonial/TestimonialColumnMarqueeCards';
-import { Star, User } from "lucide-react";
-import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+import FaqTabbedAccordion from '@/components/sections/faq/FaqTabbedAccordion';
+import ContactCta from '@/components/sections/contact/ContactCta';
+import FooterSimpleMedia from '@/components/sections/footer/FooterSimpleMedia';
 
 export default function HomePage() {
+  const navItems = [
+    { name: "Hero", href: "#hero" },
+    { name: "About", href: "#about" },
+    { name: "Capabilities", href: "#features" },
+    { name: "Catalog", href: "#products" },
+    { name: "Metrics", href: "#metrics" },
+    { name: "Testimonials", href: "#testimonials" },
+    { name: "FAQ", href: "#faq" },
+    { name: "Contact", href: "#contact" }
+  ];
+
   return (
-    <>
-  <div id="hero" data-section="hero">
-    <SectionErrorBoundary name="hero">
-          <HeroCenteredLogos
-      avatarsSrc={[
-        "http://img.b2bpic.net/free-photo/portrait-smiley-business-woman_23-2148603029.jpg",        "http://img.b2bpic.net/free-photo/middle-aged-hispanic-business-person_23-2151098593.jpg",        "http://img.b2bpic.net/free-photo/close-up-positive-businesswoman_1098-3531.jpg",        "http://img.b2bpic.net/free-photo/businesswoman-glasses-portrait_1262-1461.jpg",        "http://img.b2bpic.net/free-photo/smiling-senior-businessman-sitting-stairs_1262-3109.jpg"]}
-      avatarText="Loved by 10,000+ users"
-      title="Finance Meets Ecommerce"
-      description="Unlock seamless financial transactions and global ecommerce experiences with our integrated 3D-powered platform."
-      primaryButton={{
-        text: "Start Exploring",        href: "#products"}}
-      secondaryButton={{
-        text: "Contact Sales",        href: "#contact"}}
-      names={[
-        "Alice",        "Bob",        "Charlie",        "David",        "Eve"]}
-      imageSrc="http://img.b2bpic.net/free-photo/3d-illustration-laptop-with-shopping-basket-paper-bags-online-shopping-e-commerce-concept_58466-14623.jpg"
-    />
-    </SectionErrorBoundary>
-  </div>
-
-  <div id="about" data-section="about">
-    <SectionErrorBoundary name="about">
-          <AboutFeaturesSplit
-      tag="About Us"
-      title="Redefining Digital Commerce"
-      description="We bridge the gap between complex financial infrastructure and user-friendly ecommerce, allowing businesses to scale faster than ever."
-      items={[
-        {
-          icon: "Zap",          title: "Lightning Fast",          description: "Global transactions in milliseconds."},
-        {
-          icon: "Shield",          title: "Secure Payments",          description: "Enterprise-grade protection standard."},
-        {
-          icon: "Globe",          title: "Worldwide Scaling",          description: "Sell globally from day one."},
-      ]}
-      imageSrc="http://img.b2bpic.net/free-photo/young-happy-colleagues-sitting-office-coworking_171337-17717.jpg"
-    />
-    </SectionErrorBoundary>
-  </div>
-
-  <div id="features" data-section="features">
-    <SectionErrorBoundary name="features">
-          <FeaturesBento
-      tag="Capabilities"
-      title="Platform Power"
-      description="Engineered for high-growth digital businesses."
-      features={[
-        {
-          title: "Real-time Metrics",          description: "Visualize your growth.",          bentoComponent: "animated-bar-chart"
-        },
-        {
-          title: "Global Logistics",          description: "Automated order management.",          bentoComponent: "checklist-timeline",          heading: "Order Processing",          subheading: "Effortless flow",          checklistItems: [
-            {
-              label: "Verified",              detail: "Data validated"},
-            {
-              label: "Shipped",              detail: "Package dispatched"},
-            {
-              label: "Delivered",              detail: "Arrival confirmed"},
-          ],
-          completedLabel: "Done"
-        },
-        {
-          title: "Smart Support",          description: "AI-powered customer interaction.",          bentoComponent: "chat-marquee",          aiIcon: "Star",          userIcon: "User",          exchanges: [
-            {
-              userMessage: "Help!",              aiResponse: "I'm on it."},
-          ],
-          placeholder: "Chat with AI..."
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
-
-  <div id="products" data-section="products">
-    <SectionErrorBoundary name="products">
-          <FeaturesImageBento
-      tag="Catalog"
-      title="Our Solutions"
-      description="A curated suite of tools for the modern entrepreneur."
-      items={[
-        { title: "Product Alpha", description: "High performance module", imageSrc: "http://img.b2bpic.net/free-photo/pattern-glass-product-backdrop-with-stand_53876-125894.jpg" },
-        { title: "Product Beta", description: "Advanced analytics suite", imageSrc: "http://img.b2bpic.net/free-photo/smartphone-white-wireless-charger-pad_53876-97100.jpg" },
-        { title: "Product Gamma", description: "Integrated gateway", imageSrc: "http://img.b2bpic.net/free-photo/beautiful-concept-with-prism-light-deflection_23-2148599275.jpg" },
-        { title: "Product Delta", description: "Mobile commerce toolkit", imageSrc: "http://img.b2bpic.net/free-photo/online-shopping-concept_23-2151896814.jpg" },
-        { title: "Product Epsilon", description: "Marketing automation", imageSrc: "http://img.b2bpic.net/free-photo/gift-voucher-coupon-discount-special-offer_53876-124857.jpg" },
-        { title: "Product Zeta", description: "Customer insights engine", imageSrc: "http://img.b2bpic.net/free-photo/blue-model-career-kit-arrangement_23-2150083999.jpg" },
-        { title: "Product Omega", description: "Security core", imageSrc: "http://img.b2bpic.net/free-photo/rows-film-near-camera_23-2147852535.jpg" }
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
-
-  <div id="metrics" data-section="metrics">
-    <SectionErrorBoundary name="metrics">
-          <MetricsSimpleCards
-      tag="Performance"
-      title="By the Numbers"
-      description="Proven results for growing brands."
-      metrics={[
-        {
-          value: "150M+",          description: "Annual Transactions"},
-        {
-          value: "99.9%",          description: "System Uptime"},
-        {
-          value: "50K+",          description: "Active Businesses"},
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
-
-  <div id="testimonials" data-section="testimonials">
-    <SectionErrorBoundary name="testimonials">
-          <TestimonialColumnMarqueeCards
-      tag="Social Proof"
-      title="Trusted by Leaders"
-      description="Global brands trust us with their commerce engine."
-      testimonials={[
-        {
-          name: "Jane Smith",          role: "CEO",          quote: "Incredible integration speed.",          imageSrc: "http://img.b2bpic.net/free-photo/joyful-woman-black-jacket-liking-lip-posing-isolated-background-charming-lady-dark-suit-smiling-white-backdrop_197531-18516.jpg"},
-        {
-          name: "John Doe",          role: "CTO",          quote: "Rock solid security standards.",          imageSrc: "http://img.b2bpic.net/free-photo/confident-businessman-with-beard-smiling-camera-generated-by-ai_188544-33152.jpg"},
-        {
-          name: "Emily White",          role: "Founder",          quote: "Scaled globally in weeks.",          imageSrc: "http://img.b2bpic.net/free-photo/beautiful-corporate-woman-looks-dreamy-smiles-stands-outside-street-leans-her-head-hands-d_1258-123449.jpg"},
-        {
-          name: "Michael Brown",          role: "Head of Ops",          quote: "Operations are now streamlined.",          imageSrc: "http://img.b2bpic.net/free-photo/portrait-grey-haired-businessman-standing_74855-10324.jpg"},
-        {
-          name: "Sarah Lee",          role: "CMO",          quote: "Best-in-class UI experience.",          imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-smiling-beautiful-woman-years-old-wearing-corporate-clothing-looking-happy_1258-194086.jpg"},
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
-
-  <div id="faq" data-section="faq">
-    <SectionErrorBoundary name="faq">
-          <FaqTabbedAccordion
-      tag="Knowledge Hub"
-      title="Common Questions"
-      description="Get quick answers about our platform."
-      categories={[
-        {
-          name: "General",          items: [
-            {
-              question: "Is it free?",              answer: "We offer a trial."},
-            {
-              question: "Is it secure?",              answer: "Bank grade encryption."},
-          ],
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
-
-  <div id="contact" data-section="contact">
-    <SectionErrorBoundary name="contact">
-          <ContactCta
-      tag="Get Started"
-      text="Ready to scale your business?"
-      primaryButton={{
-        text: "Contact Support",        href: "#"}}
-      secondaryButton={{
-        text: "Learn More",        href: "#"}}
-    />
-    </SectionErrorBoundary>
-  </div>
-    </>
+    <ThemeProvider defaultButtonVariant="gradient" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass">
+      <div id="nav" data-section="nav" data-webild-component="NavbarFloatingLogo" data-webild-component-path="@/components/ui/NavbarFloatingLogo">
+        <NavbarFloatingLogo
+          logo="FinCommerce"
+          logoImageSrc="http://img.b2bpic.net/free-photo/25th-years-anniversary-celebration-3d-render_460848-8295.jpg"
+          navItems={navItems}
+          ctaButton={{ text: "Get Started", href: "#contact" }}
+        />
+      </div>
+      <div id="hero" data-section="hero" data-webild-component="HeroCenteredLogos" data-webild-component-path="@/components/sections/hero/HeroCenteredLogos">
+        <HeroCenteredLogos
+          avatarsSrc={["http://img.b2bpic.net/free-photo/portrait-smiley-business-woman_23-2148603029.jpg","http://img.b2bpic.net/free-photo/middle-aged-hispanic-business-person_23-2151098593.jpg","http://img.b2bpic.net/free-photo/close-up-positive-businesswoman_1098-3531.jpg","http://img.b2bpic.net/free-photo/businesswoman-glasses-portrait_1262-1461.jpg","http://img.b2bpic.net/free-photo/smiling-senior-businessman-sitting-stairs_1262-3109.jpg"]}
+          avatarText="Loved by 10,000+ users"
+          title="Finance Meets Ecommerce"
+          description="Unlock seamless financial transactions and global ecommerce experiences with our integrated 3D-powered platform."
+          primaryButton={{ text: "Start Exploring", href: "#products" }}
+          secondaryButton={{ text: "Contact Sales", href: "#contact" }}
+          names={["Alice","Bob","Charlie","David","Eve"]}
+          imageSrc="http://img.b2bpic.net/free-photo/3d-illustration-laptop-with-shopping-basket-paper-bags-online-shopping-e-commerce-concept_58466-14623.jpg"
+        />
+      </div>
+      <div id="about" data-section="about" data-webild-component="AboutFeaturesSplit" data-webild-component-path="@/components/sections/about/AboutFeaturesSplit">
+        <AboutFeaturesSplit
+          tag="About Us"
+          title="Redefining Digital Commerce"
+          description="We bridge the gap between complex financial infrastructure and user-friendly ecommerce, allowing businesses to scale faster than ever."
+          items={[
+            { icon: "Zap", title: "Lightning Fast", description: "Global transactions in milliseconds." },
+            { icon: "Shield", title: "Secure Payments", description: "Enterprise-grade protection standard." },
+            { icon: "Globe", title: "Worldwide Scaling", description: "Sell globally from day one." }
+          ]}
+          imageSrc="http://img.b2bpic.net/free-photo/young-happy-colleagues-sitting-office-coworking_171337-17717.jpg"
+        />
+      </div>
+      <div id="features" data-section="features" data-webild-component="FeaturesBento" data-webild-component-path="@/components/sections/features/FeaturesBento">
+        <FeaturesBento
+          tag="Capabilities"
+          title="Platform Power"
+          description="Engineered for high-growth digital businesses."
+          features={[
+            { title: "Real-time Metrics", description: "Visualize your growth.", bentoComponent: "animated-bar-chart" },
+            { title: "Global Logistics", description: "Automated order management.", bentoComponent: "checklist-timeline", heading: "Order Processing", subheading: "Effortless flow", checklistItems: [{ label: "Verified", detail: "Data validated" }, { label: "Shipped", detail: "Package dispatched" }, { label: "Delivered", detail: "Arrival confirmed" }], completedLabel: "Done" },
+            { title: "Smart Support", description: "AI-powered customer interaction.", bentoComponent: "chat-marquee", aiIcon: "Star", userIcon: "User", exchanges: [{ userMessage: "Help!", aiResponse: "I'm on it." }], placeholder: "Chat with AI..." }
+          ]}
+        />
+      </div>
+      <div id="products" data-section="products" data-webild-component="FeaturesImageBento" data-webild-component-path="@/components/sections/features/FeaturesImageBento">
+        <FeaturesImageBento
+          tag="Catalog"
+          title="Our Solutions"
+          description="A curated suite of tools for the modern entrepreneur."
+          items={[
+            { title: "Product Alpha", description: "High performance module", imageSrc: "http://img.b2bpic.net/free-photo/pattern-glass-product-backdrop-with-stand_53876-125894.jpg" },
+            { title: "Product Beta", description: "Advanced analytics suite", imageSrc: "http://img.b2bpic.net/free-photo/smartphone-white-wireless-charger-pad_53876-97100.jpg" },
+            { title: "Product Gamma", description: "Integrated gateway", imageSrc: "http://img.b2bpic.net/free-photo/beautiful-concept-with-prism-light-deflection_23-2148599275.jpg" },
+            { title: "Product Delta", description: "Mobile commerce toolkit", imageSrc: "http://img.b2bpic.net/free-photo/online-shopping-concept_23-2151896814.jpg" },
+            { title: "Product Epsilon", description: "Marketing automation", imageSrc: "http://img.b2bpic.net/free-photo/gift-voucher-coupon-discount-special-offer_53876-124857.jpg" },
+            { title: "Product Zeta", description: "Customer insights engine", imageSrc: "http://img.b2bpic.net/free-photo/blue-model-career-kit-arrangement_23-2150083999.jpg" },
+            { title: "Product Omega", description: "Security core", imageSrc: "http://img.b2bpic.net/free-photo/rows-film-near-camera_23-2147852535.jpg" }
+          ]}
+        />
+      </div>
+      <div id="metrics" data-section="metrics" data-webild-component="MetricsSimpleCards" data-webild-component-path="@/components/sections/metrics/MetricsSimpleCards">
+        <MetricsSimpleCards
+          tag="Performance"
+          title="By the Numbers"
+          description="Proven results for growing brands."
+          metrics={[
+            { value: "150M+", description: "Annual Transactions" },
+            { value: "99.9%", description: "System Uptime" },
+            { value: "50K+", description: "Active Businesses" }
+          ]}
+        />
+      </div>
+      <div id="testimonials" data-section="testimonials" data-webild-component="TestimonialColumnMarqueeCards" data-webild-component-path="@/components/sections/testimonial/TestimonialColumnMarqueeCards">
+        <TestimonialColumnMarqueeCards
+          tag="Social Proof"
+          title="Trusted by Leaders"
+          description="Global brands trust us with their commerce engine."
+          testimonials={[
+            { name: "Jane Smith", role: "CEO", quote: "Incredible integration speed.", imageSrc: "http://img.b2bpic.net/free-photo/joyful-woman-black-jacket-liking-lip-posing-isolated-background-charming-lady-dark-suit-smiling-white-backdrop_197531-18516.jpg" },
+            { name: "John Doe", role: "CTO", quote: "Rock solid security standards.", imageSrc: "http://img.b2bpic.net/free-photo/confident-businessman-with-beard-smiling-camera-generated-by-ai_188544-33152.jpg" },
+            { name: "Emily White", role: "Founder", quote: "Scaled globally in weeks.", imageSrc: "http://img.b2bpic.net/free-photo/beautiful-corporate-woman-looks-dreamy-smiles-stands-outside-street-leans-her-head-hands_1258-123449.jpg" },
+            { name: "Michael Brown", role: "Head of Ops", quote: "Operations are now streamlined.", imageSrc: "http://img.b2bpic.net/free-photo/portrait-grey-haired-businessman-standing_74855-10324.jpg" },
+            { name: "Sarah Lee", role: "CMO", quote: "Best-in-class UI experience.", imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-smiling-beautiful-woman-years-old-wearing-corporate-clothing-looking-happy_1258-194086.jpg" }
+          ]}
+        />
+      </div>
+      <div id="faq" data-section="faq" data-webild-component="FaqTabbedAccordion" data-webild-component-path="@/components/sections/faq/FaqTabbedAccordion">
+        <FaqTabbedAccordion
+          tag="Knowledge Hub"
+          title="Common Questions"
+          description="Get quick answers about our platform."
+          categories={[
+            { name: "General", items: [{ question: "Is it free?", answer: "We offer a trial." }, { question: "Is it secure?", answer: "Bank grade encryption." }] }
+          ]}
+        />
+      </div>
+      <div id="contact" data-section="contact" data-webild-component="ContactCta" data-webild-component-path="@/components/sections/contact/ContactCta">
+        <ContactCta
+          tag="Get Started"
+          text="Ready to scale your business?"
+          primaryButton={{ text: "Contact Support", href: "#" }}
+          secondaryButton={{ text: "Learn More", href: "#" }}
+        />
+      </div>
+      <div id="footer" data-section="footer" data-webild-component="FooterSimpleMedia" data-webild-component-path="@/components/sections/footer/FooterSimpleMedia">
+        <FooterSimpleMedia
+          brand="FinCommerce"
+          columns={[
+            { title: "Company", items: [{ label: "About", href: "#" }] },
+            { title: "Legal", items: [{ label: "Privacy", href: "#" }] }
+          ]}
+          copyright="© 2024 FinCommerce. All rights reserved."
+          links={[{ label: "Twitter", href: "#" }]}
+          imageSrc="http://img.b2bpic.net/free-photo/25th-years-anniversary-celebration-3d-render_460848-8295.jpg"
+        />
+      </div>
+    </ThemeProvider>
   );
-}
+}
\ No newline at end of file