diff --git a/src/app/battery-storage/page.tsx b/src/app/battery-storage/page.tsx
index eb3b88a..2e8e95c 100644
--- a/src/app/battery-storage/page.tsx
+++ b/src/app/battery-storage/page.tsx
@@ -87,7 +87,7 @@ export default function BatteryStoragePage() {
         <HeroBillboardCarousel
           title="Battery Storage Systems for Scottish Homes"
           description="Maximize your solar investment with advanced battery storage. Store excess solar energy and reduce your reliance on the grid. Available with government grant support."
-          background="radial-gradient"
+          background={{ variant: "radial-gradient" }}
           tag="Energy Independence Solutions"
           tagIcon={Zap}
           tagAnimation="slide-up"
@@ -104,7 +104,7 @@ export default function BatteryStoragePage() {
           buttonAnimation="slide-up"
           mediaItems={[
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/outdoor-utility-control-box-with-indicator-lights-blue-sky_626616-513.jpg?_wi=5",
+              imageSrc: "http://img.b2bpic.net/free-photo/outdoor-utility-control-box-with-indicator-lights-blue-sky_626616-513.jpg",
               imageAlt: "home battery storage system",
             },
           ]}
@@ -126,14 +126,14 @@ export default function BatteryStoragePage() {
               id: 1,
               title: "Maximum Energy Independence",
               description: "Store solar energy produced during the day and use it whenever you need it—evening, night, or cloudy days. Reduce your grid dependency significantly.",
-              imageSrc: "http://img.b2bpic.net/free-photo/outdoor-utility-control-box-with-indicator-lights-blue-sky_626616-513.jpg?_wi=6",
+              imageSrc: "http://img.b2bpic.net/free-photo/outdoor-utility-control-box-with-indicator-lights-blue-sky_626616-513.jpg",
               imageAlt: "Battery storage with monitoring",
             },
             {
               id: 2,
               title: "Backup Power During Outages",
               description: "Keep your home powered during grid failures. Advanced battery systems provide seamless backup, ensuring essential appliances stay running.",
-              imageSrc: "http://img.b2bpic.net/free-photo/outdoor-utility-control-box-with-indicator-lights-blue-sky_626616-513.jpg?_wi=7",
+              imageSrc: "http://img.b2bpic.net/free-photo/outdoor-utility-control-box-with-indicator-lights-blue-sky_626616-513.jpg",
               imageAlt: "Home battery backup system",
             },
           ]}
@@ -158,7 +158,7 @@ export default function BatteryStoragePage() {
               name: "5kWh Battery System",
               price: "From £4,500",
               variant: "Standard Home",
-              imageSrc: "http://img.b2bpic.net/free-photo/outdoor-utility-control-box-with-indicator-lights-blue-sky_626616-513.jpg?_wi=8",
+              imageSrc: "http://img.b2bpic.net/free-photo/outdoor-utility-control-box-with-indicator-lights-blue-sky_626616-513.jpg",
               imageAlt: "5kWh battery storage unit",
             },
             {
@@ -166,7 +166,7 @@ export default function BatteryStoragePage() {
               name: "10kWh Battery System",
               price: "From £8,500",
               variant: "Larger Home",
-              imageSrc: "http://img.b2bpic.net/free-photo/outdoor-utility-control-box-with-indicator-lights-blue-sky_626616-513.jpg?_wi=9",
+              imageSrc: "http://img.b2bpic.net/free-photo/outdoor-utility-control-box-with-indicator-lights-blue-sky_626616-513.jpg",
               imageAlt: "10kWh battery storage system",
             },
             {
@@ -174,7 +174,7 @@ export default function BatteryStoragePage() {
               name: "15kWh Battery System",
               price: "From £12,000",
               variant: "Premium Setup",
-              imageSrc: "http://img.b2bpic.net/free-photo/outdoor-utility-control-box-with-indicator-lights-blue-sky_626616-513.jpg?_wi=10",
+              imageSrc: "http://img.b2bpic.net/free-photo/outdoor-utility-control-box-with-indicator-lights-blue-sky_626616-513.jpg",
               imageAlt: "15kWh premium battery storage",
             },
           ]}
@@ -201,7 +201,7 @@ export default function BatteryStoragePage() {
               handle: "@robertstewart",
               testimonial: "Added battery storage to our existing solar system. Now we use 80% less grid electricity. The payback period was much shorter than expected. Highly satisfied.",
               rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/businessman-with-crossed-arms_23-2147996582.jpg?_wi=2",
+              imageSrc: "http://img.b2bpic.net/free-photo/businessman-with-crossed-arms_23-2147996582.jpg",
               imageAlt: "Robert Stewart",
             },
             {
@@ -210,7 +210,7 @@ export default function BatteryStoragePage() {
               handle: "@helenmackenzie",
               testimonial: "The battery storage system has been transformative. We have confidence during power cuts and see consistent savings every month. Installation was smooth and professional.",
               rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/portrait-young-business-woman-park_1303-28940.jpg?_wi=2",
+              imageSrc: "http://img.b2bpic.net/free-photo/portrait-young-business-woman-park_1303-28940.jpg",
               imageAlt: "Helen MacKenzie",
             },
             {
@@ -219,7 +219,7 @@ export default function BatteryStoragePage() {
               handle: "@grahambrown",
               testimonial: "Perfect complement to our solar panels. The monitoring app lets us track everything in real-time. Customer support has been excellent throughout.",
               rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/excited-handsome-blonde-man-points-camera-with-two-hands-orange_141793-69284.jpg?_wi=2",
+              imageSrc: "http://img.b2bpic.net/free-photo/excited-handsome-blonde-man-points-camera-with-two-hands-orange_141793-69284.jpg",
               imageAlt: "Graham Brown",
             },
           ]}
