diff --git a/src/app/about-us/page.tsx b/src/app/about-us/page.tsx
index 7bbd077..1bf0bc2 100644
--- a/src/app/about-us/page.tsx
+++ b/src/app/about-us/page.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { ThemeProvider } from "next-themes";
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import { Sparkles, Users, Trophy } from "lucide-react";
 import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
 import SplitAbout from '@/components/sections/about/SplitAbout';
@@ -17,7 +17,6 @@ export default function AboutUsPage() {
 
   return (
     <ThemeProvider
-      attribute="class"
       defaultButtonVariant="hover-magnetic"
       defaultTextAnimation="entrance-slide"
       borderRadius="rounded"
diff --git a/src/app/components/page.tsx b/src/app/components/page.tsx
index b5ea295..2dd16c3 100644
--- a/src/app/components/page.tsx
+++ b/src/app/components/page.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { ThemeProvider } from 'next-themes';
+import { ThemeProvider } from '@/providers/themeProvider/ThemeProvider';
 import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
 import HeroLogoBillboard from '@/components/sections/hero/HeroLogoBillboard';
 import FeatureCardTwentyEight from '@/components/sections/feature/FeatureCardTwentyEight';
@@ -12,11 +12,16 @@ export default function ComponentsPage() {
 
   return (
     <ThemeProvider
-      attribute="class"
-      defaultTheme="system"
-      enableSystem
-      disableTransitionOnChange
-      {...defaultTheme}
+      defaultButtonVariant="hover-magnetic"
+      defaultTextAnimation="entrance-slide"
+      borderRadius="rounded"
+      contentWidth="medium"
+      sizing="medium"
+      background="none"
+      cardStyle="soft-shadow"
+      primaryButtonStyle="gradient"
+      secondaryButtonStyle="glass"
+      headingFontWeight="bold"
     >
       <NavbarLayoutFloatingInline
         navItems={[
diff --git a/src/app/contact/page.tsx b/src/app/contact/page.tsx
index 4acdb19..e29d057 100644
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { ThemeProvider } from "@/components/theme-provider";
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarStyleFullscreen from "@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen";
 import ContactCenter from '@/components/sections/contact/ContactCenter';
 import TeamCardEleven from '@/components/sections/team/TeamCardEleven';
@@ -71,6 +71,7 @@ export default function Contact() {
             termsText="By sending a message, you agree to our Privacy Policy and Terms of Service."
             tagIcon={Mail}
             background={{ variant: "radial-gradient" }}
+            useInvertedBackground={false}
           />
         </div>
         <div id="team-contacts" data-section="team-contacts">
@@ -80,6 +81,7 @@ export default function Contact() {
             groups={[{ id: "1", groupTitle: "Leadership & Support", members: teamMembers }]}
             animationType="slide-up"
             useInvertedBackground={false}
+            textboxLayout="default"
           />
         </div>
         <FooterBase
diff --git a/src/app/page.tsx b/src/app/page.tsx
index ce88ac4..e1271c9 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { ThemeProvider } from "@/components/theme-provider";
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarStyleFullscreen from "@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen";
 import HeroBillboardGallery from "@/components/sections/hero/HeroBillboardGallery";
 import FaqBase from "@/components/sections/faq/FaqBase";
@@ -81,6 +81,8 @@ export default function Home() {
             faqsAnimation="slide-up"
             tag="Support"
             tagIcon={HelpCircle}
+            textboxLayout="default"
+            useInvertedBackground={false}
           />
         </div>
         <FooterBase
diff --git a/src/app/services/page.tsx b/src/app/services/page.tsx
index ce430d5..c9c1ff2 100644
--- a/src/app/services/page.tsx
+++ b/src/app/services/page.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { ThemeProvider } from 'next-themes';
+import { ThemeProvider } from '@/providers/themeProvider/ThemeProvider';
 import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
 import HeroLogoBillboard from '@/components/sections/hero/HeroLogoBillboard';
 import FeatureCardTwentyEight from '@/components/sections/feature/FeatureCardTwentyEight';
@@ -12,11 +12,16 @@ export default function ServicesPage() {
 
   return (
     <ThemeProvider
-      attribute="class"
-      defaultTheme="system"
-      enableSystem
-      disableTransitionOnChange
-      {...defaultTheme}
+      defaultButtonVariant="hover-magnetic"
+      defaultTextAnimation="entrance-slide"
+      borderRadius="rounded"
+      contentWidth="medium"
+      sizing="medium"
+      background="none"
+      cardStyle="soft-shadow"
+      primaryButtonStyle="gradient"
+      secondaryButtonStyle="glass"
+      headingFontWeight="bold"
     >
       <NavbarLayoutFloatingInline
         navItems={[
@@ -72,4 +77,4 @@ export default function ServicesPage() {
       </main>
     </ThemeProvider>
   );
-}
\ No newline at end of file
+}
diff --git a/src/app/tenders-procurement/page.tsx b/src/app/tenders-procurement/page.tsx
index e8919ee..9671c69 100644
--- a/src/app/tenders-procurement/page.tsx
+++ b/src/app/tenders-procurement/page.tsx
@@ -1,10 +1,10 @@
 "use client";
-import { ThemeProvider } from "next-themes";
-import { NavbarLayoutFloatingInline } from '@/components/navbar/NavbarLayoutFloatingInline';
-import { HeroBillboardDashboard } from '@/components/sections/hero/HeroBillboardDashboard';
-import { FeatureCardEight } from '@/components/sections/feature/FeatureCardEight';
-import { FaqSplitMedia } from '@/components/sections/faq/FaqSplitMedia';
-import { FooterBase } from '@/components/sections/footer/FooterBase';
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
+import HeroBillboardDashboard from '@/components/sections/hero/HeroBillboardDashboard';
+import FeatureCardEight from '@/components/sections/feature/FeatureCardEight';
+import FaqSplitMedia from '@/components/sections/faq/FaqSplitMedia';
+import FooterBase from '@/components/sections/footer/FooterBase';
 import { Briefcase, ListTodo, FileText, HelpCircle } from 'lucide-react';
 
 export default function TendersProcurementPage() {