diff --git a/sx/sx/cssx.sx b/sx/sx/cssx.sx
index 20e2d1b..19d2b0a 100644
--- a/sx/sx/cssx.sx
+++ b/sx/sx/cssx.sx
@@ -352,3 +352,70 @@
         (li (strong "Live Streaming: ") "SSE and WebSocket transports push data to components. "
             "Style components react to that data like any other component — no separate style "
             "streaming protocol.")))))
+
+
+;; ---------------------------------------------------------------------------
+;; CSS Delivery
+;; ---------------------------------------------------------------------------
+
+(defcomp ~cssx-delivery-content ()
+  (~doc-page :title "CSS Delivery"
+
+    (~doc-section :title "Multiple Strategies" :id "strategies"
+      (p "A CSSX component chooses its own styling strategy — and each strategy has its "
+         "own delivery path:")
+      (ul :class "list-disc pl-5 space-y-1 text-stone-700"
+        (li (strong "Tailwind classes: ") "Delivered via the on-demand protocol below. "
+            "The server ships only the rules the page actually uses.")
+        (li (strong "Inline styles: ") "No delivery needed — " (code ":style") " attributes "
+            "are part of the markup.")
+        (li (strong "Emitted " (code "<style>") " blocks: ") "Components can emit CSS rules "
+            "directly. They arrive as part of the rendered HTML — keyframes, custom properties, "
+            "scoped rules, anything.")
+        (li (strong "External stylesheets: ") "Components can reference pre-loaded CSS files "
+            "or lazy-load them via " (code "~suspense") " (see " (a :href "/cssx/async" "Async CSS") ").")
+        (li (strong "Custom properties: ") "A " (code "~theme") " component sets "
+            (code "--color-primary") " etc. via a " (code "<style>") " block. Everything "
+            "using " (code "var()") " repaints automatically."))
+      (p "The protocol below handles the Tailwind utility class case — the most common "
+         "strategy — but it's not the only game in town."))
+
+    (~doc-section :title "On-Demand Tailwind Delivery" :id "on-demand"
+      (p "When components use Tailwind utility classes, SX ships " (em "only the CSS rules "
+         "actually used on the page") ", computed at render time. No build step, no purging, "
+         "no unused CSS.")
+      (p "The server pre-parses the full Tailwind CSS file into an in-memory registry at "
+         "startup. When a response is rendered, SX scans all " (code ":class") " values in "
+         "the output, looks up only those classes, and embeds the matching rules."))
+
+    (~doc-section :title "The Protocol" :id "protocol"
+      (p "First page load gets the full set of used rules. Subsequent navigations send a "
+         "hash of what the client already has, and the server ships only the delta:")
+      (highlight
+        "# First page load:\nGET / HTTP/1.1\n\nHTTP/1.1 200 OK\nContent-Type: text/html\n# Full CSS in <style id=\"sx-css\"> + hash in <meta name=\"sx-css-classes\">\n\n# Subsequent navigation:\nGET /about HTTP/1.1\nSX-Css: a1b2c3d4\n\nHTTP/1.1 200 OK\nContent-Type: text/sx\nSX-Css-Hash: e5f6g7h8\nSX-Css-Add: bg-blue-500,text-white,rounded-lg\n# Only new rules in <style data-sx-css>"
+        "bash")
+      (p "The client merges new rules into the existing " (code "<style id=\"sx-css\">")
+         " block and updates its hash. No flicker, no duplicate rules."))
+
+    (~doc-section :title "Component-Aware Scanning" :id "scanning"
+      (p "CSS scanning happens at two levels:")
+      (ul :class "list-disc pl-5 space-y-1 text-stone-700"
+        (li (strong "Registration time: ") "When a component is defined via " (code "defcomp")
+            ", its body is scanned for class strings. The component records which CSS classes "
+            "it uses.")
+        (li (strong "Render time: ") "The rendered output is scanned for any classes the "
+            "static scan missed — dynamically constructed class strings, conditional classes, etc."))
+      (p "This means the CSS registry knows roughly what a page needs before rendering, "
+         "and catches any stragglers after."))
+
+    (~doc-section :title "Trade-offs" :id "tradeoffs"
+      (ul :class "list-disc pl-5 space-y-2 text-stone-700"
+        (li (strong "Full Tailwind in memory: ") "The parsed CSS registry is ~4MB. This is "
+            "a one-time startup cost per app instance.")
+        (li (strong "Regex scanning: ") "Class detection uses regex, so dynamically "
+            "constructed class names (e.g. " (code "(str \"bg-\" color \"-500\")") ") can be "
+            "missed. Use complete class strings in " (code "case") "/" (code "cond") " branches.")
+        (li (strong "No @apply: ") "Tailwind's " (code "@apply") " is a build-time feature. "
+            "On-demand delivery works with utility classes directly.")
+        (li (strong "Tailwind-shaped: ") "The registry parser understands Tailwind's naming "
+            "conventions. Non-Tailwind CSS works via " (code "<style>") " blocks in components.")))))
diff --git a/sx/sx/docs-content.sx b/sx/sx/docs-content.sx
index f3038e0..8b2ddad 100644
--- a/sx/sx/docs-content.sx
+++ b/sx/sx/docs-content.sx
@@ -85,28 +85,6 @@
         "Forms marked with a tail position enable " (a :href "/essays/tco" :class "text-violet-600 hover:underline" "tail-call optimization") " — recursive calls in tail position use constant stack space.")
       (div :class "space-y-10" forms))))
 
