diff --git a/.github/workflows/automated-tests.yml b/.github/workflows/automated-tests.yml
index 22438c06d..3c57a0a63 100644
--- a/.github/workflows/automated-tests.yml
+++ b/.github/workflows/automated-tests.yml
@@ -17,7 +17,7 @@ jobs:
 
       - uses: pnpm/action-setup@v6
         with:
-          version: 11
+          version: 9
 
       - name: Initialize Node.js Environment
         uses: actions/setup-node@v6
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 428bb6922..76b9aa9e0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
 
       - uses: pnpm/action-setup@v6
         with:
-          version: 11
+          version: 9
       - uses: actions/setup-node@v6
         with:
           node-version: 22
@@ -41,7 +41,7 @@ jobs:
 
       - uses: pnpm/action-setup@v6
         with:
-          version: 11
+          version: 9
       - uses: actions/setup-node@v6
         with:
           node-version: 22
@@ -64,7 +64,7 @@ jobs:
 
       - uses: pnpm/action-setup@v6
         with:
-          version: 11
+          version: 9
       - uses: actions/setup-node@v6
         with:
           node-version: 22
@@ -110,7 +110,7 @@ jobs:
 
       - uses: pnpm/action-setup@v6
         with:
-          version: 11
+          version: 9
       - uses: actions/setup-node@v6
         with:
           node-version: 22
@@ -130,7 +130,7 @@ jobs:
 
       - uses: pnpm/action-setup@v6
         with:
-          version: 11
+          version: 9
       - uses: actions/setup-node@v6
         with:
           node-version: 22
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 99da69366..d769a30f7 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -30,7 +30,7 @@ jobs:
 
       - uses: pnpm/action-setup@v6
         with:
-          version: 11
+          version: 9
       - uses: actions/setup-node@v6
         with:
           node-version: 22
diff --git a/.github/workflows/visual-regression.yml b/.github/workflows/visual-regression.yml
index 401300788..e191d3dbe 100644
--- a/.github/workflows/visual-regression.yml
+++ b/.github/workflows/visual-regression.yml
@@ -44,7 +44,7 @@ jobs:
 
       - uses: pnpm/action-setup@v6
         with:
-          version: 11
+          version: 9
 
       - name: Setup Node
         uses: actions/setup-node@v6
diff --git a/package.json b/package.json
index 7a4549cba..845a81609 100644
--- a/package.json
+++ b/package.json
@@ -118,13 +118,10 @@
       "@scarf/scarf",
       "@sentry/cli",
       "@swc/core",
-      "@tree-sitter-grammars/tree-sitter-yaml",
       "core-js-pure",
       "core-js",
       "esbuild",
       "sharp",
-      "tree-sitter-json",
-      "tree-sitter",
       "unrs-resolver"
     ]
   }
diff --git a/src/app/leaderboard/page.tsx b/src/app/leaderboard/page.tsx
index b78b24560..10a575307 100644
--- a/src/app/leaderboard/page.tsx
+++ b/src/app/leaderboard/page.tsx
@@ -104,14 +104,14 @@ async function LeaderboardTable({
             title={
               hasFilters
                 ? "No leaderboard results for these filters"
-                : "No public profiles yet"
+                : "No leaderboard data available"
             }
             description={
               hasFilters
                 ? "Try a broader language or time filter, or clear filters to view the full leaderboard."
                 : "No public profiles yet - be the first to enable yours in Settings!"
             }
-            actionLabel="Go to Settings"
+            actionLabel="Sync Dashboard"
             actionHref="/dashboard/settings"
           />
         ) : (
diff --git a/src/components/GoalTracker.tsx b/src/components/GoalTracker.tsx
index 1098c698b..f2d58a819 100644
--- a/src/components/GoalTracker.tsx
+++ b/src/components/GoalTracker.tsx
@@ -522,7 +522,7 @@ export default function GoalTracker() {
         <div className="mt-6">
           <EmptyState
             icon="🎯"
-            title="No goals yet"
+            title="No goals created yet"
             description="No goals yet. Create your first coding goal to start tracking progress!"
             actionLabel="Create Goal"
             actionHref="#create-goal-form"
diff --git a/src/components/PRMetrics.tsx b/src/components/PRMetrics.tsx
index ad8567618..2332ff0b5 100644
--- a/src/components/PRMetrics.tsx
+++ b/src/components/PRMetrics.tsx
@@ -7,6 +7,7 @@ import { useDashboardWidgetA11y } from "@/components/dashboard/DashboardWidgetA1
 import { LineChart, Line, XAxis, YAxis, Tooltip, ResponsiveContainer } from "recharts";
 import PRStatusDonutChart from "./PRStatusDonutChart";
 import MiniPRTrendChart from "./MiniPRTrendChart";
+import EmptyState from "@/components/EmptyState";
 import { SkeletonBlock } from "./WidgetSkeleton";
 
 interface PRMetricsSummary {
@@ -265,6 +266,14 @@ export default function PRMetrics() {
             Try again
           </button>
         </div>
+      ) : metrics && metrics.total === 0 && (!metrics.gitlab || metrics.gitlab.total === 0) ? (
+        <EmptyState
+          icon="📊"
+          title="No pull requests available"
+          description="Start reviewing or opening PRs to generate analytics."
+          actionLabel="View GitHub Profile"
+          actionHref={`https://github.com/${selectedAccount || ""}`}
+        />
       ) : activeTab === "authored" ? (
         <div className="space-y-6">
           {/* GitHub Stats */}
diff --git a/src/components/TopRepos.tsx b/src/components/TopRepos.tsx
index cfe475d85..044ef1bef 100644
--- a/src/components/TopRepos.tsx
+++ b/src/components/TopRepos.tsx
@@ -7,6 +7,7 @@ import type { RepoHealthScore } from "@/types/repo-health";
 import RepoHealthPanel from "@/components/RepoHealthPanel";
 import RepoActivityDrawer from "@/components/RepoActivityDrawer";
 import { Search, Bookmark } from "lucide-react";
+import EmptyState from "@/components/EmptyState";
 import { SkeletonBlock } from "./WidgetSkeleton";
 import { getCodebaseSizeFromLanguages, type CodebaseSize } from "@/lib/codebase-size";
 
@@ -564,26 +565,13 @@ const togglePin = useCallback((repoFullName: string) => {
           </button>
         </div>
       ) : repos.length === 0 ? (
-        <div className="flex flex-col items-center justify-center py-10 text-center">
-          <div className="mb-3 text-4xl">📦</div>
-      
-          <h3 className="text-sm font-semibold text-[var(--card-foreground)]">
-            No repositories found
-          </h3>
-      
-          <p className="mt-2 max-w-sm text-sm text-[var(--muted-foreground)]">
-            Push your first commit on GitHub to get started and see repository activity here.
-          </p>
-      
-          <a
-            href="https://github.com/new"
-            target="_blank"
-            rel="noopener noreferrer"
-            className="mt-4 inline-flex rounded-md border border-[var(--border)] px-4 py-2 text-sm font-medium hover:bg-[var(--control)]"
-          >
-            Create Repository
-          </a>
-        </div>
+        <EmptyState
+          icon="📦"
+          title="No repositories found"
+          description="Push your first commit on GitHub to get started and see repository activity here."
+          actionLabel="Refresh Data"
+          actionHref="/dashboard"
+        />
       ) : (
       <>