diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 0000000..314db70
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1,21 @@
+# AGENTS.md
+
+## Repository layout
+
+This checkout is the `Coder-soft/renderdragon.org` fork. The canonical upstream
+for this project is **`creatorcluster/renderdragon.org`** (base branch `main`),
+which itself forks `Yxmura/renderdragon`.
+
+## Pull requests
+
+Open every pull request against upstream **`creatorcluster/renderdragon.org` `main`**,
+not against the `Coder-soft` fork. Push the branch to `origin` (the fork) and open a
+cross-repository PR:
+
+```sh
+git push -u origin <branch>
+gh pr create --repo creatorcluster/renderdragon.org --base main --head Coder-soft:<branch>
+```
+
+GitHub's native linked-branch feature (`gh issue develop`) does not work in the fork,
+so reference the relevant fork issue by URL in the PR body instead.
diff --git a/index.html b/index.html
index 585a390..ee602a7 100644
--- a/index.html
+++ b/index.html
@@ -57,11 +57,8 @@
 
   <link rel="preconnect" href="https://fonts.googleapis.com">
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-  <link rel="preconnect" href="https://fonts.cdnfonts.com" crossorigin>
+  <link rel="preload" href="/fonts/minecraftia.woff2" as="font" type="font/woff2" crossorigin>
   <link href="https://fonts.googleapis.com/css2?family=Press+Start+2P&family=VT323&family=Chakra+Petch:wght@300;400;500;600;700&family=Inter:wght@300;400;500;600;700&display=swap" rel="stylesheet">
