diff --git a/public/.htaccess b/public/.htaccess
new file mode 100644
index 0000000..197f811
--- /dev/null
+++ b/public/.htaccess
@@ -0,0 +1,34 @@
+# Redirect old doc paths to new ones — using RewriteRule for broader compatibility
+<IfModule mod_rewrite.c>
+  RewriteEngine On
+  RewriteRule ^docs/product-overview/?$ /docs/overview/ [R=301,L]
+  RewriteRule ^docs/deploy-first-service/?$ /docs/first-service/ [R=301,L]
+  RewriteRule ^docs/premium-features/?$ /docs/premium/ [R=301,L]
+  RewriteRule ^docs/infrastructure/?$ /docs/integrations/ [R=301,L]
+</IfModule>
+
+# Fallback using mod_alias Redirect if available
+<IfModule mod_alias.c>
+  Redirect 301 /docs/product-overview /docs/overview/
+  Redirect 301 /docs/deploy-first-service /docs/first-service/
+  Redirect 301 /docs/premium-features /docs/premium/
+  Redirect 301 /docs/infrastructure /docs/integrations/
+</IfModule>
+
+# Set cache headers for static assets
+<IfModule mod_expires.c>
+  ExpiresActive On
+  ExpiresByType text/css "access plus 1 month"
+  ExpiresByType application/javascript "access plus 1 month"
+  ExpiresByType image/png "access plus 1 month"
+  ExpiresByType image/svg+xml "access plus 1 month"
+  ExpiresByType image/x-icon "access plus 1 year"
+</IfModule>
+
+# Enable compression
+<IfModule mod_deflate.c>
+  AddOutputFilterByType DEFLATE text/html text/plain text/css application/javascript application/json
+</IfModule>
+
+# Custom 404 page
+ErrorDocument 404 /404.html
diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index e4f08cc..7272341 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -117,7 +117,7 @@ export default function AboutPage() {
                 { name: "Express", role: "REST API + WebSocket", icon: "⚡" },
                 { name: "MCP", role: "AI Protocol Layer", icon: "🤖" },
                 { name: "Stripe", role: "Payment Processing", icon: "💳" },
-                { name: "Jest", role: "Testing (1400+ tests)", icon: "✅" },
+                { name: "Jest", role: "Testing (775+ tests)", icon: "✅" },
               ].map((tech) => (
                 <div
                   key={tech.name}
@@ -140,8 +140,8 @@ export default function AboutPage() {
             </h2>
             <div className="grid grid-cols-2 md:grid-cols-4 gap-8">
               {[
-                { value: "76+", label: "App Templates" },
-                { value: "1400+", label: "Test Cases" },
+                { value: "92+", label: "App Templates" },
+                { value: "775+", label: "Test Cases" },
                 { value: "39", label: "SDK Methods" },
                 { value: "5", label: "Languages" },
               ].map((stat) => (
diff --git a/src/app/docs/first-service/page.tsx b/src/app/docs/first-service/page.tsx
index dfff950..0c4eec3 100644
--- a/src/app/docs/first-service/page.tsx
+++ b/src/app/docs/first-service/page.tsx
@@ -34,7 +34,7 @@ export default function DocsFirstServicePage() {
 
         <h2>Three ways to add a service</h2>
 
-        <h3>1. Pick from 76+ one-click templates</h3>
+        <h3>1. Pick from 92+ one-click templates</h3>
         <p>
           The template library covers the most popular self-hosted applications — media servers, dashboards,
           databases, note apps, automation tools, and more. Each template bundles sane defaults for ports,
@@ -62,7 +62,7 @@ export default function DocsFirstServicePage() {
         <h3>Step 1: Open the template library</h3>
         <p>
           From the dashboard sidebar, click <strong>New Service → From Template</strong>. The template library
-          opens with a searchable grid of 76+ applications.
+          opens with a searchable grid of 92+ applications.
         </p>
 
         <h3>Step 2: Find Plex</h3>
diff --git a/src/app/docs/integrations/page.tsx b/src/app/docs/integrations/page.tsx
index 1e997ed..5ede8c8 100644
--- a/src/app/docs/integrations/page.tsx
+++ b/src/app/docs/integrations/page.tsx
@@ -27,7 +27,7 @@ export default function DocsIntegrationsPage() {
           Docker (and Docker Compose) is the runtime foundation for every deployment workflow, container lifecycle action,
           service discovery sweep, and template-based launch. DashCaddy communicates with the Docker daemon over the
           Unix socket (<code>/var/run/docker.sock</code>) to start, stop, restart, inspect, and adopt containers, and to
-          deploy the <strong>76+ one-click application templates</strong> from the catalog.
+          deploy the <strong>92+ one-click application templates</strong> from the catalog.
         </p>
         <p>
           The daemon connection is established at startup. If the socket is missing or permissioned for a different user,
diff --git a/src/app/docs/overview/page.tsx b/src/app/docs/overview/page.tsx
index 7892e4c..778944e 100644
--- a/src/app/docs/overview/page.tsx
+++ b/src/app/docs/overview/page.tsx
@@ -162,7 +162,7 @@ export default function DocsOverviewPage() {
               <tr className="border-b border-surface-800">
                 <td className="py-3 pr-4">Docker deployment</td>
                 <td className="py-3 pr-4">Manual compose files</td>
-                <td className="py-3 pr-4">76+ one-click templates</td>
+                <td className="py-3 pr-4">92+ one-click templates</td>
                 <td className="py-3">Templates + Recipes</td>
               </tr>
               <tr className="border-b border-surface-800">
diff --git a/src/app/docs/premium/page.tsx b/src/app/docs/premium/page.tsx
index 496c870..91a40a1 100644
--- a/src/app/docs/premium/page.tsx
+++ b/src/app/docs/premium/page.tsx
@@ -39,7 +39,7 @@ export default function DocsPremiumPage() {
           </thead>
           <tbody>
             <tr><td>Dashboard &amp; web UI</td><td>✓</td><td>✓</td></tr>
-            <tr><td>76+ application templates</td><td>✓</td><td>✓</td></tr>
+            <tr><td>92+ application templates</td><td>✓</td><td>✓</td></tr>
             <tr><td>Caddy reverse proxy + auto HTTPS</td><td>✓</td><td>✓</td></tr>
             <tr><td>Caddyfile-as-Code builder</td><td>✓</td><td>✓</td></tr>
             <tr><td>Technitium DNS automation</td><td>✓</td><td>✓</td></tr>
diff --git a/src/app/features/page.tsx b/src/app/features/page.tsx
index 844c47c..fd272db 100644
--- a/src/app/features/page.tsx
+++ b/src/app/features/page.tsx
@@ -40,11 +40,11 @@ export default function FeaturesPage() {
       id: 'app-deployment',
       title: 'App Deployment',
       description:
-        'Deploy from a library of 76+ pre-configured Docker templates with one click. Automatic configuration, smart defaults, and service discovery that auto-detects running containers and lets you adopt them instantly. From zero to live in seconds.',
+        'Deploy from a library of 92+ pre-configured Docker templates with one click. Automatic configuration, smart defaults, and service discovery that auto-detects running containers and lets you adopt them instantly. From zero to live in seconds.',
       icon: '🚀',
       features: [
         { icon: '⚡', label: 'One-click deployment' },
-        { icon: '📦', label: '76+ app templates' },
+        { icon: '📦', label: '92+ app templates' },
         { icon: '⚙️', label: 'Automatic configuration' },
         { icon: '🔍', label: 'Service Discovery & auto-adopt' },
         { icon: '🧙', label: 'Smart Defaults Wizard' },
@@ -350,7 +350,7 @@ export default function FeaturesPage() {
               </div>
               <ul className="space-y-3">
                 {[
-                  '76+ one-click app templates',
+                  '92+ one-click app templates',
                   'Automatic SSL certificates',
                   'Technitium DNS automation',
                   'Reverse proxy + Caddyfile builder',
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 0b7803c..32ce20d 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -4,7 +4,7 @@ import "./globals.css";
 export const metadata: Metadata = {
   title: "DashCaddy - Self-Hosting Made Beautiful",
   description:
-    "Deploy 76+ Docker apps with one click. AI-powered self-hosting with automatic SSL, DNS, reverse proxy, security center, and fleet management.",
+    "Deploy 92+ Docker apps with one click. AI-powered self-hosting with automatic SSL, DNS, reverse proxy, security center, and fleet management.",
   keywords: [
     "self-hosting",
     "docker",
@@ -19,7 +19,7 @@ export const metadata: Metadata = {
   openGraph: {
     title: "DashCaddy - Self-Hosting Made Beautiful",
     description:
-      "Deploy 76+ Docker apps with one click. AI-powered self-hosting with automatic SSL, DNS, and reverse proxy.",
+      "Deploy 92+ Docker apps with one click. AI-powered self-hosting with automatic SSL, DNS, and reverse proxy.",
     url: "https://dashcaddy.net",
     siteName: "DashCaddy",
     type: "website",
@@ -28,7 +28,7 @@ export const metadata: Metadata = {
     card: "summary_large_image",
     title: "DashCaddy - Self-Hosting Made Beautiful",
     description:
-      "Deploy 76+ Docker apps with one click. AI-powered self-hosting.",
+      "Deploy 92+ Docker apps with one click. AI-powered self-hosting.",
   },
 };
 
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 9a88d24..1642eb3 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -44,7 +44,7 @@ export default function Home() {
                 <p className="text-xl text-surface-300 max-w-lg leading-relaxed">
                   Just say &ldquo;deploy Plex&rdquo; — DashCaddy&rsquo;s AI Intent Router handles the rest.
                   Deploy Docker apps with one click, automatic SSL, DNS, and reverse proxy.
-                  76+ templates, fleet management, and an MCP control plane for AI assistants.
+                  92+ templates, fleet management, and an MCP control plane for AI assistants.
                   Everything you need for self-hosted perfection.
                 </p>
               </div>
@@ -206,8 +206,8 @@ export default function Home() {
             />
             <FeatureCard
               icon="🚀"
-              title="76+ App Templates"
-              description="Choose from 76+ pre-configured Docker app templates. Deploy your favorite applications instantly without manual configuration."
+              title="92+ App Templates"
+              description="Choose from 92+ pre-configured Docker app templates. Deploy your favorite applications instantly without manual configuration."
             />
             <FeatureCard
               icon="🛡️"
@@ -396,7 +396,7 @@ export default function Home() {
                       <span className="text-surface-500">Write your own compose files</span>
                     </td>
                     <td className="px-6 py-4 text-center text-sm">
-                      <span className="text-green-400 font-semibold">✓ 76+ pre-configured</span>
+                      <span className="text-green-400 font-semibold">✓ 92+ pre-configured</span>
                     </td>
                   </tr>
                   <tr className="hover:bg-surface-800/30 transition-colors">
diff --git a/src/app/pricing/page.tsx b/src/app/pricing/page.tsx
index 6fb6007..10daf34 100644
--- a/src/app/pricing/page.tsx
+++ b/src/app/pricing/page.tsx
@@ -36,7 +36,7 @@ export default function PricingPage() {
 
   const coreFeatures = [
     'Dashboard & real-time service monitoring',
-    '76+ pre-configured app templates',
+    '92+ pre-configured app templates',
     'Automatic SSL via Caddy internal CA',
     'DNS automation via Technitium DNS',
     'Reverse proxy management + Caddyfile-as-Code',
@@ -78,7 +78,7 @@ export default function PricingPage() {
     },
     {
       question: 'Can I use DashCaddy without Premium?',
-      answer: 'Absolutely. The core platform is fully functional without a license — including AI commands, the Security Center, service discovery, monitoring, backup, and all 76+ app templates. Premium unlocks SSO, Recipes, Swarm orchestration, and Fleet Management for advanced multi-node setups.',
+      answer: 'Absolutely. The core platform is fully functional without a license — including AI commands, the Security Center, service discovery, monitoring, backup, and all 92+ app templates. Premium unlocks SSO, Recipes, Swarm orchestration, and Fleet Management for advanced multi-node setups.',
     },
     {
       question: 'How many machines can I activate?',
@@ -110,7 +110,7 @@ export default function PricingPage() {
             Simple, Transparent <span className="text-brand-400">Pricing</span>
           </h1>
           <p className="text-xl text-surface-300 mb-8 max-w-2xl mx-auto">
-            The core platform is completely free — including AI commands, Security Center, and all 76+ app templates. Premium unlocks advanced orchestration with a one-time payment.
+            The core platform is completely free — including AI commands, Security Center, and all 92+ app templates. Premium unlocks advanced orchestration with a one-time payment.
           </p>
         </div>
       </section>
diff --git a/src/components/AppShowcase.tsx b/src/components/AppShowcase.tsx
index 45c8965..e4bb37a 100644
--- a/src/components/AppShowcase.tsx
+++ b/src/components/AppShowcase.tsx
@@ -1,181 +1,226 @@
-'use client';
-
-import { useState } from 'react';
-
-interface App {
-  name: string;
-  icon: string;
-  category: string;
-}
-
-const apps: App[] = [
-  // Media
-  { name: 'Plex', icon: '🎬', category: 'Media' },
-  { name: 'Jellyfin', icon: '📽️', category: 'Media' },
-  { name: 'Kaleidescape', icon: '🎞️', category: 'Media' },
-  { name: 'Emby', icon: '🎥', category: 'Media' },
-  { name: 'Subsonic', icon: '🎵', category: 'Media' },
-  { name: 'Synology Photos', icon: '📸', category: 'Media' },
-
-  // Downloads
-  { name: 'Sonarr', icon: '📺', category: 'Downloads' },
-  { name: 'Radarr', icon: '🎬', category: 'Downloads' },
-  { name: 'Lidarr', icon: '🎶', category: 'Downloads' },
-  { name: 'qBittorrent', icon: '⚡', category: 'Downloads' },
-  { name: 'Transmission', icon: '📤', category: 'Downloads' },
-  { name: 'SABnzbd', icon: '📥', category: 'Downloads' },
-
-  // Productivity
-  { name: 'Nextcloud', icon: '☁️', category: 'Productivity' },
-  { name: 'Vikunja', icon: '✓', category: 'Productivity' },
-  { name: 'OpenProject', icon: '📋', category: 'Productivity' },
-  { name: 'Plane', icon: '🚀', category: 'Productivity' },
-  { name: 'Actual Budget', icon: '💰', category: 'Productivity' },
-  { name: 'HedgeDoc', icon: '📝', category: 'Productivity' },
-
-  // Management
-  { name: 'Portainer', icon: '🐋', category: 'Management' },
-  { name: 'Homelabs', icon: '🏠', category: 'Management' },
-  { name: 'Yacht', icon: '⛵', category: 'Management' },
-  { name: 'DockSTARTer', icon: '⭐', category: 'Management' },
-  { name: 'Unraid', icon: '📦', category: 'Management' },
-  { name: 'TrueNAS', icon: '💾', category: 'Management' },
-
-  // Security
-  { name: 'Vaultwarden', icon: '🔐', category: 'Security' },
-  { name: 'Bitwarden', icon: '🗝️', category: 'Security' },
-  { name: 'Keycloak', icon: '🔑', category: 'Security' },
-  { name: 'Authelia', icon: '🛡️', category: 'Security' },
-  { name: 'OpenVPN', icon: '🌐', category: 'Security' },
-  { name: 'WireGuard', icon: '📡', category: 'Security' },
-
-  // Development
-  { name: 'Gitea', icon: '🐙', category: 'Development' },
-  { name: 'GitLab', icon: '🦊', category: 'Development' },
-  { name: 'Forgejo', icon: '🔧', category: 'Development' },
-  { name: 'Jenkins', icon: '🤖', category: 'Development' },
-  { name: 'Drone', icon: '🚁', category: 'Development' },
-  { name: 'Code Server', icon: '💻', category: 'Development' },
-
-  // Monitoring
-  { name: 'Grafana', icon: '📊', category: 'Monitoring' },
-  { name: 'Prometheus', icon: '⚙️', category: 'Monitoring' },
-  { name: 'Uptime Kuma', icon: '📈', category: 'Monitoring' },
-  { name: 'Netdata', icon: '🔍', category: 'Monitoring' },
-  { name: 'New Relic', icon: '👁️', category: 'Monitoring' },
-  { name: 'Kibana', icon: '📉', category: 'Monitoring' },
-
-  // Additional
-  { name: 'Home Assistant', icon: '🏡', category: 'Smart Home' },
-  { name: 'Node-RED', icon: '🔴', category: 'Smart Home' },
-  { name: 'OpenHAB', icon: '⚙️', category: 'Smart Home' },
-  { name: 'Immich', icon: '📷', category: 'Media' },
-  { name: 'Calibre', icon: '📚', category: 'Productivity' },
-  { name: 'Paperless', icon: '📄', category: 'Productivity' },
-];
-
-const categories = [
-  'All',
-  'Media',
-  'Downloads',
-  'Productivity',
-  'Management',
-  'Security',
-  'Development',
-  'Monitoring',
-  'Smart Home',
-];
-
-export default function AppShowcase() {
-  const [activeCategory, setActiveCategory] = useState('All');
-
-  const filteredApps =
-    activeCategory === 'All'
-      ? apps
-      : apps.filter((app) => app.category === activeCategory);
-
-  return (
-    <section className="relative py-12 px-4 sm:px-6 lg:px-8 bg-gradient-to-b from-surface-950 to-surface-900">
-      <div className="mx-auto max-w-7xl">
-        {/* Header */}
-        <div className="mb-12 text-center">
-          <h2 className="text-3xl sm:text-4xl font-bold text-surface-50 mb-4">
-            76+ One-Click App Templates
-          </h2>
-          <p className="text-lg text-surface-400 max-w-2xl mx-auto">
-            Deploy your favorite apps instantly with pre-configured templates, automatic SSL certificates, and integrated DNS management.
-          </p>
-        </div>
-
-        {/* Category Filter */}
-        <div className="mb-10 flex flex-wrap justify-center gap-2">
-          {categories.map((category) => (
-            <button
-              key={category}
-              onClick={() => setActiveCategory(category)}
-              className={`px-4 py-2 rounded-full text-sm font-medium transition-all duration-200 ${
-                activeCategory === category
-                  ? 'bg-brand-500 text-white shadow-lg shadow-brand-500/30'
-                  : 'bg-surface-800 text-surface-300 hover:bg-surface-700 hover:text-surface-200'
-              }`}
-            >
-              {category}
-            </button>
-          ))}
-        </div>
-
-        {/* App Grid */}
-        <div className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-6 gap-4">
-          {filteredApps.map((app) => (
-            <div
-              key={`${app.name}-${app.category}`}
-              className="group relative flex flex-col items-center justify-center rounded-lg border border-surface-700 bg-surface-800/50 backdrop-blur-sm p-4 transition-all duration-300 hover:border-brand-500/50 hover:bg-surface-800/80 hover:shadow-lg hover:shadow-brand-500/10 hover:-translate-y-1"
-            >
-              {/* Background gradient on hover */}
-              <div className="absolute inset-0 bg-gradient-to-br from-brand-500/0 to-brand-500/0 group-hover:from-brand-500/5 group-hover:to-brand-500/10 rounded-lg transition-all duration-300 pointer-events-none" />
-
-              <div className="relative z-10 flex flex-col items-center justify-center text-center">
-                {/* Icon */}
-                <div className="text-4xl mb-2 transition-transform duration-300 group-hover:scale-110">
-                  {app.icon}
-                </div>
-
-                {/* App Name */}
-                <h3 className="text-sm font-semibold text-surface-50 line-clamp-2 group-hover:text-brand-400 transition-colors">
-                  {app.name}
-                </h3>
-
-                {/* Category Tag */}
-                <span className="text-xs text-surface-500 mt-1 group-hover:text-brand-400/70">
-                  {app.category}
-                </span>
-              </div>
-            </div>
-          ))}
-        </div>
-
-        {/* Stats */}
-        <div className="mt-16 grid grid-cols-3 gap-4 sm:gap-8">
-          <div className="text-center">
-            <div className="text-3xl sm:text-4xl font-bold text-brand-400 mb-2">
-              76+
-            </div>
-            <p className="text-sm text-surface-400">App Templates</p>
-          </div>
-          <div className="text-center">
-            <div className="text-3xl sm:text-4xl font-bold text-brand-400 mb-2">
-              0
-            </div>
-            <p className="text-sm text-surface-400">Configuration</p>
-          </div>
-          <div className="text-center">
-            <div className="text-3xl sm:text-4xl font-bold text-brand-400 mb-2">
-              1-Click
-            </div>
-            <p className="text-sm text-surface-400">Deploy</p>
-          </div>
-        </div>
-      </div>
-    </section>
-  );
-}
+'use client';
+
+import { useState } from 'react';
+
+interface App {
+  name: string;
+  icon: string;
+  category: string;
+}
+
+// All apps below have real deployable templates in DashCaddy.
+// Last verified against src/docker/app-templates.js (92 templates).
+const apps: App[] = [
+  // Media
+  { name: 'Plex', icon: '🎬', category: 'Media' },
+  { name: 'Jellyfin', icon: '📽️', category: 'Media' },
+  { name: 'Emby', icon: '🎥', category: 'Media' },
+  { name: 'Subsonic', icon: '🎵', category: 'Media' },
+  { name: 'Navidrome', icon: '🎶', category: 'Media' },
+  { name: 'Audiobookshelf', icon: '🎧', category: 'Media' },
+  { name: 'Immich', icon: '📷', category: 'Media' },
+  { name: 'Photoprism', icon: '🖼️', category: 'Media' },
+  { name: 'Komga', icon: '📚', category: 'Media' },
+  { name: 'Kavita', icon: '📕', category: 'Media' },
+
+  // Downloads
+  { name: 'Sonarr', icon: '📺', category: 'Downloads' },
+  { name: 'Radarr', icon: '🎬', category: 'Downloads' },
+  { name: 'Lidarr', icon: '🎶', category: 'Downloads' },
+  { name: 'Readarr', icon: '📖', category: 'Downloads' },
+  { name: 'Prowlarr', icon: '🔍', category: 'Downloads' },
+  { name: 'qBittorrent', icon: '⚡', category: 'Downloads' },
+  { name: 'Transmission', icon: '📤', category: 'Downloads' },
+  { name: 'SABnzbd', icon: '📥', category: 'Downloads' },
+  { name: 'NZBGet', icon: '📰', category: 'Downloads' },
+  { name: 'Jdownloader', icon: '⬇️', category: 'Downloads' },
+
+  // Productivity
+  { name: 'Nextcloud', icon: '☁️', category: 'Productivity' },
+  { name: 'Actual Budget', icon: '💰', category: 'Productivity' },
+  { name: 'Vikunja', icon: '✓', category: 'Productivity' },
+  { name: 'OpenProject', icon: '📋', category: 'Productivity' },
+  { name: 'Plane', icon: '🚀', category: 'Productivity' },
+  { name: 'HedgeDoc', icon: '📝', category: 'Productivity' },
+  { name: 'BookStack', icon: '📖', category: 'Productivity' },
+  { name: 'Outline', icon: '📒', category: 'Productivity' },
+  { name: 'Calibre-Web', icon: '📚', category: 'Productivity' },
+  { name: 'Paperless-NGX', icon: '📄', category: 'Productivity' },
+  { name: 'Stirling-PDF', icon: '📃', category: 'Productivity' },
+  { name: 'Mealie', icon: '🍳', category: 'Productivity' },
+
+  // Management
+  { name: 'Portainer', icon: '🐋', category: 'Management' },
+  { name: 'Yacht', icon: '⛵', category: 'Management' },
+  { name: 'Homarr', icon: '🏠', category: 'Management' },
+  { name: 'Homepage', icon: '📄', category: 'Management' },
+  { name: 'Dozzle', icon: '🔍', category: 'Management' },
+  { name: 'Watchtower', icon: '🗼', category: 'Management' },
+  { name: 'Filebrowser', icon: '📁', category: 'Management' },
+
+  // Security
+  { name: 'Vaultwarden', icon: '🔐', category: 'Security' },
+  { name: 'Bitwarden', icon: '🗝️', category: 'Security' },
+  { name: 'Keycloak', icon: '🔑', category: 'Security' },
+  { name: 'Authelia', icon: '🛡️', category: 'Security' },
+  { name: 'Authentik', icon: '🪪', category: 'Security' },
+  { name: 'OpenVPN', icon: '🌐', category: 'Security' },
+  { name: 'WireGuard', icon: '📡', category: 'Security' },
+  { name: 'CrowdSec', icon: '🛡️', category: 'Security' },
+
+  // Development
+  { name: 'Gitea', icon: '🐙', category: 'Development' },
+  { name: 'GitLab', icon: '🦊', category: 'Development' },
+  { name: 'Forgejo', icon: '🔧', category: 'Development' },
+  { name: 'Jenkins', icon: '🤖', category: 'Development' },
+  { name: 'Drone', icon: '🚁', category: 'Development' },
+  { name: 'Code Server', icon: '💻', category: 'Development' },
+  { name: 'Excalidraw', icon: '✏️', category: 'Development' },
+
+  // Monitoring
+  { name: 'Grafana', icon: '📊', category: 'Monitoring' },
+  { name: 'Prometheus', icon: '⚙️', category: 'Monitoring' },
+  { name: 'Uptime Kuma', icon: '📈', category: 'Monitoring' },
+  { name: 'Netdata', icon: '🔍', category: 'Monitoring' },
+  { name: 'Kibana', icon: '📉', category: 'Monitoring' },
+  { name: 'Tautulli', icon: '📊', category: 'Monitoring' },
+  { name: 'Changedetection', icon: '🔔', category: 'Monitoring' },
+
+  // Smart Home
+  { name: 'Home Assistant', icon: '🏡', category: 'Smart Home' },
+  { name: 'Node-RED', icon: '🔴', category: 'Smart Home' },
+  { name: 'OpenHAB', icon: '⚙️', category: 'Smart Home' },
+
+  // DNS & Network
+  { name: 'Pi-hole', icon: '🕳️', category: 'Network' },
+  { name: 'Technitium', icon: '🌐', category: 'Network' },
+  { name: 'Bind9', icon: '🔗', category: 'Network' },
+  { name: 'CoreDNS', icon: '🔶', category: 'Network' },
+  { name: 'PowerDNS', icon: '⚡', category: 'Network' },
+
+  // Notes & Knowledge
+  { name: 'Standard Notes', icon: '📝', category: 'Productivity' },
+  { name: 'Trilium', icon: '🌳', category: 'Productivity' },
+  { name: 'IT-Tools', icon: '🛠️', category: 'Productivity' },
+
+  // Communication
+  { name: 'Matrix', icon: '💬', category: 'Communication' },
+  { name: 'Rocket.Chat', icon: '🚀', category: 'Communication' },
+  { name: 'Roundcube', icon: '📧', category: 'Communication' },
+
+  // Gaming
+  { name: 'Minecraft', icon: '⛏️', category: 'Gaming' },
+  { name: 'Valheim', icon: '⚔️', category: 'Gaming' },
+
+  // Sync
+  { name: 'Syncthing', icon: '🔄', category: 'Productivity' },
+];
+
+const categories = [
+  'All',
+  'Media',
+  'Downloads',
+  'Productivity',
+  'Management',
+  'Security',
+  'Development',
+  'Monitoring',
+  'Smart Home',
+  'Network',
+  'Communication',
+  'Gaming',
+];
+
+export default function AppShowcase() {
+  const [activeCategory, setActiveCategory] = useState('All');
+
+  const filteredApps =
+    activeCategory === 'All'
+      ? apps
+      : apps.filter((app) => app.category === activeCategory);
+
+  return (
+    <section className="relative py-12 px-4 sm:px-6 lg:px-8 bg-gradient-to-b from-surface-950 to-surface-900">
+      <div className="mx-auto max-w-7xl">
+        {/* Header */}
+        <div className="mb-12 text-center">
+          <h2 className="text-3xl sm:text-4xl font-bold text-surface-50 mb-4">
+            90+ One-Click App Templates
+          </h2>
+          <p className="text-lg text-surface-400 max-w-2xl mx-auto">
+            Deploy your favorite apps instantly with pre-configured templates, automatic SSL certificates, and integrated DNS management.
+          </p>
+        </div>
+
+        {/* Category Filter */}
+        <div className="mb-10 flex flex-wrap justify-center gap-2">
+          {categories.map((category) => (
+            <button
+              key={category}
+              onClick={() => setActiveCategory(category)}
+              className={`px-4 py-2 rounded-full text-sm font-medium transition-all duration-200 ${
+                activeCategory === category
+                  ? 'bg-brand-500 text-white shadow-lg shadow-brand-500/30'
+                  : 'bg-surface-800 text-surface-300 hover:bg-surface-700 hover:text-surface-200'
+              }`}
+            >
+              {category}
+            </button>
+          ))}
+        </div>
+
+        {/* App Grid */}
+        <div className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-6 gap-4">
+          {filteredApps.map((app) => (
+            <div
+              key={`${app.name}-${app.category}`}
+              className="group relative flex flex-col items-center justify-center rounded-lg border border-surface-700 bg-surface-800/50 backdrop-blur-sm p-4 transition-all duration-300 hover:border-brand-500/50 hover:bg-surface-800/80 hover:shadow-lg hover:shadow-brand-500/10 hover:-translate-y-1"
+            >
+              {/* Background gradient on hover */}
+              <div className="absolute inset-0 bg-gradient-to-br from-brand-500/0 to-brand-500/0 group-hover:from-brand-500/5 group-hover:to-brand-500/10 rounded-lg transition-all duration-300 pointer-events-none" />
+
+              <div className="relative z-10 flex flex-col items-center justify-center text-center">
+                {/* Icon */}
+                <div className="text-4xl mb-2 transition-transform duration-300 group-hover:scale-110">
+                  {app.icon}
+                </div>
+
+                {/* App Name */}
+                <h3 className="text-sm font-semibold text-surface-50 line-clamp-2 group-hover:text-brand-400 transition-colors">
+                  {app.name}
+                </h3>
+
+                {/* Category Tag */}
+                <span className="text-xs text-surface-500 mt-1 group-hover:text-brand-400/70">
+                  {app.category}
+                </span>
+              </div>
+            </div>
+          ))}
+        </div>
+
+        {/* Stats */}
+        <div className="mt-16 grid grid-cols-3 gap-4 sm:gap-8">
+          <div className="text-center">
+            <div className="text-3xl sm:text-4xl font-bold text-brand-400 mb-2">
+              90+
+            </div>
+            <p className="text-sm text-surface-400">App Templates</p>
+          </div>
+          <div className="text-center">
+            <div className="text-3xl sm:text-4xl font-bold text-brand-400 mb-2">
+              0
+            </div>
+            <p className="text-sm text-surface-400">Configuration</p>
+          </div>
+          <div className="text-center">
+            <div className="text-3xl sm:text-4xl font-bold text-brand-400 mb-2">
+              1-Click
+            </div>
+            <p className="text-sm text-surface-400">Deploy</p>
+          </div>
+        </div>
+      </div>
+    </section>
+  );
+}