diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index 7cbcefd..773dd55 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -43,36 +43,36 @@ export default function AboutPage() {
         <HeroBillboardRotatedCarousel
           title="About ProFlow Plumbing"
           description="We're local professionals dedicated to excellence in plumbing. Trust, expertise, and customer satisfaction drive everything we do."
-          background="gradient-bars"
+          background={{ variant: "gradient-bars" }}
           carouselItems={[
             {
               id: "about-carousel-1",
-              imageSrc: "http://img.b2bpic.net/free-photo/close-up-man-working-with-drill_23-2148643260.jpg?_wi=2",
+              imageSrc: "http://img.b2bpic.net/free-photo/close-up-man-working-with-drill_23-2148643260.jpg",
               imageAlt: "Professional plumber at work",
             },
             {
               id: "about-carousel-2",
-              imageSrc: "http://img.b2bpic.net/free-photo/male-plumber-working-with-client-fix-kitchen-problems_23-2150990685.jpg?_wi=5",
+              imageSrc: "http://img.b2bpic.net/free-photo/male-plumber-working-with-client-fix-kitchen-problems_23-2150990685.jpg",
               imageAlt: "Expert plumber service",
             },
             {
               id: "about-carousel-3",
-              imageSrc: "http://img.b2bpic.net/free-photo/low-angle-man-working-as-plumber_23-2150746301.jpg?_wi=2",
+              imageSrc: "http://img.b2bpic.net/free-photo/low-angle-man-working-as-plumber_23-2150746301.jpg",
               imageAlt: "Water heater installation",
             },
             {
               id: "about-carousel-4",
-              imageSrc: "http://img.b2bpic.net/free-photo/side-view-man-working-as-plumber_23-2150746294.jpg?_wi=2",
+              imageSrc: "http://img.b2bpic.net/free-photo/side-view-man-working-as-plumber_23-2150746294.jpg",
               imageAlt: "Professional plumbing inspection",
             },
             {
               id: "about-carousel-5",
-              imageSrc: "http://img.b2bpic.net/free-photo/man-installs-heating-system-house-checks-pipes-with-wrench_169016-55822.jpg?_wi=2",
+              imageSrc: "http://img.b2bpic.net/free-photo/man-installs-heating-system-house-checks-pipes-with-wrench_169016-55822.jpg",
               imageAlt: "Expert pipe installation",
             },
             {
               id: "about-carousel-6",
-              imageSrc: "http://img.b2bpic.net/free-photo/male-plumber-working-fix-problems-client-s-house_23-2150990698.jpg?_wi=2",
+              imageSrc: "http://img.b2bpic.net/free-photo/male-plumber-working-fix-problems-client-s-house_23-2150990698.jpg",
               imageAlt: "Quality plumbing repair",
             },
           ]}
@@ -90,7 +90,7 @@ export default function AboutPage() {
           tagAnimation="slide-up"
           textboxLayout="default"
           useInvertedBackground={false}
-          gridVariant="three-columns-all-equal-width"
+          gridVariant="uniform-all-items-equal"
           animationType="scale-rotate"
           metrics={[
             {
@@ -138,7 +138,7 @@ export default function AboutPage() {
           tagAnimation="slide-up"
           textboxLayout="default"
           useInvertedBackground={false}
-          gridVariant="three-columns-all-equal-width"
+          gridVariant="uniform-all-items-equal"
           animationType="scale-rotate"
           metrics={[
             {
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 81184ca..d4ed7fa 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -46,7 +46,7 @@ export default function HomePage() {
         <HeroBillboardRotatedCarousel
           title="Plumbing Done Right the First Time"
           description="Fast, reliable plumbing with modern tools and old-school work ethic. Licensed, insured, and ready to solve your problem today."
-          background="radial-gradient"
+          background={{ variant: "radial-gradient" }}
           tag="Professional Plumbing"
           tagIcon={Sparkles}
           tagAnimation="slide-up"
@@ -58,7 +58,7 @@ export default function HomePage() {
           carouselItems={[
             {
               id: "carousel-1",
-              imageSrc: "http://img.b2bpic.net/free-photo/male-plumber-working-with-client-fix-kitchen-problems_23-2150990685.jpg?_wi=1",
+              imageSrc: "http://img.b2bpic.net/free-photo/male-plumber-working-with-client-fix-kitchen-problems_23-2150990685.jpg",
               imageAlt: "Professional plumber fixing kitchen sink",
             },
             {
@@ -68,22 +68,22 @@ export default function HomePage() {
             },
             {
               id: "carousel-3",
-              imageSrc: "http://img.b2bpic.net/free-photo/low-angle-man-working-as-plumber_23-2150746301.jpg?_wi=1",
+              imageSrc: "http://img.b2bpic.net/free-photo/low-angle-man-working-as-plumber_23-2150746301.jpg",
               imageAlt: "Water heater installation service",
             },
             {
               id: "carousel-4",
-              imageSrc: "http://img.b2bpic.net/free-photo/male-plumber-working-fix-problems-client-s-house_23-2150990698.jpg?_wi=1",
+              imageSrc: "http://img.b2bpic.net/free-photo/male-plumber-working-fix-problems-client-s-house_23-2150990698.jpg",
               imageAlt: "Professional drain cleaning",
             },
             {
               id: "carousel-5",
-              imageSrc: "http://img.b2bpic.net/free-photo/man-installs-heating-system-house-checks-pipes-with-wrench_169016-55822.jpg?_wi=1",
+              imageSrc: "http://img.b2bpic.net/free-photo/man-installs-heating-system-house-checks-pipes-with-wrench_169016-55822.jpg",
               imageAlt: "Advanced leak detection",
             },
             {
               id: "carousel-6",
-              imageSrc: "http://img.b2bpic.net/free-photo/close-up-man-working-with-drill_23-2148643260.jpg?_wi=1",
+              imageSrc: "http://img.b2bpic.net/free-photo/close-up-man-working-with-drill_23-2148643260.jpg",
               imageAlt: "Quality copper piping installation",
             },
           ]}
@@ -142,7 +142,7 @@ export default function HomePage() {
           tagAnimation="slide-up"
           textboxLayout="default"
           useInvertedBackground={false}
-          gridVariant="three-columns-all-equal-width"
+          gridVariant="uniform-all-items-equal"
           animationType="scale-rotate"
           metrics={[
             {
@@ -233,7 +233,7 @@ export default function HomePage() {
         <ContactSplitForm
           title="Need a Plumber Today?"
           description="Get in touch with our team. We'll respond quickly to schedule your service or emergency repair."
-          imageSrc="http://img.b2bpic.net/free-photo/male-plumber-working-with-client-fix-kitchen-problems_23-2150990685.jpg?_wi=2"
+          imageSrc="http://img.b2bpic.net/free-photo/male-plumber-working-with-client-fix-kitchen-problems_23-2150990685.jpg"
           imageAlt="Professional plumber at work"
           mediaAnimation="slide-up"
           mediaPosition="right"
diff --git a/src/app/services/page.tsx b/src/app/services/page.tsx
index 28a7030..e0f9e18 100644
--- a/src/app/services/page.tsx
+++ b/src/app/services/page.tsx
@@ -43,36 +43,36 @@ export default function ServicesPage() {
         <HeroBillboardRotatedCarousel
           title="Professional Plumbing Services"
           description="Complete plumbing solutions tailored to your needs. From emergency repairs to planned installations."
-          background="gradient-bars"
+          background={{ variant: "gradient-bars" }}
           carouselItems={[
             {
               id: "services-carousel-1",
-              imageSrc: "http://img.b2bpic.net/free-photo/side-view-man-working-as-plumber_23-2150746294.jpg?_wi=1",
+              imageSrc: "http://img.b2bpic.net/free-photo/side-view-man-working-as-plumber_23-2150746294.jpg",
               imageAlt: "Professional plumber inspecting pipes",
             },
             {
               id: "services-carousel-2",
-              imageSrc: "http://img.b2bpic.net/free-photo/sporty-girl-packing-bag-training-sports-girl-going-training-preparing-training_169016-67494.jpg?_wi=1",
+              imageSrc: "http://img.b2bpic.net/free-photo/sporty-girl-packing-bag-training-sports-girl-going-training-preparing-training_169016-67494.jpg",
               imageAlt: "Emergency plumbing response",
             },
             {
               id: "services-carousel-3",
-              imageSrc: "http://img.b2bpic.net/free-vector/heater-installation-plumbing-flyer_742173-3463.jpg?_wi=1",
+              imageSrc: "http://img.b2bpic.net/free-vector/heater-installation-plumbing-flyer_742173-3463.jpg",
               imageAlt: "Water heater service",
             },
             {
               id: "services-carousel-4",
-              imageSrc: "http://img.b2bpic.net/free-photo/man-rinsing-dish-sponge-running-water-daily-home-hygiene_169016-69431.jpg?_wi=1",
+              imageSrc: "http://img.b2bpic.net/free-photo/man-rinsing-dish-sponge-running-water-daily-home-hygiene_169016-69431.jpg",
               imageAlt: "Drain cleaning service",
             },
             {
               id: "services-carousel-5",
-              imageSrc: "http://img.b2bpic.net/free-vector/three-vertical-plumber-isometric-banner-set_1284-54706.jpg?_wi=1",
+              imageSrc: "http://img.b2bpic.net/free-vector/three-vertical-plumber-isometric-banner-set_1284-54706.jpg",
               imageAlt: "Leak detection service",
             },
             {
               id: "services-carousel-6",
-              imageSrc: "http://img.b2bpic.net/free-photo/male-plumber-working-with-client-fix-kitchen-problems_23-2150990685.jpg?_wi=3",
+              imageSrc: "http://img.b2bpic.net/free-photo/male-plumber-working-with-client-fix-kitchen-problems_23-2150990685.jpg",
               imageAlt: "Kitchen plumbing repair",
             },
           ]}
@@ -100,7 +100,7 @@ export default function ServicesPage() {
               price: "Call for Quote",
               rating: 5,
               reviewCount: "Fast & Professional",
-              imageSrc: "http://img.b2bpic.net/free-photo/sporty-girl-packing-bag-training-sports-girl-going-training-preparing-training_169016-67494.jpg?_wi=2",
+              imageSrc: "http://img.b2bpic.net/free-photo/sporty-girl-packing-bag-training-sports-girl-going-training-preparing-training_169016-67494.jpg",
               imageAlt: "Emergency plumbing response",
             },
             {
@@ -110,7 +110,7 @@ export default function ServicesPage() {
               price: "Starting at $500",
               rating: 5,
               reviewCount: "Expert Service",
-              imageSrc: "http://img.b2bpic.net/free-vector/heater-installation-plumbing-flyer_742173-3463.jpg?_wi=2",
+              imageSrc: "http://img.b2bpic.net/free-vector/heater-installation-plumbing-flyer_742173-3463.jpg",
               imageAlt: "Water heater installation",
             },
             {
@@ -120,7 +120,7 @@ export default function ServicesPage() {
               price: "From $150",
               rating: 5,
               reviewCount: "Effective Solutions",
-              imageSrc: "http://img.b2bpic.net/free-photo/man-rinsing-dish-sponge-running-water-daily-home-hygiene_169016-69431.jpg?_wi=2",
+              imageSrc: "http://img.b2bpic.net/free-photo/man-rinsing-dish-sponge-running-water-daily-home-hygiene_169016-69431.jpg",
               imageAlt: "Drain cleaning service",
             },
             {
@@ -130,7 +130,7 @@ export default function ServicesPage() {
               price: "From $200",
               rating: 5,
               reviewCount: "Diagnostic Expertise",
-              imageSrc: "http://img.b2bpic.net/free-vector/three-vertical-plumber-isometric-banner-set_1284-54706.jpg?_wi=2",
+              imageSrc: "http://img.b2bpic.net/free-vector/three-vertical-plumber-isometric-banner-set_1284-54706.jpg",
               imageAlt: "Leak detection service",
             },
           ]}
@@ -148,7 +148,7 @@ export default function ServicesPage() {
           tagAnimation="slide-up"
           textboxLayout="default"
           useInvertedBackground={false}
-          gridVariant="three-columns-all-equal-width"
+          gridVariant="uniform-all-items-equal"
           animationType="scale-rotate"
           metrics={[
             {