diff --git a/src/app/blog/page.tsx b/src/app/blog/page.tsx
index c8bbb7f..40d3acc 100644
--- a/src/app/blog/page.tsx
+++ b/src/app/blog/page.tsx
@@ -81,7 +81,7 @@ export default function BlogPage() {
         <HeroBillboardCarousel
           title="Renewable Energy Blog & Resources"
           description="Expert tips, guides, and insights on solar panels, battery storage, and sustainable energy for Scottish homes. Learn how to maximize your renewable energy investment."
-          background="radial-gradient"
+          background={{ variant: "radial-gradient" }}
           tag="Expert Insights"
           tagIcon={Sparkles}
           tagAnimation="slide-up"
@@ -92,7 +92,7 @@ export default function BlogPage() {
           buttonAnimation="slide-up"
           mediaItems={[
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/team-architects-looking-construction-site_23-2147702470.jpg?_wi=4",
+              imageSrc: "http://img.b2bpic.net/free-photo/team-architects-looking-construction-site_23-2147702470.jpg",
               imageAlt: "Professional energy assessment team",
             },
           ]}
@@ -114,7 +114,7 @@ export default function BlogPage() {
               id: 1,
               title: "Solar Panel Installation Guide for Scottish Homes",
               description: "A comprehensive guide covering roof assessments, system sizing, installation timeline, and expected savings for your Scottish property.",
-              imageSrc: "http://img.b2bpic.net/free-photo/young-asian-technician-man-standing-talking-smartphone-long-rows-photovoltaic-solar-panels-copy-space_1150-57278.jpg?_wi=9",
+              imageSrc: "http://img.b2bpic.net/free-photo/young-asian-technician-man-standing-talking-smartphone-long-rows-photovoltaic-solar-panels-copy-space_1150-57278.jpg",
               imageAlt: "Solar technician installation guide",
             },
             {
@@ -128,7 +128,7 @@ export default function BlogPage() {
               id: 3,
               title: "Battery Storage: Maximizing Your Solar Investment",
               description: "Understand how battery storage works, cost considerations, and how to calculate ROI for your specific energy consumption patterns.",
-              imageSrc: "http://img.b2bpic.net/free-photo/outdoor-utility-control-box-with-indicator-lights-blue-sky_626616-513.jpg?_wi=12",
+              imageSrc: "http://img.b2bpic.net/free-photo/outdoor-utility-control-box-with-indicator-lights-blue-sky_626616-513.jpg",
               imageAlt: "Battery storage system technology",
             },
           ]}
