diff --git a/src/app/page.tsx b/src/app/page.tsx
index d0c5443..3fc9f52 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -103,7 +103,7 @@ export default function SitePage() {
           members={[
             {id: '1', name: 'Marcus Richter', role: 'Team Principal', imageSrc: 'https://img.b2bpic.net/free-photo/handsome-man-women-mechanics-autoservice-posing_7502-4436.jpg', imageAlt: 'Portrait of Marcus Richter, Team Principal'},
             {id: '2', name: 'Lena Schmidt', role: 'Chief Aerodynamicist', imageSrc: 'https://img.b2bpic.net/free-photo/top-view-hard-drive-with-blue-light_23-2149413376.jpg', imageAlt: 'Portrait of Lena Schmidt, Chief Aerodynamicist'},
-            {id: '3', name: 'Dr. Klaus Weber', role: 'Head of Powertrain', imageSrc: 'https://img.b2bpic.net/free-photo/young-car-repairman-talking-with-his-coworker-while-checking-engine-performance-with-diagnostic-tools-auto-repair-shop_637285-4277.jpg?_wi=1', imageAlt: 'Portrait of Dr. Klaus Weber, Head of Powertrain'},
+            {id: '3', name: 'Dr. Klaus Weber', role: 'Head of Powertrain', imageSrc: 'https://img.b2bpic.net/free-photo/young-car-repairman-talking-with-his-coworker-while-checking-engine-performance-with-diagnostic-tools-auto-repair-shop_637285-4277.jpg', imageAlt: 'Portrait of Dr. Klaus Weber, Head of Powertrain'},
             {id: '4', name: 'Dr. Anya Sharma', role: 'Lead Race Strategist', imageSrc: 'https://img.b2bpic.net/free-photo/factory-management-industrial-facility-looking-data-mockup-laptop_482257-126905.jpg', imageAlt: 'Portrait of Dr. Anya Sharma, Lead Race Strategist'}
           ]} 
           carouselMode="buttons" 
@@ -121,12 +121,12 @@ export default function SitePage() {
       <div id="testimonials" data-section="testimonials">
         <TestimonialCardTwo 
           testimonials={[
-            {id: '1', name: 'Carlos Sainz', role: 'F1 Driver', testimonial: 'The engineering prowess behind the AUDI F1 car is simply astounding. Every detail is meticulously crafted for peak performance.', imageSrc: 'https://img.b2bpic.net/free-photo/portrait-young-man-with-facial-hair_181624-21795.jpg?_wi=1', imageAlt: 'Portrait of F1 Driver Carlos Sainz'},
-            {id: '2', name: 'Lando Norris', role: 'F1 Driver', testimonial: 'Driving an AUDI F1 machine gives you an unmatched sense of precision and power. It\'s a true masterpiece of engineering.', imageSrc: 'https://img.b2bpic.net/free-photo/portrait-smiling-handsome-stylish-redhead-biker-black-leather-jacket-holds-motorcycle-helmet-posing-studio-isolated-dark-background_613910-19244.jpg?_wi=1', imageAlt: 'Portrait of F1 Driver Lando Norris'},
-            {id: '3', name: 'Max Verstappen', role: 'F1 Driver', testimonial: 'The team\'s dedication to innovation and constant improvement is evident in every race. They build winning cars.', imageSrc: 'https://img.b2bpic.net/free-photo/dirt-bike-rider-with-his-motorcycle-racing-circuits-adventure_23-2151482742.jpg', imageAlt: 'Portrait of F1 Driver Max Verstappen'},
-            {id: '4', name: 'Lewis Hamilton', role: 'F1 Driver', testimonial: 'The reliability and speed of the AUDI F1 powertrain are exceptional. It allows us to push the limits on track.', imageSrc: 'https://img.b2bpic.net/free-photo/portrait-victorious-male-racing-car-pilot_23-2150923101.jpg?_wi=1', imageAlt: 'Portrait of F1 Driver Lewis Hamilton'},
-            {id: '5', name: 'Charles Leclerc', role: 'F1 Driver', testimonial: 'Being part of a team with such a strong engineering backbone provides immense confidence in every corner.', imageSrc: 'https://img.b2bpic.net/free-photo/portrait-young-man-with-facial-hair_181624-21795.jpg?_wi=2', imageAlt: 'Portrait of F1 Driver Charles Leclerc'},
-            {id: '6', name: 'George Russell', role: 'F1 Driver', testimonial: 'The strategic insights and rapid development cycles from the AUDI F1 team are world-class, making a real difference.', imageSrc: 'https://img.b2bpic.net/free-photo/portrait-smiling-handsome-stylish-redhead-biker-black-leather-jacket-holds-motorcycle-helmet-posing-studio-isolated-dark-background_613910-19244.jpg?_wi=2', imageAlt: 'Portrait of F1 Driver George Russell'}
+            {id: '1', name: 'Carlos Sainz', role: 'F1 Driver', testimonial: 'The engineering prowess behind the AUDI F1 car is simply astounding. Every detail is meticulously crafted for peak performance.', imageSrc: 'https://img.b2bpic.net/free-photo/portrait-young-man-with-facial-hair_181624-21795.jpg', imageAlt: 'Portrait of F1 Driver Carlos Sainz'},
+            {id: '2', name: 'Lando Norris', role: 'F1 Driver', testimonial: "Driving an AUDI F1 machine gives you an unmatched sense of precision and power. It's a true masterpiece of engineering.", imageSrc: 'https://img.b2bpic.net/free-photo/portrait-smiling-handsome-stylish-redhead-biker-black-leather-jacket-holds-motorcycle-helmet-posing-studio-isolated-dark-background_613910-19244.jpg', imageAlt: 'Portrait of F1 Driver Lando Norris'},
+            {id: '3', name: 'Max Verstappen', role: 'F1 Driver', testimonial: "The team's dedication to innovation and constant improvement is evident in every race. They build winning cars.", imageSrc: 'https://img.b2bpic.net/free-photo/dirt-bike-rider-with-his-motorcycle-racing-circuits-adventure_23-2151482742.jpg', imageAlt: 'Portrait of F1 Driver Max Verstappen'},
+            {id: '4', name: 'Lewis Hamilton', role: 'F1 Driver', testimonial: 'The reliability and speed of the AUDI F1 powertrain are exceptional. It allows us to push the limits on track.', imageSrc: 'https://img.b2bpic.net/free-photo/portrait-victorious-male-racing-car-pilot_23-2150923101.jpg', imageAlt: 'Portrait of F1 Driver Lewis Hamilton'},
+            {id: '5', name: 'Charles Leclerc', role: 'F1 Driver', testimonial: 'Being part of a team with such a strong engineering backbone provides immense confidence in every corner.', imageSrc: 'https://img.b2bpic.net/free-photo/portrait-young-man-with-facial-hair_181624-21795.jpg', imageAlt: 'Portrait of F1 Driver Charles Leclerc'},
+            {id: '6', name: 'George Russell', role: 'F1 Driver', testimonial: 'The strategic insights and rapid development cycles from the AUDI F1 team are world-class, making a real difference.', imageSrc: 'https://img.b2bpic.net/free-photo/portrait-smiling-handsome-stylish-redhead-biker-black-leather-jacket-holds-motorcycle-helmet-posing-studio-isolated-dark-background_613910-19244.jpg', imageAlt: 'Portrait of F1 Driver George Russell'}
           ]} 
           carouselMode="buttons" 
           uniformGridCustomHeightClasses="min-h-90" 
@@ -143,9 +143,9 @@ export default function SitePage() {
       <div id="blog" data-section="blog">
         <BlogCardThree 
           blogs={[
-            {id: '1', category: 'Race Analysis', title: 'Unpacking the Monaco Grand Prix Strategy', excerpt: 'A deep dive into the strategic decisions that defined our performance in Monaco.', imageSrc: 'https://img.b2bpic.net/free-photo/vertical-shot-two-men-riding-motorcycles_181624-21877.jpg', imageAlt: 'F1 race analysis on a monitor'},
-            {id: '2', category: 'Tech Deep Dive', title: 'The Future of F1 Aerodynamics at Audi', excerpt: 'Exploring the cutting-edge aerodynamic innovations shaping our next generation cars.', imageSrc: 'https://img.b2bpic.net/free-photo/close-up-astronaut-pressing-wrist-device-emergency-red-lighting-confirm-alert_482257-132555.jpg', imageAlt: 'Close up of F1 car aerodynamic components'},
-            {id: '3', category: 'Team Spotlight', title: 'Behind the Scenes: A Day with Our Pit Crew', excerpt: 'An exclusive look into the high-pressure, precision world of the AUDI F1 pit crew.', imageSrc: 'https://img.b2bpic.net/free-photo/portrait-victorious-male-racing-car-pilot_23-2150923101.jpg?_wi=2', imageAlt: 'F1 pit crew in action during a race'}
+            {id: '1', category: 'Race Analysis', title: 'Unpacking the Monaco Grand Prix Strategy', excerpt: 'A deep dive into the strategic decisions that defined our performance in Monaco.', imageSrc: 'https://img.b2bpic.net/free-photo/vertical-shot-two-men-riding-motorcycles_181624-21877.jpg', imageAlt: 'F1 race analysis on a monitor', authorName: 'AUDI F1 Team', authorAvatar: '/placeholders/avatar.webp', date: 'October 26, 2024'},
+            {id: '2', category: 'Tech Deep Dive', title: 'The Future of F1 Aerodynamics at Audi', excerpt: 'Exploring the cutting-edge aerodynamic innovations shaping our next generation cars.', imageSrc: 'https://img.b2bpic.net/free-photo/close-up-astronaut-pressing-wrist-device-emergency-red-lighting-confirm-alert_482257-132555.jpg', imageAlt: 'Close up of F1 car aerodynamic components', authorName: 'AUDI F1 Team', authorAvatar: '/placeholders/avatar.webp', date: 'October 22, 2024'},
+            {id: '3', category: 'Team Spotlight', title: 'Behind the Scenes: A Day with Our Pit Crew', excerpt: 'An exclusive look into the high-pressure, precision world of the AUDI F1 pit crew.', imageSrc: 'https://img.b2bpic.net/free-photo/portrait-victorious-male-racing-car-pilot_23-2150923101.jpg', imageAlt: 'F1 pit crew in action during a race', authorName: 'AUDI F1 Team', authorAvatar: '/placeholders/avatar.webp', date: 'October 18, 2024'}
           ]} 
           carouselMode="buttons" 
           uniformGridCustomHeightClasses="min-h-[500px]" 
@@ -181,7 +181,7 @@ export default function SitePage() {
           tagIcon={Mail}
           background={{variant: 'sparkles-gradient'}} 
           useInvertedBackground={false} 
-          imageSrc="https://img.b2bpic.net/free-photo/young-car-repairman-talking-with-his-coworker-while-checking-engine-performance-with-diagnostic-tools-auto-repair-shop_637285-4277.jpg?_wi=2"
+          imageSrc="https://img.b2bpic.net/free-photo/young-car-repairman-talking-with-his-coworker-while-checking-engine-performance-with-diagnostic-tools-auto-repair-shop_637285-4277.jpg"
           videoAriaLabel="F1 pit stop in action"
           mediaAnimation="slide-up" 
           mediaPosition="right" 
diff --git a/src/app/shop/[id]/page.tsx b/src/app/shop/[id]/page.tsx
index b382734..6e4ded5 100644
--- a/src/app/shop/[id]/page.tsx
+++ b/src/app/shop/[id]/page.tsx
@@ -80,16 +80,12 @@ function ProductPageContent({ params }: ProductPageProps) {
         { name: "Shop", id: "/shop" },
     ];
 
-    const iconMap = { Twitter, Instagram, Youtube, Facebook };
     const socialLinks = [
-        { icon: "Twitter", href: "https://twitter.com/audisport", ariaLabel: "Twitter" },
-        { icon: "Instagram", href: "https://www.instagram.com/audisport", ariaLabel: "Instagram" },
-        { icon: "Youtube", href: "https://www.youtube.com/audisport", ariaLabel: "YouTube" },
-        { icon: "Facebook", href: "https://www.facebook.com/audisport", ariaLabel: "Facebook" }
-    ].map(link => ({ ...link, icon: iconMap[link.icon] }));
-
-    const themeProviderProps = {
-        defaultButtonVariant: "directional-hover",        defaultTextAnimation: "background-highlight",        borderRadius: "soft",        contentWidth: "compact",        sizing: "mediumLarge",        background: "aurora",        cardStyle: "layered-gradient",        primaryButtonStyle: "double-inset",        secondaryButtonStyle: "solid",        headingFontWeight: "normal"};
+        { icon: Twitter, href: "https://twitter.com/audisport", ariaLabel: "Twitter" },
+        { icon: Instagram, href: "https://www.instagram.com/audisport", ariaLabel: "Instagram" },
+        { icon: Youtube, href: "https://www.youtube.com/audisport", ariaLabel: "YouTube" },
+        { icon: Facebook, href: "https://www.facebook.com/audisport", ariaLabel: "Facebook" }
+    ];
 
     const navbarProps = {
         navItems: navItems,
@@ -102,7 +98,18 @@ function ProductPageContent({ params }: ProductPageProps) {
 
     if (isLoading) {
         return (
-            <ThemeProvider {...themeProviderProps}>
+            <ThemeProvider
+                defaultButtonVariant="directional-hover"
+                defaultTextAnimation="background-highlight"
+                borderRadius="soft"
+                contentWidth="compact"
+                sizing="mediumLarge"
+                background="aurora"
+                cardStyle="layered-gradient"
+                primaryButtonStyle="double-inset"
+                secondaryButtonStyle="solid"
+                headingFontWeight="normal"
+            >
                 <ReactLenis root>
                     <div id="navbar" data-section="navbar">
                         <NavbarStyleApple {...navbarProps} />
@@ -120,7 +127,18 @@ function ProductPageContent({ params }: ProductPageProps) {
 
     if (!product) {
         return (
-            <ThemeProvider {...themeProviderProps}>
+            <ThemeProvider
+                defaultButtonVariant="directional-hover"
+                defaultTextAnimation="background-highlight"
+                borderRadius="soft"
+                contentWidth="compact"
+                sizing="mediumLarge"
+                background="aurora"
+                cardStyle="layered-gradient"
+                primaryButtonStyle="double-inset"
+                secondaryButtonStyle="solid"
+                headingFontWeight="normal"
+            >
                 <ReactLenis root>
                     <div id="navbar" data-section="navbar">
                         <NavbarStyleApple {...navbarProps} />
@@ -145,7 +163,18 @@ function ProductPageContent({ params }: ProductPageProps) {
     }
 
     return (
-        <ThemeProvider {...themeProviderProps}>
+        <ThemeProvider
+            defaultButtonVariant="directional-hover"
+            defaultTextAnimation="background-highlight"
+            borderRadius="soft"
+            contentWidth="compact"
+            sizing="mediumLarge"
+            background="aurora"
+            cardStyle="layered-gradient"
+            primaryButtonStyle="double-inset"
+            secondaryButtonStyle="solid"
+            headingFontWeight="normal"
+        >
             <ReactLenis root>
                 <div id="navbar" data-section="navbar">
                     <NavbarStyleApple {...navbarProps} />
diff --git a/src/app/shop/page.tsx b/src/app/shop/page.tsx
index 7e6b0cb..ed69e01 100644
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -43,13 +43,12 @@ function ShopPageContent() {
         { name: "Shop", id: "/shop" },
     ];
 
-    const iconMap = { Twitter, Instagram, Youtube, Facebook };
     const socialLinks = [
-        { icon: "Twitter", href: "https://twitter.com/audisport", ariaLabel: "Twitter" },
-        { icon: "Instagram", href: "https://www.instagram.com/audisport", ariaLabel: "Instagram" },
-        { icon: "Youtube", href: "https://www.youtube.com/audisport", ariaLabel: "YouTube" },
-        { icon: "Facebook", href: "https://www.facebook.com/audisport", ariaLabel: "Facebook" }
-    ].map(link => ({ ...link, icon: iconMap[link.icon] }));
+        { icon: Twitter, href: "https://twitter.com/audisport", ariaLabel: "Twitter" },
+        { icon: Instagram, href: "https://www.instagram.com/audisport", ariaLabel: "Instagram" },
+        { icon: Youtube, href: "https://www.youtube.com/audisport", ariaLabel: "YouTube" },
+        { icon: Facebook, href: "https://www.facebook.com/audisport", ariaLabel: "Facebook" }
+    ];
 
 
     return (