diff --git a/src/app/contact/page.tsx b/src/app/contact/page.tsx
index 75d8242..cd9669c 100644
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -2,15 +2,15 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import Link from "next/link";
-import NavbarStyleFullscreen from "@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen";
+import NavbarStyleCentered from "@/components/navbar/NavbarStyleCentered/NavbarStyleCentered";
 import FeatureBento from "@/components/sections/feature/FeatureBento";
-import FaqBase from "@/components/sections/faq/FaqBase";
+import FaqSplitText from "@/components/sections/faq/FaqSplitText";
 import FooterCard from "@/components/sections/footer/FooterCard";
 import { Mail, Phone, MapPin, Clock, Instagram, Facebook, Twitter } from "lucide-react";
 
 const navItems = [
   { name: "Shop", id: "/products" },
-  { name: "About Us", id: "/about" },
+  { name: "About", id: "/about" },
   { name: "Subscription", id: "/subscription" },
   { name: "Blog", id: "/blog" },
   { name: "Contact", id: "/contact" },
@@ -19,24 +19,23 @@ const navItems = [
 export default function ContactPage() {
   return (
     <ThemeProvider
-      defaultButtonVariant="elastic-effect"
+      defaultButtonVariant="hover-magnetic"
       defaultTextAnimation="entrance-slide"
-      borderRadius="pill"
-      contentWidth="smallMedium"
-      sizing="largeSmallSizeMediumTitles"
-      background="aurora"
-      cardStyle="subtle-shadow"
-      primaryButtonStyle="double-inset"
-      secondaryButtonStyle="radial-glow"
-      headingFontWeight="normal"
+      borderRadius="rounded"
+      contentWidth="medium"
+      sizing="mediumLargeSizeLargeTitles"
+      background="none"
+      cardStyle="solid"
+      primaryButtonStyle="gradient"
+      secondaryButtonStyle="solid"
+      headingFontWeight="bold"
     >
       {/* Navigation */}
       <div id="nav" data-section="nav">
-        <NavbarStyleFullscreen
+        <NavbarStyleCentered
           navItems={navItems}
+          button={{ text: "Get Started", href: "/subscription" }}
           brandName="Finca Don Manuel"
-          bottomLeftText="Premium Specialty Coffee"
-          bottomRightText="hello@fincadonmanuel.com"
         />
       </div>
 
@@ -79,38 +78,28 @@ export default function ContactPage() {
 
       {/* FAQ Section */}
       <div id="faq" data-section="faq">
-        <FaqBase
-          title="Frequently Asked Questions"
-          description="Find answers to common questions about our products, subscriptions, and policies."
-          tag="Help & Support"
-          textboxLayout="default"
+        <FaqSplitText
+          sideTitle="Frequently Asked Questions"
+          sideDescription="Find answers to common questions about our products, subscriptions, and policies."
           faqsAnimation="slide-up"
           useInvertedBackground={false}
           faqs={[
             {
-              id: "1",              title: "How quickly will my order arrive?",              content: "We process orders within 1-2 business days. Standard shipping takes 5-7 business days domestically. Expedited shipping (2-3 days) is available for an additional fee. All orders include tracking information."
-            },
+              id: "1",              title: "How quickly will my order arrive?",              content: "We process orders within 1-2 business days. Standard shipping takes 5-7 business days domestically. Expedited shipping (2-3 days) is available for an additional fee. All orders include tracking information."},
             {
-              id: "2",              title: "Do you offer international shipping?",              content: "We currently ship throughout North America with standard and express options. We're expanding international availability. Please contact us for information about shipping to your country."
-            },
+              id: "2",              title: "Do you offer international shipping?",              content: "We currently ship throughout North America with standard and express options. We're expanding international availability. Please contact us for information about shipping to your country."},
             {
-              id: "3",              title: "What if I'm not satisfied with my coffee?",              content: "We stand behind our product 100%. If you're not completely satisfied, we offer a 30-day money-back guarantee with no questions asked. Simply contact our customer service team for details."
-            },
+              id: "3",              title: "What if I'm not satisfied with my coffee?",              content: "We stand behind our product 100%. If you're not completely satisfied, we offer a 30-day money-back guarantee with no questions asked. Simply contact our customer service team for details."},
             {
-              id: "4",              title: "Can I modify my subscription at any time?",              content: "Absolutely! You can pause, skip, cancel, or modify your subscription preferences anytime from your member portal. Changes take effect on your next scheduled delivery."
-            },
+              id: "4",              title: "Can I modify my subscription at any time?",              content: "Absolutely! You can pause, skip, cancel, or modify your subscription preferences anytime from your member portal. Changes take effect on your next scheduled delivery."},
             {
-              id: "5",              title: "How do I know when my coffee was roasted?",              content: "Each bag includes a QR code with the exact roast date and brewing recommendations. Our coffee is optimal 3-4 weeks after roasting and stays fresh for 2-3 months in our resealable valve bags."
-            },
+              id: "5",              title: "How do I know when my coffee was roasted?",              content: "Each bag includes a QR code with the exact roast date and brewing recommendations. Our coffee is optimal 3-4 weeks after roasting and stays fresh for 2-3 months in our resealable valve bags."},
             {
-              id: "6",              title: "Do you offer wholesale or bulk pricing?",              content: "Yes! We offer special pricing for cafés, restaurants, and corporate orders. Contact our sales team at sales@fincadonmanuel.com to discuss bulk options and custom arrangements."
-            },
+              id: "6",              title: "Do you offer wholesale or bulk pricing?",              content: "Yes! We offer special pricing for cafés, restaurants, and corporate orders. Contact our sales team at sales@fincadonmanuel.com to discuss bulk options and custom arrangements."},
             {
-              id: "7",              title: "Are your farming practices truly sustainable?",              content: "Yes. Our farm is Fair Trade Certified, Rainforest Alliance Member, uses 100% compostable packaging, maintains carbon-neutral shipping, and focuses on soil health and biodiversity protection."
-            },
+              id: "7",              title: "Are your farming practices truly sustainable?",              content: "Yes. Our farm is Fair Trade Certified, Rainforest Alliance Member, uses 100% compostable packaging, maintains carbon-neutral shipping, and focuses on soil health and biodiversity protection."},
             {
-              id: "8",              title: "How do I earn and redeem loyalty rewards?",              content: "You earn 1 point per $1 spent with every purchase. 50 points = $10 credit. Bonus: earn double points on your birthday month. Redeem anytime from your member portal."
-            },
+              id: "8",              title: "How do I earn and redeem loyalty rewards?",              content: "You earn 1 point per $1 spent with every purchase. 50 points = $10 credit. Bonus: earn double points on your birthday month. Redeem anytime from your member portal."},
           ]}
         />
       </div>