diff --git a/src/app/contact/page.tsx b/src/app/contact/page.tsx
index 25deab1..e27170e 100644
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -84,7 +84,7 @@ export default function ContactPage() {
         <HeroBillboardCarousel
           title="Get Your Free Renewable Energy Quote"
           description="Connect with Scotland's leading MCS-approved renewable energy installers. Book your free home survey and discover how much you can save with solar panels, battery storage, or heat pumps."
-          background="radial-gradient"
+          background={{ variant: "radial-gradient" }}
           tag="Expert Support Available"
           tagIcon={Sparkles}
           tagAnimation="slide-up"
@@ -95,7 +95,7 @@ export default function ContactPage() {
           buttonAnimation="slide-up"
           mediaItems={[
             {
-              imageSrc: "http://img.b2bpic.net/free-vector/colored-smart-house-elements-set_1284-34321.jpg?_wi=9",
+              imageSrc: "http://img.b2bpic.net/free-vector/colored-smart-house-elements-set_1284-34321.jpg",
               imageAlt: "Smart home renewable energy solution",
             },
           ]}
@@ -110,7 +110,7 @@ export default function ContactPage() {
           useInvertedBackground={false}
           mediaPosition="right"
           mediaAnimation="slide-up"
-          imageSrc="http://img.b2bpic.net/free-vector/colored-smart-house-elements-set_1284-34321.jpg?_wi=10"
+          imageSrc="http://img.b2bpic.net/free-vector/colored-smart-house-elements-set_1284-34321.jpg"
           imageAlt="Scottish home with renewable energy solution"
           inputs={[
             {
diff --git a/src/app/customer-reviews/page.tsx b/src/app/customer-reviews/page.tsx
index 582cd8d..5f7c4ef 100644
--- a/src/app/customer-reviews/page.tsx
+++ b/src/app/customer-reviews/page.tsx
@@ -47,7 +47,7 @@ export default function CustomerReviewsPage() {
         <HeroBillboardCarousel
           title="Trusted by Thousands of Scottish Homeowners"
           description="Read verified customer reviews from real homeowners who have transformed their homes with our MCS-approved renewable energy installers. Consistently rated 4.5+ stars across all platforms."
-          background="radial-gradient"
+          background={{ variant: "radial-gradient" }}
           tag="Award-Winning Customer Service"
           tagIcon={Sparkles}
           tagAnimation="slide-up"
@@ -60,7 +60,7 @@ export default function CustomerReviewsPage() {
           buttonAnimation="slide-up"
           mediaItems={[
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/businessman-with-crossed-arms_23-2147996582.jpg?_wi=4",
+              imageSrc: "http://img.b2bpic.net/free-photo/businessman-with-crossed-arms_23-2147996582.jpg",
               imageAlt: "Satisfied renewable energy customer",
             },
           ]}
@@ -87,7 +87,7 @@ export default function CustomerReviewsPage() {
               handle: "@mitchellhome",
               testimonial: "Professional installation and great advice. The team assessed our home thoroughly and recommended exactly what we needed. Our energy bills have dropped significantly. Highly recommended.",
               rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/businessman-with-crossed-arms_23-2147996582.jpg?_wi=5",
+              imageSrc: "http://img.b2bpic.net/free-photo/businessman-with-crossed-arms_23-2147996582.jpg",
               imageAlt: "James Mitchell",
             },
             {
@@ -96,7 +96,7 @@ export default function CustomerReviewsPage() {
               handle: "@sarahcampbell",
               testimonial: "Excellent service from start to finish. No pressure selling, just honest advice about what would work best for our home. The installation was clean and professional. Very happy with the results.",
               rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/portrait-young-business-woman-park_1303-28940.jpg?_wi=4",
+              imageSrc: "http://img.b2bpic.net/free-photo/portrait-young-business-woman-park_1303-28940.jpg",
               imageAlt: "Sarah Campbell",
             },
             {
@@ -105,7 +105,7 @@ export default function CustomerReviewsPage() {
               handle: "@davidthomson",
               testimonial: "The survey was thorough and they explained everything clearly. They advised against a larger system, saying our roof wasn't ideal, but instead designed a perfect solution. That kind of honesty is rare.",
               rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/brunette-woman-standing-bricks-wall-smiling-with-happy-face-looking-pointing-side-with-thumb-up_839833-15096.jpg?_wi=2",
+              imageSrc: "http://img.b2bpic.net/free-photo/brunette-woman-standing-bricks-wall-smiling-with-happy-face-looking-pointing-side-with-thumb-up_839833-15096.jpg",
               imageAlt: "David Thomson",
             },
             {
@@ -114,7 +114,7 @@ export default function CustomerReviewsPage() {
               handle: "@emmarobertson",
               testimonial: "Outstanding customer service. They helped us navigate the government grant process and we got our heat pump installed at a fraction of the cost. Genuinely impressive team.",
               rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/portrait-happy-senior-woman-showing-thumbs-up_1262-5331.jpg?_wi=2",
+              imageSrc: "http://img.b2bpic.net/free-photo/portrait-happy-senior-woman-showing-thumbs-up_1262-5331.jpg",
               imageAlt: "Emma Robertson",
             },
             {
@@ -123,7 +123,7 @@ export default function CustomerReviewsPage() {
               handle: "@michaelmacleod",
               testimonial: "Best decision we made for our home. The team was professional, courteous, and delivered everything they promised. Our solar system is performing beautifully in Scotland's climate.",
               rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/excited-handsome-blonde-man-points-camera-with-two-hands-orange_141793-69284.jpg?_wi=4",
+              imageSrc: "http://img.b2bpic.net/free-photo/excited-handsome-blonde-man-points-camera-with-two-hands-orange_141793-69284.jpg",
               imageAlt: "Michael MacLeod",
             },
             {
@@ -132,7 +132,7 @@ export default function CustomerReviewsPage() {
               handle: "@lisaanderson",
               testimonial: "Five years on and still saving money. The maintenance team keeps our system running perfectly. This investment has completely changed how we think about energy.",
               rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/portrait-businesswoman-pointing-finger-left-showing-corporate-banner-logo-standing-brown-suit_1258-118860.jpg?_wi=2",
+              imageSrc: "http://img.b2bpic.net/free-photo/portrait-businesswoman-pointing-finger-left-showing-corporate-banner-logo-standing-brown-suit_1258-118860.jpg",
               imageAlt: "Lisa Anderson",
             },
           ]}
diff --git a/src/app/heat-pumps/page.tsx b/src/app/heat-pumps/page.tsx
index 862ce82..1b7d350 100644
--- a/src/app/heat-pumps/page.tsx
+++ b/src/app/heat-pumps/page.tsx
@@ -47,7 +47,7 @@ export default function HeatPumpsPage() {
         <HeroBillboardCarousel
           title="Air Source Heat Pumps - Government Grants Available"
           description="Replace your traditional heating system with efficient renewable heat. Our MCS-approved installers help Scottish homeowners access government grants covering up to 40% of installation costs. Transform your home heating while reducing carbon emissions."
-          background="radial-gradient"
+          background={{ variant: "radial-gradient" }}
           tag="Renewable Heating Solutions"
           tagIcon={Zap}
           tagAnimation="slide-up"
@@ -64,7 +64,7 @@ export default function HeatPumpsPage() {
           buttonAnimation="slide-up"
           mediaItems={[
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/aerial-view-salt-salt-farm-ready-harvest-thailand_335224-1050.jpg?_wi=2",
+              imageSrc: "http://img.b2bpic.net/free-photo/aerial-view-salt-salt-farm-ready-harvest-thailand_335224-1050.jpg",
               imageAlt: "Air source heat pump outdoor unit",
             },
           ]}
@@ -86,14 +86,14 @@ export default function HeatPumpsPage() {
               id: 1,
               title: "Government Grant Eligible",
               description: "Access the Boiler Upgrade Scheme offering up to £7,500 in government funding. Our installers handle all grant applications and paperwork.",
-              imageSrc: "http://img.b2bpic.net/free-photo/team-architects-looking-construction-site_23-2147702470.jpg?_wi=2",
+              imageSrc: "http://img.b2bpic.net/free-photo/team-architects-looking-construction-site_23-2147702470.jpg",
               imageAlt: "Professional heat pump assessment",
             },
             {
               id: 2,
               title: "Lower Energy Bills",
               description: "Heat pumps are 3-4 times more efficient than traditional boilers, reducing heating costs by up to 40% and providing year-round comfort.",
-              imageSrc: "http://img.b2bpic.net/free-photo/outdoor-utility-control-box-with-indicator-lights-blue-sky_626616-513.jpg?_wi=11",
+              imageSrc: "http://img.b2bpic.net/free-photo/outdoor-utility-control-box-with-indicator-lights-blue-sky_626616-513.jpg",
               imageAlt: "Modern heat pump technology",
             },
             {
@@ -125,7 +125,7 @@ export default function HeatPumpsPage() {
               name: "Professional Survey",
               price: "Free Assessment",
               variant: "Expert Evaluation",
-              imageSrc: "http://img.b2bpic.net/free-photo/team-architects-looking-construction-site_23-2147702470.jpg?_wi=3",
+              imageSrc: "http://img.b2bpic.net/free-photo/team-architects-looking-construction-site_23-2147702470.jpg",
               imageAlt: "Professional home assessment",
             },
             {
@@ -133,7 +133,7 @@ export default function HeatPumpsPage() {
               name: "Installation Service",
               price: "Custom Quote",
               variant: "Expert Installation",
-              imageSrc: "http://img.b2bpic.net/free-photo/aerial-view-salt-salt-farm-ready-harvest-thailand_335224-1050.jpg?_wi=3",
+              imageSrc: "http://img.b2bpic.net/free-photo/aerial-view-salt-salt-farm-ready-harvest-thailand_335224-1050.jpg",
               imageAlt: "Heat pump installation",
             },
             {
@@ -141,7 +141,7 @@ export default function HeatPumpsPage() {
               name: "Grant Support",
               price: "Included",
               variant: "Up to £7,500 Available",
-              imageSrc: "http://img.b2bpic.net/free-photo/couple-with-laptop-table_23-2147744891.jpg?_wi=2",
+              imageSrc: "http://img.b2bpic.net/free-photo/couple-with-laptop-table_23-2147744891.jpg",
               imageAlt: "Grant application assistance",
             },
             {
@@ -149,7 +149,7 @@ export default function HeatPumpsPage() {
               name: "Maintenance Plans",
               price: "Service Plans Available",
               variant: "Ongoing Support",
-              imageSrc: "http://img.b2bpic.net/free-photo/young-asian-technician-man-standing-talking-smartphone-long-rows-photovoltaic-solar-panels-copy-space_1150-57278.jpg?_wi=8",
+              imageSrc: "http://img.b2bpic.net/free-photo/young-asian-technician-man-standing-talking-smartphone-long-rows-photovoltaic-solar-panels-copy-space_1150-57278.jpg",
               imageAlt: "Professional maintenance service",
             },
             {
@@ -157,7 +157,7 @@ export default function HeatPumpsPage() {
               name: "Combined Heat & Solar",
               price: "Custom Quote",
               variant: "Maximum Efficiency",
-              imageSrc: "http://img.b2bpic.net/free-vector/colored-smart-house-elements-set_1284-34321.jpg?_wi=8",
+              imageSrc: "http://img.b2bpic.net/free-vector/colored-smart-house-elements-set_1284-34321.jpg",
               imageAlt: "Combined energy system",
             },
             {
diff --git a/src/app/page.tsx b/src/app/page.tsx
index daec53e..ed965b2 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -91,7 +91,7 @@ export default function HomePage() {
         <HeroBillboardCarousel
           title="Trusted Solar & Renewable Energy Installers Across Scotland"
           description="Get a free quote from trusted MCS-approved installers with outstanding customer reviews. Transform your home with solar panels, battery storage, or heat pumps."
-          background="radial-gradient"
+          background={{ variant: "radial-gradient" }}
           tag="Scotland's Leading Renewable Energy Specialists"
           tagIcon={Sparkles}
           tagAnimation="slide-up"
@@ -102,7 +102,7 @@ export default function HomePage() {
           buttonAnimation="slide-up"
           mediaItems={[
             {
-              imageSrc: "http://img.b2bpic.net/free-vector/colored-smart-house-elements-set_1284-34321.jpg?_wi=1",
+              imageSrc: "http://img.b2bpic.net/free-vector/colored-smart-house-elements-set_1284-34321.jpg",
               imageAlt: "Solar panels installed on Scottish residential home",
             },
           ]}
@@ -140,14 +140,14 @@ export default function HomePage() {
               id: 1,
               title: "Consultative Assessment",
               description: "Installers carefully assess your home and energy usage before recommending the best solution for your needs.",
-              imageSrc: "http://img.b2bpic.net/free-photo/couple-with-laptop-table_23-2147744891.jpg?_wi=1",
+              imageSrc: "http://img.b2bpic.net/free-photo/couple-with-laptop-table_23-2147744891.jpg",
               imageAlt: "Professional consultant discussing home energy with homeowner",
             },
             {
               id: 2,
               title: "Honest Recommendations",
               description: "Sometimes customers request products that aren't suitable for their homes. We advise against installation if it won't reduce energy costs or meet your goals.",
-              imageSrc: "http://img.b2bpic.net/free-photo/top-view-teamwork-environment-project_23-2148894022.jpg?_wi=1",
+              imageSrc: "http://img.b2bpic.net/free-photo/top-view-teamwork-environment-project_23-2148894022.jpg",
               imageAlt: "Bespoke solar system design diagram",
             },
           ]}
@@ -169,21 +169,21 @@ export default function HomePage() {
               id: 1,
               title: "Solar Panels",
               description: "High-efficiency photovoltaic systems designed for Scottish climate and optimized for maximum energy generation.",
-              imageSrc: "http://img.b2bpic.net/free-photo/top-view-teamwork-environment-project_23-2148894022.jpg?_wi=2",
+              imageSrc: "http://img.b2bpic.net/free-photo/top-view-teamwork-environment-project_23-2148894022.jpg",
               imageAlt: "Advanced solar panel installation",
             },
             {
               id: 2,
               title: "Battery Storage",
               description: "Store excess solar energy for use during evening hours or cloudy days, maximizing your energy independence.",
-              imageSrc: "http://img.b2bpic.net/free-photo/outdoor-utility-control-box-with-indicator-lights-blue-sky_626616-513.jpg?_wi=1",
+              imageSrc: "http://img.b2bpic.net/free-photo/outdoor-utility-control-box-with-indicator-lights-blue-sky_626616-513.jpg",
               imageAlt: "Home battery storage system",
             },
             {
               id: 3,
               title: "System Optimization",
               description: "Inverters and monitoring systems ensure peak performance and give you real-time insight into your energy production.",
-              imageSrc: "http://img.b2bpic.net/free-photo/top-view-teamwork-environment-project_23-2148894022.jpg?_wi=3",
+              imageSrc: "http://img.b2bpic.net/free-photo/top-view-teamwork-environment-project_23-2148894022.jpg",
               imageAlt: "Solar inverter and monitoring technology",
             },
           ]}
@@ -208,7 +208,7 @@ export default function HomePage() {
               name: "Solar Panels Installation",
               price: "Custom Quote",
               variant: "Professional Installation",
-              imageSrc: "http://img.b2bpic.net/free-vector/colored-smart-house-elements-set_1284-34321.jpg?_wi=2",
+              imageSrc: "http://img.b2bpic.net/free-vector/colored-smart-house-elements-set_1284-34321.jpg",
               imageAlt: "Solar panel installation on residential roof",
             },
             {
@@ -216,7 +216,7 @@ export default function HomePage() {
               name: "Battery Storage Systems",
               price: "Custom Quote",
               variant: "Energy Storage",
-              imageSrc: "http://img.b2bpic.net/free-photo/outdoor-utility-control-box-with-indicator-lights-blue-sky_626616-513.jpg?_wi=2",
+              imageSrc: "http://img.b2bpic.net/free-photo/outdoor-utility-control-box-with-indicator-lights-blue-sky_626616-513.jpg",
               imageAlt: "Home battery storage system",
             },
             {
@@ -224,7 +224,7 @@ export default function HomePage() {
               name: "Solar Maintenance & Repair",
               price: "Service Plans Available",
               variant: "Ongoing Support",
-              imageSrc: "http://img.b2bpic.net/free-photo/young-asian-technician-man-standing-talking-smartphone-long-rows-photovoltaic-solar-panels-copy-space_1150-57278.jpg?_wi=1",
+              imageSrc: "http://img.b2bpic.net/free-photo/young-asian-technician-man-standing-talking-smartphone-long-rows-photovoltaic-solar-panels-copy-space_1150-57278.jpg",
               imageAlt: "Professional solar panel maintenance",
             },
             {
@@ -232,7 +232,7 @@ export default function HomePage() {
               name: "Air Source Heat Pumps",
               price: "Custom Quote",
               variant: "Government Grants Available",
-              imageSrc: "http://img.b2bpic.net/free-photo/aerial-view-salt-salt-farm-ready-harvest-thailand_335224-1050.jpg?_wi=1",
+              imageSrc: "http://img.b2bpic.net/free-photo/aerial-view-salt-salt-farm-ready-harvest-thailand_335224-1050.jpg",
               imageAlt: "Air source heat pump outdoor unit",
             },
             {
@@ -240,7 +240,7 @@ export default function HomePage() {
               name: "Home Energy Assessments",
               price: "Free Consultation",
               variant: "Expert Evaluation",
-              imageSrc: "http://img.b2bpic.net/free-photo/team-architects-looking-construction-site_23-2147702470.jpg?_wi=1",
+              imageSrc: "http://img.b2bpic.net/free-photo/team-architects-looking-construction-site_23-2147702470.jpg",
               imageAlt: "Professional home energy assessment",
             },
             {
@@ -248,7 +248,7 @@ export default function HomePage() {
               name: "Government Grant Advice",
               price: "Included Service",
               variant: "Financial Support",
-              imageSrc: "http://img.b2bpic.net/free-vector/colored-smart-house-elements-set_1284-34321.jpg?_wi=3",
+              imageSrc: "http://img.b2bpic.net/free-vector/colored-smart-house-elements-set_1284-34321.jpg",
               imageAlt: "Government renewable energy grant information",
             },
           ]}
@@ -309,7 +309,7 @@ export default function HomePage() {
               handle: "@mitchellhome",
               testimonial: "Professional installation and great advice. The team assessed our home thoroughly and recommended exactly what we needed. Our energy bills have dropped significantly. Highly recommended.",
               rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/businessman-with-crossed-arms_23-2147996582.jpg?_wi=1",
+              imageSrc: "http://img.b2bpic.net/free-photo/businessman-with-crossed-arms_23-2147996582.jpg",
               imageAlt: "James Mitchell",
             },
             {
@@ -318,7 +318,7 @@ export default function HomePage() {
               handle: "@sarahcampbell",
               testimonial: "Excellent service from start to finish. No pressure selling, just honest advice about what would work best for our home. The installation was clean and professional. Very happy with the results.",
               rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/portrait-young-business-woman-park_1303-28940.jpg?_wi=1",
+              imageSrc: "http://img.b2bpic.net/free-photo/portrait-young-business-woman-park_1303-28940.jpg",
               imageAlt: "Sarah Campbell",
             },
             {
@@ -327,7 +327,7 @@ export default function HomePage() {
               handle: "@davidthomson",
               testimonial: "The survey was thorough and they explained everything clearly. They advised against a larger system, saying our roof wasn't ideal, but instead designed a perfect solution. That kind of honesty is rare.",
               rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/brunette-woman-standing-bricks-wall-smiling-with-happy-face-looking-pointing-side-with-thumb-up_839833-15096.jpg?_wi=1",
+              imageSrc: "http://img.b2bpic.net/free-photo/brunette-woman-standing-bricks-wall-smiling-with-happy-face-looking-pointing-side-with-thumb-up_839833-15096.jpg",
               imageAlt: "David Thomson",
             },
             {
@@ -336,7 +336,7 @@ export default function HomePage() {
               handle: "@emmarobertson",
               testimonial: "Outstanding customer service. They helped us navigate the government grant process and we got our heat pump installed at a fraction of the cost. Genuinely impressive team.",
               rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/portrait-happy-senior-woman-showing-thumbs-up_1262-5331.jpg?_wi=1",
+              imageSrc: "http://img.b2bpic.net/free-photo/portrait-happy-senior-woman-showing-thumbs-up_1262-5331.jpg",
               imageAlt: "Emma Robertson",
             },
             {
@@ -345,7 +345,7 @@ export default function HomePage() {
               handle: "@michaelmacleod",
               testimonial: "Best decision we made for our home. The team was professional, courteous, and delivered everything they promised. Our solar system is performing beautifully in Scotland's climate.",
               rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/excited-handsome-blonde-man-points-camera-with-two-hands-orange_141793-69284.jpg?_wi=1",
+              imageSrc: "http://img.b2bpic.net/free-photo/excited-handsome-blonde-man-points-camera-with-two-hands-orange_141793-69284.jpg",
               imageAlt: "Michael MacLeod",
             },
             {
@@ -354,7 +354,7 @@ export default function HomePage() {
               handle: "@lisaanderson",
               testimonial: "Five years on and still saving money. The maintenance team keeps our system running perfectly. This investment has completely changed how we think about energy.",
               rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/portrait-businesswoman-pointing-finger-left-showing-corporate-banner-logo-standing-brown-suit_1258-118860.jpg?_wi=1",
+              imageSrc: "http://img.b2bpic.net/free-photo/portrait-businesswoman-pointing-finger-left-showing-corporate-banner-logo-standing-brown-suit_1258-118860.jpg",
               imageAlt: "Lisa Anderson",
             },
           ]}
@@ -417,7 +417,7 @@ export default function HomePage() {
           useInvertedBackground={false}
           mediaPosition="right"
           mediaAnimation="slide-up"
-          imageSrc="http://img.b2bpic.net/free-vector/colored-smart-house-elements-set_1284-34321.jpg?_wi=4"
+          imageSrc="http://img.b2bpic.net/free-vector/colored-smart-house-elements-set_1284-34321.jpg"
           imageAlt="Scottish home with solar panels"
           inputs={[
             {
diff --git a/src/app/solar-maintenance/page.tsx b/src/app/solar-maintenance/page.tsx
index 2ada78e..56cdb74 100644
--- a/src/app/solar-maintenance/page.tsx
+++ b/src/app/solar-maintenance/page.tsx
@@ -87,7 +87,7 @@ export default function SolarMaintenancePage() {
         <HeroBillboardCarousel
           title="Professional Solar Panel Maintenance & Repair Services"
           description="Keep your solar system performing at peak efficiency with expert maintenance and rapid repair services across Scotland. Protect your investment and maximize energy production."
-          background="radial-gradient"
+          background={{ variant: "radial-gradient" }}
           tag="Ongoing System Support"
           tagIcon={Zap}
           tagAnimation="slide-up"
@@ -104,7 +104,7 @@ export default function SolarMaintenancePage() {
           buttonAnimation="slide-up"
           mediaItems={[
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/young-asian-technician-man-standing-talking-smartphone-long-rows-photovoltaic-solar-panels-copy-space_1150-57278.jpg?_wi=2",
+              imageSrc: "http://img.b2bpic.net/free-photo/young-asian-technician-man-standing-talking-smartphone-long-rows-photovoltaic-solar-panels-copy-space_1150-57278.jpg",
               imageAlt: "solar panel maintenance inspection",
             },
           ]}
@@ -126,14 +126,14 @@ export default function SolarMaintenancePage() {
               id: 1,
               title: "Performance Optimization",
               description: "Regular cleaning and inspections prevent efficiency loss from dust, debris, and weather exposure. We ensure your system generates maximum energy year-round.",
-              imageSrc: "http://img.b2bpic.net/free-photo/young-asian-technician-man-standing-talking-smartphone-long-rows-photovoltaic-solar-panels-copy-space_1150-57278.jpg?_wi=3",
+              imageSrc: "http://img.b2bpic.net/free-photo/young-asian-technician-man-standing-talking-smartphone-long-rows-photovoltaic-solar-panels-copy-space_1150-57278.jpg",
               imageAlt: "Solar panel cleaning and inspection",
             },
             {
               id: 2,
               title: "Early Fault Detection",
               description: "Professional thermal imaging and electrical testing identify potential issues before they become expensive problems. Preventative maintenance saves money long-term.",
-              imageSrc: "http://img.b2bpic.net/free-photo/young-asian-technician-man-standing-talking-smartphone-long-rows-photovoltaic-solar-panels-copy-space_1150-57278.jpg?_wi=4",
+              imageSrc: "http://img.b2bpic.net/free-photo/young-asian-technician-man-standing-talking-smartphone-long-rows-photovoltaic-solar-panels-copy-space_1150-57278.jpg",
               imageAlt: "Professional solar system diagnostics",
             },
           ]}
@@ -158,7 +158,7 @@ export default function SolarMaintenancePage() {
               name: "Annual Inspection Plan",
               price: "From £199/year",
               variant: "Basic Maintenance",
-              imageSrc: "http://img.b2bpic.net/free-photo/young-asian-technician-man-standing-talking-smartphone-long-rows-photovoltaic-solar-panels-copy-space_1150-57278.jpg?_wi=5",
+              imageSrc: "http://img.b2bpic.net/free-photo/young-asian-technician-man-standing-talking-smartphone-long-rows-photovoltaic-solar-panels-copy-space_1150-57278.jpg",
               imageAlt: "Annual solar panel inspection",
             },
             {
@@ -166,7 +166,7 @@ export default function SolarMaintenancePage() {
               name: "Premium Care Plan",
               price: "From £399/year",
               variant: "Professional Support",
-              imageSrc: "http://img.b2bpic.net/free-photo/young-asian-technician-man-standing-talking-smartphone-long-rows-photovoltaic-solar-panels-copy-space_1150-57278.jpg?_wi=6",
+              imageSrc: "http://img.b2bpic.net/free-photo/young-asian-technician-man-standing-talking-smartphone-long-rows-photovoltaic-solar-panels-copy-space_1150-57278.jpg",
               imageAlt: "Premium solar maintenance service",
             },
             {
@@ -174,7 +174,7 @@ export default function SolarMaintenancePage() {
               name: "Emergency Repair Service",
               price: "24/7 Available",
               variant: "Rapid Response",
-              imageSrc: "http://img.b2bpic.net/free-photo/young-asian-technician-man-standing-talking-smartphone-long-rows-photovoltaic-solar-panels-copy-space_1150-57278.jpg?_wi=7",
+              imageSrc: "http://img.b2bpic.net/free-photo/young-asian-technician-man-standing-talking-smartphone-long-rows-photovoltaic-solar-panels-copy-space_1150-57278.jpg",
               imageAlt: "Emergency solar system repair",
             },
           ]}
@@ -201,7 +201,7 @@ export default function SolarMaintenancePage() {
               handle: "@andrewsinclair",
               testimonial: "Professional maintenance team visits annually. They're thorough, courteous, and provide detailed reports. My system performance has stayed consistently high.",
               rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/businessman-with-crossed-arms_23-2147996582.jpg?_wi=3",
+              imageSrc: "http://img.b2bpic.net/free-photo/businessman-with-crossed-arms_23-2147996582.jpg",
               imageAlt: "Andrew Sinclair",
             },
             {
@@ -210,7 +210,7 @@ export default function SolarMaintenancePage() {
               handle: "@catherinemacleod",
               testimonial: "Had an issue with one inverter and they came out within 48 hours. Diagnosis was accurate and repair was completed quickly. Excellent emergency service.",
               rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/portrait-young-business-woman-park_1303-28940.jpg?_wi=3",
+              imageSrc: "http://img.b2bpic.net/free-photo/portrait-young-business-woman-park_1303-28940.jpg",
               imageAlt: "Catherine MacLeod",
             },
             {
@@ -219,7 +219,7 @@ export default function SolarMaintenancePage() {
               handle: "@peterfleming",
               testimonial: "Great peace of mind with their maintenance plan. The annual visit includes cleaning and diagnostics. System efficiency improved noticeably after their first visit.",
               rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/excited-handsome-blonde-man-points-camera-with-two-hands-orange_141793-69284.jpg?_wi=3",
+              imageSrc: "http://img.b2bpic.net/free-photo/excited-handsome-blonde-man-points-camera-with-two-hands-orange_141793-69284.jpg",
               imageAlt: "Peter Fleming",
             },
           ]}
diff --git a/src/app/solar-panels/page.tsx b/src/app/solar-panels/page.tsx
index 3cf4132..b16887c 100644
--- a/src/app/solar-panels/page.tsx
+++ b/src/app/solar-panels/page.tsx
@@ -86,7 +86,7 @@ export default function SolarPanelsPage() {
         <HeroBillboardCarousel
           title="Professional Solar Panel Installation Across Scotland"
           description="Get a free quote from MCS-approved solar installers. We design bespoke photovoltaic systems tailored to your home, maximizing energy generation in Scotland's climate."
-          background="radial-gradient"
+          background={{ variant: "radial-gradient" }}
           tag="Solar Panels - MCS Certified Installation"
           tagIcon={Sparkles}
           tagAnimation="slide-up"
@@ -97,7 +97,7 @@ export default function SolarPanelsPage() {
           buttonAnimation="slide-up"
           mediaItems={[
             {
-              imageSrc: "http://img.b2bpic.net/free-vector/colored-smart-house-elements-set_1284-34321.jpg?_wi=5",
+              imageSrc: "http://img.b2bpic.net/free-vector/colored-smart-house-elements-set_1284-34321.jpg",
               imageAlt: "Professional solar panel installation on Scottish home",
             },
           ]}
@@ -119,21 +119,21 @@ export default function SolarPanelsPage() {
               id: 1,
               title: "High-Efficiency Panels",
               description: "Latest generation photovoltaic technology rated for Scotland's climate, with guaranteed performance for 25+ years.",
-              imageSrc: "http://img.b2bpic.net/free-vector/colored-smart-house-elements-set_1284-34321.jpg?_wi=6",
+              imageSrc: "http://img.b2bpic.net/free-vector/colored-smart-house-elements-set_1284-34321.jpg",
               imageAlt: "High-efficiency solar panels installation",
             },
             {
               id: 2,
               title: "Real-Time Monitoring",
               description: "Smart inverters and monitoring systems give you complete visibility into your energy production and savings.",
-              imageSrc: "http://img.b2bpic.net/free-photo/top-view-teamwork-environment-project_23-2148894022.jpg?_wi=4",
+              imageSrc: "http://img.b2bpic.net/free-photo/top-view-teamwork-environment-project_23-2148894022.jpg",
               imageAlt: "Solar monitoring dashboard and technology",
             },
             {
               id: 3,
               title: "Battery Integration Ready",
               description: "Your system can be expanded with battery storage later to maximize energy independence and evening usage.",
-              imageSrc: "http://img.b2bpic.net/free-photo/outdoor-utility-control-box-with-indicator-lights-blue-sky_626616-513.jpg?_wi=3",
+              imageSrc: "http://img.b2bpic.net/free-photo/outdoor-utility-control-box-with-indicator-lights-blue-sky_626616-513.jpg",
               imageAlt: "Battery storage integration capability",
             },
           ]}
@@ -158,7 +158,7 @@ export default function SolarPanelsPage() {
               name: "Starter Solar System",
               price: "From £4,500",
               variant: "3-4 kW System",
-              imageSrc: "http://img.b2bpic.net/free-vector/colored-smart-house-elements-set_1284-34321.jpg?_wi=7",
+              imageSrc: "http://img.b2bpic.net/free-vector/colored-smart-house-elements-set_1284-34321.jpg",
               imageAlt: "Starter solar panel system",
             },
             {
@@ -166,7 +166,7 @@ export default function SolarPanelsPage() {
               name: "Standard Solar System",
               price: "From £6,500",
               variant: "5-6 kW System",
-              imageSrc: "http://img.b2bpic.net/free-photo/top-view-teamwork-environment-project_23-2148894022.jpg?_wi=5",
+              imageSrc: "http://img.b2bpic.net/free-photo/top-view-teamwork-environment-project_23-2148894022.jpg",
               imageAlt: "Standard residential solar installation",
             },
             {
@@ -174,7 +174,7 @@ export default function SolarPanelsPage() {
               name: "Premium Solar System",
               price: "From £8,500",
               variant: "7-8 kW + Battery",
-              imageSrc: "http://img.b2bpic.net/free-photo/outdoor-utility-control-box-with-indicator-lights-blue-sky_626616-513.jpg?_wi=4",
+              imageSrc: "http://img.b2bpic.net/free-photo/outdoor-utility-control-box-with-indicator-lights-blue-sky_626616-513.jpg",
               imageAlt: "Premium solar with battery storage",
             },
           ]}