diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index 7a4a824..1d6a967 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { ThemeProvider } from "@/components/theme/ThemeProvider";
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarStyleFullscreen from "@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen";
 import TextAbout from "@/components/sections/about/TextAbout";
 import FeatureCardTwentyFour from "@/components/sections/feature/FeatureCardTwentyFour";
@@ -44,12 +44,14 @@ export default function AboutPage() {
       secondaryButtonStyle="glass"
       headingFontWeight="semibold"
     >
-      <NavbarStyleFullscreen
-        navItems={navItems}
-        brandName="D-Max Zwembaden"
-        bottomLeftText="Global Community"
-        bottomRightText="hello@example.com"
-      />
+      <div id="nav" data-section="nav">
+        <NavbarStyleFullscreen
+          navItems={navItems}
+          brandName="D-Max Zwembaden"
+          bottomLeftText="Global Community"
+          bottomRightText="hello@example.com"
+        />
+      </div>
 
       <div id="about" data-section="about" className="pt-32">
         <TextAbout
diff --git a/src/app/contact/page.tsx b/src/app/contact/page.tsx
index 5820c9b..a89714f 100644
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { ThemeProvider } from "@/context/ThemeContext";
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay";
 import ContactFaq from "@/components/sections/contact/ContactFaq";
 import { Phone, Mail, MapPin, Clock } from "lucide-react";
@@ -38,11 +38,13 @@ export default function ContactPage() {
       secondaryButtonStyle="glass"
       headingFontWeight="bold"
     >
-      <NavbarLayoutFloatingOverlay
-        navItems={navItems}
-        brandName="D-Max Zwembaden"
-        button={navButton}
-      />
+      <div id="nav" data-section="nav">
+        <NavbarLayoutFloatingOverlay
+          navItems={navItems}
+          brandName="D-Max Zwembaden"
+          button={navButton}
+        />
+      </div>
       <div className="pt-20">
         <h1 className="text-center text-4xl font-bold mb-4">Neem Contact Met Ons Op</h1>
         <p className="text-center text-lg mb-12 max-w-2xl mx-auto">We helpen graag bij vragen over uw droomzwembad. Vul het contactformulier in of bel ons rechtstreeks.</p>
diff --git a/src/app/page.tsx b/src/app/page.tsx
index b91bfe4..e8c45b7 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,8 +1,7 @@
 "use client";
 
-import { ThemeProvider } from "@/context/ThemeContext";
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay";
-import Tag from "@/components/tag/Tag";
 
 const navItems = [
   { name: "Home", id: "/" },
@@ -26,12 +25,13 @@ export default function Home() {
       secondaryButtonStyle="glass"
       headingFontWeight="bold"
     >
-      <NavbarLayoutFloatingOverlay
-        navItems={navItems}
-        brandName="D-Max Zwembaden"
-        button={navButton}
-      />
-      <Tag text="Welcome to D-Max Zwembaden" />
+      <div id="nav" data-section="nav">
+        <NavbarLayoutFloatingOverlay
+          navItems={navItems}
+          brandName="D-Max Zwembaden"
+          button={navButton}
+        />
+      </div>
     </ThemeProvider>
   );
 }
\ No newline at end of file
diff --git a/src/app/realisaties/page.tsx b/src/app/realisaties/page.tsx
index 45dfe32..fa18539 100644
--- a/src/app/realisaties/page.tsx
+++ b/src/app/realisaties/page.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { ThemeProvider } from "@/components/theme/ThemeProvider";
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarStyleApple from "@/components/navbar/NavbarStyleApple/NavbarStyleApple";
 import ProductCardFour from "@/components/sections/product/ProductCardFour";
 import { ReactLenis } from "lenis/react";
@@ -37,7 +37,9 @@ export default function Realisaties() {
       headingFontWeight="bold"
     >
       <ReactLenis root>
-        <NavbarStyleApple navItems={navItems} brandName="D-Max" />
+        <div id="nav" data-section="nav">
+          <NavbarStyleApple navItems={navItems} brandName="D-Max" />
+        </div>
         <div className="pt-20">
           <div id="realisaties" data-section="realisaties">
             <ProductCardFour
diff --git a/src/app/reviews/page.tsx b/src/app/reviews/page.tsx
index 54e2b7a..6bdb145 100644
--- a/src/app/reviews/page.tsx
+++ b/src/app/reviews/page.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { ThemeProvider } from "@/components/theme/ThemeProvider";
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarStyleApple from "@/components/navbar/NavbarStyleApple/NavbarStyleApple";
 import TestimonialCardTwelve from "@/components/sections/testimonial/TestimonialCardTwelve";
 import { ReactLenis } from "lenis/react";
@@ -41,7 +41,9 @@ export default function Reviews() {
       headingFontWeight="bold"
     >
       <ReactLenis root>
-        <NavbarStyleApple navItems={navItems} brandName="D-Max" />
+        <div id="nav" data-section="nav">
+          <NavbarStyleApple navItems={navItems} brandName="D-Max" />
+        </div>
         <div className="pt-20">
           <div id="reviews" data-section="reviews">
             <TestimonialCardTwelve
diff --git a/src/app/services/page.tsx b/src/app/services/page.tsx
index 50d2374..d75cf75 100644
--- a/src/app/services/page.tsx
+++ b/src/app/services/page.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { ThemeProvider } from "@/components/theme/ThemeProvider";
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarStyleFullscreen from "@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen";
 import TextAbout from "@/components/sections/about/TextAbout";
 import FeatureCardTwentyFour from "@/components/sections/feature/FeatureCardTwentyFour";
@@ -44,12 +44,14 @@ export default function ServicesPage() {
       secondaryButtonStyle="glass"
       headingFontWeight="semibold"
     >
-      <NavbarStyleFullscreen
-        navItems={navItems}
-        brandName="D-Max Zwembaden"
-        bottomLeftText="Global Community"
-        bottomRightText="hello@example.com"
-      />
+      <div id="nav" data-section="nav">
+        <NavbarStyleFullscreen
+          navItems={navItems}
+          brandName="D-Max Zwembaden"
+          bottomLeftText="Global Community"
+          bottomRightText="hello@example.com"
+        />
+      </div>
 
       <div id="services" data-section="services" className="pt-32">
         <TextAbout