-(defcomp ~docs-css-content ()
-  (~doc-page :title "On-Demand CSS"
-    (~doc-section :title "How it works" :id "how"
-      (p :class "text-stone-600"
-        "sx scans every response for CSS class names used in :class attributes. It looks up only those classes in a pre-parsed Tailwind CSS registry and ships just the rules that are needed. No build step. No purging. No unused CSS.")
-      (p :class "text-stone-600"
-        "On the first page load, the full set of used classes is embedded in a <style> block. A hash of the class set is stored. On subsequent navigations, the client sends the hash in the SX-Css header. The server computes the diff and sends only new rules via SX-Css-Add and a <style data-sx-css> block."))
-    (~doc-section :title "The protocol" :id "protocol"
-      (~doc-code :code (highlight "# First page load:\nGET / HTTP/1.1\n\nHTTP/1.1 200 OK\nContent-Type: text/html\n# Full CSS in <style id=\"sx-css\"> + hash in <meta name=\"sx-css-classes\">\n\n# Subsequent navigation:\nGET /about HTTP/1.1\nSX-Css: a1b2c3d4\n\nHTTP/1.1 200 OK\nContent-Type: text/sx\nSX-Css-Hash: e5f6g7h8\nSX-Css-Add: bg-blue-500,text-white,rounded-lg\n# Only new rules in <style data-sx-css>" "bash")))
-    (~doc-section :title "Advantages" :id "advantages"
-      (ul :class "space-y-2 text-stone-600"
-        (li "Zero build step — no Tailwind CLI, no PostCSS, no purging")
-        (li "Exact CSS — never ships a rule that isn't used on the page")
-        (li "Incremental — subsequent navigations only ship new rules")
-        (li "Component-aware — pre-scans component definitions at registration time")))
-    (~doc-section :title "Disadvantages" :id "disadvantages"
-      (ul :class "space-y-2 text-stone-600"
-        (li "Requires the full Tailwind CSS file loaded in memory at startup (~4MB parsed)")
-        (li "Regex-based class scanning — can miss dynamically constructed class names")
-        (li "No @apply support — classes must be used directly")
-        (li "Tied to Tailwind's utility class naming conventions")))))
-
 (defcomp ~docs-server-rendering-content ()
   (~doc-page :title "Server Rendering"
     (~doc-section :title "Python API" :id "python"
diff --git a/sx/sx/nav-data.sx b/sx/sx/nav-data.sx
index f8b003f..1b08ca8 100644
--- a/sx/sx/nav-data.sx
+++ b/sx/sx/nav-data.sx
@@ -9,7 +9,6 @@
   (dict :label "Evaluator" :href "/docs/evaluator")
   (dict :label "Primitives" :href "/docs/primitives")
   (dict :label "Special Forms" :href "/docs/special-forms")
-  (dict :label "CSS" :href "/docs/css")
   (dict :label "Server Rendering" :href "/docs/server-rendering")))
 
 (define reference-nav-items (list
@@ -58,6 +57,7 @@
 (define cssx-nav-items (list
   (dict :label "Overview" :href "/cssx/")
   (dict :label "Patterns" :href "/cssx/patterns")
+  (dict :label "Delivery" :href "/cssx/delivery")
   (dict :label "Async CSS" :href "/cssx/async")
   (dict :label "Live Styles" :href "/cssx/live")
   (dict :label "Comparisons" :href "/cssx/comparisons")
@@ -153,8 +153,6 @@
         :summary "OAuth-based sharing to Facebook, Instagram, Threads, Twitter/X, LinkedIn, and Mastodon.")
   (dict :label "SX CI Pipeline" :href "/plans/sx-ci"
         :summary "Build, test, and deploy in s-expressions — CI pipelines as SX components.")
-  (dict :label "CSSX Components" :href "/plans/cssx-components"
-        :summary "Done — see /cssx/. Styling as components: style dictionary removed, defcomps handle all styling.")
   (dict :label "Live Streaming" :href "/plans/live-streaming"
         :summary "SSE and WebSocket transports for re-resolving suspense slots after initial page load — live data, real-time collaboration.")))
 
diff --git a/sx/sx/plans.sx b/sx/sx/plans.sx
index b850c5b..1ba4201 100644
--- a/sx/sx/plans.sx
+++ b/sx/sx/plans.sx
@@ -2221,130 +2221,6 @@
               (td :class "px-3 py-2 text-stone-700" "Add CI primitive declarations"))))))))
 
 
