diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index 851d38f..9ce4ad1 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -7,18 +7,7 @@ import FooterBase from '@/components/sections/footer/FooterBase';
 
 export default function AboutPage() {
   return (
-    <ThemeProvider
-        defaultButtonVariant="text-stagger"
-        defaultTextAnimation="entrance-slide"
-        borderRadius="rounded"
-        contentWidth="medium"
-        sizing="mediumLargeSizeLargeTitles"
-        background="circleGradient"
-        cardStyle="glass-elevated"
-        primaryButtonStyle="gradient"
-        secondaryButtonStyle="glass"
-        headingFontWeight="normal"
-    >
+    <ThemeProvider>
       <div id="nav" data-section="nav">
           <NavbarStyleFullscreen
             navItems={[
diff --git a/src/app/contact/page.tsx b/src/app/contact/page.tsx
index e978b77..57e752a 100644
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -1,133 +1,58 @@
 "use client";
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import ReactLenis from "lenis/react";
+import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
 import ContactSplit from '@/components/sections/contact/ContactSplit';
 import FeatureCardTwentySeven from '@/components/sections/feature/FeatureCardTwentySeven';
 import FooterBase from '@/components/sections/footer/FooterBase';
-import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
 
-export default function LandingPage() {
+export default function ContactPage() {
   return (
-    <ThemeProvider
-        defaultButtonVariant="text-stagger"
-        defaultTextAnimation="entrance-slide"
-        borderRadius="rounded"
-        contentWidth="medium"
-        sizing="mediumLargeSizeLargeTitles"
-        background="circleGradient"
-        cardStyle="gradient-bordered"
-        primaryButtonStyle="shadow"
-        secondaryButtonStyle="layered"
-        headingFontWeight="bold"
-    >
-      <ReactLenis root>
-  <div id="nav" data-section="nav">
-      <NavbarStyleFullscreen
-      navItems={[
-        {
-          name: "Home",
-          id: "/",
-        },
-        {
-          name: "Services",
-          id: "/services",
-        },
-        {
-          name: "About",
-          id: "/about",
-        },
-        {
-          name: "Contact",
-          id: "/contact",
-        },
-      ]}
-      brandName="Rocky's Plumbing"
-    />
-  </div>
-
-  <div id="contact" data-section="contact">
-      <ContactSplit
-      useInvertedBackground={false}
-      background={{
-        variant: "plain",
-      }}
-      tag="Get in Touch"
-      title="How Can We Help You Today?"
-      description="Reach out to schedule your service or consultation."
-      imageSrc="http://img.b2bpic.net/free-photo/customer-service-female-employee-with-headset_53876-111344.jpg"
-      mediaAnimation="none"
-    />
-  </div>
-
-  <div id="feature" data-section="feature">
-      <FeatureCardTwentySeven
-      animationType="slide-up"
-      textboxLayout="default"
-      useInvertedBackground={false}
-      title="Direct Contact"
-      description="We are available via phone and email."
-      features={[
-        {
-          id: "c1",
-          title: "Phone Support",
-          descriptions: [
-            "Immediate assistance.",
-            "Live dispatcher.",
-          ],
-          imageSrc: "http://img.b2bpic.net/free-photo/front-view-happy-man-showing-approval_23-2148230800.jpg",
-        },
-        {
-          id: "c2",
-          title: "Visit Us",
-          descriptions: [
-            "Service centers available.",
-            "On-site support.",
-          ],
-          imageSrc: "http://img.b2bpic.net/free-photo/portrait-two-young-smiling-multinational-businessmen-sitting-table-happily-discussing-new-project-while-working-together-office-isolated_574295-454.jpg",
-        },
-      ]}
-    />
-  </div>
-
-  <div id="footer" data-section="footer">
-      <FooterBase
-      columns={[
-        {
-          title: "Company",
-          items: [
-            {
-              label: "About",
-              href: "/about",
-            },
-            {
-              label: "Services",
-              href: "/services",
-            },
-            {
-              label: "Contact",
-              href: "/contact",
-            },
-          ],
-        },
-        {
-          title: "Legal",
-          items: [
-            {
-              label: "Privacy Policy",
-              href: "#",
-            },
-            {
-              label: "Terms of Service",
-              href: "#",
-            },
-          ],
-        },
-      ]}
-      logoText="Rocky's Plumbing"
-    />
-  </div>
-      </ReactLenis>
+    <ThemeProvider>
+      <div id="nav" data-section="nav">
+          <NavbarStyleFullscreen
+            navItems={[
+              { name: "Home", id: "/" },
+              { name: "About", id: "/about" },
+              { name: "Services", id: "/services" },
+              { name: "Contact", id: "/contact" }
+            ]}
+            brandName="Rocky's Plumbing"
+          />
+      </div>
+      <div id="contact" data-section="contact">
+        <ContactSplit
+          useInvertedBackground={false}
+          background={{ variant: "plain" }}
+          tag="Get in Touch"
+          title="How Can We Help You Today?"
+          description="Reach out to schedule your service or consultation."
+          imageSrc="http://img.b2bpic.net/free-photo/customer-service-female-employee-with-headset_53876-111344.jpg"
+          mediaAnimation="none"
+        />
+      </div>
+      <div id="feature" data-section="feature">
+        <FeatureCardTwentySeven
+          animationType="slide-up"
+          textboxLayout="default"
+          useInvertedBackground={false}
+          title="Direct Contact"
+          description="We are available via phone and email."
+          features={[
+            { id: "c1", title: "Phone Support", descriptions: ["Immediate assistance.", "Live dispatcher."], imageSrc: "http://img.b2bpic.net/free-photo/front-view-happy-man-showing-approval_23-2148230800.jpg" },
+            { id: "c2", title: "Visit Us", descriptions: ["Service centers available.", "On-site support."], imageSrc: "http://img.b2bpic.net/free-photo/portrait-two-young-smiling-multinational-businessmen-sitting-table-happily-discussing-new-project-while-working-together-office-isolated_574295-454.jpg" }
+          ]}
+        />
+      </div>
+      <div id="footer" data-section="footer">
+        <FooterBase
+          logoText="Rocky's Plumbing"
+          columns={[
+            { title: "Company", items: [ { label: "Home", href: "/" }, { label: "About", href: "/about" }, { label: "Services", href: "/services" } ] },
+            { title: "Legal", items: [ { label: "Privacy Policy", href: "#" }, { label: "Terms of Service", href: "#" } ] }
+          ]}
+        />
+      </div>
     </ThemeProvider>
   );
 }
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 998aa32..ca65e89 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -2,28 +2,17 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import ContactSplit from '@/components/sections/contact/ContactSplit';
-import FeatureCardTwentySeven from '@/components/sections/feature/FeatureCardTwentySeven';
-import FooterBase from '@/components/sections/footer/FooterBase';
-import HeroLogo from '@/components/sections/hero/HeroLogo';
 import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
+import HeroLogo from '@/components/sections/hero/HeroLogo';
+import FeatureCardTwentySeven from '@/components/sections/feature/FeatureCardTwentySeven';
 import ProductCardTwo from '@/components/sections/product/ProductCardTwo';
 import TestimonialCardOne from '@/components/sections/testimonial/TestimonialCardOne';
+import ContactSplit from '@/components/sections/contact/ContactSplit';
+import FooterBase from '@/components/sections/footer/FooterBase';
 
 export default function LandingPage() {
   return (
-    <ThemeProvider
-        defaultButtonVariant="text-stagger"
-        defaultTextAnimation="entrance-slide"
-        borderRadius="rounded"
-        contentWidth="medium"
-        sizing="mediumLargeSizeLargeTitles"
-        background="circleGradient"
-        cardStyle="glass-elevated"
-        primaryButtonStyle="gradient"
-        secondaryButtonStyle="glass"
-        headingFontWeight="normal"
-    >
+    <ThemeProvider>
       <ReactLenis root>
         <div id="nav" data-section="nav">
           <NavbarStyleFullscreen
@@ -36,7 +25,6 @@ export default function LandingPage() {
             brandName="Rocky's Plumbing"
           />
         </div>
-
         <div id="hero" data-section="hero">
           <HeroLogo
             logoText="Plumbing Done Right — The First Time."
@@ -45,7 +33,6 @@ export default function LandingPage() {
             imageSrc="http://img.b2bpic.net/free-photo/sanitary-technician-gesturing-thumb-up_23-2147772204.jpg"
           />
         </div>
-
         <div id="why-us" data-section="why-us">
           <FeatureCardTwentySeven
             animationType="slide-up"
@@ -60,7 +47,6 @@ export default function LandingPage() {
             ]}
           />
         </div>
-
         <div id="services" data-section="services">
           <ProductCardTwo
             animationType="slide-up"
@@ -79,7 +65,6 @@ export default function LandingPage() {
             ]}
           />
         </div>
-
         <div id="testimonials" data-section="testimonials">
           <TestimonialCardOne
             textboxLayout="default"
@@ -97,7 +82,6 @@ export default function LandingPage() {
             ]}
           />
         </div>
-
         <div id="urgency" data-section="urgency">
           <ContactSplit
             useInvertedBackground={true}
@@ -109,7 +93,6 @@ export default function LandingPage() {
             imageSrc="http://img.b2bpic.net/free-photo/plumbing-professional-doing-his-job_23-2150721575.jpg"
           />
         </div>
-
         <div id="footer" data-section="footer">
           <FooterBase
             logoText="Rocky's Plumbing"
diff --git a/src/app/services/page.tsx b/src/app/services/page.tsx
index 151fa42..4360d58 100644
--- a/src/app/services/page.tsx
+++ b/src/app/services/page.tsx
@@ -7,18 +7,7 @@ import FooterBase from '@/components/sections/footer/FooterBase';
 
 export default function ServicesPage() {
   return (
-    <ThemeProvider
-        defaultButtonVariant="text-stagger"
-        defaultTextAnimation="entrance-slide"
-        borderRadius="rounded"
-        contentWidth="medium"
-        sizing="mediumLargeSizeLargeTitles"
-        background="circleGradient"
-        cardStyle="glass-elevated"
-        primaryButtonStyle="gradient"
-        secondaryButtonStyle="glass"
-        headingFontWeight="normal"
-    >
+    <ThemeProvider>
       <div id="nav" data-section="nav">
           <NavbarStyleFullscreen
             navItems={[