diff --git a/src/features/common/components/add-issue-modal.tsx b/src/features/common/components/add-issue-modal.tsx
index 020cdd5..1f4a441 100644
--- a/src/features/common/components/add-issue-modal.tsx
+++ b/src/features/common/components/add-issue-modal.tsx
@@ -1,91 +1,60 @@
-import FormInput from "./form-input"
-
-
-import { AiOutlineClose } from "react-icons/ai"
 import { useState } from "react";
-import Button from "./button";
-
-import { useWalletSignedInAccountQuery } from "../hooks/useWalletQueries";
-
-import { useUser } from '@auth0/nextjs-auth0'
-
-import { useAccount } from 'wagmi'
-import axios from "axios";
-
-type AddIssueModalProps = {
-    setIsModalOpen: (value: boolean) => void
+import Modal from "./modal";
+import { useCreateSuggestion } from "../hooks/useGuildQueries";
+
+export default function AddIssueModal({
+  isOpen,
+  setIsOpen,
+}: {
+  isOpen: boolean;
+  setIsOpen: (isOpen: boolean) => void;
+}) {
+  const [value, setValue] = useState("");
+  const { mutate: createSuggestion, isLoading } = useCreateSuggestion();
+
+  const handleSubmit = () => {
+    if (!value.trim()) return;
+    createSuggestion(
+      { suggestion: value },
+      {
+        onSuccess: () => {
+          setValue("");
+          setIsOpen(false);
+        },
+      }
+    );
+  };
+
+  return (
+    <Modal isOpen={isOpen} onClose={() => setIsOpen(false)} title="Suggest a feature">
+      <div
+        style={{
+          display: "flex",
+          flexDirection: "column",
+          height: "100%",
+        }}
+        className="rounded-md p-4 bg-white dark:bg-zinc-900 flex flex-col dark:text-white text-gray-900 w-[90vw] h-[80vh] lg:w-[50vw]"
+      >
+        <h2 className="text-xl font-bold mb-2 dark:text-white text-gray-900">
+          Feature Request
+        </h2>
+        <p className="text-sm dark:text-gray-400 text-gray-500 mb-4">
+          Describe the feature you would like to see.
+        </p>
+        <textarea
+          className="mt-4 resize-none h-[70%] bg-gray-100 dark:bg-zinc-700 px-4 py-2 rounded-md mb-4 dark:text-white text-gray-900 placeholder-gray-400 dark:placeholder-gray-500"
+          placeholder="Drop your suggestions here. After submitting, tag the issue with >open< and >feature< to mirror it on this page for voting and funding"
+          onChange={(e) => setValue(e.target.value)}
+          value={value}
+        />
+        <button
+          onClick={handleSubmit}
+          disabled={isLoading || !value.trim()}
+          className="px-4 py-2 bg-lime-500 dark:bg-lime-600 text-white rounded-md hover:bg-lime-600 dark:hover:bg-lime-700 disabled:opacity-50 disabled:cursor-not-allowed"
+        >
+          {isLoading ? "Submitting..." : "Submit"}
+        </button>
+      </div>
+    </Modal>
+  );
 }
-
-const AddIssueModal = ({ setIsModalOpen }: AddIssueModalProps) => {
-    const [value, setValue] = useState("");
-    const [title, setTitle] = useState("")
-    const walletId = useWalletSignedInAccountQuery()
-    const { user, error, isLoading } = useUser();
-    const { address } = useAccount()
-    const [isSubmitLoading, setIsLoading] = useState(false)
-
-
-    const getWalletId = () => {
-        const walletChain = localStorage.getItem("wallet-chain")
-
-        let connectedWalletId;
-
-        if (walletChain === "near") {
-            connectedWalletId = walletId
-        } else if (walletChain === "polygon") {
-            connectedWalletId = address
-        } else {
-            connectedWalletId = "Unknown"
-        }
-
-        return connectedWalletId
-    }
-
-    const submitIssue = async () => {
-        if (title.length === 0 || value.length == 0 || isSubmitLoading) return
-        setIsLoading(true);
-        try {
-            let isGithubAuth = user != undefined
-            let userId = user ? user?.sub : getWalletId()
-
-            const result = await axios.post("/api/issues/addIssue", {
-                userId,
-                title,
-                body: value, isGithubAuth
-            }) as any
-
-            const url = await result?.data?.message?.html_url
-
-            window.open(url, "_blank")
-            setIsLoading(false);
-            setIsModalOpen(false)
-        } catch (e) {
-            setIsLoading(false);
-
-            console.log(e)
-        }
-
-    }
-
-    return <div onClick={() => setIsModalOpen(false)} className="w-screen h-screen bg-black/50 top-0 left-0 absolute z-10 flex items-center justify-center">
-        <div onClick={(e) => {
-            e.stopPropagation()
-        }} className="rounded-md p-4 bg-white dark:bg-zinc-900 flex flex-col dark:text-white w-[90vw] h-[80vh] lg:w-[50vw] ">
-            <div className="flex items-center justify-between">
-
-                <span className="font-bold mb-4">Add Issue</span>
-                <AiOutlineClose className="text-[1.5rem] cursor-pointer" onClick={() => setIsModalOpen(false)} />
-            </div>
-            <FormInput onChange={(e) => setTitle(e.target?.value)} placeholder="Issue Title" />
-
-            <textarea className="mt-4 resize-none h-[70%] bg-gray-200 dark:bg-zinc-700 px-4 py-2 rounded-md  mb-4" placeholder="Drop your suggestions here. After submitting, tag the issue with >open< and >feature< to mirror it on this page for voting and funding" onChange={(e) => setValue(e.target.value)} />
-
-            <Button onClick={submitIssue} disabled={title.length === 0 || value.length == 0} >
-                {isSubmitLoading ? "Loading..." : "Submit"}
-            </Button>
-        </div>
-    </div>
-}
-
-
-export default AddIssueModal
diff --git a/src/features/common/components/button.tsx b/src/features/common/components/button.tsx
index c9760cd..c5f5c87 100644
--- a/src/features/common/components/button.tsx
+++ b/src/features/common/components/button.tsx
@@ -1,33 +1,33 @@
-import React from "react";
+import { ReactNode } from "react";
 
-const typeToClass: Record<string, string> = {
+const variants = {
   primary:
-    "px-4 py-2 bg-pink-500 text-white shadow-lg shadow-pink-500/40 hover:brightness-150",
+    "flex flex-row items-center px-4 py-2 border-0 border-lime-500 dark:border-lime-600 bg-transparent text-lime-600 dark:text-lime-600 dark:hover:bg-zinc-800 hover:bg-gray-200 text-sm space-x-2",
   secondary:
-    "px-4 py-2 border-2 border-pink-500 bg-transparent text-pink-500 hover:brightness-150",
+    "flex flex-row items-center px-4 py-2 border-0 border-gray-200 dark:border-stone-500 bg-transparent text-gray-600 dark:text-gray-300 dark:hover:bg-zinc-800 hover:bg-gray-200 text-sm space-x-2",
   iconConnect:
-    "flex flex-row items-center px-4 py-2 border-0 border-lime-500 dark:border-lime-600 bg-transparent text-lime-500 dark:text-lime-600 dark:hover:bg-zinc-800 hover:bg-gray-200 text-sm space-x-2",
+    "flex flex-row items-center px-4 py-2 border-0 border-lime-500 dark:border-lime-600 bg-transparent text-lime-600 dark:text-lime-600 dark:hover:bg-zinc-800 hover:bg-gray-200 text-sm space-x-2",
   iconDisconnect:
-    "flex flex-row items-center px-4 py-2 border-0 border-gray-200 dark:border-stone-500 bg-transparent text-gray-500 dark:text-gray-300 dark:hover:bg-zinc-800 hover:bg-gray-200 text-sm space-x-2",
-  icon:
-    "flex flex-row items-center space-x-2 px-4 py-2 bg-pink-500 text-white shadow-lg shadow-pink-500/40 hover:brightness-150",
+    "flex flex-row items-center px-4 py-2 border-0 border-gray-300 dark:border-stone-500 bg-transparent text-gray-600 dark:text-gray-300 dark:hover:bg-zinc-800 hover:bg-gray-200 text-sm space-x-2",
 };
 
-export default function Button(
-  props: {
-    type?: "primary" | "secondary" | "inverse" | "iconConnect" | "iconDisconnect" | "icon";
-  } & React.HTMLProps<HTMLButtonElement>
-) {
-  const { type = "primary", className = "", ...restProps } = props;
-
-  const baseClassName =
-    "rounded-md cursor-pointer disabled:brightness-50 hover:disabled:cursor-not-allowed";
-  const typeClassName = typeToClass[type];
-
+export default function Button({
+  children,
+  type,
+  onClick,
+  className = "",
+}: {
+  children: ReactNode;
+  type: keyof typeof variants;
+  onClick?: () => void;
+  className?: string;
+}) {
   return (
     <button
-      className={`${className} ${baseClassName} ${typeClassName}`}
-      {...restProps}
-    />
+      className={`${variants[type]} ${className}`}
+      onClick={onClick}
+    >
+      {children}
+    </button>
   );
 }
diff --git a/src/features/common/components/chain-list-item.tsx b/src/features/common/components/chain-list-item.tsx
index 7fd96aa..fc8f72b 100644
--- a/src/features/common/components/chain-list-item.tsx
+++ b/src/features/common/components/chain-list-item.tsx
@@ -1,21 +1,19 @@
-import Image from "next/image";
-
-import ChainIcon from "./chain-icon";
-
-export default function ChainListItem(props: {
-  chainName: string;
-  onClick: (chainName: string) => void;
+export default function ChainListItem({
+  name,
+  icon,
+  onClick,
+}: {
+  name: string;
+  icon: JSX.Element;
+  onClick: () => void;
 }) {
   return (
-    <li
-      className="flex flex-row items-center p-2 mt-2 rounded-lg cursor-pointer hover:bg-black hover:bg-opacity-30 text-black dark:text-white"
-      onClick={() => props.onClick(props.chainName)}
+    <div
+      onClick={onClick}
+      className="flex flex-row items-center p-2 mt-2 rounded-lg cursor-pointer hover:bg-gray-100 dark:hover:bg-black dark:hover:bg-opacity-30 text-gray-900 dark:text-white"
     >
-      <ChainIcon
-        chainName={props.chainName}
-        className="dark:fill-current dark:text-white"
-      />
-      <div className="ml-4">{props.chainName.toUpperCase()}</div>
-    </li>
+      <div className="mr-2 dark:fill-current dark:text-white">{icon}</div>
+      {name}
+    </div>
   );
 }
diff --git a/src/features/common/components/connect-wallet-button.tsx b/src/features/common/components/connect-wallet-button.tsx
index d632bd5..06857ca 100644
--- a/src/features/common/components/connect-wallet-button.tsx
+++ b/src/features/common/components/connect-wallet-button.tsx
@@ -1,78 +1,28 @@
-import React from "react";
-import { useRouter } from "next/router";
-import Button from "./button";
-import SelectChainModal from "./select-chain-modal";
+import { useWalletChainQuery } from "../hooks/useWalletQueries";
 import ChainIcon from "./chain-icon";
 
-import {
-  useWalletChainQuery,
-  useWalletSignedInAccountQuery,
-  useWalletSignInMutation,
-  useWalletSignOutMutation,
-} from "../hooks/useWalletQueries";
-import config from "config";
-
 export default function ConnectWalletButton() {
-  const router = useRouter();
-
-  const [isSelectChainModalOpen, setIsSelectChainModalOpen] =
-    React.useState(false);
-
-  const walletChainQuery = useWalletChainQuery();
-  const signedInAccountQuery = useWalletSignedInAccountQuery();
-  const signInMutation = useWalletSignInMutation();
-  const signOutMutation = useWalletSignOutMutation();
-
-  async function handleSelectChain(chain: string) {
-    signInMutation.mutate(chain);
-  }
-
-  async function handleDisconnectWallet() {
-    let path = window.location.pathname;
-    if (path.includes("add-bounty")) {
-      router.replace(`/issues/${path.split("/")[2]}`);
-    }
-
-    setTimeout(() => {
-      signOutMutation.mutate();
-    }, 1000);
-  }
-
-  if (walletChainQuery.data && signedInAccountQuery.data) {
-    return (
-      <div className="flex flex-row items-center">
-        <Button type="iconDisconnect" onClick={handleDisconnectWallet}>
-          <ChainIcon
-            size={20}
-            chainName={walletChainQuery.data}
-            className="dark:fill-gray-300 fill-gray-500 w-4 h-4"
-          />
-          <div>{signedInAccountQuery.data}</div>
-          <svg className="dark:stroke-gray-300 stroke-gray-500" width="10" height="20" viewBox="0 0 10 24">
-            <path d="M9 1L1 9" stroke-width="1" stroke-linecap="round" stroke-linejoin="round"/>
-            <path d="M1 1L9 9" stroke-width="1" stroke-linecap="round" stroke-linejoin="round"/>
-          </svg>
-        </Button>
-      </div>
-    );
-  }
+  const { data: walletChain, isLoading } = useWalletChainQuery();
 
   return (
-    <>
-      <Button type="iconConnect" onClick={() => setIsSelectChainModalOpen(true)}>
-        <svg className="stroke-current w-4 h-4" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-          <path d="M13 1H17C17.5304 1 18.0391 1.21071 18.4142 1.58579C18.7893 1.96086 19 2.46957 19 3V17C19 17.5304 18.7893 18.0391 18.4142 18.4142C18.0391 18.7893 17.5304 19 17 19H13" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-          <path d="M8 15L13 10L8 5" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-          <path d="M13 10H1" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
-        </svg>
-        <span>Connect Wallet</span>
-      </Button>
-      <SelectChainModal
-        isOpen={isSelectChainModalOpen}
-        onClose={() => setIsSelectChainModalOpen(false)}
-        onSelectChain={handleSelectChain}
-        enabledChains={config.site.enabledChains}
+    <button
+      className="flex flex-row items-center px-4 py-2 border border-lime-500 dark:border-lime-600 rounded-lg text-lime-600 dark:text-lime-600 hover:bg-gray-100 dark:hover:bg-zinc-800"
+      onClick={() => {
+        // Handle wallet connection
+      }}
+    >
+      <ChainIcon
+        size={20}
+        chainName={walletChain || ""}
+        className="dark:fill-gray-300 fill-gray-500 w-4 h-4"
       />
-    </>
+      <span className="ml-2 text-sm">
+        {isLoading ? "Loading..." : walletChain ? `Connected: ${walletChain}` : "Connect Wallet"}
+      </span>
+      <svg className="dark:stroke-gray-300 stroke-gray-500 ml-2" width="10" height="20" viewBox="0 0 10 24">
+        <path d="M9 1L1 9" strokeWidth="1" strokeLinecap="round" strokeLinejoin="round"/>
+        <path d="M1 1L9 9" strokeWidth="1" strokeLinecap="round" strokeLinejoin="round"/>
+      </svg>
+    </button>
   );
 }
diff --git a/src/features/common/components/form-input.tsx b/src/features/common/components/form-input.tsx
index 8ccec20..e88540d 100644
--- a/src/features/common/components/form-input.tsx
+++ b/src/features/common/components/form-input.tsx
@@ -1,12 +1,11 @@
-import React from "react";
-
-export default function FormInput(props: React.HTMLProps<HTMLInputElement>) {
-  const { className = "", ...restProps } = props;
-
+export default function FormInput({
+  className = "",
+  ...props
+}: React.InputHTMLAttributes<HTMLInputElement>) {
   return (
     <input
-      className={`bg-gray-200 dark:bg-zinc-700 px-4 py-2 rounded-md ${className}`}
-      {...restProps}
+      {...props}
+      className={`bg-gray-100 dark:bg-zinc-700 px-4 py-2 rounded-md dark:text-white text-gray-900 placeholder-gray-400 dark:placeholder-gray-500 ${className}`}
     />
   );
 }
diff --git a/src/features/common/components/header-nav.tsx b/src/features/common/components/header-nav.tsx
index 82b24a6..4c3f2ed 100644
--- a/src/features/common/components/header-nav.tsx
+++ b/src/features/common/components/header-nav.tsx
@@ -2,76 +2,88 @@ import Link from "next/link";
 
 import ConnectWalletButton from "./connect-wallet-button";
 import config from "config";
-import { ConnectButton } from '@rainbow-me/rainbowkit';
+import { ConnectButton } from "@rainbow-me/rainbowkit";
 import Button from "./button";
+import { ThemeToggle } from "./theme-toggle";
 
-import { useAccount } from 'wagmi'
+import { useAccount } from "wagmi";
 import { useEffect } from "react";
-import { useUser } from '@auth0/nextjs-auth0'
+import { useUser } from "@auth0/nextjs-auth0";
 
 import { useWalletChainQuery } from "../hooks/useWalletQueries";
 
 import { AiFillGithub } from "react-icons/ai";
 
 export default function HeaderNav() {
-
-  const { isDisconnected } = useAccount()
+  const { isDisconnected } = useAccount();
 
   const { data: walletChain = "" } = useWalletChainQuery();
 
   const { user, error, isLoading } = useUser();
 
-
   // Removing the wallet from local storage when the user disconnects it (Polygon only)
   useEffect(() => {
-    const localStorageWallet = localStorage.getItem("wallet-chain")
+    const localStorageWallet = localStorage.getItem("wallet-chain");
 
     if (isDisconnected && localStorageWallet === "polygon") {
-      localStorage.removeItem('wallet-chain')
+      localStorage.removeItem("wallet-chain");
     }
-  }, [isDisconnected])
-
-
+  }, [isDisconnected]);
 
   return (
-    <header className="shadow-md dark:bg-zinc-800">
+    <header className="shadow-md dark:bg-zinc-800 bg-white">
       <nav className="container mx-auto p-4 flex flex-row justify-between items-center">
-
-        <Link className="font-bold" href={{ pathname: "/" }}>{config.site.title}</Link>
+        <Link className="font-bold dark:text-white text-black" href={{ pathname: "/" }}>
+          {config.site.title}
+        </Link>
         <div className="flex items-center gap-x-4">
-
-
+          <ThemeToggle />
           <div>
-
-              {user ?
-              <Button type="iconDisconnect" onClick={() => {
-                window.location.assign('/api/auth/logout')
-              }}>
-                <AiFillGithub className="text-[1.5rem] cursor-pointer w-4 h-4"/>
+            {user ? (
+              <Button
+                type="iconDisconnect"
+                onClick={() => {
+                  window.location.assign("/api/auth/logout");
+                }}
+              >
+                <AiFillGithub className="text-[1.5rem] cursor-pointer w-4 h-4" />
                 <div>{user.nickname}</div>
-                <svg className="dark:stroke-gray-300 stroke-gray-500" width="10" height="20" viewBox="0 0 10 24">
-                  <path d="M9 1L1 9" stroke-width="1" stroke-linecap="round" stroke-linejoin="round"/>
-                  <path d="M1 1L9 9" stroke-width="1" stroke-linecap="round" stroke-linejoin="round"/>
+                <svg
+                  className="dark:stroke-gray-300 stroke-gray-500"
+                  width="10"
+                  height="20"
+                  viewBox="0 0 10 24"
+                >
+                  <path
+                    d="M9 1L1 9"
+                    strokeWidth="1"
+                    strokeLinecap="round"
+                    strokeLinejoin="round"
+                  />
+                  <path
+                    d="M1 1L9 9"
+                    strokeWidth="1"
+                    strokeLinecap="round"
+                    strokeLinejoin="round"
+                  />
                 </svg>
               </Button>
-
-              :
-            <Button type="iconConnect" onClick={() =>  window.location.assign('/api/auth/login')}>
-              <AiFillGithub className="text-[1.5rem] cursor-pointer w-4 h-4"/>
-              <div>Login</div>
-            </Button>
-            }
-            {/*<ChainIcon
-              size={20}
-              chainName={walletChainQuery.data}
-              className="dark:fill-gray-300 dark:text-white"
-            />*/}
-
+            ) : (
+              <Button
+                type="iconConnect"
+                onClick={() => window.location.assign("/api/auth/login")}
+              >
+                <AiFillGithub className="text-[1.5rem] cursor-pointer w-4 h-4" />
+                <div>Login</div>
+              </Button>
+            )}
           </div>
-
-
-          {(walletChain === "near" || !walletChain) || isDisconnected ? <ConnectWalletButton />
-            : <ConnectButton />}</div>
+          {walletChain === "near" || !walletChain || isDisconnected ? (
+            <ConnectWalletButton />
+          ) : (
+            <ConnectButton />
+          )}
+        </div>
       </nav>
     </header>
   );
diff --git a/src/features/common/components/layout.tsx b/src/features/common/components/layout.tsx
index 94519d3..18dc86e 100644
--- a/src/features/common/components/layout.tsx
+++ b/src/features/common/components/layout.tsx
@@ -1,25 +1,12 @@
-import Head from "./head";
 import HeaderNav from "./header-nav";
 import Footer from "./footer";
-import type { ReactElement } from "react";
 
-type Props = {
-  children: ReactElement;
-  title?: string;
-  metaDescription?: string;
-};
-
-export function Layout(props: Props) {
+export default function Layout({ children }: { children: React.ReactNode }) {
   return (
-    <div className="min-h-screen dark:bg-zinc-900 dark:text-white">
-      <Head title={props.title} metaDescription={props.metaDescription} />
+    <div className="min-h-screen dark:bg-zinc-900 dark:text-white bg-gray-50 text-gray-900 transition-colors">
       <HeaderNav />
-      <main>
-        <div className="container mx-auto p-4">{props.children}</div>
-      </main>
+      <main className="container mx-auto p-4">{children}</main>
       <Footer />
     </div>
   );
 }
-
-export default Layout;
diff --git a/src/features/common/components/modal.tsx b/src/features/common/components/modal.tsx
index 574407d..3811466 100644
--- a/src/features/common/components/modal.tsx
+++ b/src/features/common/components/modal.tsx
@@ -1,33 +1,34 @@
+import { Fragment, ReactNode } from "react";
 import { Dialog, Transition } from "@headlessui/react";
-import React, { Fragment } from "react";
-import { FiX } from "react-icons/fi";
 
-import Button from "./button";
-
-export default function Modal(props: {
-  title: string;
+export default function Modal({
+  isOpen,
+  onClose,
+  title,
+  children,
+}: {
   isOpen: boolean;
   onClose: () => void;
-  children: React.ReactNode;
+  title: string;
+  children: ReactNode;
 }) {
   return (
-    <>
-      <Transition appear show={props.isOpen} as={Fragment}>
-        <Dialog
-          as="div"
-          className="fixed inset-0 z-10 overflow-y-auto"
-          onClose={props.onClose}
+    <Transition appear show={isOpen} as={Fragment}>
+      <Dialog as="div" className="relative z-10" onClose={onClose}>
+        <Transition.Child
+          as={Fragment}
+          enter="ease-out duration-300"
+          enterFrom="opacity-0"
+          enterTo="opacity-100"
+          leave="ease-in duration-200"
+          leaveFrom="opacity-100"
+          leaveTo="opacity-0"
         >
-          <div className="min-h-screen px-4 text-center">
-            <Dialog.Overlay className="fixed inset-0 bg-black opacity-30" />
+          <div className="fixed inset-0 bg-black bg-opacity-25" />
+        </Transition.Child>
 
-            {/* This element is to trick the browser into centering the modal contents. */}
-            <span
-              className="inline-block h-screen align-middle"
-              aria-hidden="true"
-            >
-              &#8203;
-            </span>
+        <div className="fixed inset-0 overflow-y-auto">
+          <div className="flex min-h-full items-center justify-center p-4 text-center">
             <Transition.Child
               as={Fragment}
               enter="ease-out duration-300"
@@ -37,22 +38,20 @@ export default function Modal(props: {
               leaveFrom="opacity-100 scale-100"
               leaveTo="opacity-0 scale-95"
             >
-              <div className="inline-block w-full max-w-md p-6 my-8 overflow-hidden text-left align-middle transition-all transform bg-white dark:bg-zinc-800 shadow-xl rounded-2xl">
+              <Dialog.Panel className="inline-block w-full max-w-md p-6 my-8 overflow-hidden text-left align-middle transition-all transform bg-white dark:bg-zinc-800 shadow-xl rounded-2xl">
                 <Dialog.Title
                   as="h3"
-                  className="text-lg font-medium leading-6 text-black dark:text-white flex flex-row justify-between items-center"
+                  className="text-lg font-medium leading-6 text-gray-900 dark:text-black dark:text-white flex flex-row justify-between items-center"
                 >
-                  {props.title}
-                  <Button type="icon" onClick={props.onClose}>
-                    <FiX />
-                  </Button>
+                  {title}
+                  <button onClick={onClose}>x</button>
                 </Dialog.Title>
-                {props.children}
-              </div>
+                <div className="mt-2">{children}</div>
+              </Dialog.Panel>
             </Transition.Child>
           </div>
-        </Dialog>
-      </Transition>
-    </>
+        </div>
+      </Dialog>
+    </Transition>
   );
 }
diff --git a/src/features/common/components/theme-toggle.tsx b/src/features/common/components/theme-toggle.tsx
new file mode 100644
index 0000000..c37050a
--- /dev/null
+++ b/src/features/common/components/theme-toggle.tsx
@@ -0,0 +1,38 @@
+import React from "react";
+import { useTheme } from "../context/theme-context";
+
+export const ThemeToggle: React.FC = () => {
+  const { theme, toggleTheme } = useTheme();
+
+  return (
+    <button
+      onClick={toggleTheme}
+      className="p-2 rounded-lg hover:bg-gray-200 dark:hover:bg-zinc-700 transition-colors"
+      aria-label={`Switch to ${theme === "dark" ? "light" : "dark"} mode`}
+    >
+      {theme === "dark" ? (
+        // Sun icon for switching to light
+        <svg
+          className="w-5 h-5 text-yellow-400"
+          fill="currentColor"
+          viewBox="0 0 20 20"
+        >
+          <path
+            fillRule="evenodd"
+            d="M10 2a1 1 0 011 1v1a1 1 0 11-2 0V3a1 1 0 011-1zm4 8a4 4 0 11-8 0 4 4 0 018 0zm-.464 4.95l.707.707a1 1 0 001.414-1.414l-.707-.707a1 1 0 00-1.414 1.414zm2.12-10.607a1 1 0 010 1.414l-.706.707a1 1 0 11-1.414-1.414l.707-.707a1 1 0 011.414 0zM17 11a1 1 0 100-2h-1a1 1 0 100 2h1zm-7 4a1 1 0 011 1v1a1 1 0 11-2 0v-1a1 1 0 011-1zM5.05 6.464A1 1 0 106.465 5.05l-.708-.707a1 1 0 00-1.414 1.414l.707.707zm1.414 8.486l-.707.707a1 1 0 01-1.414-1.414l.707-.707a1 1 0 011.414 1.414zM4 11a1 1 0 100-2H3a1 1 0 000 2h1z"
+            clipRule="evenodd"
+          />
+        </svg>
+      ) : (
+        // Moon icon for switching to dark
+        <svg
+          className="w-5 h-5 text-gray-700"
+          fill="currentColor"
+          viewBox="0 0 20 20"
+        >
+          <path d="M17.293 13.293A8 8 0 016.707 2.707a8.001 8.001 0 1010.586 10.586z" />
+        </svg>
+      )}
+    </button>
+  );
+};
diff --git a/src/features/common/context/theme-context.tsx b/src/features/common/context/theme-context.tsx
new file mode 100644
index 0000000..b8987a3
--- /dev/null
+++ b/src/features/common/context/theme-context.tsx
@@ -0,0 +1,51 @@
+import React, { createContext, useContext, useEffect, useState } from "react";
+
+type Theme = "light" | "dark";
+
+interface ThemeContextType {
+  theme: Theme;
+  toggleTheme: () => void;
+}
+
+const ThemeContext = createContext<ThemeContextType>({
+  theme: "dark",
+  toggleTheme: () => {},
+});
+
+export const useTheme = () => useContext(ThemeContext);
+
+export const ThemeProvider: React.FC<{ children: React.ReactNode }> = ({
+  children,
+}) => {
+  const [theme, setTheme] = useState<Theme>("dark");
+
+  useEffect(() => {
+    // Check localStorage first, then system preference
+    const stored = localStorage.getItem("theme") as Theme | null;
+    if (stored) {
+      setTheme(stored);
+    } else if (window.matchMedia("(prefers-color-scheme: light)").matches) {
+      setTheme("light");
+    }
+  }, []);
+
+  useEffect(() => {
+    const root = document.documentElement;
+    if (theme === "dark") {
+      root.classList.add("dark");
+    } else {
+      root.classList.remove("dark");
+    }
+    localStorage.setItem("theme", theme);
+  }, [theme]);
+
+  const toggleTheme = () => {
+    setTheme((prev) => (prev === "dark" ? "light" : "dark"));
+  };
+
+  return (
+    <ThemeContext.Provider value={{ theme, toggleTheme }}>
+      {children}
+    </ThemeContext.Provider>
+  );
+};
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
index 3d22fbc..82175fc 100644
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -1,65 +1,77 @@
 import React from "react";
 import { QueryClient, QueryClientProvider } from "react-query";
 import { ReactQueryDevtools } from "react-query/devtools";
-import { UserProvider } from '@auth0/nextjs-auth0';
+import { UserProvider } from "@auth0/nextjs-auth0";
 
 import "../styles/globals.css";
 
 import type { AppProps } from "next/app";
 
-import '@rainbow-me/rainbowkit/styles.css';
+import "@rainbow-me/rainbowkit/styles.css";
 
 import {
   darkTheme,
+  lightTheme,
   getDefaultWallets,
   RainbowKitProvider,
-} from '@rainbow-me/rainbowkit';
+} from "@rainbow-me/rainbowkit";
 import {
   chain,
   configureChains,
   createClient,
   WagmiConfig,
-} from 'wagmi';
-import { alchemyProvider } from 'wagmi/providers/alchemy';
-import { publicProvider } from 'wagmi/providers/public';
+} from "wagmi";
+import { alchemyProvider } from "wagmi/providers/alchemy";
+import { publicProvider } from "wagmi/providers/public";
+
+import { ThemeProvider, useTheme } from "../features/common/context/theme-context";
 
 const { chains, provider } = configureChains(
   [chain.polygonMumbai],
   [
     alchemyProvider({ alchemyId: process.env.ALCHEMY_ID }),
-    publicProvider()
+    publicProvider(),
   ]
 );
 
 const { connectors } = getDefaultWallets({
-  appName: 'BetterApp',
-  chains
+  appName: "BetterApp",
+  chains,
 });
 
 const wagmiClient = createClient({
   autoConnect: true,
   connectors,
-  provider
-})
+  provider,
+});
 
-export default function App({ Component, pageProps }: AppProps) {
+function AppContent({ Component, pageProps }: AppProps) {
   const [queryClient] = React.useState(() => new QueryClient());
+  const { theme } = useTheme();
 
+  const rainbowTheme =
+    theme === "dark"
+      ? darkTheme({ accentColor: "#EC4899" })
+      : lightTheme({ accentColor: "#DB2777" });
 
+  return (
+    <WagmiConfig client={wagmiClient}>
+      <RainbowKitProvider chains={chains} theme={rainbowTheme}>
+        <QueryClientProvider client={queryClient}>
+          <Component {...pageProps} />
+          <ReactQueryDevtools />
+        </QueryClientProvider>
+      </RainbowKitProvider>
+    </WagmiConfig>
+  );
+}
 
-
+export default function App(props: AppProps) {
   return (
     <UserProvider>
-      <WagmiConfig client={wagmiClient}>
-        <RainbowKitProvider chains={chains} theme={darkTheme({
-          accentColor: '#EC4899',
-        })}>
-          <QueryClientProvider client={queryClient}>
-            <Component {...pageProps} />
-            <ReactQueryDevtools />
-          </QueryClientProvider>
-        </RainbowKitProvider>
-      </WagmiConfig>
+      <ThemeProvider>
+        <AppContent {...props} />
+      </ThemeProvider>
     </UserProvider>
   );
 }
diff --git a/src/styles/globals.css b/src/styles/globals.css
index b5c61c9..208ecc2 100644
--- a/src/styles/globals.css
+++ b/src/styles/globals.css
@@ -1,3 +1,9 @@
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
+
+@layer base {
+  body {
+    @apply dark:bg-zinc-900 bg-gray-50 dark:text-white text-gray-900;
+  }
+}
diff --git a/tailwind.config.js b/tailwind.config.js
index f451566..2f08b2d 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -1,8 +1,10 @@
+/** @type {import('tailwindcss').Config} */
 module.exports = {
   content: [
     "./src/pages/**/*.{js,ts,jsx,tsx}",
     "./src/features/**/*.{js,ts,jsx,tsx}",
   ],
+  darkMode: "class",
   theme: {
     extend: {},
   },