diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 7fad51c..244828f 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -38,6 +38,7 @@ export default function RootLayout({
     <html lang="en" suppressHydrationWarning>
       <head>
         <script dangerouslySetInnerHTML={{ __html: themeScript }} />
+        <script defer src="https://cloud.umami.is/script.js" data-website-id="afcac946-8d72-4ab4-a817-d2834c909c9e"></script>
       </head>
       <body
         className={`${geistSans.variable} ${geistMono.variable} antialiased`}
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 18d5fe3..fe5825f 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -6,6 +6,7 @@ import { Check, Copy, ChevronDown, ChevronRight, X, Download, HelpCircle, Github
 import { useLinuxInit } from '@/hooks/useLinuxInit';
 import { distros, categories, getAppsByCategory, type DistroId, type AppData, type Category } from '@/lib/data';
 import { generateInstallScript } from '@/lib/generateInstallScript';
+import { analytics } from '@/lib/analytics';
 import gsap from 'gsap';
 
 // Theme hook removed (using global hook)
@@ -220,7 +221,12 @@ function HowItWorks() {
         <>
             <button
                 ref={triggerRef}
-                onClick={() => setIsOpen(!isOpen)}
+                onClick={() => {
+                    const wasOpen = isOpen;
+                    setIsOpen(!isOpen);
+                    if (!wasOpen) analytics.helpOpened();
+                    else analytics.helpClosed();
+                }}
                 className={`flex items-center gap-1.5 text-sm transition-all duration-200 hover:scale-105 ${isOpen ? 'text-[var(--text-primary)]' : 'text-[var(--text-muted)] hover:text-[var(--text-secondary)]'}`}
             >
                 <HelpCircle className="w-4 h-4" />
@@ -241,6 +247,7 @@ function GitHubLink({ href = "https://github.com/abusoww/tuxmate" }: { href?: st
             rel="noopener noreferrer"
             className="group flex items-center gap-1.5 text-sm text-[var(--text-muted)] hover:text-[var(--text-primary)] transition-all duration-300"
             title="View on GitHub"
+            onClick={() => analytics.githubClicked()}
         >
             <Github className="w-4 h-4 transition-transform duration-300 group-hover:rotate-12" />
             <span className="hidden sm:inline relative">
@@ -259,6 +266,7 @@ function ContributeLink({ href = "https://github.com/abusoww/tuxmate/blob/main/C
             target="_blank"
             rel="noopener noreferrer"
             className="group flex items-center gap-1.5 text-sm text-[var(--text-muted)] hover:text-[var(--text-primary)] transition-all duration-300"
+            onClick={() => analytics.contributeClicked()}
         >
             <Heart className="w-4 h-4 transition-all duration-300 group-hover:text-rose-400 group-hover:scale-110" />
             <span className="hidden sm:inline relative">
@@ -389,7 +397,7 @@ function DistroSelector({ selectedDistro, onSelect }: { selectedDistro: DistroId
                     {distros.map((distro, i) => (
                         <button
                             key={distro.id}
-                            onClick={() => { onSelect(distro.id); setIsOpen(false); }}
+                            onClick={() => { onSelect(distro.id); setIsOpen(false); analytics.distroSelected(distro.name); }}
                             className={`group w-full flex items-center gap-3 py-2.5 px-3 rounded-xl border-none cursor-pointer text-left transition-all duration-200 ${selectedDistro === distro.id
                                 ? 'bg-[var(--accent)]/10'
                                 : 'bg-transparent hover:bg-[var(--bg-hover)] hover:scale-[1.02]'
@@ -467,7 +475,20 @@ function AppItem({
         ${isFocused ? 'bg-[var(--bg-focus)]' : ''}
         ${!isAvailable ? 'opacity-40 grayscale-[30%]' : 'hover:bg-[var(--bg-hover)] cursor-pointer'}`}
             style={{ transition: 'background-color 0.15s, color 0.5s' }}
-            onClick={(e) => { e.stopPropagation(); onFocus?.(); if (isAvailable) onToggle(); }}
+            onClick={(e) => {
+                e.stopPropagation();
+                onFocus?.();
+                if (isAvailable) {
+                    const willBeSelected = !isSelected;
+                    onToggle();
+                    const distroName = distros.find(d => d.id === selectedDistro)?.name || selectedDistro;
+                    if (willBeSelected) {
+                        analytics.appSelected(app.name, app.category, distroName);
+                    } else {
+                        analytics.appDeselected(app.name, app.category, distroName);
+                    }
+                }
+            }}
             onMouseEnter={(e) => {
                 if (isAvailable) onTooltipEnter(app.description, e);
             }}
@@ -596,7 +617,15 @@ function CategorySection({
                 category={category}
                 isExpanded={isExpanded}
                 isFocused={isCategoryFocused}
-                onToggle={onToggleExpanded}
+                onToggle={() => {
+                    const willExpand = !isExpanded;
+                    onToggleExpanded();
+                    if (willExpand) {
+                        analytics.categoryExpanded(category);
+                    } else {
+                        analytics.categoryCollapsed(category);
+                    }
+                }}
                 selectedCount={selectedInCategory}
                 onFocus={onCategoryFocus}
             />
@@ -641,6 +670,8 @@ function CommandFooter({
         await navigator.clipboard.writeText(command);
         setCopied(true);
         setShowCopyTooltip(true);
+        const distroName = distros.find(d => d.id === selectedDistro)?.name || selectedDistro;
+        analytics.commandCopied(distroName, selectedCount);
         setTimeout(() => {
             setCopied(false);
             setShowCopyTooltip(false);
@@ -660,6 +691,8 @@ function CommandFooter({
         a.download = `tuxmate-${selectedDistro}.sh`;
         a.click();
         URL.revokeObjectURL(url);
+        const distroName = distros.find(d => d.id === selectedDistro)?.name || selectedDistro;
+        analytics.scriptDownloaded(distroName, selectedCount);
     };
 
     const showAurBar = selectedDistro === 'arch' && hasAurPackages;
diff --git a/src/components/ui/theme-toggle.tsx b/src/components/ui/theme-toggle.tsx
index b1a1ebd..44d7c2f 100644
--- a/src/components/ui/theme-toggle.tsx
+++ b/src/components/ui/theme-toggle.tsx
@@ -4,6 +4,7 @@ import { useState } from "react"
 import { Moon, Sun } from "lucide-react"
 import { cn } from "@/lib/utils"
 import { useTheme } from "@/hooks/use-theme"
+import { analytics } from "@/lib/analytics"
 
 interface ThemeToggleProps {
     className?: string
@@ -25,7 +26,10 @@ export function ThemeToggle({ className }: ThemeToggleProps) {
                 "bg-[var(--bg-secondary)] border border-[var(--border-primary)]",
                 className
             )}
-            onClick={toggle}
+            onClick={() => {
+                toggle();
+                analytics.themeChanged(isDark ? 'light' : 'dark');
+            }}
             role="button"
             tabIndex={0}
         >
diff --git a/src/lib/analytics.ts b/src/lib/analytics.ts
new file mode 100644
index 0000000..793ddb2
--- /dev/null
+++ b/src/lib/analytics.ts
@@ -0,0 +1,117 @@
+// Umami Analytics Utility
+// https://umami.is/docs/track-events
+
+declare global {
+    interface Window {
+        umami?: {
+            track: (eventName: string, eventData?: Record<string, string | number | boolean>) => void;
+        };
+    }
+}
+
+/**
+ * Track a custom event with Umami
+ * Safe to call even if Umami hasn't loaded yet
+ */
+export function track(
+    eventName: string,
+    eventData?: Record<string, string | number | boolean>
+): void {
+    if (typeof window !== 'undefined' && window.umami) {
+        window.umami.track(eventName, eventData);
+    }
+}
+
+// ═══════════════════════════════════════════════════════════════
+// EVENT NAMES - Descriptive names for Umami dashboard
+// ═══════════════════════════════════════════════════════════════
+
+export const EVENTS = {
+    // Distro Selection
+    DISTRO_SELECTED: 'Distro Selected',
+
+    // App Interactions
+    APP_SELECTED: 'App Selected',
+    APP_DESELECTED: 'App Deselected',
+
+    // Command Actions
+    COMMAND_COPIED: 'Command Copied',
+    SCRIPT_DOWNLOADED: 'Script Downloaded',
+
+    // Navigation
+    GITHUB_CLICKED: 'GitHub Clicked',
+    CONTRIBUTE_CLICKED: 'Contribute Clicked',
+
+    // UI Interactions
+    HELP_OPENED: 'How It Works Opened',
+    HELP_CLOSED: 'How It Works Closed',
+    THEME_CHANGED: 'Theme Changed',
+    CATEGORY_EXPANDED: 'Category Expanded',
+    CATEGORY_COLLAPSED: 'Category Collapsed',
+} as const;
+
+// ═══════════════════════════════════════════════════════════════
+// CONVENIENCE FUNCTIONS - Type-safe tracking helpers
+// ═══════════════════════════════════════════════════════════════
+
+export const analytics = {
+    /** Track distro selection */
+    distroSelected: (distro: string) => {
+        track(EVENTS.DISTRO_SELECTED, { distro });
+    },
+
+    /** Track app selection */
+    appSelected: (app: string, category: string, distro: string) => {
+        track(EVENTS.APP_SELECTED, { app, category, distro });
+    },
+
+    /** Track app deselection */
+    appDeselected: (app: string, category: string, distro: string) => {
+        track(EVENTS.APP_DESELECTED, { app, category, distro });
+    },
+
+    /** Track command copy */
+    commandCopied: (distro: string, appCount: number) => {
+        track(EVENTS.COMMAND_COPIED, { distro, apps: appCount });
+    },
+
+    /** Track script download */
+    scriptDownloaded: (distro: string, appCount: number) => {
+        track(EVENTS.SCRIPT_DOWNLOADED, { distro, apps: appCount });
+    },
+
+    /** Track GitHub link click */
+    githubClicked: () => {
+        track(EVENTS.GITHUB_CLICKED);
+    },
+
+    /** Track contribute link click */
+    contributeClicked: () => {
+        track(EVENTS.CONTRIBUTE_CLICKED);
+    },
+
+    /** Track help popup opened */
+    helpOpened: () => {
+        track(EVENTS.HELP_OPENED);
+    },
+
+    /** Track help popup closed */
+    helpClosed: () => {
+        track(EVENTS.HELP_CLOSED);
+    },
+
+    /** Track theme change */
+    themeChanged: (theme: 'light' | 'dark') => {
+        track(EVENTS.THEME_CHANGED, { theme });
+    },
+
+    /** Track category expand */
+    categoryExpanded: (category: string) => {
+        track(EVENTS.CATEGORY_EXPANDED, { category });
+    },
+
+    /** Track category collapse */
+    categoryCollapsed: (category: string) => {
+        track(EVENTS.CATEGORY_COLLAPSED, { category });
+    },
+};
