diff --git a/TaskTracker.Web/src/components/analytics/ActivityFeed.tsx b/TaskTracker.Web/src/components/analytics/ActivityFeed.tsx
index fe64cf5..751a2a1 100644
--- a/TaskTracker.Web/src/components/analytics/ActivityFeed.tsx
+++ b/TaskTracker.Web/src/components/analytics/ActivityFeed.tsx
@@ -74,7 +74,7 @@ export default function ActivityFeed({ minutes, taskId }: ActivityFeedProps) {
 
   if (eventsLoading || mappingsLoading) {
     return (
-      <div className="flex items-center justify-center h-32 text-[#94a3b8] text-sm">
+      <div className="flex items-center justify-center h-32 text-[var(--color-text-secondary)] text-sm">
         Loading activity...
       </div>
     )
@@ -82,7 +82,7 @@ export default function ActivityFeed({ minutes, taskId }: ActivityFeedProps) {
 
   if (sortedEvents.length === 0) {
     return (
-      <div className="flex items-center justify-center h-32 text-[#94a3b8] text-sm">
+      <div className="flex items-center justify-center h-32 text-[var(--color-text-secondary)] text-sm">
         No activity events for this time range.
       </div>
     )
@@ -90,30 +90,36 @@ export default function ActivityFeed({ minutes, taskId }: ActivityFeedProps) {
 
   return (
     <div>
-      <div className="divide-y divide-white/5">
-        {visibleEvents.map((evt) => {
+      <div className="relative">
+        {visibleEvents.map((evt, idx) => {
           const category = mappings ? resolveCategory(evt.appName, mappings) : 'Unknown'
           const color = CATEGORY_COLORS[category] ?? CATEGORY_COLORS['Unknown']
           const detail = evt.url || evt.windowTitle || ''
+          const isLast = idx === visibleEvents.length - 1
 
           return (
-            <div key={evt.id} className="flex items-start gap-3 py-3">
-              {/* Category dot */}
-              <span
-                className="w-2 h-2 rounded-full mt-1.5 shrink-0"
-                style={{ backgroundColor: color }}
-              />
+            <div key={evt.id} className="flex items-start gap-3 relative">
+              {/* Timeline connector + dot */}
+              <div className="flex flex-col items-center shrink-0">
+                <span
+                  className="w-2 h-2 rounded-full mt-1.5 shrink-0 relative z-10"
+                  style={{ backgroundColor: color }}
+                />
+                {!isLast && (
+                  <div className="w-px flex-1 bg-[var(--color-border)]" />
+                )}
+              </div>
 
               {/* Content */}
-              <div className="flex-1 min-w-0">
+              <div className="flex-1 min-w-0 pb-3">
                 <div className="flex items-center gap-2">
-                  <span className="text-xs text-[#94a3b8] shrink-0">
+                  <span className="text-xs text-[var(--color-text-secondary)] shrink-0">
                     {formatTimestamp(evt.timestamp)}
                   </span>
-                  <span className="text-sm text-white font-medium truncate">{evt.appName}</span>
+                  <span className="text-sm text-[var(--color-text-primary)] font-medium truncate">{evt.appName}</span>
                 </div>
                 {detail && (
-                  <p className="text-xs text-[#64748b] truncate mt-0.5">{detail}</p>
+                  <p className="text-xs text-[var(--color-text-tertiary)] truncate mt-0.5">{detail}</p>
                 )}
               </div>
             </div>
@@ -124,7 +130,7 @@ export default function ActivityFeed({ minutes, taskId }: ActivityFeedProps) {
       {hasMore && (
         <button
           onClick={() => setVisibleCount((c) => c + PAGE_SIZE)}
-          className="mt-3 w-full py-2 text-sm text-[#94a3b8] hover:text-white bg-white/5 hover:bg-white/10 rounded-lg transition-colors"
+          className="mt-3 w-full py-2 text-sm text-[var(--color-text-secondary)] hover:text-[var(--color-text-primary)] bg-white/5 hover:bg-white/10 rounded-lg transition-colors"
         >
           Load more ({sortedEvents.length - visibleCount} remaining)
         </button>
diff --git a/TaskTracker.Web/src/components/analytics/CategoryBreakdown.tsx b/TaskTracker.Web/src/components/analytics/CategoryBreakdown.tsx
index 50fcf52..9c40f22 100644
--- a/TaskTracker.Web/src/components/analytics/CategoryBreakdown.tsx
+++ b/TaskTracker.Web/src/components/analytics/CategoryBreakdown.tsx
@@ -44,7 +44,7 @@ export default function CategoryBreakdown({ minutes: _minutes, taskId: _taskId }
 
   if (isLoading) {
     return (
-      <div className="flex items-center justify-center h-64 text-[#94a3b8] text-sm">
+      <div className="flex items-center justify-center h-64 text-[var(--color-text-secondary)] text-sm">
         Loading category breakdown...
       </div>
     )
@@ -52,7 +52,7 @@ export default function CategoryBreakdown({ minutes: _minutes, taskId: _taskId }
 
   if (categories.length === 0) {
     return (
-      <div className="flex items-center justify-center h-64 text-[#94a3b8] text-sm">
+      <div className="flex items-center justify-center h-64 text-[var(--color-text-secondary)] text-sm">
         No category data available.
       </div>
     )
@@ -88,14 +88,14 @@ export default function CategoryBreakdown({ minutes: _minutes, taskId: _taskId }
                 return (
                   <div
                     style={{
-                      backgroundColor: '#1e293b',
-                      border: '1px solid rgba(255,255,255,0.1)',
+                      backgroundColor: 'var(--color-elevated)',
+                      border: '1px solid var(--color-border)',
                       borderRadius: 8,
                       padding: '8px 12px',
                     }}
                   >
-                    <div className="text-white text-sm font-medium">{d.name}</div>
-                    <div className="text-[#94a3b8] text-xs mt-0.5">
+                    <div className="text-[var(--color-text-primary)] text-sm font-medium">{d.name}</div>
+                    <div className="text-[var(--color-text-secondary)] text-xs mt-0.5">
                       {d.count} events ({d.percentage}%)
                     </div>
                   </div>
@@ -119,13 +119,13 @@ export default function CategoryBreakdown({ minutes: _minutes, taskId: _taskId }
             {/* Name + bar + stats */}
             <div className="flex-1 min-w-0">
               <div className="flex items-center justify-between mb-1">
-                <span className="text-sm text-white font-medium truncate">{cat.name}</span>
-                <span className="text-xs text-[#94a3b8] ml-2 shrink-0">
+                <span className="text-sm text-[var(--color-text-primary)] font-medium truncate">{cat.name}</span>
+                <span className="text-xs text-[var(--color-text-secondary)] ml-2 shrink-0">
                   {cat.count} ({cat.percentage}%)
                 </span>
               </div>
               {/* Progress bar */}
-              <div className="h-1.5 rounded-full bg-white/5 overflow-hidden">
+              <div className="h-1.5 rounded-full bg-[var(--color-border)] overflow-hidden">
                 <div
                   className="h-full rounded-full transition-all duration-300"
                   style={{
diff --git a/TaskTracker.Web/src/components/analytics/Timeline.tsx b/TaskTracker.Web/src/components/analytics/Timeline.tsx
index d869823..db4903d 100644
--- a/TaskTracker.Web/src/components/analytics/Timeline.tsx
+++ b/TaskTracker.Web/src/components/analytics/Timeline.tsx
@@ -136,7 +136,7 @@ export default function Timeline({ minutes, taskId }: TimelineProps) {
 
   if (eventsLoading || mappingsLoading) {
     return (
-      <div className="flex items-center justify-center h-64 text-[#94a3b8] text-sm">
+      <div className="flex items-center justify-center h-64 text-[var(--color-text-secondary)] text-sm">
         Loading timeline...
       </div>
     )
@@ -144,7 +144,7 @@ export default function Timeline({ minutes, taskId }: TimelineProps) {
 
   if (buckets.length === 0) {
     return (
-      <div className="flex items-center justify-center h-64 text-[#94a3b8] text-sm">
+      <div className="flex items-center justify-center h-64 text-[var(--color-text-secondary)] text-sm">
         No activity data for this time range.
       </div>
     )
@@ -156,12 +156,12 @@ export default function Timeline({ minutes, taskId }: TimelineProps) {
         <BarChart data={buckets} margin={{ top: 8, right: 8, bottom: 0, left: -12 }}>
           <XAxis
             dataKey="label"
-            tick={{ fill: '#94a3b8', fontSize: 12 }}
-            axisLine={{ stroke: '#1e293b' }}
+            tick={{ fill: 'var(--color-text-secondary)', fontSize: 12 }}
+            axisLine={{ stroke: 'var(--color-border)' }}
             tickLine={false}
           />
           <YAxis
-            tick={{ fill: '#94a3b8', fontSize: 12 }}
+            tick={{ fill: 'var(--color-text-secondary)', fontSize: 12 }}
             axisLine={false}
             tickLine={false}
             allowDecimals={false}
@@ -169,8 +169,8 @@ export default function Timeline({ minutes, taskId }: TimelineProps) {
           <Tooltip
             cursor={{ fill: 'rgba(255,255,255,0.03)' }}
             contentStyle={{
-              backgroundColor: '#1e293b',
-              border: '1px solid rgba(255,255,255,0.1)',
+              backgroundColor: 'var(--color-elevated)',
+              border: '1px solid var(--color-border)',
               borderRadius: 8,
               padding: '8px 12px',
             }}
@@ -181,14 +181,14 @@ export default function Timeline({ minutes, taskId }: TimelineProps) {
               return (
                 <div
                   style={{
-                    backgroundColor: '#1e293b',
-                    border: '1px solid rgba(255,255,255,0.1)',
+                    backgroundColor: 'var(--color-elevated)',
+                    border: '1px solid var(--color-border)',
                     borderRadius: 8,
                     padding: '8px 12px',
                   }}
                 >
-                  <div className="text-[#94a3b8] text-xs">{d.timeRange}</div>
-                  <div className="text-white text-sm font-medium mt-0.5">{d.appName}</div>
+                  <div className="text-[var(--color-text-secondary)] text-xs">{d.timeRange}</div>
+                  <div className="text-[var(--color-text-primary)] text-sm font-medium mt-0.5">{d.appName}</div>
                   <div className="text-xs mt-0.5" style={{ color: d.color }}>
                     {d.count} events
                   </div>
diff --git a/TaskTracker.Web/src/pages/Analytics.tsx b/TaskTracker.Web/src/pages/Analytics.tsx
index 204f80d..2458dc8 100644
--- a/TaskTracker.Web/src/pages/Analytics.tsx
+++ b/TaskTracker.Web/src/pages/Analytics.tsx
@@ -19,14 +19,14 @@ export default function Analytics() {
     <div className="max-w-6xl mx-auto space-y-8">
       {/* Header + Filters */}
       <div className="flex items-center justify-between flex-wrap gap-4">
-        <h1 className="text-xl font-semibold text-white">Analytics</h1>
+        <h1 className="text-xl font-semibold text-[var(--color-text-primary)]">Analytics</h1>
 
         <div className="flex items-center gap-3">
           {/* Time range dropdown */}
           <select
             value={minutes}
             onChange={(e) => setMinutes(Number(e.target.value))}
-            className="bg-[#1e293b] text-white text-sm rounded-lg border border-white/10 px-3 py-1.5 focus:outline-none focus:border-indigo-500 transition-colors appearance-none cursor-pointer"
+            className="bg-[var(--color-surface)] text-[var(--color-text-primary)] text-sm rounded-lg border border-[var(--color-border)] px-3 py-1.5 focus:outline-none focus:border-[var(--color-accent)] transition-colors appearance-none cursor-pointer"
           >
             {TIME_RANGES.map((r) => (
               <option key={r.minutes} value={r.minutes}>
@@ -39,7 +39,7 @@ export default function Analytics() {
           <select
             value={taskId ?? ''}
             onChange={(e) => setTaskId(e.target.value ? Number(e.target.value) : undefined)}
-            className="bg-[#1e293b] text-white text-sm rounded-lg border border-white/10 px-3 py-1.5 focus:outline-none focus:border-indigo-500 transition-colors appearance-none cursor-pointer max-w-[200px]"
+            className="bg-[var(--color-surface)] text-[var(--color-text-primary)] text-sm rounded-lg border border-[var(--color-border)] px-3 py-1.5 focus:outline-none focus:border-[var(--color-accent)] transition-colors appearance-none cursor-pointer max-w-[200px]"
           >
             <option value="">All Tasks</option>
             {tasks?.map((t) => (
@@ -51,32 +51,69 @@ export default function Analytics() {
         </div>
       </div>
 
+      {/* Stat cards */}
+      <div className="grid grid-cols-3 gap-4">
+        <div className="bg-[var(--color-surface)] border border-[var(--color-border)] rounded-xl p-4">
+          <span className="text-[10px] font-medium uppercase tracking-wider text-[var(--color-text-tertiary)]">Open Tasks</span>
+          <p className="text-2xl font-semibold text-[var(--color-text-primary)] mt-1">
+            {tasks?.filter(t => t.status !== 'Completed' && t.status !== 'Abandoned').length ?? 0}
+          </p>
+        </div>
+        <div className="bg-[var(--color-surface)] border border-[var(--color-border)] rounded-xl p-4">
+          <span className="text-[10px] font-medium uppercase tracking-wider text-[var(--color-text-tertiary)]">Active Time</span>
+          <p className="text-2xl font-semibold text-[var(--color-text-primary)] mt-1">
+            {(() => {
+              const totalMins = tasks?.reduce((acc, t) => {
+                if (!t.startedAt) return acc
+                const start = new Date(t.startedAt).getTime()
+                const end = t.completedAt ? new Date(t.completedAt).getTime() : (t.status === 'Active' ? Date.now() : start)
+                return acc + (end - start) / 60000
+              }, 0) ?? 0
+              const hours = Math.floor(totalMins / 60)
+              const mins = Math.floor(totalMins % 60)
+              return hours > 0 ? `${hours}h ${mins}m` : `${mins}m`
+            })()}
+          </p>
+        </div>
+        <div className="bg-[var(--color-surface)] border border-[var(--color-border)] rounded-xl p-4">
+          <span className="text-[10px] font-medium uppercase tracking-wider text-[var(--color-text-tertiary)]">Top Category</span>
+          <p className="text-2xl font-semibold text-[var(--color-text-primary)] mt-1">
+            {(() => {
+              const counts: Record<string, number> = {}
+              tasks?.forEach(t => { counts[t.category ?? 'Unknown'] = (counts[t.category ?? 'Unknown'] || 0) + 1 })
+              const top = Object.entries(counts).sort(([,a], [,b]) => b - a)[0]
+              return top ? top[0] : '\u2014'
+            })()}
+          </p>
+        </div>
+      </div>
+
       {/* Timeline */}
       <section>
-        <h2 className="text-sm font-medium text-[#94a3b8] uppercase tracking-wider mb-4">
+        <h2 className="text-[11px] font-medium text-[var(--color-text-secondary)] uppercase tracking-wider mb-4">
           Activity Timeline
         </h2>
-        <div className="bg-[#161922] rounded-xl border border-white/5 p-5">
+        <div className="bg-[var(--color-surface)] rounded-xl border border-[var(--color-border)] p-5">
           <Timeline minutes={minutes} taskId={taskId} />
         </div>
       </section>
 
       {/* Category Breakdown */}
       <section>
-        <h2 className="text-sm font-medium text-[#94a3b8] uppercase tracking-wider mb-4">
+        <h2 className="text-[11px] font-medium text-[var(--color-text-secondary)] uppercase tracking-wider mb-4">
           Category Breakdown
         </h2>
-        <div className="bg-[#161922] rounded-xl border border-white/5 p-5">
+        <div className="bg-[var(--color-surface)] rounded-xl border border-[var(--color-border)] p-5">
           <CategoryBreakdown minutes={minutes} taskId={taskId} />
         </div>
       </section>
 
       {/* Activity Feed */}
       <section>
-        <h2 className="text-sm font-medium text-[#94a3b8] uppercase tracking-wider mb-4">
+        <h2 className="text-[11px] font-medium text-[var(--color-text-secondary)] uppercase tracking-wider mb-4">
           Recent Activity
         </h2>
-        <div className="bg-[#161922] rounded-xl border border-white/5 p-5">
+        <div className="bg-[var(--color-surface)] rounded-xl border border-[var(--color-border)] p-5">
           <ActivityFeed minutes={minutes} taskId={taskId} />
         </div>
       </section>