diff --git a/src/app/contact/page.tsx b/src/app/contact/page.tsx
index 6cb72a4..f3b9ff3 100644
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import NavbarStyleCentered from "@/components/navbar/NavbarStyleCentered/NavbarStyleCentered";
+import NavbarStyleApple from "@/components/navbar/NavbarStyleApple/NavbarStyleApple";
 import HeroBillboardCarousel from "@/components/sections/hero/HeroBillboardCarousel";
 import FeatureCardTwentyFive from "@/components/sections/feature/FeatureCardTwentyFive";
 import TestimonialCardThirteen from "@/components/sections/testimonial/TestimonialCardThirteen";
@@ -14,8 +14,7 @@ export default function ContactPage() {
     { name: "Home", id: "/" },
     { name: "Services", id: "services" },
     { name: "About", id: "about" },
-    { name: "Portfolio", id: "portfolio" },
-    { name: "Contact", id: "contact" },
+    { name: "Contact", id: "/contact" },
   ];
 
   const contactButton = {
@@ -36,9 +35,8 @@ export default function ContactPage() {
       headingFontWeight="bold"
     >
       <div id="nav" data-section="nav">
-        <NavbarStyleCentered
+        <NavbarStyleApple
           navItems={navItems}
-          button={contactButton}
           brandName="Earl Boys Services"
         />
       </div>
@@ -233,4 +231,4 @@ export default function ContactPage() {
       </div>
     </ThemeProvider>
   );
-}
\ No newline at end of file
+}
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 9f2d841..4b02a3f 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,34 +1,22 @@
 "use client";
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import NavbarStyleCentered from "@/components/navbar/NavbarStyleCentered/NavbarStyleCentered";
-import HeroBillboardCarousel from "@/components/sections/hero/HeroBillboardCarousel";
-import FeatureCardTwentyFive from "@/components/sections/feature/FeatureCardTwentyFive";
+import NavbarStyleApple from "@/components/navbar/NavbarStyleApple/NavbarStyleApple";
+import HeroBillboardRotatedCarousel from "@/components/sections/hero/HeroBillboardRotatedCarousel";
+import FeatureCardTen from "@/components/sections/feature/FeatureCardTen";
 import TestimonialCardTwelve from "@/components/sections/testimonial/TestimonialCardTwelve";