-  <link href="https://fonts.cdnfonts.com/css/minecraftia" rel="stylesheet">
-  <link href="https://fonts.cdnfonts.com/css/minecraft-3" rel="stylesheet">
-
   <script type="application/ld+json">
     {
       "@context": "https://schema.org",
diff --git a/public/VERT_Screencast_20260705_160503.gif b/public/VERT_Screencast_20260705_160503.gif
deleted file mode 100644
index 263e260..0000000
Binary files a/public/VERT_Screencast_20260705_160503.gif and /dev/null differ
diff --git a/public/assets/AlphaReturns.jpg b/public/assets/AlphaReturns.jpg
deleted file mode 100644
index bcf6a9f..0000000
Binary files a/public/assets/AlphaReturns.jpg and /dev/null differ
diff --git a/public/assets/AlphaReturns.webp b/public/assets/AlphaReturns.webp
new file mode 100644
index 0000000..647497c
Binary files /dev/null and b/public/assets/AlphaReturns.webp differ
diff --git a/public/assets/ItsProger.jpg b/public/assets/ItsProger.jpg
deleted file mode 100644
index da331a1..0000000
Binary files a/public/assets/ItsProger.jpg and /dev/null differ
diff --git a/public/assets/ItsProger.webp b/public/assets/ItsProger.webp
new file mode 100644
index 0000000..2c0c3f7
Binary files /dev/null and b/public/assets/ItsProger.webp differ
diff --git a/public/assets/Jkingnick.jpg b/public/assets/Jkingnick.jpg
deleted file mode 100644
index 6f75e42..0000000
Binary files a/public/assets/Jkingnick.jpg and /dev/null differ
diff --git a/public/assets/Jkingnick.webp b/public/assets/Jkingnick.webp
new file mode 100644
index 0000000..7955223
Binary files /dev/null and b/public/assets/Jkingnick.webp differ
diff --git a/public/assets/VOVOplay.png b/public/assets/VOVOplay.png
deleted file mode 100644
index 6f57e6f..0000000
Binary files a/public/assets/VOVOplay.png and /dev/null differ
diff --git a/public/assets/VOVOplay.webp b/public/assets/VOVOplay.webp
new file mode 100644
index 0000000..0a2353f
Binary files /dev/null and b/public/assets/VOVOplay.webp differ
diff --git a/public/assets/clover.jpeg b/public/assets/clover.jpeg
deleted file mode 100644
index 4672f3c..0000000
Binary files a/public/assets/clover.jpeg and /dev/null differ
diff --git a/public/assets/clover.webp b/public/assets/clover.webp
new file mode 100644
index 0000000..ef98d4d
Binary files /dev/null and b/public/assets/clover.webp differ
diff --git a/public/assets/codersoft.png b/public/assets/codersoft.png
deleted file mode 100644
index 3e481cd..0000000
Binary files a/public/assets/codersoft.png and /dev/null differ
diff --git a/public/assets/codersoft.webp b/public/assets/codersoft.webp
new file mode 100644
index 0000000..5a896f3
Binary files /dev/null and b/public/assets/codersoft.webp differ
diff --git a/public/assets/denji.png b/public/assets/denji.png
deleted file mode 100644
index e225c3e..0000000
Binary files a/public/assets/denji.png and /dev/null differ
diff --git a/public/assets/denji.webp b/public/assets/denji.webp
new file mode 100644
index 0000000..94afd18
Binary files /dev/null and b/public/assets/denji.webp differ
diff --git a/public/assets/heart.png b/public/assets/heart.png
deleted file mode 100644
index e672687..0000000
Binary files a/public/assets/heart.png and /dev/null differ
diff --git a/public/assets/minecraft-pattern-background-1920x1080.png b/public/assets/minecraft-pattern-background-1920x1080.png
deleted file mode 100644
index feff69f..0000000
Binary files a/public/assets/minecraft-pattern-background-1920x1080.png and /dev/null differ
diff --git a/public/assets/minecraft-pattern-background.webp b/public/assets/minecraft-pattern-background.webp
new file mode 100644
index 0000000..e2eec02
Binary files /dev/null and b/public/assets/minecraft-pattern-background.webp differ
diff --git a/public/assets/tomatoking.png b/public/assets/tomatoking.png
deleted file mode 100644
index f349428..0000000
Binary files a/public/assets/tomatoking.png and /dev/null differ
diff --git a/public/assets/tomatoking.webp b/public/assets/tomatoking.webp
new file mode 100644
index 0000000..7636c08
Binary files /dev/null and b/public/assets/tomatoking.webp differ
diff --git a/public/assets/yFury.jpg b/public/assets/yFury.jpg
deleted file mode 100644
index 56ef500..0000000
Binary files a/public/assets/yFury.jpg and /dev/null differ
diff --git a/public/assets/yFury.webp b/public/assets/yFury.webp
new file mode 100644
index 0000000..afb02f4
Binary files /dev/null and b/public/assets/yFury.webp differ
diff --git a/public/assets/yamura.png b/public/assets/yamura.png
deleted file mode 100644
index 29ec4e9..0000000
Binary files a/public/assets/yamura.png and /dev/null differ
diff --git a/public/assets/yamura.webp b/public/assets/yamura.webp
new file mode 100644
index 0000000..f1153e1
Binary files /dev/null and b/public/assets/yamura.webp differ
diff --git a/public/favicon.ico b/public/favicon.ico
index e9bd1e7..12c198f 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/public/fonts/minecraft.woff2 b/public/fonts/minecraft.woff2
new file mode 100644
index 0000000..a076947
Binary files /dev/null and b/public/fonts/minecraft.woff2 differ
diff --git a/public/fonts/minecraftia.woff2 b/public/fonts/minecraftia.woff2
new file mode 100644
index 0000000..bda90c2
Binary files /dev/null and b/public/fonts/minecraftia.woff2 differ
diff --git a/public/minecraft-pattern-background-1920x1080.png b/public/minecraft-pattern-background-1920x1080.png
deleted file mode 100644
index 5a29397..0000000
Binary files a/public/minecraft-pattern-background-1920x1080.png and /dev/null differ
diff --git a/public/renderdragon-logo.webp b/public/renderdragon-logo.webp
new file mode 100644
index 0000000..d264613
Binary files /dev/null and b/public/renderdragon-logo.webp differ
diff --git a/src/components/Logo.tsx b/src/components/Logo.tsx
index 0b9dcf6..e527482 100644
--- a/src/components/Logo.tsx
+++ b/src/components/Logo.tsx
@@ -1,6 +1,8 @@
 import React from 'react';
 
-export const Logo = ({ className = "", size = "md", mobile = false }: { className?: string, size?: "sm" | "md" | "lg" | "xl", mobile?: boolean }) => {
+const LOGO_SRC = "/renderdragon-logo.webp";
+
+export const Logo = ({ className = "", size = "md" }: { className?: string, size?: "sm" | "md" | "lg" | "xl" }) => {
   const dimensions = {
     sm: "h-8",
     md: "h-10",
@@ -8,15 +10,16 @@ export const Logo = ({ className = "", size = "md", mobile = false }: { classNam
     xl: "h-14"
   }[size];
 
-  const src = mobile ? "/renderdragon.png" : "/favicon.ico";
-
   return (
     <img
-      src={src}
+      src={LOGO_SRC}
       alt="Renderdragon"
+      width={128}
+      height={92}
+      decoding="async"
       className={`${dimensions} w-auto object-contain ${className}`}
     />
   );
 };
 
-export default React.memo(Logo);
\ No newline at end of file
+export default React.memo(Logo);
diff --git a/src/components/PopularTools.tsx b/src/components/PopularTools.tsx
index 8936424..0c0a7c1 100644
--- a/src/components/PopularTools.tsx
+++ b/src/components/PopularTools.tsx
@@ -28,7 +28,7 @@ const tools: Tool[] = [
     title: 'Background Gen',
     description: 'Generate stunning, unique backgrounds for your thumbnails in seconds.',
     icon: IconPhoto,
-    backgroundImage: '/assets/minecraft-pattern-background-1920x1080.png',
+    backgroundImage: '/assets/minecraft-pattern-background.webp',
     path: '/background-generator',
   },
   {
@@ -88,14 +88,14 @@ const PopularTools = () => {
                    className={`group relative block h-full pixel-card bg-card hover:bg-cow-purple/5 border-2 border-border hover:border-cow-purple p-6 transition-all duration-300 hover:-translate-y-1 hover:shadow-xl hover:shadow-cow-purple/20 ${tool.backgroundImage ? 'overflow-hidden' : ''}`}
                  >
                    {tool.backgroundImage && <>
-                     <img src={tool.backgroundImage} alt="" aria-hidden="true" className="pointer-events-none absolute inset-0 h-full w-full object-cover opacity-0 transition-opacity duration-200 group-hover:opacity-100" />
+                     <img src={tool.backgroundImage} alt="" aria-hidden="true" width={800} height={450} loading="lazy" decoding="async" className="pointer-events-none absolute inset-0 h-full w-full object-cover opacity-0 transition-opacity duration-200 group-hover:opacity-100" />
                      <div aria-hidden="true" className="pointer-events-none absolute inset-0 bg-[radial-gradient(circle_at_center,transparent_35%,rgba(0,0,0,0.55)_100%)] opacity-0 transition-opacity duration-200 group-hover:opacity-100" />
                    </>}
                   <div className="flex items-start justify-between mb-5">
                    <div className="relative z-10 w-12 h-12 bg-cow-purple/15 border-2 border-cow-purple pixel-corners flex items-center justify-center group-hover:scale-110 group-hover:-rotate-6 transition-transform duration-300">
                      <tool.icon className={`h-6 w-6 text-cow-purple transition-opacity duration-150 ${tool.hoverIcon || tool.hoverImage ? 'group-hover:opacity-0' : ''}`} stroke={2.5} />
                     {'hoverIcon' in tool && tool.hoverIcon && <tool.hoverIcon className="absolute h-6 w-6 text-red-500 opacity-0 transition-opacity duration-150 group-hover:opacity-100" stroke={2.5} />}
-                    {'hoverImage' in tool && tool.hoverImage && <img src={tool.hoverImage} alt="" className="absolute h-7 w-7 rounded-sm object-cover opacity-0 transition-opacity duration-150 group-hover:opacity-100" />}
+                    {'hoverImage' in tool && tool.hoverImage && <img src={tool.hoverImage} alt="" loading="lazy" decoding="async" className="absolute h-7 w-7 rounded-sm object-cover opacity-0 transition-opacity duration-150 group-hover:opacity-100" />}
                   </div>
                    <IconArrowRight className="relative z-10 w-5 h-5 text-cow-purple opacity-0 group-hover:opacity-100 group-hover:translate-x-1 transition-all" />
                 </div>
diff --git a/src/components/Testimonials.tsx b/src/components/Testimonials.tsx
index 61e0607..6285986 100644
--- a/src/components/Testimonials.tsx
+++ b/src/components/Testimonials.tsx
@@ -7,6 +7,7 @@ interface Testimonial {
   name: string;
   role: string;
   content: string;
+  avatar: string;
 }
 
 const testimonialsData: Testimonial[] = [
@@ -15,24 +16,28 @@ const testimonialsData: Testimonial[] = [
     name: "yFury",
     role: 'YouTuber',
     content: 'RenderDragon is a fantastic resource for any creator. I use it all the time for my videos!',
+    avatar: '/assets/yFury.webp',
   },
   {
     id: 2,
     name: "Jkingnick",
     role: 'Designer',
     content: 'The assets on RenderDragon are top-notch. They save me a ton of time and effort.',
+    avatar: '/assets/Jkingnick.webp',
   },
   {
     id: 3,
     name: "AlphaReturns",
     role: 'Editor',
     content: 'I love the variety of resources available. It\'s my go-to for all my editing needs.',
+    avatar: '/assets/AlphaReturns.webp',
   },
   {
     id: 4,
     name: "ItsProger",
     role: 'Minecraft YouTuber and Thumbnail Designer',
     content: "I really like renderdragon, it's one of the only and best websites for Minecraft content creators. I really like the style, assets, tools and the whole team working on this amazing project. I'll use it for every single video that I make in the future",
+    avatar: '/assets/ItsProger.webp',
   }
 ];
 
@@ -103,10 +108,13 @@ const Testimonials = () => {
               <div className="flex items-center gap-4 mb-5 pb-5 border-b-2 border-dashed border-border relative">
                 <div className="w-14 h-14 overflow-hidden border-2 border-cow-purple pixel-corners">
                   <img
-                    src={`/assets/${testimonial.name}.jpg`}
+                    src={testimonial.avatar}
                     alt={testimonial.name}
+                    width={112}
+                    height={112}
                     className="w-full h-full object-cover"
                     loading="lazy"
+                    decoding="async"
                   />
                 </div>
                 <div>
diff --git a/src/components/resources/GreenVoidPopup.tsx b/src/components/resources/GreenVoidPopup.tsx
deleted file mode 100644
index 1751fc2..0000000
--- a/src/components/resources/GreenVoidPopup.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-import { useState, useEffect } from 'react';
-import {
-  Dialog,
-  DialogContent,
-} from '@/components/ui/dialog';
-import { Button } from '@/components/ui/button';
-import { IconX, IconPalette, IconBrightness, IconEye, IconCloud, IconSparkles } from '@tabler/icons-react';
-
-const GREEN_VOID_KEY = 'green-void-changelog-dismissed';
-const MC_PLAYLIST_KEY = 'mc-creator-playlist-changelog-dismissed';
-
-const GreenVoidPopup = () => {
-  const [open, setOpen] = useState(false);
-
-  useEffect(() => {
-    const check = () => {
-      const greenVoidDismissed = localStorage.getItem(GREEN_VOID_KEY);
-      const mcPlaylistDismissed = localStorage.getItem(MC_PLAYLIST_KEY);
-      if (!greenVoidDismissed && mcPlaylistDismissed) {
-        setOpen(true);
-      }
-    };
-
-    check();
-    window.addEventListener('mc-playlist-dismissed', check);
-    return () => window.removeEventListener('mc-playlist-dismissed', check);
-  }, []);
-
-  const dismiss = () => {
-    localStorage.setItem(GREEN_VOID_KEY, 'true');
-    setOpen(false);
-  };
-
-  return (
-    <Dialog open={open} onOpenChange={(o) => { if (!o) dismiss(); }}>
-      <DialogContent className="sm:max-w-lg pixel-corners bg-gradient-to-b from-card/95 to-card/70 border-green-500/20 max-h-[90vh] overflow-y-auto">
-        <div className="space-y-5">
-          <h1 className="text-2xl font-minecraftia font-bold text-center leading-tight">
-            Green Void Shader Pack
-          </h1>
-
-          <img
-            src="/VERT_Screencast_20260705_160503.gif"
-            alt="Green Void Shader Pack"
-            className="w-full rounded-lg border border-border/40"
-          />
-
-          <div className="space-y-3 text-sm text-muted-foreground">
-            <p className="text-foreground/80 font-medium">
-              Green Void is a Minecraft shader pack designed for content creators. Change the chroma color of the sky, terrain, and entities to create stunning thumbnail visuals.
-            </p>
-
-            <div>
-              <h4 className="text-xs font-semibold text-foreground/90 uppercase tracking-wider mb-2 flex items-center gap-1.5 font-minecraftia">
-                <IconSparkles className="h-3.5 w-3.5 text-green-400" />
-                Features
-              </h4>
-              <ul className="space-y-1.5">
-                <li className="flex items-start gap-2">
-                  <IconCloud className="h-4 w-4 text-green-400 mt-0.5 flex-shrink-0" />
-                  <span><strong className="text-foreground/80">Chroma sky</strong> — recolor the sky with any chroma color</span>
-                </li>
-                <li className="flex items-start gap-2">
-                  <IconBrightness className="h-4 w-4 text-green-400 mt-0.5 flex-shrink-0" />
-                  <span><strong className="text-foreground/80">Chroma terrain</strong> — apply chroma effects to all terrain blocks</span>
-                </li>
-                <li className="flex items-start gap-2">
-                  <IconEye className="h-4 w-4 text-green-400 mt-0.5 flex-shrink-0" />
-                  <span><strong className="text-foreground/80">Chroma entities</strong> — change entity colors for seamless composites</span>
-                </li>
-                <li className="flex items-start gap-2">
-                  <IconPalette className="h-4 w-4 text-green-400 mt-0.5 flex-shrink-0" />
-                  <span><strong className="text-foreground/80">Full color control</strong> — pick any chroma key for perfect thumbnails</span>
-                </li>
-              </ul>
-            </div>
-
-            <div className="flex flex-col gap-2 pt-2">
-              <a
-                href="https://modrinth.com/shader/greenvoid"
-                target="_blank"
-                rel="noopener noreferrer"
-                className="inline-flex items-center gap-2 px-4 py-2.5 rounded-md bg-green-500/15 text-green-400 hover:bg-green-500/25 transition-colors text-sm font-medium"
-              >
-                <img src="/modrinth.svg" alt="Modrinth" className="h-5 w-5" />
-                Download on Modrinth
-                <IconX className="h-3 w-3 ml-auto rotate-45" />
-              </a>
-            </div>
-          </div>
-
-          <Button
-            onClick={dismiss}
-            className="w-full pixel-corners bg-green-600 hover:bg-green-700 font-minecraft font-bold text-white"
-          >
-            Got it!
-          </Button>
-        </div>
-      </DialogContent>
-    </Dialog>
-  );
-};
-
-export default GreenVoidPopup;
diff --git a/src/hooks/useProfile.ts b/src/hooks/useProfile.ts
index 872af3d..a4f848e 100644
--- a/src/hooks/useProfile.ts
+++ b/src/hooks/useProfile.ts
@@ -1,6 +1,6 @@
 
 import { useState, useEffect, useCallback } from 'react';
-import { supabase } from '@/integrations/supabase/client';
+import { getSupabase } from '@/integrations/supabase/lazyClient';
 import { useAuth } from './useAuth';
 import { toast } from 'sonner';
 import type { Database } from '@/integrations/supabase/types';
@@ -27,6 +27,7 @@ export const useProfile = () => {
 
     setLoading(true);
     try {
+      const supabase = await getSupabase();
       // Own-profile reads go through the security-definer RPC so the client
       // never needs (and no longer has) column access to email/first/last/etc.
       const { data: rawData, error } = await supabase.rpc("get_my_profile");
@@ -74,6 +75,7 @@ export const useProfile = () => {
 
     setLoading(true);
     try {
+      const supabase = await getSupabase();
       // Only columns the owner is actually allowed to change (RLS-granted).
       // email/created_at/updated_at/role/etc. are never written from the client.
       const allowedFields = [
@@ -114,6 +116,7 @@ export const useProfile = () => {
     if (!user) return;
 
     try {
+      const supabase = await getSupabase();
       // Get the current session to send the access token
       const { data: { session } } = await supabase.auth.getSession();
 
diff --git a/src/index.css b/src/index.css
index caf3c9d..af54d4f 100644
--- a/src/index.css
+++ b/src/index.css
@@ -4,19 +4,19 @@
 
 @font-face {
   font-family: Minecraftia;
-  src: url('https://raw.githubusercontent.com/Yxmura/resources_renderdragon/d41fc385c3c178527da0710ad4f6cd4f37a12eea/fonts/minecraftia.ttf') format('truetype');
+  src: url('/fonts/minecraftia.woff2') format('woff2');
   font-display: swap;
 }
 
 @font-face {
   font-family: 'Minecraft Seven';
-  src: url('https://raw.githubusercontent.com/Yxmura/resources_renderdragon/d41fc385c3c178527da0710ad4f6cd4f37a12eea/fonts/minecraft.ttf') format('truetype');
+  src: url('/fonts/minecraft.woff2') format('woff2');
   font-display: swap;
 }
 
 @font-face {
   font-family: 'Minecraft Five Bold';
-  src: url('https://raw.githubusercontent.com/Yxmura/resources_renderdragon/d41fc385c3c178527da0710ad4f6cd4f37a12eea/fonts/minecraft.ttf') format('truetype');
+  src: url('/fonts/minecraft.woff2') format('woff2');
   font-display: swap;
 }
 
diff --git a/src/integrations/supabase/lazyClient.ts b/src/integrations/supabase/lazyClient.ts
new file mode 100644
index 0000000..11c0408
--- /dev/null
+++ b/src/integrations/supabase/lazyClient.ts
@@ -0,0 +1,16 @@
+import type { SupabaseClient } from '@supabase/supabase-js';
+import type { Database } from './types';
+
+let clientPromise: Promise<SupabaseClient<Database>> | null = null;
+
+export const getSupabase = (): Promise<SupabaseClient<Database>> => {
+    if (!clientPromise) {
+        clientPromise = import('./client')
+            .then((module) => module.supabase)
+            .catch((error) => {
+                clientPromise = null;
+                throw error;
+            });
+    }
+    return clientPromise;
+};
diff --git a/src/pages/Contact.tsx b/src/pages/Contact.tsx
index 0960fea..1602d6b 100644
--- a/src/pages/Contact.tsx
+++ b/src/pages/Contact.tsx
@@ -22,7 +22,7 @@ const teamMembers: TeamMember[] = [
   {
     name: "Coder-soft",
     role: "Founder",
-    avatar: "/assets/codersoft.png",
+    avatar: "/assets/codersoft.webp",
     socials: {
       github: "https://github.com/coder-soft",
       discord: "https://discordapp.com/users/1094475489734819840",
@@ -32,7 +32,7 @@ const teamMembers: TeamMember[] = [
   {
     name: "Clover",
     role: "Admin",
-    avatar: "/assets/clover.jpeg",
+    avatar: "/assets/clover.webp",
     socials: {
       github: "https://github.com/CloverTheBunny",
       discord: "https://discordapp.com/users/789997917661560862",
@@ -41,7 +41,7 @@ const teamMembers: TeamMember[] = [
   {
     name: "Yamura",
     role: "Lead Programmer",
-    avatar: "/assets/yamura.png",
+    avatar: "/assets/yamura.webp",
     socials: {
       github: "https://github.com/Yxmura",
       discord: "https://discordapp.com/users/877933841170432071",
@@ -51,7 +51,7 @@ const teamMembers: TeamMember[] = [
   {
     name: "TomatoKing",
     role: "King of Yapping",
-    avatar: "/assets/tomatoking.png",
+    avatar: "/assets/tomatoking.webp",
     socials: {
       discord: "https://discordapp.com/users/1279190506126966847",
       website: "https://tomatosportfolio.netlify.app",
@@ -60,7 +60,7 @@ const teamMembers: TeamMember[] = [
   {
     name: "Denji",
     role: "Guides writer",
-    avatar: "/assets/denji.png",
+    avatar: "/assets/denji.webp",
     socials: {
       discord: "https://discordapp.com/users/1114195537093201992",
       website: "https://yournotluis.xyz/",
@@ -80,7 +80,7 @@ const teamMembers: TeamMember[] = [
   {
     name: "VOVOplay",
     role: "Animator",
-    avatar: "/assets/VOVOplay.png",
+    avatar: "/assets/VOVOplay.webp",
     socials: {
       website: "https://vovomotion.com/",
       discord: "https://discordapp.com/users/758322333437394944",
@@ -228,8 +228,11 @@ const Contact = () => {
                       <img
                         src={member.avatar}
                         alt={member.name}
+                        width={192}
+                        height={192}
                         className="w-full h-full object-cover"
                         loading="lazy"
+                        decoding="async"
                       />
                     </div>
                      <h3 className="text-lg font-geist font-medium">{member.name}</h3>
diff --git a/src/providers/AuthProvider.tsx b/src/providers/AuthProvider.tsx
index e241583..3aa62c9 100644
--- a/src/providers/AuthProvider.tsx
+++ b/src/providers/AuthProvider.tsx
@@ -1,6 +1,6 @@
 import { useState, useEffect } from "react";
-import { User, Session } from "@supabase/supabase-js";
-import { supabase } from "@/integrations/supabase/client";
+import type { User, Session } from "@supabase/supabase-js";
+import { getSupabase } from "@/integrations/supabase/lazyClient";
 import { AuthContext, AuthResult } from "@/providers/AuthContext";
 
 export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
@@ -9,27 +9,47 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
     const [loading, setLoading] = useState(true);
 
     useEffect(() => {
-        const {
-            data: { subscription },
-        } = supabase.auth.onAuthStateChange((_event, session) => {
-            setSession(session);
-            setUser(session?.user ?? null);
-            setLoading(false);
-        });
+        let unsubscribe: (() => void) | undefined;
+        let cancelled = false;
 
-        supabase.auth.getSession().then(({ data: { session } }) => {
-            setSession(session);
-            setUser(session?.user ?? null);
-            setLoading(false);
-        });
+        (async () => {
+            try {
+                const supabase = await getSupabase();
+                if (cancelled) return;
+
+                const {
+                    data: { subscription },
+                } = supabase.auth.onAuthStateChange((_event, session) => {
+                    setSession(session);
+                    setUser(session?.user ?? null);
+                    setLoading(false);
+                });
+                unsubscribe = () => subscription.unsubscribe();
 
-        return () => subscription.unsubscribe();
+                const {
+                    data: { session },
+                } = await supabase.auth.getSession();
+                if (cancelled) return;
+                setSession(session);
+                setUser(session?.user ?? null);
+                setLoading(false);
+            } catch (error) {
+                console.error("Auth initialization failed:", error);
+                if (!cancelled) setLoading(false);
+            }
+        })();
+
+        return () => {
+            cancelled = true;
+            unsubscribe?.();
+        };
     }, []);
 
     // Keep profiles.avatar_url in sync with the latest auth metadata
     useEffect(() => {
         const syncAvatar = async () => {
             if (!user) return;
+            const supabase = await getSupabase();
             const meta = (user.user_metadata as Record<string, unknown>) || {};
             let avatarUrl: string | undefined = (meta.avatar_url as string | undefined) || (meta.picture as string | undefined);
 
@@ -123,6 +143,7 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
         lastName: string,
         captchaToken: string | null,
     ): Promise<AuthResult> => {
+        const supabase = await getSupabase();
         const redirectUrl = `${window.location.origin}/`;
 
         const { error } = await supabase.auth.signUp({
@@ -153,6 +174,7 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
         password: string,
         captchaToken: string | null,
     ): Promise<AuthResult> => {
+        const supabase = await getSupabase();
         const { error } = await supabase.auth.signInWithPassword({
             email,
             password,
@@ -170,6 +192,7 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
 
     // UPDATED signOut function
     const signOut = async (): Promise<AuthResult> => {
+        const supabase = await getSupabase();
         const { error } = await supabase.auth.signOut();
         if (error) {
             console.error("Sign out error:", error);
@@ -185,6 +208,7 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
     };
 
     const signInWithGitHub = async (): Promise<AuthResult> => {
+        const supabase = await getSupabase();
         const { error } = await supabase.auth.signInWithOAuth({
             provider: "github",
             options: {
@@ -199,6 +223,7 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
     };
 
     const signInWithDiscord = async (): Promise<AuthResult> => {
+        const supabase = await getSupabase();
         const { error } = await supabase.auth.signInWithOAuth({
             provider: "discord",
             options: {
@@ -213,6 +238,7 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
     };
 
     const signInWithGoogle = async (): Promise<AuthResult> => {
+        const supabase = await getSupabase();
         const { error } = await supabase.auth.signInWithOAuth({
             provider: "google",
             options: {
@@ -231,6 +257,7 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
     };
 
     const refreshUser = async () => {
+        const supabase = await getSupabase();
         const { data, error } = await supabase.auth.refreshSession();
         if (error) {
             console.error("Failed to refresh user:", error);
diff --git a/vercel.json b/vercel.json
index 8c37ee2..4b0a4be 100644
--- a/vercel.json
+++ b/vercel.json
@@ -3,6 +3,24 @@
   "framework": "vite",
   "installCommand": "pnpm install --frozen-lockfile",
   "headers": [
+    {
+      "source": "/static/(.*)",
+      "headers": [
+        {
+          "key": "Cache-Control",
+          "value": "public, max-age=31536000, immutable"
+        }
+      ]
+    },
+    {
+      "source": "/fonts/(.*)",
+      "headers": [
+        {
+          "key": "Cache-Control",
+          "value": "public, max-age=604800"
+        }
+      ]
+    },
     {
       "source": "/(.*)",
       "headers": [
diff --git a/vite.config.ts b/vite.config.ts
index 1b80964..2a62f0e 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -56,6 +56,7 @@ export default defineConfig(() => {
       ]
     },
     build: {
+      assetsDir: "static",
       commonjsOptions: {
         include: [/node_modules/],
         transformMixedEsModules: true