diff --git a/src/app/page.tsx b/src/app/page.tsx
index abd7729..7dc01e8 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -3,16 +3,16 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import TextAbout from '@/components/sections/about/TextAbout';
-import BlogCardOne from '@/components/sections/blog/BlogCardOne';
-import ContactCTA from '@/components/sections/contact/ContactCTA';
-import FaqSplitText from '@/components/sections/faq/FaqSplitText';
-import FeatureCardTwentySix from '@/components/sections/feature/FeatureCardTwentySix';
-import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
-import HeroBillboardGallery from '@/components/sections/hero/HeroBillboardGallery';
-import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
-import ProductCardOne from '@/components/sections/product/ProductCardOne';
-import TestimonialCardFifteen from '@/components/sections/testimonial/TestimonialCardFifteen';
-import { MapPin, Wifi, Coffee, Star } from "lucide-react";
+import BlogCardThree from '@/components/sections/blog/BlogCardThree';
+import ContactText from '@/components/sections/contact/ContactText';
+import FaqSplitMedia from '@/components/sections/faq/FaqSplitMedia';
+import FeatureCardThree from '@/components/sections/feature/featureCardThree/FeatureCardThree';
+import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
+import HeroSplitDoubleCarousel from '@/components/sections/hero/HeroSplitDoubleCarousel';
+import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
+import ProductCardFour from '@/components/sections/product/ProductCardFour';
+import TestimonialCardTwo from '@/components/sections/testimonial/TestimonialCardTwo';
+import { MapPin, Wifi, Coffee, Star, BookOpen, Clock } from "lucide-react";
 
 export default function LandingPage() {
   return (
@@ -30,7 +30,7 @@ export default function LandingPage() {
     >
       <ReactLenis root>
         <div id="nav" data-section="nav">
-            <NavbarLayoutFloatingOverlay
+          <NavbarStyleFullscreen
             navItems={[
               { name: "Home", id: "hero" },
               { name: "Shops", id: "shops" },
@@ -41,23 +41,25 @@ export default function LandingPage() {
         </div>
 
         <div id="hero" data-section="hero">
-            <HeroBillboardGallery
+          <HeroSplitDoubleCarousel
             title="Find Your Perfect Flow"
             description="Discover the best coffee shops for deep work across American Samoa. Quiet, reliable, and inspiring."
             background={{ variant: "sparkles-gradient" }}
             tag="Concentration First"
             tagIcon={MapPin}
-            mediaItems={[
-              { imageSrc: "http://img.b2bpic.net/free-photo/top-view-coffee-cookies_23-2148571119.jpg", imageAlt: "cozy workspace" },
-              { imageSrc: "http://img.b2bpic.net/free-photo/professional-artisan-job-workshop_23-2148801581.jpg", imageAlt: "modern cafe interior" },
-              { imageSrc: "http://img.b2bpic.net/free-photo/laptop-with-notepad-cafe-table_23-2147962616.jpg", imageAlt: "productive desk setup" }
+            leftCarouselItems={[
+              { imageSrc: "http://img.b2bpic.net/free-photo/top-view-coffee-cookies_23-2148571119.jpg" },
+              { imageSrc: "http://img.b2bpic.net/free-photo/laptop-with-notepad-cafe-table_23-2147962616.jpg" }
+            ]}
+            rightCarouselItems={[
+              { imageSrc: "http://img.b2bpic.net/free-photo/professional-artisan-job-workshop_23-2148801581.jpg" },
+              { imageSrc: "http://img.b2bpic.net/free-photo/table-ready-lunch_1162-65.jpg" }
             ]}
-            mediaAnimation="blur-reveal"
           />
         </div>
 
         <div id="about" data-section="about">
-            <TextAbout
+          <TextAbout
             title="We curate spaces where productivity meets the perfect cup of coffee."
             tag="Our Philosophy"
             useInvertedBackground={false}
@@ -65,7 +67,7 @@ export default function LandingPage() {
         </div>
 
         <div id="shops" data-section="shops">
-            <ProductCardOne
+          <ProductCardFour
             title="Curated Workspaces"
             description="Only shops with proven Wi-Fi and quiet environments make our list."
             gridVariant="asymmetric-60-wide-40-narrow"
@@ -73,58 +75,60 @@ export default function LandingPage() {
             textboxLayout="split"
             useInvertedBackground={false}
             products={[
-              { id: "s1", name: "Island Brew Studio", price: "$$ - Reliable Wi-Fi", imageSrc: "http://img.b2bpic.net/free-photo/table-ready-lunch_1162-65.jpg" },
-              { id: "s2", name: "Zen Bean Cafe", price: "$$$ - Silent Zone", imageSrc: "http://img.b2bpic.net/free-photo/photo-concentrated-readhead-bearded-businessman-reading-contract-sitting-cafeteria_171337-9893.jpg" }
+              { id: "s1", name: "Island Brew Studio", price: "$$ - Reliable Wi-Fi", variant: "Open", imageSrc: "http://img.b2bpic.net/free-photo/table-ready-lunch_1162-65.jpg" },
+              { id: "s2", name: "Zen Bean Cafe", price: "$$$ - Silent Zone", variant: "Quiet", imageSrc: "http://img.b2bpic.net/free-photo/photo-concentrated-readhead-bearded-businessman-reading-contract-sitting-cafeteria_171337-9893.jpg" }
             ]}
           />
         </div>
 
         <div id="features" data-section="features">
-            <FeatureCardTwentySix
+          <FeatureCardThree
             title="What We Evaluate"
             description="Our criteria ensures that every recommended shop is perfect for deep work."
+            gridVariant="four-items-2x2-equal-grid"
+            animationType="slide-up"
             textboxLayout="inline-image"
             useInvertedBackground={false}
             features={[
-              { title: "High Speed Wi-Fi", description: "Consistent, fiber-grade internet access.", buttonIcon: Wifi },
-              { title: "Locally Roasted", description: "Fresh beans from the best local roasters.", buttonIcon: Coffee },
-              { title: "Ergonomics", description: "Comfortable seating for hours of focus.", buttonIcon: Star },
-              { title: "Quiet Atmosphere", description: "Low noise, low traffic environments.", buttonIcon: MapPin }
+              { title: "High Speed Wi-Fi", description: "Consistent, fiber-grade internet access.", imageSrc: "http://img.b2bpic.net/free-photo/interior-nice-bar_23-2147897025.jpg" },
+              { title: "Locally Roasted", description: "Fresh beans from the best local roasters.", imageSrc: "http://img.b2bpic.net/free-photo/top-view-coffee-cookies_23-2148571119.jpg" },
+              { title: "Ergonomics", description: "Comfortable seating for hours of focus.", imageSrc: "http://img.b2bpic.net/free-photo/laptop-with-notepad-cafe-table_23-2147962616.jpg" },
+              { title: "Quiet Atmosphere", description: "Low noise, low traffic environments.", imageSrc: "http://img.b2bpic.net/free-photo/professional-artisan-job-workshop_23-2148801581.jpg" }
             ]}
           />
         </div>
 
         <div id="testimonials" data-section="testimonials">
-            <TestimonialCardFifteen
-            testimonial="I doubled my output in just one week by finding this spot. The quiet zone is a game changer for remote freelancers!"
-            author="Alex R., Remote Developer"
-            rating={5}
-            ratingAnimation="slide-up"
-            avatarsAnimation="opacity"
-            avatars={[{ src: "http://img.b2bpic.net/free-photo/portrait-smiling-male-worker_1162-65.jpg", alt: "User" }]}
-            useInvertedBackground={true}
+          <TestimonialCardTwo
+            title="What Workers Say"
+            description="Success stories from our community."
+            animationType="blur-reveal"
+            textboxLayout="split"
+            testimonials={[
+              { id: "t1", name: "Alex R.", role: "Remote Developer", testimonial: "I doubled my output in just one week by finding this spot. The quiet zone is a game changer!", icon: BookOpen }
+            ]}
           />
         </div>
 
         <div id="faq" data-section="faq">
-            <FaqSplitText
-            sideTitle="Your Work-From-Cafe Questions"
+          <FaqSplitMedia
+            title="Work-From-Cafe FAQs"
             faqs={[
               { id: "q1", title: "How is Wi-Fi speed verified?", content: "We perform speed tests at peak and off-peak hours." },
               { id: "q2", title: "Are these family friendly?", content: "We highlight the 'Deep Work' friendly shops, which are often quieter." }
             ]}
+            imageSrc="http://img.b2bpic.net/free-photo/interior-nice-bar_23-2147897025.jpg"
             faqsAnimation="slide-up"
-            useInvertedBackground={false}
+            textboxLayout="split"
           />
         </div>
 
         <div id="blog" data-section="blog">
-            <BlogCardOne
+          <BlogCardThree
             title="Productivity Tips"
             description="Insights into maintaining focus while working from public spaces."
-            animationType="slide-up"
+            animationType="blur-reveal"
             textboxLayout="split"
-            useInvertedBackground={false}
             blogs={[
               { id: "b1", category: "Guide", title: "Deep Work Techniques", excerpt: "How to block distractions anywhere.", imageSrc: "http://img.b2bpic.net/free-photo/interior-nice-bar_23-2147897025.jpg", authorName: "Admin", authorAvatar: "", date: "Jan 2025" }
             ]}
@@ -132,24 +136,23 @@ export default function LandingPage() {
         </div>
 
         <div id="contact" data-section="contact">
-            <ContactCTA
-            tag="Get Involved"
-            title="Found a new quiet spot?"
-            description="Tell us about your favorite hidden gem for deep work."
+          <ContactText
+            text="Found a new quiet spot? Tell us about your favorite hidden gem for deep work."
             buttons={[{ text: "Submit a Location", href: "#contact" }]}
             background={{ variant: "sparkles-gradient" }}
-            useInvertedBackground={false}
           />
         </div>
 
         <div id="footer" data-section="footer">
-            <FooterLogoReveal
+          <FooterBaseCard
             logoText="DeepWork Coffee"
-            leftLink={{ text: "Privacy", href: "#" }}
-            rightLink={{ text: "Contact", href: "#contact" }}
+            columns={[
+              { title: "Links", items: [{ label: "Home", href: "#hero" }, { label: "Shops", href: "#shops" }] },
+              { title: "Support", items: [{ label: "Privacy", href: "#" }, { label: "Contact", href: "#contact" }] }
+            ]}
           />
         </div>
       </ReactLenis>
     </ThemeProvider>
   );
-}
\ No newline at end of file
+}