diff --git a/src/lib/components/Footer.svelte b/src/lib/components/Footer.svelte
new file mode 100644
index 0000000..0b28b5b
--- /dev/null
+++ b/src/lib/components/Footer.svelte
@@ -0,0 +1,36 @@
+<footer class="py-12 relative">
+  <div class="absolute inset-0 bg-black/20 backdrop-blur-sm"></div>
+  <div class="container mx-auto px-4 relative">
+    <div class="flex flex-col md:flex-row justify-between items-center gap-6 text-white/60">
+      <div>
+        <p class="text-lg">© 2025 yaerguOS. All rights reserved.</p>
+      </div>
+      <div class="flex gap-8">
+        <a href="#" class="hover:text-white transition-all duration-200 hover:-translate-y-1">
+          <span class="flex items-center gap-2">
+            <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 24 24">
+              <path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z"/>
+            </svg>
+            GitHub
+          </span>
+        </a>
+        <a href="#" class="hover:text-white transition-all duration-200 hover:-translate-y-1">
+          <span class="flex items-center gap-2">
+            <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 24 24">
+              <path d="M20.317 4.3698a19.7913 19.7913 0 00-4.8851-1.5152.0741.0741 0 00-.0785.0371c-.211.3753-.4447.8648-.6083 1.2495-1.8447-.2762-3.68-.2762-5.4868 0-.1636-.3847-.4058-.8742-.6177-1.2495a.077.077 0 00-.0785-.037 19.7363 19.7363 0 00-4.8852 1.515.0699.0699 0 00-.0321.0277C.5334 9.0458-.319 13.5799.0992 18.0578a.0824.0824 0 00.0312.0561c2.0528 1.5076 4.0413 2.4228 5.9929 3.0294a.0777.0777 0 00.0842-.0276c.4616-.6304.8731-1.2952 1.226-1.9942a.076.076 0 00-.0416-.1057c-.6528-.2476-1.2743-.5495-1.8722-.8923a.077.077 0 01-.0076-.1277c.1258-.0943.2517-.1923.3718-.2914a.0743.0743 0 01.0776-.0105c3.9278 1.7933 8.18 1.7933 12.0614 0a.0739.0739 0 01.0785.0095c.1202.099.246.1981.3728.2924a.077.077 0 01-.0066.1276 12.2986 12.2986 0 01-1.873.8914.0766.0766 0 00-.0407.1067c.3604.698.7719 1.3628 1.225 1.9932a.076.076 0 00.0842.0286c1.961-.6067 3.9495-1.5219 6.0023-3.0294a.077.077 0 00.0313-.0552c.5004-5.177-.8382-9.6739-3.5485-13.6604a.061.061 0 00-.0312-.0286zM8.02 15.3312c-1.1825 0-2.1569-1.0857-2.1569-2.419 0-1.3332.9555-2.4189 2.157-2.4189 1.2108 0 2.1757 1.0952 2.1568 2.419 0 1.3332-.9555 2.4189-2.1569 2.4189zm7.9748 0c-1.1825 0-2.1569-1.0857-2.1569-2.419 0-1.3332.9554-2.4189 2.1569-2.4189 1.2108 0 2.1757 1.0952 2.1568 2.419 0 1.3332-.946 2.4189-2.1568 2.4189Z"/>
+            </svg>
+            Discord
+          </span>
+        </a>
+        <a href="#" class="hover:text-white transition-all duration-200 hover:-translate-y-1">
+          <span class="flex items-center gap-2">
+            <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 24 24">
+              <path d="M23.953 4.57a10 10 0 01-2.825.775 4.958 4.958 0 002.163-2.723c-.951.555-2.005.959-3.127 1.184a4.92 4.92 0 00-8.384 4.482C7.69 8.095 4.067 6.13 1.64 3.162a4.822 4.822 0 00-.666 2.475c0 1.71.87 3.213 2.188 4.096a4.904 4.904 0 01-2.228-.616v.06a4.923 4.923 0 003.946 4.827 4.996 4.996 0 01-2.212.085 4.936 4.936 0 004.604 3.417 9.867 9.867 0 01-6.102 2.105c-.39 0-.779-.023-1.17-.067a13.995 13.995 0 007.557 2.209c9.053 0 13.998-7.496 13.998-13.985 0-.21 0-.42-.015-.63A9.935 9.935 0 0024 4.59z"/>
+            </svg>
+            Twitter
+          </span>
+        </a>
+      </div>
+    </div>
+  </div>
+</footer> 
\ No newline at end of file
diff --git a/src/lib/components/Navbar.svelte b/src/lib/components/Navbar.svelte
new file mode 100644
index 0000000..d4e511b
--- /dev/null
+++ b/src/lib/components/Navbar.svelte
@@ -0,0 +1,108 @@
+<script lang="ts">
+  import { page } from '$app/stores';
+  let isMenuOpen = false;
+
+  $: path = $page.url.pathname;
+</script>
+
+<header class="fixed top-0 left-0 right-0 z-50 bg-black/80 backdrop-blur px-6 py-4 border-b border-white/10">
+  <div class="max-w-7xl mx-auto flex justify-between items-center">
+    <a href="/" class="flex items-center gap-3 group">
+      <img src="/lilypad.png" alt="Logo" class="h-8 w-auto group-hover:scale-110 transition-transform duration-300">
+      <span class="text-white font-khand text-xl hidden sm:block">yaerguOS</span>
+    </a>
+
+    <nav class="hidden md:flex items-center gap-8">
+      <a 
+        href="/" 
+        class="relative text-white/80 hover:text-white font-khand transition-colors duration-200 hover:-translate-y-0.5 transform group"
+        class:active={path === '/'}
+      >
+        Home
+        <span class="absolute bottom-0 left-0 w-full h-0.5 bg-white/0 group-hover:bg-white/20 transform scale-x-0 group-hover:scale-x-100 transition-transform duration-200 {path === '/' ? '!scale-x-100 !bg-white/40' : ''}"></span>
+      </a>
+      <a 
+        href="/faq" 
+        class="relative text-white/80 hover:text-white font-khand transition-colors duration-200 hover:-translate-y-0.5 transform group"
+        class:active={path === '/faq'}
+      >
+        FAQ
+        <span class="absolute bottom-0 left-0 w-full h-0.5 bg-white/0 group-hover:bg-white/20 transform scale-x-0 group-hover:scale-x-100 transition-transform duration-200 {path === '/faq' ? '!scale-x-100 !bg-white/40' : ''}"></span>
+      </a>
+      <a 
+        href="/collaborators" 
+        class="relative text-white/80 hover:text-white font-khand transition-colors duration-200 hover:-translate-y-0.5 transform group"
+        class:active={path === '/collaborators'}
+      >
+        Collaborators
+        <span class="absolute bottom-0 left-0 w-full h-0.5 bg-white/0 group-hover:bg-white/20 transform scale-x-0 group-hover:scale-x-100 transition-transform duration-200 {path === '/collaborators' ? '!scale-x-100 !bg-white/40' : ''}"></span>
+      </a>
+      <a 
+        href="https://discord.com" 
+        target="_blank" 
+        rel="noopener noreferrer" 
+        class="px-4 py-2 bg-blue-600/20 hover:bg-blue-600/40 text-blue-400 hover:text-blue-300 rounded-lg font-khand transition-all duration-200"
+      >
+        Join Discord
+      </a>
+    </nav>
+
+    <button class="md:hidden text-white p-2" on:click={() => isMenuOpen = !isMenuOpen}>
+      <svg class="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+        {#if !isMenuOpen}
+          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16" />
+        {:else}
+          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+        {/if}
+      </svg>
+    </button>
+  </div>
+
+  {#if isMenuOpen}
+    <nav class="md:hidden absolute top-full left-0 right-0 bg-black/90 backdrop-blur-md border-b border-white/10 py-4 px-6">
+      <div class="flex flex-col gap-4">
+        <a 
+          href="/" 
+          class="relative text-white/80 hover:text-white font-khand transition-colors duration-200 {path === '/' ? 'text-white' : ''}"
+        >
+          Home
+          {#if path === '/'}
+            <span class="absolute -left-4 top-1/2 -translate-y-1/2 w-2 h-2 bg-white rounded-full"></span>
+          {/if}
+        </a>
+        <a 
+          href="/faq" 
+          class="relative text-white/80 hover:text-white font-khand transition-colors duration-200 {path === '/faq' ? 'text-white' : ''}"
+        >
+          FAQ
+          {#if path === '/faq'}
+            <span class="absolute -left-4 top-1/2 -translate-y-1/2 w-2 h-2 bg-white rounded-full"></span>
+          {/if}
+        </a>
+        <a 
+          href="/collaborators" 
+          class="relative text-white/80 hover:text-white font-khand transition-colors duration-200 {path === '/collaborators' ? 'text-white' : ''}"
+        >
+          Collaborators
+          {#if path === '/collaborators'}
+            <span class="absolute -left-4 top-1/2 -translate-y-1/2 w-2 h-2 bg-white rounded-full"></span>
+          {/if}
+        </a>
+        <a 
+          href="https://discord.com" 
+          target="_blank" 
+          rel="noopener noreferrer" 
+          class="px-4 py-2 bg-blue-600/20 hover:bg-blue-600/40 text-blue-400 hover:text-blue-300 rounded-lg font-khand transition-all duration-200 text-center"
+        >
+          Join Discord
+        </a>
+      </div>
+    </nav>
+  {/if}
+</header>
+
+<style>
+  .active {
+    @apply text-white;
+  }
+</style> 
\ No newline at end of file
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index c451f52..d403e2e 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,5 +1,20 @@
 <script lang="ts">
   import '../app.css';
+  import Navbar from '$lib/components/Navbar.svelte';
 </script>
 
-<slot /> 
\ No newline at end of file
+<Navbar />
+
+<main class="pt-16">
+  <slot />
+</main>
+
+<style>
+  :global(html) {
+    scroll-behavior: smooth;
+  }
+  
+  :global(body) {
+    @apply bg-gradient-to-b from-hero-top via-hero-bottom to-features-bg text-white;
+  }
+</style> 
\ No newline at end of file
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 6c2e0b6..e0cf587 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-  import '../app.css';
-  import { fade, fly, scale } from 'svelte/transition';
+  import { fade, fly } from 'svelte/transition';
   import { onMount } from 'svelte';
+  import Footer from '$lib/components/Footer.svelte';
 
   let mounted = false;
   onMount(() => {
@@ -9,59 +9,45 @@
   });
 </script>
 
-<header class="bg-black px-8 py-4 flex justify-between items-center">
-  <!-- Logo that redirects to the home page -->
-  <div class="cursor-pointer" on:click={() => window.location.href = '/'}>
-    <img src="/lilypad.png" alt="Logo" class="h-10"> <!-- Replace with your logo -->
-  </div>
-
-  <!-- Navigation links -->
-  <nav class="flex gap-8">
-    <a href="https://discord.com" target="_blank" rel="noopener noreferrer" class="text-white font-khand hover:text-blue-400 transition-colors">Discord</a>
-    <a href="/faq" class="text-white font-khand hover:text-blue-400 transition-colors">FAQ</a>
-    <a href="/collaborators" class="text-white font-khand hover:text-blue-400 transition-colors">Collaborators</a>
-    <a href="/download" class="text-white font-khand hover:text-blue-400 transition-colors">Download</a>
-  </nav>
-</header>
-
 <main class="min-h-screen flex flex-col">
-  <section class="py-32 text-center relative overflow-hidden">
-    <div class="absolute inset-0 bg-gradient-radial from-hero-top/20 to-transparent pointer-events-none"></div>
+  <section class="py-16 text-center relative overflow-hidden">
+    <div class="absolute inset-0 bg-gradient-radial from-hero-top/30 via-hero-bottom/20 to-transparent pointer-events-none"></div>
     <div class="absolute inset-0 opacity-30">
       <div class="absolute top-20 left-20 w-72 h-72 bg-text-primary/20 rounded-full filter blur-3xl animate-pulse"></div>
       <div class="absolute bottom-20 right-20 w-96 h-96 bg-hero-top/30 rounded-full filter blur-3xl animate-pulse" style="animation-delay: 1s;"></div>
+      <div class="absolute top-40 right-40 w-48 h-48 bg-white/10 rounded-full filter blur-2xl animate-float"></div>
     </div>
     
     <div class="container mx-auto px-4 relative">
       {#if mounted}
-        <div in:fly={{ y: -20, duration: 800 }} class="space-y-8">
-          <div class="inline-block px-6 py-2 rounded-full bg-white/5 backdrop-blur-sm border border-white/10 text-white/80 text-sm mb-4 shadow-lg">
+        <div in:fly={{ y: -20, duration: 800 }} class="space-y-6">
+          <div class="inline-block px-4 py-1.5 rounded-full bg-white/5 backdrop-blur-sm border border-white/10 text-white/80 text-sm shadow-lg hover:bg-white/10 transition-all duration-300">
             <span class="mr-2 inline-block w-2 h-2 bg-text-primary rounded-full animate-pulse"></span>
             Coming Soon
           </div>
           
-          <div class="flex items-center gap-4 justify-center">
-            <h1 class="text-7xl font-khand text-transparent bg-gradient-to-r from-white to-white/80 bg-clip-text leading-tight">yaerguOS</h1>
-            <img src="/lilypad.png" alt="lilypad" class="h-24 w-auto " />
+          <div class="flex items-center gap-4 justify-center group">
+            <h1 class="text-6xl font-khand text-transparent bg-gradient-to-r from-white via-white/90 to-white/80 bg-clip-text leading-tight hover:scale-105 transition-transform duration-300">yaerguOS</h1>
+            <img src="/lilypad.png" alt="lilypad" class="h-20 w-auto animate-float hover:scale-110 transition-transform duration-300" />
           </div>
           
-          <div class="max-w-2xl mx-auto space-y-4">
-            <p class="text-xl text-white/90">A modern, highly optimized arch-based linux distribution powered by KDE plasma.</p>
-            <p class="text-lg text-white/80">Built for looks, performance and ease of use.</p>
+          <div class="max-w-2xl mx-auto space-y-2">
+            <p class="text-lg text-white/90 hover:text-white transition-colors duration-300">A modern, highly optimized arch-based linux distribution powered by KDE plasma.</p>
+            <p class="text-base text-white/80 hover:text-white/90 transition-colors duration-300">Built for looks, performance and ease of use.</p>
           </div>
           
-          <div class="flex justify-center gap-4 mt-8">
-          <a href="https://discord.com" target="_blank" rel="noopener noreferrer">
-            <button class="group px-8 py-3 rounded-lg bg-white/10 backdrop-blur-sm border border-white/10 text-white hover:bg-white/20 transition-all duration-300 shadow-lg hover:shadow-xl">
-              <span class="flex items-center gap-2">
-                Join Discord
-                <svg class="w-4 h-4 transition-transform group-hover:translate-x-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                  <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 7l5 5m0 0l-5 5m5-5H6" />
-                </svg>
-              </span>
-            </button>
+          <div class="flex justify-center gap-4 mt-4">
+            <a href="https://discord.com" target="_blank" rel="noopener noreferrer" class="transform hover:scale-105 transition-all duration-300">
+              <button class="group px-6 py-2 rounded-lg bg-white/10 backdrop-blur-sm border border-white/10 text-white hover:bg-white/20 transition-all duration-300 shadow-lg hover:shadow-xl">
+                <span class="flex items-center gap-2">
+                  Join Discord
+                  <svg class="w-4 h-4 transition-transform group-hover:translate-x-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 7l5 5m0 0l-5 5m5-5H6" />
+                  </svg>
+                </span>
+              </button>
             </a>
-            <button class="group px-8 py-3 rounded-lg bg-text-primary/20 backdrop-blur-sm border border-text-primary/30 text-text-primary hover:bg-text-primary/30 transition-all duration-300 shadow-lg hover:shadow-xl">
+            <button class="group px-6 py-2 rounded-lg bg-text-primary/20 backdrop-blur-sm border border-text-primary/30 text-text-primary hover:bg-text-primary/30 transition-all duration-300 shadow-lg hover:shadow-xl transform hover:scale-105">
               <span class="flex items-center gap-2">
                 Learn More
                 <svg class="w-4 h-4 transition-transform group-hover:translate-x-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
@@ -75,86 +61,87 @@
     </div>
   </section>
 
-  <section class="py-32 relative flex-grow overflow-hidden">
-    <div class="absolute inset-0 bg-gradient-radial from-features-bg/50 to-transparent pointer-events-none"></div>
+  <section class="py-20 relative flex-grow overflow-hidden">
+    <div class="absolute inset-0 bg-gradient-radial from-features-bg/50 via-hero-bottom/30 to-transparent pointer-events-none"></div>
     <div class="absolute inset-0 opacity-30">
       <div class="absolute top-40 right-20 w-64 h-64 bg-text-primary/10 rounded-full filter blur-3xl animate-pulse"></div>
       <div class="absolute bottom-40 left-20 w-80 h-80 bg-hero-top/20 rounded-full filter blur-3xl animate-pulse" style="animation-delay: 2s;"></div>
+      <div class="absolute top-60 left-40 w-56 h-56 bg-white/5 rounded-full filter blur-2xl animate-float" style="animation-delay: 1.5s;"></div>
     </div>
     
     <div class="container mx-auto px-4 relative">
       {#if mounted}
-        <h2 class="text-4xl font-bold text-center mb-24 text-transparent bg-gradient-to-r from-white to-white/80 bg-clip-text" in:fade={{ duration: 800, delay: 200 }}>
+        <h2 class="text-3xl font-bold text-center mb-16 text-transparent bg-gradient-to-r from-white via-white/90 to-white/80 bg-clip-text hover:scale-105 transition-transform duration-300" in:fade={{ duration: 800, delay: 200 }}>
           Features that separate the yaergu system from any other
         </h2>
         <div class="grid grid-cols-1 md:grid-cols-3 gap-8 max-w-6xl mx-auto" in:fade={{ duration: 800, delay: 400 }}>
-          <div class="group bg-white/5 backdrop-blur-md rounded-xl p-8 border border-white/10 hover:bg-white/10 transition-all duration-300 hover:shadow-2xl hover:-translate-y-1">
-            <div class="mb-8">
-              <div class="w-20 h-20 mb-6 bg-gradient-to-br from-hero-top to-text-primary/30 rounded-xl p-4 group-hover:scale-110 transition-transform duration-300 shadow-lg">
-                <img src="/ayva.png" alt="Ayva" class="w-full h-full" />
+          <div class="group bg-white/5 backdrop-blur-md rounded-xl p-6 border border-white/10 hover:bg-white/10 transition-all duration-500 hover:shadow-2xl hover:-translate-y-2">
+            <div class="mb-6">
+              <div class="w-16 h-16 mb-4 bg-gradient-to-br from-hero-top to-text-primary/30 rounded-xl p-3 group-hover:scale-110 transition-transform duration-500 shadow-lg group-hover:shadow-text-primary/20">
+                <img src="/ayva.png" alt="Ayva" class="w-full h-full transform group-hover:rotate-6 transition-transform duration-500" />
               </div>
-              <h3 class="text-2xl font-khand text-transparent bg-gradient-to-r from-white to-white/90 bg-clip-text">Ayva</h3>
+              <h3 class="text-xl font-khand text-transparent bg-gradient-to-r from-white to-white/90 bg-clip-text group-hover:scale-105 transition-transform duration-300">Ayva</h3>
             </div>
-            <p class="text-text-muted mb-8">Voice assistant bundled with yaerguOS, designed to be easy to use and to help the user with their tasks, provide info and more.</p>
-            <ul class="space-y-3">
-              <li class="flex items-center gap-3 text-text-muted group-hover:text-white/80 transition-colors duration-300">
-                <span class="text-text-primary text-lg">✓</span>
+            <p class="text-text-muted mb-4 text-sm group-hover:text-white/80 transition-colors duration-300">Voice assistant bundled with yaerguOS, designed to be easy to use and to help the user with their tasks, provide info and more.</p>
+            <ul class="space-y-2 text-sm">
+              <li class="flex items-center gap-2 text-text-muted group-hover:text-white/80 transition-colors duration-300">
+                <span class="text-text-primary transform group-hover:scale-110 transition-transform duration-300">✓</span>
                 Open websites, apps and more
               </li>
-              <li class="flex items-center gap-3 text-text-muted group-hover:text-white/80 transition-colors duration-300">
-                <span class="text-text-primary text-lg">✓</span>
+              <li class="flex items-center gap-2 text-text-muted group-hover:text-white/80 transition-colors duration-300">
+                <span class="text-text-primary transform group-hover:scale-110 transition-transform duration-300">✓</span>
                 Assist in everyday tasks
               </li>
-              <li class="flex items-center gap-3 text-text-muted group-hover:text-white/80 transition-colors duration-300">
-                <span class="text-yellow-500 text-lg">~</span>
+              <li class="flex items-center gap-2 text-text-muted group-hover:text-white/80 transition-colors duration-300">
+                <span class="text-yellow-500 transform group-hover:scale-110 transition-transform duration-300">~</span>
                 AI powered answers (WIP)
               </li>
             </ul>
           </div>
 
-          <div class="group bg-white/5 backdrop-blur-md rounded-xl p-8 border border-white/10 hover:bg-white/10 transition-all duration-300 hover:shadow-2xl hover:-translate-y-1">
-            <div class="mb-8">
-              <div class="w-20 h-20 mb-6 bg-gradient-to-br from-hero-top to-text-primary/30 rounded-xl p-4 group-hover:scale-110 transition-transform duration-300 shadow-lg">
-                <img src="/yns-icon.svg" alt="YNS" class="w-full h-full" />
+          <div class="group bg-white/5 backdrop-blur-md rounded-xl p-6 border border-white/10 hover:bg-white/10 transition-all duration-500 hover:shadow-2xl hover:-translate-y-2">
+            <div class="mb-6">
+              <div class="w-16 h-16 mb-4 bg-gradient-to-br from-hero-top to-text-primary/30 rounded-xl p-3 group-hover:scale-110 transition-transform duration-500 shadow-lg group-hover:shadow-text-primary/20">
+                <img src="/yns-icon.svg" alt="YNS" class="w-full h-full transform group-hover:rotate-6 transition-transform duration-500" />
               </div>
-              <h3 class="text-2xl font-khand text-transparent bg-gradient-to-r from-white to-white/90 bg-clip-text">YNS</h3>
+              <h3 class="text-xl font-khand text-transparent bg-gradient-to-r from-white to-white/90 bg-clip-text group-hover:scale-105 transition-transform duration-300">YNS</h3>
             </div>
-            <p class="text-text-muted mb-8">Package manager with fast installation, wide variety of yaerguOS utilites, and not resource heavy.</p>
-            <ul class="space-y-3">
-              <li class="flex items-center gap-3 text-text-muted group-hover:text-white/80 transition-colors duration-300">
-                <span class="text-text-primary text-lg">✓</span>
+            <p class="text-text-muted mb-4 text-sm group-hover:text-white/80 transition-colors duration-300">Package manager with fast installation, wide variety of yaerguOS utilites, and not resource heavy.</p>
+            <ul class="space-y-2 text-sm">
+              <li class="flex items-center gap-2 text-text-muted group-hover:text-white/80 transition-colors duration-300">
+                <span class="text-text-primary transform group-hover:scale-110 transition-transform duration-300">✓</span>
                 Install apps and games
               </li>
-              <li class="flex items-center gap-3 text-text-muted group-hover:text-white/80 transition-colors duration-300">
-                <span class="text-text-primary text-lg">✓</span>
+              <li class="flex items-center gap-2 text-text-muted group-hover:text-white/80 transition-colors duration-300">
+                <span class="text-text-primary transform group-hover:scale-110 transition-transform duration-300">✓</span>
                 Easy updates
               </li>
-              <li class="flex items-center gap-3 text-text-muted group-hover:text-white/80 transition-colors duration-300">
-                <span class="text-text-primary text-lg">✓</span>
+              <li class="flex items-center gap-2 text-text-muted group-hover:text-white/80 transition-colors duration-300">
+                <span class="text-text-primary transform group-hover:scale-110 transition-transform duration-300">✓</span>
                 GUI and CLI interface
               </li>
             </ul>
           </div>
 
-          <div class="group bg-white/5 backdrop-blur-md rounded-xl p-8 border border-white/10 hover:bg-white/10 transition-all duration-300 hover:shadow-2xl hover:-translate-y-1">
-            <div class="mb-8">
-              <div class="w-20 h-20 mb-6 bg-gradient-to-br from-hero-top to-text-primary/30 rounded-xl p-4 group-hover:scale-110 transition-transform duration-300 shadow-lg">
-                <img src="/discover.png" alt="Discover" class="w-full h-full" />
+          <div class="group bg-white/5 backdrop-blur-md rounded-xl p-6 border border-white/10 hover:bg-white/10 transition-all duration-500 hover:shadow-2xl hover:-translate-y-2">
+            <div class="mb-6">
+              <div class="w-16 h-16 mb-4 bg-gradient-to-br from-hero-top to-text-primary/30 rounded-xl p-3 group-hover:scale-110 transition-transform duration-500 shadow-lg group-hover:shadow-text-primary/20">
+                <img src="/discover.png" alt="Discover" class="w-full h-full transform group-hover:rotate-6 transition-transform duration-500" />
               </div>
-              <h3 class="text-2xl font-khand text-transparent bg-gradient-to-r from-white to-white/90 bg-clip-text">Discover</h3>
+              <h3 class="text-xl font-khand text-transparent bg-gradient-to-r from-white to-white/90 bg-clip-text group-hover:scale-105 transition-transform duration-300">Discover</h3>
             </div>
-            <p class="text-text-muted mb-8">Software center with a wide variety of apps from flathub including vscodium, vlc etc.. Built-in discover app from kde plasma.</p>
-            <ul class="space-y-3">
-              <li class="flex items-center gap-3 text-text-muted group-hover:text-white/80 transition-colors duration-300">
-                <span class="text-text-primary text-lg">✓</span>
+            <p class="text-text-muted mb-4 text-sm group-hover:text-white/80 transition-colors duration-300">Software center with a wide variety of apps from flathub including vscodium, vlc etc.. Built-in discover app from kde plasma.</p>
+            <ul class="space-y-2 text-sm">
+              <li class="flex items-center gap-2 text-text-muted group-hover:text-white/80 transition-colors duration-300">
+                <span class="text-text-primary transform group-hover:scale-110 transition-transform duration-300">✓</span>
                 Wide variety
               </li>
-              <li class="flex items-center gap-3 text-text-muted group-hover:text-white/80 transition-colors duration-300">
-                <span class="text-text-primary text-lg">✓</span>
+              <li class="flex items-center gap-2 text-text-muted group-hover:text-white/80 transition-colors duration-300">
+                <span class="text-text-primary transform group-hover:scale-110 transition-transform duration-300">✓</span>
                 Fast downloads
               </li>
-              <li class="flex items-center gap-3 text-text-muted group-hover:text-white/80 transition-colors duration-300">
-                <span class="text-text-primary text-lg">✓</span>
+              <li class="flex items-center gap-2 text-text-muted group-hover:text-white/80 transition-colors duration-300">
+                <span class="text-text-primary transform group-hover:scale-110 transition-transform duration-300">✓</span>
                 From KDE
               </li>
             </ul>
@@ -164,56 +151,27 @@
     </div>
   </section>
 
-  <footer class="py-12 relative">
-    <div class="absolute inset-0 bg-black/20 backdrop-blur-sm"></div>
-    <div class="container mx-auto px-4 relative">
-      <div class="flex flex-col md:flex-row justify-between items-center gap-6 text-white/60">
-        <div>
-          <p class="text-lg">© 2025 yaerguOS. All rights reserved.</p>
-        </div>
-        <div class="flex gap-8">
-          <a href="#" class="hover:text-white transition-all duration-200 hover:-translate-y-1">
-            <span class="flex items-center gap-2">
-              <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 24 24">
-                <path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z"/>
-              </svg>
-              GitHub
-            </span>
-          </a>
-          <a href="#" class="hover:text-white transition-all duration-200 hover:-translate-y-1">
-            <span class="flex items-center gap-2">
-              <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 24 24">
-                <path d="M20.317 4.3698a19.7913 19.7913 0 00-4.8851-1.5152.0741.0741 0 00-.0785.0371c-.211.3753-.4447.8648-.6083 1.2495-1.8447-.2762-3.68-.2762-5.4868 0-.1636-.3847-.4058-.8742-.6177-1.2495a.077.077 0 00-.0785-.037 19.7363 19.7363 0 00-4.8852 1.515.0699.0699 0 00-.0321.0277C.5334 9.0458-.319 13.5799.0992 18.0578a.0824.0824 0 00.0312.0561c2.0528 1.5076 4.0413 2.4228 5.9929 3.0294a.0777.0777 0 00.0842-.0276c.4616-.6304.8731-1.2952 1.226-1.9942a.076.076 0 00-.0416-.1057c-.6528-.2476-1.2743-.5495-1.8722-.8923a.077.077 0 01-.0076-.1277c.1258-.0943.2517-.1923.3718-.2914a.0743.0743 0 01.0776-.0105c3.9278 1.7933 8.18 1.7933 12.0614 0a.0739.0739 0 01.0785.0095c.1202.099.246.1981.3728.2924a.077.077 0 01-.0066.1276 12.2986 12.2986 0 01-1.873.8914.0766.0766 0 00-.0407.1067c.3604.698.7719 1.3628 1.225 1.9932a.076.076 0 00.0842.0286c1.961-.6067 3.9495-1.5219 6.0023-3.0294a.077.077 0 00.0313-.0552c.5004-5.177-.8382-9.6739-3.5485-13.6604a.061.061 0 00-.0312-.0286zM8.02 15.3312c-1.1825 0-2.1569-1.0857-2.1569-2.419 0-1.3332.9555-2.4189 2.157-2.4189 1.2108 0 2.1757 1.0952 2.1568 2.419 0 1.3332-.9555 2.4189-2.1569 2.4189zm7.9748 0c-1.1825 0-2.1569-1.0857-2.1569-2.419 0-1.3332.9554-2.4189 2.1569-2.4189 1.2108 0 2.1757 1.0952 2.1568 2.419 0 1.3332-.946 2.4189-2.1568 2.4189Z"/>
-              </svg>
-              Discord
-            </span>
-          </a>
-          <a href="#" class="hover:text-white transition-all duration-200 hover:-translate-y-1">
-            <span class="flex items-center gap-2">
-              <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 24 24">
-                <path d="M23.953 4.57a10 10 0 01-2.825.775 4.958 4.958 0 002.163-2.723c-.951.555-2.005.959-3.127 1.184a4.92 4.92 0 00-8.384 4.482C7.69 8.095 4.067 6.13 1.64 3.162a4.822 4.822 0 00-.666 2.475c0 1.71.87 3.213 2.188 4.096a4.904 4.904 0 01-2.228-.616v.06a4.923 4.923 0 003.946 4.827 4.996 4.996 0 01-2.212.085 4.936 4.936 0 004.604 3.417 9.867 9.867 0 01-6.102 2.105c-.39 0-.779-.023-1.17-.067a13.995 13.995 0 007.557 2.209c9.053 0 13.998-7.496 13.998-13.985 0-.21 0-.42-.015-.63A9.935 9.935 0 0024 4.59z"/>
-              </svg>
-              Twitter
-            </span>
-          </a>
-        </div>
-      </div>
-    </div>
-  </footer>
+  <Footer />
 </main>
 
 <style>
-  :global(html) {
-    scroll-behavior: smooth;
-  }
-
   @keyframes float {
-    0% { transform: translateY(0px); }
-    50% { transform: translateY(-10px); }
-    100% { transform: translateY(0px); }
+    0% { transform: translateY(0px) rotate(0deg); }
+    50% { transform: translateY(-10px) rotate(2deg); }
+    100% { transform: translateY(0px) rotate(0deg); }
   }
 
   .animate-float {
-    animation: float 3s ease-in-out infinite;
+    animation: float 6s ease-in-out infinite;
+  }
+
+  @keyframes glow {
+    0% { box-shadow: 0 0 5px rgba(76, 175, 80, 0.2); }
+    50% { box-shadow: 0 0 20px rgba(76, 175, 80, 0.4); }
+    100% { box-shadow: 0 0 5px rgba(76, 175, 80, 0.2); }
+  }
+
+  :global(.glow-effect) {
+    animation: glow 3s ease-in-out infinite;
   }
 </style>
diff --git a/src/routes/collaborators/+page.svelte b/src/routes/collaborators/+page.svelte
index 3cd2f8a..e99a196 100644
--- a/src/routes/collaborators/+page.svelte
+++ b/src/routes/collaborators/+page.svelte
@@ -1,137 +1,135 @@
 <script lang="ts">
-  import '../../app.css';
-  import { fade, fly, scale } from 'svelte/transition';
+  import { fade, slide } from 'svelte/transition';
   import { onMount } from 'svelte';
 
   let mounted = false;
   onMount(() => {
     mounted = true;
   });
+
+  const collaborators = [
+    {
+      name: "spitkov",
+      role: "Web Developer",
+      description: "Lead web developer responsible for the new YNS CLI and GUI interfaces. Specializes in creating intuitive and efficient user experiences.",
+      image: "/spitkov.png",
+      skills: ["Web Development", "UI/UX Design", "CLI Development"],
+      links: {
+        github: "https://github.com/spitkov",
+        discord: "spitkov"
+      }
+    },
+    {
+      name: "maybe.asdf",
+      role: "Project Lead",
+      description: "Project founder and lead architect of yaerguOS. Oversees the overall direction and development of the distribution.",
+      image: "/maybe.png",
+      skills: ["System Architecture", "Linux Development", "Project Management"],
+      links: {
+        discord: "maybe.asdf"
+      }
+    }
+  ];
 </script>
 
-<header class="bg-black px-8 py-4 flex justify-between items-center">
-  <!-- Logo that redirects to the home page -->
-  <div class="cursor-pointer" on:click={() => window.location.href = '/'}>
-    <img src="/lilypad.png" alt="Logo" class="h-10"> <!-- Replace with your logo -->
-  </div>
-
-  <!-- Navigation links -->
-  <nav class="flex gap-8">
-    <a href="https://discord.com" target="_blank" rel="noopener noreferrer" class="text-white font-khand hover:text-blue-400 transition-colors">Discord</a>
-    <a href="/faq" class="text-white font-khand hover:text-blue-400 transition-colors">FAQ</a>
-    <a href="/collaborators" class="text-white font-khand hover:text-blue-400 transition-colors">Collaborators</a>
-    <a href="/download" class="text-white font-khand hover:text-blue-400 transition-colors">Download</a>
-  </nav>
-</header>
-
-<main class="min-h-screen flex flex-col">
-  <section class="py-32 text-center relative overflow-hidden">
-    <div class="absolute inset-0 bg-gradient-radial from-hero-top/20 to-transparent pointer-events-none"></div>
-    <div class="absolute inset-0 opacity-30">
-      <div class="absolute top-20 left-20 w-72 h-72 bg-text-primary/20 rounded-full filter blur-3xl animate-pulse"></div>
-      <div class="absolute bottom-20 right-20 w-96 h-96 bg-hero-top/30 rounded-full filter blur-3xl animate-pulse" style="animation-delay: 1s;"></div>
-    </div>
-    
-    <div class="container mx-auto px-4 relative">
-      {#if mounted}
-        <div in:fly={{ y: -20, duration: 800 }} class="space-y-8">
-                    
-          <div class="flex items-center gap-4 justify-center">
-            <h1 class="text-7xl font-khand text-transparent bg-gradient-to-r from-white to-white/80 bg-clip-text leading-normal">yaerguOS</h1>
-            <img src="/lilypad.png" alt="lilypad" class="h-24 w-auto " />
-          </div>
-          
-          <div class="max-w-2xl mx-auto space-y-4">
-            <p class="text-4xl text-white/90 font-khand">FAQ</p>
-          </div>
-          
-          <div class="flex justify-center gap-4 mt-8">
-          </div>
-        </div>
-      {/if}
-    </div>
-  </section>
-
-  <section class="py-32 relative flex-grow overflow-hidden">
-    <div class="absolute inset-0 bg-gradient-radial from-features-bg/50 to-transparent pointer-events-none"></div>
-    <div class="absolute inset-0 opacity-30">
-      <div class="absolute top-40 right-20 w-64 h-64 bg-text-primary/10 rounded-full filter blur-3xl animate-pulse"></div>
-      <div class="absolute bottom-40 left-20 w-80 h-80 bg-hero-top/20 rounded-full filter blur-3xl animate-pulse" style="animation-delay: 2s;"></div>
-    </div>
-    
-    <div class="container mx-auto px-4 relative">
-      {#if mounted}
-                    <div class="group bg-white/5 backdrop-blur-md rounded-xl p-4 border border-white/10 hover:bg-white/10 transition-all duration-300 hover:shadow-2xl hover:-translate-y-1 flex items-center">
-  <!-- Image section -->
-  <div class="w-32 h-32 mb-0 bg-gradient-to-br from-hero-left to-text-primary/30 rounded-xl p-2 group-hover:scale-110 transition-transform duration-300 shadow-lg flex-shrink-0">
-    <img src="/spitkov.png" alt="Spitkov" class="w-full h-full object-cover rounded" />
-  </div>
-  
-  <!-- Text section -->
-  <div class="ml-6">
-    <h3 class="text-2xl font-khand text-transparent bg-gradient-to-r from-white to-white/90 bg-clip-text">Spitkov</h3>
-    <p class="text-text-muted mt-2">Web Dev, new yns CLI and yns GUI</p>
-  </div>
-</div>
-
-<div class="grid grid-cols-1 md:grid-cols-3 gap-8 max-w-6xl mx-auto" in:fade={{ duration: 800, delay: 400 }}>
-</div>
-
-
-      {/if}
-    </div>
-  </section>
-
-  <footer class="py-12 relative">
-    <div class="absolute inset-0 bg-black/20 backdrop-blur-sm"></div>
-    <div class="container mx-auto px-4 relative">
-      <div class="flex flex-col md:flex-row justify-between items-center gap-6 text-white/60">
-        <div>
-          <p class="text-lg">© 2025 yaerguOS. All rights reserved.</p>
-        </div>
-        <div class="flex gap-8">
-          <a href="#" class="hover:text-white transition-all duration-200 hover:-translate-y-1">
-            <span class="flex items-center gap-2">
-              <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 24 24">
-                <path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z"/>
-              </svg>
-              GitHub
-            </span>
-          </a>
-          <a href="#" class="hover:text-white transition-all duration-200 hover:-translate-y-1">
-            <span class="flex items-center gap-2">
-              <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 24 24">
-                <path d="M20.317 4.3698a19.7913 19.7913 0 00-4.8851-1.5152.0741.0741 0 00-.0785.0371c-.211.3753-.4447.8648-.6083 1.2495-1.8447-.2762-3.68-.2762-5.4868 0-.1636-.3847-.4058-.8742-.6177-1.2495a.077.077 0 00-.0785-.037 19.7363 19.7363 0 00-4.8852 1.515.0699.0699 0 00-.0321.0277C.5334 9.0458-.319 13.5799.0992 18.0578a.0824.0824 0 00.0312.0561c2.0528 1.5076 4.0413 2.4228 5.9929 3.0294a.0777.0777 0 00.0842-.0276c.4616-.6304.8731-1.2952 1.226-1.9942a.076.076 0 00-.0416-.1057c-.6528-.2476-1.2743-.5495-1.8722-.8923a.077.077 0 01-.0076-.1277c.1258-.0943.2517-.1923.3718-.2914a.0743.0743 0 01.0776-.0105c3.9278 1.7933 8.18 1.7933 12.0614 0a.0739.0739 0 01.0785.0095c.1202.099.246.1981.3728.2924a.077.077 0 01-.0066.1276 12.2986 12.2986 0 01-1.873.8914.0766.0766 0 00-.0407.1067c.3604.698.7719 1.3628 1.225 1.9932a.076.076 0 00.0842.0286c1.961-.6067 3.9495-1.5219 6.0023-3.0294a.077.077 0 00.0313-.0552c.5004-5.177-.8382-9.6739-3.5485-13.6604a.061.061 0 00-.0312-.0286zM8.02 15.3312c-1.1825 0-2.1569-1.0857-2.1569-2.419 0-1.3332.9555-2.4189 2.157-2.4189 1.2108 0 2.1757 1.0952 2.1568 2.419 0 1.3332-.9555 2.4189-2.1569 2.4189zm7.9748 0c-1.1825 0-2.1569-1.0857-2.1569-2.419 0-1.3332.9554-2.4189 2.1569-2.4189 1.2108 0 2.1757 1.0952 2.1568 2.419 0 1.3332-.946 2.4189-2.1568 2.4189Z"/>
-              </svg>
-              Discord
-            </span>
-          </a>
-          <a href="#" class="hover:text-white transition-all duration-200 hover:-translate-y-1">
-            <span class="flex items-center gap-2">
-              <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 24 24">
-                <path d="M23.953 4.57a10 10 0 01-2.825.775 4.958 4.958 0 002.163-2.723c-.951.555-2.005.959-3.127 1.184a4.92 4.92 0 00-8.384 4.482C7.69 8.095 4.067 6.13 1.64 3.162a4.822 4.822 0 00-.666 2.475c0 1.71.87 3.213 2.188 4.096a4.904 4.904 0 01-2.228-.616v.06a4.923 4.923 0 003.946 4.827 4.996 4.996 0 01-2.212.085 4.936 4.936 0 004.604 3.417 9.867 9.867 0 01-6.102 2.105c-.39 0-.779-.023-1.17-.067a13.995 13.995 0 007.557 2.209c9.053 0 13.998-7.496 13.998-13.985 0-.21 0-.42-.015-.63A9.935 9.935 0 0024 4.59z"/>
-              </svg>
-              Twitter
-            </span>
-          </a>
-        </div>
+<div class="min-h-screen py-24 px-4 sm:px-6 lg:px-8">
+  <div class="max-w-7xl mx-auto">
+    {#if mounted}
+      <div in:fade={{ duration: 800 }} class="text-center mb-16">
+        <h1 class="text-5xl sm:text-6xl font-khand mb-6 text-transparent bg-gradient-to-r from-white to-white/80 bg-clip-text">
+          Meet Our Team
+        </h1>
+        <p class="text-lg text-white/80 max-w-2xl mx-auto">
+          The talented individuals behind yaerguOS, working together to create a modern and efficient Linux distribution.
+        </p>
       </div>
-    </div>
-  </footer>
-</main>
+
+      <div class="grid grid-cols-1 md:grid-cols-2 gap-8">
+        {#each collaborators as collaborator, index}
+          <div 
+            class="bg-white/5 backdrop-blur-sm rounded-xl p-6 border border-white/10 hover:bg-white/10 transition-all duration-300 hover:shadow-2xl hover:-translate-y-1"
+            in:fade={{ duration: 800, delay: 200 + index * 100 }}
+          >
+            <div class="flex items-start gap-6">
+              <div class="w-32 h-32 rounded-xl bg-gradient-to-br from-hero-top to-text-primary/30 p-2 shadow-lg flex-shrink-0 overflow-hidden transition-transform duration-300 group-hover:scale-105">
+                <img 
+                  src={collaborator.image} 
+                  alt={collaborator.name}
+                  class="w-full h-full object-cover rounded-lg"
+                />
+              </div>
+
+              <div class="flex-1">
+                <h3 class="text-2xl font-khand text-transparent bg-gradient-to-r from-white to-white/90 bg-clip-text mb-1">
+                  {collaborator.name}
+                </h3>
+                <p class="text-blue-400 font-khand mb-3">{collaborator.role}</p>
+                <p class="text-white/70 text-sm mb-4">{collaborator.description}</p>
+                
+                <div class="mb-4">
+                  <h4 class="text-white/60 text-sm mb-2">Expertise</h4>
+                  <div class="flex flex-wrap gap-2">
+                    {#each collaborator.skills as skill}
+                      <span class="px-2 py-1 bg-white/10 rounded-full text-xs text-white/80">
+                        {skill}
+                      </span>
+                    {/each}
+                  </div>
+                </div>
+
+                <div class="flex gap-4">
+                  {#if collaborator.links.github}
+                    <a 
+                      href={collaborator.links.github}
+                      target="_blank"
+                      rel="noopener noreferrer"
+                      class="text-white/60 hover:text-white transition-colors duration-200"
+                    >
+                      <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 24 24">
+                        <path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z"/>
+                      </svg>
+                    </a>
+                  {/if}
+                  {#if collaborator.links.discord}
+                    <div class="text-white/60 flex items-center gap-2">
+                      <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 24 24">
+                        <path d="M20.317 4.3698a19.7913 19.7913 0 00-4.8851-1.5152.0741.0741 0 00-.0785.0371c-.211.3753-.4447.8648-.6083 1.2495-1.8447-.2762-3.68-.2762-5.4868 0-.1636-.3847-.4058-.8742-.6177-1.2495a.077.077 0 00-.0785-.037 19.7363 19.7363 0 00-4.8852 1.515.0699.0699 0 00-.0321.0277C.5334 9.0458-.319 13.5799.0992 18.0578a.0824.0824 0 00.0312.0561c2.0528 1.5076 4.0413 2.4228 5.9929 3.0294a.0777.0777 0 00.0842-.0276c.4616-.6304.8731-1.2952 1.226-1.9942a.076.076 0 00-.0416-.1057c-.6528-.2476-1.2743-.5495-1.8722-.8923a.077.077 0 01-.0076-.1277c.1258-.0943.2517-.1923.3718-.2914a.0743.0743 0 01.0776-.0105c3.9278 1.7933 8.18 1.7933 12.0614 0a.0739.0739 0 01.0785.0095c.1202.099.246.1981.3728.2924a.077.077 0 01-.0066.1276 12.2986 12.2986 0 01-1.873.8914.0766.0766 0 00-.0407.1067c.3604.698.7719 1.3628 1.225 1.9932a.076.076 0 00.0842.0286c1.961-.6067 3.9495-1.5219 6.0023-3.0294a.077.077 0 00.0313-.0552c.5004-5.177-.8382-9.6739-3.5485-13.6604a.061.061 0 00-.0312-.0286zM8.02 15.3312c-1.1825 0-2.1569-1.0857-2.1569-2.419 0-1.3332.9555-2.4189 2.157-2.4189 1.2108 0 2.1757 1.0952 2.1568 2.419 0 1.3332-.9555 2.4189-2.1569 2.4189zm7.9748 0c-1.1825 0-2.1569-1.0857-2.1569-2.419 0-1.3332.9554-2.4189 2.1569-2.4189 1.2108 0 2.1757 1.0952 2.1568 2.419 0 1.3332-.946 2.4189-2.1568 2.4189Z"/>
+                      </svg>
+                      <span class="text-sm">{collaborator.links.discord}</span>
+                    </div>
+                  {/if}
+                </div>
+              </div>
+            </div>
+          </div>
+        {/each}
+      </div>
+
+      <div class="mt-16 text-center">
+        <p class="text-white/60 mb-4">Want to contribute to yaerguOS?</p>
+        <a
+          href="https://discord.com"
+          target="_blank"
+          rel="noopener noreferrer"
+          class="inline-flex items-center gap-2 px-6 py-3 bg-blue-600/20 hover:bg-blue-600/30 text-blue-400 hover:text-blue-300 rounded-lg transition-all duration-200 group"
+        >
+          Join Our Community
+          <svg
+            class="w-4 h-4 transform transition-transform group-hover:translate-x-1"
+            fill="none"
+            stroke="currentColor"
+            viewBox="0 0 24 24"
+          >
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 7l5 5m0 0l-5 5m5-5H6" />
+          </svg>
+        </a>
+      </div>
+    {/if}
+  </div>
+</div>
 
 <style>
   :global(html) {
     scroll-behavior: smooth;
   }
-
-  @keyframes float {
-    0% { transform: translateY(0px); }
-    50% { transform: translateY(-10px); }
-    100% { transform: translateY(0px); }
-  }
-
-  .animate-float {
-    animation: float 3s ease-in-out infinite;
-  }
 </style>
diff --git a/src/routes/faq/+page.svelte b/src/routes/faq/+page.svelte
index fdf26c4..e2ee9cc 100644
--- a/src/routes/faq/+page.svelte
+++ b/src/routes/faq/+page.svelte
@@ -1,137 +1,97 @@
 <script lang="ts">
-  import '../../app.css';
-  import { fade, fly, scale } from 'svelte/transition';
+  import { fade, slide } from 'svelte/transition';
   import { onMount } from 'svelte';
 
   let mounted = false;
   onMount(() => {
     mounted = true;
   });
+
+  const faqs = [
+    {
+      question: "When will yaerguOS be released?",
+      answer: "We anticipate a release in mid-2025. However, this timeline may be adjusted based on development progress and quality assurance."
+    },
+    {
+      question: "What is the best way to contact the owner?",
+      answer: "The best way to reach out is through Discord. You can contact the owner directly at: maybe.asdf"
+    }
+  ];
+
+  let openIndex = -1;
 </script>
 
-<header class="bg-black px-8 py-4 flex justify-between items-center">
-  <!-- Logo that redirects to the home page -->
-  <div class="cursor-pointer" on:click={() => window.location.href = '/'}>
-    <img src="/lilypad.png" alt="Logo" class="h-10"> <!-- Replace with your logo -->
-  </div>
-
-  <!-- Navigation links -->
-  <nav class="flex gap-8">
-    <a href="https://discord.com" target="_blank" rel="noopener noreferrer" class="text-white font-khand hover:text-blue-400 transition-colors">Discord</a>
-    <a href="/faq" class="text-white font-khand hover:text-blue-400 transition-colors">FAQ</a>
-    <a href="/collaborators" class="text-white font-khand hover:text-blue-400 transition-colors">Collaborators</a>
-    <a href="/download" class="text-white font-khand hover:text-blue-400 transition-colors">Download</a>
-  </nav>
-</header>
-
-<main class="min-h-screen flex flex-col">
-  <section class="py-32 text-center relative overflow-hidden">
-    <div class="absolute inset-0 bg-gradient-radial from-hero-top/20 to-transparent pointer-events-none"></div>
-    <div class="absolute inset-0 opacity-30">
-      <div class="absolute top-20 left-20 w-72 h-72 bg-text-primary/20 rounded-full filter blur-3xl animate-pulse"></div>
-      <div class="absolute bottom-20 right-20 w-96 h-96 bg-hero-top/30 rounded-full filter blur-3xl animate-pulse" style="animation-delay: 1s;"></div>
-    </div>
-    
-    <div class="container mx-auto px-4 relative">
-      {#if mounted}
-        <div in:fly={{ y: -20, duration: 800 }} class="space-y-8">
-                    
-          <div class="flex items-center gap-4 justify-center">
-            <h1 class="text-7xl font-khand text-transparent bg-gradient-to-r from-white to-white/80 bg-clip-text leading-normal">yaerguOS</h1>
-            <img src="/lilypad.png" alt="lilypad" class="h-24 w-auto " />
-          </div>
-          
-          <div class="max-w-2xl mx-auto space-y-4">
-            <p class="text-4xl text-white/90 font-khand">FAQ</p>
-          </div>
-          
-          <div class="flex justify-center gap-4 mt-8">
-          </div>
-        </div>
-      {/if}
-    </div>
-  </section>
-
-  <section class="py-32 relative flex-grow overflow-hidden">
-    <div class="absolute inset-0 bg-gradient-radial from-features-bg/50 to-transparent pointer-events-none"></div>
-    <div class="absolute inset-0 opacity-30">
-      <div class="absolute top-40 right-20 w-64 h-64 bg-text-primary/10 rounded-full filter blur-3xl animate-pulse"></div>
-      <div class="absolute bottom-40 left-20 w-80 h-80 bg-hero-top/20 rounded-full filter blur-3xl animate-pulse" style="animation-delay: 2s;"></div>
-    </div>
-    
-    <div class="container mx-auto px-4 relative">
-      {#if mounted}
-        <h2 class="text-4xl font-khand text-center mb-2 text-transparent bg-gradient-to-r from-white to-white/80 bg-clip-text" in:fade={{ duration: 800, delay: 200 }}>
-          When will yaerguOS be released?
-        </h2>
-        <h2 class="text-3xl font-khand text-center mb-2 text-transparent bg-gradient-to-r from-white to-white/80 bg-clip-text" in:fade={{ duration: 800, delay: 200 }}>
-          We do not know for sure, but we assume mid-2025.
-        </h2>
-        <hr class="border-t-2 border-gray-500/50 mb-2">
-        <h2 class="text-4xl font-khand text-center mb-2 text-transparent bg-gradient-to-r from-white to-white/80 bg-clip-text" in:fade={{ duration: 800, delay: 200 }}>
-          What is the best way to contact the owner?
-        </h2>
-        <h2 class="text-3xl font-khand text-center mb-2 text-transparent bg-gradient-to-r from-white to-white/80 bg-clip-text" in:fade={{ duration: 800, delay: 200 }}>
-          On discord : maybe.asdf
-        </h2>
-        <hr class="border-t-2 border-gray-500/50">
-        
-        <div class="grid grid-cols-1 md:grid-cols-3 gap-8 max-w-6xl mx-auto" in:fade={{ duration: 800, delay: 400 }}>
-        </div>
-      {/if}
-    </div>
-  </section>
-
-  <footer class="py-12 relative">
-    <div class="absolute inset-0 bg-black/20 backdrop-blur-sm"></div>
-    <div class="container mx-auto px-4 relative">
-      <div class="flex flex-col md:flex-row justify-between items-center gap-6 text-white/60">
-        <div>
-          <p class="text-lg">© 2025 yaerguOS. All rights reserved.</p>
-        </div>
-        <div class="flex gap-8">
-          <a href="#" class="hover:text-white transition-all duration-200 hover:-translate-y-1">
-            <span class="flex items-center gap-2">
-              <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 24 24">
-                <path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z"/>
-              </svg>
-              GitHub
-            </span>
-          </a>
-          <a href="#" class="hover:text-white transition-all duration-200 hover:-translate-y-1">
-            <span class="flex items-center gap-2">
-              <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 24 24">
-                <path d="M20.317 4.3698a19.7913 19.7913 0 00-4.8851-1.5152.0741.0741 0 00-.0785.0371c-.211.3753-.4447.8648-.6083 1.2495-1.8447-.2762-3.68-.2762-5.4868 0-.1636-.3847-.4058-.8742-.6177-1.2495a.077.077 0 00-.0785-.037 19.7363 19.7363 0 00-4.8852 1.515.0699.0699 0 00-.0321.0277C.5334 9.0458-.319 13.5799.0992 18.0578a.0824.0824 0 00.0312.0561c2.0528 1.5076 4.0413 2.4228 5.9929 3.0294a.0777.0777 0 00.0842-.0276c.4616-.6304.8731-1.2952 1.226-1.9942a.076.076 0 00-.0416-.1057c-.6528-.2476-1.2743-.5495-1.8722-.8923a.077.077 0 01-.0076-.1277c.1258-.0943.2517-.1923.3718-.2914a.0743.0743 0 01.0776-.0105c3.9278 1.7933 8.18 1.7933 12.0614 0a.0739.0739 0 01.0785.0095c.1202.099.246.1981.3728.2924a.077.077 0 01-.0066.1276 12.2986 12.2986 0 01-1.873.8914.0766.0766 0 00-.0407.1067c.3604.698.7719 1.3628 1.225 1.9932a.076.076 0 00.0842.0286c1.961-.6067 3.9495-1.5219 6.0023-3.0294a.077.077 0 00.0313-.0552c.5004-5.177-.8382-9.6739-3.5485-13.6604a.061.061 0 00-.0312-.0286zM8.02 15.3312c-1.1825 0-2.1569-1.0857-2.1569-2.419 0-1.3332.9555-2.4189 2.157-2.4189 1.2108 0 2.1757 1.0952 2.1568 2.419 0 1.3332-.9555 2.4189-2.1569 2.4189zm7.9748 0c-1.1825 0-2.1569-1.0857-2.1569-2.419 0-1.3332.9554-2.4189 2.1569-2.4189 1.2108 0 2.1757 1.0952 2.1568 2.419 0 1.3332-.946 2.4189-2.1568 2.4189Z"/>
-              </svg>
-              Discord
-            </span>
-          </a>
-          <a href="#" class="hover:text-white transition-all duration-200 hover:-translate-y-1">
-            <span class="flex items-center gap-2">
-              <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 24 24">
-                <path d="M23.953 4.57a10 10 0 01-2.825.775 4.958 4.958 0 002.163-2.723c-.951.555-2.005.959-3.127 1.184a4.92 4.92 0 00-8.384 4.482C7.69 8.095 4.067 6.13 1.64 3.162a4.822 4.822 0 00-.666 2.475c0 1.71.87 3.213 2.188 4.096a4.904 4.904 0 01-2.228-.616v.06a4.923 4.923 0 003.946 4.827 4.996 4.996 0 01-2.212.085 4.936 4.936 0 004.604 3.417 9.867 9.867 0 01-6.102 2.105c-.39 0-.779-.023-1.17-.067a13.995 13.995 0 007.557 2.209c9.053 0 13.998-7.496 13.998-13.985 0-.21 0-.42-.015-.63A9.935 9.935 0 0024 4.59z"/>
-              </svg>
-              Twitter
-            </span>
-          </a>
-        </div>
+<div class="min-h-screen py-24 px-4 sm:px-6 lg:px-8">
+  <div class="max-w-4xl mx-auto">
+    {#if mounted}
+      <div in:fade={{ duration: 800 }} class="text-center mb-16">
+        <h1 class="text-5xl sm:text-6xl font-khand mb-6 text-transparent bg-gradient-to-r from-white to-white/80 bg-clip-text">
+          Frequently Asked Questions
+        </h1>
+        <p class="text-lg text-white/80 max-w-2xl mx-auto">
+          Find answers to common questions about yaerguOS. Can't find what you're looking for? 
+          <a href="https://discord.com" class="text-blue-400 hover:text-blue-300 underline">Join our Discord</a>.
+        </p>
       </div>
-    </div>
-  </footer>
-</main>
+
+      <div class="space-y-4">
+        {#each faqs as faq, index}
+          <div 
+            class="bg-white/5 backdrop-blur-sm rounded-lg border border-white/10 overflow-hidden transition-all duration-200 hover:border-white/20"
+            in:fade={{ duration: 800, delay: 200 + index * 100 }}
+          >
+            <button
+              class="w-full px-6 py-4 flex justify-between items-center text-left"
+              on:click={() => openIndex = openIndex === index ? -1 : index}
+            >
+              <span class="text-xl font-khand text-white">{faq.question}</span>
+              <svg
+                class="w-5 h-5 text-white/60 transform transition-transform duration-200 {openIndex === index ? 'rotate-180' : ''}"
+                fill="none"
+                stroke="currentColor"
+                viewBox="0 0 24 24"
+              >
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
+              </svg>
+            </button>
+            
+            {#if openIndex === index}
+              <div 
+                class="px-6 pb-4 text-white/80"
+                transition:slide={{ duration: 200 }}
+              >
+                <p>{faq.answer}</p>
+              </div>
+            {/if}
+          </div>
+        {/each}
+      </div>
+
+      <div class="mt-16 text-center">
+        <p class="text-white/60 mb-4">Still have questions?</p>
+        <a
+          href="https://discord.com"
+          target="_blank"
+          rel="noopener noreferrer"
+          class="inline-flex items-center gap-2 px-6 py-3 bg-blue-600/20 hover:bg-blue-600/30 text-blue-400 hover:text-blue-300 rounded-lg transition-all duration-200 group"
+        >
+          Join Our Community
+          <svg
+            class="w-4 h-4 transform transition-transform group-hover:translate-x-1"
+            fill="none"
+            stroke="currentColor"
+            viewBox="0 0 24 24"
+          >
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 7l5 5m0 0l-5 5m5-5H6" />
+          </svg>
+        </a>
+      </div>
+    {/if}
+  </div>
+</div>
 
 <style>
   :global(html) {
     scroll-behavior: smooth;
   }
-
-  @keyframes float {
-    0% { transform: translateY(0px); }
-    50% { transform: translateY(-10px); }
-    100% { transform: translateY(0px); }
-  }
-
-  .animate-float {
-    animation: float 3s ease-in-out infinite;
-  }
 </style>