diff --git a/src/app/page.tsx b/src/app/page.tsx
index 28ce4e8..6b6db65 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -3,15 +3,16 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import ContactSplit from '@/components/sections/contact/ContactSplit';
-import FaqDouble from '@/components/sections/faq/FaqDouble';
-import FooterMedia from '@/components/sections/footer/FooterMedia';
+import FaqBase from '@/components/sections/faq/FaqBase';
+import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
 import HeroCarouselLogo from '@/components/sections/hero/heroCarouselLogo/HeroCarouselLogo';
-import MetricCardEleven from '@/components/sections/metrics/MetricCardEleven';
+import MetricCardOne from '@/components/sections/metrics/MetricCardOne';
 import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
 import ProductCardThree from '@/components/sections/product/ProductCardThree';
 import SocialProofOne from '@/components/sections/socialProof/SocialProofOne';
 import SplitAbout from '@/components/sections/about/SplitAbout';
-import TestimonialCardOne from '@/components/sections/testimonial/TestimonialCardOne';
+import TestimonialCardSixteen from '@/components/sections/testimonial/TestimonialCardSixteen';
+import { Heart, Star, Sparkles, Zap, ShieldCheck } from "lucide-react";
 
 export default function LandingPage() {
   return (
@@ -31,22 +32,10 @@ export default function LandingPage() {
   <div id="nav" data-section="nav">
       <NavbarStyleFullscreen
       navItems={[
-        {
-          name: "Home",
-          id: "hero",
-        },
-        {
-          name: "Products",
-          id: "products",
-        },
-        {
-          name: "Testimonials",
-          id: "testimonials",
-        },
-        {
-          name: "FAQ",
-          id: "faq",
-        },
+        { name: "Home", id: "hero" },
+        { name: "Products", id: "products" },
+        { name: "Testimonials", id: "testimonials" },
+        { name: "FAQ", id: "faq" },
       ]}
       brandName="EtsyDigitalShop"
     />
@@ -56,37 +45,11 @@ export default function LandingPage() {
       <HeroCarouselLogo
       logoText="Etsy Digital Shop"
       description="Premium digital journals, e-recipes, and fun activity books for your daily life. Download, print, and create instantly."
-      buttons={[
-        {
-          text: "Shop Collections",
-          href: "#products",
-        },
-      ]}
+      buttons={[{ text: "Shop Collections", href: "#products" }]}
       slides={[
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/floral-journal-with-soft-pastel-aesthetics_23-2152005013.jpg",
-          imageAlt: "digital planner flat lay",
-        },
-        {
-          imageSrc: "http://img.b2bpic.net/free-vector/hand-drawn-tracing-worksheet-template_23-2149675501.jpg",
-          imageAlt: "kids activity book cover",
-        },
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/illustrated-line-art-mandala_23-2151800256.jpg",
-          imageAlt: "adult coloring book cover",
-        },
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/top-view-cup-tea-with-plums-candies_140725-57204.jpg",
-          imageAlt: "digital recipe binder design",
-        },
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/stuck-home-checklist-notebook_53876-95186.jpg",
-          imageAlt: "modern digital shop branding",
-        },
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/scenes-famous-vlogger-recording-social-media-creative-young-man_482257-24887.jpg",
-          imageAlt: "creative digital download studio",
-        },
+        { imageSrc: "http://img.b2bpic.net/free-photo/floral-journal-with-soft-pastel-aesthetics_23-2152005013.jpg", imageAlt: "digital planner flat lay" },
+        { imageSrc: "http://img.b2bpic.net/free-vector/hand-drawn-tracing-worksheet-template_23-2149675501.jpg", imageAlt: "kids activity book cover" },
+        { imageSrc: "http://img.b2bpic.net/free-photo/illustrated-line-art-mandala_23-2151800256.jpg", imageAlt: "adult coloring book cover" },
       ]}
       autoplayDelay={4000}
     />
