diff --git a/src/app/create-game/page.tsx b/src/app/create-game/page.tsx
index dee117b..7510a04 100644
--- a/src/app/create-game/page.tsx
+++ b/src/app/create-game/page.tsx
@@ -42,7 +42,7 @@ const [gameSlug, setGameSlug] = useState("");
 const [thumbnailUrl, setThumbnailUrl] = useState("");
 const [authorSearch, setAuthorSearch] = useState("");
 const [selectedAuthors, setSelectedAuthors] = useState<Array<{id: number, name: string}>>([]);
-const [searchResults, setSearchResults] = useState([]);
+const [searchResults, setSearchResults] = useState<Array<{ id: number; name: string }>>([]);
 
 // Add this function to handle author search
 const handleAuthorSearch = async (query: string) => {
diff --git a/src/app/create-post/page.tsx b/src/app/create-post/page.tsx
index 4ff98f0..b10f524 100644
--- a/src/app/create-post/page.tsx
+++ b/src/app/create-post/page.tsx
@@ -19,6 +19,7 @@ import Select, { MultiValue, StylesConfig } from "react-select";
 import { useTheme } from "next-themes";
 import Timers from "@/components/timers";
 import Streams from "@/components/streams";
+import { UserType } from "@/types/UserType";
 
 export default function CreatePostPage() {
   const [title, setTitle] = useState("");
@@ -306,7 +307,7 @@ export default function CreatePostPage() {
           </Button>
         </div>
       </Form>
-      <div class="flex flex-col gap-4 px-8 items-end">
+      <div className="flex flex-col gap-4 px-8 items-end">
         <Timers />
         <Streams />
       </div>
diff --git a/src/components/editor/index.tsx b/src/components/editor/index.tsx
index aa484d6..6c8a2fe 100644
--- a/src/components/editor/index.tsx
+++ b/src/components/editor/index.tsx
@@ -40,7 +40,7 @@ import { useTheme } from "next-themes";
 type EditorProps = {
   content: string;
   setContent: (content: string) => void;
-  gameEditor: boolean;
+  gameEditor?: boolean;
 };
 
 const limit = 32767;
diff --git a/src/components/themes/theme-slaughter.tsx b/src/components/themes/theme-slaughter.tsx
index b57a75a..4715d4b 100644
--- a/src/components/themes/theme-slaughter.tsx
+++ b/src/components/themes/theme-slaughter.tsx
@@ -1,286 +1,295 @@
 "use client";
 
-// import React, { useState, useEffect, useCallback } from "react";
-// import { getCookie } from "@/helpers/cookie";
-// import {
-//   getCurrentJam,
-//   hasJoinedCurrentJam,
-//   ActiveJamResponse,
-// } from "@/helpers/jam";
+import React, { useState, useEffect, useCallback } from "react";
+import { getCookie } from "@/helpers/cookie";
+import {
+  getCurrentJam,
+  hasJoinedCurrentJam,
+  ActiveJamResponse,
+  joinJam
+} from "@/helpers/jam";
+import {ThemeType} from "@/types/ThemeType";
 
 export default function ThemeSlaughter() {
-  // const [randomTheme, setRandomTheme] = useState(null);
-  // const [votedThemes, setVotedThemes] = useState([]);
-  // const [loading, setLoading] = useState(false);
-  // const [token, setToken] = useState<string | null>(null);
-  // const [hasJoined, setHasJoined] = useState<boolean>(false);
-  // const [activeJamResponse, setActiveJam] = useState<ActiveJamResponse | null>(
-  //   null
-  // );
-  // const [phaseLoading, setPhaseLoading] = useState(true);
+  const [randomTheme, setRandomTheme] = useState<ThemeType | null>(null);
+  const [votedThemes, setVotedThemes] = useState<ThemeType[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [token, setToken] = useState<string | null>(null);
+  const [hasJoined, setHasJoined] = useState<boolean>(false);
+  const [activeJamResponse, setActiveJam] = useState<ActiveJamResponse | null>(
+    null
+  );
+  const [phaseLoading, setPhaseLoading] = useState(true);
 
-  // // Fetch token on the client side
-  // useEffect(() => {
-  //   const fetchedToken = getCookie("token");
-  //   setToken(fetchedToken);
-  // }, []);
+  // Fetch token on the client side
+  useEffect(() => {
+    const fetchedToken = getCookie("token");
+    setToken(fetchedToken);
+  }, []);
 
-  // // Fetch the current jam phase using helpers/jam
-  // useEffect(() => {
-  //   const fetchCurrentJamPhase = async () => {
-  //     try {
-  //       const activeJam = await getCurrentJam();
-  //       setActiveJam(activeJam); // Set active jam details
-  //     } catch (error) {
-  //       console.error("Error fetching current jam:", error);
-  //     } finally {
-  //       setPhaseLoading(false); // Stop loading when phase is fetched
-  //     }
-  //   };
+  // Fetch the current jam phase using helpers/jam
+  useEffect(() => {
+    const fetchCurrentJamPhase = async () => {
+      try {
+        const activeJam = await getCurrentJam();
+        setActiveJam(activeJam); // Set active jam details
+      } catch (error) {
+        console.error("Error fetching current jam:", error);
+      } finally {
+        setPhaseLoading(false); // Stop loading when phase is fetched
+      }
+    };
 
-  //   fetchCurrentJamPhase();
-  // }, []);
+    fetchCurrentJamPhase();
+  }, []);
 
-  // // Fetch a random theme
-  // const fetchRandomTheme = useCallback(async () => {
-  //   if (!token) return; // Wait until token is available
-  //   if (!activeJamResponse) return;
-  //   if (
-  //     activeJamResponse &&
-  //     activeJamResponse.jam &&
-  //     activeJamResponse.phase != "Survival"
-  //   ) {
-  //     return (
-  //       <div>
-  //         <h1>It&apos;s not Theme Survival phase.</h1>
-  //       </div>
-  //     );
-  //   }
+  // Fetch a random theme
+  const fetchRandomTheme = useCallback(async () => {
+    if (!token) return; // Wait until token is available
+    if (!activeJamResponse) return;
+    if (
+      activeJamResponse &&
+      activeJamResponse.jam &&
+      activeJamResponse.phase != "Survival"
+    ) {
+      return (
+        <div>
+          <h1>It&apos;s not Theme Survival phase.</h1>
+        </div>
+      );
+    }
 
-  //   try {
-  //     const response = await fetch(
-  //       process.env.NEXT_PUBLIC_MODE === "PROD"
-  //         ? "https://d2jam.com/api/v1/themes/random"
-  //         : "http://localhost:3005/api/v1/themes/random",
-  //       {
-  //         headers: { Authorization: `Bearer ${token}` },
-  //         credentials: "include",
-  //       }
-  //     );
-  //     if (response.ok) {
-  //       const data = await response.json();
-  //       setRandomTheme(data);
-  //     } else {
-  //       console.error("Failed to fetch random theme.");
-  //     }
-  //   } catch (error) {
-  //     console.error("Error fetching random theme:", error);
-  //   }
-  // }, [activeJamResponse, token]);
+    try {
+      const response = await fetch(
+        process.env.NEXT_PUBLIC_MODE === "PROD"
+          ? "https://d2jam.com/api/v1/themes/random"
+          : "http://localhost:3005/api/v1/themes/random",
+        {
+          headers: { Authorization: `Bearer ${token}` },
+          credentials: "include",
+        }
+      );
+      if (response.ok) {
+        const data = await response.json();
+        setRandomTheme(data);
+      } else {
+        console.error("Failed to fetch random theme.");
+      }
+    } catch (error) {
+      console.error("Error fetching random theme:", error);
+    }
+  }, [activeJamResponse, token]);
 
-  // // Fetch voted themes
-  // const fetchVotedThemes = useCallback(async () => {
-  //   if (!token) return; // Wait until token is available
+  // Fetch voted themes
+  const fetchVotedThemes = useCallback(async () => {
+    if (!token) return; // Wait until token is available
 
-  //   try {
-  //     const response = await fetch(
-  //       process.env.NEXT_PUBLIC_MODE === "PROD"
-  //         ? "https://d2jam.com/api/v1/themes/voteSlaughter"
-  //         : "http://localhost:3005/api/v1/themes/voteSlaughter",
-  //       {
-  //         headers: { Authorization: `Bearer ${token}` },
-  //         credentials: "include",
-  //       }
-  //     );
-  //     if (response.ok) {
-  //       const data = await response.json();
-  //       setVotedThemes(data);
-  //     } else {
-  //       console.error("Failed to fetch voted themes.");
-  //     }
-  //   } catch (error) {
-  //     console.error("Error fetching voted themes:", error);
-  //   }
-  // }, [token]);
+    try {
+      const response = await fetch(
+        process.env.NEXT_PUBLIC_MODE === "PROD"
+          ? "https://d2jam.com/api/v1/themes/voteSlaughter"
+          : "http://localhost:3005/api/v1/themes/voteSlaughter",
+        {
+          headers: { Authorization: `Bearer ${token}` },
+          credentials: "include",
+        }
+      );
+      if (response.ok) {
+        const data = await response.json();
+        setVotedThemes(data);
+      } else {
+        console.error("Failed to fetch voted themes.");
+      }
+    } catch (error) {
+      console.error("Error fetching voted themes:", error);
+    }
+  }, [token]);
 
-  // // Handle voting
-  // const handleVote = async (voteType: string) => {
-  //   if (!randomTheme) return;
+  // Handle voting
+  const handleVote = async (voteType: string) => {
+    if (!randomTheme) return;
 
-  //   setLoading(true);
-  //   try {
-  //     const response = await fetch(
-  //       process.env.NEXT_PUBLIC_MODE === "PROD"
-  //         ? "https://d2jam.com/api/v1/themes/voteSlaughter"
-  //         : "http://localhost:3005/api/v1/themes/voteSlaughter",
-  //       {
-  //         method: "POST",
-  //         headers: {
-  //           "Content-Type": "application/json",
-  //           Authorization: `Bearer ${token}`,
-  //         },
-  //         credentials: "include",
-  //         body: JSON.stringify({
-  //           suggestionId: randomTheme.id,
-  //           voteType,
-  //         }),
-  //       }
-  //     );
+    setLoading(true);
+    try {
+      const response = await fetch(
+        process.env.NEXT_PUBLIC_MODE === "PROD"
+          ? "https://d2jam.com/api/v1/themes/voteSlaughter"
+          : "http://localhost:3005/api/v1/themes/voteSlaughter",
+        {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: `Bearer ${token}`,
+          },
+          credentials: "include",
+          body: JSON.stringify({
+            suggestionId: randomTheme.id,
+            voteType,
+          }),
+        }
+      );
 
-  //     if (response.ok) {
-  //       // Refresh data after voting
-  //       fetchRandomTheme();
-  //       fetchVotedThemes();
-  //     } else {
-  //       console.error("Failed to submit vote.");
-  //     }
-  //   } catch (error) {
-  //     console.error("Error submitting vote:", error);
-  //   } finally {
-  //     setLoading(false);
-  //   }
-  // };
+      if (response.ok) {
+        // Refresh data after voting
+        fetchRandomTheme();
+        fetchVotedThemes();
+      } else {
+        console.error("Failed to submit vote.");
+      }
+    } catch (error) {
+      console.error("Error submitting vote:", error);
+    } finally {
+      setLoading(false);
+    }
+  };
 
-  // // Handle resetting a vote from the grid
-  // const handleResetVote = async (themeId: number) => {
-  //   try {
-  //     setRandomTheme(votedThemes.find((theme) => theme.id === themeId));
-  //     setVotedThemes((prev) =>
-  //       prev.map((theme) =>
-  //         theme.id === themeId ? { ...theme, slaughterScore: 0 } : theme
-  //       )
-  //     );
-  //   } catch (error) {
-  //     console.error("Error resetting vote:", error);
-  //   }
-  // };
+  // Handle resetting a vote from the grid
+  const handleResetVote = async (themeId: number) => {
+    try {
+      const theme = votedThemes.find((theme) => theme.id === themeId);
+      if (theme) {
+        setRandomTheme(theme);
+        setVotedThemes((prev) =>
+          prev.map((t) =>
+            t.id === themeId ? { ...t, slaughterScore: 0 } : t
+          )
+        );
+      }
+    } catch (error) {
+      console.error("Error resetting vote:", error);
+    }
+  };
 
-  // useEffect(() => {
-  //   if (token && activeJamResponse?.phase === "Survival") {
-  //     fetchRandomTheme();
-  //     fetchVotedThemes();
-  //   }
-  // }, [token, activeJamResponse, fetchRandomTheme, fetchVotedThemes]);
+  useEffect(() => {
+    if (token && activeJamResponse?.phase === "Survival") {
+      fetchRandomTheme();
+      fetchVotedThemes();
+    }
+  }, [token, activeJamResponse, fetchRandomTheme, fetchVotedThemes]);
 
-  // useEffect(() => {
-  //   const init = async () => {
-  //     const joined = await hasJoinedCurrentJam();
-  //     setHasJoined(joined);
-  //     setLoading(false);
-  //   };
+  useEffect(() => {
+    const init = async () => {
+      const joined = await hasJoinedCurrentJam();
+      setHasJoined(joined);
+      setLoading(false);
+    };
 
-  //   init();
-  // }, []);
+    init();
+  }, []);
 
-  // if (phaseLoading || loading) {
-  //   return <div>Loading...</div>;
-  // }
+  if (phaseLoading || loading) {
+    return <div>Loading...</div>;
+  }
 
-  // if (!hasJoined) {
-  //   return (
-  //     <div className="p-6 bg-gray-100 dark:bg-gray-800 min-h-screen">
-  //       <h1 className="text-2xl font-bold text-gray-800 dark:text-white mb-6">
-  //         Join the Jam First
-  //       </h1>
-  //       <p className="text-gray-600 dark:text-gray-400">
-  //         You need to join the current jam before you can join Theme Survival.
-  //       </p>
-  //       <button
-  //         onClick={() => joinJam(activeJamResponse?.jam?.id)}
-  //         className="mt-4 px-6 py-2 bg-blue-500 text-white rounded-lg hover:bg-blue-600"
-  //       >
-  //         Join Jam
-  //       </button>
-  //     </div>
-  //   );
-  // }
+  if (!hasJoined) {
+    return (
+      <div className="p-6 bg-gray-100 dark:bg-gray-800 min-h-screen">
+        <h1 className="text-2xl font-bold text-gray-800 dark:text-white mb-6">
+          Join the Jam First
+        </h1>
+        <p className="text-gray-600 dark:text-gray-400">
+          You need to join the current jam before you can join Theme Survival.
+        </p>
+        <button
+          onClick={() => {
+            if (activeJamResponse?.jam?.id !== undefined) {
+              joinJam(activeJamResponse.jam.id);
+            }
+          }}
+          className="mt-4 px-6 py-2 bg-blue-500 text-white rounded-lg hover:bg-blue-600"
+        >
+          Join Jam
+        </button>
+      </div>
+    );
+  }
 
-  // // Render message if not in Theme Slaughter phase
-  // if (activeJamResponse?.phase !== "Survival") {
-  //   return (
-  //     <div className="p-6 bg-gray-100 dark:bg-gray-800 min-h-screen">
-  //       <h1 className="text-2xl font-bold text-gray-800 dark:text-white mb-6">
-  //         Not in Theme Slaughter Phase
-  //       </h1>
-  //       <p className="text-gray-600 dark:text-gray-400">
-  //         The current phase is{" "}
-  //         <strong>{activeJamResponse?.phase || "Unknown"}</strong>. Please come
-  //         back during the Theme Slaughter phase.
-  //       </p>
-  //     </div>
-  //   );
-  // }
+  // Render message if not in Theme Slaughter phase
+  if (activeJamResponse?.phase !== "Survival") {
+    return (
+      <div className="p-6 bg-gray-100 dark:bg-gray-800 min-h-screen">
+        <h1 className="text-2xl font-bold text-gray-800 dark:text-white mb-6">
+          Not in Theme Slaughter Phase
+        </h1>
+        <p className="text-gray-600 dark:text-gray-400">
+          The current phase is{" "}
+          <strong>{activeJamResponse?.phase || "Unknown"}</strong>. Please come
+          back during the Theme Slaughter phase.
+        </p>
+      </div>
+    );
+  }
 
-  // const loggedIn = getCookie("token");
+  const loggedIn = getCookie("token");
 
-  // if (!loggedIn) {
-  //   return <div>Sign in to be able to join the Theme Survival</div>;
-  // }
+  if (!loggedIn) {
+    return <div>Sign in to be able to join the Theme Survival</div>;
+  }
 
-  // return (
-  //   <div className="flex h-screen">
-  //     {/* Left Side */}
-  //     <div className="w-1/2 p-6 bg-gray-100 dark:bg-gray-800 flex flex-col justify-start items-center">
-  //       {randomTheme ? (
-  //         <>
-  //           <h2 className="text-2xl font-bold text-gray-800 dark:text-white mb-4">
-  //             {randomTheme.suggestion}
-  //           </h2>
-  //           <div className="flex gap-4">
-  //             <button
-  //               onClick={() => handleVote("YES")}
-  //               className="px-6 py-3 bg-green-500 text-white font-bold rounded-lg hover:bg-green-600"
-  //               disabled={loading}
-  //             >
-  //               YES
-  //             </button>
-  //             <button
-  //               onClick={() => handleVote("NO")}
-  //               className="px-6 py-3 bg-red-500 text-white font-bold rounded-lg hover:bg-red-600"
-  //               disabled={loading}
-  //             >
-  //               NO
-  //             </button>
-  //             <button
-  //               onClick={() => handleVote("SKIP")}
-  //               className="px-6 py-3 bg-gray-500 text-white font-bold rounded-lg hover:bg-gray-600"
-  //               disabled={loading}
-  //             >
-  //               SKIP
-  //             </button>
-  //           </div>
-  //         </>
-  //       ) : (
-  //         <p className="text-gray-600 dark:text-gray-400">
-  //           No themes available.
-  //         </p>
-  //       )}
-  //     </div>
+  return (
+    <div className="flex h-screen">
+      {/* Left Side */}
+      <div className="w-1/2 p-6 bg-gray-100 dark:bg-gray-800 flex flex-col justify-start items-center">
+        {randomTheme ? (
+          <>
+            <h2 className="text-2xl font-bold text-gray-800 dark:text-white mb-4">
+              {randomTheme.suggestion}
+            </h2>
+            <div className="flex gap-4">
+              <button
+                onClick={() => handleVote("YES")}
+                className="px-6 py-3 bg-green-500 text-white font-bold rounded-lg hover:bg-green-600"
+                disabled={loading}
+              >
+                YES
+              </button>
+              <button
+                onClick={() => handleVote("NO")}
+                className="px-6 py-3 bg-red-500 text-white font-bold rounded-lg hover:bg-red-600"
+                disabled={loading}
+              >
+                NO
+              </button>
+              <button
+                onClick={() => handleVote("SKIP")}
+                className="px-6 py-3 bg-gray-500 text-white font-bold rounded-lg hover:bg-gray-600"
+                disabled={loading}
+              >
+                SKIP
+              </button>
+            </div>
+          </>
+        ) : (
+          <p className="text-gray-600 dark:text-gray-400">
+            No themes available.
+          </p>
+        )}
+      </div>
 
-  //     {/* Right Side */}
-  //     <div className="w-1/2 p-6 bg-white dark:bg-gray-900 overflow-y-auto">
-  //       <h3 className="text-xl font-bold text-gray-800 dark:text-white mb-4">
-  //         Your Votes
-  //       </h3>
-  //       <div className="grid grid-cols-4 gap-4">
-  //         {votedThemes.map((theme) => (
-  //           <div
-  //             key={theme.id}
-  //             onClick={() => handleResetVote(theme.id)}
-  //             className={`p-4 rounded-lg cursor-pointer ${
-  //               theme.slaughterScore > 0
-  //                 ? "bg-green-500 text-white"
-  //                 : theme.slaughterScore < 0
-  //                 ? "bg-red-500 text-white"
-  //                 : "bg-gray-300 text-black"
-  //             }`}
-  //           >
-  //             {theme.suggestion}
-  //           </div>
-  //         ))}
-  //       </div>
-  //     </div>
-  //   </div>
-  // );
+      {/* Right Side */}
+      <div className="w-1/2 p-6 bg-white dark:bg-gray-900 overflow-y-auto">
+        <h3 className="text-xl font-bold text-gray-800 dark:text-white mb-4">
+          Your Votes
+        </h3>
+        <div className="grid grid-cols-4 gap-4">
+          {votedThemes.map((theme) => (
+            <div
+              key={theme.id}
+              onClick={() => handleResetVote(theme.id)}
+              className={`p-4 rounded-lg cursor-pointer ${
+                theme.slaughterScore > 0
+                  ? "bg-green-500 text-white"
+                  : theme.slaughterScore < 0
+                  ? "bg-red-500 text-white"
+                  : "bg-gray-300 text-black"
+              }`}
+            >
+              {theme.suggestion}
+            </div>
+          ))}
+        </div>
+      </div>
+    </div>
+  );
   return <></>;
 }
diff --git a/src/components/themes/theme-suggest.tsx b/src/components/themes/theme-suggest.tsx
index 8fa72ff..40925c0 100644
--- a/src/components/themes/theme-suggest.tsx
+++ b/src/components/themes/theme-suggest.tsx
@@ -1,282 +1,287 @@
 "use client";
 
-// import React, { useState, useEffect } from "react";
-// import { getCookie } from "@/helpers/cookie";
-// import {
-//   getCurrentJam,
-//   hasJoinedCurrentJam,
-//   ActiveJamResponse,
-// } from "@/helpers/jam";
+import React, { useState, useEffect } from "react";
+import { getCookie } from "@/helpers/cookie";
+import {
+  getCurrentJam,
+  hasJoinedCurrentJam,
+  ActiveJamResponse,
+} from "@/helpers/jam";
+import { ThemeType } from "@/types/ThemeType";
+import { joinJam } from "@/helpers/jam";
 
 export default function ThemeSuggestions() {
-  // const [suggestion, setSuggestion] = useState("");
-  // const [loading, setLoading] = useState(false);
-  // const [successMessage, setSuccessMessage] = useState("");
-  // const [errorMessage, setErrorMessage] = useState("");
-  // const [userSuggestions, setUserSuggestions] = useState([]);
-  // const [themeLimit, setThemeLimit] = useState(0);
-  // const [hasJoined, setHasJoined] = useState<boolean>(false);
-  // const [activeJamResponse, setActiveJamResponse] =
-  //   useState<ActiveJamResponse | null>(null);
-  // const [phaseLoading, setPhaseLoading] = useState(true); // Loading state for fetching phase
+  const [suggestion, setSuggestion] = useState("");
+  const [loading, setLoading] = useState(false);
+  const [successMessage, setSuccessMessage] = useState("");
+  const [errorMessage, setErrorMessage] = useState("");
+  const [userSuggestions, setUserSuggestions] =  useState<ThemeType[]>([]);
+  const [themeLimit, setThemeLimit] = useState(0);
+  const [hasJoined, setHasJoined] = useState<boolean>(false);
+  const [activeJamResponse, setActiveJamResponse] =
+    useState<ActiveJamResponse | null>(null);
+  const [phaseLoading, setPhaseLoading] = useState(true); // Loading state for fetching phase
 
-  // // Fetch the current jam phase using helpers/jam
-  // useEffect(() => {
-  //   const fetchCurrentJamPhase = async () => {
-  //     try {
-  //       const activeJam = await getCurrentJam();
-  //       setActiveJamResponse(activeJam); // Set active jam details
-  //       if (activeJam?.jam) {
-  //         setThemeLimit(activeJam.jam.themePerUser || Infinity); // Set theme limit
-  //       }
-  //     } catch (error) {
-  //       console.error("Error fetching current jam:", error);
-  //     } finally {
-  //       setPhaseLoading(false); // Stop loading when phase is fetched
-  //     }
-  //   };
+  // Fetch the current jam phase using helpers/jam
+  useEffect(() => {
+    const fetchCurrentJamPhase = async () => {
+      try {
+        const activeJam = await getCurrentJam();
+        setActiveJamResponse(activeJam); // Set active jam details
+        if (activeJam?.jam) {
+          setThemeLimit(activeJam.jam.themePerUser || Infinity); // Set theme limit
+        }
+      } catch (error) {
+        console.error("Error fetching current jam:", error);
+      } finally {
+        setPhaseLoading(false); // Stop loading when phase is fetched
+      }
+    };
 
-  //   fetchCurrentJamPhase();
-  // }, []);
+    fetchCurrentJamPhase();
+  }, []);
 
-  // // Fetch all suggestions for the logged-in user
-  // const fetchSuggestions = async () => {
-  //   try {
-  //     const response = await fetch(
-  //       process.env.NEXT_PUBLIC_MODE === "PROD"
-  //         ? "https://d2jam.com/api/v1/themes/suggestion"
-  //         : "http://localhost:3005/api/v1/themes/suggestion",
-  //       {
-  //         headers: { Authorization: `Bearer ${getCookie("token")}` },
-  //         credentials: "include",
-  //       }
-  //     );
-  //     if (response.ok) {
-  //       const data = await response.json();
-  //       setUserSuggestions(data);
-  //     }
-  //   } catch (error) {
-  //     console.error("Error fetching suggestions:", error);
-  //   }
-  // };
+  // Fetch all suggestions for the logged-in user
+  const fetchSuggestions = async () => {
+    try {
+      const response = await fetch(
+        process.env.NEXT_PUBLIC_MODE === "PROD"
+          ? "https://d2jam.com/api/v1/themes/suggestion"
+          : "http://localhost:3005/api/v1/themes/suggestion",
+        {
+          headers: { Authorization: `Bearer ${getCookie("token")}` },
+          credentials: "include",
+        }
+      );
+      if (response.ok) {
+        const data = await response.json();
+        setUserSuggestions(data);
+      }
+    } catch (error) {
+      console.error("Error fetching suggestions:", error);
+    }
+  };
 
-  // // Fetch suggestions only when phase is "Suggestion"
-  // useEffect(() => {
-  //   if (activeJamResponse?.phase === "Suggestion") {
-  //     fetchSuggestions();
-  //   }
-  // }, [activeJamResponse]);
+  // Fetch suggestions only when phase is "Suggestion"
+  useEffect(() => {
+    if (activeJamResponse?.phase === "Suggestion") {
+      fetchSuggestions();
+    }
+  }, [activeJamResponse]);
 
-  // // Handle form submission to add a new suggestion
-  // const handleSubmit = async (e: React.FormEvent) => {
-  //   e.preventDefault();
-  //   setLoading(true);
-  //   setSuccessMessage("");
-  //   setErrorMessage("");
+  // Handle form submission to add a new suggestion
+  const handleSubmit = async (e: React.FormEvent) => {
+    e.preventDefault();
+    setLoading(true);
+    setSuccessMessage("");
+    setErrorMessage("");
 
-  //   if (!suggestion.trim()) {
-  //     setErrorMessage("Suggestion cannot be empty.");
-  //     setLoading(false);
-  //     return;
-  //   }
+    if (!suggestion.trim()) {
+      setErrorMessage("Suggestion cannot be empty.");
+      setLoading(false);
+      return;
+    }
 
-  //   try {
-  //     const token = getCookie("token");
+    try {
+      const token = getCookie("token");
 
-  //     if (!token) {
-  //       throw new Error("User is not authenticated. Please log in.");
-  //     }
+      if (!token) {
+        throw new Error("User is not authenticated. Please log in.");
+      }
 
-  //     const response = await fetch(
-  //       process.env.NEXT_PUBLIC_MODE === "PROD"
-  //         ? "https://d2jam.com/api/v1/themes/suggestion"
-  //         : "http://localhost:3005/api/v1/themes/suggestion",
-  //       {
-  //         method: "POST",
-  //         headers: {
-  //           "Content-Type": "application/json",
-  //           Authorization: `Bearer ${token}`,
-  //         },
-  //         credentials: "include",
-  //         body: JSON.stringify({ suggestionText: suggestion }),
-  //       }
-  //     );
+      const response = await fetch(
+        process.env.NEXT_PUBLIC_MODE === "PROD"
+          ? "https://d2jam.com/api/v1/themes/suggestion"
+          : "http://localhost:3005/api/v1/themes/suggestion",
+        {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: `Bearer ${token}`,
+          },
+          credentials: "include",
+          body: JSON.stringify({ suggestionText: suggestion }),
+        }
+      );
 
-  //     if (!response.ok) {
-  //       const errorData = await response.json();
-  //       throw new Error(errorData.error || "Failed to submit suggestion.");
-  //     }
+      if (!response.ok) {
+        const errorData = await response.json();
+        throw new Error(errorData.error || "Failed to submit suggestion.");
+      }
 
-  //     setSuccessMessage("Suggestion added successfully!");
-  //     setSuggestion(""); // Clear input field
-  //     fetchSuggestions(); // Refresh suggestions list
-  //   } catch (error) {
-  //     if (error instanceof Error) {
-  //       console.error("Error submitting suggestion:", error.message);
-  //       setErrorMessage(error.message || "An unexpected error occurred.");
-  //     } else {
-  //       console.error("Unknown error:", error);
-  //       setErrorMessage("An unexpected error occurred.");
-  //     }
-  //   } finally {
-  //     setLoading(false);
-  //   }
-  // };
+      setSuccessMessage("Suggestion added successfully!");
+      setSuggestion(""); // Clear input field
+      fetchSuggestions(); // Refresh suggestions list
+    } catch (error) {
+      if (error instanceof Error) {
+        console.error("Error submitting suggestion:", error.message);
+        setErrorMessage(error.message || "An unexpected error occurred.");
+      } else {
+        console.error("Unknown error:", error);
+        setErrorMessage("An unexpected error occurred.");
+      }
+    } finally {
+      setLoading(false);
+    }
+  };
 
-  // // Handle deleting a suggestion
-  // const handleDelete = async (id: number) => {
-  //   try {
-  //     const token = getCookie("token");
+  // Handle deleting a suggestion
+  const handleDelete = async (id: number) => {
+    try {
+      const token = getCookie("token");
 
-  //     const response = await fetch(
-  //       process.env.NEXT_PUBLIC_MODE === "PROD"
-  //         ? `https://d2jam.com/api/v1/themes/suggestion/${id}`
-  //         : `http://localhost:3005/api/v1/themes/suggestion/${id}`,
-  //       {
-  //         method: "DELETE",
-  //         headers: { Authorization: `Bearer ${token}` },
-  //         credentials: "include",
-  //       }
-  //     );
+      const response = await fetch(
+        process.env.NEXT_PUBLIC_MODE === "PROD"
+          ? `https://d2jam.com/api/v1/themes/suggestion/${id}`
+          : `http://localhost:3005/api/v1/themes/suggestion/${id}`,
+        {
+          method: "DELETE",
+          headers: { Authorization: `Bearer ${token}` },
+          credentials: "include",
+        }
+      );
 
-  //     if (!response.ok) {
-  //       throw new Error("Failed to delete suggestion.");
-  //     }
+      if (!response.ok) {
+        throw new Error("Failed to delete suggestion.");
+      }
 
-  //     fetchSuggestions(); // Refresh suggestions list
-  //   } catch (error) {
-  //     console.error("Error deleting suggestion:", error);
-  //   }
-  // };
+      fetchSuggestions(); // Refresh suggestions list
+    } catch (error) {
+      console.error("Error deleting suggestion:", error);
+    }
+  };
 
-  // useEffect(() => {
-  //   const init = async () => {
-  //     const joined = await hasJoinedCurrentJam();
-  //     setHasJoined(joined);
-  //     setLoading(false);
-  //   };
+  useEffect(() => {
+    const init = async () => {
+      const joined = await hasJoinedCurrentJam();
+      setHasJoined(joined);
+      setLoading(false);
+    };
 
-  //   init();
-  // }, []);
+    init();
+  }, []);
 
-  // // Render loading state while fetching phase
-  // if (phaseLoading || loading) {
-  //   return <div>Loading...</div>;
-  // }
+  // Render loading state while fetching phase
+  if (phaseLoading || loading) {
+    return <div>Loading...</div>;
+  }
 
-  // if (!hasJoined) {
-  //   return (
-  //     <div className="p-6 bg-gray-100 dark:bg-gray-800 min-h-screen">
-  //       <h1 className="text-2xl font-bold text-gray-800 dark:text-white mb-6">
-  //         Join the Jam First
-  //       </h1>
-  //       <p className="text-gray-600 dark:text-gray-400">
-  //         You need to join the current jam before you can suggest themes.
-  //       </p>
-  //       <button
-  //         onClick={() => joinJam(activeJamResponse?.jam?.id)}
-  //         className="mt-4 px-6 py-2 bg-blue-500 text-white rounded-lg hover:bg-blue-600"
-  //       >
-  //         Join Jam
-  //       </button>
-  //     </div>
-  //   );
-  // }
+  if (!hasJoined) {
+    return (
+      <div className="p-6 bg-gray-100 dark:bg-gray-800 min-h-screen">
+        <h1 className="text-2xl font-bold text-gray-800 dark:text-white mb-6">
+          Join the Jam First
+        </h1>
+        <p className="text-gray-600 dark:text-gray-400">
+          You need to join the current jam before you can suggest themes.
+        </p>
+        <button
+          onClick={() => {
+                      if (activeJamResponse?.jam?.id !== undefined) {
+                        joinJam(activeJamResponse.jam.id);
+                      }
+                    }}
+          className="mt-4 px-6 py-2 bg-blue-500 text-white rounded-lg hover:bg-blue-600"
+        >
+          Join Jam
+        </button>
+      </div>
+    );
+  }
 
-  // const token = getCookie("token");
+  const token = getCookie("token");
 
-  // if (!token) {
-  //   return <div>Sign in to be able to suggest themes</div>;
-  // }
+  if (!token) {
+    return <div>Sign in to be able to suggest themes</div>;
+  }
 
-  // // Render message if not in Suggestion phase
-  // if (activeJamResponse?.phase !== "Suggestion") {
-  //   return (
-  //     <div className="p-6 bg-gray-100 dark:bg-gray-800 min-h-screen">
-  //       <h1 className="text-2xl font-bold text-gray-800 dark:text-white mb-6">
-  //         Not in Suggestion Phase
-  //       </h1>
-  //       <p className="text-gray-600 dark:text-gray-400">
-  //         The current phase is{" "}
-  //         <strong>{activeJamResponse?.phase || "Unknown"}</strong>. Please come
-  //         back during the Suggestion phase.
-  //       </p>
-  //     </div>
-  //   );
-  // }
+  // Render message if not in Suggestion phase
+  if (activeJamResponse?.phase !== "Suggestion") {
+    return (
+      <div className="p-6 bg-gray-100 dark:bg-gray-800 min-h-screen">
+        <h1 className="text-2xl font-bold text-gray-800 dark:text-white mb-6">
+          Not in Suggestion Phase
+        </h1>
+        <p className="text-gray-600 dark:text-gray-400">
+          The current phase is{" "}
+          <strong>{activeJamResponse?.phase || "Unknown"}</strong>. Please come
+          back during the Suggestion phase.
+        </p>
+      </div>
+    );
+  }
 
-  // return (
-  //   <div className="max-w-md mx-auto mt-8 p-6 bg-white dark:bg-gray-800 rounded-lg shadow-md">
-  //     <h2 className="text-xl font-bold text-gray-800 dark:text-white mb-4">
-  //       Submit Your Theme Suggestion
-  //     </h2>
+  return (
+    <div className="max-w-md mx-auto mt-8 p-6 bg-white dark:bg-gray-800 rounded-lg shadow-md">
+      <h2 className="text-xl font-bold text-gray-800 dark:text-white mb-4">
+        Submit Your Theme Suggestion
+      </h2>
 
-  //     {/* Hide form if user has reached their limit */}
-  //     {userSuggestions.length < themeLimit ? (
-  //       <form onSubmit={handleSubmit} className="flex flex-col gap-4">
-  //         <textarea
-  //           className="w-full p-3 border rounded-lg focus:outline-none text-gray-600 focus:ring focus:ring-blue-300 dark:bg-gray-700 dark:text-white"
-  //           placeholder="Enter your theme suggestion..."
-  //           value={suggestion}
-  //           onChange={(e) => {
-  //             if (e.target.value.length <= 32) {
-  //               setSuggestion(e.target.value);
-  //             }
-  //           }}
-  //           rows={1}
-  //           maxLength={32}
-  //         ></textarea>
-  //         {errorMessage && (
-  //           <p className="text-red-500 text-sm">{errorMessage}</p>
-  //         )}
-  //         {successMessage && (
-  //           <p className="text-green-500 text-sm">{successMessage}</p>
-  //         )}
-  //         <button
-  //           type="submit"
-  //           className={`w-full py-2 px-4 bg-blue-500 text-white font-semibold rounded-lg shadow-md hover:bg-blue-600 focus:outline-none focus:ring focus:ring-blue-300 ${
-  //             loading ? "opacity-50 cursor-not-allowed" : ""
-  //           }`}
-  //           disabled={loading}
-  //         >
-  //           {loading ? "Submitting..." : "Submit Suggestion"}
-  //         </button>
-  //       </form>
-  //     ) : (
-  //       <p className="text-yellow-500 text-sm">
-  //         You&apos;ve reached your theme suggestion limit for this jam!
-  //       </p>
-  //     )}
+      {/* Hide form if user has reached their limit */}
+      {userSuggestions.length < themeLimit ? (
+        <form onSubmit={handleSubmit} className="flex flex-col gap-4">
+          <textarea
+            className="w-full p-3 border rounded-lg focus:outline-none text-gray-600 focus:ring focus:ring-blue-300 dark:bg-gray-700 dark:text-white"
+            placeholder="Enter your theme suggestion..."
+            value={suggestion}
+            onChange={(e) => {
+              if (e.target.value.length <= 32) {
+                setSuggestion(e.target.value);
+              }
+            }}
+            rows={1}
+            maxLength={32}
+          ></textarea>
+          {errorMessage && (
+            <p className="text-red-500 text-sm">{errorMessage}</p>
+          )}
+          {successMessage && (
+            <p className="text-green-500 text-sm">{successMessage}</p>
+          )}
+          <button
+            type="submit"
+            className={`w-full py-2 px-4 bg-blue-500 text-white font-semibold rounded-lg shadow-md hover:bg-blue-600 focus:outline-none focus:ring focus:ring-blue-300 ${
+              loading ? "opacity-50 cursor-not-allowed" : ""
+            }`}
+            disabled={loading}
+          >
+            {loading ? "Submitting..." : "Submit Suggestion"}
+          </button>
+        </form>
+      ) : (
+        <p className="text-yellow-500 text-sm">
+          You&apos;ve reached your theme suggestion limit for this jam!
+        </p>
+      )}
 
-  //     {/* List of user's suggestions */}
-  //     <div className="mt-6">
-  //       <h3 className="text-lg font-semibold text-gray-800 dark:text-white mb-4">
-  //         Your Suggestions
-  //       </h3>
-  //       {userSuggestions.length > 0 ? (
-  //         <ul className="space-y-4">
-  //           {userSuggestions.map((suggestion) => (
-  //             <li
-  //               key={suggestion.id}
-  //               className="flex justify-between items-center text-gray-400 bg-gray-100 dark:bg-gray-700 p-3 rounded-lg shadow-sm"
-  //             >
-  //               <span>{suggestion.suggestion}</span>
-  //               <button
-  //                 onClick={() => handleDelete(suggestion.id)}
-  //                 className="text-red-500 hover:text-red-700 font-semibold"
-  //               >
-  //                 Delete
-  //               </button>
-  //             </li>
-  //           ))}
-  //         </ul>
-  //       ) : (
-  //         <p className="text-gray-600 dark:text-gray-400">
-  //           You haven&apos;t submitted any suggestions yet.
-  //         </p>
-  //       )}
-  //     </div>
-  //   </div>
-  // );
-  return <></>;
+      {/* List of user's suggestions */}
+      <div className="mt-6">
+        <h3 className="text-lg font-semibold text-gray-800 dark:text-white mb-4">
+          Your Suggestions
+        </h3>
+        {userSuggestions.length > 0 ? (
+          <ul className="space-y-4">
+            {userSuggestions.map((suggestion) => (
+              <li
+                key={suggestion.id}
+                className="flex justify-between items-center text-gray-400 bg-gray-100 dark:bg-gray-700 p-3 rounded-lg shadow-sm"
+              >
+                <span>{suggestion.suggestion}</span>
+                <button
+                  onClick={() => handleDelete(suggestion.id)}
+                  className="text-red-500 hover:text-red-700 font-semibold"
+                >
+                  Delete
+                </button>
+              </li>
+            ))}
+          </ul>
+        ) : (
+          <p className="text-gray-600 dark:text-gray-400">
+            You haven&apos;t submitted any suggestions yet.
+          </p>
+        )}
+      </div>
+    </div>
+  );
 }
diff --git a/src/components/themes/theme-vote.tsx b/src/components/themes/theme-vote.tsx
index 3a0b7fa..19a9547 100644
--- a/src/components/themes/theme-vote.tsx
+++ b/src/components/themes/theme-vote.tsx
@@ -1,245 +1,248 @@
 "use client";
 
-// import React, { useState, useEffect } from "react";
-// import { getCookie } from "@/helpers/cookie";
-// import {
-//   getCurrentJam,
-//   hasJoinedCurrentJam,
-//   ActiveJamResponse,
-// } from "@/helpers/jam";
+import React, { useState, useEffect } from "react";
+import { getCookie } from "@/helpers/cookie";
+import {
+  getCurrentJam,
+  hasJoinedCurrentJam,
+  ActiveJamResponse,
+} from "@/helpers/jam";
+import { ThemeType } from "@/types/ThemeType";
+import { joinJam } from "@/helpers/jam";
+
+interface VoteType {
+  themeSuggestionId: number;
+  votingScore: number;
+}
 
 export default function VotingPage() {
-  return <></>;
-  // const [themes, setThemes] = useState([]);
-  // const [loading, setLoading] = useState(false);
-  // const [activeJamResponse, setActiveJamResponse] =
-  //   useState<ActiveJamResponse | null>(null);
-  // const [hasJoined, setHasJoined] = useState<boolean>(false);
-  // const [phaseLoading, setPhaseLoading] = useState(true); // Loading state for fetching phase
-  // const token = getCookie("token");
+  const [themes, setThemes] = useState<ThemeType[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [activeJamResponse, setActiveJamResponse] = useState<ActiveJamResponse | null>(null);
+  const [hasJoined, setHasJoined] = useState<boolean>(false);
+  const [phaseLoading, setPhaseLoading] = useState(true); // Loading state for fetching phase
+  const token = getCookie("token");
 
-  // // Fetch the current jam phase using helpers/jam
-  // useEffect(() => {
-  //   const fetchCurrentJamPhase = async () => {
-  //     try {
-  //       const activeJam = await getCurrentJam();
-  //       setActiveJamResponse(activeJam); // Set active jam details
-  //     } catch (error) {
-  //       console.error("Error fetching current jam:", error);
-  //     } finally {
-  //       setPhaseLoading(false); // Stop loading when phase is fetched
-  //     }
-  //   };
+  // Fetch the current jam phase using helpers/jam
+  useEffect(() => {
+    const fetchCurrentJamPhase = async () => {
+      try {
+        const activeJam = await getCurrentJam();
+        setActiveJamResponse(activeJam); // Set active jam details
+      } catch (error) {
+        console.error("Error fetching current jam:", error);
+      } finally {
+        setPhaseLoading(false); // Stop loading when phase is fetched
+      }
+    };
 
-  //   fetchCurrentJamPhase();
-  // }, []);
+    fetchCurrentJamPhase();
+  }, []);
 
-  // // Fetch themes only when phase is "Voting"
-  // useEffect(() => {
-  //   // Fetch top N themes with voting scores
-  //   async function fetchThemes() {
-  //     if (!token || !activeJamResponse) return;
+  // Fetch themes only when phase is "Voting"
+  useEffect(() => {
+    // Fetch top N themes with voting scores
+    async function fetchThemes() {
+      if (!token || !activeJamResponse) return;
 
-  //     try {
-  //       const response = await fetch(
-  //         process.env.NEXT_PUBLIC_MODE === "PROD"
-  //           ? "https://d2jam.com/api/v1/themes/top-themes"
-  //           : "http://localhost:3005/api/v1/themes/top-themes",
-  //         {
-  //           headers: { Authorization: `Bearer ${token}` },
-  //           credentials: "include",
-  //         }
-  //       );
-  //       if (response.ok) {
-  //         const themes = await response.json();
-  //         console.log("Fetched themes:", themes); // Debug log
+      try {
+        const response = await fetch(
+          process.env.NEXT_PUBLIC_MODE === "PROD"
+            ? "https://d2jam.com/api/v1/themes/top-themes"
+            : "http://localhost:3005/api/v1/themes/top-themes",
+          {
+            headers: { Authorization: `Bearer ${token}` },
+            credentials: "include",
+          }
+        );
+        if (response.ok) {
+          const themes = await response.json();
 
-  //         // Fetch user's votes for these themes
-  //         const votesResponse = await fetch(
-  //           process.env.NEXT_PUBLIC_MODE === "PROD"
-  //             ? "https://d2jam.com/api/v1/themes/votes"
-  //             : "http://localhost:3005/api/v1/themes/votes",
-  //           {
-  //             headers: { Authorization: `Bearer ${token}` },
-  //             credentials: "include",
-  //           }
-  //         );
+          // Fetch user's votes for these themes
+          const votesResponse = await fetch(
+            process.env.NEXT_PUBLIC_MODE === "PROD"
+              ? "https://d2jam.com/api/v1/themes/votes"
+              : "http://localhost:3005/api/v1/themes/votes",
+            {
+              headers: { Authorization: `Bearer ${token}` },
+              credentials: "include",
+            }
+          );
 
-  //         if (votesResponse.ok) {
-  //           const votes = await votesResponse.json();
-  //           console.log("Fetched votes:", votes); // Debug log
+          if (votesResponse.ok) {
+            const votes = await votesResponse.json();
+            // Merge themes with user's votes
+            const themesWithVotes = themes.map((theme: ThemeType) => {
+              const vote = votes.find((v: VoteType) => v.themeSuggestionId === theme.id);
+              return {
+                ...theme,
+                votingScore: vote ? vote.votingScore : null,
+              };
+            });
+            setThemes(themesWithVotes);
+          }
+        } else {
+          console.error("Failed to fetch themes.");
+        }
+      } catch (error) {
+        console.error("Error fetching themes:", error);
+      }
+    }
 
-  //           // Merge themes with user's votes
-  //           const themesWithVotes = themes.map((theme) => {
-  //             const vote = votes.find((v) => v.themeSuggestionId === theme.id);
-  //             console.log(`Theme ${theme.id} vote:`, vote); // Debug log
-  //             return {
-  //               ...theme,
-  //               votingScore: vote ? vote.votingScore : null,
-  //             };
-  //           });
+    if (activeJamResponse?.phase === "Voting") {
+      fetchThemes();
+    }
+  }, [activeJamResponse, token]);
 
-  //           console.log("Themes with votes:", themesWithVotes); // Debug log
-  //           setThemes(themesWithVotes);
-  //         }
-  //       } else {
-  //         console.error("Failed to fetch themes.");
-  //       }
-  //     } catch (error) {
-  //       console.error("Error fetching themes:", error);
-  //     }
-  //   }
+  // Handle voting
+  const handleVote = async (themeId: number, votingScore: number) => {
+    setLoading(true);
+    try {
+      const response = await fetch(
+        process.env.NEXT_PUBLIC_MODE === "PROD"
+          ? "https://d2jam.com/api/v1/themes/vote"
+          : "http://localhost:3005/api/v1/themes/vote",
+        {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: `Bearer ${token}`,
+          },
+          credentials: "include",
+          body: JSON.stringify({ suggestionId: themeId, votingScore }),
+        }
+      );
 
-  //   if (activeJamResponse?.phase === "Voting") {
-  //     fetchThemes();
-  //   }
-  // }, [activeJamResponse, token]);
+      if (response.ok) {
+        // Just update the local state instead of re-fetching all themes
+        setThemes((prevThemes) =>
+          prevThemes.map((theme) =>
+            theme.id === themeId ? { ...theme, votingScore } : theme
+          )
+        );
+      } else {
+        console.error("Failed to submit vote.");
+      }
+    } catch (error) {
+      console.error("Error submitting vote:", error);
+    } finally {
+      setLoading(false);
+    }
+  };
 
-  // // Handle voting
-  // const handleVote = async (themeId, votingScore) => {
-  //   setLoading(true);
-  //   try {
-  //     const response = await fetch(
-  //       process.env.NEXT_PUBLIC_MODE === "PROD"
-  //         ? "https://d2jam.com/api/v1/themes/vote"
-  //         : "http://localhost:3005/api/v1/themes/vote",
-  //       {
-  //         method: "POST",
-  //         headers: {
-  //           "Content-Type": "application/json",
-  //           Authorization: `Bearer ${token}`,
-  //         },
-  //         credentials: "include",
-  //         body: JSON.stringify({ suggestionId: themeId, votingScore }),
-  //       }
-  //     );
+  useEffect(() => {
+    const init = async () => {
+      const joined = await hasJoinedCurrentJam();
+      setHasJoined(joined);
+      setLoading(false);
+    };
 
-  //     if (response.ok) {
-  //       // Just update the local state instead of re-fetching all themes
-  //       setThemes((prevThemes) =>
-  //         prevThemes.map((theme) =>
-  //           theme.id === themeId ? { ...theme, votingScore } : theme
-  //         )
-  //       );
-  //     } else {
-  //       console.error("Failed to submit vote.");
-  //     }
-  //   } catch (error) {
-  //     console.error("Error submitting vote:", error);
-  //   } finally {
-  //     setLoading(false);
-  //   }
-  // };
+    init();
+  }, []);
 
-  // useEffect(() => {
-  //   const init = async () => {
-  //     const joined = await hasJoinedCurrentJam();
-  //     setHasJoined(joined);
-  //     setLoading(false);
-  //   };
+  if (phaseLoading || loading) {
+    return <div>Loading...</div>;
+  }
 
-  //   init();
-  // }, []);
+  if (!hasJoined) {
+    return (
+      <div className="p-6 bg-gray-100 dark:bg-gray-800 min-h-screen">
+        <h1 className="text-2xl font-bold text-gray-800 dark:text-white mb-6">
+          Join the Jam First
+        </h1>
+        <p className="text-gray-600 dark:text-gray-400">
+          You need to join the current jam before you can vote themes.
+        </p>
+        <button
+          onClick={() => {
+                                if (activeJamResponse?.jam?.id !== undefined) {
+                                  joinJam(activeJamResponse.jam.id);
+                                }
+                              }}
+          className="mt-4 px-6 py-2 bg-blue-500 text-white rounded-lg hover:bg-blue-600"
+        >
+          Join Jam
+        </button>
+      </div>
+    );
+  }
 
-  // if (phaseLoading || loading) {
-  //   return <div>Loading...</div>;
-  // }
+  if (activeJamResponse?.phase !== "Voting") {
+    return (
+      <div className="p-4 bg-gray-100 dark:bg-gray-800 min-h-screen">
+        <h1 className="text-2xl font-bold text-gray-800 dark:text-white mb-4">
+          Not in Voting Phase
+        </h1>
+        <p className="text-gray-600 dark:text-gray-400">
+          The current phase is{" "}
+          <strong>{activeJamResponse?.phase || "Unknown"}</strong>. Please come
+          back during the Voting phase.
+        </p>
+      </div>
+    );
+  }
 
-  // if (!hasJoined) {
-  //   return (
-  //     <div className="p-6 bg-gray-100 dark:bg-gray-800 min-h-screen">
-  //       <h1 className="text-2xl font-bold text-gray-800 dark:text-white mb-6">
-  //         Join the Jam First
-  //       </h1>
-  //       <p className="text-gray-600 dark:text-gray-400">
-  //         You need to join the current jam before you can vote themes.
-  //       </p>
-  //       <button
-  //         onClick={() => joinJam(activeJamResponse?.jam?.id)}
-  //         className="mt-4 px-6 py-2 bg-blue-500 text-white rounded-lg hover:bg-blue-600"
-  //       >
-  //         Join Jam
-  //       </button>
-  //     </div>
-  //   );
-  // }
+  const loggedIn = getCookie("token");
 
-  // if (activeJamResponse?.phase !== "Voting") {
-  //   return (
-  //     <div className="p-4 bg-gray-100 dark:bg-gray-800 min-h-screen">
-  //       <h1 className="text-2xl font-bold text-gray-800 dark:text-white mb-4">
-  //         Not in Voting Phase
-  //       </h1>
-  //       <p className="text-gray-600 dark:text-gray-400">
-  //         The current phase is{" "}
-  //         <strong>{activeJamResponse?.phase || "Unknown"}</strong>. Please come
-  //         back during the Voting phase.
-  //       </p>
-  //     </div>
-  //   );
-  // }
+  if (!loggedIn) {
+    return <div>Sign in to be able to vote</div>;
+  }
 
-  // const loggedIn = getCookie("token");
+  return (
+    <div className="p-3 bg-gray-100 dark:bg-gray-800 min-h-screen">
+      <h1 className="text-2xl font-bold text-gray-800 dark:text-white mb-4">
+        Voting Phase
+      </h1>
+      <div className="space-y-2">
+        {themes.map((theme) => (
+          <div
+            key={theme.id}
+            className="p-3 bg-white dark:bg-gray-900 rounded-lg shadow-md flex items-center"
+          >
+            {/* Voting Buttons */}
+            <div className="flex gap-1 mr-4">
+              <button
+                onClick={() => handleVote(theme.id, -1)}
+                className={`px-3 py-2 rounded-lg ${
+                  theme.votingScore === -1
+                    ? "bg-red-500 text-white"
+                    : "bg-gray-300 text-black hover:bg-red-500 hover:text-white"
+                }`}
+                disabled={loading}
+              >
+                -1
+              </button>
+              <button
+                onClick={() => handleVote(theme.id, 0)}
+                className={`px-3 py-2 rounded-lg ${
+                  theme.votingScore === 0
+                    ? "bg-gray-500 text-white"
+                    : "bg-gray-300 text-black hover:bg-gray-500 hover:text-white"
+                }`}
+                disabled={loading}
+              >
+                0
+              </button>
+              <button
+                onClick={() => handleVote(theme.id, +1)}
+                className={`px-3 py-2 rounded-lg ${
+                  theme.votingScore === +1
+                    ? "bg-green-500 text-white"
+                    : "bg-gray-300 text-black hover:bg-green-500 hover:text-white"
+                }`}
+                disabled={loading}
+              >
+                +1
+              </button>
+            </div>
 
-  // if (!loggedIn) {
-  //   return <div>Sign in to be able to vote</div>;
-  // }
-
-  // return (
-  //   <div className="p-3 bg-gray-100 dark:bg-gray-800 min-h-screen">
-  //     <h1 className="text-2xl font-bold text-gray-800 dark:text-white mb-4">
-  //       Voting Phase
-  //     </h1>
-  //     <div className="space-y-2">
-  //       {themes.map((theme) => (
-  //         <div
-  //           key={theme.id}
-  //           className="p-3 bg-white dark:bg-gray-900 rounded-lg shadow-md flex items-center"
-  //         >
-  //           {/* Voting Buttons */}
-  //           <div className="flex gap-1 mr-4">
-  //             <button
-  //               onClick={() => handleVote(theme.id, -1)}
-  //               className={`px-3 py-2 rounded-lg ${
-  //                 theme.votingScore === -1
-  //                   ? "bg-red-500 text-white"
-  //                   : "bg-gray-300 text-black hover:bg-red-500 hover:text-white"
-  //               }`}
-  //               disabled={loading}
-  //             >
-  //               -1
-  //             </button>
-  //             <button
-  //               onClick={() => handleVote(theme.id, 0)}
-  //               className={`px-3 py-2 rounded-lg ${
-  //                 theme.votingScore === 0
-  //                   ? "bg-gray-500 text-white"
-  //                   : "bg-gray-300 text-black hover:bg-gray-500 hover:text-white"
-  //               }`}
-  //               disabled={loading}
-  //             >
-  //               0
-  //             </button>
-  //             <button
-  //               onClick={() => handleVote(theme.id, +1)}
-  //               className={`px-3 py-2 rounded-lg ${
-  //                 theme.votingScore === +1
-  //                   ? "bg-green-500 text-white"
-  //                   : "bg-gray-300 text-black hover:bg-green-500 hover:text-white"
-  //               }`}
-  //               disabled={loading}
-  //             >
-  //               +1
-  //             </button>
-  //           </div>
-
-  //           {/* Theme Suggestion */}
-  //           <div className="text-gray-800 dark:text-white">
-  //             {theme.suggestion}
-  //           </div>
-  //         </div>
-  //       ))}
-  //     </div>
-  //   </div>
-  // );
+            {/* Theme Suggestion */}
+            <div className="text-gray-800 dark:text-white">
+              {theme.suggestion}
+            </div>
+          </div>
+        ))}
+      </div>
+    </div>
+  );
 }
diff --git a/src/helpers/jam.ts b/src/helpers/jam.ts
index 5b82708..2ceeb83 100644
--- a/src/helpers/jam.ts
+++ b/src/helpers/jam.ts
@@ -74,8 +74,8 @@ export async function hasJoinedCurrentJam(): Promise<boolean> {
   try {
     const response = await fetch(
       process.env.NEXT_PUBLIC_MODE === "PROD"
-        ? "https://d2jam.com/api/v1/participation"
-        : "http://localhost:3005/api/v1/participation",
+        ? "https://d2jam.com/api/v1/jams/participation"
+        : "http://localhost:3005/api/v1/jams/participation",
       {
         credentials: "include",
         headers: {
diff --git a/src/types/JamType.ts b/src/types/JamType.ts
index c20c43d..271fc75 100644
--- a/src/types/JamType.ts
+++ b/src/types/JamType.ts
@@ -9,4 +9,5 @@ export interface JamType {
   startTime: Date;
   createdAt: Date;
   updatedAt: Date;
+  themePerUser: number;
 }
diff --git a/src/types/ThemeType.ts b/src/types/ThemeType.ts
new file mode 100644
index 0000000..4c05dad
--- /dev/null
+++ b/src/types/ThemeType.ts
@@ -0,0 +1,6 @@
+export interface ThemeType {
+    id: number;
+    suggestion: string;
+    slaughterScore: number;
+    votingScore: number;
+  }
\ No newline at end of file