diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index 058a262..758e3a7 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -18,8 +18,7 @@ export default function AboutPage() {
 
   const footerColumns = [
     {
-      title: "Services",
-      items: [
+      title: "Services",      items: [
         { label: "Drain Cleaning", href: "/#drain" },
         { label: "Leak Detection", href: "/#leak" },
         { label: "Water Heater Service", href: "/#heater" },
@@ -27,8 +26,7 @@ export default function AboutPage() {
       ],
     },
     {
-      title: "Company",
-      items: [
+      title: "Company",      items: [
         { label: "About Us", href: "/about" },
         { label: "Contact", href: "/#contact" },
         { label: "Service Areas", href: "/#services" },
@@ -36,8 +34,7 @@ export default function AboutPage() {
       ],
     },
     {
-      title: "Contact",
-      items: [
+      title: "Contact",      items: [
         { label: "Call: (918) 555-PLUMB", href: "tel:+1-918-555-7586" },
         { label: "Email: service@spotonplumbing.com", href: "mailto:service@spotonplumbing.com" },
         { label: "Tulsa, Oklahoma", href: "#" },
@@ -53,7 +50,7 @@ export default function AboutPage() {
       borderRadius="pill"
       contentWidth="small"
       sizing="large"
-      background="noiseDiagonalGradient"
+      background="circleGradient"
       cardStyle="gradient-bordered"
       primaryButtonStyle="flat"
       secondaryButtonStyle="glass"
@@ -64,9 +61,7 @@ export default function AboutPage() {
           brandName="Spot On Plumbing"
           navItems={navItems}
           button={{
-            text: "Schedule Service",
-            href: "/contact",
-          }}
+            text: "Schedule Service",            href: "/contact"}}
           className="bg-opacity-90 backdrop-blur-md"
           buttonClassName="bg-[var(--primary-cta)] text-[var(--primary-cta-text)] hover:opacity-90"
           buttonTextClassName="font-semibold"
@@ -80,7 +75,7 @@ export default function AboutPage() {
           tag="Our Story"
           tagIcon={Award}
           tagAnimation="slide-up"
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=03ifi9&_wi=2"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=03ifi9"
           imageAlt="Spot On Plumbing team of expert technicians"
           useInvertedBackground={true}
           buttons={[
@@ -107,37 +102,21 @@ export default function AboutPage() {
           features={[
             {
               id: 1,
-              title: "Professional Excellence",
-              description: "Every technician is licensed, trained, and committed to the highest standards of workmanship.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=d3s44i",
-              imageAlt: "Professional plumbing expertise",
-            },
+              title: "Professional Excellence",              description: "Every technician is licensed, trained, and committed to the highest standards of workmanship.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=d3s44i",              imageAlt: "Professional plumbing expertise"},
             {
               id: 2,
-              title: "Local Community",
-              description: "We're proud to be part of the Tulsa community. We understand our neighbors and serve them with respect.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=8gfiwh",
-              imageAlt: "Local Tulsa plumbing service",
-            },
+              title: "Local Community",              description: "We're proud to be part of the Tulsa community. We understand our neighbors and serve them with respect.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=8gfiwh",              imageAlt: "Local Tulsa plumbing service"},
             {
               id: 3,
-              title: "Customer First",
-              description: "Your satisfaction is our guarantee. We listen, communicate clearly, and deliver results you can trust.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=73ih8j",
-              imageAlt: "Customer-focused service",
-            },
+              title: "Customer First",              description: "Your satisfaction is our guarantee. We listen, communicate clearly, and deliver results you can trust.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=73ih8j",              imageAlt: "Customer-focused service"},
             {
               id: 4,
-              title: "Honest Pricing",
-              description: "No hidden fees. We provide upfront estimates and stand behind our pricing every time.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=7x2jvq",
-              imageAlt: "Transparent plumbing pricing",
-            },
+              title: "Honest Pricing",              description: "No hidden fees. We provide upfront estimates and stand behind our pricing every time.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=7x2jvq",              imageAlt: "Transparent plumbing pricing"},
           ]}
           className="py-20"
           containerClassName="max-w-6xl"
-          titleClassName="text-4xl font-bold mb-6"
-          descriptionClassName="text-lg opacity-80 max-w-2xl mb-12"
+          textBoxTitleClassName="text-4xl font-bold mb-6"
+          textBoxDescriptionClassName="text-lg opacity-80 max-w-2xl mb-12"
           cardClassName="rounded-2xl p-8 h-full hover:shadow-lg transition-all duration-300"
           cardTitleClassName="text-2xl font-bold mb-3"
           cardDescriptionClassName="text-base opacity-75"
diff --git a/src/app/contact/page.tsx b/src/app/contact/page.tsx
index 8894b54..7b33de0 100644
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -19,21 +19,15 @@ export default function ContactPage() {
 
   const navItemsWithLinks = navItems.map((item) => {
     const routeMap: Record<string, string> = {
-      home: "/",
-      services: "/services",
-      about: "/about",
-      contact: "/contact",
-    };
+      home: "/",      services: "/services",      about: "/about",      contact: "/contact"};
     return {
       ...item,
-      href: routeMap[item.id] || "/",
-    };
+      href: routeMap[item.id] || "/"};
   });
 
   const footerColumns = [
     {
-      title: "Services",
-      items: [
+      title: "Services",      items: [
         { label: "Drain Cleaning", href: "/services" },
         { label: "Leak Detection", href: "/services" },
         { label: "Water Heater Service", href: "/services" },
@@ -41,8 +35,7 @@ export default function ContactPage() {
       ],
     },
     {
-      title: "Company",
-      items: [
+      title: "Company",      items: [
         { label: "About Us", href: "/about" },
         { label: "Contact", href: "/contact" },
         { label: "Service Areas", href: "/services" },
@@ -50,8 +43,7 @@ export default function ContactPage() {
       ],
     },
     {
-      title: "Contact",
-      items: [
+      title: "Contact",      items: [
         { label: "Call: (918) 555-PLUMB", href: "tel:+1-918-555-7586" },
         { label: "Email: service@spotonplumbing.com", href: "mailto:service@spotonplumbing.com" },
         { label: "Tulsa, Oklahoma", href: "#" },
@@ -67,7 +59,7 @@ export default function ContactPage() {
       borderRadius="pill"
       contentWidth="small"
       sizing="large"
-      background="noiseDiagonalGradient"
+      background="circleGradient"
       cardStyle="gradient-bordered"
       primaryButtonStyle="flat"
       secondaryButtonStyle="glass"
@@ -88,7 +80,7 @@ export default function ContactPage() {
         <HeroBillboard
           title="Book Your Plumbing Service"
           description="Tell us what's going on and our team will get back to you quickly with a solution."
-          background={{ variant: "noiseDiagonalGradient" }}
+          background={{ variant: "plain" }}
           tag="Quick Response"
           tagIcon={Clock}
           tagAnimation="slide-up"
@@ -127,38 +119,22 @@ export default function ContactPage() {
           animationType="slide-up"
           metrics={[
             {
-              id: "1",
-              value: "24/7",
-              title: "Emergency Service",
-              description: "Available around the clock for plumbing emergencies.",
-              icon: Clock,
+              id: "1",              value: "24/7",              title: "Emergency Service",              description: "Available around the clock for plumbing emergencies.",              icon: Clock,
             },
             {
-              id: "2",
-              value: "(918) 555-PLUMB",
-              title: "Phone",
-              description: "Call us anytime for immediate assistance.",
-              icon: Phone,
+              id: "2",              value: "(918) 555-PLUMB",              title: "Phone",              description: "Call us anytime for immediate assistance.",              icon: Phone,
             },
             {
-              id: "3",
-              value: "service@spotonplumbing.com",
-              title: "Email",
-              description: "Send us details about your plumbing needs.",
-              icon: Mail,
+              id: "3",              value: "service@spotonplumbing.com",              title: "Email",              description: "Send us details about your plumbing needs.",              icon: Mail,
             },
             {
-              id: "4",
-              value: "Tulsa, OK",
-              title: "Location",
-              description: "Serving Tulsa and surrounding areas.",
-              icon: MapPin,
+              id: "4",              value: "Tulsa, OK",              title: "Location",              description: "Serving Tulsa and surrounding areas.",              icon: MapPin,
             },
           ]}
           className="py-20"
           containerClassName="max-w-5xl"
-          titleClassName="text-xl font-bold mb-2"
-          descriptionClassName="text-sm opacity-75"
+          textBoxTitleClassName="text-xl font-bold mb-2"
+          textBoxDescriptionClassName="text-sm opacity-75"
           cardClassName="rounded-2xl p-8 h-full text-center hover:shadow-lg transition-all duration-300"
           valueClassName="text-2xl font-bold mb-2"
         />
diff --git a/src/app/page.tsx b/src/app/page.tsx
index ffe2054..337b78a 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -23,8 +23,7 @@ export default function HomePage() {
 
   const footerColumns = [
     {
-      title: "Services",
-      items: [
+      title: "Services",      items: [
         { label: "Drain Cleaning", href: "/#drain" },
         { label: "Leak Detection", href: "/#leak" },
         { label: "Water Heater Service", href: "/#heater" },
@@ -32,8 +31,7 @@ export default function HomePage() {
       ],
     },
     {
-      title: "Company",
-      items: [
+      title: "Company",      items: [
         { label: "About Us", href: "/about" },
         { label: "Contact", href: "/#contact" },
         { label: "Service Areas", href: "/#services" },
@@ -41,8 +39,7 @@ export default function HomePage() {
       ],
     },
     {
-      title: "Contact",
-      items: [
+      title: "Contact",      items: [
         { label: "Call: (918) 555-PLUMB", href: "tel:+1-918-555-7586" },
         { label: "Email: service@spotonplumbing.com", href: "mailto:service@spotonplumbing.com" },
         { label: "Tulsa, Oklahoma", href: "#" },
@@ -58,7 +55,7 @@ export default function HomePage() {
       borderRadius="pill"
       contentWidth="small"
       sizing="large"
-      background="noiseDiagonalGradient"
+      background="circleGradient"
       cardStyle="gradient-bordered"
       primaryButtonStyle="flat"
       secondaryButtonStyle="glass"
@@ -69,9 +66,7 @@ export default function HomePage() {
           brandName="Spot On Plumbing"
           navItems={navItems}
           button={{
-            text: "Schedule Service",
-            href: "/contact",
-          }}
+            text: "Schedule Service",            href: "/contact"}}
           className="bg-opacity-90 backdrop-blur-md"
           buttonClassName="bg-[var(--primary-cta)] text-[var(--primary-cta-text)] hover:opacity-90"
           buttonTextClassName="font-semibold"
@@ -82,7 +77,7 @@ export default function HomePage() {
         <HeroBillboard
           title="Tulsa's Most Reliable Plumbing — Done Right the First Time"
           description="Fast, professional plumbing services for homes and businesses across Tulsa. Same-day service available. Licensed, insured, and locally owned."
-          background={{ variant: "noiseDiagonalGradient" }}
+          background={{ variant: "plain" }}
           tag="Trusted Local Service"
           tagIcon={Shield}
           tagAnimation="slide-up"
@@ -91,7 +86,7 @@ export default function HomePage() {
             { text: "Call Now", href: "tel:+1-918-555-7586" },
           ]}
           buttonAnimation="slide-up"
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=03ifi9&_wi=1"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=03ifi9"
           imageAlt="Professional plumber working on residential plumbing service"
           mediaAnimation="blur-reveal"
           className="w-full"
@@ -108,15 +103,7 @@ export default function HomePage() {
       <div id="social-proof-home" data-section="social-proof-home">
         <SocialProofOne
           names={[
-            "Licensed & Insured",
-            "Same-Day Service",
-            "24/7 Emergency Support",
-            "Locally Owned Since 2015",
-            "100% Satisfaction Guarantee",
-            "Experienced Technicians",
-            "Transparent Pricing",
-            "Family-Trusted",
-          ]}
+            "Licensed & Insured",            "Same-Day Service",            "24/7 Emergency Support",            "Locally Owned Since 2015",            "100% Satisfaction Guarantee",            "Experienced Technicians",            "Transparent Pricing",            "Family-Trusted"]}
           title="Why Tulsa Trusts Spot On Plumbing"
           description="We combine professional expertise with genuine local care. Every job done right, every time."
           tag="Trust Signals"
@@ -149,52 +136,28 @@ export default function HomePage() {
           features={[
             {
               id: 1,
-              title: "Drain Cleaning",
-              description: "Professional drain cleaning and maintenance to keep your plumbing flowing smoothly year-round.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=heaime&_wi=1",
-              imageAlt: "Professional drain cleaning service",
-            },
+              title: "Drain Cleaning",              description: "Professional drain cleaning and maintenance to keep your plumbing flowing smoothly year-round.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=heaime",              imageAlt: "Professional drain cleaning service"},
             {
               id: 2,
-              title: "Leak Detection",
-              description: "Advanced leak detection technology to identify and repair hidden leaks before they cause water damage.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9zvurb&_wi=1",
-              imageAlt: "Water leak detection and repair",
-            },
+              title: "Leak Detection",              description: "Advanced leak detection technology to identify and repair hidden leaks before they cause water damage.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9zvurb",              imageAlt: "Water leak detection and repair"},
             {
               id: 3,
-              title: "Water Heater Service",
-              description: "Repair, maintenance, and installation of water heaters to ensure reliable hot water supply.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=wovxlr&_wi=1",
-              imageAlt: "Water heater installation and repair",
-            },
+              title: "Water Heater Service",              description: "Repair, maintenance, and installation of water heaters to ensure reliable hot water supply.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=wovxlr",              imageAlt: "Water heater installation and repair"},
             {
               id: 4,
-              title: "Pipe Repair & Replacement",
-              description: "Expert pipe repair and replacement for all materials including copper, PVC, and cast iron.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=5t2xd6&_wi=1",
-              imageAlt: "Pipe repair and replacement service",
-            },
+              title: "Pipe Repair & Replacement",              description: "Expert pipe repair and replacement for all materials including copper, PVC, and cast iron.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=5t2xd6",              imageAlt: "Pipe repair and replacement service"},
             {
               id: 5,
-              title: "Emergency Plumbing",
-              description: "24/7 emergency plumbing response for burst pipes, flooding, and urgent situations.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=finmsy&_wi=1",
-              imageAlt: "Emergency plumbing repair service",
-            },
+              title: "Emergency Plumbing",              description: "24/7 emergency plumbing response for burst pipes, flooding, and urgent situations.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=finmsy",              imageAlt: "Emergency plumbing repair service"},
             {
               id: 6,
-              title: "Fixture Installation",
-              description: "Professional installation of new fixtures including toilets, faucets, sinks, and more.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=wi2dh9&_wi=1",
-              imageAlt: "Bathroom and kitchen fixture installation",
-            },
+              title: "Fixture Installation",              description: "Professional installation of new fixtures including toilets, faucets, sinks, and more.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=wi2dh9",              imageAlt: "Bathroom and kitchen fixture installation"},
           ]}
           className="py-20"
           containerClassName="max-w-7xl"
           textBoxClassName="mb-16"
-          titleClassName="text-4xl md:text-5xl font-bold mb-4"
-          descriptionClassName="text-lg opacity-80 max-w-2xl"
+          textBoxTitleClassName="text-4xl md:text-5xl font-bold mb-4"
+          textBoxDescriptionClassName="text-lg opacity-80 max-w-2xl"
           cardClassName="rounded-2xl p-8 h-full hover:shadow-lg transition-all duration-300"
           cardTitleClassName="text-2xl font-bold mb-2"
           cardDescriptionClassName="text-base opacity-75 mb-6"
@@ -214,58 +177,22 @@ export default function HomePage() {
           useInvertedBackground={false}
           testimonials={[
             {
-              id: "1",
-              name: "Sarah Johnson",
-              role: "Homeowner",
-              testimonial: "We are thoroughly impressed with the customer service and the attentiveness given to us. Our drains needed cleaning and we had questions about our initial appointment and we had plumbers at our house almost immediately to address our concerns.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=v1h4ur",
-              imageAlt: "Sarah Johnson",
-              icon: Star,
+              id: "1",              name: "Sarah Johnson",              role: "Homeowner",              testimonial: "We are thoroughly impressed with the customer service and the attentiveness given to us. Our drains needed cleaning and we had questions about our initial appointment and we had plumbers at our house almost immediately to address our concerns.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=v1h4ur",              imageAlt: "Sarah Johnson",              icon: Star,
             },
             {
-              id: "2",
-              name: "Michael Chen",
-              role: "Business Owner",
-              testimonial: "Outstanding service! They fixed our water heater on the same day we called. Professional, courteous, and the pricing was exactly what they quoted. Highly recommend for any plumbing needs.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=wz0st9",
-              imageAlt: "Michael Chen",
-              icon: Star,
+              id: "2",              name: "Michael Chen",              role: "Business Owner",              testimonial: "Outstanding service! They fixed our water heater on the same day we called. Professional, courteous, and the pricing was exactly what they quoted. Highly recommend for any plumbing needs.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=wz0st9",              imageAlt: "Michael Chen",              icon: Star,
             },
             {
-              id: "3",
-              name: "Jennifer Davis",
-              role: "Homeowner",
-              testimonial: "Had an emergency with a burst pipe at 2 AM. They answered immediately, came out within 30 minutes, and had everything fixed before morning. True professionals!",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=4j5w4a",
-              imageAlt: "Jennifer Davis",
-              icon: Star,
+              id: "3",              name: "Jennifer Davis",              role: "Homeowner",              testimonial: "Had an emergency with a burst pipe at 2 AM. They answered immediately, came out within 30 minutes, and had everything fixed before morning. True professionals!",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=4j5w4a",              imageAlt: "Jennifer Davis",              icon: Star,
             },
             {
-              id: "4",
-              name: "Robert Martinez",
-              role: "Property Manager",
-              testimonial: "We manage multiple properties and Spot On is our go-to for all plumbing. Reliable, fast, and they always treat our tenants with respect. Five stars every time.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=kt1xee",
-              imageAlt: "Robert Martinez",
-              icon: Star,
+              id: "4",              name: "Robert Martinez",              role: "Property Manager",              testimonial: "We manage multiple properties and Spot On is our go-to for all plumbing. Reliable, fast, and they always treat our tenants with respect. Five stars every time.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=kt1xee",              imageAlt: "Robert Martinez",              icon: Star,
             },
             {
-              id: "5",
-              name: "Lisa Thompson",
-              role: "Homeowner",
-              testimonial: "No hidden fees, no surprises. They gave us an upfront estimate, did excellent work, and even cleaned up afterwards. This is the kind of service you don't find often.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=h06yf2",
-              imageAlt: "Lisa Thompson",
-              icon: Star,
+              id: "5",              name: "Lisa Thompson",              role: "Homeowner",              testimonial: "No hidden fees, no surprises. They gave us an upfront estimate, did excellent work, and even cleaned up afterwards. This is the kind of service you don't find often.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=h06yf2",              imageAlt: "Lisa Thompson",              icon: Star,
             },
             {
-              id: "6",
-              name: "David Wilson",
-              role: "Restaurant Owner",
-              testimonial: "For commercial plumbing, you need someone reliable. Spot On Plumbing came in, diagnosed the problem quickly, and had us back in business with minimal downtime. Excellent!",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=uqlysv",
-              imageAlt: "David Wilson",
-              icon: Star,
+              id: "6",              name: "David Wilson",              role: "Restaurant Owner",              testimonial: "For commercial plumbing, you need someone reliable. Spot On Plumbing came in, diagnosed the problem quickly, and had us back in business with minimal downtime. Excellent!",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=uqlysv",              imageAlt: "David Wilson",              icon: Star,
             },
           ]}
           carouselMode="buttons"
@@ -273,8 +200,8 @@ export default function HomePage() {
           className="py-20"
           containerClassName="max-w-6xl"
           textBoxClassName="text-center mb-16"
-          titleClassName="text-4xl md:text-5xl font-bold mb-4"
-          descriptionClassName="text-lg opacity-80"
+          textBoxTitleClassName="text-4xl md:text-5xl font-bold mb-4"
+          textBoxDescriptionClassName="text-lg opacity-80"
           cardClassName="rounded-2xl p-8 h-full backdrop-blur-sm"
           testimonialClassName="text-lg mb-6 leading-relaxed italic opacity-90"
           nameClassName="font-bold text-lg"
@@ -298,39 +225,23 @@ export default function HomePage() {
           animationType="slide-up"
           metrics={[
             {
-              id: "1",
-              value: "Fast",
-              title: "Quick Response",
-              description: "We respond quickly and get your plumbing issues fixed without delay. Same-day service when available.",
-              icon: Clock,
+              id: "1",              value: "Fast",              title: "Quick Response",              description: "We respond quickly and get your plumbing issues fixed without delay. Same-day service when available.",              icon: Clock,
             },
             {
-              id: "2",
-              value: "Honest",
-              title: "Transparent Pricing",
-              description: "Clear, upfront pricing with no surprises. We tell you the cost before we start work.",
-              icon: Shield,
+              id: "2",              value: "Honest",              title: "Transparent Pricing",              description: "Clear, upfront pricing with no surprises. We tell you the cost before we start work.",              icon: Shield,
             },
             {
-              id: "3",
-              value: "Expert",
-              title: "Experienced Team",
-              description: "Licensed plumbers with years of hands-on experience handling every type of plumbing issue.",
-              icon: Wrench,
+              id: "3",              value: "Expert",              title: "Experienced Team",              description: "Licensed plumbers with years of hands-on experience handling every type of plumbing issue.",              icon: Wrench,
             },
             {
-              id: "4",
-              value: "Local",
-              title: "Tulsa Experts",
-              description: "We understand Tulsa homes and plumbing systems. Locally owned, locally focused, locally trusted.",
-              icon: MapPin,
+              id: "4",              value: "Local",              title: "Tulsa Experts",              description: "We understand Tulsa homes and plumbing systems. Locally owned, locally focused, locally trusted.",              icon: MapPin,
             },
           ]}
           className="py-20"
           containerClassName="max-w-6xl"
           textBoxClassName="mb-16"
-          titleClassName="text-2xl font-bold mb-2"
-          descriptionClassName="text-base opacity-75"
+          textBoxTitleClassName="text-2xl font-bold mb-2"
+          textBoxDescriptionClassName="text-base opacity-75"
           cardClassName="rounded-2xl p-8 h-full hover:shadow-lg transition-all duration-300"
           valueClassName="text-3xl font-bold mb-2"
           gridClassName="grid gap-6 w-full"
@@ -353,43 +264,25 @@ export default function HomePage() {
           faqsAnimation="slide-up"
           faqs={[
             {
-              id: "1",
-              title: "Do you offer emergency plumbing services?",
-              content: "Yes! We provide 24/7 emergency plumbing services for burst pipes, flooding, and other urgent issues. Call us anytime at (918) 555-PLUMB.",
-            },
+              id: "1",              title: "Do you offer emergency plumbing services?",              content: "Yes! We provide 24/7 emergency plumbing services for burst pipes, flooding, and other urgent issues. Call us anytime at (918) 555-PLUMB."},
             {
-              id: "2",
-              title: "What areas of Tulsa do you service?",
-              content: "We serve Tulsa and surrounding areas including Broken Arrow, Bixby, and Jenks. Contact us to confirm service availability for your specific location.",
-            },
+              id: "2",              title: "What areas of Tulsa do you service?",              content: "We serve Tulsa and surrounding areas including Broken Arrow, Bixby, and Jenks. Contact us to confirm service availability for your specific location."},
             {
-              id: "3",
-              title: "How quickly can you respond to a service call?",
-              content: "We typically respond within 1-2 hours during business hours. For emergencies, we prioritize rapid response. Same-day service is often available.",
-            },
+              id: "3",              title: "How quickly can you respond to a service call?",              content: "We typically respond within 1-2 hours during business hours. For emergencies, we prioritize rapid response. Same-day service is often available."},
             {
-              id: "4",
-              title: "Do you provide upfront pricing?",
-              content: "Absolutely. We provide clear, honest estimates before starting any work. No hidden fees, no surprises.",
-            },
+              id: "4",              title: "Do you provide upfront pricing?",              content: "Absolutely. We provide clear, honest estimates before starting any work. No hidden fees, no surprises."},
             {
-              id: "5",
-              title: "Are your plumbers licensed and insured?",
-              content: "Yes, all our technicians are fully licensed, insured, and bonded. Your satisfaction and safety are our top priorities.",
-            },
+              id: "5",              title: "Are your plumbers licensed and insured?",              content: "Yes, all our technicians are fully licensed, insured, and bonded. Your satisfaction and safety are our top priorities."},
             {
-              id: "6",
-              title: "What is your service guarantee?",
-              content: "We guarantee 100% satisfaction on all our work. If you're not happy, we'll make it right.",
-            },
+              id: "6",              title: "What is your service guarantee?",              content: "We guarantee 100% satisfaction on all our work. If you're not happy, we'll make it right."},
           ]}
           animationType="smooth"
           showCard={true}
           className="py-20"
           containerClassName="max-w-6xl grid grid-cols-1 md:grid-cols-2 gap-12 items-center"
           textBoxClassName="md:col-span-1"
-          titleClassName="text-4xl font-bold mb-4"
-          descriptionClassName="text-lg opacity-80 mb-8"
+          textBoxTitleClassName="text-4xl font-bold mb-4"
+          textBoxDescriptionClassName="text-lg opacity-80 mb-8"
           faqsContainerClassName="space-y-4"
           accordionClassName="rounded-xl border border-opacity-20 p-4 hover:bg-opacity-5 transition-colors"
           accordionTitleClassName="text-lg font-semibold cursor-pointer flex justify-between items-center"
diff --git a/src/app/services/page.tsx b/src/app/services/page.tsx
index 40edbbd..b31d04b 100644
--- a/src/app/services/page.tsx
+++ b/src/app/services/page.tsx
@@ -19,21 +19,15 @@ export default function ServicesPage() {
 
   const navItemsWithLinks = navItems.map((item) => {
     const routeMap: Record<string, string> = {
-      home: "/",
-      services: "/services",
-      about: "/about",
-      contact: "/contact",
-    };
+      home: "/",      services: "/services",      about: "/about",      contact: "/contact"};
     return {
       ...item,
-      href: routeMap[item.id] || "/",
-    };
+      href: routeMap[item.id] || "/"};
   });
 
   const footerColumns = [
     {
-      title: "Services",
-      items: [
+      title: "Services",      items: [
         { label: "Drain Cleaning", href: "/services" },
         { label: "Leak Detection", href: "/services" },
         { label: "Water Heater Service", href: "/services" },
@@ -41,8 +35,7 @@ export default function ServicesPage() {
       ],
     },
     {
-      title: "Company",
-      items: [
+      title: "Company",      items: [
         { label: "About Us", href: "/about" },
         { label: "Contact", href: "/contact" },
         { label: "Service Areas", href: "/services" },
@@ -50,8 +43,7 @@ export default function ServicesPage() {
       ],
     },
     {
-      title: "Contact",
-      items: [
+      title: "Contact",      items: [
         { label: "Call: (918) 555-PLUMB", href: "tel:+1-918-555-7586" },
         { label: "Email: service@spotonplumbing.com", href: "mailto:service@spotonplumbing.com" },
         { label: "Tulsa, Oklahoma", href: "#" },
@@ -67,7 +59,7 @@ export default function ServicesPage() {
       borderRadius="pill"
       contentWidth="small"
       sizing="large"
-      background="noiseDiagonalGradient"
+      background="circleGradient"
       cardStyle="gradient-bordered"
       primaryButtonStyle="flat"
       secondaryButtonStyle="glass"
@@ -88,7 +80,7 @@ export default function ServicesPage() {
         <HeroBillboard
           title="Comprehensive Plumbing Solutions for Tulsa"
           description="From routine maintenance to emergency repairs, we provide expert plumbing services for homes and businesses across the region."
-          background={{ variant: "noiseDiagonalGradient" }}
+          background={{ variant: "plain" }}
           tag="Expert Services"
           tagIcon={Wrench}
           tagAnimation="slide-up"
@@ -111,51 +103,27 @@ export default function ServicesPage() {
           features={[
             {
               id: 1,
-              title: "Drain Cleaning & Maintenance",
-              description: "Keep your drains flowing freely with professional cleaning and maintenance services.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=heaime&_wi=2",
-              imageAlt: "Professional drain cleaning",
-            },
+              title: "Drain Cleaning & Maintenance",              description: "Keep your drains flowing freely with professional cleaning and maintenance services.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=heaime",              imageAlt: "Professional drain cleaning"},
             {
               id: 2,
-              title: "Leak Detection & Repair",
-              description: "Using advanced technology, we locate hidden leaks quickly and repair them to prevent water damage.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9zvurb&_wi=2",
-              imageAlt: "Water leak detection",
-            },
+              title: "Leak Detection & Repair",              description: "Using advanced technology, we locate hidden leaks quickly and repair them to prevent water damage.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9zvurb",              imageAlt: "Water leak detection"},
             {
               id: 3,
-              title: "Water Heater Repair & Installation",
-              description: "Professional repair and installation of all water heater types, including tankless systems.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=wovxlr&_wi=2",
-              imageAlt: "Water heater services",
-            },
+              title: "Water Heater Repair & Installation",              description: "Professional repair and installation of all water heater types, including tankless systems.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=wovxlr",              imageAlt: "Water heater services"},
             {
               id: 4,
-              title: "Pipe Repair & Replacement",
-              description: "Expert handling of copper, PVC, cast iron, and other pipe materials. We repair or replace as needed.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=5t2xd6&_wi=2",
-              imageAlt: "Pipe repair services",
-            },
+              title: "Pipe Repair & Replacement",              description: "Expert handling of copper, PVC, cast iron, and other pipe materials. We repair or replace as needed.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=5t2xd6",              imageAlt: "Pipe repair services"},
             {
               id: 5,
-              title: "24/7 Emergency Plumbing",
-              description: "When disaster strikes, we're here. Immediate response to burst pipes, flooding, and urgent issues.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=finmsy&_wi=2",
-              imageAlt: "Emergency plumbing",
-            },
+              title: "24/7 Emergency Plumbing",              description: "When disaster strikes, we're here. Immediate response to burst pipes, flooding, and urgent issues.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=finmsy",              imageAlt: "Emergency plumbing"},
             {
               id: 6,
-              title: "Fixture Installation & Upgrades",
-              description: "Professional installation of new fixtures for bathrooms, kitchens, and laundry areas.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=wi2dh9&_wi=2",
-              imageAlt: "Fixture installation",
-            },
+              title: "Fixture Installation & Upgrades",              description: "Professional installation of new fixtures for bathrooms, kitchens, and laundry areas.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=wi2dh9",              imageAlt: "Fixture installation"},
           ]}
           className="py-20"
           containerClassName="max-w-7xl"
-          titleClassName="text-4xl font-bold mb-6"
-          descriptionClassName="text-lg opacity-80 max-w-2xl mb-16"
+          textBoxTitleClassName="text-4xl font-bold mb-6"
+          textBoxDescriptionClassName="text-lg opacity-80 max-w-2xl mb-16"
           cardClassName="rounded-2xl p-8 h-full hover:shadow-lg transition-all duration-300"
           cardTitleClassName="text-2xl font-bold mb-3"
           cardDescriptionClassName="text-base opacity-75 mb-4"