diff --git a/src/app/blog/page.tsx b/src/app/blog/page.tsx
index 69015bf..3a8e885 100644
--- a/src/app/blog/page.tsx
+++ b/src/app/blog/page.tsx
@@ -7,6 +7,7 @@ import { useBlogPosts } from "@/hooks/useBlogPosts";
 import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
 import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
 import BlogCardTwo from '@/components/sections/blog/BlogCardTwo';
+import Link from 'next/link';
 
 export default function BlogPage() {
     const { posts, isLoading } = useBlogPosts();
@@ -29,10 +30,10 @@ export default function BlogPage() {
                     <NavbarLayoutFloatingInline
                         navItems={[
                             { name: "Home", id: "/" },
-                            { name: "About", id: "about" },
-                            { name: "Team", id: "team" },
-                            { name: "News", id: "blog" },
-                            { name: "Contact", id: "contact" },
+                            { name: "About", id: "/#about" },
+                            { name: "Team", id: "/#team" },
+                            { name: "News", id: "/#blog" },
+                            { name: "Contact", id: "/#contact" },
                         ]}
                         brandName="Ferro ZNTU"
                         button={{ text: "Get Tickets", href: "#" }}
@@ -67,28 +68,27 @@ export default function BlogPage() {
                             columns={[
                                 {
                                     title: "Team",                                    items: [
-                                        { label: "About Us", href: "#about" },
-                                        { label: "Roster", href: "#team" },
-                                        { label: "News", href: "#blog" },
+                                        { label: "About Us", href: "/#about" },
+                                        { label: "Roster", href: "/#team" },
+                                        { label: "News", href: "/#blog" },
                                     ],
                                 },
                                 {
                                     title: "Fan Zone",                                    items: [
                                         { label: "Tickets", href: "#" },
-                                        { label: "Merchandise", href: "#" },
+                                        { label: "Merchandise", href: "/shop" },
                                         { label: "Schedule", href: "#" },
                                     ],
                                 },
                                 {
                                     title: "Contact",                                    items: [
-                                        { label: "Partnerships", href: "#contact" },
-                                        { label: "Media Inquiries", href: "#contact" },
-                                        { label: "General Contact", href: "#contact" },
+                                        { label: "Partnerships", href: "/#contact" },
+                                        { label: "Media Inquiries", href: "/#contact" },
+                                        { label: "General Contact", href: "/#contact" },
                                     ],
                                 },
                             ]}
                             copyrightText="© 2024 Ferro ZNTU Basketball Club. All rights reserved."
-                            useInvertedBackground={false}
                             className="py-10"
                             cardClassName="p-10"
                             logoTextClassName="text-3xl font-semibold"
diff --git a/src/app/page.tsx b/src/app/page.tsx
index f80ff27..7656ce1 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { Basketball, Shield, Trophy, Users } from "lucide-react";
+import { Dribbble, Shield, Trophy, Users } from "lucide-react";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
 import HeroCarouselLogo from '@/components/sections/hero/heroCarouselLogo/HeroCarouselLogo';
@@ -11,6 +11,7 @@ import BlogCardOne from '@/components/sections/blog/BlogCardOne';
 import TestimonialCardOne from '@/components/sections/testimonial/TestimonialCardOne';
 import ContactText from '@/components/sections/contact/ContactText';
 import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
+import Link from 'next/link';
 
 export default function LandingPage() {
   return (
@@ -75,7 +76,7 @@ export default function LandingPage() {
       <div id="features" data-section="features">
         <FeatureBorderGlow
           features={[
-            { icon: Basketball, title: "Dynamic Offense", description: "Witness an electrifying offense designed to dominate the paint and light up the scoreboard." },
+            { icon: Dribbble, title: "Dynamic Offense", description: "Witness an electrifying offense designed to dominate the paint and light up the scoreboard." },
             { icon: Shield, title: "Ironclad Defense", description: "Our relentless defense clamps down on opponents, forcing turnovers and controlling the game's pace." },
             { icon: Users, title: "Team Spirit", description: "More than just players, we are a family united by a shared passion for basketball and victory." },
             { icon: Trophy, title: "Championship Legacy", description: "Building on a rich history of success, we are constantly striving for new titles and achievements." }
diff --git a/src/app/shop/[id]/page.tsx b/src/app/shop/[id]/page.tsx
index a00e800..b318659 100644
--- a/src/app/shop/[id]/page.tsx
+++ b/src/app/shop/[id]/page.tsx
@@ -11,6 +11,7 @@ import ProductCart from "@/components/ecommerce/cart/ProductCart";
 import { useProductDetail } from "@/hooks/useProductDetail";
 import { useCart } from "@/hooks/useCart";
 import { useCheckout } from "@/hooks/useCheckout";
+import Link from 'next/link';
 
 interface ProductPageProps {
     params: Promise<{ id: string }>;
@@ -74,35 +75,40 @@ function ProductPageContent({ params }: ProductPageProps) {
         await checkout(getCheckoutItems(), { successUrl: currentUrl.toString() });
     }, [cartItems, checkout, getCheckoutItems]);
 
-    const themeProviderProps = {
-        defaultButtonVariant: "hover-magnetic",        defaultTextAnimation: "entrance-slide",        borderRadius: "soft",        contentWidth: "mediumSmall",        sizing: "mediumLargeSizeMediumTitles",        background: "fluid",        cardStyle: "glass-depth",        primaryButtonStyle: "shadow",        secondaryButtonStyle: "radial-glow",        headingFontWeight: "normal"
-    };
-
     const navbarProps = {
         navItems: [
             { name: "Home", id: "/" },
-            { name: "About", id: "about" },
-            { name: "Team", id: "team" },
-            { name: "News", id: "blog" },
-            { name: "Contact", id: "contact" },
-            { name: "Shop", id: "/shop" }
+            { name: "About", id: "/#about" },
+            { name: "Team", id: "/#team" },
+            { name: "News", id: "/#blog" },
+            { name: "Contact", id: "/#contact" },
         ],
         brandName: "Ferro ZNTU",        className: "py-4 px-6",        navItemClassName: "text-lg",        buttonClassName: "px-5 py-2",        buttonTextClassName: "font-semibold",        button: { text: "Cart", onClick: () => setCartOpen(true) }
     };
 
     const footerProps = {
         logoText: "Ferro ZNTU",        columns: [
-            { title: "Team", items: [{ label: "About Us", href: "/about" }, { label: "Roster", href: "/team" }, { label: "News", href: "/blog" }] },
+            { title: "Team", items: [{ label: "About Us", href: "/#about" }, { label: "Roster", href: "/#team" }, { label: "News", href: "/#blog" }] },
             { title: "Fan Zone", items: [{ label: "Merchandise", href: "/shop" }] },
-            { title: "Contact", items: [{ label: "Partnerships", href: "/contact" }, { label: "Media Inquiries", href: "/contact" }, { label: "General Contact", href: "/contact" }] }
+            { title: "Contact", items: [{ label: "Partnerships", href: "/#contact" }, { label: "Media Inquiries", href: "/#contact" }, { label: "General Contact", href: "/#contact" }] }
         ],
-        copyrightText: "© 2024 Ferro ZNTU Basketball Club. All rights reserved.",        useInvertedBackground: false,
-        className: "py-10",        cardClassName: "p-10",        logoTextClassName: "text-3xl font-semibold",        columnTitleClassName: "font-medium mb-4",        columnItemClassName: "text-foreground/70 hover:text-primary-cta"
+        copyrightText: "© 2024 Ferro ZNTU Basketball Club. All rights reserved.",        className: "py-10",        cardClassName: "p-10",        logoTextClassName: "text-3xl font-semibold",        columnTitleClassName: "font-medium mb-4",        columnItemClassName: "text-foreground/70 hover:text-primary-cta"
     };
 
     if (isLoading) {
         return (
-            <ThemeProvider {...themeProviderProps}>
+            <ThemeProvider 
+                defaultButtonVariant="hover-magnetic"
+                defaultTextAnimation="entrance-slide"
+                borderRadius="soft"
+                contentWidth="mediumSmall"
+                sizing="mediumLargeSizeMediumTitles"
+                background="fluid"
+                cardStyle="glass-depth"
+                primaryButtonStyle="shadow"
+                secondaryButtonStyle="radial-glow"
+                headingFontWeight="normal"
+            >
                 <ReactLenis root>
                     <div id="navbar" data-section="navbar">
                         <NavbarLayoutFloatingInline {...navbarProps} />
@@ -122,7 +128,18 @@ function ProductPageContent({ params }: ProductPageProps) {
 
     if (!product) {
         return (
-            <ThemeProvider {...themeProviderProps}>
+            <ThemeProvider 
+                defaultButtonVariant="hover-magnetic"
+                defaultTextAnimation="entrance-slide"
+                borderRadius="soft"
+                contentWidth="mediumSmall"
+                sizing="mediumLargeSizeMediumTitles"
+                background="fluid"
+                cardStyle="glass-depth"
+                primaryButtonStyle="shadow"
+                secondaryButtonStyle="radial-glow"
+                headingFontWeight="normal"
+            >
                 <ReactLenis root>
                     <div id="navbar" data-section="navbar">
                         <NavbarLayoutFloatingInline {...navbarProps} />
@@ -149,7 +166,18 @@ function ProductPageContent({ params }: ProductPageProps) {
     }
 
     return (
-        <ThemeProvider {...themeProviderProps}>
+        <ThemeProvider 
+            defaultButtonVariant="hover-magnetic"
+            defaultTextAnimation="entrance-slide"
+            borderRadius="soft"
+            contentWidth="mediumSmall"
+            sizing="mediumLargeSizeMediumTitles"
+            background="fluid"
+            cardStyle="glass-depth"
+            primaryButtonStyle="shadow"
+            secondaryButtonStyle="radial-glow"
+            headingFontWeight="normal"
+        >
             <ReactLenis root>
                 <div id="navbar" data-section="navbar">
                     <NavbarLayoutFloatingInline {...navbarProps} />
diff --git a/src/app/shop/page.tsx b/src/app/shop/page.tsx
index 4da8a31..4c5c3ec 100644
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -7,6 +7,7 @@ import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloating
 import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
 import ProductCatalog from "@/components/ecommerce/productCatalog/ProductCatalog";
 import { useProductCatalog } from "@/hooks/useProductCatalog";
+import Link from 'next/link';
 
 function ShopPageContent() {
     const {
@@ -17,35 +18,40 @@ function ShopPageContent() {
         filters,
     } = useProductCatalog({ basePath: "/shop" });
 
-    const themeProviderProps = {
-        defaultButtonVariant: "hover-magnetic",        defaultTextAnimation: "entrance-slide",        borderRadius: "soft",        contentWidth: "mediumSmall",        sizing: "mediumLargeSizeMediumTitles",        background: "fluid",        cardStyle: "glass-depth",        primaryButtonStyle: "shadow",        secondaryButtonStyle: "radial-glow",        headingFontWeight: "normal"
-    };
-
     const navbarProps = {
         navItems: [
             { name: "Home", id: "/" },
-            { name: "About", id: "about" },
-            { name: "Team", id: "team" },
-            { name: "News", id: "blog" },
-            { name: "Contact", id: "contact" },
-            { name: "Shop", id: "/shop" }
+            { name: "About", id: "/#about" },
+            { name: "Team", id: "/#team" },
+            { name: "News", id: "/#blog" },
+            { name: "Contact", id: "/#contact" },
         ],
         brandName: "Ferro ZNTU",        className: "py-4 px-6",        navItemClassName: "text-lg",        buttonClassName: "px-5 py-2",        buttonTextClassName: "font-semibold",        button: { text: "Cart", onClick: () => {} } // setCartOpen is not available on this page
     };
 
     const footerProps = {
         logoText: "Ferro ZNTU",        columns: [
-            { title: "Team", items: [{ label: "About Us", href: "/about" }, { label: "Roster", href: "/team" }, { label: "News", href: "/blog" }] },
+            { title: "Team", items: [{ label: "About Us", href: "/#about" }, { label: "Roster", href: "/#team" }, { label: "News", href: "/#blog" }] },
             { title: "Fan Zone", items: [{ label: "Merchandise", href: "/shop" }] },
-            { title: "Contact", items: [{ label: "Partnerships", href: "/contact" }, { label: "Media Inquiries", href: "/contact" }, { label: "General Contact", href: "/contact" }] }
+            { title: "Contact", items: [{ label: "Partnerships", href: "/#contact" }, { label: "Media Inquiries", href: "/#contact" }, { label: "General Contact", href: "/#contact" }] }
         ],
-        copyrightText: "© 2024 Ferro ZNTU Basketball Club. All rights reserved.",        useInvertedBackground: false,
-        className: "py-10",        cardClassName: "p-10",        logoTextClassName: "text-3xl font-semibold",        columnTitleClassName: "font-medium mb-4",        columnItemClassName: "text-foreground/70 hover:text-primary-cta"
+        copyrightText: "© 2024 Ferro ZNTU Basketball Club. All rights reserved.",        className: "py-10",        cardClassName: "p-10",        logoTextClassName: "text-3xl font-semibold",        columnTitleClassName: "font-medium mb-4",        columnItemClassName: "text-foreground/70 hover:text-primary-cta"
     };
 
     if (isLoading) {
         return (
-            <ThemeProvider {...themeProviderProps}>
+            <ThemeProvider 
+                defaultButtonVariant="hover-magnetic"
+                defaultTextAnimation="entrance-slide"
+                borderRadius="soft"
+                contentWidth="mediumSmall"
+                sizing="mediumLargeSizeMediumTitles"
+                background="fluid"
+                cardStyle="glass-depth"
+                primaryButtonStyle="shadow"
+                secondaryButtonStyle="radial-glow"
+                headingFontWeight="normal"
+            >
                 <ReactLenis root>
                     <div id="navbar" data-section="navbar">
                         <NavbarLayoutFloatingInline {...navbarProps} />
@@ -64,7 +70,18 @@ function ShopPageContent() {
     }
 
     return (
-        <ThemeProvider {...themeProviderProps}>
+        <ThemeProvider
+            defaultButtonVariant="hover-magnetic"
+            defaultTextAnimation="entrance-slide"
+            borderRadius="soft"
+            contentWidth="mediumSmall"
+            sizing="mediumLargeSizeMediumTitles"
+            background="fluid"
+            cardStyle="glass-depth"
+            primaryButtonStyle="shadow"
+            secondaryButtonStyle="radial-glow"
+            headingFontWeight="normal"
+        >
             <ReactLenis root>
                 <div id="navbar" data-section="navbar">
                     <NavbarLayoutFloatingInline {...navbarProps} />