-;; ---------------------------------------------------------------------------
-;; CSSX Components
-;; ---------------------------------------------------------------------------
-
-(defcomp ~plan-cssx-components-content ()
-  (~doc-page :title "CSSX Components"
-
-    (~doc-section :title "Context" :id "context"
-      (p "SX currently has a parallel CSS system: a style dictionary (JSON blob of atom-to-declaration mappings), a " (code "StyleValue") " type threaded through the evaluator and renderer, content-addressed hash class names (" (code "sx-a3f2b1") "), runtime CSS injection into " (code "<style id=\"sx-css\">") ", and a separate caching pipeline (" (code "<script type=\"text/sx-styles\">") ", localStorage, cookies).")
-      (p "This is ~300 lines of spec code (cssx.sx) plus platform interface (hash, regex, injection), plus server-side infrastructure (css_registry.py, tw.css parsing). All to solve one problem: " (em "resolving keyword atoms like ") (code ":flex :gap-4 :hover:bg-sky-200") (em " into CSS at render time."))
-      (p "The result: elements in the DOM get opaque class names like " (code "class=\"sx-a3f2b1\"") ". DevTools becomes useless. You can't inspect an element and understand its styling. " (strong "This is a deal breaker.")))
-
-    (~doc-section :title "The Idea" :id "idea"
-      (p (strong "Styling is just components.") " A CSSX component is a regular " (code "defcomp") " that decides how to style its children. It might apply Tailwind classes, or hand-written CSS classes, or inline styles, or generate rules at runtime. The implementation is the component's private business. The consumer just calls " (code "(~btn :variant \"primary\" \"Submit\")") " and doesn't care.")
-      (p "Because it's " (code "defcomp") ", you get everything for free: caching, bundling, dependency scanning, server/client rendering, composition. No parallel infrastructure.")
-      (p "Key advantages:")
-      (ul :class "list-disc pl-5 space-y-1 text-stone-700"
-        (li (strong "Readable DOM: ") "Elements have real class names, not content-addressed hashes. DevTools works.")
-        (li (strong "Data-driven styling: ") "Components receive data and decide styling. " (code "(~metric :value 150)") " renders red because " (code "value > 100") " — logic lives in the component, not a CSS preprocessor.")
-        (li (strong "One system: ") "No separate " (code "StyleValue") " type, no style dictionary JSON, no " (code "<script type=\"text/sx-styles\">") ", no " (code "sx-css") " injection. Components ARE the styling abstraction.")
-        (li (strong "One cache: ") "Component hash/localStorage handles everything. No separate style dict caching.")
-        (li (strong "Composable: ") (code "(~card :elevated true (~metric :value v))") " — styling composes like any other component.")
-        (li (strong "Strategy-agnostic: ") "A component can apply Tailwind classes, emit " (code "<style>") " blocks, use inline styles, generate CSS custom properties, or any combination. The consumer never knows or cares. Swap strategies without touching call sites.")))
-
-    (~doc-section :title "Examples" :id "examples"
-      (~doc-subsection :title "Simple class mapping"
-        (p "A button component that maps variant keywords to class strings:")
-        (highlight
-          "(defcomp ~btn (&key variant disabled &rest children)\n  (button\n    :class (str \"px-4 py-2 rounded font-medium transition \"\n               (case variant\n                 \"primary\" \"bg-blue-600 text-white hover:bg-blue-700\"\n                 \"danger\"  \"bg-red-600 text-white hover:bg-red-700\"\n                 \"ghost\"   \"bg-transparent hover:bg-stone-100\"\n                 \"bg-stone-200 hover:bg-stone-300\")\n               (when disabled \" opacity-50 cursor-not-allowed\"))\n    :disabled disabled\n    children))"
-          "lisp"))
-
-      (~doc-subsection :title "Data-driven styling"
-        (p "Styling that responds to data values — impossible with static CSS:")
-        (highlight
-          "(defcomp ~metric (&key value label threshold)\n  (let ((t (or threshold 10)))\n    (div :class (str \"p-3 rounded font-bold \"\n                 (cond\n                   ((> value (* t 10)) \"bg-red-500 text-white\")\n                   ((> value t)        \"bg-amber-200 text-amber-900\")\n                   (:else              \"bg-green-100 text-green-800\")))\n      (span :class \"text-sm\" label) \": \" (span (str value)))))"
-          "lisp"))
-
-      (~doc-subsection :title "Style functions"
-        (p "Reusable style logic without wrapping — returns class strings:")
-        (highlight
-          "(define card-classes\n  (fn (&key elevated bordered)\n    (str \"rounded-lg p-4 \"\n         (if elevated \"shadow-lg\" \"shadow-sm\")\n         (when bordered \" border border-stone-200\"))))\n\n;; Usage: (div :class (card-classes :elevated true) ...)"
-          "lisp"))
-
-      (~doc-subsection :title "Responsive and interactive"
-        (p "Components can encode responsive breakpoints and interactive states as class strings — the same way you'd write Tailwind, but wrapped in a semantic component:")
-        (highlight
-          "(defcomp ~responsive-grid (&key cols &rest children)\n  (div :class (str \"grid gap-4 \"\n               (case (or cols 3)\n                 1 \"grid-cols-1\"\n                 2 \"grid-cols-1 md:grid-cols-2\"\n                 3 \"grid-cols-1 md:grid-cols-2 lg:grid-cols-3\"\n                 4 \"grid-cols-2 md:grid-cols-3 lg:grid-cols-4\"))\n    children))"
-          "lisp"))
-
-      (~doc-subsection :title "Emitting CSS directly"
-        (p "Components are not limited to referencing existing classes. They can generate CSS — " (code "<style>") " tags, keyframes, custom properties — as part of their output:")
-        (highlight
-          "(defcomp ~pulse (&key color duration &rest children)\n  (<>\n    (style (str \"@keyframes sx-pulse {\"\n               \"0%,100% { opacity:1 } 50% { opacity:.5 } }\"))\n    (div :style (str \"animation: sx-pulse \" (or duration \"2s\") \" infinite;\"\n                    \"color:\" (or color \"inherit\"))\n      children)))\n\n(defcomp ~theme (&key primary surface &rest children)\n  (<>\n    (style (str \":root {\"\n               \"--color-primary:\" (or primary \"#7c3aed\") \";\"\n               \"--color-surface:\" (or surface \"#fafaf9\") \"}\"))\n    children))"
-          "lisp")
-        (p "The CSS strategy is the component's private implementation detail. Consumers call " (code "(~pulse :color \"red\" \"Loading...\")") " or " (code "(~theme :primary \"#2563eb\" ...)") " without knowing or caring whether the component uses classes, inline styles, generated rules, or all three.")))
-
-    (~doc-section :title "What Changes" :id "changes"
-
-      (~doc-subsection :title "Remove"
-        (ul :class "list-disc pl-5 space-y-1 text-stone-700"
-          (li (code "StyleValue") " type and all plumbing (type checks in eval, render, serialize)")
-          (li (code "cssx.sx") " spec module (~300 lines: resolve-style, resolve-atom, split-variant, hash, injection)")
-          (li "Style dictionary JSON format, loading, caching (" (code "<script type=\"text/sx-styles\">") ", " (code "initStyleDict") ", " (code "parseAndLoadStyleDict") ")")
-          (li (code "<style id=\"sx-css\">") " runtime CSS injection system")
-          (li (code "css_registry.py") " server-side (builds style dictionary from tw.css)")
-          (li "Style dict cookies (" (code "sx-styles-hash") "), localStorage keys (" (code "sx-styles-src") ")")
-          (li "Platform interface: " (code "fnv1a-hash") ", " (code "compile-regex") ", " (code "regex-match") ", " (code "regex-replace-groups") ", " (code "make-style-value") ", " (code "inject-style-value"))))
-
-      (~doc-subsection :title "Keep"
-        (ul :class "list-disc pl-5 space-y-1 text-stone-700"
-          (li (code "defstyle") " — already just " (code "(defstyle name expr)") " which binds name to a value. Stays as sugar for defining reusable style values/functions. No " (code "StyleValue") " type needed — the value can be a string, a function, anything.")
-          (li (code "defkeyframes") " — could stay if we want declarative keyframe definitions. Or could become a component/function too.")
-          (li (code "tw.css") " — the compiled Tailwind stylesheet. Components reference its classes directly. No runtime resolution needed.")
-          (li (code ":class") " attribute — just takes strings now, no " (code "StyleValue") " special-casing.")))
-
-      (~doc-subsection :title "Add"
-        (p "Nothing new to the spec. CSSX components are just " (code "defcomp") ". The only new thing is a convention: components whose primary purpose is styling. They live in the same component files, cache the same way, bundle the same way.")))
-
-    (~doc-section :title "Migration" :id "migration"
-      (p "The existing codebase uses " (code ":class") " with plain Tailwind strings everywhere already. The CSSX style dictionary was an alternative path that was never widely adopted. Migration is mostly deletion:")
-      (ol :class "list-decimal pl-5 space-y-2 text-stone-700"
-        (li "Remove " (code "StyleValue") " type from " (code "types.py") ", " (code "render.sx") ", " (code "eval.sx") ", bootstrappers")
-        (li "Remove " (code "cssx.sx") " from spec modules and bootstrapper")
-        (li "Remove " (code "css_registry.py") " and style dict generation pipeline")
-        (li "Remove style dict loading from " (code "boot.sx") " (" (code "initStyleDict") ", " (code "queryStyleScripts") ")")
-        (li "Remove style-related cookies and localStorage from " (code "boot.sx") " platform interface")
-        (li "Remove " (code "StyleValue") " special-casing from " (code "render-attrs") " in " (code "render.sx") " and DOM adapter")
-        (li "Simplify " (code ":class") " / " (code ":style") " attribute handling — just strings")
-        (li "Convert any existing " (code "defstyle") " uses to return plain class strings instead of " (code "StyleValue") " objects"))
-      (p :class "mt-4 text-stone-600 italic" "Net effect: hundreds of lines of spec and infrastructure removed, zero new lines added. The component system already does everything CSSX was trying to do."))
-
-    (~doc-section :title "Relationship to Other Plans" :id "relationships"
-      (ul :class "list-disc pl-5 space-y-1 text-stone-700"
-        (li (strong "Content-Addressed Components: ") "CSSX components get CIDs like any other component. A " (code "~btn") " from one site can be shared to another via IPFS. No " (code ":css-atoms") " manifest field needed — the component carries its own styling logic.")
-        (li (strong "Isomorphic Rendering: ") "Components render the same on server and client. No style injection timing issues, no FOUC from late CSS loading.")
-        (li (strong "Component Bundling: ") "deps.sx already handles transitive component deps. Style components are just more components in the bundle — no separate style bundling.")))
-
-    (~doc-section :title "Comparison with CSS Technologies" :id "comparison"
-      (p "CSSX components share DNA with several existing approaches but avoid the problems that make each one painful at scale.")
-
-      (~doc-subsection :title "styled-components / Emotion"
-        (p (a :href "https://styled-components.com" :class "text-violet-600 hover:underline" "styled-components") " pioneered the idea that styling belongs in components. But it generates CSS at runtime, injects " (code "<style>") " tags, and produces opaque hashed class names (" (code "class=\"sc-bdfBwQ fNMpVx\"") "). Open DevTools and you see gibberish. It also carries significant runtime cost — parsing CSS template literals, hashing, deduplicating — and needs a separate SSR extraction step (" (code "ServerStyleSheet") ").")
-        (p "CSSX components share the core insight (" (em "styling is a component concern") ") but without the runtime machinery. When a component applies Tailwind classes, there's zero CSS generation overhead. When it does emit " (code "<style>") " blocks, it's explicit — not hidden behind a tagged template literal. And the DOM is always readable."))
-
-      (~doc-subsection :title "CSS Modules"
-        (p (a :href "https://github.com/css-modules/css-modules" :class "text-violet-600 hover:underline" "CSS Modules") " scope class names to avoid collisions by rewriting them at build time: " (code ".button") " becomes " (code ".button_abc123") ". This solves the global namespace problem but creates the same opacity issue — hashed names in the DOM that you can't grep for or reason about.")
-        (p "CSSX components don't need scoping because component boundaries already provide isolation. A " (code "~btn") " owns its markup. There's nothing to collide with."))
-
-      (~doc-subsection :title "Tailwind CSS"
-        (p "Tailwind is " (em "complementary") ", not competitive. CSSX components are the semantic layer on top. Raw Tailwind in markup — " (code ":class \"px-4 py-2 bg-blue-600 text-white font-medium rounded hover:bg-blue-700\"") " — is powerful but verbose and duplicated across call sites.")
-        (p "A CSSX component wraps that string once: " (code "(~btn :variant \"primary\" \"Submit\")") ". The Tailwind classes are still there, readable in DevTools, but consumers don't repeat them. This is the same pattern Tailwind's own docs recommend (" (em "\"extracting components\"") ") — CSSX components are just SX's native way of doing it."))
-
-      (~doc-subsection :title "Vanilla Extract"
-        (p (a :href "https://vanilla-extract.style" :class "text-violet-600 hover:underline" "Vanilla Extract") " is zero-runtime CSS-in-JS: styles are written in TypeScript, compiled to static CSS at build time, and referenced by generated class names. It avoids the runtime cost of styled-components but still requires a build step, a bundler plugin, and TypeScript. The generated class names are again opaque.")
-        (p "CSSX components need no build step for styling — they're evaluated at render time like any other component. And since the component chooses its own strategy, it can reference pre-built classes (zero runtime) " (em "or") " generate CSS on the fly — same API either way."))
-
-      (~doc-subsection :title "Design Tokens / Style Dictionary"
-        (p "The " (a :href "https://amzn.github.io/style-dictionary/" :class "text-violet-600 hover:underline" "Style Dictionary") " pattern — a JSON/YAML file mapping token names to values, compiled to platform-specific output — is essentially what the old CSSX was. It's the industry standard for design systems.")
-        (p "The problem is that it's a parallel system: separate file format, separate build pipeline, separate caching, separate tooling. CSSX components eliminate all of that by expressing tokens as component parameters: " (code "(~theme :primary \"#7c3aed\")") " instead of " (code "{\"color\": {\"primary\": {\"value\": \"#7c3aed\"}}}") ". Same result, no parallel infrastructure.")))
-
-    (~doc-section :title "Philosophy" :id "philosophy"
-      (p "The web has spent two decades building increasingly complex CSS tooling: preprocessors, CSS-in-JS, atomic CSS, utility frameworks, design tokens, style dictionaries. Each solves a real problem but adds a new system with its own caching, bundling, and mental model.")
-      (p "CSSX components collapse all of this back to the simplest possible thing: " (strong "a function that takes data and returns markup with classes.") " That's what a component already is. There is no separate styling system because there doesn't need to be."))))
-
 ;; ---------------------------------------------------------------------------
 ;; Live Streaming — SSE & WebSocket
 ;; ---------------------------------------------------------------------------
