diff --git a/frontend/data/category.ts b/frontend/data/category.ts
index 0bf9a807..dc3888ea 100644
--- a/frontend/data/category.ts
+++ b/frontend/data/category.ts
@@ -33,4 +33,6 @@ export const categoryData = [
   createCategory('flutter', 'Flutter', 21),
   createCategory('kotlin', 'Kotlin', 22),
   createCategory('reactnative', 'React Native', 23),
+  createCategory('java', 'Java', 24),
+  createCategory('spring', 'Spring', 25),
 ];
diff --git a/frontend/data/categoryStyles.ts b/frontend/data/categoryStyles.ts
index 85a90a0a..2efb4f8f 100644
--- a/frontend/data/categoryStyles.ts
+++ b/frontend/data/categoryStyles.ts
@@ -187,6 +187,20 @@ export const categoryTabStyles = {
     glow: 'bg-[#61DAFB]',
     accent: '#61DAFB',
   },
+  java: {
+    icon: '/icons/java.svg',
+    color:
+      'group-hover:border-[#0074BD]/50 group-hover:bg-[#0074BD]/10 data-[state=active]:border-[#0074BD]/50 data-[state=active]:bg-[#0074BD]/10',
+    glow: 'bg-[#0074BD]',
+    accent: '#0074BD',
+  },
+  spring: {
+    icon: '/icons/spring.svg',
+    color:
+      'group-hover:border-[#77BC1F]/50 group-hover:bg-[#77BC1F]/10 data-[state=active]:border-[#77BC1F]/50 data-[state=active]:bg-[#77BC1F]/10',
+    glow: 'bg-[#77BC1F]',
+    accent: '#77BC1F',
+  },
 } as const satisfies Partial<Record<CategorySlug, CategoryTabStyle>>;
 
 export function getCategoryTabStyle(slug: string): CategoryTabStyle {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index fa6a615f..92d2e6f8 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -52,6 +52,7 @@
         "prism-react-renderer": "^2.4.1",
         "react": "^19.2.1",
         "react-dom": "^19.2.1",
+        "server-only": "^0.0.1",
         "sonner": "^2.0.7",
         "stripe": "20.0.0",
         "tailwind-merge": "^3.4.0",
@@ -12591,7 +12592,6 @@
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "optional": true,
@@ -13589,6 +13589,12 @@
         "randombytes": "^2.1.0"
       }
     },
+    "node_modules/server-only": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/server-only/-/server-only-0.0.1.tgz",
+      "integrity": "sha512-qepMx2JxAa5jjfzxG79yPPq+8BuFToHd1hm7kI+Z4zAq1ftQiP7HcxMhDDItrbtwVeLg/cY2JnKnrcFkmiswNA==",
+      "license": "MIT"
+    },
     "node_modules/set-function-length": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index d7ac2dd1..0b6b68a4 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -9,8 +9,8 @@
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "format": "prettier --write .",
-    "seed:categories": "tsx db/seed-categories.ts",
-    "seed:questions": "tsx db/seed-questions.ts",
+    "seed:categories": "NODE_OPTIONS=--conditions=react-server tsx db/seed-categories.ts",
+    "seed:questions": "NODE_OPTIONS=--conditions=react-server tsx db/seed-questions.ts",
     "parse": "tsx parse/parse.ts",
     "db:generate": "drizzle-kit generate --config drizzle.config.ts",
     "db:migrate": "drizzle-kit migrate --config drizzle.config.ts",
@@ -67,6 +67,7 @@
     "prism-react-renderer": "^2.4.1",
     "react": "^19.2.1",
     "react-dom": "^19.2.1",
+    "server-only": "^0.0.1",
     "sonner": "^2.0.7",
     "stripe": "20.0.0",
     "tailwind-merge": "^3.4.0",
