diff --git a/app/components/layout/Footer.tsx b/app/components/layout/Footer.tsx
index 4cd3093..2c3e96d 100644
--- a/app/components/layout/Footer.tsx
+++ b/app/components/layout/Footer.tsx
@@ -1,24 +1,50 @@
+import Link from "next/link";
+
 export default function Footer() {
   return (
-    <footer className="border-t border-white/5 mt-20 py-10 text-center text-sm text-gray-500">
-      <p className="font-medium text-gray-400">
-        © {new Date().getFullYear()} DevPulse
-      </p>
-      <p className="mt-1">
-        A creation by{" "}
-        <span className="text-indigo-400 font-medium">Hall of Codes</span>
-      </p>
-      <p className="mt-1 text-gray-600">
-        Open source on{" "}
-        <a
-          href="https://github.com/hallofcodes/devpulse"
-          target="_blank"
-          rel="noopener noreferrer"
-          className="text-indigo-500 hover:text-indigo-400 underline-offset-4 hover:underline transition"
-        >
-          GitHub
-        </a>
-      </p>
+    <footer className="border-t border-white/5 mt-24">
+      <div className="max-w-7xl mx-auto px-6 py-10 text-sm text-gray-500">
+        <div className="flex flex-col md:flex-row items-center justify-between gap-4">
+          <div className="text-center md:text-left">
+            <p className="font-semibold text-gray-300">
+              © {new Date().getFullYear()} DevPulse
+            </p>
+            <p className="text-gray-500 mt-1">
+              Built by{" "}
+              <span className="text-indigo-400 font-medium">Hall of Codes</span>
+            </p>
+          </div>
+
+          <div className="flex items-center gap-6">
+            <Link
+              href="/legal/privacy"
+              className="hover:text-gray-300 transition"
+            >
+              Privacy
+            </Link>
+            <Link
+              href="/legal/terms"
+              className="hover:text-gray-300 transition"
+            >
+              Terms
+            </Link>
+            <a
+              href="https://github.com/hallofcodes/devpulse"
+              target="_blank"
+              rel="noopener noreferrer"
+              className="hover:text-gray-300 transition"
+            >
+              GitHub
+            </a>
+          </div>
+        </div>
+
+        <div className="my-6 border-t border-white/5" />
+
+        <div className="text-center text-xs text-gray-600">
+          <p>Open-source project maintained by the DevPulse team.</p>
+        </div>
+      </div>
     </footer>
   );
 }
