diff --git a/src/app/page.tsx b/src/app/page.tsx
index b66427d..c089aa2 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,49 +1,67 @@
 "use client";
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import HeroOverlayTestimonial from "@/components/sections/hero/HeroOverlayTestimonial";
-import { Code, Globe, Sparkles } from "lucide-react";
-
-export default function PersonalPortfolioPage() {
-    const testimonials = [
-        {
-            name: "Alex River",            handle: "@ariver",            testimonial: "The designs were absolutely world-class and perfectly aligned with my brand vision.",            rating: 5,
-            imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CqQjwbrkg4MwzJUItUsihWdcBc/uploaded-1777110995052-7l3iwi2m.png"},
-        {
-            name: "Sam Chen",            handle: "@schen",            testimonial: "Incredible attention to detail. Really pushed my project to the next level.",            rating: 5,
-            imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CqQjwbrkg4MwzJUItUsihWdcBc/uploaded-1777110995052-xx4f032f.png"},
-    ];
-
-    const avatars = [
-        { src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CqQjwbrkg4MwzJUItUsihWdcBc/uploaded-1777110995052-7l3iwi2m.png", alt: "User" },
-        { src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CqQjwbrkg4MwzJUItUsihWdcBc/uploaded-1777110995052-xx4f032f.png", alt: "User" },
-        { src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CqQjwbrkg4MwzJUItUsihWdcBc/uploaded-1777110995052-vub6tpkj.png", alt: "User" },
-    ];
+import HeroSignup from "@/components/sections/hero/HeroSignup";
+import SplitAbout from "@/components/sections/about/SplitAbout";
+import TeamCardTwo from "@/components/sections/team/TeamCardTwo";
+import { Github, Linkedin, Mail, Sparkles, Code, Globe } from "lucide-react";
 
+export default function AchMadzPortfolio() {
     return (
         <ThemeProvider
             defaultButtonVariant="hover-magnetic"
             defaultTextAnimation="reveal-blur"
-            borderRadius="soft"
+            borderRadius="pill"
             contentWidth="medium"
             sizing="medium"
-            background="noise"
-            cardStyle="glass-depth"
+            background="fluid"
+            cardStyle="glass-elevated"
             primaryButtonStyle="gradient"
-            secondaryButtonStyle="solid"
+            secondaryButtonStyle="glass"
             headingFontWeight="semibold"
         >
             <div id="hero">
-                <HeroOverlayTestimonial
-                    title="Building digital experiences with passion"
-                    description="I specialize in creating clean, user-centric software that makes an impact. Let's build something great together."
-                    testimonials={testimonials}
-                    avatars={avatars}
-                    avatarText="Trusted by industry leaders"
-                    imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CqQjwbrkg4MwzJUItUsihWdcBc/uploaded-1777110995052-vub6tpkj.png"
-                    buttons={[
-                        { text: "View Portfolio", href: "#projects" },
-                        { text: "Contact Me", href: "#contact" }
+                <HeroSignup
+                    tag="Software Engineer & Creator"
+                    tagIcon={Sparkles}
+                    title="Ach Madz: Building Digital Excellence"
+                    description="I am a passionate software engineer focused on crafting clean, modern, and performant web experiences. I love turning complex ideas into elegant, user-friendly solutions."
+                    background={{ variant: "glowing-orb" }}
+                    buttonText="Get in Touch"
+                />
+            </div>
+
+            <div id="about">
+                <SplitAbout
+                    title="More about my journey"
+                    description="With years of experience in full-stack development, I focus on building scalable web applications. My approach combines aesthetic design with robust engineering to deliver lasting impact."
+                    imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CqQjwbrkg4MwzJUItUsihWdcBc/uploaded-1777111132044-0c8dl9zt.png"
+                    imageAlt="Ach Madz"
+                    imagePosition="left"
+                    textboxLayout="default"
+                    bulletPoints={[
+                        { title: "Frontend Architecture", description: "Building reactive and fluid interfaces using modern frameworks.", icon: Code },
+                        { title: "Performance Optimization", description: "Ensuring fast load times and seamless user journeys.", icon: Globe },
+                        { title: "Innovation & Strategy", description: "Designing thoughtful solutions to solve real-world problems.", icon: Sparkles }
+                    ]}
+                />
+            </div>
+
+            <div id="team">
+                <TeamCardTwo
+                    title="My Professional Focus"
+                    description="Always exploring new frontiers in technology and design."
+                    gridVariant="uniform-all-items-equal"
+                    animationType="slide-up"
+                    textboxLayout="default"
+                    members={[
+                        {
+                            id: "1",                            name: "Ach Madz",                            role: "Full Stack Engineer",                            description: "Passionate about creating modern digital ecosystems.",                            socialLinks: [
+                                { icon: Github, url: "#" },
+                                { icon: Linkedin, url: "#" },
+                                { icon: Mail, url: "#" }
+                            ]
+                        }
                     ]}
                 />
             </div>