diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index 2319cb7..16da821 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 NavbarStyleApple from "@/components/navbar/NavbarStyleApple/NavbarStyleApple";
 import InlineImageSplitTextAbout from "@/components/sections/about/InlineImageSplitTextAbout";
 import TeamCardTen from "@/components/sections/team/TeamCardTen";
diff --git a/src/app/booking/page.tsx b/src/app/booking/page.tsx
index 0a06c4a..6c47241 100644
--- a/src/app/booking/page.tsx
+++ b/src/app/booking/page.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { useState } from "react";
-import { ThemeProvider } from "@/components/theme/ThemeProvider";
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarStyleApple from "@/components/navbar/NavbarStyleApple/NavbarStyleApple";
 import ContactCenter from "@/components/sections/contact/ContactCenter";
 import Textarea from "@/components/form/Textarea";
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 72144dd..c7c55d1 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,8 +1,6 @@
 import type { Metadata } from "next";
 import { Inter_Tight } from "next/font/google";
 import "./globals.css";
-import ServiceWrapper from "@/components/serviceWrapper/ServiceWrapper";
-import { Tag } from "@/components/tag/Tag";
 
 const interTight = Inter_Tight({
   variable: "--font-inter-tight",  subsets: ["latin"],
@@ -20,10 +18,7 @@ export default function RootLayout({
   return (
     <html lang="en" suppressHydrationWarning>
       <body className={`${interTight.variable} antialiased`}>
-        <ServiceWrapper>
-          <Tag />
-          {children}
-        </ServiceWrapper>
+        {children}
         <script
           async
           src="https://cdn.jsdelivr.net/npm/gsap@3.12.2/dist/gsap.min.js"
diff --git a/src/app/page.tsx b/src/app/page.tsx
index b2fda83..6450aa6 100644
--- a/src/app/page.tsx
+++ b/src/app/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";
 
 export default function Home() {
diff --git a/src/app/portfolio/page.tsx b/src/app/portfolio/page.tsx
index 08c9e45..5f08ab7 100644
--- a/src/app/portfolio/page.tsx
+++ b/src/app/portfolio/page.tsx
@@ -1,76 +1,43 @@
-'use client';
+"use client";
 
-import { ThemeProvider } from '@/components/providers/ThemeProvider';
-import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
-import HeroBillboardScroll from '@/components/sections/hero/HeroBillboardScroll';
-import ProductCardOne from '@/components/sections/product/ProductCardOne';
-import TestimonialCardTwo from '@/components/sections/testimonial/TestimonialCardTwo';
-import FooterBase from '@/components/sections/footer/FooterBase';
-import { ServiceWrapper, Tag } from '@/components/ui';
-import { Quote } from 'lucide-react';
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import NavbarStyleFullscreen from "@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen";
+import HeroBillboardScroll from "@/components/sections/hero/HeroBillboardScroll";
+import ProductCardOne from "@/components/sections/product/ProductCardOne";
+import TestimonialCardTwo from "@/components/sections/testimonial/TestimonialCardTwo";
+import FooterBase from "@/components/sections/footer/FooterBase";
+import { Quote } from "lucide-react";
 
 const navItems = [
-  { name: 'Home', id: '/' },
-  { name: 'Portfolio', id: '/portfolio' },
-  { name: 'About', id: '#about' },
-  { name: 'Contact', id: '#contact' },
+  { name: "Home", id: "/" },
+  { name: "Portfolio", id: "/portfolio" },
+  { name: "About", id: "#about" },
+  { name: "Contact", id: "#contact" },
 ];
 
 const portfolioProjects = [
   {
-    id: '1',
-    name: 'E-commerce Platform',
-    price: '$15,000',
-    imageSrc: '/placeholders/placeholder-16-9.svg',
-    imageAlt: 'E-commerce Platform Project',
-  },
+    id: "1",    name: "E-commerce Platform",    price: "$15,000",    imageSrc: "/placeholders/placeholder-16-9.svg",    imageAlt: "E-commerce Platform Project"},
   {
-    id: '2',
-    name: 'Mobile App Design',
-    price: '$12,000',
-    imageSrc: '/placeholders/placeholder-16-9.svg',
-    imageAlt: 'Mobile App Design Project',
-  },
+    id: "2",    name: "Mobile App Design",    price: "$12,000",    imageSrc: "/placeholders/placeholder-16-9.svg",    imageAlt: "Mobile App Design Project"},
   {
-    id: '3',
-    name: 'Brand Identity',
-    price: '$8,000',
-    imageSrc: '/placeholders/placeholder-16-9.svg',
-    imageAlt: 'Brand Identity Project',
-  },
+    id: "3",    name: "Brand Identity",    price: "$8,000",    imageSrc: "/placeholders/placeholder-16-9.svg",    imageAlt: "Brand Identity Project"},
   {
-    id: '4',
-    name: 'Web Redesign',
-    price: '$10,000',
-    imageSrc: '/placeholders/placeholder-16-9.svg',
-    imageAlt: 'Web Redesign Project',
-  },
+    id: "4",    name: "Web Redesign",    price: "$10,000",    imageSrc: "/placeholders/placeholder-16-9.svg",    imageAlt: "Web Redesign Project"},
 ];
 
 const testimonials = [
   {
-    id: '1',
-    name: 'Sarah Johnson',
-    role: 'CEO at Tech Startup',
-    testimonial:
-      'Outstanding work! The team delivered exactly what we envisioned. Their attention to detail and professionalism was exceptional.',
-    icon: Quote,
+    id: "1",    name: "Sarah Johnson",    role: "CEO at Tech Startup",    testimonial:
+      "Outstanding work! The team delivered exactly what we envisioned. Their attention to detail and professionalism was exceptional.",    icon: Quote,
   },
   {
-    id: '2',
-    name: 'Michael Chen',
-    role: 'Marketing Director',
-    testimonial:
-      'Fantastic collaboration from start to finish. The project exceeded our expectations and delivered measurable results.',
-    icon: Quote,
+    id: "2",    name: "Michael Chen",    role: "Marketing Director",    testimonial:
+      "Fantastic collaboration from start to finish. The project exceeded our expectations and delivered measurable results.",    icon: Quote,
   },
   {
-    id: '3',
-    name: 'Emily Rodriguez',
-    role: 'Product Manager',
-    testimonial:
-      'Incredible attention to user experience. The designs are not only beautiful but highly functional and intuitive.',
-    icon: Quote,
+    id: "3",    name: "Emily Rodriguez",    role: "Product Manager",    testimonial:
+      "Incredible attention to user experience. The designs are not only beautiful but highly functional and intuitive.",    icon: Quote,
   },
 ];
 
@@ -88,71 +55,67 @@ export default function Portfolio() {
       secondaryButtonStyle="glass"
       headingFontWeight="bold"
     >
-      <ServiceWrapper>
-        <NavbarStyleFullscreen
-          navItems={navItems}
-          brandName="Webild"
-          bottomLeftText="Global Community"
-          bottomRightText="hello@example.com"
-        />
-        <div id="hero" data-section="hero">
-          <HeroBillboardScroll
-            title="Our Portfolio"
-            description="Showcase of our best work and successful projects"
-            tag="Gallery"
-            background={{ variant: 'plain' }}
-            imageSrc="/placeholders/placeholder-16-9.svg"
-            imageAlt="Portfolio showcase"
-            buttons={[
-              { text: 'View All Work', href: '#portfolio-gallery' },
-              { text: 'Get Started', href: '#contact' },
-            ]}
-          />
-        </div>
-        <div id="portfolio-gallery" data-section="portfolio-gallery" className="py-24">
-          <ProductCardOne
-            title="Portfolio Gallery"
-            description="Explore our collection of completed projects and creative work"
-            tag="Featured Projects"
-            products={portfolioProjects}
-            gridVariant="uniform-all-items-equal"
-            animationType="slide-up"
-            textboxLayout="default"
-            useInvertedBackground={false}
-          />
-        </div>
-        <div id="testimonials" data-section="testimonials" className="py-24">
-          <TestimonialCardTwo
-            title="What Our Clients Say"
-            description="Real feedback from satisfied clients and partners"
-            tag="Testimonials"
-            testimonials={testimonials}
-            animationType="slide-up"
-            textboxLayout="default"
-            useInvertedBackground={false}
-          />
-        </div>
-        <FooterBase
-          logoText="Webild"
-          columns={[
-            {
-              title: 'Product',
-              items: [
-                { label: 'Features', href: '#features' },
-                { label: 'Pricing', href: '#pricing' },
-              ],
-            },
-            {
-              title: 'Company',
-              items: [
-                { label: 'About', href: '#about' },
-                { label: 'Contact', href: '#contact' },
-              ],
-            },
+      <NavbarStyleFullscreen
+        navItems={navItems}
+        brandName="Webild"
+        bottomLeftText="Global Community"
+        bottomRightText="hello@example.com"
+      />
+      <div id="hero" data-section="hero">
+        <HeroBillboardScroll
+          title="Our Portfolio"
+          description="Showcase of our best work and successful projects"
+          tag="Gallery"
+          background={{ variant: "plain" }}
+          imageSrc="/placeholders/placeholder-16-9.svg"
+          imageAlt="Portfolio showcase"
+          buttons={[
+            { text: "View All Work", href: "#portfolio-gallery" },
+            { text: "Get Started", href: "#contact" },
           ]}
-          copyrightText="© 2025 | Webild"
         />
-      </ServiceWrapper>
+      </div>
+      <div id="portfolio-gallery" data-section="portfolio-gallery" className="py-24">
+        <ProductCardOne
+          title="Portfolio Gallery"
+          description="Explore our collection of completed projects and creative work"
+          tag="Featured Projects"
+          products={portfolioProjects}
+          gridVariant="uniform-all-items-equal"
+          animationType="slide-up"
+          textboxLayout="default"
+          useInvertedBackground={false}
+        />
+      </div>
+      <div id="testimonials" data-section="testimonials" className="py-24">
+        <TestimonialCardTwo
+          title="What Our Clients Say"
+          description="Real feedback from satisfied clients and partners"
+          tag="Testimonials"
+          testimonials={testimonials}
+          animationType="slide-up"
+          textboxLayout="default"
+          useInvertedBackground={false}
+        />
+      </div>
+      <FooterBase
+        logoText="Webild"
+        columns={[
+          {
+            title: "Product",            items: [
+              { label: "Features", href: "#features" },
+              { label: "Pricing", href: "#pricing" },
+            ],
+          },
+          {
+            title: "Company",            items: [
+              { label: "About", href: "#about" },
+              { label: "Contact", href: "#contact" },
+            ],
+          },
+        ]}
+        copyrightText="© 2025 | Webild"
+      />
     </ThemeProvider>
   );
 }
diff --git a/src/app/services/page.tsx b/src/app/services/page.tsx
index c3e017f..7becd03 100644
--- a/src/app/services/page.tsx
+++ b/src/app/services/page.tsx
@@ -1,10 +1,10 @@
-'use client';
+"use client";
 
-import { ThemeProvider } from '@/components/theme';
-import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
-import AboutMetric from '@/components/sections/about/AboutMetric';
-import FeatureCardSeven from '@/components/sections/feature/FeatureCardSeven';
-import { TrendingUp, Zap, Globe, CheckCircle } from 'lucide-react';
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import NavbarStyleFullscreen from "@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen";
+import AboutMetric from "@/components/sections/about/AboutMetric";
+import FeatureCardSeven from "@/components/sections/feature/FeatureCardSeven";
+import { TrendingUp, Zap, Globe, CheckCircle } from "lucide-react";
 
 export default function ServicesPage() {
   return (
@@ -22,8 +22,8 @@ export default function ServicesPage() {
     >
       <NavbarStyleFullscreen
         navItems={[
-          { name: 'Home', id: '/' },
-          { name: 'Services', id: '/services' },
+          { name: "Home", id: "/" },
+          { name: "Services", id: "/services" },
         ]}
         brandName="Webild"
         bottomLeftText="Global Community"
@@ -35,10 +35,10 @@ export default function ServicesPage() {
         <AboutMetric
           title="Our Comprehensive Service Offerings"
           metrics={[
-            { icon: TrendingUp, label: 'Growth Solutions', value: '500+' },
-            { icon: Zap, label: 'Performance', value: '99.9%' },
-            { icon: Globe, label: 'Global Reach', value: '150+' },
-            { icon: CheckCircle, label: 'Client Satisfaction', value: '100%' },
+            { icon: TrendingUp, label: "Growth Solutions", value: "500+" },
+            { icon: Zap, label: "Performance", value: "99.9%" },
+            { icon: Globe, label: "Global Reach", value: "150+" },
+            { icon: CheckCircle, label: "Client Satisfaction", value: "100%" },
           ]}
           metricsAnimation="slide-up"
           useInvertedBackground={false}
@@ -51,36 +51,20 @@ export default function ServicesPage() {
           features={[
             {
               id: 1,
-              title: 'Digital Strategy',
-              description:
-                'Develop a comprehensive digital transformation strategy tailored to your business goals and market positioning.',
-              imageSrc: '/images/service-1.jpg',
-              imageAlt: 'Digital Strategy',
-            },
+              title: "Digital Strategy",              description:
+                "Develop a comprehensive digital transformation strategy tailored to your business goals and market positioning.",              imageSrc: "/images/service-1.jpg",              imageAlt: "Digital Strategy"},
             {
               id: 2,
-              title: 'Design & Development',
-              description:
-                'Create stunning, user-centric digital experiences with cutting-edge design and robust development practices.',
-              imageSrc: '/images/service-2.jpg',
-              imageAlt: 'Design & Development',
-            },
+              title: "Design & Development",              description:
+                "Create stunning, user-centric digital experiences with cutting-edge design and robust development practices.",              imageSrc: "/images/service-2.jpg",              imageAlt: "Design & Development"},
             {
               id: 3,
-              title: 'Marketing & Growth',
-              description:
-                'Amplify your brand presence with targeted marketing campaigns and growth-hacking strategies.',
-              imageSrc: '/images/service-3.jpg',
-              imageAlt: 'Marketing & Growth',
-            },
+              title: "Marketing & Growth",              description:
+                "Amplify your brand presence with targeted marketing campaigns and growth-hacking strategies.",              imageSrc: "/images/service-3.jpg",              imageAlt: "Marketing & Growth"},
             {
               id: 4,
-              title: 'Analytics & Optimization',
-              description:
-                'Harness data-driven insights to continuously optimize performance and drive measurable results.',
-              imageSrc: '/images/service-4.jpg',
-              imageAlt: 'Analytics & Optimization',
-            },
+              title: "Analytics & Optimization",              description:
+                "Harness data-driven insights to continuously optimize performance and drive measurable results.",              imageSrc: "/images/service-4.jpg",              imageAlt: "Analytics & Optimization"},
           ]}
           animationType="blur-reveal"
           title="Our Service Offerings"