@@ -123,23 +112,19 @@ export default function ContactPage() {
           socialLinks={[
             {
               icon: Instagram,
-              href: "https://instagram.com/fincadonmanuel",              ariaLabel: "Follow us on Instagram"
-            },
+              href: "https://instagram.com/fincadonmanuel",              ariaLabel: "Follow us on Instagram"},
             {
               icon: Facebook,
-              href: "https://facebook.com/fincadonmanuel",              ariaLabel: "Follow us on Facebook"
-            },
+              href: "https://facebook.com/fincadonmanuel",              ariaLabel: "Follow us on Facebook"},
             {
               icon: Twitter,
-              href: "https://twitter.com/fincadonmanuel",              ariaLabel: "Follow us on Twitter"
-            },
+              href: "https://twitter.com/fincadonmanuel",              ariaLabel: "Follow us on Twitter"},
             {
               icon: Mail,
-              href: "mailto:hello@fincadonmanuel.com",              ariaLabel: "Email us"
-            },
+              href: "mailto:hello@fincadonmanuel.com",              ariaLabel: "Email us"},
           ]}
         />
       </div>
     </ThemeProvider>
   );
-}
\ No newline at end of file
+}
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index afa070d..e1a576c 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,59 +1,21 @@
 import type { Metadata } from "next";
-import { DM_Sans } from "next/font/google";
+import "./styles/variables.css";
+import "./styles/base.css";
 import "./globals.css";