diff --git a/sx/sxc/pages/docs.sx b/sx/sxc/pages/docs.sx
index 320e844..49e0957 100644
--- a/sx/sxc/pages/docs.sx
+++ b/sx/sxc/pages/docs.sx
@@ -46,7 +46,6 @@
                    :prims (~doc-primitives-tables :primitives (primitives-data)))
     "special-forms" (~docs-special-forms-content
                       :forms (~doc-special-forms-tables :forms (special-forms-data)))
-    "css" (~docs-css-content)
     "server-rendering" (~docs-server-rendering-content)
     :else (~docs-introduction-content)))
 
@@ -313,6 +312,7 @@
     :selected (or (find-current cssx-nav-items slug) ""))
   :content (case slug
     "patterns" (~cssx-patterns-content)
+    "delivery" (~cssx-delivery-content)
     "async" (~cssx-async-content)
     "live" (~cssx-live-content)
     "comparisons" (~cssx-comparison-content)
@@ -567,7 +567,6 @@
     "glue-decoupling" (~plan-glue-decoupling-content)
     "social-sharing" (~plan-social-sharing-content)
     "sx-ci" (~plan-sx-ci-content)
-    "cssx-components" (~plan-cssx-components-content)
     "live-streaming" (~plan-live-streaming-content)
     :else (~plans-index-content)))