diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index da44fa6..4e9e293 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -14,31 +14,15 @@ const navItems = [
 
 export default function AboutPage() {
   return (
-    <ThemeProvider>
+    <ThemeProvider defaultButtonVariant="hover-magnetic" 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">
-        <NavbarLayoutFloatingInline navItems={navItems} brandName="Empire Roofing" />
+        <NavbarLayoutFloatingInline navItems={navItems} brandName="Empire Roofing" button={{ text: "Get Quote", href: "/contact" }} />
       </div>
       <div id="about-story" data-section="about-story">
-        <TestimonialAboutCard
-          tag="About Us"
-          title="Built on Trust. Backed by Results."
-          description="Empire Roofing & Construction was built to bring honesty back into the roofing industry. Too many homeowners get overcharged, misled, or left with poor workmanship. We do things differently."
-          subdescription="Rudy — Founder: 'We treat every home like it’s our own.'"
-          imageSrc="http://img.b2bpic.net/free-photo/front-view-rejoicing-male-engineer-sitting-his-working-place-writing-notes-document-plan-business-contractor-agenda-corporate-job-property-builder_140725-155596.jpg"
-          icon={ShieldCheck}
-          mediaAnimation="slide-up"
-          useInvertedBackground={false}
-        />
+        <TestimonialAboutCard tag="About Us" title="Built on Trust. Backed by Results." description="Empire Roofing & Construction was built to bring honesty back into the roofing industry. Too many homeowners get overcharged, misled, or left with poor workmanship. We do things differently." subdescription="Rudy — Founder: 'We treat every home like it’s our own.'" imageSrc="http://img.b2bpic.net/free-photo/front-view-rejoicing-male-engineer-sitting-his-working-place-writing-notes-document-plan-business-contractor-agenda-corporate-job-property-builder_140725-155596.jpg" icon={ShieldCheck} mediaAnimation="slide-up" useInvertedBackground={false} />
       </div>
       <div id="footer" data-section="footer">
-        <FooterSimple
-          columns={[
-            { title: "Company", items: [{ label: "About Us", href: "/about" }, { label: "Contact", href: "/contact" }] },
-            { title: "Services", items: [{ label: "Roof Repairs", href: "/services" }, { label: "Full Replacements", href: "/services" }, { label: "Claims", href: "/services" }] }
-          ]}
-          bottomLeftText="© 2024 Empire Roofing & Construction"
-          bottomRightText="Built Like an Empire."
-        />
+        <FooterSimple columns={[{ title: "Company", items: [{ label: "About Us", href: "/about" }, { label: "Contact", href: "/contact" }] }, { title: "Services", items: [{ label: "Roof Repairs", href: "/services" }, { label: "Full Replacements", href: "/services" }, { label: "Claims", href: "/services" }] }]} bottomLeftText="© 2024 Empire Roofing & Construction" bottomRightText="Built Like an Empire." />
       </div>
     </ThemeProvider>
   );
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 5a228de..d1d8cc3 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -6,7 +6,6 @@ import FeatureCardTwentyFour from "@/components/sections/feature/FeatureCardTwen
 import ProductCardOne from "@/components/sections/product/ProductCardOne";
 import ContactCenter from "@/components/sections/contact/ContactCenter";
 import FooterSimple from "@/components/sections/footer/FooterSimple";
-import { Home, FileText, Award } from "lucide-react";
 
 const navItems = [
   { name: "Home", id: "/" },
@@ -17,73 +16,24 @@ const navItems = [
 
 export default function HomePage() {
   return (
-    <ThemeProvider>
+    <ThemeProvider defaultButtonVariant="hover-magnetic" 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">
-        <NavbarLayoutFloatingInline navItems={navItems} brandName="Empire Roofing" />
+        <NavbarLayoutFloatingInline navItems={navItems} brandName="Empire Roofing" button={{ text: "Get Quote", href: "/contact" }} />
       </div>
       <div id="hero" data-section="hero">
-        <HeroOverlayTestimonial
-          title="Missouri’s Most Trusted Roofing Experts"
-          description="Roof Repairs • Insurance Claims • Full Replacements — Done Right the First Time"
-          testimonials={[
-            { name: "Kevin James", handle: "Homeowner", testimonial: "Professional. Honest. No shortcuts.", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/closeup-shot-handsome-male-smiling_181624-41237.jpg" },
-            { name: "Mark Mann", handle: "Homeowner", testimonial: "Out of 6 quotes, Empire was the only one that truly knew their craft.", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-happy-mother-home_23-2148321636.jpg" },
-            { name: "Ken Watson", handle: "Homeowner", testimonial: "They handled my insurance claim when it was denied and got it approved.", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/close-up-confident-male-employee-white-collar-shirt-smiling-camera-standing-self-assured-against-studio-background_1258-26761.jpg" },
-            { name: "Mary Tuggle", handle: "Homeowner", testimonial: "Crew was clean, professional, and followed up.", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/happy-professional_1098-12931.jpg" },
-            { name: "Local Resident", handle: "Homeowner", testimonial: "Best service in Springfield area, hands down.", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/man-portrait-posing-loft-modern-space_158595-5365.jpg" }
-          ]}
-          buttons={[{ text: "Get Free Roof Inspection", href: "/contact" }, { text: "Call Now", href: "tel:5555555555" }]}
-          imageSrc="http://img.b2bpic.net/free-photo/old-stone-building-with-blue-sky_23-2148252732.jpg"
-        />
+        <HeroOverlayTestimonial title="Missouri’s Most Trusted Roofing Experts" description="Roof Repairs • Insurance Claims • Full Replacements — Done Right the First Time" testimonials={[{ name: "Kevin James", handle: "Homeowner", testimonial: "Professional. Honest. No shortcuts.", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/closeup-shot-handsome-male-smiling_181624-41237.jpg" }, { name: "Mark Mann", handle: "Homeowner", testimonial: "Out of 6 quotes, Empire was the only one that truly knew their craft.", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-happy-mother-home_23-2148321636.jpg" }, { name: "Ken Watson", handle: "Homeowner", testimonial: "They handled my insurance claim when it was denied and got it approved.", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/close-up-confident-male-employee-white-collar-shirt-smiling-camera-standing-self-assured-against-studio-background_1258-26761.jpg" }, { name: "Mary Tuggle", handle: "Homeowner", testimonial: "Crew was clean, professional, and followed up.", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/happy-professional_1098-12931.jpg" }, { name: "Local Resident", handle: "Homeowner", testimonial: "Best service in Springfield area, hands down.", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/man-portrait-posing-loft-modern-space_158595-5365.jpg" }]} imageSrc="http://img.b2bpic.net/free-photo/old-stone-building-with-blue-sky_23-2148252732.jpg" />
       </div>
       <div id="services-list" data-section="services-list">
-        <FeatureCardTwentyFour
-          animationType="slide-up"
-          textboxLayout="split"
-          useInvertedBackground={false}
-          title="Premium Roofing Services"
-          description="Comprehensive care for your biggest asset."
-          features={[
-            { id: "s1", title: "Roof Inspection", author: "Pro Team", description: "Detailed inspections with photos & videos so you see exactly what we see.", tags: ["Safety", "Analysis"], imageSrc: "http://img.b2bpic.net/free-photo/cute-yellow-rural-house-with-wooden-stairs-countryside_176420-7157.jpg" },
-            { id: "s2", title: "Roof Repair", author: "Expert Crew", description: "From leaks to storm damage—we fix it fast and correctly.", tags: ["Speed", "Quality"], imageSrc: "http://img.b2bpic.net/free-photo/man-working-roof-front-view_23-2148748780.jpg" },
-            { id: "s3", title: "Full Replacement", author: "Master Craftsmen", description: "Premium materials, expert installation, built to last decades.", tags: ["Longevity", "Value"], imageSrc: "http://img.b2bpic.net/free-photo/high-angle-beautiful-wooden-house-with-new-roof_23-2149343703.jpg" },
-            { id: "s4", title: "Insurance Help", author: "Claim Specialists", description: "We fight your insurance so you don’t have to.", tags: ["Claims", "Ease"], imageSrc: "http://img.b2bpic.net/free-photo/high-angle-hand-holding-pen-close-up_23-2149191369.jpg" }
-          ]}
-        />
+        <FeatureCardTwentyFour animationType="slide-up" textboxLayout="split" useInvertedBackground={false} title="Premium Roofing Services" description="Comprehensive care for your biggest asset." features={[{ id: "s1", title: "Roof Inspection", author: "Pro Team", description: "Detailed inspections with photos & videos so you see exactly what we see.", tags: ["Safety", "Analysis"], imageSrc: "http://img.b2bpic.net/free-photo/cute-yellow-rural-house-with-wooden-stairs-countryside_176420-7157.jpg" }, { id: "s2", title: "Roof Repair", author: "Expert Crew", description: "From leaks to storm damage—we fix it fast and correctly.", tags: ["Speed", "Quality"], imageSrc: "http://img.b2bpic.net/free-photo/man-working-roof-front-view_23-2148748780.jpg" }, { id: "s3", title: "Full Replacement", author: "Master Craftsmen", description: "Premium materials, expert installation, built to last decades.", tags: ["Longevity", "Value"], imageSrc: "http://img.b2bpic.net/free-photo/high-angle-beautiful-wooden-house-with-new-roof_23-2149343703.jpg" }, { id: "s4", title: "Insurance Help", author: "Claim Specialists", description: "We fight your insurance so you don’t have to.", tags: ["Claims", "Ease"], imageSrc: "http://img.b2bpic.net/free-photo/high-angle-hand-holding-pen-close-up_23-2149191369.jpg" }]} />
       </div>
       <div id="before-after" data-section="before-after">
-        <ProductCardOne
-          animationType="slide-up"
-          textboxLayout="default"
-          gridVariant="two-columns-alternating-heights"
-          useInvertedBackground={true}
-          title="See the Difference"
-          description="Real craftsmanship. Real transformation."
-          products={[
-            { id: "ba1", name: "Before: Storm Damaged", price: "Damaged", imageSrc: "http://img.b2bpic.net/free-photo/view-old-abandoned-house-nature_23-2150166504.jpg" },
-            { id: "ba2", name: "After: Fully Restored", price: "Completed", imageSrc: "http://img.b2bpic.net/free-photo/modern-stadium_1127-110.jpg" },
-            { id: "ba3", name: "Before: Old Roof", price: "Weathered", imageSrc: "http://img.b2bpic.net/free-photo/metal-structure_181624-31076.jpg" }
-          ]}
-        />
+        <ProductCardOne animationType="slide-up" textboxLayout="default" gridVariant="two-columns-alternating-heights" useInvertedBackground={true} title="See the Difference" description="Real craftsmanship. Real transformation." products={[{ id: "ba1", name: "Before: Storm Damaged", price: "Damaged", imageSrc: "http://img.b2bpic.net/free-photo/view-old-abandoned-house-nature_23-2150166504.jpg" }, { id: "ba2", name: "After: Fully Restored", price: "Completed", imageSrc: "http://img.b2bpic.net/free-photo/modern-stadium_1127-110.jpg" }, { id: "ba3", name: "Before: Old Roof", price: "Weathered", imageSrc: "http://img.b2bpic.net/free-photo/metal-structure_181624-31076.jpg" }]} />
       </div>
       <div id="contact-home" data-section="contact-home">
-        <ContactCenter
-          title="Don’t Wait Until It Gets Worse"
-          description="A small roof issue today can cost thousands tomorrow. Get a free inspection."
-          tag="Contact Us"
-          background={{ variant: "gradient-bars" }}
-          useInvertedBackground={false}
-        />
+        <ContactCenter title="Don’t Wait Until It Gets Worse" description="A small roof issue today can cost thousands tomorrow. Get a free inspection." tag="Contact Us" background={{ variant: "gradient-bars" }} useInvertedBackground={false} />
       </div>
       <div id="footer" data-section="footer">
-        <FooterSimple
-          columns={[
-            { title: "Company", items: [{ label: "About Us", href: "/about" }, { label: "Contact", href: "/contact" }] },
-            { title: "Services", items: [{ label: "Roof Repairs", href: "/services" }, { label: "Full Replacements", href: "/services" }, { label: "Claims", href: "/services" }] }
-          ]}
-          bottomLeftText="© 2024 Empire Roofing & Construction"
-          bottomRightText="Built Like an Empire."
-        />
+        <FooterSimple columns={[{ title: "Company", items: [{ label: "About Us", href: "/about" }, { label: "Contact", href: "/contact" }] }, { title: "Services", items: [{ label: "Roof Repairs", href: "/services" }, { label: "Full Replacements", href: "/services" }, { label: "Claims", href: "/services" }] }]} bottomLeftText="© 2024 Empire Roofing & Construction" bottomRightText="Built Like an Empire." />
       </div>
     </ThemeProvider>
   );