-import MetricCardOne from "@/components/sections/metrics/MetricCardOne";
-import FaqSplitText from "@/components/sections/faq/FaqSplitText";
-import FooterCard from "@/components/sections/footer/FooterCard";
-import Link from "next/link";
-import {
-  Hammer,
-  Wrench,
-  Droplet,
-  Paintbrush,
-  Zap,
-  MonitorPlay,
-  Armchair,
-  Layers,
-  Clock,
-  Users,
-  CheckCircle,
-  TrendingUp,
-  Star,
-  Facebook,
-  Instagram,
-  Phone,
-} from "lucide-react";
+import FaqDouble from "@/components/sections/faq/FaqDouble";
+import FooterBaseReveal from "@/components/sections/footer/FooterBaseReveal";
+import { Sparkles, CheckCircle, TrendingUp, Users } from "lucide-react";
+
+export default function Home() {
+  const navItems = [
+    { name: "Home", id: "/" },
+    { name: "Services", id: "services" },
+    { name: "About", id: "about" },
+    { name: "Contact", id: "/contact" },
+  ];
 
-export default function HomePage() {
   return (
     <ThemeProvider
       defaultButtonVariant="hover-magnetic"
@@ -36,184 +24,93 @@ export default function HomePage() {
       borderRadius="rounded"
       contentWidth="smallMedium"
       sizing="mediumLargeSizeLargeTitles"
-      background="noise"
+      background="circleGradient"
       cardStyle="solid"
       primaryButtonStyle="primary-glow"
       secondaryButtonStyle="glass"
       headingFontWeight="bold"
     >
       <div id="nav" data-section="nav">
-        <NavbarStyleCentered
-          brandName="Earl Boys Services"
-          navItems={[
-            { name: "Home", id: "home" },
-            { name: "Services", id: "services" },
-            { name: "About", id: "about" },
-            { name: "Portfolio", id: "portfolio" },
-            { name: "Contact", id: "contact" },
-          ]}
-          button={{
-            text: "Call Now",
-            href: "tel:804-938-0669",
-          }}
-        />
+        <NavbarStyleApple navItems={navItems} brandName="Earl Boys Services" />
       </div>
 
       <div id="hero" data-section="hero">
-        <HeroBillboardCarousel
-          title="Professional Home Services in Richmond, VA"
-          description="Expert solutions for all your home improvement, repair, and maintenance needs. 10+ services to transform your home. Call 804-938-0669"
+        <HeroBillboardRotatedCarousel
+          title="Transform Your Home with Professional Services"
+          description="Expert home services in Richmond, VA. From plumbing and electrical work to painting and flooring, we deliver quality craftsmanship every time."
           tag="Earl Boys Services"
-          tagIcon={Hammer}
+          tagIcon={Sparkles}
           tagAnimation="slide-up"
-          background={{ variant: "plain" }}
-          mediaItems={[
+          background={{ variant: "sparkles-gradient" }}
+          carouselItems={[
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/young-cute-family-repairs-room_1157-24897.jpg?_wi=1",
-              imageAlt: "Professional home services team",
-            },
+              id: "1",              imageSrc: "http://img.b2bpic.net/free-photo/young-cute-family-repairs-room_1157-24897.jpg",              imageAlt: "Professional home services team"},
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/plumbing-professional-doing-his-job_23-2150721573.jpg?_wi=1",
-              imageAlt: "Expert plumbing services",
-            },
+              id: "2",              imageSrc: "http://img.b2bpic.net/free-photo/plumbing-professional-doing-his-job_23-2150721573.jpg",              imageAlt: "Expert plumbing services"},
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-woman-painting-wall-home_23-2149098981.jpg?_wi=1",
-              imageAlt: "Professional painting services",
-            },
+              id: "3",              imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-woman-painting-wall-home_23-2149098981.jpg",              imageAlt: "Professional painting services"},
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/woman-electrician-checks-switchboard-tablet-night-shift-smart-service_169016-70936.jpg?_wi=1",
-              imageAlt: "Licensed electrical work",
-            },
+              id: "4",              imageSrc: "http://img.b2bpic.net/free-photo/woman-electrician-checks-switchboard-tablet-night-shift-smart-service_169016-70936.jpg",              imageAlt: "Licensed electrical work"},
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/mechanics-checking-planning-workshop_329181-11868.jpg?_wi=1",
-              imageAlt: "General maintenance services",
-            },
+              id: "5",              imageSrc: "http://img.b2bpic.net/free-photo/mechanics-checking-planning-workshop_329181-11868.jpg",              imageAlt: "General maintenance services"},
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/circular-saw-carpenter-using-circular-saw-wood_169016-17039.jpg?_wi=1",
-              imageAlt: "Professional flooring installation",
-            },
+              id: "6",              imageSrc: "http://img.b2bpic.net/free-photo/circular-saw-carpenter-using-circular-saw-wood_169016-17039.jpg",              imageAlt: "Professional flooring installation"},
           ]}
           buttons={[
             {
-              text: "Call Now: 804-938-0669",
-              href: "tel:804-938-0669",
-            },
+              text: "Get Free Estimate",              href: "/contact"},
             {
-              text: "Book a Service",
-              href: "contact",
-            },
+              text: "Call: 804-938-0669",              href: "tel:804-938-0669"},
           ]}
           buttonAnimation="slide-up"
-          ariaLabel="Hero section for Earl Boys Services"
+          ariaLabel="Hero section showcasing home services"
         />
       </div>
 