diff --git a/app/legal/privacy/page.tsx b/app/legal/privacy/page.tsx
new file mode 100644
index 0000000..55fda81
--- /dev/null
+++ b/app/legal/privacy/page.tsx
@@ -0,0 +1,135 @@
+import { Metadata } from "next";
+
+export const metadata: Metadata = {
+  title: "Privacy Policy - DevPulse",
+  description:
+    "Read our Privacy Policy to understand how we collect, use, and protect your information when you use DevPulse.",
+};
+
+export default function Privacy() {
+  return (
+    <div className="grid-bg p-6 max-w-3xl mx-auto text-sm leading-relaxed">
+      <h1 className="text-5xl md:text-6xl lg:text-7xl font-extrabold tracking-tight leading-[1.1] text-transparent bg-clip-text bg-gradient-to-br from-white to-gray-400 mb-6">
+        Privacy Policy
+      </h1>
+
+      <p className="text-lg md:text-xl text-gray-400 max-w-2xl mx-auto lg:mx-0 leading-relaxed mb-10">
+        This Privacy Policy explains how <strong>DevPulse</strong>{" "}
+        (&quot;we&quot;, &quot;our&quot;, or &quot;us&quot;) collects, uses, and
+        protects your information when you use
+        <strong> devpulse-waka.vercel.app</strong>.{" "}
+      </p>
+
+      <h2 className="text-xl font-semibold mt-6 mb-2">
+        1. Information We Collect
+      </h2>
+
+      <h3 className="font-semibold mt-4">a. Automatically Collected Data</h3>
+      <p className="mb-2">
+        Our application is hosted on Vercel. Vercel may automatically collect
+        certain information such as:
+      </p>
+      <ul className="list-disc ml-6 mb-4">
+        <li>IP address</li>
+        <li>Browser type and version</li>
+        <li>Device information</li>
+        <li>Request logs and usage data</li>
+      </ul>
+
+      <h3 className="font-semibold mt-4">b. Authentication (Supabase)</h3>
+      <p className="mb-2">
+        We use Supabase as our authentication provider. When you sign up or log
+        in, we collect:
+      </p>
+      <ul className="list-disc ml-6 mb-4">
+        <li>Email address</li>
+        <li>Password</li>
+      </ul>
+      <p className="mb-4">
+        This information is securely processed and stored by Supabase to create
+        and manage your account. We do not directly store or have access to your
+        password in plain text.
+      </p>
+
+      <h3 className="font-semibold mt-4">c. WakaTime API Key</h3>
+      <p className="mb-4">
+        When you use DevPulse, you may provide your WakaTime API key. This key
+        is used solely to fetch your coding activity data from the WakaTime API
+        and generate statistics. We do not use this key for any other purpose.
+      </p>
+
+      <h3 className="font-semibold mt-4">d. GitHub OAuth Data</h3>
+      <p className="mb-2">
+        When you connect your GitHub account via OAuth2, we may access:
+      </p>
+      <ul className="list-disc ml-6 mb-4">
+        <li>Your name</li>
+        <li>Your email address</li>
+      </ul>
+      <p className="mb-4">
+        This information is used only to identify your account and personalize
+        your experience.
+      </p>
+
+      <h2 className="text-xl font-semibold mt-6 mb-2">
+        2. How We Use Your Information
+      </h2>
+      <ul className="list-disc ml-6 mb-4">
+        <li>To authenticate users and manage accounts</li>
+        <li>To fetch and display your coding statistics</li>
+        <li>To personalize your experience</li>
+        <li>To improve the performance and reliability of the app</li>
+      </ul>
+
+      <h2 className="text-xl font-semibold mt-6 mb-2">
+        3. Third-Party Services
+      </h2>
+      <p className="mb-4">
+        We use third-party services that may collect and process data:
+      </p>
+      <ul className="list-disc ml-6 mb-4">
+        <li>Vercel (hosting and infrastructure)</li>
+        <li>Supabase (authentication and backend services)</li>
+        <li>Google Search Console (search performance monitoring)</li>
+        <li>WakaTime API (coding activity data)</li>
+        <li>GitHub OAuth (authentication and profile data)</li>
+      </ul>
+
+      <h2 className="text-xl font-semibold mt-6 mb-2">
+        4. Data Storage and Security
+      </h2>
+      <p className="mb-4">
+        We take reasonable measures to protect your information. Authentication
+        data is handled securely by Supabase. However, no method of transmission
+        over the internet is 100% secure.
+      </p>
+
+      <h2 className="text-xl font-semibold mt-6 mb-2">5. Data Sharing</h2>
+      <p className="mb-4">
+        We do not sell, trade, or rent your personal information. Data is only
+        shared with third-party services as necessary to operate the
+        application.
+      </p>
+
+      <h2 className="text-xl font-semibold mt-6 mb-2">6. Your Rights</h2>
+      <p className="mb-4">
+        You may choose not to provide certain information (such as your WakaTime
+        API key or GitHub access), but this may limit functionality.
+      </p>
+
+      <h2 className="text-xl font-semibold mt-6 mb-2">
+        7. Changes to This Policy
+      </h2>
+      <p className="mb-4">
+        We may update this Privacy Policy from time to time. Changes will be
+        posted on this page.
+      </p>
+
+      <h2 className="text-xl font-semibold mt-6 mb-2">8. Contact</h2>
+      <p>
+        If you have any questions about this Privacy Policy, please contact us
+        through the project repository or application interface.
+      </p>
+    </div>
+  );
+}
diff --git a/app/legal/terms/page.tsx b/app/legal/terms/page.tsx
new file mode 100644
index 0000000..df18a50
--- /dev/null
+++ b/app/legal/terms/page.tsx
@@ -0,0 +1,114 @@
+import { Metadata } from "next";
+
+export const metadata: Metadata = {
+  title: "Terms of Service - DevPulse",
+  description:
+    "Read our Terms of Service to understand the rules and guidelines for using DevPulse.",
+};
+
+export default function Terms() {
+  return (
+    <div className="grid-bg p-6 max-w-3xl mx-auto text-sm leading-relaxed">
+      <h1 className="text-5xl md:text-6xl lg:text-7xl font-extrabold tracking-tight leading-[1.1] text-transparent bg-clip-text bg-gradient-to-br from-white to-gray-400 mb-6">
+        Terms of Service
+      </h1>
+
+      <p className="text-lg md:text-xl text-gray-400 max-w-2xl mx-auto lg:mx-0 leading-relaxed mb-10">
+        These Terms of Service (&quot;Terms&quot;) govern your use of{" "}
+        <strong>DevPulse</strong>
+        (&quot;we&quot;, &quot;our&quot;, or &quot;us&quot;) available at{" "}
+        <strong>devpulse-waka.vercel.app</strong>. By using this service, you
+        agree to these Terms.
+      </p>
+
+      <h2 className="text-xl font-semibold mt-6 mb-2">1. Use of the Service</h2>
+      <p className="mb-4">
+        DevPulse provides tools to visualize and analyze your coding activity
+        using third-party integrations such as WakaTime and GitHub. You agree to
+        use the service only for lawful purposes and in compliance with all
+        applicable laws.
+      </p>
+
+      <h2 className="text-xl font-semibold mt-6 mb-2">2. Accounts</h2>
+      <p className="mb-2">
+        To use certain features, you may be required to create an account using
+        Supabase authentication. You agree to:
+      </p>
+      <ul className="list-disc ml-6 mb-4">
+        <li>Provide accurate and complete information</li>
+        <li>Maintain the security of your account credentials</li>
+        <li>Be responsible for all activity under your account</li>
+      </ul>
+
+      <h2 className="text-xl font-semibold mt-6 mb-2">
+        3. Third-Party Services
+      </h2>
+      <p className="mb-2">
+        DevPulse relies on third-party services, including:
+      </p>
+      <ul className="list-disc ml-6 mb-4">
+        <li>Vercel (hosting)</li>
+        <li>Supabase (authentication and backend)</li>
+        <li>WakaTime API (coding statistics)</li>
+        <li>GitHub OAuth (authentication and profile data)</li>
+        <li>Google Search Console (analytics)</li>
+      </ul>
+      <p className="mb-4">
+        We are not responsible for the availability, accuracy, or practices of
+        these third-party services.
+      </p>
+
+      <h2 className="text-xl font-semibold mt-6 mb-2">
+        4. API Keys and Integrations
+      </h2>
+      <p className="mb-4">
+        You may provide a WakaTime API key to use certain features. You are
+        responsible for keeping your API key secure. We are not liable for any
+        misuse resulting from unauthorized access to your key.
+      </p>
+
+      <h2 className="text-xl font-semibold mt-6 mb-2">5. Data and Content</h2>
+      <p className="mb-4">
+        You retain ownership of your data. By using the service, you grant us
+        permission to process your data solely for the purpose of providing the
+        service’s features.
+      </p>
+
+      <h2 className="text-xl font-semibold mt-6 mb-2">
+        6. Service Availability
+      </h2>
+      <p className="mb-4">
+        We do not guarantee that the service will be uninterrupted or
+        error-free. Features may change, be modified, or discontinued at any
+        time without notice.
+      </p>
+
+      <h2 className="text-xl font-semibold mt-6 mb-2">
+        7. Limitation of Liability
+      </h2>
+      <p className="mb-4">
+        DevPulse is provided "as is" without warranties of any kind. We are not
+        liable for any damages, including loss of data, arising from your use of
+        the service.
+      </p>
+
+      <h2 className="text-xl font-semibold mt-6 mb-2">8. Termination</h2>
+      <p className="mb-4">
+        We reserve the right to suspend or terminate your access to the service
+        at any time, without prior notice, if you violate these Terms.
+      </p>
+
+      <h2 className="text-xl font-semibold mt-6 mb-2">9. Changes to Terms</h2>
+      <p className="mb-4">
+        We may update these Terms from time to time. Continued use of the
+        service after changes means you accept the updated Terms.
+      </p>
+
+      <h2 className="text-xl font-semibold mt-6 mb-2">10. Contact</h2>
+      <p>
+        If you have any questions about these Terms, please contact us through
+        the project repository or application interface.
+      </p>
+    </div>
+  );
+}
diff --git a/app/lib/proxy/auth.ts b/app/lib/proxy/auth.ts
index 17cab24..7fe9cbf 100644
--- a/app/lib/proxy/auth.ts
+++ b/app/lib/proxy/auth.ts
@@ -29,7 +29,7 @@ export default async function Auth(req: NextRequest) {
   } = await supabase.auth.getUser();
   const { pathname } = req.nextUrl;
 
