diff --git a/src/app/page.tsx b/src/app/page.tsx
index 0d155c9..e1feec5 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -3,204 +3,161 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import ContactCenter from '@/components/sections/contact/ContactCenter';
-import FeatureCardTwentyFive from '@/components/sections/feature/FeatureCardTwentyFive';
-import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
-import HeroSplitKpi from '@/components/sections/hero/HeroSplitKpi';
-import InlineImageSplitTextAbout from '@/components/sections/about/InlineImageSplitTextAbout';
-import MetricCardEleven from '@/components/sections/metrics/MetricCardEleven';
-import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
-import ProductCardFour from '@/components/sections/product/ProductCardFour';
+import FeatureCardTwentyFour from '@/components/sections/feature/FeatureCardTwentyFour';
+import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
+import HeroPersonalLinks from '@/components/sections/hero/HeroPersonalLinks';
+import SplitAbout from '@/components/sections/about/SplitAbout';
+import MetricCardFourteen from '@/components/sections/metrics/MetricCardFourteen';
+import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
+import ProductCardTwo from '@/components/sections/product/ProductCardTwo';
 import SocialProofOne from '@/components/sections/socialProof/SocialProofOne';
-import TestimonialCardSix from '@/components/sections/testimonial/TestimonialCardSix';
-import { Award, Shield, Zap } from "lucide-react";
+import TestimonialCardTwo from '@/components/sections/testimonial/TestimonialCardTwo';
+import { Award, Shield, Zap, Coffee, ChevronRight, Mail } from "lucide-react";
 
 export default function LandingPage() {
   return (
     <ThemeProvider
         defaultButtonVariant="expand-hover"
         defaultTextAnimation="background-highlight"
-        borderRadius="rounded"
+        borderRadius="pill"
         contentWidth="mediumLarge"
-        sizing="largeSmallSizeMediumTitles"
-        background="fluid"
-        cardStyle="subtle-shadow"
-        primaryButtonStyle="shadow"
+        sizing="largeSizeMediumTitles"
+        background="noiseDiagonalGradient"
+        cardStyle="glass-elevated"
+        primaryButtonStyle="primary-glow"
         secondaryButtonStyle="layered"
-        headingFontWeight="medium"
+        headingFontWeight="bold"
     >
       <ReactLenis root>
-  <div id="nav" data-section="nav">
-      <NavbarLayoutFloatingInline
-      navItems={[
-        { name: "Our Coffee", id: "#about" },
-        { name: "Menu", id: "#products" },
-        { name: "Our Process", id: "#features" },
-        { name: "Contact", id: "#contact" },
-      ]}
-      brandName="Revolver Espresso"
-      button={{ text: "Order Online", href: "#products" }}
-    />
-  </div>
+        <div id="nav" data-section="nav">
+            <NavbarStyleApple
+              brandName="Revolver Espresso"
+              navItems={[
+                { name: "Our Story", id: "#about" },
+                { name: "Roasts", id: "#products" },
+                { name: "Process", id: "#features" },
+                { name: "Contact", id: "#contact" },
+              ]}
+            />
+        </div>
 
-  <div id="hero" data-section="hero">
-      <HeroSplitKpi
-      background={{ variant: "plain" }}
-      title="Mastery in Every Pour"
-      description="At Revolver Espresso, we redefine the craft of coffee. Sourced from the world's finest estates and roasted with precision, every cup tells a story of passion, tradition, and perfection."
-      kpis={[
-        { value: "100%", label: "Ethically Sourced" },
-        { value: "24h", label: "Roast Precision" },
-        { value: "50+", label: "Global Estates" },
-      ]}
-      enableKpiAnimation={true}
-      buttons={[{ text: "Explore Blends", href: "#products" }]}
-      imageSrc="http://img.b2bpic.net/free-photo/close-up-hand-preparing-coffee-with-machine_23-2148892831.jpg"
-      imageAlt="Professional espresso machine"
-      mediaAnimation="slide-up"
-      avatars={[
-        { src: "http://img.b2bpic.net/free-photo/cute-girl-with-shopping-bag-city_1157-23102.jpg", alt: "Customer 1" },
-        { src: "http://img.b2bpic.net/free-photo/cafe-restaurants-coffee-shop-owners-retail-concept-friendly-joyful-handsome-barista-black_1258-60007.jpg", alt: "Customer 2" },
-        { src: "http://img.b2bpic.net/free-photo/young-caucasian-woman-working-office-holding-coffee-cups-smiling-with-happy-cool-smile-face-showing-teeth_839833-17423.jpg", alt: "Customer 3" },
-        { src: "http://img.b2bpic.net/free-photo/young-blond-girl-posing-against-white-wall_176420-32845.jpg", alt: "Customer 4" },
-        { src: "http://img.b2bpic.net/free-photo/pensive-business-lady_1098-17148.jpg", alt: "Customer 5" },
-      ]}
-      avatarText="Join 5,000+ coffee lovers"
-      marqueeItems={[
-        { type: "text", text: "Sustainable" },
-        { type: "text", text: "Artisanal" },
-        { type: "text", text: "Freshly Roasted" },
-        { type: "text", text: "Premium Quality" },
-        { type: "text", text: "Global Sourcing" },
-      ]}
-    />
-  </div>
+        <div id="hero" data-section="hero">
+            <HeroPersonalLinks
+              background={{ variant: "sparkles-gradient" }}
+              title="Revolver Espresso"
+              linkCards={[
+                { title: "Our Roasts", description: "Shop the latest specialty collection", button: { text: "Shop Now", href: "#products" }, icon: Coffee },
+                { title: "The Process", description: "See how we craft every cup", button: { text: "Learn More", href: "#features" }, icon: Zap },
+                { title: "Contact Us", description: "Get in touch with our team", button: { text: "Message", href: "#contact" }, icon: Mail },
+              ]}
+            />
+        </div>
 
-  <div id="about" data-section="about">
-      <InlineImageSplitTextAbout
-      useInvertedBackground={false}
-      heading={[
-        { type: "text", content: "The Art of " },
-        { type: "image", src: "http://img.b2bpic.net/free-photo/rich-brown-roasted-coffee-beans-close-up_84443-73317.jpg", alt: "Roasted Beans" },
-        { type: "text", content: " Artisanal Coffee" },
-      ]}
-    />
-  </div>
+        <div id="about" data-section="about">
+            <SplitAbout
+              title="Refining the Coffee Experience"
+              description="At Revolver Espresso, we believe in the art of the perfect brew. Our mission is to bridge the gap between world-class specialty estates and your daily ritual."
+              bulletPoints={[
+                { title: "Direct Trade", description: "Fair partnerships with ethical estates globally.", icon: Shield },
+                { title: "Artisanal Roasting", description: "Precision controlled small-batch roasting.", icon: Award },
+                { title: "Expert Mastery", description: "Training the next generation of baristas.", icon: Zap },
+              ]}
+              imageSrc="http://img.b2bpic.net/free-photo/close-up-hand-preparing-coffee-with-machine_23-2148892831.jpg"
+              textboxLayout="split"
+              useInvertedBackground={false}
+            />
+        </div>
 
-  <div id="features" data-section="features">
-      <FeatureCardTwentyFive
-      animationType="depth-3d"
-      textboxLayout="split"
-      useInvertedBackground={false}
-      features={[
-        {
-          title: "Sustainable Sourcing",          description: "Working directly with farmers to ensure excellence and ethical integrity.",          icon: Shield,
-          mediaItems: [
-            { imageSrc: "http://img.b2bpic.net/free-photo/closeup-shot-male-hands-sorting-harvested-coffee-fruits-before-drying_181624-58904.jpg", imageAlt: "Farming" },
-            { imageSrc: "http://img.b2bpic.net/free-photo/barista-grind-coffee-bean-with-grinder-machine-barista-prepares-coffee_169016-61314.jpg", imageAlt: "Roasting" },
-          ],
-        },
-        {
-          title: "Precision Roasting",          description: "Small-batch roasting protocols that highlight the unique terroir of every single bean.",          icon: Zap,
-          mediaItems: [
-            { imageSrc: "http://img.b2bpic.net/free-photo/crop-hand-coffee-machine_23-2147775909.jpg", imageAlt: "Roasting Process" },
-            { imageSrc: "http://img.b2bpic.net/free-photo/barista-preparing-beverage_23-2149458070.jpg", imageAlt: "Field Work" },
-          ],
-        },
-        {
-          title: "Expert Baristas",          description: "Every Revolver barista is trained in the science and art of the perfect extraction.",          icon: Award,
-          mediaItems: [
-            { imageSrc: "http://img.b2bpic.net/free-photo/coffee-beans-shop-caffeine-concept_53876-14304.jpg", imageAlt: "Barista" },
-            { imageSrc: "http://img.b2bpic.net/free-photo/freshly-ground-coffee-beans-fuel-barista-workshop-generated-by-ai_188544-45314.jpg", imageAlt: "Craft" },
-          ],
-        },
-      ]}
-      title="Craftsmanship Redefined"
-      description="Our dedication extends far beyond the final pour, focusing on every nuance of the coffee life cycle."
-    />
-  </div>
+        <div id="features" data-section="features">
+            <FeatureCardTwentyFour
+              title="Precision Craft"
+              description="Explore our dedication to the coffee lifecycle."
+              animationType="slide-up"
+              textboxLayout="split"
+              useInvertedBackground={true}
+              features={[
+                {
+                  id: "f1",                  title: "Origin Selection",                  author: "Master Roaster",                  description: "Sourcing only the top 1% of harvested cherries.",                  tags: ["Sustainable", "Organic"],
+                  imageSrc: "http://img.b2bpic.net/free-photo/closeup-shot-male-hands-sorting-harvested-coffee-fruits-before-drying_181624-58904.jpg"
+                },
+                {
+                  id: "f2",                  title: "Roast Science",                  author: "QA Dept",                  description: "Thermodynamic profiling for consistent flavor.",                  tags: ["Tech", "Precision"],
+                  imageSrc: "http://img.b2bpic.net/free-photo/barista-grind-coffee-bean-with-grinder-machine-barista-prepares-coffee_169016-61314.jpg"
+                }
+              ]}
+            />
+        </div>
 
-  <div id="products" data-section="products">
-      <ProductCardFour
-      textboxLayout="split"
-      gridVariant="two-columns-alternating-heights"
-      useInvertedBackground={false}
-      animationType="slide-up"
-      products={[
-        { id: "p1", name: "Ethiopian Yirgacheffe", price: "$22.00", variant: "Light Roast", imageSrc: "http://img.b2bpic.net/free-photo/high-angle-glass-with-delicious-coffee-table_23-2149514314.jpg" },
-        { id: "p2", name: "Colombia Huila", price: "$20.00", variant: "Medium Roast", imageSrc: "http://img.b2bpic.net/free-photo/top-view-new-year-concept_23-2148346429.jpg" },
-        { id: "p3", name: "Revolver Signature Blend", price: "$18.00", variant: "Dark Roast", imageSrc: "http://img.b2bpic.net/free-photo/black-coffee-beans-beige-background_23-2148623198.jpg" },
-        { id: "p4", name: "Sumatra Mandheling", price: "$24.00", variant: "Dark Roast", imageSrc: "http://img.b2bpic.net/free-photo/coffee-beans_1388-619.jpg" },
-        { id: "p5", name: "Costa Rica Tarrazu", price: "$21.00", variant: "Medium Roast", imageSrc: "http://img.b2bpic.net/free-photo/cup-coffee-plant-table_140725-8126.jpg" },
-        { id: "p6", name: "Guatemala Antigua", price: "$23.00", variant: "Medium Roast", imageSrc: "http://img.b2bpic.net/free-photo/top-view-black-coffee-mug-near-wooden-cutting-board-cheese-copy-space_132075-11328.jpg" },
-      ]}
-      title="Signature Roasts"
-      description="A curated collection of our finest single-origin beans and signature blends."
-    />
-  </div>
+        <div id="products" data-section="products">
+            <ProductCardTwo
+              title="Curated Blends"
+              description="Premium selections for the discerning palate."
+              gridVariant="four-items-2x2-equal-grid"
+              animationType="slide-up"
+              textboxLayout="inline-image"
+              useInvertedBackground={false}
+              products={[
+                { id: "p1", brand: "Revolver", name: "Midnight Velvet", price: "$24.00", rating: 5, reviewCount: "128", imageSrc: "http://img.b2bpic.net/free-photo/high-angle-glass-with-delicious-coffee-table_23-2149514314.jpg" },
+                { id: "p2", brand: "Revolver", name: "Highland Gold", price: "$26.00", rating: 5, reviewCount: "96", imageSrc: "http://img.b2bpic.net/free-photo/top-view-new-year-concept_23-2148346429.jpg" },
+              ]}
+            />
+        </div>
 
-  <div id="testimonials" data-section="testimonials">
-      <TestimonialCardSix
-      textboxLayout="split"
-      useInvertedBackground={false}
-      animationType="slide-up"
-      testimonials={[
-        { id: "t1", name: "Sarah J.", handle: "@sarah.espresso", testimonial: "The best coffee I've ever tasted. Revolver Espresso has raised the bar.", imageSrc: "http://img.b2bpic.net/free-photo/positive-young-woman-with-curly-hair-giggles-happily-holds-disposable-cup-coffee-enjoys-aromatic-beverage-dressed-casual-orange-jumper-isolated-white-background-drinking-concept_273609-61071.jpg" },
-        { id: "t2", name: "Michael T.", handle: "@michael.roasts", testimonial: "Unparalleled freshness. You can really taste the difference in the roast.", imageSrc: "http://img.b2bpic.net/free-photo/pretty-blonde-woman-sitting-cafe_273609-6756.jpg" },
-        { id: "t3", name: "Elena R.", handle: "@elena.caffè", testimonial: "A ritual I never skip. Their signature blend is my home staple.", imageSrc: "http://img.b2bpic.net/free-photo/hand-holding-hot-drink-near-book-chocolate-bedsheet_23-2147887684.jpg" },
-        { id: "t4", name: "David W.", handle: "@david.coffee", testimonial: "Exceptional service and even better coffee. Highly recommended.", imageSrc: "http://img.b2bpic.net/free-photo/young-man-drinking-teat-while-relaxing-sofa-living-room_637285-5901.jpg" },
-        { id: "t5", name: "Lydia M.", handle: "@lydia.brew", testimonial: "The attention to detail in their roasting is truly noticeable in every cup.", imageSrc: "http://img.b2bpic.net/free-photo/close-up-beautiful-joyful-african-student-woman-with-dark-wavy-hair-green-cardigan-sitting-cafe-drinking-cup-coffee-smiling-camera-woman-waiting-her-boyfriend-after-university_176420-12329.jpg" },
-      ]}
-      title="What Our Community Says"
-      description="Crafting exceptional coffee experiences for enthusiasts everywhere."
-    />
-  </div>
+        <div id="testimonials" data-section="testimonials">
+            <TestimonialCardTwo
+              title="Community Voices"
+              description="Voices from our global coffee network."
+              animationType="slide-up"
+              textboxLayout="split"
+              useInvertedBackground={true}
+              testimonials={[
+                { id: "t1", name: "Sarah J.", role: "Coffee Aficionado", testimonial: "The most consistent specialty roast I have ever found.", imageSrc: "http://img.b2bpic.net/free-photo/positive-young-woman-with-curly-hair-giggles-happily-holds-disposable-cup-coffee-enjoys-aromatic-beverage-dressed-casual-orange-jumper-isolated-white-background-drinking-concept_273609-61071.jpg" },
+              ]}
+            />
+        </div>
 
-  <div id="metrics" data-section="metrics">
-      <MetricCardEleven
-      animationType="scale-rotate"
-      textboxLayout="split"
-      useInvertedBackground={false}
-      metrics={[
-        { id: "m1", value: "12K+", title: "Cups Served", description: "Monthly average across all our roastery partners.", imageSrc: "http://img.b2bpic.net/free-photo/elegant-coffee-concept_23-2148093912.jpg" },
-        { id: "m2", value: "450", title: "Roast Profiles", description: "Tested and perfected by our master roasters.", imageSrc: "http://img.b2bpic.net/free-photo/business-owner-working-coffee-shop_23-2148366578.jpg" },
-        { id: "m3", value: "18", title: "Years of Craft", description: "Advancing the art of espresso since 2006.", imageSrc: "http://img.b2bpic.net/free-photo/machine-making-delicious-coffee_23-2148892816.jpg" },
-      ]}
-      title="By The Numbers"
-      description="Quality defined through data and rigorous standard testing."
-    />
-  </div>
+        <div id="metrics" data-section="metrics">
+            <MetricCardFourteen
+              title="Our Reach"
+              tag="Impact"
+              metrics={[
+                { id: "m1", value: "50+", description: "Global estates supported" },
+                { id: "m2", value: "18yr", description: "Years of roasting heritage" },
+                { id: "m3", value: "100%", description: "Ethical sustainability index" },
+              ]}
+              useInvertedBackground={false}
+            />
+        </div>
 
-  <div id="social-proof" data-section="social-proof">
-      <SocialProofOne
-      textboxLayout="split"
-      useInvertedBackground={false}
-      names={[
-        "The Daily Roast",        "Coffee Enthusiast Daily",        "Barista Magazine",        "Espresso Weekly",        "Café Culture Quarterly",        "The Coffee Journal",        "Global Roasters Alliance"]}
-      title="Featured In"
-      description="Proudly recognized by leading voices in the specialty coffee movement."
-    />
-  </div>
+        <div id="social-proof" data-section="social-proof">
+            <SocialProofOne
+              names={["Barista Weekly", "Global Coffee News", "The Roast Journal", "Modern Espresso", "Café Life"]
+              }
+              title="Proudly Featured"
+              textboxLayout="split"
+              useInvertedBackground={true}
+            />
+        </div>
 
-  <div id="contact" data-section="contact">
-      <ContactCenter
-      useInvertedBackground={false}
-      background={{ variant: "rotated-rays-static" }}
-      tag="Newsletter"
-      title="Join the Revolver Inner Circle"
-      description="Subscribe for early access to limited micro-lots and roastery updates."
-    />
-  </div>
+        <div id="contact" data-section="contact">
+            <ContactCenter
+              title="Stay Connected"
+              description="Join our inner circle for early access and events."
+              background={{ variant: "sparkles-gradient" }}
+              useInvertedBackground={true}
+            />
+        </div>
 
-  <div id="footer" data-section="footer">
-      <FooterLogoEmphasis
-      columns={[
-        { items: [{ label: "Our Story", href: "#about" }, { label: "Careers", href: "#" }, { label: "Partnerships", href: "#" }] },
-        { items: [{ label: "Shop Coffee", href: "#products" }, { label: "Roastery", href: "#" }, { label: "Wholesale", href: "#" }] },
-        { items: [{ label: "Privacy Policy", href: "#" }, { label: "Terms of Service", href: "#" }, { label: "Contact", href: "#contact" }] },
-      ]}
-      logoText="Revolver Espresso"
-    />
-  </div>
+        <div id="footer" data-section="footer">
+            <FooterBaseReveal
+              logoText="Revolver Espresso"
+              columns={[
+                { title: "Company", items: [{ label: "Our Story", href: "#about" }, { label: "Roastery", href: "#" }] },
+                { title: "Shop", items: [{ label: "Beans", href: "#products" }, { label: "Equipment", href: "#" }] },
+                { title: "Support", items: [{ label: "Contact", href: "#contact" }, { label: "Privacy", href: "#" }] },
+              ]}
+            />
+        </div>
       </ReactLenis>
     </ThemeProvider>
   );