diff --git a/src/app/page.tsx b/src/app/page.tsx
index 14ac5aa..f514a37 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -2,14 +2,14 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import AboutMetric from '@/components/sections/about/AboutMetric';
-import ContactCenter from '@/components/sections/contact/ContactCenter';
-import FeatureCardSixteen from '@/components/sections/feature/FeatureCardSixteen';
-import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
-import HeroCentered from '@/components/sections/hero/HeroCentered';
-import MetricCardTwo from '@/components/sections/metrics/MetricCardTwo';
+import InlineImageSplitTextAbout from '@/components/sections/about/InlineImageSplitTextAbout';
+import ContactText from '@/components/sections/contact/ContactText';
+import FeatureCardOne from '@/components/sections/feature/FeatureCardOne';
+import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
+import HeroBillboard from '@/components/sections/hero/HeroBillboard';
+import MetricCardSeven from '@/components/sections/metrics/MetricCardSeven';
 import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
-import TestimonialCardTwo from '@/components/sections/testimonial/TestimonialCardTwo';
+import TestimonialCardSixteen from '@/components/sections/testimonial/TestimonialCardSixteen';
 import { Database, Globe, Rocket } from "lucide-react";
 
 export default function LandingPage() {
@@ -17,256 +17,108 @@ export default function LandingPage() {
     <ThemeProvider
         defaultButtonVariant="icon-arrow"
         defaultTextAnimation="reveal-blur"
-        borderRadius="soft"
-        contentWidth="mediumSmall"
-        sizing="mediumLargeSizeMediumTitles"
-        background="grid"
-        cardStyle="solid"
-        primaryButtonStyle="gradient"
-        secondaryButtonStyle="radial-glow"
-        headingFontWeight="normal"
+        borderRadius="pill"
+        contentWidth="mediumLarge"
+        sizing="largeSizeMediumTitles"
+        background="noiseDiagonalGradient"
+        cardStyle="glass-elevated"
+        primaryButtonStyle="primary-glow"
+        secondaryButtonStyle="glass"
+        headingFontWeight="extrabold"
     >
       <ReactLenis root>
   <div id="nav" data-section="nav">
       <NavbarStyleApple
       navItems={[
-        {
-          name: "Home",
-          id: "hero",
-        },
-        {
-          name: "Services",
-          id: "features",
-        },
-        {
-          name: "Metrics",
-          id: "metrics",
-        },
-        {
-          name: "Contact",
-          id: "contact",
-        },
+        { name: "Home", id: "hero" },
+        { name: "Advantage", id: "features" },
+        { name: "Impact", id: "metrics" },
+        { name: "Stories", id: "testimonials" },
+        { name: "Contact", id: "contact" },
       ]}
       brandName="Ammerlus Inc"
     />
   </div>
 
   <div id="hero" data-section="hero">
-      <HeroCentered
-      background={{
-        variant: "sparkles-gradient",
-      }}
+      <HeroBillboard
+      background={{ variant: "sparkles-gradient" }}
       title="Architecting the Future with Ammerlus Inc"
       description="Powered by Hupfumi Africa, we bridge the gap between imagination and digital reality. High-performance software solutions for the next era of innovation."
-      avatars={[
-        {
-          src: "http://img.b2bpic.net/free-photo/portrait-smiling-businessman-sitting-desk-table-business-company-office_482257-16773.jpg",
-          alt: "Client 1",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/front-view-doctor-wearing-lab-coat_23-2149551157.jpg",
-          alt: "Client 2",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/casual-smile-street-style-background-spring_1139-777.jpg",
-          alt: "Client 3",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/senior-businessman-outside-modern-office-building_1139-1076.jpg",
-          alt: "Client 4",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/close-up-entrepreneur-with-corporate-job-looking-camera-business-office-portrait-young-man-preparing-work-planning-development-industry-with-technology-computer_482257-29387.jpg",
-          alt: "Client 5",
-        },
-      ]}
-      avatarText="Trusted by 500+ Innovators"
-      buttons={[
-        {
-          text: "View Solutions",
-          href: "#features",
-        },
-        {
-          text: "Contact Us",
-          href: "#contact",
-        },
-      ]}
-      marqueeItems={[
-        {
-          type: "text",
-          text: "AI Integration",
-        },
-        {
-          type: "text",
-          text: "Cloud Infrastructure",
-        },
-        {
-          type: "text",
-          text: "Blockchain Solutions",
-        },
-        {
-          type: "text",
-          text: "DevOps Optimization",
-        },
-        {
-          type: "text",
-          text: "Cybersecurity",
-        },
-      ]}
+      tag="Next Gen Engineering"
+      buttons={[{ text: "View Solutions", href: "#features" }, { text: "Contact Us", href: "#contact" }]}
+      imageSrc="http://img.b2bpic.net/free-photo/close-up-entrepreneur-with-corporate-job-looking-camera-business-office-portrait-young-man-preparing-work-planning-development-industry-with-technology-computer_482257-29387.jpg"
     />
   </div>
 
   <div id="about" data-section="about">
-      <AboutMetric
+      <InlineImageSplitTextAbout
       useInvertedBackground={true}
-      title="Our Engineering Powerhouse"
-      metrics={[
-        {
-          icon: Database,
-          label: "Dev Cycles",
-          value: "24/7",
-        },
-        {
-          icon: Rocket,
-          label: "Deployments",
-          value: "150+",
-        },
-        {
-          icon: Globe,
-          label: "Global Reach",
-          value: "Hupfumi",
-        },
-      ]}
-      metricsAnimation="blur-reveal"
+      heading={[{ type: 'text', content: "Our Engineering Powerhouse" }]}
     />
   </div>
 
   <div id="features" data-section="features">
-      <FeatureCardSixteen
+      <FeatureCardOne
       animationType="depth-3d"
-      textboxLayout="default"
+      textboxLayout="split"
+      gridVariant="bento-grid"
       useInvertedBackground={false}
-      negativeCard={{
-        items: [
-          "Legacy overhead",
-          "Slow deployment",
-          "Insecure pipelines",
-          "Fragmented data",
-          "Downtime risk",
-        ],
-      }}
-      positiveCard={{
-        items: [
-          "AI-native architecture",
-          "Rapid delivery",
-          "Zero-trust security",
-          "Unified ecosystems",
-          "Always-on resilience",
-        ],
-      }}
       title="Ammerlus Advantage"
       description="We don't just write code; we architect systems that define the future."
+      features={[
+        { title: "AI-native architecture", description: "Advanced neural systems for modern enterprise." },
+        { title: "Rapid delivery", description: "Speed to market without compromising on quality." },
+        { title: "Zero-trust security", description: "Hardened infrastructure for the global cloud." },
+      ]}
     />
   </div>
 
   <div id="metrics" data-section="metrics">
-      <MetricCardTwo
-      animationType="scale-rotate"
+      <MetricCardSeven
+      animationType="depth-3d"
       textboxLayout="split"
-      gridVariant="bento-grid"
       useInvertedBackground={true}
-      metrics={[
-        {
-          id: "m1",
-          value: "99.99%",
-          description: "Uptime Guarantee",
-        },
-        {
-          id: "m2",
-          value: "2x",
-          description: "Faster Time-to-Market",
-        },
-        {
-          id: "m3",
-          value: "40%",
-          description: "Lower Operating Costs",
-        },
-      ]}
       title="Performance at Scale"
       description="Quantifiable impact delivered through Hupfumi Africa infrastructure."
+      metrics={[
+        { id: "u", value: "99.99%", title: "Uptime Guarantee", items: ["High availability", "Redundant systems"] },
+        { id: "s", value: "2x", title: "Faster Launch", items: ["Optimized pipelines", "Automated CI/CD"] },
+        { id: "c", value: "40%", title: "Cost Efficiency", items: ["Resource optimization", "Waste reduction"] },
+      ]}
     />
   </div>
 
   <div id="testimonials" data-section="testimonials">
-      <TestimonialCardTwo
-      animationType="slide-up"
-      textboxLayout="default"
+      <TestimonialCardSixteen
+      animationType="depth-3d"
+      textboxLayout="split"
       useInvertedBackground={false}
-      testimonials={[
-        {
-          id: "t1",
-          name: "Kojo Mensah",
-          role: "CEO",
-          testimonial: "Ammerlus transformed our digital stack.",
-          imageSrc: "http://img.b2bpic.net/free-photo/portrait-smiling-businessman-sitting-desk-table-business-company-office_482257-16773.jpg",
-        },
-        {
-          id: "t2",
-          name: "Sarah Ahmed",
-          role: "CTO",
-          testimonial: "Seamless execution, exceptional talent.",
-          imageSrc: "http://img.b2bpic.net/free-photo/front-view-doctor-wearing-lab-coat_23-2149551157.jpg",
-        },
-        {
-          id: "t3",
-          name: "Amara Okoro",
-          role: "Founder",
-          testimonial: "Hupfumi Africa's tech is unmatched.",
-          imageSrc: "http://img.b2bpic.net/free-photo/casual-smile-street-style-background-spring_1139-777.jpg",
-        },
-        {
-          id: "t4",
-          name: "David Zhou",
-          role: "Director",
-          testimonial: "The future of development is here.",
-          imageSrc: "http://img.b2bpic.net/free-photo/senior-businessman-outside-modern-office-building_1139-1076.jpg",
-        },
-        {
-          id: "t5",
-          name: "Elena Rossi",
-          role: "Head of Engineering",
-          testimonial: "Professional, efficient, and brilliant.",
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-entrepreneur-with-corporate-job-looking-camera-business-office-portrait-young-man-preparing-work-planning-development-industry-with-technology-computer_482257-29387.jpg",
-        },
-      ]}
       title="Voices of Innovation"
       description="Client success stories powered by our engineering."
+      kpiItems={[{ value: "500+", label: "Projects" }, { value: "99%", label: "Satisfaction" }, { value: "20+", label: "Countries" }]}
+      testimonials={[
+        { id: "t1", name: "Kojo Mensah", role: "CEO", company: "Hupfumi", rating: 5, testimonial: "Ammerlus transformed our digital stack." },
+        { id: "t2", name: "Sarah Ahmed", role: "CTO", company: "TechCorp", rating: 5, testimonial: "Seamless execution, exceptional talent." },
+      ]}
     />
   </div>
 
   <div id="contact" data-section="contact">
-      <ContactCenter
-      useInvertedBackground={true}
-      background={{
-        variant: "gradient-bars",
-      }}
-      tag="Let's Build"
-      title="Start Your Journey with Ammerlus"
-      description="Get in touch to discuss your next technical challenge."
+      <ContactText
+      background={{ variant: "sparkles-gradient" }}
+      text="Ready to architect the next big breakthrough? Let's get started."
+      buttons={[{ text: "Get in touch", href: "#" }]}
     />
   </div>
 
   <div id="footer" data-section="footer">
-      <FooterLogoReveal
+      <FooterBaseReveal
       logoText="Ammerlus Inc"
-      leftLink={{
-        text: "Hupfumi Africa",
-        href: "https://hupfumi.africa",
-      }}
-      rightLink={{
-        text: "Terms",
-        href: "#",
-      }}
+      columns={[
+        { title: "Services", items: [{ label: "Cloud", href: "#" }, { label: "Security", href: "#" }] },
+        { title: "Company", items: [{ label: "About", href: "#" }, { label: "Careers", href: "#" }] },
+      ]}
     />
   </div>
       </ReactLenis>