-  const protectedRoutes = ["/dashboard", "/logout"];
+  const protectedRoutes = ["/dashboard", "/update-password", "/logout"];
   const isProtectedRoute = protectedRoutes.some((route) => {
     const regex = new RegExp(`^${route}(/.*)?$`);
     return regex.test(pathname);
diff --git a/app/not-found.tsx b/app/not-found.tsx
new file mode 100644
index 0000000..0df0296
--- /dev/null
+++ b/app/not-found.tsx
@@ -0,0 +1,120 @@
+export default function NotFound() {
+  return (
+    <div className="relative max-w-7xl mx-auto px-6 pt-32 lg:pt-40 pb-20 lg:pb-32 flex flex-col lg:flex-row items-center gap-16 min-h-[85vh]">
+      <div className="w-full lg:w-1/2 text-center lg:text-left z-10">
+        <h1 className="text-8xl font-bold tracking-tight gradient-text">404</h1>
+
+        <h2 className="mt-6 text-2xl font-semibold">Page not found</h2>
+
+        <p className="my-3 leading-relaxed">
+          The page you’re looking for doesn’t exist or may have been moved.
+        </p>
+
+        <p className="mt-10 text-xs text-neutral-400">
+          Tip: Check the URL or head back to the homepage.
+        </p>
+      </div>
+
+      <div className="w-full lg:w-1/2 relative h-[400px] lg:h-[500px] hidden md:block z-10 perspective-1000">
+        {/* Card 1 */}
+        <div
+          className="absolute top-0 right-10 lg:right-0 w-[320px] glass-card p-5 border-white/10 shadow-2xl skew-y-3 -rotate-3 transition-transform duration-700 hover:rotate-0 hover:skew-y-0"
+          style={{ transformStyle: "preserve-3d" }}
+          data-aos="fade-left"
+          data-aos-delay="200"
+        >
+          <div className="flex items-center justify-between mb-4">
+            <div className="text-xs text-gray-400 font-semibold uppercase tracking-wider">
+              Total Coding
+            </div>
+            <div className="text-xs text-emerald-400 bg-emerald-500/10 px-2 py-0.5 rounded-full font-bold">
+              +18%
+            </div>
+          </div>
+          <div className="text-4xl font-extrabold text-white mb-2">42h 15m</div>
+          <div className="text-xs text-gray-500 mb-4">Last 7 days</div>
+          <div className="h-1.5 w-full bg-white/5 rounded-full overflow-hidden">
+            <div className="h-full bg-gradient-to-r from-indigo-500 to-purple-500 w-3/4 rounded-full" />
+          </div>
+        </div>
+
+        {/* Card 2 */}
+        <div
+          className="absolute top-44 left-10 lg:-left-10 w-[280px] glass-card p-5 border-white/10 shadow-2xl -skew-y-3 rotate-3 z-20 backdrop-blur-xl bg-[#0f0f28]/80 transition-transform duration-700 hover:rotate-0 hover:skew-y-0 text-left"
+          data-aos="fade-up"
+          data-aos-delay="400"
+        >
+          <h4 className="text-xs text-gray-400 font-semibold uppercase tracking-wider mb-4">
+            Top Languages
+          </h4>
+          <div className="space-y-4">
+            <div className="flex items-center gap-3">
+              <div className="w-8 h-8 rounded-md bg-[#3178c6]/20 flex items-center justify-center text-[#3178c6] font-bold text-xs">
+                TS
+              </div>
+              <div className="flex-1">
+                <div className="flex justify-between text-sm mb-1">
+                  <span className="font-bold text-white">TypeScript</span>
+                  <span className="text-gray-400 font-mono text-xs">
+                    28h 40m
+                  </span>
+                </div>
+                <div className="h-1 w-full bg-white/5 rounded-full overflow-hidden">
+                  <div className="h-full bg-[#3178c6] w-[70%]" />
+                </div>
+              </div>
+            </div>
+            <div className="flex items-center gap-3">
+              <div className="w-8 h-8 rounded-md bg-[#61dafb]/20 flex items-center justify-center text-[#61dafb] font-bold text-xs">
+                Re
+              </div>
+              <div className="flex-1">
+                <div className="flex justify-between text-sm mb-1">
+                  <span className="font-bold text-white">React</span>
+                  <span className="text-gray-400 font-mono text-xs">
+                    12h 10m
+                  </span>
+                </div>
+                <div className="h-1 w-full bg-white/5 rounded-full overflow-hidden">
+                  <div className="h-full bg-[#61dafb] w-[30%]" />
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        {/* Card 3 (Code terminal) */}
+        <div
+          className="absolute bottom-5 right-20 w-[300px] glass-card p-4 border border-white/10 shadow-[0_20px_50px_rgba(0,0,0,0.5)] z-30 bg-[#050510]/90 transition-transform duration-700 hover:-translate-y-2 text-left"
+          data-aos="fade-up"
+          data-aos-delay="600"
+        >
+          <div className="flex gap-1.5 mb-3">
+            <div className="w-2.5 h-2.5 rounded-full bg-red-500/80" />
+            <div className="w-2.5 h-2.5 rounded-full bg-yellow-500/80" />
+            <div className="w-2.5 h-2.5 rounded-full bg-green-500/80" />
+          </div>
+          <div className="font-mono text-[13px] leading-relaxed">
+            <span className="text-purple-400">import</span>{" "}
+            <span className="text-gray-300">{"{ Pulse }"}</span>{" "}
+            <span className="text-purple-400">from</span>{" "}
+            <span className="text-green-400">&apos;devpulse&apos;</span>;<br />
+            <br />
+            <span className="text-blue-400">Pulse</span>.
+            <span className="text-yellow-200">syncWakaTime</span>(
+            <span className="text-gray-300">key</span>).
+            <span className="text-yellow-200">then</span>(
+            <span className="text-blue-300">stats</span>{" "}
+            <span className="text-purple-400">=&gt;</span> {"{"}
+            <br />
+            &nbsp;&nbsp;<span className="text-blue-400">console</span>.
+            <span className="text-yellow-200">log</span>(
+            <span className="text-green-400">&quot;Leveling up!&quot;</span>);
+            <br />
+            {"}"});
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/app/robots.ts b/app/robots.ts
new file mode 100644
index 0000000..6f595e5
--- /dev/null
+++ b/app/robots.ts
@@ -0,0 +1,12 @@
+import type { MetadataRoute } from "next";
+
+export default function robots(): MetadataRoute.Robots {
+  return {
+    rules: {
+      userAgent: "*",
+      allow: "/",
+      disallow: ["/api"],
+    },
+    sitemap: "https://devpulse-waka.vercel.app/sitemap.xml",
+  };
+}
diff --git a/app/sitemap.tsx b/app/sitemap.tsx
new file mode 100644
index 0000000..e398c1d
--- /dev/null
+++ b/app/sitemap.tsx
@@ -0,0 +1,14 @@
+import type { MetadataRoute } from "next";
+import staticSitemap from "./sitemaps/static";
+import leaderboardsSitemap from "./sitemaps/leaderboards";
+
+export const revalidate = 86400;
+
+export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
+  const [staticUrl, leaderboardsUrl] = await Promise.all([
+    staticSitemap(),
+    leaderboardsSitemap(),
+  ]);
+
+  return [...staticUrl, ...leaderboardsUrl];
+}
diff --git a/app/sitemaps/leaderboards.ts b/app/sitemaps/leaderboards.ts
new file mode 100644
index 0000000..1d70748
--- /dev/null
+++ b/app/sitemaps/leaderboards.ts
@@ -0,0 +1,17 @@
+import { createClient } from "../lib/supabase/server";
+import type { MetadataRoute } from "next";
+
+export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
+  const supabase = await createClient();
+
+  const { data, error } = await supabase
+    .from("leaderboards")
+    .select("id, name, slug")
+    .order("created_at", { ascending: false });
+
+  if (error) return [];
+
+  return data.map((leaderboard) => ({
+    url: `https://devpulse-waka.vercel.app/leaderboard/${leaderboard.slug}`,
+  }));
+}
diff --git a/app/sitemaps/static.ts b/app/sitemaps/static.ts
new file mode 100644
index 0000000..434b8dc
--- /dev/null
+++ b/app/sitemaps/static.ts
@@ -0,0 +1,12 @@
+import type { MetadataRoute } from "next";
+
+export default function sitemap(): MetadataRoute.Sitemap {
+  return [
+    { url: "https://devpulse-waka.vercel.app" },
+    { url: "https://devpulse-waka.vercel.app/login" },
+    { url: "https://devpulse-waka.vercel.app/signup" },
+    { url: "https://devpulse-waka.vercel.app/legal" },
+    { url: "https://devpulse-waka.vercel.app/legal/terms" },
+    { url: "https://devpulse-waka.vercel.app/legal/privacy" },
+  ];
+}