-import { ServiceWrapper } from "@/components/ServiceWrapper";
-import Tag from "@/tag/Tag";
-
-const dmSans = DM_Sans({
-  variable: "--font-dm-sans",
-  subsets: ["latin"],
-});
 
 export const metadata: Metadata = {
-  title: "Finca Don Manuel - Premium Specialty Coffee Delivered Fresh",
-  description: "Experience exceptional coffee sourced directly from our sustainable farm. Farm-to-cup freshness with whole bean and ground options, flexible subscriptions, and direct delivery. Ethically grown, expertly roasted.",
-  keywords: "specialty coffee, whole bean coffee, premium coffee, coffee subscription, direct trade coffee, sustainable coffee, artisan roasted coffee, farm to cup",
-  metadataBase: new URL("https://fincadonmanuel.com"),
-  alternates: {
-    canonical: "https://fincadonmanuel.com",
-  },
-  openGraph: {
-    title: "Finca Don Manuel - Premium Specialty Coffee",
-    description: "Direct-to-consumer coffee subscription. Farm-to-cup excellence with ethical practices and exceptional flavor.",
-    url: "https://fincadonmanuel.com",
-    siteName: "Finca Don Manuel",
-    type: "website",
-    images: [
-      {
-        url: "http://img.b2bpic.net/free-photo/serene-morning-coffee-plantation_23-2152031666.jpg",
-        alt: "Finca Don Manuel coffee farm",
-      },
-    ],
-  },
-  twitter: {
-    card: "summary_large_image",
-    title: "Finca Don Manuel - Premium Specialty Coffee",
-    description: "Exceptional coffee sourced directly from our sustainable farm. Fresh delivery subscription available.",
-    images: ["http://img.b2bpic.net/free-photo/serene-morning-coffee-plantation_23-2152031666.jpg"],
-  },
-  robots: {
-    index: true,
-    follow: true,
-  },
-};
+  title: "Finca Don Manuel - Premium Specialty Coffee",  description: "Experience the finest specialty coffee from our Central American farm. Direct-to-consumer ordering with sustainable farming practices."};
 
 export default function RootLayout({
   children,
-}: Readonly<{
+}: {
   children: React.ReactNode;
-}>) {
+}) {
   return (
-    <html lang="en" suppressHydrationWarning>
-      <ServiceWrapper>
-        <body className={`${dmSans.variable} antialiased`}>
-          <Tag />
-          {children}
-        
+    <html lang="en">
+      <body>
+        {children}
+      
         <script
           dangerouslySetInnerHTML={{
             __html: `
@@ -1421,7 +1383,6 @@ export default function RootLayout({
           }}
         />
       </body>
-      </ServiceWrapper>
     </html>
   );
-}
\ No newline at end of file
+}
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 48078ae..5b93815 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -2,19 +2,18 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import Link from "next/link";
-import NavbarStyleFullscreen from "@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen";
-import HeroOverlay from "@/components/sections/hero/HeroOverlay";
-import ProductCardThree from "@/components/sections/product/ProductCardThree";
-import FeatureBento from "@/components/sections/feature/FeatureBento";
-import PricingCardTwo from "@/components/sections/pricing/PricingCardTwo";
+import NavbarStyleCentered from "@/components/navbar/NavbarStyleCentered/NavbarStyleCentered";
+import HeroCarouselLogo from "@/components/sections/hero/heroCarouselLogo/HeroCarouselLogo";
 import MediaAbout from "@/components/sections/about/MediaAbout";
-import TestimonialCardTen from "@/components/sections/testimonial/TestimonialCardTen";
+import FeatureBento from "@/components/sections/feature/FeatureBento";
+import PricingCardThree from "@/components/sections/pricing/PricingCardThree";
+import TestimonialCardSixteen from "@/components/sections/testimonial/TestimonialCardSixteen";
 import FooterCard from "@/components/sections/footer/FooterCard";
-import { Coffee, Zap, Leaf, Award, Sparkles, Droplets, Instagram, Facebook, Twitter, Mail } from "lucide-react";
+import { Sparkles, Award, Zap, Coffee, Leaf, Instagram, Facebook, Twitter, Mail, Shield, Users } from "lucide-react";
 
 const navItems = [
   { name: "Shop", id: "/products" },
-  { name: "About Us", id: "/about" },
+  { name: "About", id: "/about" },
   { name: "Subscription", id: "/subscription" },
   { name: "Blog", id: "/blog" },
   { name: "Contact", id: "/contact" },
@@ -23,310 +22,155 @@ const navItems = [
 export default function HomePage() {
   return (
     <ThemeProvider
-      defaultButtonVariant="elastic-effect"
+      defaultButtonVariant="hover-magnetic"
       defaultTextAnimation="entrance-slide"
-      borderRadius="pill"
-      contentWidth="smallMedium"
-      sizing="largeSmallSizeMediumTitles"
-      background="aurora"
-      cardStyle="subtle-shadow"
-      primaryButtonStyle="double-inset"
-      secondaryButtonStyle="radial-glow"
-      headingFontWeight="normal"
+      borderRadius="rounded"
+      contentWidth="medium"
+      sizing="mediumLargeSizeLargeTitles"
+      background="none"
+      cardStyle="solid"
+      primaryButtonStyle="gradient"
+      secondaryButtonStyle="solid"
+      headingFontWeight="bold"
     >
       {/* Navigation */}
       <div id="nav" data-section="nav">
-        <NavbarStyleFullscreen
+        <NavbarStyleCentered
           navItems={navItems}
+          button={{ text: "Get Started", href: "/subscription" }}
           brandName="Finca Don Manuel"
-          bottomLeftText="Premium Specialty Coffee"
-          bottomRightText="hello@fincadonmanuel.com"
         />
       </div>
 
       {/* Hero Section */}
       <div id="hero" data-section="hero">
-        <HeroOverlay
-          title="Exceptional Coffee, Delivered Fresh from Our Farm to Your Cup"
-          description="Experience the difference of premium specialty coffee sourced directly from Finca Don Manuel. Farm-to-table freshness, sustainable practices, and extraordinary flavor in every brew."
-          tag="Farm-to-Cup Excellence"
-          imageSrc="http://img.b2bpic.net/free-photo/serene-morning-coffee-plantation_23-2152031666.jpg"
-          imageAlt="Coffee farm landscape at sunrise"
-          textPosition="bottom-left"
-          showBlur={true}
-          showDimOverlay={true}
+        <HeroCarouselLogo
+          logoText="FINCA DON MANUEL"
+          description="Premium specialty coffee from our Central American farm, roasted to perfection for the discerning palate."
           buttons={[
             { text: "Shop Now", href: "/products" },
-            { text: "Learn Our Story", href: "/about" },
+            { text: "Learn More", href: "/about" },
           ]}
-        />
-      </div>
-
-      {/* Product Showcase */}
-      <div id="products" data-section="products">
-        <ProductCardThree
-          title="Our Premium Coffee Selection"
-          description="Handcrafted coffees roasted to perfection. Choose from whole beans or ground coffee in sizes perfect for any household or café."
-          tag="Fresh Roasts Available"
-          textboxLayout="default"
-          animationType="slide-up"
-          useInvertedBackground={false}
-          products={[
-            {
-              id: "1",
-              name: "Whole Bean - Light Roast - 250g",
-              price: "$12.99",
-              imageSrc: "http://img.b2bpic.net/free-photo/fragrant-coffee-beans-are-scattered-from-jar-rustic-tabletop-background-closeup-selective-focus-copy-space-banner_166373-2309.jpg?_wi=1",
-              imageAlt: "Light roast whole bean coffee 250g",
-              initialQuantity: 1,
-            },
-            {
-              id: "2",
-              name: "Whole Bean - Medium Roast - 500g",
-              price: "$24.99",
-              imageSrc: "http://img.b2bpic.net/free-photo/fragrant-coffee-beans-are-scattered-from-jar-rustic-tabletop-background-closeup-selective-focus-copy-space-banner_166373-2309.jpg?_wi=2",
-              imageAlt: "Medium roast whole bean coffee 500g",
-              initialQuantity: 1,
-            },
-            {
-              id: "3",
-              name: "Ground Coffee - Dark Roast - 1kg",
-              price: "$44.99",
-              imageSrc: "http://img.b2bpic.net/free-photo/coffee-automatic-from-machine-with-ground-coffee_1220-6141.jpg?_wi=1",
-              imageAlt: "Dark roast ground coffee 1kg",
-              initialQuantity: 1,
-            },
-            {
-              id: "4",
-              name: "Whole Bean - Premium Blend - 2kg",
-              price: "$79.99",
-              imageSrc: "http://img.b2bpic.net/free-photo/fragrant-coffee-beans-are-scattered-from-jar-rustic-tabletop-background-closeup-selective-focus-copy-space-banner_166373-2309.jpg?_wi=3",
-              imageAlt: "Premium blend whole bean coffee 2kg",
-              initialQuantity: 1,
-            },
-            {
-              id: "5",
-              name: "Starter Bundle - 3 Roasts Sampler",
-              price: "$34.99",
-              imageSrc: "http://img.b2bpic.net/free-photo/fragrant-coffee-beans-are-scattered-from-jar-rustic-tabletop-background-closeup-selective-focus-copy-space-banner_166373-2309.jpg?_wi=4",
-              imageAlt: "Starter pack with three coffee varieties",
-              initialQuantity: 1,
-            },
-            {
-              id: "6",
-              name: "Family Pack - Ground Coffee Assortment",
-              price: "$64.99",
-              imageSrc: "http://img.b2bpic.net/free-photo/coffee-automatic-from-machine-with-ground-coffee_1220-6141.jpg?_wi=2",
-              imageAlt: "Family pack with assorted ground coffees",
-              initialQuantity: 1,
-            },
-          ]}
-          gridVariant="three-columns-all-equal-width"
-          carouselMode="buttons"
-        />
-      </div>
-
-      {/* Features & Benefits */}
-      <div id="features" data-section="features">
-        <FeatureBento
-          title="Why Choose Finca Don Manuel?"
-          description="Our commitment to quality, sustainability, and transparency sets us apart. Every cup tells a story of passion, heritage, and exceptional craftsmanship."
-          tag="Premium Quality"
-          textboxLayout="default"
-          animationType="slide-up"
-          useInvertedBackground={false}
-          carouselMode="buttons"
-          features={[
-            {
-              title: "Direct from Farm",
-              description: "100% sourced from our own sustainable farm with complete traceability and quality control.",
-              bentoComponent: "globe",
-            },
-            {
-              title: "Freshness Tracking",
-              description: "Roast-to-order system with QR codes showing exact roast dates and brewing recommendations.",
-              bentoComponent: "timeline",
-              heading: "Your Coffee Journey",
-              subheading: "Track freshness milestones",
-              items: [
-                { label: "Farm Harvest", detail: "Carefully hand-picked at peak ripeness" },
-                { label: "Roasting", detail: "Small-batch roasted to perfection" },
-                { label: "Packaging", detail: "Sealed within hours of roasting" },
-              ],
-              completedLabel: "Delivered Fresh",
-            },
-            {
-              title: "Multiple Options",
-              description: "Choose your perfect grind: Espresso, Drip, French Press, Moka, or Cold Brew.",
-              bentoComponent: "icon-info-cards",
-              items: [
-                { icon: Coffee, label: "Whole Bean", value: "For Fresh Grind" },
-                { icon: Zap, label: "Pre-Ground", value: "Ready to Brew" },
-                { icon: Droplets, label: "Cold Brew", value: "Special Formula" },
-              ],
-            },
-            {
-              title: "Sustainability",
-              description: "Eco-friendly packaging, ethical labor practices, and forest regeneration initiatives in every purchase.",
-              bentoComponent: "marquee",
-              centerIcon: Leaf,
-              variant: "text",
-              texts: [
-                "100% Compostable Packaging",
-                "Fair Trade Certified",
-                "Carbon Neutral Shipping",
-                "Rainforest Alliance Member",
-              ],
-            },
-          ]}
-        />
-      </div>
-
-      {/* Subscription Plans */}
-      <div id="pricing" data-section="pricing">
-        <PricingCardTwo
-          title="Flexible Subscription Plans"
-          description="Choose the perfect frequency for your coffee delivery. All plans include free shipping and exclusive member benefits."
-          tag="Recurring Savings"
-          textboxLayout="default"
-          animationType="slide-up"
-          useInvertedBackground={false}
-          carouselMode="buttons"
-          plans={[
-            {
-              id: "weekly",
-              badge: "Weekly Subscription",
-              badgeIcon: Zap,
-              price: "$12.99/bag",
-              subtitle: "Fresh delivery every week",
-              buttons: [
-                { text: "Subscribe Weekly", href: "/subscription" },
-                { text: "Learn More", href: "/subscription" },
-              ],
-              features: [
-                "1 bag (250g or 500g) every week",
-                "10% discount on regular price",
-                "Skip or pause anytime",
-                "Free priority shipping",
-                "Exclusive member-only blends",
-              ],
-            },
-            {
-              id: "biweekly",
-              badge: "Bi-Weekly Plan",
-              badgeIcon: Sparkles,
-              price: "$24.99/shipment",
-              subtitle: "Balanced for regular drinkers",
-              buttons: [
-                { text: "Subscribe Bi-Weekly", href: "/subscription" },
-                { text: "Learn More", href: "/subscription" },
-              ],
-              features: [
-                "1kg coffee every 2 weeks",
-                "15% discount on regular price",
-                "Free shipping all orders",
-                "Birthday bonus coffee",
-                "Loyalty rewards program",
-              ],
-            },
-            {
-              id: "monthly",
-              badge: "Monthly Box",
-              badgeIcon: Award,
-              price: "$44.99/month",
-              subtitle: "Most popular choice",
-              buttons: [
-                { text: "Subscribe Monthly", href: "/subscription" },
-                { text: "Learn More", href: "/subscription" },
-              ],
-              features: [
-                "2kg premium selection monthly",
-                "20% discount on all items",
-                "Free express shipping",
-                "Early access to limited editions",
-                "Exclusive tasting notes guide",
-              ],
-            },
+          slides={[
+            { imageSrc: "asset://coffee-hero-1", imageAlt: "Coffee farm landscape" },
+            { imageSrc: "asset://coffee-hero-2", imageAlt: "Coffee beans close-up" },
+            { imageSrc: "asset://coffee-hero-3", imageAlt: "Roasting process" },
           ]}
+          autoplayDelay={5000}
+          showDimOverlay={true}
         />
       </div>
 
       {/* About Section */}
       <div id="about" data-section="about">
         <MediaAbout
-          title="The Finca Don Manuel Story"
-          description="Rooted in tradition, cultivated with passion. For three generations, the Don Manuel family has dedicated itself to producing the world's finest specialty coffee. Our commitment to sustainable practices, exceptional quality, and direct relationships with coffee lovers worldwide makes every cup extraordinary."
-          tag="Heritage & Innovation"
-          imageSrc="http://img.b2bpic.net/free-photo/adult-nature-coffee-harvesting_23-2151711563.jpg?_wi=1"
-          imageAlt="Finca Don Manuel coffee farm with mountain views"
-          buttons={[{ text: "Explore Our Methods", href: "/about" }]}
+          title="Crafted with Care"
+          description="Every bean tells a story of sustainable farming, meticulous harvesting, and expert roasting. We're committed to excellence and environmental stewardship."
+          tag="Our Story"
+          imageSrc="asset://coffee-about"
+          imageAlt="Our coffee farm"
+          buttons={[{ text: "Discover More", href: "#features" }]}
           useInvertedBackground={false}
         />
       </div>
 
-      {/* Testimonials */}
+      {/* Features Section */}
+      <div id="features" data-section="features">
+        <FeatureBento
+          title="Why Choose Finca Don Manuel"
+          description="From farm to cup, we maintain the highest standards of quality and sustainability."
+          tag="Our Commitment"
+          textboxLayout="default"
+          animationType="slide-up"
+          useInvertedBackground={false}
+          carouselMode="buttons"
+          features={[
+            {
+              title: "Single Origin Sourcing",              description: "Each roast comes from a specific microlot on our farm, ensuring consistency and traceability.",              bentoComponent: "icon-info-cards",              items: [
+                { icon: Coffee, label: "Elevation", value: "1500-1800m" },
+                { icon: Leaf, label: "Altitude", value: "Premium Grade" },
+                { icon: Award, label: "Certification", value: "Fair Trade" },
+              ],
+            },
+            {
+              title: "Expert Roasting",              description: "Our master roasters develop custom profiles for each microlot to unlock unique flavor characteristics.",              bentoComponent: "animated-bar-chart"},
+            {
+              title: "Sustainable Practices",              description: "Carbon-neutral operations, rainforest conservation, and community support.",              bentoComponent: "timeline",              heading: "Our Impact",              subheading: "Building a better future",              items: [
+                { label: "Forest Acres", detail: "Protected annually" },
+                { label: "Carbon Offset", detail: "100% neutral shipping" },
+                { label: "Fair Wages", detail: "Above market rates" },
+              ],
+              completedLabel: "Making a Difference"},
+          ]}
+        />
+      </div>
+
+      {/* Pricing Section */}
+      <div id="pricing" data-section="pricing">
+        <PricingCardThree
+          title="Choose Your Plan"
+          description="All plans include free shipping, flexible customization, and exclusive member benefits."
+          tag="Simple Pricing"
+          textboxLayout="default"
+          animationType="slide-up"
+          useInvertedBackground={true}
+          carouselMode="buttons"
+          plans={[
+            {
+              id: "weekly",              badge: "Weekly Fresh",              badgeIcon: Zap,
+              price: "$12.99/bag",              name: "Weekly Subscription",              buttons: [
+                { text: "Start Weekly", href: "/subscription" },
+                { text: "Learn More", href: "/subscription" },
+              ],
+              features: [
+                "1 bag weekly",                "10% discount",                "Free shipping",                "Skip anytime",                "Member exclusive blends"],
+            },
+            {
+              id: "biweekly",              badge: "Most Popular",              badgeIcon: Sparkles,
+              price: "$24.99/month",              name: "Bi-Weekly Plan",              buttons: [
+                { text: "Start Bi-Weekly", href: "/subscription" },
+                { text: "Learn More", href: "/subscription" },
+              ],
+              features: [
+                "1kg every 2 weeks",                "15% discount",                "Free express shipping",                "Birthday bonus",                "Loyalty rewards"],
+            },
+            {
+              id: "monthly",              badge: "Premium Box",              badgeIcon: Award,
+              price: "$44.99/month",              name: "Monthly Selection",              buttons: [
+                { text: "Start Monthly", href: "/subscription" },
+                { text: "Learn More", href: "/subscription" },
+              ],
+              features: [
+                "2kg premium selection",                "20% discount",                "Early limited releases",                "Tasting guide included",                "VIP member access"],
+            },
+          ]}
+        />
+      </div>
+
+      {/* Testimonials Section */}
       <div id="testimonials" data-section="testimonials">
-        <TestimonialCardTen
-          title="Loved by Coffee Enthusiasts"
-          description="Discover why thousands of coffee lovers have made Finca Don Manuel their preferred source for premium specialty coffee."
+        <TestimonialCardSixteen
+          title="Loved by Coffee Connoisseurs"
+          description="Join thousands of passionate coffee enthusiasts who've made Finca Don Manuel their daily ritual."
           tag="Customer Stories"
           textboxLayout="default"
+          animationType="slide-up"
           useInvertedBackground={false}
           testimonials={[
             {
-              id: "1",
-              title: "Life-Changing Morning Ritual",
-              quote: "Switching to Finca Don Manuel completely transformed my morning routine. The freshness and flavor are incomparable. I can't imagine starting my day any other way now.",
-              name: "James Richardson",
-              role: "Coffee Enthusiast & Home Barista",
-              imageSrc: "http://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg?_wi=1",
-              imageAlt: "James Richardson portrait",
-            },
+              id: "1",              name: "Sarah Mitchell",              role: "Coffee Enthusiast",              company: "Portland, OR",              rating: 5,
+              imageSrc: "asset://testimonial-1"},
             {
-              id: "2",
-              title: "Exceptional Quality & Consistency",
-              quote: "I've tried every premium coffee brand out there. Finca Don Manuel stands out for their consistency, ethical practices, and genuine passion for their craft. Every delivery exceeds expectations.",
-              name: "Sarah Mitchell",
-              role: "Café Owner & Coffee Connoisseur",
-              imageSrc: "http://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg?_wi=2",
-              imageAlt: "Sarah Mitchell portrait",
-            },
+              id: "2",              name: "James Chen",              role: "Specialty Café Owner",              company: "Seattle, WA",              rating: 5,
+              imageSrc: "asset://testimonial-2"},
             {
-              id: "3",
-              title: "Perfect for Corporate Gifting",
-              quote: "We order Finca Don Manuel for our executive team and client gifts. It's a hit every single time. Premium packaging and incredible flavor make it the perfect thoughtful present.",
-              name: "Michael Chen",
-              role: "CEO, Tech Innovation Group",
-              imageSrc: "http://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg?_wi=3",
-              imageAlt: "Michael Chen portrait",
-            },
-            {
-              id: "4",
-              title: "Sustainable & Delicious",
-              quote: "Supporting a company that cares about the environment as much as they care about quality coffee is a win-win. Their direct farm-to-cup model is exactly what I was looking for.",
-              name: "Emma Thompson",
-              role: "Sustainability Advocate",
-              imageSrc: "http://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg?_wi=4",
-              imageAlt: "Emma Thompson portrait",
-            },
-            {
-              id: "5",
-              title: "Best Subscription Ever",
-              quote: "Their subscription service is seamless, flexible, and the value is unbeatable. I appreciate the ability to customize my orders and the loyalty rewards have been fantastic.",
-              name: "David Martinez",
-              role: "Frequent Subscriber",
-              imageSrc: "http://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg?_wi=5",
-              imageAlt: "David Martinez portrait",
-            },
-            {
-              id: "6",
-              title: "Transparency I Can Trust",
-              quote: "Knowing exactly where my coffee comes from, when it was roasted, and how to brew it perfectly makes this experience feel truly premium. That level of care is rare.",
-              name: "Lisa Anderson",
-              role: "Quality-Focused Consumer",
-              imageSrc: "http://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg?_wi=6",
-              imageAlt: "Lisa Anderson portrait",
-            },
+              id: "3",              name: "Maria Rodriguez",              role: "Home Barista",              company: "Austin, TX",              rating: 5,
+              imageSrc: "asset://testimonial-3"},
+          ]}
+          kpiItems={[
+            { value: "10K+", label: "Happy Customers" },
+            { value: "100%", label: "Satisfaction Rate" },
+            { value: "15+", label: "Awards Won" },
           ]}
         />
       </div>
@@ -339,27 +183,19 @@ export default function HomePage() {
           socialLinks={[
             {
               icon: Instagram,
-              href: "https://instagram.com/fincadonmanuel",
-              ariaLabel: "Follow us on Instagram",
-            },
+              href: "https://instagram.com/fincadonmanuel",              ariaLabel: "Follow us on Instagram"},
             {
               icon: Facebook,
-              href: "https://facebook.com/fincadonmanuel",
-              ariaLabel: "Follow us on Facebook",
-            },
+              href: "https://facebook.com/fincadonmanuel",              ariaLabel: "Follow us on Facebook"},
             {
               icon: Twitter,
-              href: "https://twitter.com/fincadonmanuel",
-              ariaLabel: "Follow us on Twitter",
-            },
+              href: "https://twitter.com/fincadonmanuel",              ariaLabel: "Follow us on Twitter"},
             {
               icon: Mail,
-              href: "mailto:hello@fincadonmanuel.com",
-              ariaLabel: "Email us",
-            },
+              href: "mailto:hello@fincadonmanuel.com",              ariaLabel: "Email us"},
           ]}
         />
       </div>
     </ThemeProvider>
   );
-}
\ No newline at end of file
+}
diff --git a/src/app/styles/variables.css b/src/app/styles/variables.css
index 7810cc6..5a25d06 100644
--- a/src/app/styles/variables.css
+++ b/src/app/styles/variables.css
@@ -2,23 +2,23 @@
   /* Base units */
   /* --vw is set by ThemeProvider */
 
-  /* --background: #ffffff;;
-  --card: #f9f9f9;;
-  --foreground: #120006e6;;
-  --primary-cta: #e63946;;
-  --secondary-cta: #f9f9f9;;
-  --accent: #e2e2e2;;
-  --background-accent: #c4c4c4;; */
+  /* --background: #000000;;
+  --card: #1a1a1a;;
+  --foreground: #ffffff;;
+  --primary-cta: #000000;;
+  --secondary-cta: #ffffff;;
+  --accent: #535353;;
+  --background-accent: #000000;; */
 
-  --background: #ffffff;;
-  --card: #f9f9f9;;
-  --foreground: #120006e6;;
-  --primary-cta: #e63946;;
+  --background: #000000;;
+  --card: #1a1a1a;;
+  --foreground: #ffffff;;
+  --primary-cta: #000000;;
   --primary-cta-text: #ffffff;;
-  --secondary-cta: #f9f9f9;;
+  --secondary-cta: #ffffff;;
   --secondary-cta-text: #120006e6;;
-  --accent: #e2e2e2;;
-  --background-accent: #c4c4c4;;
+  --accent: #535353;;
+  --background-accent: #000000;;
 
   /* text sizing - set by ThemeProvider */
   /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
diff --git a/src/app/subscription/page.tsx b/src/app/subscription/page.tsx
index 900b92a..55c5941 100644
--- a/src/app/subscription/page.tsx
+++ b/src/app/subscription/page.tsx
@@ -2,15 +2,15 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import Link from "next/link";
-import NavbarStyleFullscreen from "@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen";
-import PricingCardTwo from "@/components/sections/pricing/PricingCardTwo";
+import NavbarStyleCentered from "@/components/navbar/NavbarStyleCentered/NavbarStyleCentered";
+import PricingCardThree from "@/components/sections/pricing/PricingCardThree";
 import FeatureBento from "@/components/sections/feature/FeatureBento";
 import FooterCard from "@/components/sections/footer/FooterCard";
 import { Zap, Award, Sparkles, Coffee, Leaf, Instagram, Facebook, Twitter, Mail } from "lucide-react";
 
 const navItems = [
   { name: "Shop", id: "/products" },
-  { name: "About Us", id: "/about" },
+  { name: "About", id: "/about" },
   { name: "Subscription", id: "/subscription" },
   { name: "Blog", id: "/blog" },
   { name: "Contact", id: "/contact" },
@@ -19,30 +19,29 @@ const navItems = [
 export default function SubscriptionPage() {
   return (
     <ThemeProvider
-      defaultButtonVariant="elastic-effect"
+      defaultButtonVariant="hover-magnetic"
       defaultTextAnimation="entrance-slide"
-      borderRadius="pill"
-      contentWidth="smallMedium"
-      sizing="largeSmallSizeMediumTitles"
-      background="aurora"
-      cardStyle="subtle-shadow"
-      primaryButtonStyle="double-inset"
-      secondaryButtonStyle="radial-glow"
-      headingFontWeight="normal"
+      borderRadius="rounded"
+      contentWidth="medium"
+      sizing="mediumLargeSizeLargeTitles"
+      background="none"
+      cardStyle="solid"
+      primaryButtonStyle="gradient"
+      secondaryButtonStyle="solid"
+      headingFontWeight="bold"
     >
       {/* Navigation */}
       <div id="nav" data-section="nav">
-        <NavbarStyleFullscreen
+        <NavbarStyleCentered
           navItems={navItems}
+          button={{ text: "Get Started", href: "/subscription" }}
           brandName="Finca Don Manuel"
-          bottomLeftText="Premium Specialty Coffee"
-          bottomRightText="hello@fincadonmanuel.com"
         />
       </div>
 
       {/* Subscription Plans */}
       <div id="subscription-plans" data-section="subscription-plans">
-        <PricingCardTwo
+        <PricingCardThree
           title="Choose Your Perfect Subscription"
           description="All plans include free shipping, flexible customization, and exclusive member benefits. Pause, skip, or cancel anytime with no penalties."
           tag="Recurring Savings"
@@ -53,33 +52,30 @@ export default function SubscriptionPage() {
           plans={[
             {
               id: "weekly",              badge: "Weekly Subscription",              badgeIcon: Zap,
-              price: "$12.99/bag",              subtitle: "Fresh delivery every week",              buttons: [
+              price: "$12.99/bag",              name: "Fresh delivery every week",              buttons: [
                 { text: "Start Weekly", href: "#" },
                 { text: "Chat to Sales", href: "/contact" },
               ],
               features: [
-                "1 bag (250g or 500g) every week",                "10% discount on regular price",                "Skip or pause anytime",                "Free priority shipping",                "Exclusive member-only blends"
-              ],
+                "1 bag (250g or 500g) every week",                "10% discount on regular price",                "Skip or pause anytime",                "Free priority shipping",                "Exclusive member-only blends"],
             },
             {
               id: "biweekly",              badge: "Bi-Weekly Plan",              badgeIcon: Sparkles,
-              price: "$24.99/shipment",              subtitle: "Balanced for regular drinkers",              buttons: [
+              price: "$24.99/shipment",              name: "Balanced for regular drinkers",              buttons: [
                 { text: "Start Bi-Weekly", href: "#" },
                 { text: "Chat to Sales", href: "/contact" },
               ],
               features: [
-                "1kg coffee every 2 weeks",                "15% discount on regular price",                "Free shipping all orders",                "Birthday bonus coffee",                "Loyalty rewards program"
-              ],
+                "1kg coffee every 2 weeks",                "15% discount on regular price",                "Free shipping all orders",                "Birthday bonus coffee",                "Loyalty rewards program"],
             },
             {
               id: "monthly",              badge: "Monthly Box",              badgeIcon: Award,
-              price: "$44.99/month",              subtitle: "Most popular choice",              buttons: [
+              price: "$44.99/month",              name: "Most popular choice",              buttons: [
                 { text: "Start Monthly", href: "#" },
                 { text: "Chat to Sales", href: "/contact" },
               ],
               features: [
-                "2kg premium selection monthly",                "20% discount on all items",                "Free express shipping",                "Early access to limited editions",                "Exclusive tasting notes guide"
-              ],
+                "2kg premium selection monthly",                "20% discount on all items",                "Free express shipping",                "Early access to limited editions",                "Exclusive tasting notes guide"],
             },
           ]}
         />
@@ -106,8 +102,7 @@ export default function SubscriptionPage() {
             {
               title: "Limited Edition Access",              description: "Be the first to access seasonal roasts, experimental blends, and exclusive collaborations.",              bentoComponent: "marquee",              centerIcon: Coffee,
               variant: "text",              texts: [
-                "Spring Microlots First",                "Harvest Releases Early",                "Exclusive Collaborations",                "Member-Only Roasts"
-              ],
+                "Spring Microlots First",                "Harvest Releases Early",                "Exclusive Collaborations",                "Member-Only Roasts"],
             },
             {
               title: "Sustainability Tracking",              description: "Monitor your environmental impact with detailed reports showing your carbon footprint savings and forest regeneration contribution.",              bentoComponent: "timeline",              heading: "Your Impact",              subheading: "Positive change through coffee",              items: [
@@ -115,8 +110,7 @@ export default function SubscriptionPage() {
                 { label: "Forest Acres", detail: "Protected per year" },
                 { label: "Fair Wages", detail: "Invested in farming" },
               ],
-              completedLabel: "Making a Difference"
-            },
+              completedLabel: "Making a Difference"},
           ]}
         />
       </div>
@@ -161,23 +155,19 @@ export default function SubscriptionPage() {
           socialLinks={[
             {
               icon: Instagram,
-              href: "https://instagram.com/fincadonmanuel",              ariaLabel: "Follow us on Instagram"
-            },
+              href: "https://instagram.com/fincadonmanuel",              ariaLabel: "Follow us on Instagram"},
             {
               icon: Facebook,
-              href: "https://facebook.com/fincadonmanuel",              ariaLabel: "Follow us on Facebook"
-            },
+              href: "https://facebook.com/fincadonmanuel",              ariaLabel: "Follow us on Facebook"},
             {
               icon: Twitter,
-              href: "https://twitter.com/fincadonmanuel",              ariaLabel: "Follow us on Twitter"
-            },
+              href: "https://twitter.com/fincadonmanuel",              ariaLabel: "Follow us on Twitter"},
             {
               icon: Mail,
-              href: "mailto:hello@fincadonmanuel.com",              ariaLabel: "Email us"
-            },
+              href: "mailto:hello@fincadonmanuel.com",              ariaLabel: "Email us"},
           ]}
         />
       </div>
     </ThemeProvider>
   );
-}
\ No newline at end of file
+}