@@ -99,18 +62,9 @@ export default function LandingPage() {
       title="Crafting Joy, One Page at a Time"
       description="We specialize in high-quality digital downloads designed to inspire creativity, organization, and fun. Every template is crafted with love, ready for you to download and enjoy today."
       bulletPoints={[
-        {
-          title: "Artisanal Design",
-          description: "Hand-crafted layouts tailored for aesthetics and usability.",
-        },
-        {
-          title: "Instant Download",
-          description: "Get your products immediately after purchase via Etsy.",
-        },
-        {
-          title: "Family Friendly",
-          description: "Activities for kids and drawing books for all ages.",
-        },
+        { title: "Artisanal Design", description: "Hand-crafted layouts tailored for aesthetics and usability.", icon: Heart },
+        { title: "Instant Download", description: "Get your products immediately after purchase via Etsy.", icon: Zap },
+        { title: "Family Friendly", description: "Activities for kids and drawing books for all ages.", icon: Star },
       ]}
       imageSrc="http://img.b2bpic.net/free-photo/still-life-office-desk-mess_23-2150164872.jpg"
       mediaAnimation="slide-up"
@@ -124,42 +78,9 @@ export default function LandingPage() {
       gridVariant="three-columns-all-equal-width"
       useInvertedBackground={false}
       products={[
-        {
-          id: "p1",
-          name: "Daily Planner Journal",
-          price: "$9.99",
-          imageSrc: "http://img.b2bpic.net/free-photo/still-life-colorful-overloaded-bullet-journal_23-2150168636.jpg",
-        },
-        {
-          id: "p2",
-          name: "Healthy Recipe Book",
-          price: "$12.99",
-          imageSrc: "http://img.b2bpic.net/free-photo/top-view-recipe-book-still-life-concept_23-2149056018.jpg",
-        },
-        {
-          id: "p3",
-          name: "Zen Adult Coloring",
-          price: "$7.99",
-          imageSrc: "http://img.b2bpic.net/free-photo/line-art-mandala-illustration_23-2151800213.jpg",
-        },
-        {
-          id: "p4",
-          name: "Kids Alphabet Set",
-          price: "$5.99",
-          imageSrc: "http://img.b2bpic.net/free-photo/top-view-child-tutor-learning-about-numbers-letters_23-2148524549.jpg",
-        },
-        {
-          id: "p5",
-          name: "Maze & Puzzle Book",
-          price: "$6.99",
-          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9j8m3h",
-        },
-        {
-          id: "p6",
-          name: "Self-Care Workbook",
-          price: "$8.99",
-          imageSrc: "http://img.b2bpic.net/free-photo/top-view-desk-arrangement-with-glasses_23-2149046719.jpg",
-        },
+        { id: "p1", name: "Daily Planner Journal", price: "$9.99", imageSrc: "http://img.b2bpic.net/free-photo/still-life-colorful-overloaded-bullet-journal_23-2150168636.jpg" },
+        { id: "p2", name: "Healthy Recipe Book", price: "$12.99", imageSrc: "http://img.b2bpic.net/free-photo/top-view-recipe-book-still-life-concept_23-2149056018.jpg" },
+        { id: "p3", name: "Zen Adult Coloring", price: "$7.99", imageSrc: "http://img.b2bpic.net/free-photo/line-art-mandala-illustration_23-2151800213.jpg" },
       ]}
       title="Shop Our Digital Collection"
       description="Browse our latest journals, recipes, and coloring books."
@@ -167,88 +88,37 @@ export default function LandingPage() {
   </div>
 
   <div id="metrics" data-section="metrics">
-      <MetricCardEleven
+      <MetricCardOne
       animationType="slide-up"
       textboxLayout="default"
       useInvertedBackground={true}
-      metrics={[
-        {
-          id: "m1",
-          value: "5,000+",
-          title: "Downloads",
-          description: "Unique digital items sold.",
-          imageSrc: "http://img.b2bpic.net/free-vector/round-graphic-with-ecommerce-icons_1051-480.jpg",
-        },
-        {
-          id: "m2",
-          value: "4.9/5",
-          title: "Customer Rating",
-          description: "Based on 1,200+ reviews.",
-          imageSrc: "http://img.b2bpic.net/free-photo/top-view-arrangement-with-smiley-emoji-card_23-2148860296.jpg",
-        },
-        {
-          id: "m3",
-          value: "150+",
-          title: "Product Designs",
-          description: "Curated digital products.",
-          imageSrc: "http://img.b2bpic.net/free-vector/creative-online-shopping-25-line-filled-icon-pack-such-as-quality-list-product-clipboard-online-shopping_1142-24659.jpg",
-        },
-      ]}
+      gridVariant="uniform-all-items-equal"
       title="Trusted by Thousands"
       description="Join our community of happy creators."
+      metrics={[
+        { id: "m1", value: "5,000+", title: "Downloads", description: "Unique digital items sold.", icon: Sparkles },
+        { id: "m2", value: "4.9/5", title: "Customer Rating", description: "Based on 1,200+ reviews.", icon: Star },
+        { id: "m3", value: "150+", title: "Product Designs", description: "Curated digital products.", icon: ShieldCheck },
+      ]}
     />
   </div>
 
   <div id="testimonials" data-section="testimonials">
-      <TestimonialCardOne
+      <TestimonialCardSixteen
       animationType="slide-up"
       textboxLayout="split"
-      gridVariant="asymmetric-60-wide-40-narrow"
       useInvertedBackground={false}
-      testimonials={[
-        {
-          id: "1",
-          name: "Sarah Miller",
-          role: "Graphic Designer",
-          company: "Creative Hub",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/girl-sitting-table-holding-mobile-phone-indoors_171337-17096.jpg",
-        },
-        {
-          id: "2",
-          name: "John Doe",
-          role: "Teacher",
-          company: "Local Elementary",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/attractive-man-using-laptop-sofa_329181-12153.jpg",
-        },
-        {
-          id: "3",
-          name: "Emily Chen",
-          role: "Freelancer",
-          company: "Self-Employed",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/happy-smiling-woman-close-eyes-showing-okay-ok-sign-zero-gesture-no-proble-praise-awesome-good-thing-standing-stylish-outfit-against-white-background_176420-46697.jpg",
-        },
-        {
-          id: "4",
-          name: "Anna Smith",
-          role: "Stay at Home Mom",
-          company: "Home",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/black-white-portrait-mother-child-showing-vulnerability-self-acceptance_23-2151237481.jpg",
-        },
-        {
-          id: "5",
-          name: "Mark Wilson",
-          role: "Architect",
-          company: "Studio Design",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/woman-with-thumbs-up_1149-1163.jpg",
-        },
-      ]}
       title="From Our Creative Community"
       description="See why our customers love our printable digital products."
+      kpiItems={[
+          { value: "1.2K+", label: "Reviews" },
+          { value: "5K+", label: "Downloads" },
+          { value: "150+", label: "Designs" }
+      ]}
+      testimonials={[
+        { id: "1", name: "Sarah Miller", role: "Graphic Designer", company: "Creative Hub", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/girl-sitting-table-holding-mobile-phone-indoors_171337-17096.jpg" },
+        { id: "2", name: "John Doe", role: "Teacher", company: "Local Elementary", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/attractive-man-using-laptop-sofa_329181-12153.jpg" },
+      ]}
     />
   </div>
 
@@ -256,98 +126,44 @@ export default function LandingPage() {
       <SocialProofOne
       textboxLayout="default"
       useInvertedBackground={true}
-      names={[
-        "CraftyLife",
-        "PrintJoy",
-        "DigitalStudio",
-        "HappyHome",
-        "KidsLearn",
-        "StationeryTrends",
-        "PaperDreams",
-      ]}
+      names={["CraftyLife", "PrintJoy", "DigitalStudio", "HappyHome", "KidsLearn"]}
       title="Featured In & Loved By"
-      description="We are proud to be part of the community."
+      description="We are proud to be part of the creative community."
     />
   </div>
 
   <div id="faq" data-section="faq">
-      <FaqDouble
+      <FaqBase
       textboxLayout="default"
       useInvertedBackground={false}
-      faqs={[
-        {
-          id: "f1",
-          title: "How do I download my product?",
-          content: "Upon purchase, you will receive an email from Etsy with a link to download your file.",
-        },
-        {
-          id: "f2",
-          title: "Are these printable?",
-          content: "Yes! All our products are designed to be printed at home or professionally.",
-        },
-        {
-          id: "f3",
-          title: "Can I return a digital product?",
-          content: "Due to the digital nature of our goods, we do not accept returns. However, please contact us if you have issues.",
-        },
-      ]}
+      faqsAnimation="slide-up"
       title="Frequently Asked Questions"
       description="Everything you need to know about our digital downloads."
-      faqsAnimation="slide-up"
+      faqs={[
+        { id: "f1", title: "How do I download my product?", content: "Upon purchase, you will receive an email from Etsy with a link to download your file." },
+        { id: "f2", title: "Are these printable?", content: "Yes! All our products are designed to be printed at home or professionally." },
+        { id: "f3", title: "Can I return a digital product?", content: "Due to the digital nature of our goods, we do not accept returns. However, please contact us if you have issues." },
+      ]}
     />
   </div>
 
   <div id="contact" data-section="contact">
       <ContactSplit
       useInvertedBackground={true}
-      background={{
-        variant: "gradient-bars",
-      }}
+      background={{ variant: "gradient-bars" }}
       tag="Newsletter"
       title="Join Our Mailing List"
       description="Stay updated with new arrivals, special discounts, and creative tips."
-      inputPlaceholder="Enter your email address"
-      buttonText="Subscribe"
       imageSrc="http://img.b2bpic.net/free-photo/lavender-cellphone-keyboard-mouse-with-office-stationery-colored-pink-background_23-2147880690.jpg"
-      mediaAnimation="slide-up"
     />
   </div>
 
   <div id="footer" data-section="footer">
-      <FooterMedia
-      imageSrc="http://img.b2bpic.net/free-vector/illustration-boutique-shop-logo-stamp-banner_53876-6848.jpg"
+      <FooterBaseCard
       logoText="Etsy Digital Shop"
       columns={[
-        {
-          title: "Shop",
-          items: [
-            {
-              label: "Journals",
-              href: "#products",
-            },
-            {
-              label: "Recipes",
-              href: "#products",
-            },
-            {
-              label: "Books",
-              href: "#products",
-            },
-          ],
-        },
-        {
-          title: "Support",
-          items: [
-            {
-              label: "Contact Us",
-              href: "#contact",
-            },
-            {
-              label: "Returns Policy",
-              href: "#faq",
-            },
-          ],
-        },
+        { title: "Shop", items: [{ label: "Journals", href: "#products" }, { label: "Recipes", href: "#products" }] },
+        { title: "Support", items: [{ label: "Contact", href: "#contact" }, { label: "FAQ", href: "#faq" }] },
       ]}
       copyrightText="© 2025 EtsyDigitalShop"
     />