-      <div id="services-home" data-section="services-home">
-        <FeatureCardTwentyFive
+      <div id="services" data-section="services">
+        <FeatureCardTen
+          title="Our Services"
+          description="Comprehensive home services designed to meet all your residential needs with professional expertise and quality craftsmanship."
+          tag="What We Offer"
+          tagIcon={Sparkles}
           features={[
             {
-              title: "Plumbing Services",
-              description: "Expert plumbing repairs, installations, and maintenance for all your home water systems.",
-              icon: Droplet,
-              mediaItems: [
-                {
-                  imageSrc: "http://img.b2bpic.net/free-photo/plumbing-professional-doing-his-job_23-2150721573.jpg?_wi=2",
-                  imageAlt: "Professional plumbing work",
-                },
-                {
-                  imageSrc: "http://img.b2bpic.net/free-photo/close-up-smiley-man-receiving-box_23-2149103401.jpg?_wi=1",
-                  imageAlt: "Plumbing project completed",
-                },
+              id: "1",              title: "Plumbing Services",              description: "From routine maintenance to complex repairs, our licensed plumbers handle all your plumbing needs with precision and care.",              media: {
+                imageSrc: "http://img.b2bpic.net/free-photo/plumbing-professional-doing-his-job_23-2150721573.jpg",                imageAlt: "Professional plumbing work"},
+              items: [
+                { icon: CheckCircle, text: "Leak detection & repair" },
+                { icon: CheckCircle, text: "Pipe installation" },
+                { icon: CheckCircle, text: "Drain cleaning" },
               ],
+              reverse: false,
             },
             {
-              title: "Painting Services",
-              description: "Interior and exterior painting with premium finishes for residential and commercial spaces.",
-              icon: Paintbrush,
-              mediaItems: [
-                {
-                  imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-woman-painting-wall-home_23-2149098981.jpg?_wi=2",
-                  imageAlt: "Professional painting service",
-                },
-                {
-                  imageSrc: "http://img.b2bpic.net/free-photo/close-up-woman-man-choosing-color_23-2148903521.jpg?_wi=1",
-                  imageAlt: "Painting transformation",
-                },
+              id: "2",              title: "Electrical Services",              description: "Safe, reliable electrical work for all your home needs. Licensed electricians providing installations, repairs, and upgrades.",              media: {
+                imageSrc: "http://img.b2bpic.net/free-photo/woman-electrician-checks-switchboard-tablet-night-shift-smart-service_169016-70936.jpg",                imageAlt: "Professional electrical work"},
+              items: [
+                { icon: CheckCircle, text: "Circuit installation" },
+                { icon: CheckCircle, text: "Outlet & switch repairs" },
+                { icon: CheckCircle, text: "Safety inspections" },
               ],
+              reverse: true,
             },
             {
-              title: "Electrical Work",
-              description: "Licensed electrical services including installations, repairs, and safety inspections.",
-              icon: Zap,
-              mediaItems: [
-                {
-                  imageSrc: "http://img.b2bpic.net/free-photo/woman-electrician-checks-switchboard-tablet-night-shift-smart-service_169016-70936.jpg?_wi=2",
-                  imageAlt: "Professional electrical work",
-                },
-                {
-                  imageSrc: "http://img.b2bpic.net/free-photo/young-couple-moving-new-home_23-2149242082.jpg?_wi=1",
-                  imageAlt: "Electrical project completed",
-                },
-              ],
-            },
-            {
-              title: "Wall Mounting",
-              description: "Professional TV mounting, shelving installation, and wall customization services.",
-              icon: MonitorPlay,
-              mediaItems: [
-                {
-                  imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-builder-men-with-smartphones_23-2148751993.jpg?_wi=1",
-                  imageAlt: "Professional wall mounting",
-                },
-                {
-                  imageSrc: "http://img.b2bpic.net/free-photo/close-up-smiley-man-receiving-box_23-2149103401.jpg?_wi=2",
-                  imageAlt: "Wall mounting installation",
-                },
-              ],
-            },
-            {
-              title: "Furniture Assembly",
-              description: "Quick and efficient furniture assembly for residential and commercial installations.",
-              icon: Armchair,
-              mediaItems: [
-                {
-                  imageSrc: "http://img.b2bpic.net/free-photo/close-up-man-hitting-nail-by-hammer_329181-3740.jpg?_wi=1",
-                  imageAlt: "Professional furniture assembly",
-                },
-                {
-                  imageSrc: "http://img.b2bpic.net/free-photo/close-up-woman-man-choosing-color_23-2148903521.jpg?_wi=2",
-                  imageAlt: "Furniture installation completed",
-                },
-              ],
-            },
-            {
-              title: "Flooring Installation",
-              description: "Expert flooring installation for hardwood, tile, laminate, and other materials.",
-              icon: Layers,
-              mediaItems: [
-                {
-                  imageSrc: "http://img.b2bpic.net/free-photo/circular-saw-carpenter-using-circular-saw-wood_169016-17039.jpg?_wi=2",
-                  imageAlt: "Professional flooring installation",
-                },
-                {
-                  imageSrc: "http://img.b2bpic.net/free-photo/young-couple-moving-new-home_23-2149242082.jpg?_wi=2",
-                  imageAlt: "Flooring project transformation",
-                },
+              id: "3",              title: "Painting & Finishing",              description: "Transform your space with professional painting services. Interior and exterior work with attention to detail and quality finishes.",              media: {
+                imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-woman-painting-wall-home_23-2149098981.jpg",                imageAlt: "Professional painting services"},
+              items: [
+                { icon: CheckCircle, text: "Interior painting" },
+                { icon: CheckCircle, text: "Exterior painting" },
+                { icon: CheckCircle, text: "Surface preparation" },
               ],
+              reverse: false,
             },
           ]}
           animationType="slide-up"
-          title="Our Expert Services"
-          description="Comprehensive home services tailored to your needs. From plumbing to painting, we handle it all with professional excellence."
-          tag="10 Services"
-          tagIcon={Wrench}
           textboxLayout="default"
           useInvertedBackground={false}
           buttons={[
             {
-              text: "View All Services",
-              href: "/services",
-            },
+              text: "Schedule Service",              href: "/contact"},
           ]}
           buttonAnimation="slide-up"
         />
@@ -223,147 +120,62 @@ export default function HomePage() {
         <TestimonialCardTwelve
           testimonials={[
             {
-              id: "1",
-              name: "Sarah Johnson",
-              imageSrc: "http://img.b2bpic.net/free-photo/portrait-smiley-businessman-close-up_23-2148746290.jpg",
-              imageAlt: "Sarah Johnson testimonial",
-            },
+              id: "1",              name: "John Mitchell",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AOwz6pWy3usOcBMo4WS6AXnICI/uploaded-1773139927112-860778c6.png",              imageAlt: "John Mitchell"},
             {
-              id: "2",
-              name: "Michael Chen",
-              imageSrc: "http://img.b2bpic.net/free-photo/happy-man-with-thumbs-up_1187-3144.jpg",
-              imageAlt: "Michael Chen testimonial",
-            },
+              id: "2",              name: "Sarah Thompson",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AOwz6pWy3usOcBMo4WS6AXnICI/uploaded-1773139927112-860778c6.png",              imageAlt: "Sarah Thompson"},
             {
-              id: "3",
-              name: "Emily Rodriguez",
-              imageSrc: "http://img.b2bpic.net/free-photo/headshot-euphoric-successful-businesswoman_273609-13789.jpg",
-              imageAlt: "Emily Rodriguez testimonial",
-            },
+              id: "3",              name: "Michael Chen",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AOwz6pWy3usOcBMo4WS6AXnICI/uploaded-1773139927112-860778c6.png",              imageAlt: "Michael Chen"},
             {
-              id: "4",
-              name: "David Williams",
-              imageSrc: "http://img.b2bpic.net/free-photo/young-man-holding-house-model-t-shirt-jacket-cap-looking-amazed-front-view_176474-57861.jpg",
-              imageAlt: "David Williams testimonial",
-            },
+              id: "4",              name: "Jennifer Rodriguez",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AOwz6pWy3usOcBMo4WS6AXnICI/uploaded-1773139927112-860778c6.png",              imageAlt: "Jennifer Rodriguez"},
           ]}
-          cardTitle="Over 2,000+ satisfied customers trust Earl Boys Services for their home improvement needs"
-          cardTag="Customer Reviews"
-          cardTagIcon={Star}
-          cardAnimation="slide-up"
+          cardTitle="Over 1,000 satisfied customers trust Earl Boys Services"
+          cardTag="See what they say"
           useInvertedBackground={false}
-        />
-      </div>
-
-      <div id="metrics" data-section="metrics">
-        <MetricCardOne
-          metrics={[
-            {
-              id: "1",
-              value: "15",
-              title: "Years",
-              description: "In business serving Richmond VA",
-              icon: Clock,
-            },
-            {
-              id: "2",
-              value: "2000",
-              title: "Customers",
-              description: "Satisfied homeowners and businesses",
-              icon: Users,
-            },
-            {
-              id: "3",
-              value: "98",
-              title: "Percent",
-              description: "Customer satisfaction rating",
-              icon: CheckCircle,
-            },
-            {
-              id: "4",
-              value: "10",
-              title: "Services",
-              description: "Complete home service solutions",
-              icon: Wrench,
-            },
-          ]}
-          animationType="slide-up"
-          gridVariant="uniform-all-items-equal"
-          title="By The Numbers"
-          description="Earl Boys Services is Richmond's trusted home services leader with proven results."
-          tag="Our Success"
-          tagIcon={TrendingUp}
-          textboxLayout="default"
-          useInvertedBackground={true}
+          cardAnimation="slide-up"
         />
       </div>
 
       <div id="faq" data-section="faq">
-        <FaqSplitText
+        <FaqDouble
           faqs={[
             {
-              id: "1",
-              title: "What areas of Richmond do you serve?",
-              content: "We proudly serve all of Richmond, VA and surrounding areas. Our service team covers residential and commercial properties throughout the region.",
-            },
+              id: "1",              title: "What areas do you serve?",              content: "We proudly serve Richmond, VA and all surrounding areas. Our service team covers residential and commercial properties throughout the region."},
             {
-              id: "2",
-              title: "How quickly can you respond to service requests?",
-              content: "We typically respond to service requests within 24 hours. For urgent issues, call us at 804-938-0669 for immediate assistance.",
-            },
+              id: "2",              title: "How quickly can you respond to my request?",              content: "We typically respond to service requests within 24 hours. For emergency issues, call us immediately at 804-938-0669."},
             {
-              id: "3",
-              title: "Do you offer warranty on your work?",
-              content: "Yes! We stand behind our workmanship with comprehensive warranties on all services. Details vary by service type.",
-            },
+              id: "3",              title: "Do you charge for consultations?",              content: "No! We provide free, no-obligation estimates for all services. Contact us to schedule your consultation."},
             {
-              id: "4",
-              title: "Are you licensed and insured?",
-              content: "Absolutely. Earl Boys Services is fully licensed, insured, and bonded. We maintain all required certifications for electrical, plumbing, and other specialized services.",
-            },
-            {
-              id: "5",
-              title: "What payment methods do you accept?",
-              content: "We accept cash, check, credit cards, and digital payments. We also offer financing options for larger projects.",
-            },
-            {
-              id: "6",
-              title: "Do you provide free estimates?",
-              content: "Yes! We provide free, no-obligation estimates for all services. Contact us to schedule your consultation.",
-            },
+              id: "4",              title: "Are you licensed and insured?",              content: "Absolutely. Earl Boys Services is fully licensed, insured, and bonded. We maintain all required certifications."},
           ]}