diff --git a/frontend/public/icons/java.svg b/frontend/public/icons/java.svg
new file mode 100644
index 00000000..051bf254
--- /dev/null
+++ b/frontend/public/icons/java.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><path fill="#0074BD" d="M47.617 98.12s-4.767 2.774 3.397 3.71c9.892 1.13 14.947.968 25.845-1.092 0 0 2.871 1.795 6.873 3.351-24.439 10.47-55.308-.607-36.115-5.969zm-2.988-13.665s-5.348 3.959 2.823 4.805c10.567 1.091 18.91 1.18 33.354-1.6 0 0 1.993 2.025 5.132 3.131-29.542 8.64-62.446.68-41.309-6.336z"/><path fill="#EA2D2E" d="M69.802 61.271c6.025 6.935-1.58 13.17-1.58 13.17s15.289-7.891 8.269-17.777c-6.559-9.215-11.587-13.792 15.635-29.58 0 .001-42.731 10.67-22.324 34.187z"/><path fill="#0074BD" d="M102.123 108.229s3.529 2.91-3.888 5.159c-14.102 4.272-58.706 5.56-71.094.171-4.451-1.938 3.899-4.625 6.526-5.192 2.739-.593 4.303-.485 4.303-.485-4.953-3.487-32.013 6.85-13.743 9.815 49.821 8.076 90.817-3.637 77.896-9.468zM49.912 70.294s-22.686 5.389-8.033 7.348c6.188.828 18.518.638 30.011-.326 9.39-.789 18.813-2.474 18.813-2.474s-3.308 1.419-5.704 3.053c-23.042 6.061-67.544 3.238-54.731-2.958 10.832-5.239 19.644-4.643 19.644-4.643zm40.697 22.747c23.421-12.167 12.591-23.86 5.032-22.285-1.848.385-2.677.72-2.677.72s.688-1.079 2-1.543c14.953-5.255 26.451 15.503-4.823 23.725 0-.002.359-.327.468-.617z"/><path fill="#EA2D2E" d="M76.491 1.587S89.459 14.563 64.188 34.51c-20.266 16.006-4.621 25.13-.007 35.559-11.831-10.673-20.509-20.07-14.688-28.815C58.041 28.42 81.722 22.195 76.491 1.587z"/><path fill="#0074BD" d="M52.214 126.021c22.476 1.437 57-.8 57.817-11.436 0 0-1.571 4.032-18.577 7.231-19.186 3.612-42.854 3.191-56.887.874 0 .001 2.875 2.381 17.647 3.331z"/></svg>
\ No newline at end of file
diff --git a/frontend/public/icons/spring.svg b/frontend/public/icons/spring.svg
new file mode 100644
index 00000000..9a10e7f4
--- /dev/null
+++ b/frontend/public/icons/spring.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><path d="M116.452 6.643a59.104 59.104 0 01-6.837 12.136A64.249 64.249 0 0064.205-.026C28.984-.026 0 28.982 0 64.242a64.316 64.316 0 0019.945 46.562l2.368 2.1a64.22 64.22 0 0041.358 15.122c33.487 0 61.637-26.24 64.021-59.683 1.751-16.371-3.051-37.077-11.24-61.7zM29.067 111.17a5.5 5.5 0 01-4.269 2.034c-3.018 0-5.487-2.484-5.487-5.502 0-3.017 2.485-5.501 5.487-5.501 1.25 0 2.485.433 3.452 1.234 2.351 1.9 2.718 5.384.817 7.735zm87.119-19.238c-15.843 21.122-49.68 14.003-71.376 15.02 0 0-3.852.234-7.721.867 0 0 1.45-.617 3.335-1.334 15.226-5.301 22.43-6.335 31.685-11.086 17.427-8.869 34.654-28.274 38.24-48.463-6.637 19.422-26.75 36.11-45.077 42.895-12.557 4.635-35.238 9.136-35.238 9.136l-.917-.484c-15.442-7.518-15.91-40.977 12.157-51.78 12.291-4.735 24.048-2.134 37.323-5.302 14.175-3.367 30.568-14.004 37.238-27.874 7.471 22.19 16.46 56.932.35 78.405z" fill="#77bc1f"/></svg>