diff --git a/src/app/page.tsx b/src/app/page.tsx
index 22dbe9b..cba56b9 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -2,308 +2,165 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import ContactCTA from '@/components/sections/contact/ContactCTA';
-import FaqBase from '@/components/sections/faq/FaqBase';
-import FeatureBento from '@/components/sections/feature/FeatureBento';
-import FooterCard from '@/components/sections/footer/FooterCard';
-import HeroLogoBillboard from '@/components/sections/hero/HeroLogoBillboard';
-import InlineImageSplitTextAbout from '@/components/sections/about/InlineImageSplitTextAbout';
-import MetricCardFourteen from '@/components/sections/metrics/MetricCardFourteen';
-import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
-import ProductCardFour from '@/components/sections/product/ProductCardFour';
-import TestimonialCardSix from '@/components/sections/testimonial/TestimonialCardSix';
-import { CheckCircle, Shield, Zap } from "lucide-react";
+import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
+import FaqSplitMedia from '@/components/sections/faq/FaqSplitMedia';
+import FeatureCardTwentySix from '@/components/sections/feature/FeatureCardTwentySix';
+import FooterMedia from '@/components/sections/footer/FooterMedia';
+import HeroLogo from '@/components/sections/hero/HeroLogo';
+import TestimonialAboutCard from '@/components/sections/about/TestimonialAboutCard';
+import MetricCardTwo from '@/components/sections/metrics/MetricCardTwo';
+import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
+import ProductCardTwo from '@/components/sections/product/ProductCardTwo';
+import TestimonialCardOne from '@/components/sections/testimonial/TestimonialCardOne';
+import { CheckCircle, Shield, Zap, ShoppingBag, MapPin } from "lucide-react";
 
 export default function LandingPage() {
   return (
     <ThemeProvider
         defaultButtonVariant="hover-magnetic"
         defaultTextAnimation="reveal-blur"
-        borderRadius="pill"
-        contentWidth="small"
-        sizing="mediumSizeLargeTitles"
-        background="grid"
-        cardStyle="subtle-shadow"
-        primaryButtonStyle="radial-glow"
-        secondaryButtonStyle="glass"
-        headingFontWeight="light"
+        borderRadius="soft"
+        contentWidth="mediumLarge"
+        sizing="medium"
+        background="none"
+        cardStyle="outline"
+        primaryButtonStyle="flat"
+        secondaryButtonStyle="solid"
+        headingFontWeight="semibold"
     >
       <ReactLenis root>
   <div id="nav" data-section="nav">
-      <NavbarLayoutFloatingInline
-      navItems={[
-        {
-          name: "Home",
-          id: "hero",
-        },
-        {
-          name: "Products",
-          id: "products",
-        },
-        {
-          name: "About",
-          id: "about",
-        },
-        {
-          name: "Contact",
-          id: "contact",
-        },
-      ]}
+      <NavbarStyleApple
       brandName="GeneralStore"
+      navItems={[
+        { name: "Home", id: "hero" },
+        { name: "Products", id: "products" },
+        { name: "About", id: "about" },
+        { name: "Contact", id: "contact" },
+      ]}
     />
   </div>
 
   <div id="hero" data-section="hero">
-      <HeroLogoBillboard
-      background={{
-        variant: "plain",
-      }}
-      logoText="GeneralStore"
-      description="Your neighborhood hub for premium quality goods, fresh produce, and daily essentials. Delivered with care to your doorstep."
-      buttons={[
-        {
-          text: "Shop Now",
-          href: "#products",
-        },
-        {
-          text: "Contact Us",
-          href: "#contact",
-        },
-      ]}
+      <HeroLogo
+      logoText="Modern General Store"
+      description="Curated essentials for your contemporary lifestyle. Quality goods, delivered with modern convenience."
+      buttons={[{ text: "Explore Products", href: "#products" }]}
       imageSrc="http://img.b2bpic.net/free-photo/brunette-chooses-food-lady-is-holding-shopping-cart-girl-white-shirt-supermarket_1157-42221.jpg?_wi=1"
-      imageAlt="modern general store interior"
-      mediaAnimation="slide-up"
+      imageAlt="Modern retail environment"
     />
   </div>
 
   <div id="about" data-section="about">
-      <InlineImageSplitTextAbout
+      <TestimonialAboutCard
+      tag="Our Story"
+      title="Redefining the General Store"
+      description="We blend traditional reliability with modern convenience to serve your everyday needs."
+      subdescription="Our commitment is to source the best local products for our community."
+      icon={ShoppingBag}
+      imageSrc="http://img.b2bpic.net/free-photo/vendor-talking-customer-counter_482257-76117.jpg?_wi=1"
       useInvertedBackground={true}
-      heading={[
-        {
-          type: "text",
-          content: "Quality You Can Trust",
-        },
-        {
-          type: "image",
-          src: "http://img.b2bpic.net/free-photo/vendor-talking-customer-counter_482257-76117.jpg",
-          alt: "local general store staff",
-        },
-      ]}
     />
   </div>
 
   <div id="products" data-section="products">
-      <ProductCardFour
+      <ProductCardTwo
+      title="Curated Essentials"
+      description="Thoughtfully selected items for your pantry and home."
+      gridVariant="four-items-2x2-equal-grid"
       animationType="slide-up"
       textboxLayout="default"
-      gridVariant="four-items-2x2-equal-grid"
-      useInvertedBackground={false}
       products={[
-        {
-          id: "p1",
-          name: "Organic Apples",
-          price: "$4.99",
-          variant: "1kg",
-          imageSrc: "http://img.b2bpic.net/free-photo/oranges-green-red-apples_1339-4563.jpg",
-        },
-        {
-          id: "p2",
-          name: "Olive Oil",
-          price: "$12.50",
-          variant: "500ml",
-          imageSrc: "http://img.b2bpic.net/free-photo/healthy-product-olive-oil_23-2151944007.jpg",
-        },
-        {
-          id: "p3",
-          name: "Artisanal Bread",
-          price: "$3.50",
-          variant: "500g",
-          imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-woman-working-bakery_23-2150273178.jpg",
-        },
-        {
-          id: "p4",
-          name: "Coffee Beans",
-          price: "$15.00",
-          variant: "250g",
-          imageSrc: "http://img.b2bpic.net/free-photo/top-view-brown-coffee-seeds-with-macarons_140725-27789.jpg",
-        },
-        {
-          id: "p5",
-          name: "Raw Honey",
-          price: "$8.99",
-          variant: "300g",
-          imageSrc: "http://img.b2bpic.net/free-photo/jar-sweet-honey-flowers-desk_23-2147938089.jpg",
-        },
-        {
-          id: "p6",
-          name: "Natural Soap",
-          price: "$5.00",
-          variant: "100g",
-          imageSrc: "http://img.b2bpic.net/free-photo/homemade-soap-with-flowers_23-2148897649.jpg",
-        },
+        { id: "1", brand: "Organic", name: "Fresh Apples", price: "$4.99", rating: 5, reviewCount: "128", imageSrc: "http://img.b2bpic.net/free-photo/oranges-green-red-apples_1339-4563.jpg" },
+        { id: "2", brand: "Premium", name: "Olive Oil", price: "$14.99", rating: 5, reviewCount: "95", imageSrc: "http://img.b2bpic.net/free-photo/healthy-product-olive-oil_23-2151944007.jpg?_wi=1" }
       ]}
-      title="Daily Essentials"
-      description="Browse our hand-picked selection of fresh, organic, and locally sourced essentials for your pantry and home."
+      useInvertedBackground={false}
     />
   </div>
 
   <div id="features" data-section="features">
-      <FeatureBento
-      textboxLayout="split"
+      <FeatureCardTwentySix
+      title="Why Choose Us"
+      description="Modern service for modern living."
+      textboxLayout="inline-image"
       useInvertedBackground={true}
       features={[
-        {
-          title: "Fresh Quality",
-          description: "Hand-picked produce delivered to our shop daily.",
-          bentoComponent: "reveal-icon",
-          icon: CheckCircle,
-          imageSrc: "http://img.b2bpic.net/free-photo/mature-blonde-business-woman-work_23-2149100297.jpg",
-          imageAlt: "fresh quality groceries icon",
-        },
-        {
-          title: "Fast Delivery",
-          description: "Same day shipping to your home with care.",
-          bentoComponent: "reveal-icon",
-          icon: Zap,
-          imageSrc: "http://img.b2bpic.net/free-photo/brunette-chooses-food-lady-is-holding-shopping-cart-girl-white-shirt-supermarket_1157-42221.jpg?_wi=2",
-          imageAlt: "fresh quality groceries icon",
-        },
-        {
-          title: "Great Prices",
-          description: "Affordable prices for every family's budget.",
-          bentoComponent: "reveal-icon",
-          icon: Shield,
-          imageSrc: "http://img.b2bpic.net/free-photo/vendor-talking-customer-counter_482257-76117.jpg",
-          imageAlt: "fresh quality groceries icon",
-        },
+        { title: "Freshness First", description: "Daily deliveries from local growers.", buttonIcon: CheckCircle },
+        { title: "Fast Delivery", description: "Reliable shipping to your doorstep.", buttonIcon: Zap },
+        { title: "Secure Payments", description: "Safe and easy checkout process.", buttonIcon: Shield },
+        { title: "Local Roots", description: "Supporting our neighborhood farmers.", buttonIcon: MapPin }
       ]}
-      title="Why Choose Us"
-      description="We prioritize your health, convenience, and local community values above everything else."
     />
   </div>
 
   <div id="metrics" data-section="metrics">
-      <MetricCardFourteen
-      useInvertedBackground={false}
-      title="Our Impact"
-      tag="Trusted by Thousands"
+      <MetricCardTwo
+      title="Our Growth"
+      description="Tracking our impact on the community."
       metrics={[
-        {
-          id: "m1",
-          value: "10k+",
-          description: "Happy Customers",
-        },
-        {
-          id: "m2",
-          value: "500+",
-          description: "Products Available",
-        },
-        {
-          id: "m3",
-          value: "5+",
-          description: "City Locations",
-        },
+        { id: "1", value: "10k+", description: "Happy Customers" },
+        { id: "2", value: "500+", description: "Curated Products" },
+        { id: "3", value: "15", description: "Years Experience" }
       ]}
-      metricsAnimation="slide-up"
+      gridVariant="bento-grid"
+      animationType="slide-up"
+      textboxLayout="default"
+      useInvertedBackground={false}
     />
   </div>
 
   <div id="testimonials" data-section="testimonials">
-      <TestimonialCardSix
+      <TestimonialCardOne
+      title="Customer Love"
+      description="What our community has to say about our store."
+      testimonials={[
+        { id: "1", name: "Sarah J.", role: "Local Resident", company: "City Center", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/smiley-mother-daughter-walking-front-view_23-2149854626.jpg" },
+        { id: "2", name: "Mike R.", role: "Daily Shopper", company: "West End", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/portrait-woman-happy-after-shopping_23-2148660676.jpg" }
+      ]}
+      gridVariant="uniform-all-items-equal"
+      animationType="slide-up"
       textboxLayout="default"
       useInvertedBackground={true}
-      testimonials={[
-        {
-          id: "t1",
-          name: "Jane Doe",
-          handle: "@janedoe",
-          testimonial: "Best service in town! Everything is always fresh.",
-          imageSrc: "http://img.b2bpic.net/free-photo/smiley-mother-daughter-walking-front-view_23-2149854626.jpg",
-        },
-        {
-          id: "t2",
-          name: "John Smith",
-          handle: "@johnsmith",
-          testimonial: "I love the local variety and friendly atmosphere.",
-          imageSrc: "http://img.b2bpic.net/free-photo/portrait-woman-happy-after-shopping_23-2148660676.jpg",
-        },
-        {
-          id: "t3",
-          name: "Alice Brown",
-          handle: "@aliceb",
-          testimonial: "Highly recommended shop for daily essentials.",
-          imageSrc: "http://img.b2bpic.net/free-photo/client-shopping-eco-supermarket_482257-76691.jpg",
-        },
-        {
-          id: "t4",
-          name: "Bob Wilson",
-          handle: "@bobwilson",
-          testimonial: "Very friendly staff and great prices.",
-          imageSrc: "http://img.b2bpic.net/free-photo/elderly-couple-searching-blazers_482257-74572.jpg",
-        },
-        {
-          id: "t5",
-          name: "Carol White",
-          handle: "@carolw",
-          testimonial: "Fast delivery as promised, every single time.",
-          imageSrc: "http://img.b2bpic.net/free-photo/smiley-adult-women-taking-selfie_23-2148385695.jpg",
-        },
-      ]}
-      title="Customer Stories"
-      description="Read what our wonderful neighbors are saying about their shopping experience."
     />
   </div>
 
   <div id="faq" data-section="faq">
-      <FaqBase
+      <FaqSplitMedia
+      title="Helpful Information"
+      description="Answers to frequently asked questions about our store."
+      faqs={[
+        { id: "1", title: "Delivery areas?", content: "We cover the entire metro area." },
+        { id: "2", title: "Return policy?", content: "100% satisfaction guarantee on all goods." }
+      ]}
+      faqsAnimation="slide-up"
       textboxLayout="default"
       useInvertedBackground={false}
-      faqs={[
-        {
-          id: "f1",
-          title: "Do you deliver daily?",
-          content: "Yes, we offer same-day delivery service to most residential areas nearby.",
-        },
-        {
-          id: "f2",
-          title: "Are items organic?",
-          content: "Many of our fresh products are sourced directly from certified organic local farms.",
-        },
-        {
-          id: "f3",
-          title: "Return policy?",
-          content: "We offer a 30-day money-back guarantee if you are not fully satisfied with your purchase.",
-        },
-      ]}
-      title="Common Questions"
-      faqsAnimation="slide-up"
-      description="Everything you need to know about shopping with us."
+      imageSrc="http://img.b2bpic.net/free-photo/vendor-talking-customer-counter_482257-76117.jpg?_wi=2"
     />
   </div>
 
   <div id="contact" data-section="contact">
-      <ContactCTA
-      useInvertedBackground={true}
-      background={{
-        variant: "plain",
-      }}
-      tag="Contact Us"
-      title="Need Help?"
-      description="Have questions or special requests? Our team is always ready to assist you."
-      buttons={[
-        {
-          text: "Email Us",
-          href: "mailto:hello@generalstore.com",
-        },
+      <ContactSplitForm
+      title="Get In Touch"
+      description="Have a question? Drop us a line."
+      inputs={[
+        { name: "name", type: "text", placeholder: "Full Name" },
+        { name: "email", type: "email", placeholder: "Email Address" }
       ]}
+      textarea={{ name: "message", placeholder: "Your Message" }}
+      useInvertedBackground={true}
+      imageSrc="http://img.b2bpic.net/free-photo/brunette-chooses-food-lady-is-holding-shopping-cart-girl-white-shirt-supermarket_1157-42221.jpg?_wi=1"
     />
   </div>
 
   <div id="footer" data-section="footer">
-      <FooterCard
+      <FooterMedia
       logoText="GeneralStore"
-      copyrightText="© 2024 GeneralStore, Inc."
+      columns={[
+        { title: "Shop", items: [{ label: "Catalog", href: "#products" }] },
+        { title: "Support", items: [{ label: "FAQ", href: "#faq" }] }
+      ]}
+      imageSrc="http://img.b2bpic.net/free-photo/healthy-product-olive-oil_23-2151944007.jpg?_wi=2"
     />
   </div>
       </ReactLenis>