-          sideTitle="Frequently Asked Questions"
-          sideDescription="Find answers to common questions about our home services, pricing, and availability."
-          textPosition="left"
-          faqsAnimation="slide-up"
+          title="Frequently Asked Questions"
+          description="Find answers to common questions about our services and how we can help your home."
+          textboxLayout="default"
           useInvertedBackground={false}
-          animationType="smooth"
+          faqsAnimation="slide-up"
         />
       </div>
 
       <div id="footer" data-section="footer">
-        <FooterCard
-          logoText="Earl Boys Services"
-          copyrightText="© 2025 Earl Boys Services LLC. All rights reserved. Licensed & Insured."
-          socialLinks={[
+        <FooterBaseReveal
+          columns={[
             {
-              icon: Facebook,
-              href: "https://facebook.com",
-              ariaLabel: "Facebook",
+              title: "Services",              items: [
+                { label: "Plumbing", href: "services" },
+                { label: "Electrical", href: "services" },
+                { label: "Painting", href: "services" },
+              ],
             },
             {
-              icon: Instagram,
-              href: "https://instagram.com",
-              ariaLabel: "Instagram",
-            },
-            {
-              icon: Phone,
-              href: "tel:804-938-0669",
-              ariaLabel: "Call us",
+              title: "Company",              items: [
+                { label: "About", href: "about" },
+                { label: "Contact", href: "/contact" },
+                { label: "Home", href: "/" },
+              ],
             },
           ]}
+          copyrightText="© 2025 Earl Boys Services LLC. All rights reserved. Licensed & Insured."
         />
       </div>
     </ThemeProvider>
   );
-}
\ No newline at end of file
+}