diff --git a/src/app/page.tsx b/src/app/page.tsx
index 7d7389d..dc87756 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -11,7 +11,6 @@ import TestimonialCardFive from '@/components/sections/testimonial/TestimonialCa
 import FaqSplitText from '@/components/sections/faq/FaqSplitText';
 import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
 import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
-import Link from "next/link";
 
 const navItems = [
   { name: "Home", id: "/" },
@@ -21,36 +20,96 @@ const navItems = [
 
 export default function Page() {
   return (
-    <ThemeProvider>
+    <ThemeProvider 
+      defaultButtonVariant="text-stagger" 
+      defaultTextAnimation="entrance-slide" 
+      borderRadius="rounded" 
+      contentWidth="medium" 
+      sizing="medium" 
+      background="circleGradient" 
+      cardStyle="glass-elevated" 
+      primaryButtonStyle="gradient" 
+      secondaryButtonStyle="glass" 
+      headingFontWeight="normal"
+    >
       <div id="nav" data-section="nav">
         <NavbarLayoutFloatingOverlay navItems={navItems} />
       </div>
       <div id="home" data-section="home">
-        <HeroLogo logoText="A+ Roofing & Handyman Services" description="Top-Tier Craftsmanship. Reliable Every Time. Serving San Juan with expert craftsmanship for residential & commercial properties." buttons={[{ text: "Get a Free Estimate", href: "#contact" }, { text: "Call Now: (787) 242-4022", href: "tel:+17872424022" }]} imageSrc="http://img.b2bpic.net/free-photo/medium-shot-people-wearing-protection-helmets_23-2149343642.jpg" />
+        <HeroLogo 
+          logoText="A+ Roofing & Handyman Services" 
+          description="Top-Tier Craftsmanship. Reliable Every Time. Serving San Juan with expert craftsmanship for residential & commercial properties." 
+          buttons={[{ text: "Get a Free Estimate", href: "#contact" }, { text: "Call Now: (787) 242-4022", href: "tel:+17872424022" }]} 
+          imageSrc="http://img.b2bpic.net/free-photo/medium-shot-people-wearing-protection-helmets_23-2149343642.jpg" 
+        />
       </div>
       <div id="about" data-section="about">
         <TextAbout useInvertedBackground={false} title="Built on Trust. Backed by Experience." />
       </div>
       <div id="services" data-section="services">
-        <FeatureCardTwentySeven animationType="slide-up" textboxLayout="default" useInvertedBackground={false} features={[{ id: "s1", title: "Roofing Services", descriptions: ["Roof Repair", "Roof Replacement", "Leak Detection", "Preventative Maintenance"], imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=rwy1tv" }, { id: "s2", title: "Handyman Services", descriptions: ["General Repairs", "Painting", "Drywall", "Fixtures & Installations"], imageSrc: "http://img.b2bpic.net/free-vector/home-repair-isometric-icons-set-tools-craftspeople-performing-laying-tiles-pasting-wallpapers-doors-window-installation-isolated-illustration_1284-29446.jpg" }, { id: "s3", title: "Property Upgrades", descriptions: ["Remodeling", "Interior Renovations", "Property Upgrades", "Maintenance Plans"], imageSrc: "http://img.b2bpic.net/free-vector/25-plumber-line-icon-pack-vector-icons-illustration_1142-19381.jpg" }]} title="Everything Your Property Needs — Done Right" description="From roofing to full property repairs, we deliver dependable service with top-tier results." />
+        <FeatureCardTwentySeven 
+          animationType="slide-up" 
+          textboxLayout="default" 
+          useInvertedBackground={false} 
+          features={[{ id: "s1", title: "Roofing Services", descriptions: ["Roof Repair", "Roof Replacement", "Leak Detection", "Preventative Maintenance"], imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=rwy1tv" }, { id: "s2", title: "Handyman Services", descriptions: ["General Repairs", "Painting", "Drywall", "Fixtures & Installations"], imageSrc: "http://img.b2bpic.net/free-vector/home-repair-isometric-icons-set-tools-craftspeople-performing-laying-tiles-pasting-wallpapers-doors-window-installation-isolated-illustration_1284-29444.jpg" }, { id: "s3", title: "Property Upgrades", descriptions: ["Remodeling", "Interior Renovations", "Property Upgrades", "Maintenance Plans"], imageSrc: "http://img.b2bpic.net/free-vector/25-plumber-line-icon-pack-vector-icons-illustration_1142-19381.jpg" }]} 
+          title="Everything Your Property Needs — Done Right" 
+          description="From roofing to full property repairs, we deliver dependable service with top-tier results." 
+        />
       </div>
       <div id="why-choose-us" data-section="why-choose-us">
-        <MetricCardEleven animationType="slide-up" textboxLayout="default" useInvertedBackground={false} metrics={[{ id: "m1", value: "100%", title: "Reliable", description: "On-time arrival for every project.", imageSrc: "http://img.b2bpic.net/free-photo/cardboard-house-notepad-tools_23-2148393154.jpg" }, { id: "m2", value: "Expert", title: "Skilled Craftsmanship", description: "Top-tier quality in every detail.", imageSrc: "http://img.b2bpic.net/free-photo/screen-icon-front-side_187299-39667.jpg" }, { id: "m3", value: "Direct", title: "Transparent Pricing", description: "No hidden fees, ever.", imageSrc: "http://img.b2bpic.net/free-vector/plumbing-icons_1284-617.jpg" }]} title="Why Homeowners Choose A+" description="We don’t just fix problems — we elevate your property." />
+        <MetricCardEleven 
+          animationType="slide-up" 
+          textboxLayout="default" 
+          useInvertedBackground={false} 
+          metrics={[{ id: "m1", value: "100%", title: "Reliable", description: "On-time arrival for every project.", imageSrc: "http://img.b2bpic.net/free-photo/cardboard-house-notepad-tools_23-2148393154.jpg" }, { id: "m2", value: "Expert", title: "Skilled Craftsmanship", description: "Top-tier quality in every detail.", imageSrc: "http://img.b2bpic.net/free-photo/screen-icon-front-side_187299-39667.jpg" }, { id: "m3", value: "Direct", title: "Transparent Pricing", description: "No hidden fees, ever.", imageSrc: "http://img.b2bpic.net/free-vector/plumbing-icons_1284-617.jpg" }]} 
+          title="Why Homeowners Choose A+" 
+          description="We don’t just fix problems — we elevate your property." 
+        />
       </div>
       <div id="gallery" data-section="gallery">
-        <ProductCardOne animationType="slide-up" textboxLayout="default" gridVariant="three-columns-all-equal-width" useInvertedBackground={false} products={[{ id: "p1", name: "Roof Transformation", price: "Featured", imageSrc: "http://img.b2bpic.net/free-photo/messy-desk-office_23-2147668766.jpg" }, { id: "p2", name: "Interior Repair", price: "Featured", imageSrc: "http://img.b2bpic.net/free-photo/aerial-shot-rooftops-city-buildings-with-red-shingles_181624-12846.jpg" }, { id: "p3", name: "Remodeling Upgrade", price: "Featured", imageSrc: "http://img.b2bpic.net/free-photo/led-wall-spotlight-black-cylinder-minimal-glow_169016-69051.jpg" }, { id: "p4", name: "Roofing Maintenance", price: "Featured", imageSrc: "http://img.b2bpic.net/free-photo/beautiful-wooden-house-with-dark-roof_23-2149343705.jpg" }, { id: "p5", name: "Drywall Restoration", price: "Featured", imageSrc: "http://img.b2bpic.net/free-photo/construction-worker-using-hammer-job-site_23-2150530723.jpg" }, { id: "p6", name: "Fixture Upgrade", price: "Featured", imageSrc: "http://img.b2bpic.net/free-photo/focused-plumber-working-assembling-pipelines-install-plumbing-system-while-building-new-house_662251-539.jpg" }]} title="Before & After Transformations" description="See how we elevate properties with A+ quality." />
+        <ProductCardOne 
+          animationType="slide-up" 
+          textboxLayout="default" 
+          gridVariant="three-columns-all-equal-width" 
+          useInvertedBackground={false} 
+          products={[{ id: "p1", name: "Roof Transformation", price: "Featured", imageSrc: "http://img.b2bpic.net/free-photo/messy-desk-office_23-2147668766.jpg" }, { id: "p2", name: "Interior Repair", price: "Featured", imageSrc: "http://img.b2bpic.net/free-photo/aerial-shot-rooftops-city-buildings-with-red-shingles_181624-12846.jpg" }, { id: "p3", name: "Remodeling Upgrade", price: "Featured", imageSrc: "http://img.b2bpic.net/free-photo/led-wall-spotlight-black-cylinder-minimal-glow_169016-69051.jpg" }, { id: "p4", name: "Roofing Maintenance", price: "Featured", imageSrc: "http://img.b2bpic.net/free-photo/beautiful-wooden-house-with-dark-roof_23-2149343705.jpg" }, { id: "p5", name: "Drywall Restoration", price: "Featured", imageSrc: "http://img.b2bpic.net/free-photo/construction-worker-using-hammer-job-site_23-2150530723.jpg" }, { id: "p6", name: "Fixture Upgrade", price: "Featured", imageSrc: "http://img.b2bpic.net/free-photo/focused-plumber-working-assembling-pipelines-install-plumbing-system-while-building-new-house_662251-539.jpg" }]} 
+          title="Before & After Transformations" 
+          description="See how we elevate properties with A+ quality." 
+        />
       </div>
       <div id="testimonials" data-section="testimonials">
-        <TestimonialCardFive textboxLayout="default" useInvertedBackground={false} testimonials={[{ id: "t1", name: "Sarah Johnson", date: "Jan 2025", title: "CEO", quote: "Professional, fast, and high-quality work. Highly recommend!", tag: "Roofing", avatarSrc: "http://img.b2bpic.net/free-photo/stylish-woman-wearing-yellow-bandana_273609-13336.jpg", imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-people-wearing-protection-helmets_23-2149343642.jpg" }, { id: "t2", name: "Michael Chen", date: "Dec 2024", title: "CTO", quote: "Very reliable and fair pricing. Will use again.", tag: "Handyman", avatarSrc: "http://img.b2bpic.net/free-photo/portrait-call-center-woman_23-2148094945.jpg", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=rwy1tv" }, { id: "t3", name: "Emily Rodriguez", date: "Nov 2024", title: "Manager", quote: "A+ Service is the best in San Juan.", tag: "Roofing", avatarSrc: "http://img.b2bpic.net/free-photo/girl-sitting-table-holding-mobile-phone-indoors_171337-17097.jpg", imageSrc: "http://img.b2bpic.net/free-vector/home-repair-isometric-icons-set-tools-craftspeople-performing-laying-tiles-pasting-wallpapers-doors-window-installation-isolated-illustration_1284-29446.jpg" }, { id: "t4", name: "David Kim", date: "Oct 2024", title: "Director", quote: "Exceeded all my expectations.", tag: "Remodeling", avatarSrc: "http://img.b2bpic.net/free-photo/business-woman-green-suit-using-phone-outside-street_1303-29546.jpg", imageSrc: "http://img.b2bpic.net/free-vector/25-plumber-line-icon-pack-vector-icons-illustration_1142-19381.jpg" }, { id: "t5", name: "Maria Lopez", date: "Sep 2024", title: "Owner", quote: "Fast, clean, and top-tier.", tag: "Handyman", avatarSrc: "http://img.b2bpic.net/free-photo/horizontal-portrait-beautiful-positive-young-european-female-blue-shirt-dress-relaxing-home-looking-front-with-easy-carefree-smile_343059-3894.jpg", imageSrc: "http://img.b2bpic.net/free-photo/messy-desk-office_23-2147668766.jpg" }]} title="What Our Customers Say" description="Professional, fast, and high-quality work. Highly recommend!" />
+        <TestimonialCardFive 
+          textboxLayout="default" 
+          useInvertedBackground={false} 
+          testimonials={[{ id: "t1", name: "Sarah Johnson", date: "Jan 2025", title: "CEO", quote: "Professional, fast, and high-quality work. Highly recommend!", tag: "Roofing", avatarSrc: "http://img.b2bpic.net/free-photo/stylish-woman-wearing-yellow-bandana_273609-13336.jpg", imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-people-wearing-protection-helmets_23-2149343642.jpg" }, { id: "t2", name: "Michael Chen", date: "Dec 2024", title: "CTO", quote: "Very reliable and fair pricing. Will use again.", tag: "Handyman", avatarSrc: "http://img.b2bpic.net/free-photo/portrait-call-center-woman_23-2148094945.jpg", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=rwy1tv" }, { id: "t3", name: "Emily Rodriguez", date: "Nov 2024", title: "Manager", quote: "A+ Service is the best in San Juan.", tag: "Roofing", avatarSrc: "http://img.b2bpic.net/free-photo/girl-sitting-table-holding-mobile-phone-indoors_171337-17097.jpg", imageSrc: "http://img.b2bpic.net/free-vector/home-repair-isometric-icons-set-tools-craftspeople-performing-laying-tiles-pasting-wallpapers-doors-window-installation-isolated-illustration_1284-29444.jpg" }, { id: "t4", name: "David Kim", date: "Oct 2024", title: "Director", quote: "Exceeded all my expectations.", tag: "Remodeling", avatarSrc: "http://img.b2bpic.net/free-photo/business-woman-green-suit-using-phone-outside-street_1303-29546.jpg", imageSrc: "http://img.b2bpic.net/free-vector/25-plumber-line-icon-pack-vector-icons-illustration_1142-19381.jpg" }, { id: "t5", name: "Maria Lopez", date: "Sep 2024", title: "Owner", quote: "Fast, clean, and top-tier.", tag: "Handyman", avatarSrc: "http://img.b2bpic.net/free-photo/horizontal-portrait-beautiful-positive-young-european-female-blue-shirt-dress-relaxing-home-looking-front-with-easy-carefree-smile_343059-3894.jpg", imageSrc: "http://img.b2bpic.net/free-photo/messy-desk-office_23-2147668766.jpg" }]} 
+          title="What Our Customers Say" 
+          description="Professional, fast, and high-quality work. Highly recommend!" 
+        />
       </div>
       <div id="faq" data-section="faq">
-        <FaqSplitText useInvertedBackground={false} faqs={[{ id: "f1", title: "Is A+ licensed and insured?", content: "Yes, we are fully licensed and insured for your peace of mind." }, { id: "f2", title: "Do you offer free estimates?", content: "Yes, we provide free, no-obligation estimates for all projects." }, { id: "f3", title: "What areas do you serve?", content: "We primarily serve the San Juan metropolitan area." }]} sideTitle="Common Questions" sideDescription="Everything you need to know about our services." faqsAnimation="slide-up" />
+        <FaqSplitText 
+          useInvertedBackground={false} 
+          faqs={[{ id: "f1", title: "Is A+ licensed and insured?", content: "Yes, we are fully licensed and insured for your peace of mind." }, { id: "f2", title: "Do you offer free estimates?", content: "Yes, we provide free, no-obligation estimates for all projects." }, { id: "f3", title: "What areas do you serve?", content: "We primarily serve the San Juan metropolitan area." }]} 
+          sideTitle="Common Questions" 
+          sideDescription="Everything you need to know about our services." 
+          faqsAnimation="slide-up" 
+        />
       </div>
       <div id="contact" data-section="contact">
-        <ContactSplitForm useInvertedBackground={false} title="Ready to get started?" description="Need Repairs or Roofing Work? Let’s Get It Done Right. Contact us today for a free estimate." inputs={[{ name: "name", type: "text", placeholder: "Your Name", required: true }, { name: "phone", type: "tel", placeholder: "Phone Number", required: true }, { name: "email", type: "email", placeholder: "Email", required: true }]} textarea={{ name: "message", placeholder: "Tell us about your project", required: true }} imageSrc="http://img.b2bpic.net/free-photo/top-view-tablet-desk-mock-up_23-2148269865.jpg" />
+        <ContactSplitForm 
+          useInvertedBackground={false} 
+          title="Ready to get started?" 
+          description="Need Repairs or Roofing Work? Let’s Get It Done Right. Contact us today for a free estimate." 
+          inputs={[{ name: "name", type: "text", placeholder: "Your Name", required: true }, { name: "phone", type: "tel", placeholder: "Phone Number", required: true }, { name: "email", type: "email", placeholder: "Email", required: true }]} 
+          textarea={{ name: "message", placeholder: "Tell us about your project", required: true }} 
+          imageSrc="http://img.b2bpic.net/free-photo/top-view-tablet-desk-mock-up_23-2148269865.jpg" 
+        />
       </div>
       <div id="footer" data-section="footer">
-        <FooterBaseCard logoText="A+ Roofing" columns={[{ title: "Company", items: [{ label: "About Us", href: "#about" }, { label: "Services", href: "#services" }] }, { title: "Contact", items: [{ label: "Call Us", href: "tel:+17872424022" }, { label: "San Juan, PR", href: "#" }] }]} />
+        <FooterBaseCard 
+          logoText="A+ Roofing" 
+          columns={[{ title: "Company", items: [{ label: "About Us", href: "#about" }, { label: "Services", href: "#services" }] }, { title: "Contact", items: [{ label: "Call Us", href: "tel:+17872424022" }, { label: "San Juan, PR", href: "#" }] }]} 
+        />
       </div>
     </ThemeProvider>
   );