diff --git a/src/app/contact/page.tsx b/src/app/contact/page.tsx
index dfc88e2..4fc466c 100644
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -1,79 +1,200 @@
 "use client";
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
-import ContactText from "@/components/sections/contact/ContactText";
-import FooterBase from "@/components/sections/footer/FooterBase";
+import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay";
+import HeroOverlay from "@/components/sections/hero/HeroOverlay";
+import SplitAbout from "@/components/sections/about/SplitAbout";
+import PricingCardEight from "@/components/sections/pricing/PricingCardEight";
+import FeatureCardTwentyThree from "@/components/sections/feature/FeatureCardTwentyThree";
+import TestimonialCardTwelve from "@/components/sections/testimonial/TestimonialCardTwelve";
+import ContactCTA from "@/components/sections/contact/ContactCTA";
+import FooterMedia from "@/components/sections/footer/FooterMedia";
+import { Linkedin, Twitter, Mail, CheckCircle, Zap, Shield } from "lucide-react";
 
 export default function ContactPage() {
   return (
     <ThemeProvider
-      defaultButtonVariant="hover-magnetic"
+      defaultButtonVariant="hover-bubble"
       defaultTextAnimation="entrance-slide"
       borderRadius="rounded"
-      contentWidth="medium"
-      sizing="mediumLarge"
+      contentWidth="small"
+      sizing="largeSmallSizeLargeTitles"
       background="circleGradient"
-      cardStyle="glass-elevated"
-      primaryButtonStyle="gradient"
-      secondaryButtonStyle="glass"
-      headingFontWeight="semibold"
+      cardStyle="inset"
+      primaryButtonStyle="radial-glow"
+      secondaryButtonStyle="layered"
+      headingFontWeight="medium"
     >
       <div id="nav" data-section="nav">
-        <NavbarLayoutFloatingInline
-          brandName="OW HomeShield"
+        <NavbarLayoutFloatingOverlay
+          brandName="OW HomeShield Inc."
           navItems={[
             { name: "Home", id: "/" },
-            { name: "Services", id: "services" },
-            { name: "Pricing", id: "pricing" },
-            { name: "About", id: "about" }
+            { name: "Membership Plans", id: "pricing" },
+            { name: "Why Choose Us", id: "benefits" },
+            { name: "How It Works", id: "how-it-works" },
+            { name: "Contact", id: "final-cta" }
           ]}
           button={{
-            text: "Get Started",            href: "tel:226-224-3573"
+            text: "Call Now: 226-224-3573",            href: "tel:226-224-3573"
           }}
-          animateOnLoad={true}
         />
       </div>
 
-      <div id="contact" data-section="contact">
-        <ContactText
-          text="Ready to protect your home? Join OW HomeShield today and experience the peace of mind that comes with reliable, professional home maintenance."
-          animationType="entrance-slide"
+      <div id="hero" data-section="hero">
+        <HeroOverlay
+          title="Get in Touch with OW HomeShield"
+          description="Have questions about our membership plans or need immediate assistance? We're here to help."
+          tag="Contact Us"
+          tagAnimation="slide-up"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg"
+          imageAlt="Contact our team"
+          showBlur={true}
+          showDimOverlay={false}
           buttons={[
-            { text: "Start Your Membership", href: "tel:226-224-3573" },
-            { text: "Contact Us", href: "tel:226-224-3573" }
+            { text: "Call Now", href: "tel:226-224-3573" },
+            { text: "Email Us", href: "mailto:info@owhomeshield.com" }
           ]}
+          buttonAnimation="slide-up"
+        />
+      </div>
+
+      <div id="benefits" data-section="benefits">
+        <SplitAbout
+          title="Why Choose OW HomeShield?"
+          description="We pride ourselves on delivering exceptional service across all areas"
+          textboxLayout="default"
+          useInvertedBackground={false}
+          imagePosition="right"
+          mediaAnimation="blur-reveal"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg"
+          imageAlt="Why choose us"
+          bulletPoints={[
+            {
+              title: "Expert Technicians",              description: "Licensed and insured professionals with years of experience",              icon: Shield
+            },
+            {
+              title: "Fast Response",              description: "Quick turnaround times for all service requests",              icon: Zap
+            },
+            {
+              title: "Satisfaction Guaranteed",              description: "We stand behind our work with quality assurance",              icon: CheckCircle
+            }
+          ]}
+        />
+      </div>
+
+      <div id="pricing" data-section="pricing">
+        <PricingCardEight
+          title="Our Membership Plans"
+          description="Choose the perfect plan for your home protection needs"
+          animationType="slide-up"
+          textboxLayout="default"
+          useInvertedBackground={false}
+          plans={[
+            {
+              id: "basic",              badge: "Basic",              price: "$44/month",              subtitle: "Essential coverage",              buttons: [{ text: "Choose Plan", href: "tel:226-224-3573" }],
+              features: ["1 service visit per month", "10% renovation discount", "Email support"]
+            },
+            {
+              id: "standard",              badge: "Most Popular",              price: "$59/month",              subtitle: "Popular choice",              buttons: [{ text: "Choose Plan", href: "tel:226-224-3573" }],
+              features: ["2 service visits per month", "15% renovation discount", "Priority booking", "Phone support"]
+            },
+            {
+              id: "premium",              badge: "Premium",              price: "$84/month",              subtitle: "Full coverage",              buttons: [{ text: "Choose Plan", href: "tel:226-224-3573" }],
+              features: ["Unlimited service requests", "24/7 emergency support", "Priority scheduling", "Dedicated account manager"]
+            }
+          ]}
+        />
+      </div>
+
+      <div id="how-it-works" data-section="how-it-works">
+        <FeatureCardTwentyThree
+          title="How Our Service Works"
+          description="Simple steps to get your home protected"
+          animationType="slide-up"
+          textboxLayout="default"
+          useInvertedBackground={false}
+          features={[
+            {
+              id: "1",              title: "Choose Your Plan",              tags: ["Step 1"],
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",              imageAlt: "Choose your plan"
+            },
+            {
+              id: "2",              title: "Sign Up Online",              tags: ["Step 2"],
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",              imageAlt: "Sign up online"
+            },
+            {
+              id: "3",              title: "Get Immediate Service",              tags: ["Step 3"],
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",              imageAlt: "Get immediate service"
+            }
+          ]}
+        />
+      </div>
+
+      <div id="trust" data-section="trust">
+        <TestimonialCardTwelve
+          testimonials={[
+            {
+              id: "1",              name: "John Smith",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",              imageAlt: "John Smith"
+            },
+            {
+              id: "2",              name: "Sarah Johnson",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",              imageAlt: "Sarah Johnson"
+            },
+            {
+              id: "3",              name: "Mike Davis",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",              imageAlt: "Mike Davis"
+            },
+            {
+              id: "4",              name: "Emily Chen",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",              imageAlt: "Emily Chen"
+            }
+          ]}
+          cardTitle="Over 500+ satisfied customers trust us to keep their homes protected"
+          cardTag="Customer Testimonials"
+          cardAnimation="slide-up"
+          useInvertedBackground={false}
+        />
+      </div>
+
+      <div id="final-cta" data-section="final-cta">
+        <ContactCTA
+          tag="Ready to Get Started?"
+          title="Join OW HomeShield Today"
+          description="Experience the peace of mind that comes with reliable home maintenance and emergency support available 24/7."
+          buttons={[
+            { text: "Start Free Trial", href: "tel:226-224-3573" },
+            { text: "Call Us Now", href: "tel:226-224-3573" }
+          ]}
+          buttonAnimation="slide-up"
           background={{ variant: "plain" }}
           useInvertedBackground={false}
         />
       </div>
 
       <div id="footer" data-section="footer">
-        <FooterBase
-          logoText="OW HomeShield"
+        <FooterMedia
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg"
+          imageAlt="OW HomeShield"
+          logoText="OW HomeShield Inc."
+          copyrightText="© 2025 OW HomeShield Inc. All rights reserved."
           columns={[
-            {
-              title: "Services",              items: [
-                { label: "Plumbing", href: "services" },
-                { label: "HVAC", href: "services" },
-                { label: "Electrical", href: "services" },
-                { label: "General Repairs", href: "services" }
-              ]
-            },
             {
               title: "Company",              items: [
-                { label: "About Us", href: "about" },
-                { label: "Contact", href: "contact" },
-                { label: "Pricing", href: "pricing" },
-                { label: "Blog", href: "#" }
+                { label: "Home", href: "/" },
+                { label: "About", href: "#benefits" },
+                { label: "Contact", href: "#final-cta" }
               ]
             },
             {
-              title: "Support",              items: [
-                { label: "Emergency", href: "tel:226-224-3573" },
-                { label: "FAQ", href: "#" },
-                { label: "Terms", href: "#" },
-                { label: "Privacy", href: "#" }
+              title: "Services",              items: [
+                { label: "Membership Plans", href: "#pricing" },
+                { label: "How It Works", href: "#how-it-works" },
+                { label: "Emergency Support", href: "tel:226-224-3573" }
+              ]
+            },
+            {
+              title: "Contact",              items: [
+                { label: "Call: 226-224-3573", href: "tel:226-224-3573" },
+                { label: "Email: info@owhomeshield.com", href: "mailto:info@owhomeshield.com" },
+                { label: "Available 24/7", href: "#" }
               ]
             }
           ]}
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 27c3051..dc427a0 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,302 +1,241 @@
 "use client";
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
-import HeroSplit from "@/components/sections/hero/HeroSplit";
-import FeatureCardTwentyFive from "@/components/sections/feature/FeatureCardTwentyFive";
-import PricingCardThree from "@/components/sections/pricing/PricingCardThree";
-import TestimonialCardFive from "@/components/sections/testimonial/TestimonialCardFive";
-import ContactText from "@/components/sections/contact/ContactText";
-import FooterBase from "@/components/sections/footer/FooterBase";
-import { Sparkles, Target, Clock, Users, Package } from "lucide-react";
+import NavbarStyleCentered from "@/components/navbar/NavbarStyleCentered/NavbarStyleCentered";
+import HeroBillboardTestimonial from "@/components/sections/hero/HeroBillboardTestimonial";
+import AboutMetric from "@/components/sections/about/AboutMetric";
+import FeatureCardTwentyFour from "@/components/sections/feature/FeatureCardTwentyFour";
+import PricingCardOne from "@/components/sections/pricing/PricingCardOne";
+import TeamCardOne from "@/components/sections/team/TeamCardOne";
+import TestimonialCardFifteen from "@/components/sections/testimonial/TestimonialCardFifteen";
+import ContactCenter from "@/components/sections/contact/ContactCenter";
+import FooterSimple from "@/components/sections/footer/FooterSimple";
+import { TrendingUp, ShoppingCart, Users, Globe } from "lucide-react";
 
-export default function Home() {
+export default function HomePage() {
   return (
     <ThemeProvider
       defaultButtonVariant="hover-magnetic"
       defaultTextAnimation="entrance-slide"
-      borderRadius="rounded"
-      contentWidth="medium"
-      sizing="mediumLarge"
-      background="circleGradient"
+      borderRadius="soft"
+      contentWidth="mediumLarge"
+      sizing="largeSmallSizeLargeTitles"
+      background="aurora"
       cardStyle="glass-elevated"
       primaryButtonStyle="gradient"
       secondaryButtonStyle="glass"
       headingFontWeight="semibold"
     >
       <div id="nav" data-section="nav">
-        <NavbarLayoutFloatingInline
-          brandName="OW HomeShield"
+        <NavbarStyleCentered
+          brandName="Webuild"
           navItems={[
             { name: "Home", id: "/" },
-            { name: "Services", id: "services" },
-            { name: "Pricing", id: "pricing" },
-            { name: "About", id: "about" }
+            { name: "About", id: "#about" },
+            { name: "Features", id: "#features" },
+            { name: "Pricing", id: "#pricing" },
+            { name: "Contact", id: "#contact" }
           ]}
           button={{
-            text: "Get Started",            href: "tel:226-224-3573"
+            text: "Get Started",            href: "contact"
           }}
-          animateOnLoad={true}
         />
       </div>
 
       <div id="hero" data-section="hero">
-        <HeroSplit
-          title="Home Protection Made Simple"
-          description="Professional home maintenance and repairs with affordable membership plans. 24/7 emergency support from licensed technicians."
-          tag="Premium Service"
-          tagIcon={Sparkles}
+        <HeroBillboardTestimonial
+          title="Build Modern Web Experiences"
+          description="Create stunning, responsive websites with our comprehensive component library and modern design system."
+          tag="New Release"
+          tagAnimation="slide-up"
           background={{ variant: "glowing-orb" }}
           imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg"
-          imageAlt="OW HomeShield professional technician"
-          imagePosition="right"
-          mediaAnimation="blur-reveal"
-          buttons={[
-            { text: "Start Your Membership", href: "#pricing" },
-            { text: "Learn More", href: "#services" }
-          ]}
-          buttonAnimation="slide-up"
-          tagAnimation="slide-up"
-        />
-      </div>
-
-      <div id="services" data-section="services">
-        <FeatureCardTwentyFive
-          title="Our Services"
-          description="Comprehensive home maintenance and repair solutions tailored to your needs"
-          tag="What We Offer"
-          tagIcon={Package}
-          features={[
+          imageAlt="Webuild platform showcase"
+          mediaAnimation="slide-up"
+          testimonials={[
             {
-              title: "Plumbing & Water",              description: "Expert plumbing repairs, maintenance, and water system inspections",              icon: Target,
-              mediaItems: [
-                {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",                  imageAlt: "Plumbing service"
-                },
-                {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",                  imageAlt: "Water system inspection"
-                }
-              ]
+              name: "Sarah Johnson",              handle: "CEO, TechCorp",              testimonial: "This platform transformed how we build web experiences. Incredibly intuitive and powerful.",              rating: 5,
+              imageSrc: "https://images.unsplash.com/photo-1494790108377-be9c29b29330?w=100&h=100&fit=crop"
             },
             {
-              title: "HVAC Solutions",              description: "Heating, cooling, and ventilation system maintenance and repair",              icon: Clock,
-              mediaItems: [
-                {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",                  imageAlt: "HVAC maintenance"
-                },
-                {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",                  imageAlt: "System inspection"
-                }
-              ]
-            },
-            {
-              title: "Electrical Work",              description: "Safe and reliable electrical repairs, upgrades, and inspections",              icon: Sparkles,
-              mediaItems: [
-                {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",                  imageAlt: "Electrical service"
-                },
-                {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",                  imageAlt: "Electrical upgrade"
-                }
-              ]
-            },
-            {
-              title: "General Repairs",              description: "Drywall, flooring, doors, windows, and other general home maintenance",              icon: Users,
-              mediaItems: [
-                {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",                  imageAlt: "General repairs"
-                },
-                {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",                  imageAlt: "Home maintenance"
-                }
-              ]
+              name: "Michael Chen",              handle: "Product Designer, InnovateLabs",              testimonial: "The component library saved us months of development time. Highly recommended!",              rating: 5,
+              imageSrc: "https://images.unsplash.com/photo-1507003211169-0a1dd7228f2d?w=100&h=100&fit=crop"
             }
           ]}
-          animationType="slide-up"
-          textboxLayout="default"
-          useInvertedBackground={false}
-          tagAnimation="slide-up"
+          testimonialRotationInterval={5000}
+          buttons={[
+            { text: "Get Started", href: "contact" },
+            { text: "Learn More", href: "#features" }
+          ]}
           buttonAnimation="slide-up"
         />
       </div>
 
       <div id="about" data-section="about">
-        <FeatureCardTwentyFive
-          title="Why Choose OW HomeShield?"
-          description="We're committed to providing the best home maintenance experience with professional service and competitive pricing"
-          tag="Our Commitment"
-          tagIcon={Sparkles}
-          features={[
-            {
-              title: "Expert Technicians",              description: "Licensed, insured, and highly trained professionals with years of experience",              icon: Users,
-              mediaItems: [
-                {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",                  imageAlt: "Expert team"
-                },
-                {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",                  imageAlt: "Professional service"
-                }
-              ]
-            },
-            {
-              title: "24/7 Emergency Support",              description: "Always available when you need help, day or night, holidays included",              icon: Clock,
-              mediaItems: [
-                {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",                  imageAlt: "Emergency support"
-                },
-                {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",                  imageAlt: "Fast response"
-                }
-              ]
-            },
-            {
-              title: "Affordable Plans",              description: "Flexible membership options that fit any budget with transparent pricing",              icon: Package,
-              mediaItems: [
-                {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",                  imageAlt: "Affordable pricing"
-                },
-                {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",                  imageAlt: "Value plans"
-                }
-              ]
-            },
-            {
-              title: "Fast Response Times",              description: "Quick turnaround on service requests and priority scheduling for members",              icon: Target,
-              mediaItems: [
-                {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",                  imageAlt: "Quick response"
-                },
-                {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",                  imageAlt: "Priority service"
-                }
-              ]
-            }
+        <AboutMetric
+          title="Empowering developers to create amazing experiences with a comprehensive design system"
+          metrics={[
+            { icon: TrendingUp, label: "Performance", value: "99.9%" },
+            { icon: ShoppingCart, label: "Trusted Since", value: "2020" },
+            { icon: Users, label: "Active Users", value: "50K+" },
+            { icon: Globe, label: "Global Reach", value: "120+" }
           ]}
+          metricsAnimation="slide-up"
+          useInvertedBackground={false}
+        />
+      </div>
+
+      <div id="features" data-section="features">
+        <FeatureCardTwentyFour
+          title="Powerful Features"
+          description="Everything you need to build beautiful, scalable web applications"
           animationType="slide-up"
           textboxLayout="default"
           useInvertedBackground={false}
-          tagAnimation="slide-up"
-          buttonAnimation="slide-up"
+          features={[
+            {
+              id: "1",              title: "Component Library",              author: "By Webuild Team",              description: "Access 100+ pre-built, customizable components ready for production use.",              tags: ["Design", "Components"],
+              imageSrc: "https://images.unsplash.com/photo-1517694712202-14dd9538aa97?w=600&h=400&fit=crop"
+            },
+            {
+              id: "2",              title: "Design System",              author: "By Webuild Team",              description: "Consistent design tokens and guidelines for scalable applications.",              tags: ["Design", "System"],
+              imageSrc: "https://images.unsplash.com/photo-1561070791-2526d30994b5?w=600&h=400&fit=crop"
+            },
+            {
+              id: "3",              title: "Developer Tools",              author: "By Webuild Team",              description: "Powerful CLI tools and integrations to streamline your workflow.",              tags: ["Tools", "Development"],
+              imageSrc: "https://images.unsplash.com/photo-1517694712202-14dd9538aa97?w=600&h=400&fit=crop"
+            }
+          ]}
         />
       </div>
 
       <div id="pricing" data-section="pricing">
-        <PricingCardThree
-          title="Membership Plans"
-          description="Choose the perfect plan for your home protection needs"
-          tag="Pricing"
-          tagIcon={Package}
-          plans={[
-            {
-              id: "basic",              price: "$44/month",              name: "Basic Plan",              buttons: [
-                { text: "Get Started", href: "tel:226-224-3573" },
-                { text: "Learn More", href: "#" }
-              ],
-              features: [
-                "1 service visit per month",                "10% renovation discount",                "Email support",                "Basic emergency response"
-              ]
-            },
-            {
-              id: "standard",              badge: "Most Popular",              badgeIcon: Sparkles,
-              price: "$59/month",              name: "Standard Plan",              buttons: [
-                { text: "Get Started", href: "tel:226-224-3573" },
-                { text: "Learn More", href: "#" }
-              ],
-              features: [
-                "2 service visits per month",                "15% renovation discount",                "Priority booking",                "Phone & email support",                "24/7 emergency support"
-              ]
-            },
-            {
-              id: "premium",              price: "$84/month",              name: "Premium Plan",              buttons: [
-                { text: "Get Started", href: "tel:226-224-3573" },
-                { text: "Learn More", href: "#" }
-              ],
-              features: [
-                "Unlimited service requests",                "20% renovation discount",                "Premium scheduling",                "Priority phone support",                "24/7 emergency coverage",                "Annual home inspection"
-              ]
-            }
-          ]}
+        <PricingCardOne
+          title="Simple, Transparent Pricing"
+          description="Choose the perfect plan for your needs"
           animationType="slide-up"
           textboxLayout="default"
           useInvertedBackground={false}
-          tagAnimation="slide-up"
-          buttonAnimation="slide-up"
+          plans={[
+            {
+              id: "starter",              badge: "Starter",              price: "$29/mo",              subtitle: "Perfect for individuals",              features: [
+                "Unlimited projects",                "20 component variations",                "Community support",                "Basic analytics"
+              ]
+            },
+            {
+              id: "professional",              badge: "Most Popular",              badgeIcon: undefined,
+              price: "$79/mo",              subtitle: "For growing teams",              features: [
+                "Everything in Starter",                "100+ components",                "Priority email support",                "Advanced analytics",                "Team collaboration"
+              ]
+            },
+            {
+              id: "enterprise",              badge: "Enterprise",              price: "Custom",              subtitle: "For large organizations",              features: [
+                "Everything in Professional",                "Custom components",                "24/7 phone support",                "Dedicated account manager",                "On-premise deployment"
+              ]
+            }
+          ]}
         />
       </div>
 
-      <div id="testimonials" data-section="testimonials">
-        <TestimonialCardFive
-          title="What Our Customers Say"
-          description="Real experiences from satisfied members of OW HomeShield"
-          tag="Testimonials"
-          tagIcon={Users}
-          testimonials={[
+      <div id="team" data-section="team">
+        <TeamCardOne
+          title="Meet Our Team"
+          description="The talented people behind Webuild"
+          textboxLayout="default"
+          gridVariant="four-items-2x2-equal-grid"
+          animationType="slide-up"
+          useInvertedBackground={false}
+          members={[
             {
-              id: "1",              name: "John Smith, Homeowner",              date: "Date: 15 January 2025",              title: "Outstanding Service and Support",              quote: "The team at OW HomeShield was professional and efficient. They fixed my plumbing issue quickly at a fair price. I'm very impressed with their 24/7 support.",              tag: "Premium Member",              avatarSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",              imageAlt: "Satisfied customer"
+              id: "1",              name: "Emily Watson",              role: "Creative Director",              imageSrc: "https://images.unsplash.com/photo-1494790108377-be9c29b29330?w=300&h=300&fit=crop"
             },
             {
-              id: "2",              name: "Sarah Johnson, Property Owner",              date: "Date: 10 January 2025",              title: "Peace of Mind with Every Service",              quote: "I've been a member for 6 months and couldn't be happier. The maintenance visits are thorough, and the emergency support gives me peace of mind.",              tag: "Standard Member",              avatarSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",              imageAlt: "Happy customer"
+              id: "2",              name: "James Rodriguez",              role: "Lead Developer",              imageSrc: "https://images.unsplash.com/photo-1507003211169-0a1dd7228f2d?w=300&h=300&fit=crop"
             },
             {
-              id: "3",              name: "Michael Chen, Real Estate Investor",              date: "Date: 5 January 2025",              title: "Best Investment for My Properties",              quote: "As someone managing multiple properties, OW HomeShield is invaluable. Fast response times and reliable technicians make property maintenance effortless.",              tag: "Premium Member",              avatarSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",              imageAlt: "Professional customer"
+              id: "3",              name: "Sophia Lee",              role: "UX Designer",              imageSrc: "https://images.unsplash.com/photo-1438761681033-6461ffad8d80?w=300&h=300&fit=crop"
             },
             {
-              id: "4",              name: "Emily Rodriguez, Homeowner",              date: "Date: 1 January 2025",              title: "Affordable and Reliable",              quote: "Great value for the price. The membership includes everything I need, and the technicians are always courteous and professional.",              tag: "Basic Member",              avatarSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",              imageAlt: "Satisfied member"
-            },
-            {
-              id: "5",              name: "David Thompson, Property Manager",              date: "Date: 28 December 2024",              title: "Exceptional Support and Expertise",              quote: "I manage 15 properties and OW HomeShield handles maintenance for all of them. The consistency and quality are exceptional.",              tag: "Premium Member",              avatarSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AkUVlKQx6CGDwb0ad68ywE0VM3/uploaded-1773157790240-ol9uxz1g.jpg",              imageAlt: "Professional testimonial"
+              id: "4",              name: "Marcus Johnson",              role: "Product Manager",              imageSrc: "https://images.unsplash.com/photo-1500648767791-00dcc994a43e?w=300&h=300&fit=crop"
             }
           ]}
-          textboxLayout="default"
+        />
+      </div>
+
+      <div id="testimonial" data-section="testimonial">
+        <TestimonialCardFifteen
+          testimonial="Webuild has completely revolutionized how we approach web development. The components are beautifully designed, well-documented, and save us incredible amounts of time. Our team productivity has increased by 40%."
+          rating={5}
+          author="David Park, CTO at StartupHub"
+          avatars={[
+            {
+              src: "https://images.unsplash.com/photo-1500648767791-00dcc994a43e?w=50&h=50&fit=crop",              alt: "David Park"
+            },
+            {
+              src: "https://images.unsplash.com/photo-1507003211169-0a1dd7228f2d?w=50&h=50&fit=crop",              alt: "Team member"
+            },
+            {
+              src: "https://images.unsplash.com/photo-1438761681033-6461ffad8d80?w=50&h=50&fit=crop",              alt: "Team member"
+            }
+          ]}
+          ratingAnimation="slide-up"
+          avatarsAnimation="slide-up"
           useInvertedBackground={false}
-          tagAnimation="slide-up"
-          buttonAnimation="slide-up"
         />
       </div>
 
       <div id="contact" data-section="contact">
-        <ContactText
-          text="Ready to protect your home? Join OW HomeShield today and experience the peace of mind that comes with reliable, professional home maintenance."
-          animationType="entrance-slide"
-          buttons={[
-            { text: "Start Your Membership", href: "tel:226-224-3573" },
-            { text: "Contact Us", href: "tel:226-224-3573" }
-          ]}
-          background={{ variant: "plain" }}
+        <ContactCenter
+          tag="Newsletter"
+          title="Stay Updated with the Latest Features"
+          description="Subscribe to our newsletter to get exclusive updates, tips, and early access to new components."
+          background={{ variant: "rotated-rays-animated-grid" }}
           useInvertedBackground={false}
+          inputPlaceholder="Enter your email"
+          buttonText="Subscribe"
+          termsText="We respect your privacy. Unsubscribe at any time."
+          onSubmit={(email) => console.log("Subscribed:", email)}
         />
       </div>
 
       <div id="footer" data-section="footer">
-        <FooterBase
-          logoText="OW HomeShield"
-          copyrightText="© 2025 OW HomeShield Inc. All rights reserved."
+        <FooterSimple
           columns={[
             {
-              title: "Services",              items: [
-                { label: "Plumbing", href: "services" },
-                { label: "HVAC", href: "services" },
-                { label: "Electrical", href: "services" },
-                { label: "General Repairs", href: "services" }
+              title: "Product",              items: [
+                { label: "Components", href: "#features" },
+                { label: "Pricing", href: "#pricing" },
+                { label: "Documentation", href: "#" },
+                { label: "Updates", href: "#" }
               ]
             },
             {
               title: "Company",              items: [
-                { label: "About Us", href: "about" },
-                { label: "Contact", href: "contact" },
-                { label: "Pricing", href: "pricing" },
-                { label: "Blog", href: "#" }
+                { label: "About", href: "#about" },
+                { label: "Team", href: "#team" },
+                { label: "Blog", href: "#" },
+                { label: "Careers", href: "#" }
               ]
             },
             {
-              title: "Support",              items: [
-                { label: "Emergency", href: "tel:226-224-3573" },
-                { label: "FAQ", href: "#" },
+              title: "Resources",              items: [
+                { label: "Support", href: "#contact" },
+                { label: "Community", href: "#" },
+                { label: "Status", href: "#" },
+                { label: "Contact", href: "#contact" }
+              ]
+            },
+            {
+              title: "Legal",              items: [
+                { label: "Privacy", href: "#" },
                 { label: "Terms", href: "#" },
-                { label: "Privacy", href: "#" }
+                { label: "License", href: "#" },
+                { label: "Cookie Policy", href: "#" }
               ]
             }
           ]}
+          bottomLeftText="© 2025 Webuild. All rights reserved."
+          bottomRightText="Made with Webuild"
         />
       </div>
     </ThemeProvider>
diff --git a/src/app/styles/variables.css b/src/app/styles/variables.css
index fd718b9..9353ce6 100644
--- a/src/app/styles/variables.css
+++ b/src/app/styles/variables.css
@@ -10,15 +10,15 @@
   --accent: #ffffff;
   --background-accent: #ffffff; */
 
-  --background: #ffffff;
-  --card: #f9f9f9;
-  --foreground: #000612e6;
-  --primary-cta: #106EFB;
+  --background: #f7f6f7;
+  --card: #ffffff;
+  --foreground: #1a1a1a;
+  --primary-cta: #0798ff;
   --primary-cta-text: #ffffff;
-  --secondary-cta: #f9f9f9;
+  --secondary-cta: #ffffff;
   --secondary-cta-text: #000612e6;
-  --accent: #e2e2e2;
-  --background-accent: #106EFB;
+  --accent: #93c7ff;
+  --background-accent: #a8cde8;
 
   /* text sizing - set by ThemeProvider */
   /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);