diff --git a/src/app/page.tsx b/src/app/page.tsx
index b569068..26c340f 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -2,36 +2,38 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import ContactText from '@/components/sections/contact/ContactText';
-import FeatureBorderGlow from '@/components/sections/feature/featureBorderGlow/FeatureBorderGlow';
-import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
-import HeroCarouselLogo from '@/components/sections/hero/heroCarouselLogo/HeroCarouselLogo';
-import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
+import HeroSplitKpi from '@/components/sections/hero/HeroSplitKpi';
 import ProductCardThree from '@/components/sections/product/ProductCardThree';
-import TestimonialAboutCard from '@/components/sections/about/TestimonialAboutCard';
-import { Award, Cake, Coffee, Cookie, GraduationCap, Pizza, ShieldCheck, Smile, TrendingUp, Users } from "lucide-react";
+import FeatureCardNine from '@/components/sections/feature/FeatureCardNine';
+import TestimonialCardFive from '@/components/sections/testimonial/TestimonialCardFive';
+import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
+import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
+import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
+import { Cake, ChefHat, Heart, Star } from "lucide-react";
 
 export default function LandingPage() {
   return (
     <ThemeProvider
         defaultButtonVariant="text-shift"
-        defaultTextAnimation="background-highlight"
-        borderRadius="pill"
+        defaultTextAnimation="reveal-blur"
+        borderRadius="soft"
         contentWidth="medium"
         sizing="medium"
         background="circleGradient"
         cardStyle="glass-elevated"
         primaryButtonStyle="gradient"
-        secondaryButtonStyle="glass"
-        headingFontWeight="normal"
+        secondaryButtonStyle="solid"
+        headingFontWeight="semibold"
     >
       <ReactLenis root>
         <div id="nav" data-section="nav">
             <NavbarLayoutFloatingOverlay
               navItems={[
                 { name: "Home", id: "hero" },
+                { name: "About", id: "about" },
                 { name: "Classes", id: "classes" },
                 { name: "Products", id: "products" },
+                { name: "Why Us", id: "why-us" },
                 { name: "Contact", id: "contact" },
               ]}
               brandName="Baking Lovers"
@@ -39,113 +41,119 @@ export default function LandingPage() {
         </div>
 
         <div id="hero" data-section="hero">
-          <HeroCarouselLogo
-            logoText="Baking Lovers"
-            description="Learn Baking, Buy Ingredients & Explore More 🍰. Whether you're starting your baking journey or refining your skills, we provide the classes, materials, and support you need to turn your passion into a professional craft."
-            buttons={[{ text: "Explore Classes", href: "#classes" }, { text: "Our Products", href: "#products" }]}
-            slides={[
-              { imageSrc: "http://img.b2bpic.net/free-photo/egg-beaten-into-bread-dough_23-2147761405.jpg?_wi=1", imageAlt: "Fresh artisan bread bakery display" },
-              { imageSrc: "http://img.b2bpic.net/free-photo/egg-beaten-into-bread-dough_23-2147761405.jpg?_wi=2", imageAlt: "Warm baking scene with flour and dough" },
-              { imageSrc: "http://img.b2bpic.net/free-photo/egg-beaten-into-bread-dough_23-2147761405.jpg?_wi=3", imageAlt: "Friendly bakery store interior warm lighting" },
-              { imageSrc: "http://img.b2bpic.net/free-photo/egg-beaten-into-bread-dough_23-2147761405.jpg?_wi=4", imageAlt: "Professional baking equipment showcase" },
-              { imageSrc: "http://img.b2bpic.net/free-photo/egg-beaten-into-bread-dough_23-2147761405.jpg?_wi=5", imageAlt: "Artisan ingredients ready for baking" },
+          <HeroSplitKpi
+            title="Warm & Welcoming Bakery Classes"
+            description="Master the art of baking with our expert-led sessions, premium ingredients, and professional guidance. Your journey to perfection starts here."
+            kpis={[
+              { value: "500+", label: "Students Trained" },
+              { value: "50+", label: "Course Modules" },
+              { value: "4.9/5", label: "Average Rating" }
             ]}
+            enableKpiAnimation={true}
+            buttons={[{ text: "Join a Class", href: "#classes" }]}
+            imageSrc="http://img.b2bpic.net/free-photo/egg-beaten-into-bread-dough_23-2147761405.jpg"
           />
         </div>
 
         <div id="about" data-section="about">
-          <TestimonialAboutCard
-            useInvertedBackground={false}
-            tag="About Us"
-            title="Turn Your Passion Into Skill"
-            description="We believe baking is an art that anyone can master. From foundational beginner courses to advanced professional training, we empower our students to create delicious memories."
-            subdescription="Beyond teaching, we offer high-quality raw materials and professional-grade tools to ensure you have everything you need to succeed in your kitchen."
-            icon={GraduationCap}
-            imageSrc="http://img.b2bpic.net/free-photo/little-girl-mixing-all-ingredients_329181-17836.jpg"
-            mediaAnimation="slide-up"
+          <TestimonialCardFive
+            title="Our Baking Philosophy"
+            description="We bring joy through traditional and modern baking techniques, ensuring every loaf and pastry feels like home."
+            testimonials={[
+              {
+                id: "1",                name: "Sarah Jenkins",                date: "Nov 2024",                title: "Professional Baker",                quote: "The most welcoming community I have ever been part of. Truly changed how I bake.",                tag: "Student",                avatarSrc: "http://img.b2bpic.net/free-photo/portrait-baker-white-apron-holding-flour_23-2148906660.jpg"
+              }
+            ]}
+            textboxLayout="split"
           />
         </div>
 
         <div id="classes" data-section="classes">
-          <FeatureBorderGlow
+          <FeatureCardNine
+            title="Our Baking Classes"
+            description="Expertly crafted courses for all levels."
+            showStepNumbers={true}
             animationType="slide-up"
-            textboxLayout="split"
-            useInvertedBackground={true}
+            textboxLayout="inline-image"
             features={[
-              { icon: Cake, title: "Cake Baking Classes", description: "Learn the secrets of fluffy sponges and perfect decorations." },
-              { icon: Pizza, title: "Pizza & Bakery Training", description: "Master artisan pizza doughs and crusty bread items." },
-              { icon: GraduationCap, title: "Beginner Sessions", description: "Designed for first-timers to build confidence in the kitchen." },
-              { icon: Cookie, title: "Pastry Workshops", description: "Delve into the delicate world of laminated doughs and buttery pastries." },
-              { icon: Coffee, title: "Advanced Techniques", description: "Perfect your tempering skills and sugar artistry." },
+              {
+                title: "Beginner Basics",                description: "Learn to knead, proof, and bake your first artisan loaf.",                phoneOne: { imageSrc: "http://img.b2bpic.net/free-photo/little-girl-mixing-all-ingredients_329181-17836.jpg" },
+                phoneTwo: { imageSrc: "http://img.b2bpic.net/free-photo/little-girl-mixing-all-ingredients_329181-17836.jpg" }
+              },
+              {
+                title: "Advanced Pastry",                description: "Master delicate croissants, tarts, and complex sugar work.",                phoneOne: { imageSrc: "http://img.b2bpic.net/free-photo/little-girl-mixing-all-ingredients_329181-17836.jpg" },
+                phoneTwo: { imageSrc: "http://img.b2bpic.net/free-photo/little-girl-mixing-all-ingredients_329181-17836.jpg" }
+              }
             ]}
-            title="Baking Classes"
-            description="Flexible learning options available both online and offline. Join a community of baking enthusiasts."
           />
         </div>
 
         <div id="products" data-section="products">
           <ProductCardThree
-            animationType="slide-up"
-            textboxLayout="default"
+            title="Premium Baking Goods"
+            description="Ingredients selected for the best results."
             gridVariant="three-columns-all-equal-width"
-            useInvertedBackground={false}
+            animationType="slide-up"
+            textboxLayout="split"
             products={[
-              { id: "p1", name: "Cake Cream", price: "High Quality", imageSrc: "http://img.b2bpic.net/free-photo/greek-yogurt-wooden-bowl-isolated-white-background-creamy-natural-yogurt_123827-22738.jpg" },
-              { id: "p2", name: "Chocolate Compounds", price: "Dark & Milk", imageSrc: "http://img.b2bpic.net/free-photo/pie-slices-wooden-platter-marble_114579-46200.jpg" },
-              { id: "p3", name: "Pizza Base", price: "Ready to bake", imageSrc: "http://img.b2bpic.net/free-photo/arrangement-with-pizza-dough_23-2148574314.jpg?_wi=1" },
-              { id: "p4", name: "Cheese", price: "Melting perfection", imageSrc: "http://img.b2bpic.net/free-photo/arrangement-with-pizza-dough_23-2148574314.jpg?_wi=2" },
-              { id: "p5", name: "Baking Tools", price: "Professional set", imageSrc: "http://img.b2bpic.net/free-photo/white-eggs-carton-container-whisker-marble-surface_114579-53666.jpg" },
+              { id: "p1", name: "Artisan Flour", price: "$12", imageSrc: "http://img.b2bpic.net/free-photo/arrangement-with-pizza-dough_23-2148574314.jpg?_wi=1" },
+              { id: "p2", name: "Dark Cocoa", price: "$15", imageSrc: "http://img.b2bpic.net/free-photo/pie-slices-wooden-platter-marble_114579-46200.jpg" },
+              { id: "p3", name: "Premium Yeast", price: "$8", imageSrc: "http://img.b2bpic.net/free-photo/white-eggs-carton-container-whisker-marble-surface_114579-53666.jpg" }
             ]}
-            title="Baking Essentials"
-            description="Premium ingredients and tools delivered right to you."
           />
         </div>
 
         <div id="why-us" data-section="why-us">
-          <FeatureBorderGlow
-            animationType="slide-up"
-            textboxLayout="split"
-            useInvertedBackground={false}
+          <FeatureCardNine
+            title="Why Choose Baking Lovers"
+            description="We believe in quality over everything."
+            showStepNumbers={false}
+            animationType="blur-reveal"
+            textboxLayout="default"
             features={[
-              { icon: Award, title: "Experienced Trainers", description: "Learn from industry professionals with years of experience." },
-              { icon: ShieldCheck, title: "High-Quality Ingredients", description: "Only the best materials for your best results." },
-              { icon: Users, title: "Trusted by Students", description: "Join hundreds of happy bakers we have trained." },
-              { icon: Smile, title: "Friendly Environment", description: "A supportive space where everyone is encouraged to learn." },
-              { icon: TrendingUp, title: "Community Support", description: "Stay connected with fellow bakers and mentors after class." },
+              {
+                title: "Expert Trainers",                description: "Professional experience in every lesson.",                phoneOne: { imageSrc: "http://img.b2bpic.net/free-photo/little-girl-mixing-all-ingredients_329181-17836.jpg" },
+                phoneTwo: { imageSrc: "http://img.b2bpic.net/free-photo/little-girl-mixing-all-ingredients_329181-17836.jpg" }
+              }
             ]}
-            title="Why Choose Us"
-            description="We are dedicated to providing the best learning environment for aspiring bakers."
           />
         </div>
 
         <div id="app" data-section="app">
-          <ContactText
-            useInvertedBackground={true}
-            background={{ variant: "sparkles-gradient" }}
-            text="Explore Our App: Discover more products and order easily through our mobile app."
-            buttons={[{ text: "Open App", href: "https://wa.me/918240757824" }]}
+          <ContactSplitForm
+            title="Join Our Community"
+            description="Register for your first session today!"
+            inputs={[
+              { name: "name", type: "text", placeholder: "Your Name" },
+              { name: "email", type: "email", placeholder: "Email Address" }
+            ]}
+            textarea={{ name: "message", placeholder: "What would you like to learn?" }}
+            imageSrc="http://img.b2bpic.net/free-photo/little-girl-mixing-all-ingredients_329181-17836.jpg"
           />
         </div>
 
         <div id="contact" data-section="contact">
-          <ContactText
-            useInvertedBackground={true}
-            background={{ variant: "canvas-reveal" }}
-            text="Get in touch with us at Baking Lovers. We're here to answer your questions!"
-            buttons={[{ text: "WhatsApp", href: "https://wa.me/918240757824" }, { text: "Call Now", href: "tel:+918240757824" }, { text: "Find Us on Map", href: "https://maps.app.goo.gl/MjC8xPrX72RAJ5QX6" }]}
+          <ContactSplitForm
+            title="Get in Touch"
+            description="Reach out for custom orders or class queries."
+            inputs={[
+              { name: "phone", type: "tel", placeholder: "Phone Number" },
+              { name: "location", type: "text", placeholder: "Location" }
+            ]}
+            imageSrc="http://img.b2bpic.net/free-photo/egg-beaten-into-bread-dough_23-2147761405.jpg"
           />
         </div>
 
         <div id="footer" data-section="footer">
-          <FooterBaseCard
+          <FooterLogoEmphasis
             logoText="Baking Lovers"
             columns={[
-              { title: "Address", items: [{ label: "Brick Field Rd, near progoti songho club, Baruipur, West Bengal 700144", href: "#" }] },
-              { title: "Links", items: [{ label: "Classes", href: "#classes" }, { label: "Products", href: "#products" }, { label: "Email", href: "mailto:youremail@gmail.com" }] },
+              { items: [{ label: "Classes", href: "#classes" }, { label: "Products", href: "#products" }] },
+              { items: [{ label: "Contact", href: "#contact" }, { label: "About", href: "#about" }] }
             ]}
           />
         </div>
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}
\ No newline at end of file