diff --git a/src/routes/core-stocks.tsx b/src/routes/core-stocks.tsx
index 756af6d..fa71c08 100644
--- a/src/routes/core-stocks.tsx
+++ b/src/routes/core-stocks.tsx
@@ -87,7 +87,14 @@ function CoreStocksPage() {
                         <td className="px-3 py-1.5 whitespace-nowrap">
                           <span className="inline-flex items-center gap-1">
                             {isOpen ? <ChevronDown className="h-3.5 w-3.5 text-muted-foreground" /> : <ChevronRight className="h-3.5 w-3.5 text-muted-foreground" />}
-                            <span className="font-medium">{s.stockName}</span>
+                            <Link
+                              to="/stock/$code"
+                              params={{ code: s.stockCode }}
+                              onClick={(e) => e.stopPropagation()}
+                              className="font-medium hover:text-primary hover:underline"
+                            >
+                              {s.stockName}
+                            </Link>
                             <span className="ml-1 text-[10px] text-muted-foreground">{s.stockCode}</span>
                           </span>
                         </td>
@@ -120,12 +127,14 @@ function CoreStocksPage() {
                             {s.themes && s.themes.length > 0 ? (
                               <div className="flex flex-wrap gap-1">
                                 {s.themes.map((t) => (
-                                  <span
+                                  <Link
                                     key={t.theme_code}
-                                    className="px-1.5 py-0.5 rounded bg-primary/10 text-primary text-[11px]"
+                                    to="/theme/$code"
+                                    params={{ code: t.theme_code }}
+                                    className="px-1.5 py-0.5 rounded bg-primary/10 text-primary text-[11px] hover:bg-primary/20 transition-colors"
                                   >
                                     {t.theme_name}
-                                  </span>
+                                  </Link>
                                 ))}
                               </div>
                             ) : (