diff --git a/.changeset/bright-pianos-flow.md b/.changeset/bright-pianos-flow.md
new file mode 100644
index 000000000000..e804f42b3442
--- /dev/null
+++ b/.changeset/bright-pianos-flow.md
@@ -0,0 +1,5 @@
+---
+'create-svelte': patch
+---
+
+Update app.d.ts files
diff --git a/.changeset/light-toes-rush.md b/.changeset/light-toes-rush.md
new file mode 100644
index 000000000000..c908ad67c373
--- /dev/null
+++ b/.changeset/light-toes-rush.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+Add more type documentation
diff --git a/.changeset/young-needles-attack.md b/.changeset/young-needles-attack.md
new file mode 100644
index 000000000000..2b276242b7e3
--- /dev/null
+++ b/.changeset/young-needles-attack.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+[breaking] move SubmitFunction into @sveltejs/kit
diff --git a/documentation/docs/20-core-concepts/20-load.md b/documentation/docs/20-core-concepts/20-load.md
index 58a4b1685782..625a6b94040e 100644
--- a/documentation/docs/20-core-concepts/20-load.md
+++ b/documentation/docs/20-core-concepts/20-load.md
@@ -243,7 +243,7 @@ export async function load({ fetch, params }) {
 
 ### Cookies and headers
 
-A server-only `load` function can get and set [`cookies`](/docs/types#sveltejs-kit-cookies).
+A server-only `load` function can get and set [`cookies`](/docs/types#public-types-cookies).
 
 ```js
 /// file: src/routes/+layout.server.js
@@ -544,7 +544,7 @@ To summarize, a `load` function will re-run in the following situations:
 - It references a property of `params` whose value has changed
 - It references a property of `url` (such as `url.pathname` or `url.search`) whose value has changed
 - It calls `await parent()` and a parent `load` function re-ran
-- It declared a dependency on a specific URL via [`fetch`](#making-fetch-requests) or [`depends`](/docs/types#sveltejs-kit-loadevent), and that URL was marked invalid with [`invalidate(url)`](/docs/modules#$app-navigation-invalidate)
+- It declared a dependency on a specific URL via [`fetch`](#making-fetch-requests) or [`depends`](/docs/types#public-types-loadevent), and that URL was marked invalid with [`invalidate(url)`](/docs/modules#$app-navigation-invalidate)
 - All active `load` functions were forcibly re-run with [`invalidateAll()`](/docs/modules#$app-navigation-invalidateall)
 
 Note that re-running a `load` function will update the `data` prop inside the corresponding `+layout.svelte` or `+page.svelte`; it does _not_ cause the component to be recreated. As a result, internal state is preserved. If this isn't what you want, you can reset whatever you need to reset inside an [`afterNavigate`](/docs/modules#$app-navigation-afternavigate) callback, and/or wrap your component in a [`{#key ...}`](https://svelte.dev/docs#template-syntax-key) block.
diff --git a/documentation/docs/30-advanced/70-packaging.md b/documentation/docs/30-advanced/70-packaging.md
index 2b61424f5081..b4507e3edcd8 100644
--- a/documentation/docs/30-advanced/70-packaging.md
+++ b/documentation/docs/30-advanced/70-packaging.md
@@ -10,13 +10,13 @@ When you're creating an app, the contents of `src/routes` is the public-facing s
 
 A component library has the exact same structure as a SvelteKit app, except that `src/lib` is the public-facing bit. `src/routes` might be a documentation or demo site that accompanies the library, or it might just be a sandbox you use during development.
 
-Running the `svelte-package` command from `@sveltejs/package` will take the contents of `src/lib` and generate a `package` directory (which can be [configured](/docs/configuration#package)) containing the following:
+Running the `svelte-package` command from `@sveltejs/package` will take the contents of `src/lib` and generate a `package` directory (which can be [configured](/docs/configuration)) containing the following:
 
-- All the files in `src/lib`, unless you [configure](/docs/configuration#package) custom `include`/`exclude` options. Svelte components will be preprocessed, TypeScript files will be transpiled to JavaScript.
-- Type definitions (`d.ts` files) which are generated for Svelte, JavaScript and TypeScript files. You need to install `typescript >= 4.0.0` for this. Type definitions are placed next to their implementation, hand-written `d.ts` files are copied over as is. You can [disable generation](/docs/configuration#package), but we strongly recommend against it.
+- All the files in `src/lib`, unless you [configure](/docs/configuration) custom `include`/`exclude` options. Svelte components will be preprocessed, TypeScript files will be transpiled to JavaScript.
+- Type definitions (`d.ts` files) which are generated for Svelte, JavaScript and TypeScript files. You need to install `typescript >= 4.0.0` for this. Type definitions are placed next to their implementation, hand-written `d.ts` files are copied over as is. You can [disable generation](/docs/configuration), but we strongly recommend against it.
 - A `package.json` copied from the project root with all fields except `"scripts"`, `"publishConfig.directory"` and `"publishConfig.linkDirectory"`. The `"dependencies"` field is included, which means you should add packages that you only need for your documentation or demo site to `"devDependencies"`. A `"type": "module"` and an `"exports"` field will be added if it's not defined in the original file.
 
-The `"exports"` field contains the package's entry points. By default, all files in `src/lib` will be treated as an entry point unless they start with (or live in a directory that starts with) an underscore, but you can [configure](/docs/configuration#package) this behaviour. If you have a `src/lib/index.js` or `src/lib/index.svelte` file, it will be treated as the package root.
+The `"exports"` field contains the package's entry points. By default, all files in `src/lib` will be treated as an entry point unless they start with (or live in a directory that starts with) an underscore, but you can [configure](/docs/configuration) this behaviour. If you have a `src/lib/index.js` or `src/lib/index.svelte` file, it will be treated as the package root.
 
 For example, if you had a `src/lib/Foo.svelte` component and a `src/lib/index.js` module that re-exported it, a consumer of your library could do either of the following:
 
@@ -54,7 +54,7 @@ To publish the generated package:
 npm publish ./package
 ```
 
-The `./package` above is referring to the directory name generated, change accordingly if you configure a custom [`package.dir`](/docs/configuration#package).
+The `./package` above is referring to the directory name generated, change accordingly if you configure a custom [`package.dir`](/docs/configuration).
 
 ### Caveats
 
diff --git a/documentation/docs/50-api-reference/10-configuration.md b/documentation/docs/50-api-reference/10-configuration.md
deleted file mode 100644
index ea2f80eefe11..000000000000
--- a/documentation/docs/50-api-reference/10-configuration.md
+++ /dev/null
@@ -1,307 +0,0 @@
----
-title: Configuration
----
-
-Your project's configuration lives in a `svelte.config.js` file. All values are optional. The complete list of options, with defaults, is shown here:
-
-```js
-/// file: svelte.config.js
-/** @type {import('@sveltejs/kit').Config} */
-const config = {
-	// options passed to svelte.compile (https://svelte.dev/docs#compile-time-svelte-compile)
-	compilerOptions: {},
-
-	// an array of file extensions that should be treated as Svelte components
-	extensions: ['.svelte'],
-
-	kit: {
-		adapter: undefined,
-		alias: {},
-		appDir: '_app',
-		csp: {
-			mode: 'auto',
-			directives: {
-				'default-src': undefined
-				// ...
-			}
-		},
-		csrf: {
-			checkOrigin: true
-		},
-		env: {
-			dir: process.cwd(),
-			publicPrefix: 'PUBLIC_'
-		},
-		files: {
-			assets: 'static',
-			hooks: {
-				client: 'src/hooks.client',
-				server: 'src/hooks.server'
-			},
-			lib: 'src/lib',
-			params: 'src/params',
-			routes: 'src/routes',
-			serviceWorker: 'src/service-worker',
-			appTemplate: 'src/app.html',
-			errorTemplate: 'src/error.html'
-		},
-		inlineStyleThreshold: 0,
-		moduleExtensions: ['.js', '.ts'],
-		outDir: '.svelte-kit',
-		paths: {
-			assets: '',
-			base: ''
-		},
-		prerender: {
-			concurrency: 1,
-			crawl: true,
-			entries: ['*'],
-			handleHttpError: 'fail',
-			handleMissingId: 'fail',
-			origin: 'http://sveltekit-prerender'
-		},
-		serviceWorker: {
-			register: true,
-			files: (filepath) => !/\.DS_Store/.test(filepath)
-		},
-		version: {
-			name: Date.now().toString(),
-			pollInterval: 0
-		}
-	},
-
-	// options passed to @sveltejs/package
-	package: {
-		source: 'value of kit.files.lib, if available, else src/lib',
-		dir: 'package',
-		emitTypes: true,
-		// excludes all .d.ts and files starting with _ as the name
-		exports: (filepath) => !/^_|\/_|\.d\.ts$/.test(filepath),
-		files: () => true
-	},
-
-	// options passed to svelte.preprocess (https://svelte.dev/docs#compile-time-svelte-preprocess)
-	preprocess: null
-};
-
-export default config;
-```
-
-### adapter
-
-Run when executing `vite build` and determines how the output is converted for different platforms. See [Adapters](/docs/adapters).
-
-### alias
-
-An object containing zero or more aliases used to replace values in `import` statements. These aliases are automatically passed to Vite and TypeScript.
-
-```js
-/// file: svelte.config.js
-/** @type {import('@sveltejs/kit').Config} */
-const config = {
-	kit: {
-		alias: {
-			// this will match a file
-			'my-file': 'path/to/my-file.js',
-
-			// this will match a directory and its contents
-			// (`my-directory/x` resolves to `path/to/my-directory/x`)
-			'my-directory': 'path/to/my-directory',
-
-			// an alias ending /* will only match
-			// the contents of a directory, not the directory itself
-			'my-directory/*': 'path/to/my-directory/*'
-		}
-	}
-};
-```
-
-> The built-in `$lib` alias is controlled by `config.kit.files.lib` as it is used for packaging.
-
-> You will need to run `npm run dev` to have SvelteKit automatically generate the required alias configuration in `jsconfig.json` or `tsconfig.json`.
-
-### appDir
-
-The directory relative to `paths.assets` where the built JS and CSS (and imported assets) are served from. (The filenames therein contain content-based hashes, meaning they can be cached indefinitely). Must not start or end with `/`.
-
-### csp
-
-An object containing zero or more of the following values:
-
-- `mode` — 'hash', 'nonce' or 'auto'
-- `directives` — an object of `[directive]: value[]` pairs
-- `reportOnly` — an object of `[directive]: value[]` pairs for CSP report-only mode
-
-[Content Security Policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy) configuration. CSP helps to protect your users against cross-site scripting (XSS) attacks, by limiting the places resources can be loaded from. For example, a configuration like this...
-
-```js
-/// file: svelte.config.js
-/** @type {import('@sveltejs/kit').Config} */
-const config = {
-	kit: {
-		csp: {
-			directives: {
-				'script-src': ['self']
-			},
-			reportOnly: {
-				'script-src': ['self']
-			}
-		}
-	}
-};
-
-export default config;
-```
-
-...would prevent scripts loading from external sites. SvelteKit will augment the specified directives with nonces or hashes (depending on `mode`) for any inline styles and scripts it generates.
-
-To add a nonce for scripts and links manually included in `app.html`, you may use the placeholder `%sveltekit.nonce%` (for example `<script nonce="%sveltekit.nonce%">`).
-
-When pages are prerendered, the CSP header is added via a `<meta http-equiv>` tag (note that in this case, `frame-ancestors`, `report-uri` and `sandbox` directives will be ignored).
-
-> When `mode` is `'auto'`, SvelteKit will use nonces for dynamically rendered pages and hashes for prerendered pages. Using nonces with prerendered pages is insecure and therefore forbidden.
-
-> Note that most [Svelte transitions](https://svelte.dev/tutorial/transition) work by creating an inline `<style>` element. If you use these in your app, you must either leave the `style-src` directive unspecified or add `unsafe-inline`.
-
-### csrf
-
-Protection against [cross-site request forgery](https://owasp.org/www-community/attacks/csrf) attacks:
-
-- `checkOrigin` — if `true`, SvelteKit will check the incoming `origin` header for `POST` form submissions and verify that it matches the server's origin
-
-To allow people to make `POST` form submissions to your app from other origins, you will need to disable this option. Be careful!
-
-### env
-
-Environment variable configuration:
-
-- `dir` — the directory to search for `.env` files.
-- `publicPrefix` — a prefix that signals that an environment variable is safe to expose to client-side code. See [`$env/static/public`](/docs/modules#$env-static-public) and [`$env/dynamic/public`](/docs/modules#$env-dynamic-public). Note that Vite's [`envPrefix`](https://vitejs.dev/config/shared-options.html#envprefix) must be set separately if you are using Vite's environment variable handling - though use of that feature should generally be unnecessary.
-
-### files
-
-An object containing zero or more of the following `string` values:
-
-- `assets` — a place to put static files that should have stable URLs and undergo no processing, such as `favicon.ico` or `manifest.json`
-- `hooks` — the location of your client and server hooks (see [Hooks](/docs/hooks))
-- `lib` — your app's internal library, accessible throughout the codebase as `$lib`
-- `params` — a directory containing [parameter matchers](/docs/advanced-routing#matching)
-- `routes` — the files that define the structure of your app (see [Routing](/docs/routing))
-- `serviceWorker` — the location of your service worker's entry point (see [Service workers](/docs/service-workers))
-- `template` — the location of the template for HTML responses
-
-### inlineStyleThreshold
-
-Inline CSS inside a `<style>` block at the head of the HTML. This option is a number that specifies the maximum length of a CSS file to be inlined. All CSS files needed for the page and smaller than this value are merged and inlined in a `<style>` block.
-
-> This results in fewer initial requests and can improve your [First Contentful Paint](https://web.dev/first-contentful-paint) score. However, it generates larger HTML output and reduces the effectiveness of browser caches. Use it advisedly.
-
-### moduleExtensions
-
-An array of file extensions that SvelteKit will treat as modules. Files with extensions that match neither `config.extensions` nor `config.kit.moduleExtensions` will be ignored by the router.
-
-### outDir
-
-The directory that SvelteKit writes files to during `dev` and `build`. You should exclude this directory from version control.
-
-### package
-
-Options related to [creating a package](/docs/packaging).
-
-- `source` - library directory
-- `dir` - output directory
-- `emitTypes` - by default, `svelte-package` will automatically generate types for your package in the form of `.d.ts` files. While generating types is configurable, we believe it is best for the ecosystem quality to generate types, always. Please make sure you have a good reason when setting it to `false` (for example when you want to provide handwritten type definitions instead)
-- `exports` - a function with the type of `(filepath: string) => boolean`. When `true`, the filepath will be included in the `exports` field of the `package.json`. Any existing values in the `package.json` source will be merged with values from the original `exports` field taking precedence
-- `files` - a function with the type of `(filepath: string) => boolean`. When `true`, the file will be processed and copied over to the final output folder, specified in `dir`
-
-For advanced `filepath` matching, you can use `exports` and `files` options in conjunction with a globbing library:
-
-```js
-// @filename: ambient.d.ts
-declare module 'micromatch';
-
-/// file: svelte.config.js
-// @filename: index.js
-// ---cut---
-import mm from 'micromatch';
-
-/** @type {import('@sveltejs/kit').Config} */
-const config = {
-	package: {
-		exports: (filepath) => {
-			if (filepath.endsWith('.d.ts')) return false;
-			return mm.isMatch(filepath, ['!**/_*', '!**/internal/**']);
-		},
-		files: mm.matcher('!**/build.*')
-	}
-};
-
-export default config;
-```
-
-### paths
-
-An object containing zero or more of the following `string` values:
-
-- `assets` — an absolute path that your app's files are served from. This is useful if your files are served from a storage bucket of some kind
-- `base` — a root-relative path that must start, but not end with `/` (e.g. `/base-path`), unless it is the empty string. This specifies where your app is served from and allows the app to live on a non-root path. Note that you need to prepend all your root-relative links with the base value or they will point to the root of your domain, not your `base` (this is how the browser works). You can use [`base` from `$app/paths`](/docs/modules#$app-paths-base) for that: `<a href="{base}/your-page">Link</a>`. If you find yourself writing this often, it may make sense to extract this into a reusable component.
-
-### prerender
-
-See [Prerendering](/docs/page-options#prerender). An object containing zero or more of the following:
-
-- `concurrency` — how many pages can be prerendered simultaneously. JS is single-threaded, but in cases where prerendering performance is network-bound (for example loading content from a remote CMS) this can speed things up by processing other tasks while waiting on the network response
-- `crawl` — determines whether SvelteKit should find pages to prerender by following links from the seed page(s)
-- `entries` — an array of pages to prerender, or start crawling from (if `crawl: true`). The `*` string includes all non-dynamic routes (i.e. pages with no `[parameters]`, because SvelteKit doesn't know what value the parameters should have)
-- `handleHttpError`
-
-  - `'fail'` — (default) fails the build when a routing error is encountered when following a link
-  - `'ignore'` - silently ignore the failure and continue
-  - `'warn'` — continue, but print a warning
-  - `(details) => void` — a custom error handler that takes a `details` object with `status`, `path`, `referrer`, `referenceType` and `message` properties. If you `throw` from this function, the build will fail
-
-      ```js
-    /** @type {import('@sveltejs/kit').Config} */
-    const config = {
-    	kit: {
-    		prerender: {
-    			handleHttpError: ({ path, referrer, message }) => {
-    				// ignore deliberate link to shiny 404 page
-    				if (path === '/not-found' && referrer === '/blog/how-we-built-our-404-page') {
-    					return;
-    				}
-
-    				// otherwise fail the build
-    				throw new Error(message);
-    			}
-    		}
-    	}
-    };
-    ```
-
-- `handleMissingId`
-
-  - `'fail'` — (default) fails the build when a prerendered page links to another prerendered page with a `#` fragment that doesn't correspond to an `id`
-  - `'ignore'` - silently ignore the failure and continue
-  - `'warn'` — continue, but print a warning
-  - `(details) => void` — a custom error handler that takes a `details` object with `path`, `id`, `referrers` and `message` properties. If you `throw` from this function, the build will fail
-
-- `origin` — the value of `url.origin` during prerendering; useful if it is included in rendered content
-
-### serviceWorker
-
-An object containing zero or more of the following values:
-
-- `register` - if set to `false`, will disable automatic service worker registration
-- `files` - a function with the type of `(filepath: string) => boolean`. When `true`, the given file will be available in `$service-worker.files`, otherwise it will be excluded.
-
-### version
-
-An object containing zero or more of the following values:
-
-- `name` - current app version string
-- `pollInterval` - interval in milliseconds to poll for version changes
-
-Client-side navigation can be buggy if you deploy a new version of your app while people are using it. If the code for the new page is already loaded, it may have stale content; if it isn't, the app's route manifest may point to a JavaScript file that no longer exists. SvelteKit solves this problem by falling back to traditional full-page navigation if it detects that a new version has been deployed, using the `name` specified here (which defaults to a timestamp of the build).
-
-If you set `pollInterval` to a non-zero value, SvelteKit will poll for new versions in the background and set the value of the [`updated`](/docs/modules#$app-stores-updated) store to `true` when it detects one.
diff --git a/documentation/docs/50-api-reference/meta.json b/documentation/docs/50-api-reference/meta.json
deleted file mode 100644
index ddb1e5887136..000000000000
--- a/documentation/docs/50-api-reference/meta.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-	"title": "API reference"
-}
diff --git a/documentation/docs/50-reference/10-configuration.md b/documentation/docs/50-reference/10-configuration.md
new file mode 100644
index 000000000000..e11b7b213ca8
--- /dev/null
+++ b/documentation/docs/50-reference/10-configuration.md
@@ -0,0 +1,25 @@
+---
+title: Configuration
+---
+
+Your project's configuration lives in a `svelte.config.js` file at the root of your project. As well as SvelteKit, this config object is used by other tooling that integrates with Svelte such as editor extensions.
+
+```js
+/// file: svelte.config.js
+import adapter from '@sveltejs/adapter-auto';
+
+/** @type {import('@sveltejs/kit').Config} */
+const config = {
+	kit: {
+		adapter: adapter()
+	}
+};
+
+export default config;
+```
+
+> TYPES: @sveltejs/kit#Config
+
+The `kit` property configures SvelteKit, and can have the following properties:
+
+> EXPANDED_TYPES: @sveltejs/kit#KitConfig
\ No newline at end of file
diff --git a/documentation/docs/50-api-reference/20-cli.md b/documentation/docs/50-reference/20-cli.md
similarity index 100%
rename from documentation/docs/50-api-reference/20-cli.md
rename to documentation/docs/50-reference/20-cli.md
diff --git a/documentation/docs/50-api-reference/30-modules.md b/documentation/docs/50-reference/30-modules.md
similarity index 88%
rename from documentation/docs/50-api-reference/30-modules.md
rename to documentation/docs/50-reference/30-modules.md
index ec92a664e2ba..7140726eb783 100644
--- a/documentation/docs/50-api-reference/30-modules.md
+++ b/documentation/docs/50-reference/30-modules.md
@@ -4,4 +4,4 @@ title: Modules
 
 SvelteKit makes a number of modules available to your application.
 
-**EXPORTS**
+> MODULES
diff --git a/documentation/docs/50-api-reference/40-types.md b/documentation/docs/50-reference/40-types.md
similarity index 93%
rename from documentation/docs/50-api-reference/40-types.md
rename to documentation/docs/50-reference/40-types.md
index b885fe878fe6..8e82becfb0c0 100644
--- a/documentation/docs/50-api-reference/40-types.md
+++ b/documentation/docs/50-reference/40-types.md
@@ -2,7 +2,17 @@
 title: Types
 ---
 
-**TYPES**
+### Public types
+
+The following types can be imported from `@sveltejs/kit`:
+
+> TYPES: @sveltejs/kit
+
+### Private types
+
+The following are referenced by the public types documented above, but cannot be imported directly:
+
+> TYPES: Private types
 
 ### Generated types
 
@@ -141,3 +151,7 @@ Others are required for SvelteKit to work properly, and should also be left unto
 	}
 }
 ```
+
+### App
+
+> TYPES: App
diff --git a/documentation/docs/50-reference/meta.json b/documentation/docs/50-reference/meta.json
new file mode 100644
index 000000000000..aa111a0d6dd3
--- /dev/null
+++ b/documentation/docs/50-reference/meta.json
@@ -0,0 +1,3 @@
+{
+	"title": "Reference"
+}
diff --git a/packages/adapter-node/README.md b/packages/adapter-node/README.md
index e578831d1f09..ed69a08e5e6a 100644
--- a/packages/adapter-node/README.md
+++ b/packages/adapter-node/README.md
@@ -49,7 +49,7 @@ If `adapter-node` can't correctly determine the URL of your deployment, you may
 
 ### `ADDRESS_HEADER` and `XFF_DEPTH`
 
-The [RequestEvent](https://kit.svelte.dev/docs/types#sveltejs-kit-requestevent) object passed to hooks and endpoints includes an `event.clientAddress` property representing the client's IP address. By default this is the connecting `remoteAddress`. If your server is behind one or more proxies (such as a load balancer), this value will contain the innermost proxy's IP address rather than the client's, so we need to specify an `ADDRESS_HEADER` to read the address from:
+The [RequestEvent](https://kit.svelte.dev/docs/types#public-types-requestevent) object passed to hooks and endpoints includes an `event.clientAddress` property representing the client's IP address. By default this is the connecting `remoteAddress`. If your server is behind one or more proxies (such as a load balancer), this value will contain the innermost proxy's IP address rather than the client's, so we need to specify an `ADDRESS_HEADER` to read the address from:
 
 ```
 ADDRESS_HEADER=True-Client-IP node build
diff --git a/packages/create-svelte/templates/default/src/app.d.ts b/packages/create-svelte/templates/default/src/app.d.ts
index 19374ac979e0..26a9569bc40a 100644
--- a/packages/create-svelte/templates/default/src/app.d.ts
+++ b/packages/create-svelte/templates/default/src/app.d.ts
@@ -1,4 +1,9 @@
 // See https://kit.svelte.dev/docs/types#app
 // for information about these interfaces
 // and what to do when importing types
-declare namespace App {}
+declare namespace App {
+	// interface Error {}
+	// interface Locals {}
+	// interface PageData {}
+	// interface Platform {}
+}
diff --git a/packages/create-svelte/templates/skeleton/src/app.d.ts b/packages/create-svelte/templates/skeleton/src/app.d.ts
index 8f4d63895a2d..26a9569bc40a 100644
--- a/packages/create-svelte/templates/skeleton/src/app.d.ts
+++ b/packages/create-svelte/templates/skeleton/src/app.d.ts
@@ -2,8 +2,8 @@
 // for information about these interfaces
 // and what to do when importing types
 declare namespace App {
+	// interface Error {}
 	// interface Locals {}
 	// interface PageData {}
-	// interface Error {}
 	// interface Platform {}
 }
diff --git a/packages/create-svelte/templates/skeletonlib/src/app.d.ts b/packages/create-svelte/templates/skeletonlib/src/app.d.ts
index 20346fb23f20..b9091cd1c51d 100644
--- a/packages/create-svelte/templates/skeletonlib/src/app.d.ts
+++ b/packages/create-svelte/templates/skeletonlib/src/app.d.ts
@@ -4,8 +4,8 @@
 // for information about these interfaces
 // and what to do when importing types
 declare namespace App {
+	// interface Error {}
 	// interface Locals {}
 	// interface PageData {}
-	// interface Error {}
 	// interface Platform {}
 }
diff --git a/packages/kit/package.json b/packages/kit/package.json
index f3c0b1885fa3..96b86f61da89 100644
--- a/packages/kit/package.json
+++ b/packages/kit/package.json
@@ -53,11 +53,10 @@
 		"!src/core/**/test",
 		"types",
 		"svelte-kit.js",
-		"postinstall.js",
-		"scripts/special-types"
+		"postinstall.js"
 	],
 	"scripts": {
-		"build": "pnpm types",
+		"build": "echo \"TODO remove build script from packages/kit\"",
 		"lint": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
 		"check": "tsc",
 		"check:all": "tsc && pnpm -r --filter=\"./**\" check",
@@ -66,7 +65,6 @@
 		"test": "pnpm test:unit && pnpm test:integration",
 		"test:integration": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test",
 		"test:unit": "uvu src \"(spec\\.js|test[\\\\/]index\\.js)\"",
-		"types": "node scripts/extract-types.js",
 		"postinstall": "node postinstall.js"
 	},
 	"exports": {
diff --git a/packages/kit/scripts/extract-types.js b/packages/kit/scripts/extract-types.js
deleted file mode 100644
index 9554b00cb3a2..000000000000
--- a/packages/kit/scripts/extract-types.js
+++ /dev/null
@@ -1,166 +0,0 @@
-import fs from 'fs';
-import ts from 'typescript';
-import prettier from 'prettier';
-import { mkdirp } from '../src/utils/filesystem.js';
-import { fileURLToPath } from 'url';
-
-/** @typedef {{ name: string, comment: string, snippet: string }} Extracted */
-
-/** @type {Array<{ name: string, comment: string, exports: Extracted[], types: Extracted[], exempt?: boolean }>} */
-const modules = [];
-
-/**
- * @param {string} code
- * @param {ts.NodeArray<ts.Statement>} statements
- */
-function get_types(code, statements) {
-	/** @type {Extracted[]} */
-	const exports = [];
-
-	/** @type {Extracted[]} */
-	const types = [];
-
-	if (statements) {
-		for (const statement of statements) {
-			const modifiers = ts.canHaveModifiers(statement) ? ts.getModifiers(statement) : undefined;
-
-			const export_modifier = modifiers?.find((modifier) => modifier.kind === 93);
-			if (!export_modifier) continue;
-
-			if (
-				ts.isClassDeclaration(statement) ||
-				ts.isInterfaceDeclaration(statement) ||
-				ts.isTypeAliasDeclaration(statement) ||
-				ts.isModuleDeclaration(statement) ||
-				ts.isVariableStatement(statement) ||
-				ts.isFunctionDeclaration(statement)
-			) {
-				const name_node = ts.isVariableStatement(statement)
-					? statement.declarationList.declarations[0]
-					: statement;
-
-				// @ts-ignore no idea why it's complaining here
-				const name = name_node.name?.escapedText;
-
-				let start = statement.pos;
-				let comment = '';
-
-				// @ts-ignore i think typescript is bad at typescript
-				if (statement.jsDoc) {
-					// @ts-ignore
-					comment = statement.jsDoc[0].comment;
-					// @ts-ignore
-					start = statement.jsDoc[0].end;
-				}
-
-				const i = code.indexOf('export', start);
-				start = i + 6;
-
-				const snippet = prettier
-					.format(code.slice(start, statement.end), {
-						parser: 'typescript',
-						printWidth: 80,
-						useTabs: true,
-						singleQuote: true,
-						trailingComma: 'none'
-					})
-					.trim();
-
-				const collection =
-					ts.isVariableStatement(statement) || ts.isFunctionDeclaration(statement)
-						? exports
-						: types;
-
-				collection.push({ name, comment, snippet });
-			}
-		}
-
-		types.sort((a, b) => (a.name < b.name ? -1 : 1));
-		exports.sort((a, b) => (a.name < b.name ? -1 : 1));
-	}
-
-	return { types, exports };
-}
-
-/**
- * Type declarations include fully qualified URLs so that they become links when
- * you hover over names in an editor with TypeScript enabled. We need to remove
- * the origin so that they become root-relative, so that they work in preview
- * deployments and when developing locally
- * @param {string} str
- */
-function strip_origin(str) {
-	return str.replace(/https:\/\/kit\.svelte\.dev/g, '');
-}
-
-{
-	const code = fs.readFileSync('types/index.d.ts', 'utf-8');
-	const node = ts.createSourceFile('index.d.ts', code, ts.ScriptTarget.Latest);
-
-	modules.push({
-		name: '@sveltejs/kit',
-		comment: 'The following can be imported from `@sveltejs/kit`:',
-		...get_types(code, node.statements)
-	});
-}
-
-{
-	const code = fs.readFileSync('types/private.d.ts', 'utf-8');
-	const node = ts.createSourceFile('private.d.ts', code, ts.ScriptTarget.Latest);
-
-	modules.push({
-		name: 'Additional types',
-		comment:
-			'The following are referenced by the public types documented above, but cannot be imported directly:',
-		...get_types(code, node.statements)
-	});
-}
-
-const dir = fileURLToPath(new URL('./special-types', import.meta.url).href);
-for (const file of fs.readdirSync(dir)) {
-	if (!file.endsWith('.md')) continue;
-
-	const comment = strip_origin(fs.readFileSync(`${dir}/${file}`, 'utf-8'));
-
-	modules.push({
-		name: file.replace(/\+/g, '/').slice(0, -3),
-		comment,
-		exports: [],
-		types: [],
-		exempt: true
-	});
-}
-
-{
-	const code = fs.readFileSync('types/ambient.d.ts', 'utf-8');
-	const node = ts.createSourceFile('ambient.d.ts', code, ts.ScriptTarget.Latest);
-
-	for (const statement of node.statements) {
-		if (ts.isModuleDeclaration(statement)) {
-			// @ts-ignore
-			const name = statement.name.text || statement.name.escapedText;
-
-			// @ts-ignore
-			const comment = strip_origin(statement.jsDoc?.[0].comment ?? '');
-
-			modules.push({
-				name,
-				comment,
-				// @ts-ignore
-				...get_types(code, statement.body?.statements)
-			});
-		}
-	}
-}
-
-modules.sort((a, b) => (a.name < b.name ? -1 : 1));
-
-mkdirp('docs');
-fs.writeFileSync(
-	'docs/types.js',
-	`
-/* This file is generated by running \`node scripts/extract-types.js\`
-   in the packages/kit directory — do not edit it */
-export const modules = ${JSON.stringify(modules, null, '  ')};
-`.trim()
-);
diff --git a/packages/kit/src/core/sync/write_ambient.js b/packages/kit/src/core/sync/write_ambient.js
index 2cd0cd27a3cc..025a1e035d45 100644
--- a/packages/kit/src/core/sync/write_ambient.js
+++ b/packages/kit/src/core/sync/write_ambient.js
@@ -6,7 +6,11 @@ import { create_dynamic_types, create_static_types } from '../env.js';
 import { write_if_changed } from './utils.js';
 import { fileURLToPath } from 'url';
 
-const descriptions_dir = fileURLToPath(new URL('../../../scripts/special-types', import.meta.url));
+// TODO these types should be described in a neutral place, rather than
+// inside either `packages/kit` or `kit.svelte.dev`
+const descriptions_dir = fileURLToPath(
+	new URL('../../../../../sites/kit.svelte.dev/scripts/types/special-types', import.meta.url)
+);
 
 /** @param {string} filename */
 function read_description(filename) {
diff --git a/packages/kit/tsconfig.json b/packages/kit/tsconfig.json
index 1ad6e60fcfef..b7eca62d1a3d 100644
--- a/packages/kit/tsconfig.json
+++ b/packages/kit/tsconfig.json
@@ -16,6 +16,11 @@
 		"noUnusedLocals": true,
 		"noUnusedParameters": true
 	},
-	"include": ["scripts/**/*", "src/**/*", "types/**/*"],
+	"include": [
+		"scripts/**/*",
+		"src/**/*",
+		"types/**/*",
+		"../../sites/kit.svelte.dev/scripts/extract-types.js"
+	],
 	"exclude": ["./**/write_types/test/**"]
 }
diff --git a/packages/kit/types/ambient.d.ts b/packages/kit/types/ambient.d.ts
index 999adb62b2ab..227cefcd1f04 100644
--- a/packages/kit/types/ambient.d.ts
+++ b/packages/kit/types/ambient.d.ts
@@ -5,10 +5,9 @@
  * /// <reference types="@sveltejs/kit" />
  *
  * declare namespace App {
+ * 	interface Error {}
  * 	interface Locals {}
- *
  * 	interface PageData {}
- *
  * 	interface Platform {}
  * }
  * ```
@@ -65,11 +64,6 @@ declare namespace App {
 	export interface Platform {}
 }
 
-/**
- * ```ts
- * import { browser, building, dev, version } from '$app/environment';
- * ```
- */
 declare module '$app/environment' {
 	/**
 	 * `true` if the app is running in the browser.
@@ -92,17 +86,14 @@ declare module '$app/environment' {
 	export const version: string;
 }
 
-/**
- * ```ts
- * import { enhance, applyAction } from '$app/forms';
- * ```
- */
 declare module '$app/forms' {
 	import type { ActionResult } from '@sveltejs/kit';
 
 	type MaybePromise<T> = T | Promise<T>;
 
-	export type SubmitFunction<
+	// this is duplicated in @sveltejs/kit because create-svelte tests fail
+	// if we use the imported version. TODO investigate
+	type SubmitFunction<
 		Success extends Record<string, unknown> | undefined = Record<string, any>,
 		Invalid extends Record<string, unknown> | undefined = Record<string, any>
 	> = (input: {
@@ -166,9 +157,10 @@ declare module '$app/forms' {
 	/**
 	 * Use this function to deserialize the response from a form submission.
 	 * Usage:
-	 * ```
-	 * const res = await fetch('/form?/action', { method: 'POST', body: formData });
-	 * const result = deserialize(await res.text());
+	 *
+	 * ```js
+	 * const response = await fetch('/form?/action', { method: 'POST', body: formData });
+	 * const result = deserialize(await response.text());
 	 * ```
 	 */
 	export function deserialize<
@@ -177,20 +169,6 @@ declare module '$app/forms' {
 	>(serialized: string): ActionResult<Success, Invalid>;
 }
 
-/**
- * ```ts
- * import {
- * 	afterNavigate,
- * 	beforeNavigate,
- * 	disableScrollHandling,
- * 	goto,
- * 	invalidate,
- * 	invalidateAll,
- * 	preloadCode,
- * 	preloadData
- * } from '$app/navigation';
- * ```
- */
 declare module '$app/navigation' {
 	import { BeforeNavigate, AfterNavigate } from '@sveltejs/kit';
 
@@ -291,11 +269,6 @@ declare module '$app/navigation' {
 	export function afterNavigate(callback: (navigation: AfterNavigate) => void): void;
 }
 
-/**
- * ```ts
- * import { base, assets } from '$app/paths';
- * ```
- */
 declare module '$app/paths' {
 	/**
 	 * A string that matches [`config.kit.paths.base`](https://kit.svelte.dev/docs/configuration#paths).
@@ -312,10 +285,6 @@ declare module '$app/paths' {
 }
 
 /**
- * ```ts
- * import { getStores, navigating, page, updated } from '$app/stores';
- * ```
- *
  * Stores on the server are _contextual_ — they are added to the [context](https://svelte.dev/tutorial/context-api) of your root component. This means that `page` is unique to each request, rather than shared between multiple requests handled by the same server simultaneously.
  *
  * Because of that, you must subscribe to the stores during component initialization (which happens automatically if you reference the store value, e.g. as `$page`, in a component) before you can use them.
@@ -353,10 +322,6 @@ declare module '$app/stores' {
 }
 
 /**
- * ```ts
- * import { build, files, prerendered, version } from '$service-worker';
- * ```
- *
  * This module is only available to [service workers](https://kit.svelte.dev/docs/service-workers).
  */
 declare module '$service-worker' {
@@ -387,10 +352,9 @@ declare module '@sveltejs/kit/hooks' {
 	 * A helper function for sequencing multiple `handle` calls in a middleware-like manner.
 	 *
 	 * ```js
-	 * /// file: src/hooks.js
+	 * /// file: src/hooks.server.js
 	 * import { sequence } from '@sveltejs/kit/hooks';
 	 *
-	 * /** @type {import('@sveltejs/kit').Handle} *\/
 	 * async function first({ event, resolve }) {
 	 * 	console.log('first pre-processing');
 	 * 	const result = await resolve(event, {
@@ -404,7 +368,6 @@ declare module '@sveltejs/kit/hooks' {
 	 * 	return result;
 	 * }
 	 *
-	 * /** @type {import('@sveltejs/kit').Handle} *\/
 	 * async function second({ event, resolve }) {
 	 * 	console.log('second pre-processing');
 	 * 	const result = await resolve(event, {
diff --git a/packages/kit/types/index.d.ts b/packages/kit/types/index.d.ts
index 478208e4695f..4e57de6e5ccf 100644
--- a/packages/kit/types/index.d.ts
+++ b/packages/kit/types/index.d.ts
@@ -14,15 +14,24 @@ import {
 	PrerenderMissingIdHandlerValue,
 	RequestOptions,
 	RouteDefinition,
-	TrailingSlash,
 	UniqueInterface
 } from './private.js';
 import { SSRNodeLoader, SSRRoute, ValidatedConfig } from './internal.js';
 
 export { PrerenderOption } from './private.js';
 
+/**
+ * [Adapters](https://kit.svelte.dev/docs/adapters) are responsible for taking the production build and turning it into something that can be deployed to a platform of your choosing.
+ */
 export interface Adapter {
+	/**
+	 * The name of the adapter, using for logging. Will typically correspond to the package name.
+	 */
 	name: string;
+	/**
+	 * This function is called after SvelteKit has built your app.
+	 * @param builder An object provided by SvelteKit that contains methods for adapting the app
+	 */
 	adapt(builder: Builder): MaybePromise<void>;
 }
 
@@ -58,35 +67,58 @@ type UnpackValidationError<T> = T extends ValidationError<infer X>
 	? undefined // needs to be undefined, because void will corrupt union type
 	: T;
 
+/**
+ * This object is passed to the `adapt` function of adapters.
+ * It contains various methods and properties that are useful for adapting the app.
+ */
 export interface Builder {
+	/** Print messages to the console. `log.info` and `log.minor` are silent unless Vite's `logLevel` is `info`. */
 	log: Logger;
+	/** Remove `dir` and all its contents. */
 	rimraf(dir: string): void;
+	/** Create `dir` and any required parent directories. */
 	mkdirp(dir: string): void;
 
+	/** The fully resolved `svelte.config.js`. */
 	config: ValidatedConfig;
+	/** Information about prerendered pages and assets, if any. */
 	prerendered: Prerendered;
 
 	/**
-	 * Create entry points that map to individual functions
+	 * Create separate functions that map to one or more routes of your app.
 	 * @param fn A function that groups a set of routes into an entry point
 	 */
 	createEntries(fn: (route: RouteDefinition) => AdapterEntry): Promise<void>;
 
+	/**
+	 * Generate a server-side manifest to initialise the SvelteKit [server](https://kit.svelte.dev/docs/types#public-types-server) with.
+	 * @param opts a relative path to the base directory of the app and optionally in which format (esm or cjs) the manifest should be generated
+	 */
 	generateManifest(opts: { relativePath: string }): string;
 
+	/**
+	 * Resolve a path to the `name` directory inside `outDir`, e.g. `/path/to/.svelte-kit/my-adapter`.
+	 * @param name path to the file, relative to the build directory
+	 */
 	getBuildDirectory(name: string): string;
+	/** Get the fully resolved path to the directory containing client-side assets, including the contents of your `static` directory. */
 	getClientDirectory(): string;
+	/** Get the fully resolved path to the directory containing server-side code. */
 	getServerDirectory(): string;
-	/** The application path including any configured base path */
+	/** Get the application path including any configured `base` path, e.g. `/my-base-path/_app`. */
 	getAppPath(): string;
 
 	/**
-	 * @param dest the destination folder to which files should be copied
-	 * @returns an array of paths corresponding to the files that have been created by the copy
+	 * Write client assets to `dest`.
+	 * @param dest the destination folder
+	 * @returns an array of files written to `dest`
 	 */
 	writeClient(dest: string): string[];
 	/**
-	 * @param dest
+	 * Write prerendered files to `dest`.
+	 * @param dest the destination folder
+	 * @param opts.fallback the name of a file for fallback responses, like `200.html` or `404.html` depending on where the app is deployed
+	 * @returns an array of files written to `dest`
 	 */
 	writePrerendered(
 		dest: string,
@@ -95,16 +127,18 @@ export interface Builder {
 		}
 	): string[];
 	/**
-	 * @param dest the destination folder to which files should be copied
-	 * @returns an array of paths corresponding to the files that have been created by the copy
+	 * Write server-side code to `dest`.
+	 * @param dest the destination folder
+	 * @returns an array of files written to `dest`
 	 */
 	writeServer(dest: string): string[];
 	/**
-	 * @param from the source file or folder
-	 * @param to the destination file or folder
-	 * @param opts.filter a function to determine whether a file or folder should be copied
+	 * Copy a file or directory.
+	 * @param from the source file or directory
+	 * @param to the destination file or directory
+	 * @param opts.filter a function to determine whether a file or directory should be copied
 	 * @param opts.replace a map of strings to replace
-	 * @returns an array of paths corresponding to the files that have been created by the copy
+	 * @returns an array of files that were copied
 	 */
 	copy(
 		from: string,
@@ -116,15 +150,26 @@ export interface Builder {
 	): string[];
 
 	/**
-	 * @param {string} directory Path to the directory containing the files to be compressed
+	 * Compress files in `directory` with gzip and brotli, where appropriate. Generates `.gz` and `.br` files alongside the originals.
+	 * @param {string} directory The directory containing the files to be compressed
 	 */
 	compress(directory: string): Promise<void>;
 }
 
 export interface Config {
+	/**
+	 * Options passed to [`svelte.compile`](https://svelte.dev/docs#compile-time-svelte-compile).
+	 * @default {}
+	 */
 	compilerOptions?: CompileOptions;
+	/**
+	 * List of file extensions that should be treated as Svelte files.
+	 * @default [".svelte"]
+	 */
 	extensions?: string[];
+	/** SvelteKit options */
 	kit?: KitConfig;
+	/** [`@sveltejs/package`](/docs/packaging) options. */
 	package?: {
 		source?: string;
 		dir?: string;
@@ -132,13 +177,17 @@ export interface Config {
 		exports?(filepath: string): boolean;
 		files?(filepath: string): boolean;
 	};
+	/** Preprocessor options, if any. Preprocessing can alternatively also be done through Vite's preprocessor capabilities. */
 	preprocess?: any;
+	/** Any additional options required by tooling that integrates with Svelte. */
 	[key: string]: any;
 }
 
 export interface Cookies {
 	/**
 	 * Gets a cookie that was previously set with `cookies.set`, or from the request headers.
+	 * @param name the name of the cookie
+	 * @param opts the options, passed directly to `cookie.parse`. See documentation [here](https://github.com/jshttp/cookie#cookieparsestr-options)
 	 */
 	get(name: string, opts?: import('cookie').CookieParseOptions): string | undefined;
 
@@ -148,6 +197,9 @@ export interface Cookies {
 	 * The `httpOnly` and `secure` options are `true` by default (except on http://localhost, where `secure` is `false`), and must be explicitly disabled if you want cookies to be readable by client-side JavaScript and/or transmitted over HTTP. The `sameSite` option defaults to `lax`.
 	 *
 	 * By default, the `path` of a cookie is the 'directory' of the current pathname. In most cases you should explicitly set `path: '/'` to make the cookie available throughout your app.
+	 * @param name the name of the cookie
+	 * @param value the cookie value
+	 * @param opts the options, passed directory to `cookie.serialize`. See documentation [here](https://github.com/jshttp/cookie#cookieserializename-value-options)
 	 */
 	set(name: string, value: string, opts?: import('cookie').CookieSerializeOptions): void;
 
@@ -155,81 +207,320 @@ export interface Cookies {
 	 * Deletes a cookie by setting its value to an empty string and setting the expiry date in the past.
 	 *
 	 * By default, the `path` of a cookie is the 'directory' of the current pathname. In most cases you should explicitly set `path: '/'` to make the cookie available throughout your app.
+	 * @param name the name of the cookie
+	 * @param opts the options, passed directory to `cookie.serialize`. The `path` must match the path of the cookie you want to delete. See documentation [here](https://github.com/jshttp/cookie#cookieserializename-value-options)
 	 */
 	delete(name: string, opts?: import('cookie').CookieSerializeOptions): void;
 
 	/**
-	 * Serialize a cookie name-value pair into a Set-Cookie header string.
+	 * Serialize a cookie name-value pair into a `Set-Cookie` header string, but don't apply it to the response.
 	 *
 	 * The `httpOnly` and `secure` options are `true` by default (except on http://localhost, where `secure` is `false`), and must be explicitly disabled if you want cookies to be readable by client-side JavaScript and/or transmitted over HTTP. The `sameSite` option defaults to `lax`.
 	 *
 	 * By default, the `path` of a cookie is the current pathname. In most cases you should explicitly set `path: '/'` to make the cookie available throughout your app.
 	 *
-	 * @param name the name for the cookie
-	 * @param value value to set the cookie to
-	 * @param options object containing serialization options
+	 * @param name the name of the cookie
+	 * @param value the cookie value
+	 * @param opts the options, passed directory to `cookie.serialize`. See documentation [here](https://github.com/jshttp/cookie#cookieserializename-value-options)
 	 */
 	serialize(name: string, value: string, opts?: import('cookie').CookieSerializeOptions): string;
 }
 
 export interface KitConfig {
+	/**
+	 * Your [adapter](https://kit.svelte.dev/docs/adapters) is run when executing `vite build`. It determines how the output is converted for different platforms.
+	 * @default undefined
+	 */
 	adapter?: Adapter;
+	/**
+	 * An object containing zero or more aliases used to replace values in `import` statements. These aliases are automatically passed to Vite and TypeScript.
+	 *
+	 * ```js
+	 * /// file: svelte.config.js
+	 * /// type: import('@sveltejs/kit').Config
+	 * const config = {
+	 *   kit: {
+	 *     alias: {
+	 *       // this will match a file
+	 *       'my-file': 'path/to/my-file.js',
+	 *
+	 *       // this will match a directory and its contents
+	 *       // (`my-directory/x` resolves to `path/to/my-directory/x`)
+	 *       'my-directory': 'path/to/my-directory',
+	 *
+	 *       // an alias ending /* will only match
+	 *       // the contents of a directory, not the directory itself
+	 *       'my-directory/*': 'path/to/my-directory/*'
+	 *     }
+	 *   }
+	 * };
+	 * ```
+	 *
+	 * > The built-in `$lib` alias is controlled by `config.kit.files.lib` as it is used for packaging.
+	 *
+	 * > You will need to run `npm run dev` to have SvelteKit automatically generate the required alias configuration in `jsconfig.json` or `tsconfig.json`.
+	 * @default {}
+	 */
 	alias?: Record<string, string>;
+	/**
+	 * The directory relative to `paths.assets` where the built JS and CSS (and imported assets) are served from. (The filenames therein contain content-based hashes, meaning they can be cached indefinitely). Must not start or end with `/`.
+	 * @default "_app"
+	 */
 	appDir?: string;
+	/**
+	 * [Content Security Policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy) configuration. CSP helps to protect your users against cross-site scripting (XSS) attacks, by limiting the places resources can be loaded from. For example, a configuration like this...
+	 *
+	 * ```js
+	 * /// file: svelte.config.js
+	 * /// type: import('@sveltejs/kit').Config
+	 * const config = {
+	 *   kit: {
+	 *     csp: {
+	 *       directives: {
+	 *         'script-src': ['self']
+	 *       },
+	 *       reportOnly: {
+	 *         'script-src': ['self']
+	 *       }
+	 *     }
+	 *   }
+	 * };
+	 *
+	 * export default config;
+	 * ```
+	 *
+	 * ...would prevent scripts loading from external sites. SvelteKit will augment the specified directives with nonces or hashes (depending on `mode`) for any inline styles and scripts it generates.
+	 *
+	 * To add a nonce for scripts and links manually included in `src/app.html`, you may use the placeholder `%sveltekit.nonce%` (for example `<script nonce="%sveltekit.nonce%">`).
+	 *
+	 * When pages are prerendered, the CSP header is added via a `<meta http-equiv>` tag (note that in this case, `frame-ancestors`, `report-uri` and `sandbox` directives will be ignored).
+	 *
+	 * > When `mode` is `'auto'`, SvelteKit will use nonces for dynamically rendered pages and hashes for prerendered pages. Using nonces with prerendered pages is insecure and therefore forbidden.
+	 *
+	 * > Note that most [Svelte transitions](https://svelte.dev/tutorial/transition) work by creating an inline `<style>` element. If you use these in your app, you must either leave the `style-src` directive unspecified or add `unsafe-inline`.
+	 */
 	csp?: {
+		/**
+		 * Whether to use hashes or nonces to restrict `<script>` and `<style>` elements. `'auto'` will use hashes for prerendered pages, and nonces for dynamically rendered pages.
+		 */
 		mode?: 'hash' | 'nonce' | 'auto';
+		/**
+		 * Directives that will be added to `Content-Security-Policy` headers.
+		 */
 		directives?: CspDirectives;
+		/**
+		 * Directives that will be added to `Content-Security-Policy-Report-Only` headers.
+		 */
 		reportOnly?: CspDirectives;
 	};
+	/**
+	 * Protection against [cross-site request forgery](https://owasp.org/www-community/attacks/csrf) attacks.
+	 */
 	csrf?: {
+		/**
+		 * Whether to check the incoming `origin` header for `POST` form submissions and verify that it matches the server's origin.
+		 *
+		 * To allow people to make `POST` form submissions to your app from other origins, you will need to disable this option. Be careful!
+		 * @default true
+		 */
 		checkOrigin?: boolean;
 	};
+	/**
+	 * Environment variable configuration
+	 */
 	env?: {
+		/**
+		 * The directory to search for `.env` files.
+		 * @default "."
+		 */
 		dir?: string;
+		/**
+		 * A prefix that signals that an environment variable is safe to expose to client-side code. See [`$env/static/public`](/docs/modules#$env-static-public) and [`$env/dynamic/public`](/docs/modules#$env-dynamic-public). Note that Vite's [`envPrefix`](https://vitejs.dev/config/shared-options.html#envprefix) must be set separately if you are using Vite's environment variable handling - though use of that feature should generally be unnecessary.
+		 * @default "PUBLIC_"
+		 */
 		publicPrefix?: string;
 	};
-	moduleExtensions?: string[];
+	/**
+	 * Where to find various files within your project.
+	 */
 	files?: {
+		/**
+		 * a place to put static files that should have stable URLs and undergo no processing, such as `favicon.ico` or `manifest.json`
+		 * @default "static"
+		 */
 		assets?: string;
 		hooks?: {
+			/**
+			 * The location of your client [hooks](https://kit.svelte.dev/docs/hooks).
+			 * @default "src/hooks.client"
+			 */
 			client?: string;
+			/**
+			 * The location of your server [hooks](https://kit.svelte.dev/docs/hooks).
+			 * @default "src/hooks.server"
+			 */
 			server?: string;
 		};
+		/**
+		 * your app's internal library, accessible throughout the codebase as `$lib`
+		 * @default "src/lib"
+		 */
 		lib?: string;
+		/**
+		 * a directory containing [parameter matchers](https://kit.svelte.dev/docs/advanced-routing#matching)
+		 * @default "src/params"
+		 */
 		params?: string;
+		/**
+		 * the files that define the structure of your app (see [Routing](https://kit.svelte.dev/docs/routing))
+		 * @default "src/routes"
+		 */
 		routes?: string;
+		/**
+		 * the location of your service worker's entry point (see [Service workers](https://kit.svelte.dev/docs/service-workers))
+		 * @default "src/service-worker"
+		 */
 		serviceWorker?: string;
+		/**
+		 * the location of the template for HTML responses
+		 * @default "src/app.html"
+		 */
 		appTemplate?: string;
+		/**
+		 * the location of the template for fallback error responses
+		 * @default "src/error.html"
+		 */
 		errorTemplate?: string;
 	};
+	/**
+	 * Inline CSS inside a `<style>` block at the head of the HTML. This option is a number that specifies the maximum length of a CSS file to be inlined. All CSS files needed for the page and smaller than this value are merged and inlined in a `<style>` block.
+	 *
+	 * > This results in fewer initial requests and can improve your [First Contentful Paint](https://web.dev/first-contentful-paint) score. However, it generates larger HTML output and reduces the effectiveness of browser caches. Use it advisedly.
+	 * @default 0
+	 */
 	inlineStyleThreshold?: number;
+	/**
+	 * An array of file extensions that SvelteKit will treat as modules. Files with extensions that match neither `config.extensions` nor `config.kit.moduleExtensions` will be ignored by the router.
+	 * @default [".js", ".ts"]
+	 */
+	moduleExtensions?: string[];
+	/**
+	 * The directory that SvelteKit writes files to during `dev` and `build`. You should exclude this directory from version control.
+	 * @default ".svelte-kit"
+	 */
 	outDir?: string;
 	paths?: {
+		/**
+		 * An absolute path that your app's files are served from. This is useful if your files are served from a storage bucket of some kind.
+		 * @default ""
+		 */
 		assets?: string;
+		/**
+		 * A root-relative path that must start, but not end with `/` (e.g. `/base-path`), unless it is the empty string. This specifies where your app is served from and allows the app to live on a non-root path. Note that you need to prepend all your root-relative links with the base value or they will point to the root of your domain, not your `base` (this is how the browser works). You can use [`base` from `$app/paths`](/docs/modules#$app-paths-base) for that: `<a href="{base}/your-page">Link</a>`. If you find yourself writing this often, it may make sense to extract this into a reusable component.
+		 * @default ""
+		 */
 		base?: string;
 	};
+	/**
+	 * See [Prerendering](https://kit.svelte.dev/docs/page-options#prerender).
+	 */
 	prerender?: {
+		/**
+		 * How many pages can be prerendered simultaneously. JS is single-threaded, but in cases where prerendering performance is network-bound (for example loading content from a remote CMS) this can speed things up by processing other tasks while waiting on the network response.
+		 * @default 1
+		 */
 		concurrency?: number;
+		/**
+		 * Whether SvelteKit should find pages to prerender by following links from `entries`.
+		 * @default true
+		 */
 		crawl?: boolean;
-		default?: boolean;
+		/**
+		 * An array of pages to prerender, or start crawling from (if `crawl: true`). The `*` string includes all non-dynamic routes (i.e. pages with no `[parameters]`, because SvelteKit doesn't know what value the parameters should have).
+		 * @default ["*"]
+		 */
 		entries?: Array<'*' | `/${string}`>;
+		/**
+		 * How to respond to HTTP errors encountered while prerendering the app.
+		 *
+		 * - `'fail'` — fail the build
+		 * - `'ignore'` - silently ignore the failure and continue
+		 * - `'warn'` — continue, but print a warning
+		 * - `(details) => void` — a custom error handler that takes a `details` object with `status`, `path`, `referrer`, `referenceType` and `message` properties. If you `throw` from this function, the build will fail
+		 *
+		 * ```js
+		 * /// type: import('@sveltejs/kit').Config
+		 * const config = {
+		 *   kit: {
+		 *     prerender: {
+		 *       handleHttpError: ({ path, referrer, message }) => {
+		 *         // ignore deliberate link to shiny 404 page
+		 *         if (path === '/not-found' && referrer === '/blog/how-we-built-our-404-page') {
+		 *           return;
+		 *         }
+		 *
+		 *         // otherwise fail the build
+		 *           throw new Error(message);
+		 *         }
+		 *       }
+		 *     }
+		 *   }
+		 * };
+		 * ```
+		 *
+		 * @default "fail"
+		 */
 		handleHttpError?: PrerenderHttpErrorHandlerValue;
+		/**
+		 * How to respond to hash links from one prerendered page to another that don't correspond to an `id` on the destination page
+		 *
+		 * - `'fail'` — fail the build
+		 * - `'ignore'` - silently ignore the failure and continue
+		 * - `'warn'` — continue, but print a warning
+		 * - `(details) => void` — a custom error handler that takes a `details` object with `path`, `id`, `referrers` and `message` properties. If you `throw` from this function, the build will fail
+		 *
+		 * @default "fail"
+		 */
 		handleMissingId?: PrerenderMissingIdHandlerValue;
+		/**
+		 * The value of `url.origin` during prerendering; useful if it is included in rendered content.
+		 * @default "http://sveltekit-prerender"
+		 */
 		origin?: string;
 	};
 	serviceWorker?: {
+		/**
+		 * Whether to automatically register the service worker, if it exists.
+		 * @default true
+		 */
 		register?: boolean;
+		/**
+		 * Determine which files in your `static` directory will be available in `$service-worker.files`.
+		 * @default (filename) => !/\.DS_Store/.test(filename)
+		 */
 		files?(filepath: string): boolean;
 	};
-	trailingSlash?: TrailingSlash;
+	/**
+	 * Client-side navigation can be buggy if you deploy a new version of your app while people are using it. If the code for the new page is already loaded, it may have stale content; if it isn't, the app's route manifest may point to a JavaScript file that no longer exists. SvelteKit solves this problem by falling back to traditional full-page navigation if it detects that a new version has been deployed, using the `name` specified here (which defaults to a timestamp of the build).
+	 *
+	 * If you set `pollInterval` to a non-zero value, SvelteKit will poll for new versions in the background and set the value of the [`updated`](/docs/modules#$app-stores-updated) store to `true` when it detects one.
+	 */
 	version?: {
+		/**
+		 * The current app version string.
+		 * @default Date.now().toString()
+		 */
 		name?: string;
+		/**
+		 * The interval in milliseconds to poll for version changes. If this is `0`, no polling occurs.
+		 * @default 0
+		 */
 		pollInterval?: number;
 	};
 }
 
 /**
- * This function runs every time the SvelteKit server receives a [request](https://kit.svelte.dev/docs/web-standards#fetch-apis-request) and
+ * The [`handle`](https://kit.svelte.dev/docs/hooks#server-hooks-handle) hook runs every time the SvelteKit server receives a [request](https://kit.svelte.dev/docs/web-standards#fetch-apis-request) and
  * determines the [response](https://kit.svelte.dev/docs/web-standards#fetch-apis-response).
  * It receives an `event` object representing the request and a function called `resolve`, which renders the route and generates a `Response`.
  * This allows you to modify response headers or bodies, or bypass SvelteKit entirely (for implementing routes programmatically, for example).
@@ -242,6 +533,8 @@ export interface Handle {
 }
 
 /**
+ * The server-side [`handleError`](https://kit.svelte.dev/docs/hooks#shared-hooks-handleerror) hook runs when an unexpected error is thrown while responding to a request.
+ *
  * If an unexpected error is thrown during loading or rendering, this function will be called with the error and the event.
  * Make sure that this function _never_ throws an error.
  */
@@ -250,6 +543,8 @@ export interface HandleServerError {
 }
 
 /**
+ * The client-side [`handleError`](https://kit.svelte.dev/docs/hooks#shared-hooks-handleerror) hook runs when an unexpected error is thrown while navigating.
+ *
  * If an unexpected error is thrown during loading or the following render, this function will be called with the error and the event.
  * Make sure that this function _never_ throws an error.
  */
@@ -257,6 +552,9 @@ export interface HandleClientError {
 	(input: { error: unknown; event: NavigationEvent }): MaybePromise<void | App.Error>;
 }
 
+/**
+ * The [`handleFetch`](https://kit.svelte.dev/docs/hooks#server-hooks-handlefetch) hook allows you to modify (or replace) a `fetch` request that happens inside a `load` function that runs on the server (or during pre-rendering)
+ */
 export interface HandleFetch {
 	(input: { event: RequestEvent; request: Request; fetch: typeof fetch }): MaybePromise<Response>;
 }
@@ -275,6 +573,10 @@ export interface Load<
 	(event: LoadEvent<Params, InputData, ParentData, RouteId>): MaybePromise<OutputData>;
 }
 
+/**
+ * The generic form of `PageLoadEvent` and `LayoutLoadEvent`. You should import those from `./$types` (see [generated types](https://kit.svelte.dev/docs/types#generated-types))
+ * rather than using `LoadEvent` directly.
+ */
 export interface LoadEvent<
 	Params extends Partial<Record<string, string>> = Partial<Record<string, string>>,
 	Data extends Record<string, unknown> | null = Record<string, any> | null,
@@ -317,7 +619,7 @@ export interface LoadEvent<
 	 *
 	 * Setting the same header multiple times (even in separate `load` functions) is an error — you can only set a given header once.
 	 *
-	 * You cannot add a `set-cookie` header with `setHeaders` — use the [`cookies`](https://kit.svelte.dev/docs/types#sveltejs-kit-cookies) API in a server-only `load` function instead.
+	 * You cannot add a `set-cookie` header with `setHeaders` — use the [`cookies`](https://kit.svelte.dev/docs/types#public-types-cookies) API in a server-only `load` function instead.
 	 *
 	 * `setHeaders` has no effect when a `load` function runs in the browser.
 	 */
@@ -374,7 +676,7 @@ export interface NavigationEvent<
 	RouteId extends string | null = string | null
 > {
 	/**
-	 * The parameters of the current page - e.g. for a route like `/blog/[slug]`, the `slug` parameter
+	 * The parameters of the current page - e.g. for a route like `/blog/[slug]`, a `{ slug: string }` object
 	 */
 	params: Params;
 	/**
@@ -392,9 +694,22 @@ export interface NavigationEvent<
 	url: URL;
 }
 
+/**
+ * Information about the target of a specific navigation.
+ */
 export interface NavigationTarget {
+	/**
+	 * Parameters of the target page - e.g. for a route like `/blog/[slug]`, a `{ slug: string }` object.
+	 * Is `null` if the target is not part of the SvelteKit app (could not be resolved to a route).
+	 */
 	params: Record<string, string> | null;
+	/**
+	 * Info about the target route
+	 */
 	route: { id: string | null };
+	/**
+	 * The URL that is navigated to
+	 */
 	url: URL;
 }
 
@@ -435,7 +750,7 @@ export interface Navigation {
 }
 
 /**
- * The interface that corresponds to the `beforeNavigate`'s input parameter.
+ * The argument passed to [`beforeNavigate`](https://kit.svelte.dev/docs/modules#$app-navigation-beforenavigate) callbacks.
  */
 export interface BeforeNavigate extends Navigation {
 	/**
@@ -445,7 +760,7 @@ export interface BeforeNavigate extends Navigation {
 }
 
 /**
- * The interface that corresponds to the `afterNavigate`'s input parameter.
+ * The argument passed to [`afterNavigate`](https://kit.svelte.dev/docs/modules#$app-navigation-afternavigate) callbacks.
  */
 export interface AfterNavigate extends Navigation {
 	/**
@@ -456,6 +771,9 @@ export interface AfterNavigate extends Navigation {
 	 * - `popstate`: Navigation was triggered by back/forward navigation
 	 */
 	type: Omit<NavigationType, 'leave'>;
+	/**
+	 * Since `afterNavigate` is called after a navigation completes, it will never be called with a navigation that unloads the page.
+	 */
 	willUnload: false;
 }
 
@@ -471,7 +789,7 @@ export interface Page<
 	 */
 	url: URL;
 	/**
-	 * The parameters of the current page - e.g. for a route like `/blog/[slug]`, the `slug` parameter
+	 * The parameters of the current page - e.g. for a route like `/blog/[slug]`, a `{ slug: string }` object
 	 */
 	params: Params;
 	/**
@@ -501,6 +819,9 @@ export interface Page<
 	form: any;
 }
 
+/**
+ * The shape of a param matcher. See [matching](https://kit.svelte.dev/docs/advanced-routing#matching) for more info.
+ */
 export interface ParamMatcher {
 	(param: string): boolean;
 }
@@ -532,7 +853,7 @@ export interface RequestEvent<
 	 */
 	locals: App.Locals;
 	/**
-	 * The parameters of the current page or endpoint - e.g. for a route like `/blog/[slug]`, the `slug` parameter
+	 * The parameters of the current page or endpoint - e.g. for a route like `/blog/[slug]`, a `{ slug: string }` object
 	 */
 	params: Params;
 	/**
@@ -572,7 +893,7 @@ export interface RequestEvent<
 	 *
 	 * Setting the same header multiple times (even in separate `load` functions) is an error — you can only set a given header once.
 	 *
-	 * You cannot add a `set-cookie` header with `setHeaders` — use the [`cookies`](https://kit.svelte.dev/docs/types#sveltejs-kit-cookies) API instead.
+	 * You cannot add a `set-cookie` header with `setHeaders` — use the [`cookies`](https://kit.svelte.dev/docs/types#public-types-cookies) API instead.
 	 */
 	setHeaders(headers: Record<string, string>): void;
 	/**
@@ -710,6 +1031,10 @@ export interface ServerLoadEvent<
 	depends(...deps: string[]): void;
 }
 
+/**
+ * Shape of a form action method that is part of `export const actions = {..}` in `+page.server.js`.
+ * See [form actions](https://kit-svelte-d4b3r0pff-svelte.vercel.app/docs/form-actions) for more information.
+ */
 export interface Action<
 	Params extends Partial<Record<string, string>> = Partial<Record<string, string>>,
 	OutputData extends Record<string, any> | void = Record<string, any> | void,
@@ -718,6 +1043,10 @@ export interface Action<
 	(event: RequestEvent<Params, RouteId>): MaybePromise<OutputData>;
 }
 
+/**
+ * Shape of the `export const actions = {..}` object in `+page.server.js`.
+ * See [form actions](https://kit-svelte-d4b3r0pff-svelte.vercel.app/docs/form-actions) for more information.
+ */
 export type Actions<
 	Params extends Partial<Record<string, string>> = Partial<Record<string, string>>,
 	OutputData extends Record<string, any> | void = Record<string, any> | void,
@@ -751,17 +1080,17 @@ export function error(
 ): HttpError;
 
 /**
- * The object returned by the `error` function
+ * The object returned by the [`error`](https://kit.svelte.dev/docs/modules#sveltejs-kit-error) function.
  */
 export interface HttpError {
-	/** The HTTP status code */
+	/** The [HTTP status code](https://httpstatusdogs.com), in the range 400-599 */
 	status: number;
-	/** The error message */
+	/** The content of the error. */
 	body: App.Error;
 }
 
 /**
- * Creates a `Redirect` object. If thrown during request handling, SvelteKit will
+ * Create a `Redirect` object. If thrown during request handling, SvelteKit will
  * return a redirect response.
  */
 export function redirect(
@@ -770,22 +1099,24 @@ export function redirect(
 ): Redirect;
 
 /**
- * The object returned by the `redirect` function
+ * The object returned by the [`redirect`](https://kit.svelte.dev/docs/modules#sveltejs-kit-redirect) function
  */
 export interface Redirect {
-	/** The HTTP status code */
+	/** The [HTTP status code](https://httpstatusdogs.com), in the range 300-308. */
 	status: 300 | 301 | 302 | 303 | 304 | 305 | 306 | 307 | 308;
-	/** The location to redirect to */
+	/** The location to redirect to. */
 	location: string;
 }
 
 /**
- * Generates a JSON `Response` object from the supplied data.
+ * Create a JSON `Response` object from the supplied data.
+ * @param data The value that will be serialized as JSON.
+ * @param init Options such as `status` and `headers` that will be added to the response. A `Content-Type: application/json` header will be added automatically.
  */
 export function json(data: any, init?: ResponseInit): Response;
 
 /**
- * Generates a `ValidationError` object.
+ * Create a `ValidationError` object.
  */
 export function invalid<T extends Record<string, unknown> | undefined>(
 	status: number,
@@ -793,10 +1124,35 @@ export function invalid<T extends Record<string, unknown> | undefined>(
 ): ValidationError<T>;
 
 /**
- * The object returned by the `invalid` function
+ * The object returned by the [`invalid`](https://kit.svelte.dev/docs/modules#sveltejs-kit-invalid) function
  */
 export interface ValidationError<T extends Record<string, unknown> | undefined = undefined>
 	extends UniqueInterface {
 	status: number;
 	data: T;
 }
+
+export interface SubmitFunction<
+	Success extends Record<string, unknown> | undefined = Record<string, any>,
+	Invalid extends Record<string, unknown> | undefined = Record<string, any>
+> {
+	(input: {
+		action: URL;
+		data: FormData;
+		form: HTMLFormElement;
+		controller: AbortController;
+		cancel(): void;
+	}): MaybePromise<
+		| void
+		| ((opts: {
+				form: HTMLFormElement;
+				action: URL;
+				result: ActionResult<Success, Invalid>;
+				/**
+				 * Call this to get the default behavior of a form submission response.
+				 * @param options Set `reset: false` if you don't want the `<form>` values to be reset after a successful submission.
+				 */
+				update(options?: { reset: boolean }): Promise<void>;
+		  }) => void)
+	>;
+}
diff --git a/packages/kit/types/private.d.ts b/packages/kit/types/private.d.ts
index 397687ae052e..9ea82c8a5c7d 100644
--- a/packages/kit/types/private.d.ts
+++ b/packages/kit/types/private.d.ts
@@ -152,6 +152,9 @@ export interface Logger {
 export type MaybePromise<T> = T | Promise<T>;
 
 export interface Prerendered {
+	/**
+	 * A map of `path` to `{ file }` objects, where a path like `/foo` corresponds to `foo.html` and a path like `/bar/` corresponds to `bar/index.html`.
+	 */
 	pages: Map<
 		string,
 		{
@@ -159,6 +162,9 @@ export interface Prerendered {
 			file: string;
 		}
 	>;
+	/**
+	 * A map of `path` to `{ type }` objects.
+	 */
 	assets: Map<
 		string,
 		{
@@ -166,6 +172,9 @@ export interface Prerendered {
 			type: string;
 		}
 	>;
+	/**
+	 * A map of redirects encountered during prerendering.
+	 */
 	redirects: Map<
 		string,
 		{
diff --git a/sites/kit.svelte.dev/.gitignore b/sites/kit.svelte.dev/.gitignore
index 152177efde8b..1f48a0f6f97a 100644
--- a/sites/kit.svelte.dev/.gitignore
+++ b/sites/kit.svelte.dev/.gitignore
@@ -3,4 +3,5 @@
 /.svelte-kit/
 /.snippets
 /build/
-/functions/
\ No newline at end of file
+/functions/
+/src/lib/docs/server/type-info.js
\ No newline at end of file
diff --git a/sites/kit.svelte.dev/package.json b/sites/kit.svelte.dev/package.json
index 7dc0b5640808..85911511314d 100644
--- a/sites/kit.svelte.dev/package.json
+++ b/sites/kit.svelte.dev/package.json
@@ -2,8 +2,9 @@
 	"name": "kit.svelte.dev",
 	"version": "0.0.1",
 	"scripts": {
-		"dev": "node ../../scripts/check-doc-links.js && vite dev",
-		"build": "node ../../scripts/check-doc-links.js && vite build",
+		"update": "node scripts/check-doc-links.js && node scripts/types",
+		"dev": "npm run update && vite dev",
+		"build": "npm run update && vite build",
 		"prebuild": "test \"$CI\" = true && npx pnpm install --store=node_modules/.pnpm-store || echo skipping pnpm install",
 		"preview": "vite preview",
 		"test": "uvu src \"(spec\\.js|test[\\\\/]index\\.js)\""
diff --git a/scripts/check-doc-links.js b/sites/kit.svelte.dev/scripts/check-doc-links.js
similarity index 85%
rename from scripts/check-doc-links.js
rename to sites/kit.svelte.dev/scripts/check-doc-links.js
index dda42313ab89..5af6474896ea 100644
--- a/scripts/check-doc-links.js
+++ b/sites/kit.svelte.dev/scripts/check-doc-links.js
@@ -5,7 +5,7 @@ import { fileURLToPath } from 'url';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
-const cwd = path.join(__dirname, '../documentation/docs');
+const cwd = path.join(__dirname, '../../../documentation/docs');
 
 const doc_filenames = glob('**/*.md', { cwd });
 const doc_urls = new Set();
@@ -52,7 +52,7 @@ for (const doc of doc_filenames) {
 		if (url.startsWith('#')) url = doc_name_to_link(doc) + url;
 
 		const [path] = url.split('#');
-		if (path === 'modules' || path === 'types') continue; // autogenerated docs
+		if (path === 'modules' || path === 'types' || path === 'configuration') continue; // autogenerated docs
 
 		if (!doc_urls.has(url)) {
 			bad = true;
@@ -63,15 +63,15 @@ for (const doc of doc_filenames) {
 
 // 3. check SvelteKit docs for broken links
 
-for (const file of walk_kit_dir(path.join(__dirname, '../packages/kit'))) {
-	const content = fs.readFileSync(path.join(__dirname, '../packages/kit', file), 'utf-8');
+for (const file of walk_kit_dir(path.join(__dirname, '../../../packages/kit'))) {
+	const content = fs.readFileSync(path.join(__dirname, '../../../packages/kit', file), 'utf-8');
 
 	const links = content.matchAll(/https:\/\/kit\.svelte\.dev\/docs\/([a-z$\-#]+)/g);
 	if (!links) continue;
 
 	for (const [, link] of links) {
 		const [path] = link.split('#');
-		if (path === 'modules' || path === 'types') continue; // autogenerated docs
+		if (path === 'modules' || path === 'types' || path === 'configuration') continue; // autogenerated docs
 
 		if (!doc_urls.has(link)) {
 			bad = true;
diff --git a/sites/kit.svelte.dev/scripts/types/index.js b/sites/kit.svelte.dev/scripts/types/index.js
new file mode 100644
index 000000000000..5411ee401ccf
--- /dev/null
+++ b/sites/kit.svelte.dev/scripts/types/index.js
@@ -0,0 +1,279 @@
+import fs from 'fs';
+import path from 'path';
+import ts from 'typescript';
+import prettier from 'prettier';
+import { mkdirp } from '../../../../packages/kit/src/utils/filesystem.js';
+import { fileURLToPath } from 'url';
+
+/** @typedef {{ name: string; comment: string; markdown: string; }} Extracted */
+
+/** @type {Array<{ name: string; comment: string; exports: Extracted[]; types: Extracted[]; exempt?: boolean; }>} */
+const modules = [];
+
+/**
+ * @param {string} code
+ * @param {ts.NodeArray<ts.Statement>} statements
+ */
+function get_types(code, statements) {
+	/** @type {Extracted[]} */
+	const exports = [];
+
+	/** @type {Extracted[]} */
+	const types = [];
+
+	if (statements) {
+		for (const statement of statements) {
+			const modifiers = ts.canHaveModifiers(statement) ? ts.getModifiers(statement) : undefined;
+
+			const export_modifier = modifiers?.find((modifier) => modifier.kind === 93);
+			if (!export_modifier) continue;
+
+			if (
+				ts.isClassDeclaration(statement) ||
+				ts.isInterfaceDeclaration(statement) ||
+				ts.isTypeAliasDeclaration(statement) ||
+				ts.isModuleDeclaration(statement) ||
+				ts.isVariableStatement(statement) ||
+				ts.isFunctionDeclaration(statement)
+			) {
+				const name_node = ts.isVariableStatement(statement)
+					? statement.declarationList.declarations[0]
+					: statement;
+
+				// @ts-ignore no idea why it's complaining here
+				const name = name_node.name?.escapedText;
+
+				let start = statement.pos;
+				let comment = '';
+
+				// @ts-ignore i think typescript is bad at typescript
+				if (statement.jsDoc) {
+					// @ts-ignore
+					comment = statement.jsDoc[0].comment;
+					// @ts-ignore
+					start = statement.jsDoc[0].end;
+				}
+
+				const i = code.indexOf('export', start);
+				start = i + 6;
+
+				/** @type {string[]} */
+				const children = [];
+
+				let snippet_unformatted = code.slice(start, statement.end).trim();
+
+				if (ts.isInterfaceDeclaration(statement)) {
+					if (statement.members.length > 0) {
+						for (const member of statement.members) {
+							children.push(munge_type_element(member));
+						}
+
+						// collapse `interface Foo {/* lots of stuff*/}` into `interface Foo {…}`
+						const first = statement.members.at(0);
+						const last = statement.members.at(-1);
+
+						let body_start = first.pos - start;
+						while (snippet_unformatted[body_start] !== '{') body_start -= 1;
+
+						let body_end = last.end - start;
+						while (snippet_unformatted[body_end] !== '}') body_end += 1;
+
+						snippet_unformatted =
+							snippet_unformatted.slice(0, body_start + 1) +
+							'/*…*/' +
+							snippet_unformatted.slice(body_end);
+					}
+				}
+
+				const snippet = prettier
+					.format(snippet_unformatted, {
+						parser: 'typescript',
+						printWidth: 80,
+						useTabs: true,
+						singleQuote: true,
+						trailingComma: 'none'
+					})
+					.replace(/\s*(\/\*…\*\/)\s*/g, '/*…*/')
+					.trim();
+
+				const collection =
+					ts.isVariableStatement(statement) || ts.isFunctionDeclaration(statement)
+						? exports
+						: types;
+
+				collection.push({ name, comment, snippet, children });
+			}
+		}
+
+		types.sort((a, b) => (a.name < b.name ? -1 : 1));
+		exports.sort((a, b) => (a.name < b.name ? -1 : 1));
+	}
+
+	return { types, exports };
+}
+
+/**
+ * @param {ts.TypeElement} member
+ */
+function munge_type_element(member, depth = 1) {
+	// @ts-ignore
+	const doc = member.jsDoc?.[0];
+
+	/** @type {string} */
+	const children = [];
+
+	const name = member.name?.escapedText;
+	let snippet = member.getText();
+
+	for (let i = 0; i < depth; i += 1) {
+		snippet = snippet.replace(/^\t/gm, '');
+	}
+
+	if (
+		ts.isPropertySignature(member) &&
+		ts.isTypeLiteralNode(member.type) &&
+		member.type.members.some((member) => member.jsDoc?.[0].comment)
+	) {
+		let a = 0;
+		while (snippet[a] !== '{') a += 1;
+
+		snippet = snippet.slice(0, a + 1) + '/*…*/}';
+
+		for (const child of member.type.members) {
+			children.push(munge_type_element(child, depth + 1));
+		}
+	}
+
+	/** @type {string[]} */
+	const bullets = [];
+
+	for (const tag of doc?.tags ?? []) {
+		const type = tag.tagName.escapedText;
+
+		switch (tag.tagName.escapedText) {
+			case 'param':
+				bullets.push(`- \`${tag.name.getText()}\` ${tag.comment}`);
+				break;
+
+			case 'default':
+				bullets.push(`- <span class="tag">default</span> \`${tag.comment}\``);
+				break;
+
+			case 'returns':
+				bullets.push(`- <span class="tag">returns</span> ${tag.comment}`);
+				break;
+
+			default:
+				console.log(`unhandled JSDoc tag: ${type}`); // TODO indicate deprecated stuff
+		}
+	}
+
+	return {
+		name,
+		snippet,
+		comment: (doc?.comment ?? '')
+			.replace(/\/\/\/ type: (.+)/g, '/** @type {$1} */')
+			.replace(/^(  )+/gm, (match, spaces) => {
+				return '\t'.repeat(match.length / 2);
+			}),
+		bullets,
+		children
+	};
+}
+
+/**
+ * Type declarations include fully qualified URLs so that they become links when
+ * you hover over names in an editor with TypeScript enabled. We need to remove
+ * the origin so that they become root-relative, so that they work in preview
+ * deployments and when developing locally
+ * @param {string} str
+ */
+function strip_origin(str) {
+	return str.replace(/https:\/\/kit\.svelte\.dev/g, '');
+}
+
+/**
+ * @param {string} file
+ */
+function read_d_ts_file(file) {
+	const resolved = path.resolve('../../packages/kit', file);
+
+	// We can't use JSDoc comments inside JSDoc, so we would get ts(7031) errors if
+	// we didn't ignore this error specifically for `/// file:` code examples
+	const str = fs.readFileSync(resolved, 'utf-8');
+	return str.replace(
+		/(\s*\*\s*)\/\/\/ file:/g,
+		(match, prefix) => prefix + '// @errors: 7031' + match
+	);
+}
+
+{
+	const code = read_d_ts_file('types/index.d.ts');
+	const node = ts.createSourceFile('index.d.ts', code, ts.ScriptTarget.Latest, true);
+
+	modules.push({
+		name: '@sveltejs/kit',
+		comment: '',
+		...get_types(code, node.statements)
+	});
+}
+
+{
+	const code = read_d_ts_file('types/private.d.ts');
+	const node = ts.createSourceFile('private.d.ts', code, ts.ScriptTarget.Latest, true);
+
+	modules.push({
+		name: 'Private types',
+		comment: '',
+		...get_types(code, node.statements)
+	});
+}
+
+const dir = fileURLToPath(new URL('./special-types', import.meta.url).href);
+for (const file of fs.readdirSync(dir)) {
+	if (!file.endsWith('.md')) continue;
+
+	const comment = strip_origin(read_d_ts_file(`${dir}/${file}`));
+
+	modules.push({
+		name: file.replace(/\+/g, '/').slice(0, -3),
+		comment,
+		exports: [],
+		types: [],
+		exempt: true
+	});
+}
+
+{
+	const code = read_d_ts_file('types/ambient.d.ts');
+	const node = ts.createSourceFile('ambient.d.ts', code, ts.ScriptTarget.Latest, true);
+
+	for (const statement of node.statements) {
+		if (ts.isModuleDeclaration(statement)) {
+			// @ts-ignore
+			const name = statement.name.text || statement.name.escapedText;
+
+			// @ts-ignore
+			const comment = strip_origin(statement.jsDoc?.[0].comment ?? '');
+
+			modules.push({
+				name,
+				comment,
+				// @ts-ignore
+				...get_types(code, statement.body?.statements)
+			});
+		}
+	}
+}
+
+modules.sort((a, b) => (a.name < b.name ? -1 : 1));
+
+mkdirp('docs');
+fs.writeFileSync(
+	'src/lib/docs/server/type-info.js',
+	`
+/* This file is generated by running \`node scripts/extract-types.js\`
+   in the packages/kit directory — do not edit it */
+export const modules = ${JSON.stringify(modules, null, '  ')};
+`.trim()
+);
diff --git a/packages/kit/scripts/special-types/$env+dynamic+private.md b/sites/kit.svelte.dev/scripts/types/special-types/$env+dynamic+private.md
similarity index 100%
rename from packages/kit/scripts/special-types/$env+dynamic+private.md
rename to sites/kit.svelte.dev/scripts/types/special-types/$env+dynamic+private.md
diff --git a/packages/kit/scripts/special-types/$env+dynamic+public.md b/sites/kit.svelte.dev/scripts/types/special-types/$env+dynamic+public.md
similarity index 100%
rename from packages/kit/scripts/special-types/$env+dynamic+public.md
rename to sites/kit.svelte.dev/scripts/types/special-types/$env+dynamic+public.md
diff --git a/packages/kit/scripts/special-types/$env+static+private.md b/sites/kit.svelte.dev/scripts/types/special-types/$env+static+private.md
similarity index 100%
rename from packages/kit/scripts/special-types/$env+static+private.md
rename to sites/kit.svelte.dev/scripts/types/special-types/$env+static+private.md
diff --git a/packages/kit/scripts/special-types/$env+static+public.md b/sites/kit.svelte.dev/scripts/types/special-types/$env+static+public.md
similarity index 100%
rename from packages/kit/scripts/special-types/$env+static+public.md
rename to sites/kit.svelte.dev/scripts/types/special-types/$env+static+public.md
diff --git a/packages/kit/scripts/special-types/$lib.md b/sites/kit.svelte.dev/scripts/types/special-types/$lib.md
similarity index 100%
rename from packages/kit/scripts/special-types/$lib.md
rename to sites/kit.svelte.dev/scripts/types/special-types/$lib.md
diff --git a/sites/kit.svelte.dev/src/lib/docs/client/docs.css b/sites/kit.svelte.dev/src/lib/docs/client/docs.css
index a3b5373e3d14..4ad7d2dc804b 100644
--- a/sites/kit.svelte.dev/src/lib/docs/client/docs.css
+++ b/sites/kit.svelte.dev/src/lib/docs/client/docs.css
@@ -260,6 +260,10 @@
 	text-decoration: none !important;
 }
 
+.code-block.border {
+	border-left: 5px solid var(--second);
+}
+
 /** TODO another thing that belongs in site-kit */
 pre.language-diff code {
 	color: rgba(0, 0, 0, 0.4);
@@ -303,3 +307,75 @@ pre.language-diff code {
 	text-indent: calc(-1 * var(--indent) - 2ch);
 	min-height: 1.35em;
 }
+
+.api-section {
+	background: var(--back-api);
+	padding: 1rem;
+	margin-bottom: 1rem;
+	max-width: var(--linemax);
+	border-radius: var(--border-r);
+}
+
+.ts-block {
+	margin-bottom: 1rem;
+	max-width: var(--linemax);
+	background: white;
+	border-radius: var(--border-r);
+	filter: drop-shadow(2px 2px 8px rgba(0, 0, 0, 0.08));
+	overflow: hidden;
+}
+
+.ts-block > .code-block {
+	margin: 0;
+	border-radius: 0;
+	box-shadow: none;
+	background: white;
+}
+
+.ts-block .ts-block-property p {
+	margin: 1rem 0;
+}
+
+.ts-block-property .code-block {
+	margin: 1rem 0;
+}
+
+.ts-block-property > .code-block {
+	margin: 0;
+	padding-left: 1rem;
+	border-radius: 0;
+	box-shadow: none;
+	/* background: var(--back-light); */
+	border-top: 1px solid var(--back-api);
+}
+
+.ts-block-property-details {
+	padding: 0 1rem 0 2rem;
+}
+
+.ts-block-property-details blockquote {
+	margin: 1rem 0;
+}
+
+.ts-block-property-children {
+	margin: 0rem -1rem 0rem 1rem;
+}
+
+.ts-block-property-children .ts-block-property > .code-block {
+	/* border: none; */
+}
+
+.ts-block-property-bullets .tag {
+	font-size: 1.4rem;
+	text-transform: uppercase;
+	color: #666;
+}
+
+.ts-block-property ul:last-child {
+	margin-bottom: 0;
+}
+
+/* we need to have a come-to-jesus moment about the site-kit css */
+.listify ul > li::before {
+	margin-top: 0.8rem !important;
+}
diff --git a/sites/kit.svelte.dev/src/lib/docs/client/shiki.css b/sites/kit.svelte.dev/src/lib/docs/client/shiki.css
index f5e599729bcf..46c875b3df9e 100644
--- a/sites/kit.svelte.dev/src/lib/docs/client/shiki.css
+++ b/sites/kit.svelte.dev/src/lib/docs/client/shiki.css
@@ -2,7 +2,7 @@
 	display: none;
 }
 
-pre.twoslash {
+:root {
 	--shiki-color-text: var(--code-base);
 	--shiki-color-background: transparent;
 	--shiki-token-constant: var(--code-base);
diff --git a/sites/kit.svelte.dev/src/lib/docs/server/index.js b/sites/kit.svelte.dev/src/lib/docs/server/index.js
index 2e1a03738a91..0c0de8782d10 100644
--- a/sites/kit.svelte.dev/src/lib/docs/server/index.js
+++ b/sites/kit.svelte.dev/src/lib/docs/server/index.js
@@ -7,8 +7,8 @@ import 'prismjs/components/prism-diff.js';
 import 'prismjs/components/prism-typescript.js';
 import 'prism-svelte';
 import { escape, extract_frontmatter, transform } from './markdown.js';
-import { modules } from '../../../../../../packages/kit/docs/types.js';
-import { render_modules } from './modules.js';
+import { modules } from './type-info.js';
+import { render, replace_placeholders } from './render.js';
 import { parse_route_id } from '../../../../../../packages/kit/src/utils/routing.js';
 import ts from 'typescript';
 import MagicString from 'magic-string';
@@ -45,8 +45,12 @@ const type_regex = new RegExp(
 
 const type_links = new Map();
 
+const slugs = {
+	'@sveltejs/kit': 'public-types'
+};
+
 modules.forEach((module) => {
-	const slug = slugify(module.name);
+	const slug = slugs[module.name] || slugify(module.name);
 
 	module.types.forEach((type) => {
 		const link = `/docs/types#${slug}-${slugify(type.name)}`;
@@ -61,10 +65,7 @@ export async function read_file(file) {
 	const match = /\d{2}-(.+)\.md/.exec(path.basename(file));
 	if (!match) return null;
 
-	const markdown = fs
-		.readFileSync(`${base}/${file}`, 'utf-8')
-		.replace('**TYPES**', () => render_modules('types'))
-		.replace('**EXPORTS**', () => render_modules('exports'));
+	const markdown = replace_placeholders(fs.readFileSync(`${base}/${file}`, 'utf-8'));
 
 	const highlighter = await createShikiHighlighter({ theme: 'css-variables' });
 
@@ -72,7 +73,6 @@ export async function read_file(file) {
 
 	const { content, sections } = parse({
 		body: generate_ts_from_js(body),
-		file,
 		code: (source, language, current) => {
 			const hash = createHash('sha256');
 			hash.update(source + language + current);
@@ -113,10 +113,12 @@ export async function read_file(file) {
 				version_class = ' js-version';
 			}
 
-			if (language === 'js' || language === 'ts') {
+			if (language === 'dts') {
+				html = renderCodeToHTML(source, 'ts', { twoslash: false }, {}, highlighter);
+			} else if (language === 'js' || language === 'ts') {
 				try {
 					const injected = [];
-					if (source.includes('$app/')) {
+					if (source.includes('$app/') || source.includes('@sveltejs/kit/')) {
 						injected.push(
 							`// @filename: ambient-kit.d.ts`,
 							`/// <reference types="@sveltejs/kit" />`
@@ -219,7 +221,7 @@ export async function read_file(file) {
 				html = `<pre class='language-${plang}'><code>${highlighted}</code></pre>`;
 			}
 
-			html = `<div class="code-block${version_class}">${
+			html = `<div class="code-block${version_class} ${options.style ?? ''}">${
 				options.file ? `<h5>${options.file}</h5>` : ''
 			}${html}</div>`;
 
@@ -251,7 +253,8 @@ export async function read_file(file) {
 							})
 							.join('');
 					}
-				);
+				)
+				.replace(/\/\*…\*\//g, '…');
 
 			fs.writeFileSync(`${snippet_cache}/${digest}.html`, html);
 			return html;
@@ -280,12 +283,11 @@ export async function read_file(file) {
 /**
  * @param {{
  *   body: string;
- *   file: string;
  *   code: (source: string, language: string, current: string) => string;
  *   codespan: (source: string) => string;
  * }} opts
  */
-function parse({ body, file, code, codespan }) {
+function parse({ body, code, codespan }) {
 	const headings = [];
 
 	/** @type {import('./types').Section[]} */
@@ -334,7 +336,7 @@ function parse({ body, file, code, codespan }) {
 					slug
 				});
 			} else {
-				throw new Error(`Unexpected <h${level}> in ${file}`);
+				// throw new Error(`Unexpected <h${level}> in ${file}`);
 			}
 
 			return `<h${level} id="${slug}">${html}<a href="#${slug}" class="anchor"><span class="visually-hidden">permalink</span></a></h${level}>`;
diff --git a/sites/kit.svelte.dev/src/lib/docs/server/modules.js b/sites/kit.svelte.dev/src/lib/docs/server/modules.js
deleted file mode 100644
index 97b8576db5a8..000000000000
--- a/sites/kit.svelte.dev/src/lib/docs/server/modules.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { modules } from '../../../../../../packages/kit/docs/types.js';
-
-/** @param {'types' | 'exports'} kind */
-export function render_modules(kind) {
-	return modules
-		.map((module) => {
-			// special case — we want to include $lib etc in the modules page
-			const is_exempt = kind === 'exports' && module.exempt;
-			const skip = module[kind].length === 0 && !is_exempt;
-
-			if (skip) return '';
-
-			return `### ${module.name}\n\n${module.comment}\n\n${module[kind]
-				.map((type) => `#### ${type.name}\n\n${type.comment}\n\n\`\`\`ts\n${type.snippet}\n\`\`\``)
-				.join('\n\n')}`;
-		})
-		.join('\n\n');
-}
diff --git a/sites/kit.svelte.dev/src/lib/docs/server/render.js b/sites/kit.svelte.dev/src/lib/docs/server/render.js
new file mode 100644
index 000000000000..4a438d473e5d
--- /dev/null
+++ b/sites/kit.svelte.dev/src/lib/docs/server/render.js
@@ -0,0 +1,158 @@
+import { modules } from './type-info.js';
+
+/** @param {string} content */
+export function replace_placeholders(content) {
+	return content
+		.replace(/> EXPANDED_TYPES: (.+?)#(.+)$/gm, (_, name, id) => {
+			const module = modules.find((module) => module.name === name);
+			if (!module) throw new Error(`Could not find module ${name}`);
+
+			const type = module.types.find((t) => t.name === id);
+
+			return (
+				type.comment +
+				type.children
+					.map((child) => {
+						let section = `### ${child.name}`;
+
+						if (child.bullets) {
+							section += `\n\n<div class="ts-block-property-bullets">\n\n${child.bullets.join(
+								'\n'
+							)}\n\n</div>`;
+						}
+
+						section += `\n\n${child.comment}`;
+
+						if (child.children) {
+							section += `\n\n<div class="ts-block-property-children">\n\n${child.children
+								.map(stringify)
+								.join('\n')}\n\n</div>`;
+						}
+
+						return section;
+					})
+					.join('\n\n')
+			);
+		})
+		.replace(/> TYPES: (.+?)(?:#(.+))?$/gm, (_, name, id) => {
+			const module = modules.find((module) => module.name === name);
+			if (!module) throw new Error(`Could not find module ${name}`);
+
+			if (id) {
+				const type = module.types.find((t) => t.name === id);
+
+				return (
+					`<div class="ts-block">${fence(type.snippet)}` +
+					type.children.map(stringify).join('\n\n') +
+					`</div>`
+				);
+			}
+
+			return `${module.comment}\n\n${module.types
+				.map((t) => {
+					let children = t.children.map(stringify).join('\n\n');
+					if (t.name === 'Config' || t.name === 'KitConfig') {
+						// special case — we want these to be on a separate page
+						children =
+							'<div class="ts-block-property-details">\n\nSee the [configuration reference](/docs#configuration) for details.</div>';
+					}
+
+					const markdown = `<div class="ts-block">${fence(t.snippet)}` + children + `</div>`;
+					return `#### ${t.name}\n\n${t.comment}\n\n${markdown}\n\n`;
+				})
+				.join('')}`;
+		})
+		.replace('> MODULES', () => {
+			return modules
+				.map((module) => {
+					if (module.exports.length === 0 && !module.exempt) return '';
+
+					let import_block = '';
+
+					if (module.exports.length > 0) {
+						// deduplication is necessary for now, because of `error()` overload
+						const exports = Array.from(new Set(module.exports.map((x) => x.name)));
+
+						let declaration = `import { ${exports.join(', ')} } from '${module.name}';`;
+						if (declaration.length > 80) {
+							declaration = `import {\n\t${exports.join(',\n\t')}\n} from '${module.name}';`;
+						}
+
+						import_block = fence(declaration, 'js');
+					}
+
+					return `### ${module.name}\n\n${import_block}\n\n${module.comment}\n\n${module.exports
+						.map((type) => {
+							const markdown =
+								`<div class="ts-block">${fence(type.snippet)}` +
+								type.children.map(stringify).join('\n\n') +
+								`</div>`;
+							return `#### ${type.name}\n\n${type.comment}\n\n${markdown}`;
+						})
+						.join('\n\n')}`;
+				})
+				.join('\n\n');
+		});
+}
+
+/** @param {'types' | 'exports'} kind */
+export function render(kind) {
+	return modules
+		.map((module) => {
+			// special case — we want to include $lib etc in the modules page
+			const is_exempt = kind === 'exports' && module.exempt;
+			const skip = module[kind].length === 0 && !is_exempt;
+
+			if (skip) return '';
+
+			return `### ${module.name}\n\n${module.comment}\n\n${module[kind]
+				.map((type) => {
+					const markdown =
+						`<div class="ts-block">${fence(type.snippet)}` +
+						type.children.map(stringify).join('\n\n') +
+						`</div>`;
+					return `#### ${type.name}\n\n${type.comment}\n\n${markdown}`;
+				})
+				.join('\n\n')}`;
+		})
+		.join('\n\n');
+}
+
+/**
+ * @param {string} code
+ * @param {string} lang
+ */
+function fence(code, lang = 'dts') {
+	return '\n\n```' + lang + '\n' + code + '\n```\n\n';
+}
+
+/**
+ * @param {import('./types').Type} member
+ */
+function stringify(member) {
+	const bullet_block =
+		member.bullets.length > 0
+			? `\n\n<div class="ts-block-property-bullets">\n\n${member.bullets.join('\n')}</div>`
+			: '';
+
+	const child_block =
+		member.children.length > 0
+			? `\n\n<div class="ts-block-property-children">${member.children
+					.map(stringify)
+					.join('\n')}</div>`
+			: '';
+
+	return (
+		`<div class="ts-block-property">${fence(member.snippet)}` +
+		`<div class="ts-block-property-details">\n\n` +
+		bullet_block +
+		'\n\n' +
+		member.comment
+			.replace(/\/\/\/ type: (.+)/g, '/** @type {$1} */')
+			.replace(/^(  )+/gm, (match, spaces) => {
+				return '\t'.repeat(match.length / 2);
+			}) +
+		child_block +
+		'\n</div></div>'
+	);
+}
diff --git a/sites/kit.svelte.dev/src/lib/docs/server/types.d.ts b/sites/kit.svelte.dev/src/lib/docs/server/types.d.ts
index 716e83abba33..c627e1b68ba7 100644
--- a/sites/kit.svelte.dev/src/lib/docs/server/types.d.ts
+++ b/sites/kit.svelte.dev/src/lib/docs/server/types.d.ts
@@ -3,3 +3,11 @@ export interface Section {
 	slug: string;
 	sections?: Section[];
 }
+
+export interface Type {
+	name: string;
+	comment: string;
+	snippet: string;
+	bullets: string[];
+	children: Type[];
+}
diff --git a/sites/kit.svelte.dev/src/lib/search/content.server.js b/sites/kit.svelte.dev/src/lib/search/content.server.js
index 744a5cbe6431..5ea52719e324 100644
--- a/sites/kit.svelte.dev/src/lib/search/content.server.js
+++ b/sites/kit.svelte.dev/src/lib/search/content.server.js
@@ -1,8 +1,8 @@
 import fs from 'fs';
 import path from 'path';
 import glob from 'tiny-glob/sync.js';
-import { extract_frontmatter, transform } from '../docs/server/markdown';
-import { render_modules } from '../docs/server/modules';
+import { extract_frontmatter, transform } from '../docs/server/markdown.js';
+import { render, replace_placeholders } from '../docs/server/render.js';
 import { slugify } from '../docs/server';
 
 const categories = [
@@ -34,10 +34,7 @@ export function content() {
 			const slug = match[1];
 
 			const filepath = `../../documentation/${category.slug}/${file}`;
-			const markdown = fs
-				.readFileSync(filepath, 'utf-8')
-				.replace('**TYPES**', () => render_modules('types'))
-				.replace('**EXPORTS**', () => render_modules('exports'));
+			const markdown = replace_placeholders(fs.readFileSync(filepath, 'utf-8'));
 
 			const { body, metadata } = extract_frontmatter(markdown);
 
@@ -93,8 +90,8 @@ function plaintext(markdown) {
 	return transform(markdown, {
 		code: block,
 		blockquote: block,
-		html: () => {
-			throw new Error('TODO implement HTML');
+		html: (html) => {
+			return html;
 		},
 		hr: () => '',
 		list: block,
diff --git a/sites/kit.svelte.dev/src/routes/+layout.svelte b/sites/kit.svelte.dev/src/routes/+layout.svelte
index 9b1cc555b71e..7399ed6adacb 100644
--- a/sites/kit.svelte.dev/src/routes/+layout.svelte
+++ b/sites/kit.svelte.dev/src/routes/+layout.svelte
@@ -26,7 +26,9 @@
 	</svelte:fragment>
 
 	<svelte:fragment slot="nav-right">
-		<NavItem selected={$page.url.pathname.startsWith('/docs') || undefined} href="/docs">Docs</NavItem>
+		<NavItem selected={$page.url.pathname.startsWith('/docs') || undefined} href="/docs"
+			>Docs</NavItem
+		>
 		<NavItem selected={$page.url.pathname.startsWith('/faq') || undefined} href="/faq">FAQ</NavItem>
 
 		<li aria-hidden="true"><span class="separator" /></li>