diff --git a/apps/website/package.json b/apps/website/package.json
index ee4dbbd24..ad202ff1a 100644
--- a/apps/website/package.json
+++ b/apps/website/package.json
@@ -54,7 +54,7 @@
 		"ariakit": "^2.0.0-next.41",
 		"cmdk": "^0.1.20",
 		"meilisearch": "^0.30.0",
-		"next": "^13.0.7-canary.1",
+		"next": "^13.1.2-canary.4",
 		"next-mdx-remote": "^4.2.0",
 		"next-themes": "npm:@wits/next-themes@latest",
 		"react": "^18.2.0",
diff --git a/apps/website/src/app/docAPI.ts b/apps/website/src/app/docAPI.ts
new file mode 100644
index 000000000..85f7a0800
--- /dev/null
+++ b/apps/website/src/app/docAPI.ts
@@ -0,0 +1,26 @@
+import { readFile } from 'node:fs/promises';
+import { join } from 'node:path';
+
+export async function fetchVersions(packageName: string): Promise<string[]> {
+	const response = await fetch(`https://docs.discordjs.dev/api/info?package=${packageName}`, {
+		next: { revalidate: 3_600 },
+	});
+
+	return response.json();
+}
+
+export async function fetchModelJSON(packageName: string, version: string): Promise<unknown> {
+	if (process.env.NEXT_PUBLIC_LOCAL_DEV) {
+		const res = await readFile(
+			join(process.cwd(), '..', '..', 'packages', packageName, 'docs', 'docs.api.json'),
+			'utf8',
+		);
+		return JSON.parse(res);
+	}
+
+	const response = await fetch(`https://docs.discordjs.dev/docs/${packageName}/${version}.api.json`, {
+		next: { revalidate: 3_600 },
+	});
+
+	return response.json();
+}
diff --git a/apps/website/src/app/docs/packages/[package]/[...slug]/page.tsx b/apps/website/src/app/docs/packages/[package]/[...slug]/page.tsx
deleted file mode 100644
index 800bb507b..000000000
--- a/apps/website/src/app/docs/packages/[package]/[...slug]/page.tsx
+++ /dev/null
@@ -1,382 +0,0 @@
-/* eslint-disable no-case-declarations */
-import { readFile } from 'node:fs/promises';
-import { join } from 'node:path';
-// eslint-disable-next-line n/prefer-global/process
-import process, { cwd } from 'node:process';
-import {
-	findPackage,
-	getMembers,
-	type ApiItemJSON,
-	type ApiClassJSON,
-	type ApiFunctionJSON,
-	type ApiInterfaceJSON,
-	type ApiTypeAliasJSON,
-	type ApiVariableJSON,
-	type ApiEnumJSON,
-} from '@discordjs/api-extractor-utils';
-import { createApiModel } from '@discordjs/scripts';
-import { ApiFunction, ApiItemKind, type ApiPackage } from '@microsoft/api-extractor-model';
-import Image from 'next/image';
-// import Head from 'next/head';
-import { notFound } from 'next/navigation';
-import { serialize } from 'next-mdx-remote/serialize';
-import rehypeIgnore from 'rehype-ignore';
-import rehypePrettyCode, { type Options } from 'rehype-pretty-code';
-import rehypeRaw from 'rehype-raw';
-import rehypeSlug from 'rehype-slug';
-import remarkGfm from 'remark-gfm';
-import { getHighlighter } from 'shiki';
-import shikiLangJavascript from 'shiki/languages/javascript.tmLanguage.json';
-import shikiLangTypescript from 'shiki/languages/typescript.tmLanguage.json';
-import shikiThemeDarkPlus from 'shiki/themes/dark-plus.json';
-import shikiThemeLightPlus from 'shiki/themes/light-plus.json';
-import vercelLogo from '../../../../../assets/powered-by-vercel.svg';
-import { MDXRemote } from '~/components/MDXRemote';
-import { Nav } from '~/components/Nav';
-import { Class } from '~/components/model/Class';
-import { Enum } from '~/components/model/Enum';
-import { Function } from '~/components/model/Function';
-import { Interface } from '~/components/model/Interface';
-import { TypeAlias } from '~/components/model/TypeAlias';
-import { Variable } from '~/components/model/Variable';
-import { MemberProvider } from '~/contexts/member';
-import { DESCRIPTION, PACKAGES } from '~/util/constants';
-import { findMember, findMemberByKey } from '~/util/model.server';
-import { tryResolveDescription } from '~/util/summary';
-
-export async function generateStaticParams({ params }: { params?: { package: string } }) {
-	const packageName = params?.package ?? 'builders';
-
-	try {
-		let data: any[] = [];
-		let versions: string[] = [];
-		if (process.env.NEXT_PUBLIC_LOCAL_DEV) {
-			const res = await readFile(join(cwd(), '..', '..', 'packages', packageName, 'docs', 'docs.api.json'), 'utf8');
-			data = JSON.parse(res);
-		} else {
-			const response = await fetch(`https://docs.discordjs.dev/api/info?package=${packageName}`, {
-				next: { revalidate: 3_600 },
-			});
-			versions = await response.json();
-			versions = versions.slice(-2);
-
-			for (const version of versions) {
-				const res = await fetch(`https://docs.discordjs.dev/docs/${packageName}/${version}.api.json`);
-				data = [...data, await res.json()];
-			}
-		}
-
-		if (Array.isArray(data)) {
-			const models = data.map((innerData) => createApiModel(innerData));
-			const pkgs = models.map((model) => findPackage(model, packageName)) as ApiPackage[];
-
-			return [
-				...versions.map((version) => ({ slug: [version] })),
-				...pkgs.flatMap((pkg, idx) =>
-					getMembers(pkg, versions[idx] ?? 'main').map((member) => {
-						if (member.kind === ApiItemKind.Function && member.overloadIndex && member.overloadIndex > 1) {
-							return {
-								slug: [versions[idx] ?? 'main', `${member.name}:${member.overloadIndex}:${member.kind}`],
-							};
-						}
-
-						return {
-							slug: [versions[idx] ?? 'main', `${member.name}:${member.kind}`],
-						};
-					}),
-				),
-			];
-		}
-
-		const model = createApiModel(data);
-		const pkg = findPackage(model, packageName)!;
-
-		return [
-			{ slug: ['main'] },
-			...getMembers(pkg, 'main').map((member) => {
-				if (member.kind === ApiItemKind.Function && member.overloadIndex && member.overloadIndex > 1) {
-					return {
-						slug: ['main', `${member.name}:${member.overloadIndex}:${member.kind}`],
-					};
-				}
-
-				return { slug: ['main', `${member.name}:${member.kind}`] };
-			}),
-		];
-	} catch {
-		return [{ slug: ['main'] }];
-	}
-}
-
-async function getData(packageName: string, slug: string[]) {
-	const [branchName = 'main', member] = slug;
-
-	if (!PACKAGES.includes(packageName)) {
-		notFound();
-	}
-
-	let data;
-	try {
-		if (process.env.NEXT_PUBLIC_LOCAL_DEV) {
-			const res = await readFile(join(cwd(), '..', '..', 'packages', packageName, 'docs', 'docs.api.json'), 'utf8');
-			data = JSON.parse(res);
-		} else {
-			const res = await fetch(`https://docs.discordjs.dev/docs/${packageName}/${branchName}.api.json`);
-			data = await res.json();
-		}
-	} catch {
-		notFound();
-	}
-
-	const [memberName, overloadIndex] = member?.split('%3A') ?? [];
-
-	const readme = await readFile(join(cwd(), 'src', 'assets', 'readme', packageName, 'home-README.md'), 'utf8');
-
-	const mdxSource = await serialize(readme, {
-		mdxOptions: {
-			remarkPlugins: [remarkGfm],
-			remarkRehypeOptions: { allowDangerousHtml: true },
-			rehypePlugins: [
-				rehypeRaw,
-				rehypeIgnore,
-				rehypeSlug,
-				[
-					rehypePrettyCode,
-					{
-						theme: {
-							dark: shikiThemeDarkPlus,
-							light: shikiThemeLightPlus,
-						},
-						getHighlighter: async (options?: Partial<Options>) =>
-							getHighlighter({
-								...options,
-								langs: [
-									// @ts-expect-error: Working as intended
-									{ id: 'javascript', aliases: ['js'], scopeName: 'source.js', grammar: shikiLangJavascript },
-									// @ts-expect-error: Working as intended
-									{ id: 'typescript', aliases: ['ts'], scopeName: 'source.ts', grammar: shikiLangTypescript },
-								],
-							}),
-					},
-				],
-			],
-			format: 'md',
-		},
-	});
-
-	const model = createApiModel(data);
-	const pkg = findPackage(model, packageName);
-
-	// eslint-disable-next-line prefer-const
-	let { containerKey, name } = findMember(model, packageName, memberName, branchName) ?? {};
-	if (name && overloadIndex && !Number.isNaN(Number.parseInt(overloadIndex, 10))) {
-		containerKey = ApiFunction.getContainerKey(name, Number.parseInt(overloadIndex, 10));
-	}
-
-	const members = pkg
-		? getMembers(pkg, branchName).filter((item) => item.overloadIndex === null || item.overloadIndex <= 1)
-		: [];
-	const foundMember =
-		memberName && containerKey ? findMemberByKey(model, packageName, containerKey, branchName) ?? null : null;
-	const description = foundMember ? tryResolveDescription(foundMember) ?? DESCRIPTION : DESCRIPTION;
-
-	return {
-		packageName,
-		branchName,
-		data: {
-			members,
-			member: foundMember,
-			description,
-			source: mdxSource,
-		},
-	};
-}
-
-// function resolveMember(packageName?: string | undefined, member?: SidebarLayoutProps['data']['member']) {
-// 	switch (member?.kind) {
-// 		case 'Class': {
-// 			const typedMember = member as ApiClassJSON;
-// 			return `?pkg=${packageName}&kind=${typedMember.kind}&name=${typedMember.name}&methods=${typedMember.methods.length}&props=${typedMember.properties.length}`;
-// 		}
-
-// 		case 'Function': {
-// 			const typedMember = member as ApiFunctionJSON;
-// 			return `?pkg=${packageName}&kind=${typedMember.kind}&name=${typedMember.name}`;
-// 		}
-
-// 		case 'Interface': {
-// 			const typedMember = member as ApiInterfaceJSON;
-// 			return `?pkg=${packageName}&kind=${typedMember.kind}&name=${typedMember.name}&methods=${typedMember.methods.length}&props=${typedMember.properties.length}`;
-// 		}
-
-// 		case 'TypeAlias': {
-// 			const typedMember = member as ApiTypeAliasJSON;
-// 			return `?pkg=${packageName}&kind=${typedMember.kind}&name=${typedMember.name}`;
-// 		}
-
-// 		case 'Variable': {
-// 			const typedMember = member as ApiVariableJSON;
-// 			return `?pkg=${packageName}&kind=${typedMember.kind}&name=${typedMember.name}`;
-// 		}
-
-// 		case 'Enum': {
-// 			const typedMember = member as ApiEnumJSON;
-// 			return `?pkg=${packageName}&kind=${typedMember.kind}&name=${typedMember.name}&members=${typedMember.members.length}`;
-// 		}
-
-// 		default: {
-// 			return `?pkg=${packageName}&kind=${member?.kind}&name=${member?.name}`;
-// 		}
-// 	}
-// }
-
-function member(props?: ApiItemJSON | undefined) {
-	switch (props?.kind) {
-		case 'Class':
-			return <Class data={props as ApiClassJSON} />;
-		case 'Function':
-			return <Function data={props as ApiFunctionJSON} key={props.containerKey} />;
-		case 'Interface':
-			return <Interface data={props as ApiInterfaceJSON} />;
-		case 'TypeAlias':
-			return <TypeAlias data={props as ApiTypeAliasJSON} />;
-		case 'Variable':
-			return <Variable data={props as ApiVariableJSON} />;
-		case 'Enum':
-			return <Enum data={props as ApiEnumJSON} />;
-		default:
-			return <div>Cannot render that item type</div>;
-	}
-}
-
-export default async function Page({ params }: { params: { package: string; slug: string[] } }) {
-	const data = await getData(params.package, params.slug);
-
-	// const name = useMemo(
-	// 	() => `discord.js${params.data?.member?.name ? ` | ${params.data.member.name}` : ''}`,
-	// 	[params.data?.member?.name],
-	// );
-	// const ogTitle = useMemo(
-	// 	() => `${params.packageName ?? 'discord.js'}${params.data?.member?.name ? ` | ${params.data.member.name}` : ''}`,
-	// 	[params.packageName, params.data?.member?.name],
-	// );
-	// const ogImage = useMemo(
-	// 	() => resolveMember(params.packageName, params.data?.member),
-	// 	[params.packageName, params.data?.member],
-	// );
-
-	// Just in case
-	// return <iframe src="https://discord.js.org" style={{ border: 0, height: '100%', width: '100%' }}></iframe>;
-
-	return (
-		<MemberProvider member={data.data?.member}>
-			<Nav members={data.data.members} />
-			<>
-				{/* <Head>
-								<title key="title">{name}</title>
-								<meta content={params.data.description} key="description" name="description" />
-								<meta content={ogTitle} key="og_title" property="og:title" />
-								<meta content={params.data.description} key="og_description" property="og:description" />
-								<meta content={`https://discordjs.dev/api/og_model${ogImage}`} key="og_image" property="og:image" />
-							</Head> */}
-				<main
-					className={`pt-18 lg:pl-76 ${
-						(data?.data.member?.kind === 'Class' || data?.data.member?.kind === 'Interface') &&
-						((data.data.member as ApiClassJSON | ApiInterfaceJSON).methods?.length ||
-							(data.data.member as ApiClassJSON | ApiInterfaceJSON).properties?.length)
-							? 'xl:pr-64'
-							: ''
-					}`}
-				>
-					<article className="dark:bg-dark-600 bg-light-600">
-						<div className="dark:bg-dark-800 relative z-10 min-h-[calc(100vh_-_70px)] bg-white p-6 pb-20 shadow">
-							{data.data?.member ? (
-								member(data.data.member)
-							) : data.data?.source ? (
-								<div className="prose max-w-none">
-									<MDXRemote {...data.data?.source} />
-								</div>
-							) : null}
-						</div>
-						<div className="h-76 md:h-52" />
-						<footer
-							className={`dark:bg-dark-600 h-76 lg:pl-84 bg-light-600 fixed bottom-0 left-0 right-0 md:h-52 md:pl-4 md:pr-16 ${
-								(data?.data.member?.kind === 'Class' || data?.data.member?.kind === 'Interface') &&
-								((data.data.member as ApiClassJSON | ApiInterfaceJSON).methods?.length ||
-									(data.data.member as ApiClassJSON | ApiInterfaceJSON).properties?.length)
-									? 'xl:pr-76'
-									: 'xl:pr-16'
-							}`}
-						>
-							<div className="mx-auto flex max-w-6xl flex-col place-items-center gap-12 pt-12 lg:place-content-center">
-								<div className="flex w-full flex-col place-content-between place-items-center gap-12 md:flex-row md:gap-0">
-									<a
-										className="focus:ring-width-2 focus:ring-blurple rounded outline-0 focus:ring"
-										href="https://vercel.com/?utm_source=discordjs&utm_campaign=oss"
-										rel="noopener noreferrer"
-										target="_blank"
-										title="Vercel"
-									>
-										<Image alt="Vercel" src={vercelLogo} />
-									</a>
-									<div className="flex flex-row gap-6 md:gap-12">
-										<div className="flex flex-col gap-2">
-											<div className="text-lg font-semibold">Community</div>
-											<div className="flex flex-col gap-1">
-												<a
-													className="focus:ring-width-2 focus:ring-blurple rounded outline-0 focus:ring"
-													href="https://discord.gg/djs"
-													rel="noopener noreferrer"
-													target="_blank"
-												>
-													Discord
-												</a>
-												<a
-													className="focus:ring-width-2 focus:ring-blurple rounded outline-0 focus:ring"
-													href="https://github.com/discordjs/discord.js/discussions"
-													rel="noopener noreferrer"
-													target="_blank"
-												>
-													GitHub discussions
-												</a>
-											</div>
-										</div>
-										<div className="flex flex-col gap-2">
-											<div className="text-lg font-semibold">Project</div>
-											<div className="flex flex-col gap-1">
-												<a
-													className="focus:ring-width-2 focus:ring-blurple rounded outline-0 focus:ring"
-													href="https://github.com/discordjs/discord.js"
-													rel="noopener noreferrer"
-													target="_blank"
-												>
-													discord.js
-												</a>
-												<a
-													className="focus:ring-width-2 focus:ring-blurple rounded outline-0 focus:ring"
-													href="https://discordjs.guide"
-													rel="noopener noreferrer"
-													target="_blank"
-												>
-													discord.js guide
-												</a>
-												<a
-													className="focus:ring-width-2 focus:ring-blurple rounded outline-0 focus:ring"
-													href="https://discord-api-types.dev"
-													rel="noopener noreferrer"
-													target="_blank"
-												>
-													discord-api-types
-												</a>
-											</div>
-										</div>
-									</div>
-								</div>
-							</div>
-						</footer>
-					</article>
-				</main>
-			</>
-		</MemberProvider>
-	);
-}
diff --git a/apps/website/src/app/docs/packages/[package]/[version]/[item]/head.tsx b/apps/website/src/app/docs/packages/[package]/[version]/[item]/head.tsx
new file mode 100644
index 000000000..005b9a342
--- /dev/null
+++ b/apps/website/src/app/docs/packages/[package]/[version]/[item]/head.tsx
@@ -0,0 +1,89 @@
+import { createApiModel, tryResolveSummaryText } from '@discordjs/scripts';
+import type {
+	ApiDeclaredItem,
+	ApiEnum,
+	ApiItem,
+	ApiItemContainerMixin,
+	ApiMethod,
+	ApiMethodSignature,
+	ApiProperty,
+	ApiPropertySignature,
+} from '@microsoft/api-extractor-model';
+import { ApiItemKind } from '@microsoft/api-extractor-model';
+import type { ItemRouteParams } from './page';
+import { fetchModelJSON } from '~/app/docAPI';
+import { OVERLOAD_SEPARATOR } from '~/util/constants';
+import { findMember } from '~/util/model.server';
+
+async function fetchMember({ package: packageName, version, item }: ItemRouteParams): Promise<ApiItem | undefined> {
+	const modelJSON = await fetchModelJSON(packageName, version);
+	const model = createApiModel(modelJSON);
+	const pkg = model.tryGetPackageByName(packageName);
+	const entry = pkg?.entryPoints[0];
+
+	if (!entry) {
+		return undefined;
+	}
+
+	const [memberName] = decodeURIComponent(item).split(OVERLOAD_SEPARATOR);
+
+	return findMember(model, packageName, memberName);
+}
+
+function resolveMemberSearchParams(packageName: string, member: ApiItem): URLSearchParams {
+	const params = new URLSearchParams({
+		pkg: packageName,
+		kind: member.kind,
+		name: member.displayName,
+	});
+
+	switch (member?.kind) {
+		case ApiItemKind.Interface:
+		case ApiItemKind.Class: {
+			const typedMember = member as ApiItemContainerMixin;
+
+			const properties = typedMember.members.filter((member) =>
+				[ApiItemKind.Property, ApiItemKind.PropertySignature].includes(member.kind),
+			) as (ApiProperty | ApiPropertySignature)[];
+			const methods = typedMember.members.filter((member) =>
+				[ApiItemKind.Method, ApiItemKind.Method].includes(member.kind),
+			) as (ApiMethod | ApiMethodSignature)[];
+
+			params.append('methods', methods.length.toString());
+			params.append('props', properties.length.toString());
+			break;
+		}
+
+		case ApiItemKind.Enum: {
+			const typedMember = member as ApiEnum;
+			params.append('members', typedMember.members.length.toString());
+			break;
+		}
+
+		default:
+			break;
+	}
+
+	return params;
+}
+
+export default async function Head({ params }: { params: ItemRouteParams }) {
+	const member = (await fetchMember(params))!;
+	const name = `discord.js${member?.displayName ? ` | ${member.displayName}` : ''}`;
+	const ogTitle = `${params.package ?? 'discord.js'}${member?.displayName ? ` | ${member.displayName}` : ''}`;
+	const searchParams = resolveMemberSearchParams(params.package, member);
+	const url = new URL('https://discordjs.dev/api/og_model');
+	url.search = searchParams.toString();
+	const ogImage = url.toString();
+	const description = tryResolveSummaryText(member as ApiDeclaredItem);
+
+	return (
+		<>
+			<title key="title">{name}</title>
+			<meta content={description ?? ''} key="description" name="description" />
+			<meta content={ogTitle} key="og_title" property="og:title" />
+			<meta content={description ?? ''} key="og_description" property="og:description" />
+			<meta content={ogImage} key="og_image" property="og:image" />
+		</>
+	);
+}
diff --git a/apps/website/src/app/docs/packages/[package]/[...slug]/layout.tsx b/apps/website/src/app/docs/packages/[package]/[version]/[item]/layout.tsx
similarity index 62%
rename from apps/website/src/app/docs/packages/[package]/[...slug]/layout.tsx
rename to apps/website/src/app/docs/packages/[package]/[version]/[item]/layout.tsx
index 2018a1b05..69d3bf404 100644
--- a/apps/website/src/app/docs/packages/[package]/[...slug]/layout.tsx
+++ b/apps/website/src/app/docs/packages/[package]/[version]/[item]/layout.tsx
@@ -1,12 +1,10 @@
 import type { PropsWithChildren } from 'react';
 import { Providers } from './providers';
 import { CmdKDialog } from '~/components/CmdK';
-import { Header } from '~/components/Header';
 
-export default function SidebarLayout({ children }: PropsWithChildren) {
+export default function ItemLayout({ children }: PropsWithChildren) {
 	return (
 		<Providers>
-			<Header />
 			<>{children}</>
 			<CmdKDialog />
 		</Providers>
diff --git a/apps/website/src/app/docs/packages/[package]/[version]/[item]/page.tsx b/apps/website/src/app/docs/packages/[package]/[version]/[item]/page.tsx
new file mode 100644
index 000000000..fc09eef4a
--- /dev/null
+++ b/apps/website/src/app/docs/packages/[package]/[version]/[item]/page.tsx
@@ -0,0 +1,114 @@
+/* eslint-disable no-case-declarations */
+import { readFile } from 'node:fs/promises';
+import { join } from 'node:path';
+// eslint-disable-next-line n/prefer-global/process
+import process, { cwd } from 'node:process';
+import { createApiModel } from '@discordjs/scripts';
+import type {
+	ApiClass,
+	ApiEnum,
+	ApiInterface,
+	ApiItem,
+	ApiTypeAlias,
+	ApiVariable,
+} from '@microsoft/api-extractor-model';
+import { ApiFunction } from '@microsoft/api-extractor-model';
+import { notFound } from 'next/navigation';
+import { fetchModelJSON } from '~/app/docAPI';
+import { Class } from '~/components/model/Class';
+import { Interface } from '~/components/model/Interface';
+import { TypeAlias } from '~/components/model/TypeAlias';
+import { Variable } from '~/components/model/Variable';
+import { Enum } from '~/components/model/enum/Enum';
+import { Function } from '~/components/model/function/Function';
+import { OVERLOAD_SEPARATOR, PACKAGES } from '~/util/constants';
+import { findMember, findMemberByKey } from '~/util/model.server';
+
+export interface ItemRouteParams {
+	item: string;
+	package: string;
+	version: string;
+}
+
+export async function generateStaticParams({ params: { package: packageName, version } }: { params: ItemRouteParams }) {
+	const modelJSON = await fetchModelJSON(packageName, version);
+	const model = createApiModel(modelJSON);
+
+	const pkg = model.tryGetPackageByName(packageName);
+	const entry = pkg?.entryPoints[0];
+
+	if (!entry) {
+		return notFound();
+	}
+
+	return entry.members.map((member) => ({
+		item: member.displayName,
+	}));
+}
+
+async function fetchMember({ package: packageName, version: branchName = 'main', item }: ItemRouteParams) {
+	if (!PACKAGES.includes(packageName)) {
+		notFound();
+	}
+
+	let data;
+	try {
+		if (process.env.NEXT_PUBLIC_LOCAL_DEV) {
+			const res = await readFile(join(cwd(), '..', '..', 'packages', packageName, 'docs', 'docs.api.json'), 'utf8');
+			data = JSON.parse(res);
+		} else {
+			const res = await fetch(`https://docs.discordjs.dev/docs/${packageName}/${branchName}.api.json`);
+			data = await res.json();
+		}
+	} catch {
+		notFound();
+	}
+
+	const [memberName, overloadIndex] = decodeURIComponent(item).split(OVERLOAD_SEPARATOR);
+	const model = createApiModel(data);
+
+	// eslint-disable-next-line prefer-const
+	let { containerKey, displayName: name } = findMember(model, packageName, memberName) ?? {};
+	if (name && overloadIndex && !Number.isNaN(Number.parseInt(overloadIndex, 10))) {
+		containerKey = ApiFunction.getContainerKey(name, Number.parseInt(overloadIndex, 10));
+	}
+
+	return memberName && containerKey ? findMemberByKey(model, packageName, containerKey) ?? null : null;
+}
+
+function Member({ member }: { member?: ApiItem }) {
+	switch (member?.kind) {
+		case 'Class':
+			return <Class clazz={member as ApiClass} />;
+		case 'Function':
+			return <Function item={member as ApiFunction} key={member.containerKey} />;
+		case 'Interface':
+			return <Interface item={member as ApiInterface} />;
+		case 'TypeAlias':
+			return <TypeAlias item={member as ApiTypeAlias} />;
+		case 'Variable':
+			return <Variable item={member as ApiVariable} />;
+		case 'Enum':
+			return <Enum item={member as ApiEnum} />;
+		default:
+			return <div>Cannot render that item type</div>;
+	}
+}
+
+export default async function Page({ params }: { params: ItemRouteParams }) {
+	const member = await fetchMember(params);
+
+	return (
+		<main
+			className={
+				(member?.kind === 'Class' || member?.kind === 'Interface') && (member as ApiClass | ApiInterface).members.length
+					? 'xl:pr-64'
+					: ''
+			}
+		>
+			<article className="dark:bg-dark-600 bg-light-600">
+				<div className="dark:bg-dark-800  bg-white p-6 pb-20 shadow">{member ? <Member member={member} /> : null}</div>
+			</article>
+		</main>
+	);
+}
diff --git a/apps/website/src/app/docs/packages/[package]/[...slug]/providers.tsx b/apps/website/src/app/docs/packages/[package]/[version]/[item]/providers.tsx
similarity index 100%
rename from apps/website/src/app/docs/packages/[package]/[...slug]/providers.tsx
rename to apps/website/src/app/docs/packages/[package]/[version]/[item]/providers.tsx
diff --git a/apps/website/src/app/docs/packages/[package]/[version]/layout.tsx b/apps/website/src/app/docs/packages/[package]/[version]/layout.tsx
new file mode 100644
index 000000000..12912d6dd
--- /dev/null
+++ b/apps/website/src/app/docs/packages/[package]/[version]/layout.tsx
@@ -0,0 +1,143 @@
+import { createApiModel } from '@discordjs/scripts';
+import type { ApiFunction, ApiItem } from '@microsoft/api-extractor-model';
+import Image from 'next/image';
+import { notFound } from 'next/navigation';
+import type { PropsWithChildren } from 'react';
+import { fetchModelJSON, fetchVersions } from '~/app/docAPI';
+import vercelLogo from '~/assets/powered-by-vercel.svg';
+import { Header } from '~/components/Header';
+import { Nav } from '~/components/Nav';
+import type { SidebarSectionItemData } from '~/components/Sidebar';
+import { resolveItemURI } from '~/components/documentation/util';
+import { N_RECENT_VERSIONS, PACKAGES } from '~/util/constants';
+
+export interface VersionRouteParams {
+	package: string;
+	version: string;
+}
+
+export async function generateStaticParams() {
+	const params: VersionRouteParams[] = [];
+
+	await Promise.all(
+		PACKAGES.map(async (packageName) => {
+			const versions = (await fetchVersions(packageName)).slice(-N_RECENT_VERSIONS);
+
+			params.push(...versions.map((version) => ({ package: packageName, version })));
+		}),
+	);
+
+	return params;
+}
+
+function serializeIntoSidebarItemData(item: ApiItem): SidebarSectionItemData {
+	return {
+		kind: item.kind,
+		name: item.displayName,
+		href: resolveItemURI(item),
+		overloadIndex: 'overloadIndex' in item ? (item.overloadIndex as number) : undefined,
+	};
+}
+
+export default async function PackageLayout({ children, params }: PropsWithChildren<{ params: VersionRouteParams }>) {
+	const modelJSON = await fetchModelJSON(params.package, params.version);
+	const model = createApiModel(modelJSON);
+
+	const pkg = model.tryGetPackageByName(params.package);
+
+	if (!pkg) {
+		return notFound();
+	}
+
+	const entry = pkg.entryPoints[0];
+
+	if (!entry) {
+		return notFound();
+	}
+
+	const members = entry.members.filter((member) => {
+		if (member.kind !== 'Function') {
+			return true;
+		}
+
+		return (member as ApiFunction).overloadIndex === 1;
+	});
+
+	return (
+		<>
+			<Header />
+			<Nav members={members.map((member) => serializeIntoSidebarItemData(member))} />
+			<article className="pt-18 lg:pl-76">
+				<div className="relative z-10 min-h-[calc(100vh_-_70px)]">{children}</div>
+				<div className="h-76 md:h-52" />
+				<footer className="dark:bg-dark-600 h-76 lg:pl-84 bg-light-600 fixed bottom-0 left-0 right-0 md:h-52 md:pl-4 md:pr-16">
+					<div className="mx-auto flex max-w-6xl flex-col place-items-center gap-12 pt-12 lg:place-content-center">
+						<div className="flex w-full flex-col place-content-between place-items-center gap-12 md:flex-row md:gap-0">
+							<a
+								className="focus:ring-width-2 focus:ring-blurple rounded outline-0 focus:ring"
+								href="https://vercel.com/?utm_source=discordjs&utm_campaign=oss"
+								rel="noopener noreferrer"
+								target="_blank"
+								title="Vercel"
+							>
+								<Image alt="Vercel" src={vercelLogo} />
+							</a>
+							<div className="flex flex-row gap-6 md:gap-12">
+								<div className="flex flex-col gap-2">
+									<div className="text-lg font-semibold">Community</div>
+									<div className="flex flex-col gap-1">
+										<a
+											className="focus:ring-width-2 focus:ring-blurple rounded outline-0 focus:ring"
+											href="https://discord.gg/djs"
+											rel="noopener noreferrer"
+											target="_blank"
+										>
+											Discord
+										</a>
+										<a
+											className="focus:ring-width-2 focus:ring-blurple rounded outline-0 focus:ring"
+											href="https://github.com/discordjs/discord.js/discussions"
+											rel="noopener noreferrer"
+											target="_blank"
+										>
+											GitHub discussions
+										</a>
+									</div>
+								</div>
+								<div className="flex flex-col gap-2">
+									<div className="text-lg font-semibold">Project</div>
+									<div className="flex flex-col gap-1">
+										<a
+											className="focus:ring-width-2 focus:ring-blurple rounded outline-0 focus:ring"
+											href="https://github.com/discordjs/discord.js"
+											rel="noopener noreferrer"
+											target="_blank"
+										>
+											discord.js
+										</a>
+										<a
+											className="focus:ring-width-2 focus:ring-blurple rounded outline-0 focus:ring"
+											href="https://discordjs.guide"
+											rel="noopener noreferrer"
+											target="_blank"
+										>
+											discord.js guide
+										</a>
+										<a
+											className="focus:ring-width-2 focus:ring-blurple rounded outline-0 focus:ring"
+											href="https://discord-api-types.dev"
+											rel="noopener noreferrer"
+											target="_blank"
+										>
+											discord-api-types
+										</a>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</footer>
+			</article>
+		</>
+	);
+}
diff --git a/apps/website/src/app/docs/packages/[package]/[version]/page.tsx b/apps/website/src/app/docs/packages/[package]/[version]/page.tsx
new file mode 100644
index 000000000..9b58a7b5c
--- /dev/null
+++ b/apps/website/src/app/docs/packages/[package]/[version]/page.tsx
@@ -0,0 +1,67 @@
+import { readFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import { serialize } from 'next-mdx-remote/serialize';
+import rehypeIgnore from 'rehype-ignore';
+import rehypePrettyCode, { type Options } from 'rehype-pretty-code';
+import rehypeRaw from 'rehype-raw';
+import rehypeSlug from 'rehype-slug';
+import remarkGfm from 'remark-gfm';
+import { getHighlighter } from 'shiki';
+import shikiLangJavascript from 'shiki/languages/javascript.tmLanguage.json';
+import shikiLangTypescript from 'shiki/languages/typescript.tmLanguage.json';
+import shikiThemeDarkPlus from 'shiki/themes/dark-plus.json';
+import shikiThemeLightPlus from 'shiki/themes/light-plus.json';
+import type { VersionRouteParams } from './layout';
+import { MDXRemote } from '~/components/MDXRemote';
+
+async function loadREADME(packageName: string) {
+	return readFile(join(process.cwd(), 'src', 'assets', 'readme', packageName, 'home-README.md'), 'utf8');
+}
+
+async function generateMDX(readme: string) {
+	return serialize(readme, {
+		mdxOptions: {
+			remarkPlugins: [remarkGfm],
+			remarkRehypeOptions: { allowDangerousHtml: true },
+			rehypePlugins: [
+				rehypeRaw,
+				rehypeIgnore,
+				rehypeSlug,
+				[
+					rehypePrettyCode,
+					{
+						theme: {
+							dark: shikiThemeDarkPlus,
+							light: shikiThemeLightPlus,
+						},
+						getHighlighter: async (options?: Partial<Options>) =>
+							getHighlighter({
+								...options,
+								langs: [
+									// @ts-expect-error: Working as intended
+									{ id: 'javascript', aliases: ['js'], scopeName: 'source.js', grammar: shikiLangJavascript },
+									// @ts-expect-error: Working as intended
+									{ id: 'typescript', aliases: ['ts'], scopeName: 'source.ts', grammar: shikiLangTypescript },
+								],
+							}),
+					},
+				],
+			],
+			format: 'md',
+		},
+	});
+}
+
+export default async function Page({ params }: { params: VersionRouteParams }) {
+	const { package: packageName } = params;
+	const readmeSource = await loadREADME(packageName);
+	const mdxSource = await generateMDX(readmeSource);
+
+	return (
+		<article className="dark:bg-dark-600 bg-white p-10">
+			<div className="prose max-w-none">
+				<MDXRemote {...mdxSource} />
+			</div>
+		</article>
+	);
+}
diff --git a/apps/website/src/app/docs/packages/[package]/layout.tsx b/apps/website/src/app/docs/packages/[package]/layout.tsx
deleted file mode 100644
index dc574fdf5..000000000
--- a/apps/website/src/app/docs/packages/[package]/layout.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { PropsWithChildren } from 'react';
-import { PACKAGES } from '~/util/constants';
-
-export async function generateStaticParams() {
-	return PACKAGES.map((packageName) => ({ package: packageName }));
-}
-
-export default function PackageLayout({ children }: PropsWithChildren) {
-	return children;
-}
diff --git a/apps/website/src/app/docs/packages/page.tsx b/apps/website/src/app/docs/packages/page.tsx
index 12bb5dff5..660fae937 100644
--- a/apps/website/src/app/docs/packages/page.tsx
+++ b/apps/website/src/app/docs/packages/page.tsx
@@ -5,24 +5,7 @@ import { VscPackage } from '@react-icons/all-files/vsc/VscPackage';
 import Link from 'next/link';
 import { PACKAGES } from '~/util/constants';
 
-async function getData() {
-	return Promise.all(
-		PACKAGES.map(async (pkg) => {
-			const response = await fetch(`https://docs.discordjs.dev/api/info?package=${pkg}`, {
-				next: { revalidate: 3_600 },
-			});
-			const versions = await response.json();
-			const latestVersion = versions.at(-2) ?? 'main';
-			return { packageName: pkg, version: latestVersion };
-		}),
-	);
-}
-
 export default async function Page() {
-	const data = await getData();
-
-	const findLatestVersion = (pkg: string) => data.find((version) => version.packageName === pkg);
-
 	return (
 		<div className="min-w-xs sm:w-md mx-auto flex min-h-screen flex-row place-content-center place-items-center gap-8 py-0 px-4 lg:py-0 lg:px-6">
 			<div className="flex grow flex-col place-content-center gap-4">
@@ -44,7 +27,7 @@ export default async function Page() {
 				{PACKAGES.map((pkg) => (
 					<Link
 						className="dark:bg-dark-400 dark:border-dark-100 dark:hover:bg-dark-300 dark:active:bg-dark-200 focus:ring-width-2 focus:ring-blurple flex h-11 transform-gpu cursor-pointer select-none appearance-none flex-row place-content-between rounded border border-neutral-300 bg-transparent p-4 text-base font-semibold leading-none text-black outline-0 hover:bg-neutral-100 focus:ring active:translate-y-px active:bg-neutral-200 dark:text-white"
-						href={`/docs/packages/${pkg}/${findLatestVersion(pkg)?.version ?? 'main'}`}
+						href={`/docs/packages/${pkg}`}
 						key={pkg}
 					>
 						<div className="flex grow flex-row place-content-between place-items-center gap-4">
diff --git a/apps/website/src/components/Anchor.tsx b/apps/website/src/components/Anchor.tsx
new file mode 100644
index 000000000..4ff054562
--- /dev/null
+++ b/apps/website/src/components/Anchor.tsx
@@ -0,0 +1,12 @@
+import { FiLink } from '@react-icons/all-files/fi/FiLink';
+
+export function Anchor({ href }: { href: string }) {
+	return (
+		<a
+			className="focus:ring-width-2 focus:ring-blurple hidden rounded outline-0 focus:ring md:inline-block"
+			href={href}
+		>
+			<FiLink size={20} />
+		</a>
+	);
+}
diff --git a/apps/website/src/components/CodeListing.tsx b/apps/website/src/components/CodeListing.tsx
deleted file mode 100644
index d8ff47951..000000000
--- a/apps/website/src/components/CodeListing.tsx
+++ /dev/null
@@ -1,88 +0,0 @@
-'use client';
-
-import type { TokenDocumentation, ApiItemJSON, AnyDocNodeJSON, InheritanceData } from '@discordjs/api-extractor-utils';
-import { FiLink } from '@react-icons/all-files/fi/FiLink';
-import type { PropsWithChildren } from 'react';
-import { HyperlinkedText } from './HyperlinkedText';
-import { InheritanceText } from './InheritanceText';
-import { TSDoc } from './tsdoc/TSDoc';
-
-export enum CodeListingSeparatorType {
-	Type = ':',
-	Value = '=',
-}
-
-export function CodeListing({
-	name,
-	separator = CodeListingSeparatorType.Type,
-	typeTokens,
-	readonly = false,
-	optional = false,
-	summary,
-	children,
-	comment,
-	deprecation,
-	inheritanceData,
-}: PropsWithChildren<{
-	comment?: AnyDocNodeJSON | null;
-	deprecation?: AnyDocNodeJSON | null;
-	inheritanceData?: InheritanceData | null;
-	name: string;
-	optional?: boolean;
-	readonly?: boolean;
-	separator?: CodeListingSeparatorType;
-	summary?: ApiItemJSON['summary'];
-	typeTokens: TokenDocumentation[];
-}>) {
-	return (
-		<div className="scroll-mt-30 flex flex-col gap-4" id={name}>
-			<div className="md:-ml-8.5 flex flex-col gap-2 md:flex-row md:place-items-center">
-				<a
-					aria-label="Anchor"
-					className="focus:ring-width-2 focus:ring-blurple hidden rounded outline-0 focus:ring md:inline-block"
-					href={`#${name}`}
-				>
-					<FiLink size={20} />
-				</a>
-				{deprecation || readonly || optional ? (
-					<div className="flex flex-row gap-1">
-						{deprecation ? (
-							<div className="flex h-5 flex-row place-content-center place-items-center rounded-full bg-red-500 px-3 text-center text-xs font-semibold uppercase text-white">
-								Deprecated
-							</div>
-						) : null}
-						{readonly ? (
-							<div className="bg-blurple flex h-5 flex-row place-content-center place-items-center rounded-full px-3 text-center text-xs font-semibold uppercase text-white">
-								Readonly
-							</div>
-						) : null}
-						{optional ? (
-							<div className="bg-blurple flex h-5 flex-row place-content-center place-items-center rounded-full px-3 text-center text-xs font-semibold uppercase text-white">
-								Optional
-							</div>
-						) : null}
-					</div>
-				) : null}
-				<div className="flex flex-row flex-wrap place-items-center gap-1">
-					<h4 className="break-all font-mono text-lg font-bold">
-						{name}
-						{optional ? '?' : ''}
-					</h4>
-					<h4 className="font-mono text-lg font-bold">{separator}</h4>
-					<h4 className="break-all font-mono text-lg font-bold">
-						<HyperlinkedText tokens={typeTokens} />
-					</h4>
-				</div>
-			</div>
-			{summary || inheritanceData ? (
-				<div className="mb-4 flex flex-col gap-4">
-					{deprecation ? <TSDoc node={deprecation} /> : null}
-					{summary ? <TSDoc node={summary} /> : null}
-					{comment ? <TSDoc node={comment} /> : null}
-					{inheritanceData ? <InheritanceText data={inheritanceData} /> : null}
-					{children}
-				</div>
-			) : null}
-		</div>
-	);
-}
diff --git a/apps/website/src/components/DocContainer.tsx b/apps/website/src/components/DocContainer.tsx
deleted file mode 100644
index 519e41fdf..000000000
--- a/apps/website/src/components/DocContainer.tsx
+++ /dev/null
@@ -1,135 +0,0 @@
-'use client';
-
-import type {
-	ApiItemJSON,
-	TokenDocumentation,
-	TypeParameterData,
-	ApiClassJSON,
-	ApiInterfaceJSON,
-} from '@discordjs/api-extractor-utils';
-import { Section } from '@discordjs/ui';
-import { VscListSelection } from '@react-icons/all-files/vsc/VscListSelection';
-import { VscSymbolClass } from '@react-icons/all-files/vsc/VscSymbolClass';
-import { VscSymbolEnum } from '@react-icons/all-files/vsc/VscSymbolEnum';
-import { VscSymbolInterface } from '@react-icons/all-files/vsc/VscSymbolInterface';
-import { VscSymbolMethod } from '@react-icons/all-files/vsc/VscSymbolMethod';
-import { VscSymbolParameter } from '@react-icons/all-files/vsc/VscSymbolParameter';
-import { VscSymbolVariable } from '@react-icons/all-files/vsc/VscSymbolVariable';
-import { Fragment, type PropsWithChildren } from 'react';
-import type { ReactNode } from 'react';
-import { Scrollbars } from 'react-custom-scrollbars-2';
-import { useMedia } from 'react-use';
-import { HyperlinkedText } from './HyperlinkedText';
-import { SyntaxHighlighter } from './SyntaxHighlighter';
-import { TableOfContentItems } from './TableOfContentItems';
-import { TypeParamTable } from './TypeParamTable';
-import { TSDoc } from './tsdoc/TSDoc';
-
-type DocContainerProps = PropsWithChildren<{
-	excerpt: string;
-	extendsTokens?: TokenDocumentation[] | null;
-	implementsTokens?: TokenDocumentation[][];
-	kind: string;
-	methods?: ApiClassJSON['methods'] | ApiInterfaceJSON['methods'] | null;
-	name: string;
-	properties?: ApiClassJSON['properties'] | ApiInterfaceJSON['properties'] | null;
-	subHeading?: ReactNode;
-	summary?: ApiItemJSON['summary'];
-	typeParams?: TypeParameterData[];
-}>;
-
-function generateIcon(kind: string) {
-	const icons = {
-		Class: <VscSymbolClass />,
-		Method: <VscSymbolMethod />,
-		Function: <VscSymbolMethod />,
-		Enum: <VscSymbolEnum />,
-		Interface: <VscSymbolInterface />,
-		TypeAlias: <VscSymbolVariable />,
-	};
-
-	return icons[kind as keyof typeof icons];
-}
-
-export function DocContainer({
-	name,
-	kind,
-	excerpt,
-	summary,
-	typeParams,
-	children,
-	extendsTokens,
-	implementsTokens,
-	methods,
-	properties,
-	subHeading,
-}: DocContainerProps) {
-	const matches = useMedia('(max-width: 768px)', true);
-
-	return (
-		<>
-			<div className="flex flex-col gap-4">
-				<h2 className="flex flex-row place-items-center gap-2 break-all text-2xl font-bold">
-					<span>{generateIcon(kind)}</span>
-					{name}
-				</h2>
-				{subHeading}
-				<Section dense={matches} icon={<VscListSelection size={20} />} padded title="Summary">
-					{summary ? <TSDoc node={summary} /> : <span>No summary provided.</span>}
-					<div className="border-light-900 dark:border-dark-100 -mx-8 mt-6 border-t-2" />
-				</Section>
-				<SyntaxHighlighter code={excerpt} />
-				{extendsTokens?.length ? (
-					<div className="flex flex-row place-items-center gap-4">
-						<h3 className="text-xl font-bold">Extends</h3>
-						<span className="break-all font-mono">
-							<HyperlinkedText tokens={extendsTokens} />
-						</span>
-					</div>
-				) : null}
-				{implementsTokens?.length ? (
-					<div className="flex flex-row place-items-center gap-4">
-						<h3 className="text-xl font-bold">Implements</h3>
-						<span className="break-all font-mono">
-							{implementsTokens.map((token, idx) => (
-								<Fragment key={idx}>
-									<HyperlinkedText tokens={token} />
-									{idx < implementsTokens.length - 1 ? ', ' : ''}
-								</Fragment>
-							))}
-						</span>
-					</div>
-				) : null}
-				<div className="flex flex-col gap-4">
-					{typeParams?.length ? (
-						<Section
-							defaultClosed
-							dense={matches}
-							icon={<VscSymbolParameter size={20} />}
-							padded
-							title="Type Parameters"
-						>
-							<TypeParamTable data={typeParams} />
-						</Section>
-					) : null}
-					{children}
-				</div>
-			</div>
-			{(kind === 'Class' || kind === 'Interface') && (methods?.length || properties?.length) ? (
-				<aside className="dark:bg-dark-600 dark:border-dark-100 border-light-800 fixed top-[72px] right-0 bottom-0 z-20 hidden h-[calc(100vh_-_72px)] w-64 border-l bg-white pr-2 xl:block">
-					<Scrollbars
-						autoHide
-						hideTracksWhenNotNeeded
-						renderThumbVertical={(props) => <div {...props} className="dark:bg-dark-100 bg-light-900 z-30 rounded" />}
-						renderTrackVertical={(props) => (
-							<div {...props} className="absolute top-0.5 right-0.5 bottom-0.5 z-30 w-1.5 rounded" />
-						)}
-						universal
-					>
-						<TableOfContentItems methods={methods ?? []} properties={properties ?? []} />
-					</Scrollbars>
-				</aside>
-			) : null}
-		</>
-	);
-}
diff --git a/apps/website/src/components/ExcerptText.tsx b/apps/website/src/components/ExcerptText.tsx
new file mode 100644
index 000000000..c6a5a94fd
--- /dev/null
+++ b/apps/website/src/components/ExcerptText.tsx
@@ -0,0 +1,42 @@
+import type { ApiModel, Excerpt } from '@microsoft/api-extractor-model';
+import { ExcerptTokenKind } from '@microsoft/api-extractor-model';
+import { ItemLink } from './ItemLink';
+import { resolveItemURI } from './documentation/util';
+
+export interface ExcerptTextProps {
+	/**
+	 * The tokens to render.
+	 */
+	excerpt: Excerpt;
+	/**
+	 * The model to resolve item references from.
+	 */
+	model: ApiModel;
+}
+
+/**
+ * A component that renders excerpt tokens from an api item.
+ */
+export function ExcerptText({ model, excerpt }: ExcerptTextProps) {
+	return (
+		<>
+			{excerpt.spannedTokens.map((token) => {
+				if (token.kind === ExcerptTokenKind.Reference) {
+					const item = model.resolveDeclarationReference(token.canonicalReference!, model).resolvedApiItem;
+
+					if (!item) {
+						return token.text;
+					}
+
+					return (
+						<ItemLink className="text-blurple" itemURI={resolveItemURI(item)} key={item.containerKey}>
+							{token.text}
+						</ItemLink>
+					);
+				}
+
+				return token.text;
+			})}
+		</>
+	);
+}
diff --git a/apps/website/src/components/HyperlinkedText.tsx b/apps/website/src/components/HyperlinkedText.tsx
deleted file mode 100644
index 7ee6dccfc..000000000
--- a/apps/website/src/components/HyperlinkedText.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-'use client';
-
-import type { TokenDocumentation } from '@discordjs/api-extractor-utils';
-import Link from 'next/link';
-
-export function HyperlinkedText({ tokens }: { tokens: TokenDocumentation[] }) {
-	return (
-		<>
-			{tokens.map((token, idx) => {
-				if (token.path) {
-					return (
-						<Link
-							className="text-blurple focus:ring-width-2 focus:ring-blurple rounded outline-0 focus:ring"
-							href={token.path}
-							key={idx}
-						>
-							{token.text}
-						</Link>
-					);
-				}
-
-				return <span key={idx}>{token.text}</span>;
-			})}
-		</>
-	);
-}
diff --git a/apps/website/src/components/InheritanceText.tsx b/apps/website/src/components/InheritanceText.tsx
index 8a08d8f0c..bc5e0c431 100644
--- a/apps/website/src/components/InheritanceText.tsx
+++ b/apps/website/src/components/InheritanceText.tsx
@@ -1,18 +1,17 @@
-'use client';
+import type { ApiDeclaredItem } from '@microsoft/api-extractor-model';
+import { ItemLink } from './ItemLink';
+import { resolveItemURI } from './documentation/util';
 
-import type { InheritanceData } from '@discordjs/api-extractor-utils';
-import Link from 'next/link';
-
-export function InheritanceText({ data }: { data: InheritanceData }) {
+export function InheritanceText({ parent }: { parent: ApiDeclaredItem }) {
 	return (
 		<span className="font-semibold">
 			Inherited from{' '}
-			<Link
+			<ItemLink
 				className="text-blurple focus:ring-width-2 focus:ring-blurple rounded font-mono outline-0 focus:ring"
-				href={data.path}
+				itemURI={resolveItemURI(parent)}
 			>
-				{data.parentName}
-			</Link>
+				{parent.displayName}
+			</ItemLink>
 		</span>
 	);
 }
diff --git a/apps/website/src/components/ItemLink.tsx b/apps/website/src/components/ItemLink.tsx
new file mode 100644
index 000000000..0b0bebfef
--- /dev/null
+++ b/apps/website/src/components/ItemLink.tsx
@@ -0,0 +1,42 @@
+'use client';
+
+import type { LinkProps } from 'next/link';
+import Link from 'next/link';
+import { usePathname } from 'next/navigation';
+import type { PropsWithChildren } from 'react';
+
+export interface ItemLinkProps
+	extends Omit<LinkProps, 'href'>,
+		React.RefAttributes<HTMLAnchorElement>,
+		Omit<React.AnchorHTMLAttributes<HTMLAnchorElement>, keyof LinkProps> {
+	className?: string;
+
+	/**
+	 * The URI of the api item to link to. (e.g. `/RestManager`)
+	 */
+	itemURI: string;
+}
+
+/**
+ * A component that renders a link to an api item.
+ *
+ * @remarks
+ * This component only needs the relative path to the item, and will automatically
+ * generate the full path to the item client-side.
+ */
+export function ItemLink(props: PropsWithChildren<ItemLinkProps>) {
+	const path = usePathname();
+
+	if (!path) {
+		throw new Error('ItemLink must be used inside a Next.js page. (e.g. /docs/packages/foo/main)');
+	}
+
+	// Check if the item is already in the current path, if so keep the current path
+	const end = path?.split('/')?.length < 6 ? path?.length : -1;
+
+	const pathPrefix = path?.split('/').slice(0, end).join('/');
+
+	const { itemURI, ...linkProps } = props;
+
+	return <Link href={`${pathPrefix}${itemURI}`} {...linkProps} />;
+}
diff --git a/apps/website/src/components/MethodItem.tsx b/apps/website/src/components/MethodItem.tsx
deleted file mode 100644
index 64e05d2b2..000000000
--- a/apps/website/src/components/MethodItem.tsx
+++ /dev/null
@@ -1,124 +0,0 @@
-'use client';
-
-import type { ApiMethodJSON, ApiMethodSignatureJSON } from '@discordjs/api-extractor-utils';
-import { FiLink } from '@react-icons/all-files/fi/FiLink';
-import { VscChevronDown } from '@react-icons/all-files/vsc/VscChevronDown';
-import { VscVersions } from '@react-icons/all-files/vsc/VscVersions';
-import { Menu, MenuButton, MenuItem, useMenuState } from 'ariakit/menu';
-import { useCallback, useMemo, useState } from 'react';
-import { HyperlinkedText } from './HyperlinkedText';
-import { InheritanceText } from './InheritanceText';
-import { ParameterTable } from './ParameterTable';
-import { TSDoc } from './tsdoc/TSDoc';
-
-export function MethodItem({ data }: { data: ApiMethodJSON | ApiMethodSignatureJSON }) {
-	const method = data as ApiMethodJSON;
-	const [overloadIndex, setOverloadIndex] = useState(1);
-	const overloadedData = method.mergedSiblings[overloadIndex - 1]!;
-	const menu = useMenuState({ gutter: 8, sameWidth: true, fitViewport: true });
-
-	const key = useMemo(
-		() => `${data.name}${data.overloadIndex && data.overloadIndex > 1 ? `:${data.overloadIndex}` : ''}`,
-		[data.name, data.overloadIndex],
-	);
-
-	const getShorthandName = useCallback(
-		(data: ApiMethodJSON | ApiMethodSignatureJSON) =>
-			`${data.name}${data.optional ? '?' : ''}(${data.parameters.reduce((prev, cur, index) => {
-				if (index === 0) {
-					return `${prev}${cur.isOptional ? `${cur.name}?` : cur.name}`;
-				}
-
-				return `${prev}, ${cur.isOptional ? `${cur.name}?` : cur.name}`;
-			}, '')})`,
-		[],
-	);
-
-	return (
-		<div className="scroll-mt-30 flex flex-col gap-4" id={key}>
-			<div className="flex flex-col">
-				<div className="flex flex-col gap-2 md:-ml-9 md:flex-row md:place-items-center">
-					<a
-						aria-label="Anchor"
-						className="focus:ring-width-2 focus:ring-blurple hidden rounded outline-0 focus:ring md:inline-block"
-						href={`#${key}`}
-					>
-						<FiLink size={20} />
-					</a>
-					{data.deprecated ||
-					(data.kind === 'Method' && method.protected) ||
-					(data.kind === 'Method' && method.static) ? (
-						<div className="flex flex-row gap-1">
-							{data.deprecated ? (
-								<div className="flex h-5 flex-row place-content-center place-items-center rounded-full bg-red-500 px-3 text-center text-xs font-semibold uppercase text-white">
-									Deprecated
-								</div>
-							) : null}
-							{data.kind === 'Method' && method.protected ? (
-								<div className="bg-blurple flex h-5 flex-row place-content-center place-items-center rounded-full px-3 text-center text-xs font-semibold uppercase text-white">
-									Protected
-								</div>
-							) : null}
-							{data.kind === 'Method' && method.static ? (
-								<div className="bg-blurple flex h-5 flex-row place-content-center place-items-center rounded-full px-3 text-center text-xs font-semibold uppercase text-white">
-									Static
-								</div>
-							) : null}
-						</div>
-					) : null}
-					<div className="flex flex-row flex-wrap gap-1">
-						<h4 className="break-all font-mono text-lg font-bold">{getShorthandName(overloadedData)}</h4>
-						<h4 className="font-mono text-lg font-bold">:</h4>
-						<h4 className="break-all font-mono text-lg font-bold">
-							<HyperlinkedText tokens={data.returnTypeTokens} />
-						</h4>
-					</div>
-				</div>
-			</div>
-			{data.mergedSiblings.length > 1 ? (
-				<div className="flex flex-row place-items-center gap-2">
-					<MenuButton
-						className="bg-light-600 hover:bg-light-700 active:bg-light-800 dark:bg-dark-600 dark:hover:bg-dark-500 dark:active:bg-dark-400 focus:ring-width-2 focus:ring-blurple rounded p-3 outline-0 focus:ring"
-						state={menu}
-					>
-						<div className="flex flex-row place-content-between place-items-center gap-2">
-							<VscVersions size={20} />
-							<div>
-								<span className="font-semibold">{`Overload ${overloadIndex}`}</span>
-								{` of ${data.mergedSiblings.length}`}
-							</div>
-							<VscChevronDown
-								className={`transform transition duration-150 ease-in-out ${menu.open ? 'rotate-180' : 'rotate-0'}`}
-								size={20}
-							/>
-						</div>
-					</MenuButton>
-					<Menu
-						className="dark:bg-dark-600 border-light-800 dark:border-dark-100 focus:ring-width-2 focus:ring-blurple z-20 flex flex-col rounded border bg-white p-1 outline-0 focus:ring"
-						state={menu}
-					>
-						{data.mergedSiblings.map((_, idx) => (
-							<MenuItem
-								className="hover:bg-light-700 active:bg-light-800 dark:bg-dark-600 dark:hover:bg-dark-500 dark:active:bg-dark-400 focus:ring-width-2 focus:ring-blurple my-0.5 cursor-pointer rounded bg-white p-3 text-sm outline-0 focus:ring"
-								key={idx}
-								onClick={() => setOverloadIndex(idx + 1)}
-							>
-								{`Overload ${idx + 1}`}
-							</MenuItem>
-						))}
-					</Menu>
-				</div>
-			) : null}
-			{data.summary || data.parameters.length ? (
-				<div className="mb-4 flex flex-col gap-4">
-					{overloadedData.deprecated ? <TSDoc node={overloadedData.deprecated} /> : null}
-					{overloadedData.summary ?? data.summary ? <TSDoc node={overloadedData.summary ?? data.summary!} /> : null}
-					{overloadedData.remarks ? <TSDoc node={overloadedData.remarks} /> : null}
-					{overloadedData.comment ? <TSDoc node={overloadedData.comment} /> : null}
-					{overloadedData.parameters.length ? <ParameterTable data={overloadedData.parameters} /> : null}
-					{data.inheritanceData ? <InheritanceText data={data.inheritanceData} /> : null}
-				</div>
-			) : null}
-		</div>
-	);
-}
diff --git a/apps/website/src/components/MethodList.tsx b/apps/website/src/components/MethodList.tsx
deleted file mode 100644
index 48f26e1ca..000000000
--- a/apps/website/src/components/MethodList.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-'use client';
-
-import type { ApiMethodJSON, ApiMethodSignatureJSON } from '@discordjs/api-extractor-utils';
-import { Fragment, useMemo } from 'react';
-import { MethodItem } from './MethodItem';
-
-export function MethodList({ data }: { data: (ApiMethodJSON | ApiMethodSignatureJSON)[] }) {
-	const methodItems = useMemo(
-		() =>
-			data
-				.filter((method) => method.overloadIndex <= 1)
-				.map((method) => (
-					<Fragment
-						key={`${method.name}${method.overloadIndex && method.overloadIndex > 1 ? `:${method.overloadIndex}` : ''}`}
-					>
-						<MethodItem data={method} />
-						<div className="border-light-900 dark:border-dark-100 -mx-8 border-t-2" />
-					</Fragment>
-				)),
-		[data],
-	);
-
-	return <div className="flex flex-col gap-4">{methodItems}</div>;
-}
diff --git a/apps/website/src/components/NameText.tsx b/apps/website/src/components/NameText.tsx
new file mode 100644
index 000000000..b8b7e4eca
--- /dev/null
+++ b/apps/website/src/components/NameText.tsx
@@ -0,0 +1,3 @@
+export function NameText({ name }: { name: string }) {
+	return <h4 className="break-all font-mono text-lg font-bold">{name}</h4>;
+}
diff --git a/apps/website/src/components/Nav.tsx b/apps/website/src/components/Nav.tsx
index 981d2209b..0b9df8418 100644
--- a/apps/website/src/components/Nav.tsx
+++ b/apps/website/src/components/Nav.tsx
@@ -1,13 +1,13 @@
 'use client';
 
-import type { getMembers } from '@discordjs/api-extractor-utils';
 import { Scrollbars } from 'react-custom-scrollbars-2';
 import { PackageSelect } from './PackageSelect';
-import { SidebarItems } from './SidebarItems';
+import { Sidebar } from './Sidebar';
+import type { SidebarSectionItemData } from './Sidebar';
 import { VersionSelect } from './VersionSelect';
 import { useNav } from '~/contexts/nav';
 
-export function Nav({ members }: { members: ReturnType<typeof getMembers> }) {
+export function Nav({ members }: { members: SidebarSectionItemData[] }) {
 	// eslint-disable-next-line @typescript-eslint/unbound-method
 	const { opened } = useNav();
 
@@ -30,7 +30,7 @@ export function Nav({ members }: { members: ReturnType<typeof getMembers> }) {
 					<PackageSelect />
 					<VersionSelect />
 				</div>
-				<SidebarItems members={members} />
+				<Sidebar members={members} />
 			</Scrollbars>
 		</nav>
 	);
diff --git a/apps/website/src/components/Outline.tsx b/apps/website/src/components/Outline.tsx
new file mode 100644
index 000000000..ea64c91b3
--- /dev/null
+++ b/apps/website/src/components/Outline.tsx
@@ -0,0 +1,23 @@
+'use client';
+
+import { Scrollbars } from './Scrollbars';
+import type { TableOfContentsSerialized } from './TableOfContentItems';
+import { TableOfContentItems } from './TableOfContentItems';
+
+export function Outline({ members }: { members: TableOfContentsSerialized[] }) {
+	return (
+		<aside className="dark:bg-dark-600 dark:border-dark-100 border-light-800 fixed top-[57px] right-0 bottom-0 z-20 hidden h-[calc(100vh_-_72px)] w-64 border-l bg-white pr-2 xl:block">
+			<Scrollbars
+				autoHide
+				hideTracksWhenNotNeeded
+				renderThumbVertical={(props) => <div {...props} className="dark:bg-dark-100 bg-light-900 z-30 rounded" />}
+				renderTrackVertical={(props) => (
+					<div {...props} className="absolute top-0.5 right-0.5 bottom-0.5 z-30 w-1.5 rounded" />
+				)}
+				universal
+			>
+				<TableOfContentItems serializedMembers={members} />
+			</Scrollbars>
+		</aside>
+	);
+}
diff --git a/apps/website/src/components/OverloadSwitcher.tsx b/apps/website/src/components/OverloadSwitcher.tsx
new file mode 100644
index 000000000..e9bb8a85e
--- /dev/null
+++ b/apps/website/src/components/OverloadSwitcher.tsx
@@ -0,0 +1,54 @@
+'use client';
+
+import { VscChevronDown } from '@react-icons/all-files/vsc/VscChevronDown';
+import { VscVersions } from '@react-icons/all-files/vsc/VscVersions';
+import { Menu, MenuButton, MenuItem, useMenuState } from 'ariakit';
+import type { PropsWithChildren, ReactNode } from 'react';
+import { useState } from 'react';
+
+export interface OverloadSwitcherProps {
+	overloads: ReactNode[];
+}
+
+export function OverloadSwitcher({ overloads, children }: PropsWithChildren<{ overloads: ReactNode[] }>) {
+	const [overloadIndex, setOverloadIndex] = useState(1);
+	const overloadedNode = overloads[overloadIndex - 1]!;
+	const menu = useMenuState({ gutter: 8, sameWidth: true, fitViewport: true });
+
+	return (
+		<div className="flex flex-col place-items-start gap-2">
+			<MenuButton
+				className="bg-light-600 hover:bg-light-700 active:bg-light-800 dark:bg-dark-600 dark:hover:bg-dark-500 dark:active:bg-dark-400 focus:ring-width-2 focus:ring-blurple rounded p-3 outline-0 focus:ring"
+				state={menu}
+			>
+				<div className="flex flex-row place-content-between place-items-center gap-2">
+					<VscVersions size={20} />
+					<div>
+						<span className="font-semibold">{`Overload ${overloadIndex}`}</span>
+						{` of ${overloads.length}`}
+					</div>
+					<VscChevronDown
+						className={`transform transition duration-150 ease-in-out ${menu.open ? 'rotate-180' : 'rotate-0'}`}
+						size={20}
+					/>
+				</div>
+			</MenuButton>
+			<Menu
+				className="dark:bg-dark-600 border-light-800 dark:border-dark-100 focus:ring-width-2 focus:ring-blurple z-20 flex flex-col rounded border bg-white p-1 outline-0 focus:ring"
+				state={menu}
+			>
+				{overloads.map((_, idx) => (
+					<MenuItem
+						className="hover:bg-light-700 active:bg-light-800 dark:bg-dark-600 dark:hover:bg-dark-500 dark:active:bg-dark-400 focus:ring-width-2 focus:ring-blurple my-0.5 cursor-pointer rounded bg-white p-3 text-sm outline-0 focus:ring"
+						key={idx}
+						onClick={() => setOverloadIndex(idx + 1)}
+					>
+						{`Overload ${idx + 1}`}
+					</MenuItem>
+				))}
+			</Menu>
+			{children}
+			{overloadedNode}
+		</div>
+	);
+}
diff --git a/apps/website/src/components/Panel.tsx b/apps/website/src/components/Panel.tsx
new file mode 100644
index 000000000..9a7e8ab3b
--- /dev/null
+++ b/apps/website/src/components/Panel.tsx
@@ -0,0 +1,10 @@
+import type { PropsWithChildren } from 'react';
+
+export function Panel({ children }: PropsWithChildren) {
+	return (
+		<>
+			{children}
+			<div className="border-light-900 dark:border-dark-100 -mx-8 border-t-2" />
+		</>
+	);
+}
diff --git a/apps/website/src/components/ParameterTable.tsx b/apps/website/src/components/ParameterTable.tsx
index 3e37da19b..e3ed95115 100644
--- a/apps/website/src/components/ParameterTable.tsx
+++ b/apps/website/src/components/ParameterTable.tsx
@@ -1,26 +1,24 @@
-'use client';
-
-import type { ParameterDocumentation } from '@discordjs/api-extractor-utils';
+import type { ApiParameterListMixin } from '@microsoft/api-extractor-model';
 import { useMemo } from 'react';
-import { HyperlinkedText } from './HyperlinkedText';
+import { ExcerptText } from './ExcerptText';
 import { Table } from './Table';
-import { TSDoc } from './tsdoc/TSDoc';
+import { TSDoc } from './documentation/tsdoc/TSDoc';
 
 const columnStyles = {
 	Name: 'font-mono whitespace-nowrap',
 	Type: 'font-mono whitespace-pre-wrap break-normal',
 };
 
-export function ParameterTable({ data }: { data: ParameterDocumentation[] }) {
+export function ParameterTable({ item }: { item: ApiParameterListMixin }) {
 	const rows = useMemo(
 		() =>
-			data.map((param) => ({
+			item.parameters.map((param) => ({
 				Name: param.name,
-				Type: <HyperlinkedText tokens={param.tokens} />,
+				Type: <ExcerptText excerpt={param.parameterTypeExcerpt} model={item.getAssociatedModel()!} />,
 				Optional: param.isOptional ? 'Yes' : 'No',
-				Description: param.paramCommentBlock ? <TSDoc node={param.paramCommentBlock} /> : 'None',
+				Description: param.tsdocParamBlock ? <TSDoc item={item} tsdoc={param.tsdocParamBlock.content} /> : 'None',
 			})),
-		[data],
+		[item],
 	);
 
 	return (
diff --git a/apps/website/src/components/Property.tsx b/apps/website/src/components/Property.tsx
new file mode 100644
index 000000000..c57b358e1
--- /dev/null
+++ b/apps/website/src/components/Property.tsx
@@ -0,0 +1,69 @@
+import type { ApiDeclaredItem, ApiItemContainerMixin, ApiPropertyItem } from '@microsoft/api-extractor-model';
+import type { PropsWithChildren } from 'react';
+import { Anchor } from './Anchor';
+import { ExcerptText } from './ExcerptText';
+import { InheritanceText } from './InheritanceText';
+import { TSDoc } from './documentation/tsdoc/TSDoc';
+
+export enum PropertySeparatorType {
+	Type = ':',
+	Value = '=',
+}
+
+export function Property({
+	item,
+	children,
+	separator,
+	inheritedFrom,
+}: PropsWithChildren<{
+	inheritedFrom?: (ApiDeclaredItem & ApiItemContainerMixin) | undefined;
+	item: ApiPropertyItem;
+	separator?: PropertySeparatorType;
+}>) {
+	const isDeprecated = Boolean(item.tsdocComment?.deprecatedBlock);
+	const hasSummary = Boolean(item.tsdocComment?.summarySection);
+
+	return (
+		<div className="scroll-mt-30 flex flex-col gap-4" id={item.displayName}>
+			<div className="md:-ml-8.5 flex flex-col gap-2 md:flex-row md:place-items-center">
+				<Anchor href={`#${item.displayName}`} />
+				{isDeprecated || item.isReadonly || item.isOptional ? (
+					<div className="flex flex-row gap-1">
+						{isDeprecated ? (
+							<div className="flex h-5 flex-row place-content-center place-items-center rounded-full bg-red-500 px-3 text-center text-xs font-semibold uppercase text-white">
+								Deprecated
+							</div>
+						) : null}
+						{item.isReadonly ? (
+							<div className="bg-blurple flex h-5 flex-row place-content-center place-items-center rounded-full px-3 text-center text-xs font-semibold uppercase text-white">
+								Readonly
+							</div>
+						) : null}
+						{item.isOptional ? (
+							<div className="bg-blurple flex h-5 flex-row place-content-center place-items-center rounded-full px-3 text-center text-xs font-semibold uppercase text-white">
+								Optional
+							</div>
+						) : null}
+					</div>
+				) : null}
+				<div className="flex flex-row flex-wrap place-items-center gap-1">
+					<h4 className="break-all font-mono text-lg font-bold">
+						{item.displayName}
+						{item.isOptional ? '?' : ''}
+					</h4>
+					<h4 className="font-mono text-lg font-bold">{separator}</h4>
+					<h4 className="break-all font-mono text-lg font-bold">
+						<ExcerptText excerpt={item.propertyTypeExcerpt} model={item.getAssociatedModel()!} />
+					</h4>
+				</div>
+			</div>
+			{hasSummary || inheritedFrom ? (
+				<div className="mb-4 flex flex-col gap-4">
+					{item.tsdocComment ? <TSDoc item={item} tsdoc={item.tsdocComment} /> : null}
+					{inheritedFrom ? <InheritanceText parent={inheritedFrom} /> : null}
+					{children}
+				</div>
+			) : null}
+		</div>
+	);
+}
diff --git a/apps/website/src/components/PropertyList.tsx b/apps/website/src/components/PropertyList.tsx
index 0d1b0dc76..29a52ab24 100644
--- a/apps/website/src/components/PropertyList.tsx
+++ b/apps/website/src/components/PropertyList.tsx
@@ -1,28 +1,38 @@
-'use client';
-
-import type { ApiPropertyItemJSON } from '@discordjs/api-extractor-utils';
+import type {
+	ApiDeclaredItem,
+	ApiItem,
+	ApiItemContainerMixin,
+	ApiProperty,
+	ApiPropertyItem,
+	ApiPropertySignature,
+} from '@microsoft/api-extractor-model';
+import { ApiItemKind } from '@microsoft/api-extractor-model';
 import { Fragment, useMemo } from 'react';
-import { CodeListing } from './CodeListing';
+import { Property, PropertySeparatorType } from './Property';
+import { resolveMembers } from '~/util/members';
+
+export function isPropertyLike(item: ApiItem): item is ApiProperty | ApiPropertySignature {
+	return item.kind === ApiItemKind.Property || item.kind === ApiItemKind.PropertySignature;
+}
+
+export function PropertyList({ item }: { item: ApiItemContainerMixin }) {
+	const members = resolveMembers(item, isPropertyLike);
 
-export function PropertyList({ data }: { data: ApiPropertyItemJSON[] }) {
 	const propertyItems = useMemo(
 		() =>
-			data.map((prop) => (
-				<Fragment key={prop.name}>
-					<CodeListing
-						comment={prop.comment}
-						deprecation={prop.deprecated}
-						inheritanceData={prop.inheritanceData}
-						name={prop.name}
-						optional={prop.optional}
-						readonly={prop.readonly}
-						summary={prop.summary}
-						typeTokens={prop.propertyTypeTokens}
-					/>
-					<div className="border-light-900 dark:border-dark-100 -mx-8 border-t-2" />
-				</Fragment>
-			)),
-		[data],
+			members.map((prop) => {
+				return (
+					<Fragment key={prop.item.displayName}>
+						<Property
+							inheritedFrom={prop.inherited as ApiDeclaredItem & ApiItemContainerMixin}
+							item={prop.item as ApiPropertyItem}
+							separator={PropertySeparatorType.Type}
+						/>
+						<div className="border-light-900 dark:border-dark-100 -mx-8 border-t-2" />
+					</Fragment>
+				);
+			}),
+		[members],
 	);
 
 	return <div className="flex flex-col gap-4">{propertyItems}</div>;
diff --git a/apps/website/src/components/Scrollbars.tsx b/apps/website/src/components/Scrollbars.tsx
new file mode 100644
index 000000000..9e76b4923
--- /dev/null
+++ b/apps/website/src/components/Scrollbars.tsx
@@ -0,0 +1,8 @@
+'use client';
+
+import type { ScrollbarProps } from 'react-custom-scrollbars-2';
+import { Scrollbars as ReactScrollbars2 } from 'react-custom-scrollbars-2';
+
+export function Scrollbars(props: ScrollbarProps) {
+	return <ReactScrollbars2 {...props} />;
+}
diff --git a/apps/website/src/components/Section.tsx b/apps/website/src/components/Section.tsx
new file mode 100644
index 000000000..075760697
--- /dev/null
+++ b/apps/website/src/components/Section.tsx
@@ -0,0 +1,16 @@
+'use client';
+
+import { Section as DJSSection, type SectionOptions } from '@discordjs/ui';
+import type { PropsWithChildren } from 'react';
+import { useMedia } from 'react-use';
+
+// This is wrapper around the Section component from @discordjs/ui,
+// it simply automatically sets the dense prop to true if the screen
+// width is less than 768px. This is done to separate client-side logic
+// from server-side rendering.
+export function Section(options: PropsWithChildren<SectionOptions>) {
+	const matches = useMedia('(max-width: 768px)', true);
+	const modifiedOptions = { ...options, dense: matches };
+
+	return <DJSSection {...modifiedOptions} />;
+}
diff --git a/apps/website/src/components/Sections.tsx b/apps/website/src/components/Sections.tsx
deleted file mode 100644
index 1a957e116..000000000
--- a/apps/website/src/components/Sections.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-'use client';
-
-import type {
-	ApiClassJSON,
-	ApiInterfaceJSON,
-	ParameterDocumentation,
-	ApiConstructorJSON,
-} from '@discordjs/api-extractor-utils';
-import { Section } from '@discordjs/ui';
-import { VscSymbolConstant } from '@react-icons/all-files/vsc/VscSymbolConstant';
-import { VscSymbolMethod } from '@react-icons/all-files/vsc/VscSymbolMethod';
-import { VscSymbolProperty } from '@react-icons/all-files/vsc/VscSymbolProperty';
-import { useMemo } from 'react';
-import { useMedia } from 'react-use';
-import { MethodList } from './MethodList';
-import { ParameterTable } from './ParameterTable';
-import { PropertyList } from './PropertyList';
-import { TSDoc } from './tsdoc/TSDoc';
-
-export function PropertiesSection({ data }: { data: ApiClassJSON['properties'] | ApiInterfaceJSON['properties'] }) {
-	const matches = useMedia('(max-width: 768px)', true);
-
-	return data.length ? (
-		<Section dense={matches} icon={<VscSymbolProperty size={20} />} padded title="Properties">
-			<PropertyList data={data} />
-		</Section>
-	) : null;
-}
-
-export function MethodsSection({ data }: { data: ApiClassJSON['methods'] | ApiInterfaceJSON['methods'] }) {
-	const matches = useMedia('(max-width: 768px)', true);
-
-	return data.length ? (
-		<Section dense={matches} icon={<VscSymbolMethod size={20} />} padded title="Methods">
-			<MethodList data={data} />
-		</Section>
-	) : null;
-}
-
-export function ParametersSection({ data }: { data: ParameterDocumentation[] }) {
-	const matches = useMedia('(max-width: 768px)', true);
-
-	return data.length ? (
-		<Section dense={matches} icon={<VscSymbolConstant size={20} />} padded title="Parameters">
-			<ParameterTable data={data} />
-		</Section>
-	) : null;
-}
-
-export function ConstructorSection({ data }: { data: ApiConstructorJSON }) {
-	const matches = useMedia('(max-width: 768px)', true);
-
-	const getShorthandName = useMemo(
-		() =>
-			`constructor(${data.parameters.reduce((prev, cur, index) => {
-				if (index === 0) {
-					return `${prev}${cur.isOptional ? `${cur.name}?` : cur.name}`;
-				}
-
-				return `${prev}, ${cur.isOptional ? `${cur.name}?` : cur.name}`;
-			}, '')})`,
-		[data.parameters],
-	);
-
-	return data.parameters.length ? (
-		<Section dense={matches} icon={<VscSymbolMethod size={20} />} padded title="Constructor">
-			<div className="scroll-mt-30 flex flex-col gap-4" id={data.name}>
-				<div className="flex flex-col">
-					<div className="flex flex-col gap-2 md:flex-row md:place-items-center">
-						{data.deprecated || data.protected ? (
-							<div className="flex flex-row gap-1">
-								{data.deprecated ? (
-									<div className="flex h-5 flex-row place-content-center place-items-center rounded-full bg-red-500 px-3 text-center text-xs font-semibold uppercase text-white">
-										Deprecated
-									</div>
-								) : null}
-								{data.protected ? (
-									<div className="bg-blurple flex h-5 flex-row place-content-center place-items-center rounded-full px-3 text-center text-xs font-semibold uppercase text-white">
-										Protected
-									</div>
-								) : null}
-							</div>
-						) : null}
-						<h4 className="break-all font-mono text-lg font-bold">{getShorthandName}</h4>
-					</div>
-				</div>
-				{data.summary || data.parameters.length ? (
-					<div className="mb-4 flex flex-col gap-4">
-						{data.deprecated ? <TSDoc node={data.deprecated} /> : null}
-						{data.summary ? <TSDoc node={data.summary} /> : null}
-						{data.remarks ? <TSDoc node={data.remarks} /> : null}
-						{data.comment ? <TSDoc node={data.comment} /> : null}
-						{data.parameters.length ? <ParameterTable data={data.parameters} /> : null}
-					</div>
-				) : null}
-			</div>
-		</Section>
-	) : null;
-}
diff --git a/apps/website/src/components/SidebarItems.tsx b/apps/website/src/components/Sidebar.tsx
similarity index 69%
rename from apps/website/src/components/SidebarItems.tsx
rename to apps/website/src/components/Sidebar.tsx
index 7748b19a5..71b63ac15 100644
--- a/apps/website/src/components/SidebarItems.tsx
+++ b/apps/website/src/components/Sidebar.tsx
@@ -1,36 +1,41 @@
 'use client';
 
-import type { getMembers } from '@discordjs/api-extractor-utils';
-import { Section } from '@discordjs/ui';
+import type { ApiItemKind } from '@microsoft/api-extractor-model';
 import { VscSymbolClass } from '@react-icons/all-files/vsc/VscSymbolClass';
 import { VscSymbolEnum } from '@react-icons/all-files/vsc/VscSymbolEnum';
 import { VscSymbolField } from '@react-icons/all-files/vsc/VscSymbolField';
 import { VscSymbolInterface } from '@react-icons/all-files/vsc/VscSymbolInterface';
 import { VscSymbolMethod } from '@react-icons/all-files/vsc/VscSymbolMethod';
 import { VscSymbolVariable } from '@react-icons/all-files/vsc/VscSymbolVariable';
-import Link from 'next/link';
 import { usePathname } from 'next/navigation';
-import { useMemo, useState, useEffect } from 'react';
+import { useMemo } from 'react';
+import { ItemLink } from './ItemLink';
+import { Section } from './Section';
 import { useNav } from '~/contexts/nav';
 
-type Members = ReturnType<typeof getMembers>;
-
-interface GroupedMembers {
-	Classes: Members;
-	Enums: Members;
-	Functions: Members;
-	Interfaces: Members;
-	Types: Members;
-	Variables: Members;
+export interface SidebarSectionItemData {
+	href: string;
+	kind: ApiItemKind;
+	name: string;
+	overloadIndex?: number | undefined;
 }
 
-function groupMembers(members: Members): GroupedMembers {
-	const Classes: Members = [];
-	const Enums: Members = [];
-	const Interfaces: Members = [];
-	const Types: Members = [];
-	const Variables: Members = [];
-	const Functions: Members = [];
+interface GroupedMembers {
+	Classes: SidebarSectionItemData[];
+	Enums: SidebarSectionItemData[];
+	Functions: SidebarSectionItemData[];
+	Interfaces: SidebarSectionItemData[];
+	Types: SidebarSectionItemData[];
+	Variables: SidebarSectionItemData[];
+}
+
+function groupMembers(members: readonly SidebarSectionItemData[]): GroupedMembers {
+	const Classes: SidebarSectionItemData[] = [];
+	const Enums: SidebarSectionItemData[] = [];
+	const Interfaces: SidebarSectionItemData[] = [];
+	const Types: SidebarSectionItemData[] = [];
+	const Variables: SidebarSectionItemData[] = [];
+	const Functions: SidebarSectionItemData[] = [];
 
 	for (const member of members) {
 		switch (member.kind) {
@@ -60,7 +65,7 @@ function groupMembers(members: Members): GroupedMembers {
 	return { Classes, Functions, Enums, Interfaces, Types, Variables };
 }
 
-function resolveIcon(item: keyof GroupedMembers) {
+function resolveIcon(item: string) {
 	switch (item) {
 		case 'Classes':
 			return <VscSymbolClass size={20} />;
@@ -77,15 +82,11 @@ function resolveIcon(item: keyof GroupedMembers) {
 	}
 }
 
-export function SidebarItems({ members }: { members: Members }) {
+export function Sidebar({ members }: { members: SidebarSectionItemData[] }) {
 	const pathname = usePathname();
-	const [asPathWithoutQueryAndAnchor, setAsPathWithoutQueryAndAnchor] = useState('');
+	const asPathWithoutQueryAndAnchor = `/${pathname?.split('/').splice(-1) ?? ''}`;
 	const { setOpened } = useNav();
 
-	useEffect(() => {
-		setAsPathWithoutQueryAndAnchor(pathname?.split('?')[0]?.split('#')[0] ?? '');
-	}, [pathname]);
-
 	const groupItems = useMemo(() => groupMembers(members), [members]);
 
 	return (
@@ -95,13 +96,13 @@ export function SidebarItems({ members }: { members: Members }) {
 				.map((group, idx) => (
 					<Section icon={resolveIcon(group)} key={idx} title={group}>
 						{groupItems[group].map((member, index) => (
-							<Link
+							<ItemLink
 								className={`dark:border-dark-100 border-light-800 focus:ring-width-2 focus:ring-blurple ml-5 flex flex-col border-l p-[5px] pl-6 outline-0 focus:rounded focus:border-0 focus:ring ${
-									asPathWithoutQueryAndAnchor === member.path
+									asPathWithoutQueryAndAnchor === member.href
 										? 'bg-blurple text-white'
 										: 'dark:hover:bg-dark-200 dark:active:bg-dark-100 hover:bg-light-700 active:bg-light-800'
 								}`}
-								href={member.path}
+								itemURI={member.href}
 								key={index}
 								onClick={() => setOpened(false)}
 								title={member.name}
@@ -112,7 +113,7 @@ export function SidebarItems({ members }: { members: Members }) {
 										<span className="text-xs">{member.overloadIndex}</span>
 									) : null}
 								</div>
-							</Link>
+							</ItemLink>
 						))}
 					</Section>
 				))}
diff --git a/apps/website/src/components/SignatureText.tsx b/apps/website/src/components/SignatureText.tsx
new file mode 100644
index 000000000..b8c29710f
--- /dev/null
+++ b/apps/website/src/components/SignatureText.tsx
@@ -0,0 +1,10 @@
+import type { ApiModel, Excerpt } from '@microsoft/api-extractor-model';
+import { ExcerptText } from './ExcerptText';
+
+export function SignatureText({ excerpt, model }: { excerpt: Excerpt; model: ApiModel }) {
+	return (
+		<h4 className="break-all font-mono text-lg font-bold">
+			<ExcerptText excerpt={excerpt} model={model} />
+		</h4>
+	);
+}
diff --git a/apps/website/src/components/Table.tsx b/apps/website/src/components/Table.tsx
index f05c21482..ee194eff3 100644
--- a/apps/website/src/components/Table.tsx
+++ b/apps/website/src/components/Table.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import { useMemo, type ReactNode } from 'react';
 
 export function Table({
diff --git a/apps/website/src/components/TableOfContentItems.tsx b/apps/website/src/components/TableOfContentItems.tsx
index 7bee31a43..eac96e726 100644
--- a/apps/website/src/components/TableOfContentItems.tsx
+++ b/apps/website/src/components/TableOfContentItems.tsx
@@ -1,59 +1,88 @@
 'use client';
 
-import type { ApiClassJSON, ApiInterfaceJSON } from '@discordjs/api-extractor-utils';
 import { VscListSelection } from '@react-icons/all-files/vsc/VscListSelection';
 import { VscSymbolMethod } from '@react-icons/all-files/vsc/VscSymbolMethod';
 import { VscSymbolProperty } from '@react-icons/all-files/vsc/VscSymbolProperty';
 import { useMemo } from 'react';
 
-export function TableOfContentItems({
-	methods,
-	properties,
-}: {
-	methods: ApiClassJSON['methods'] | ApiInterfaceJSON['methods'];
-	properties: ApiClassJSON['properties'] | ApiInterfaceJSON['properties'];
-}) {
+export interface TableOfContentsSerializedMethod {
+	kind: 'Method' | 'MethodSignature';
+	name: string;
+	overloadIndex?: number;
+}
+
+export interface TableOfContentsSerializedProperty {
+	kind: 'Property' | 'PropertySignature';
+	name: string;
+}
+
+export type TableOfContentsSerialized = TableOfContentsSerializedMethod | TableOfContentsSerializedProperty;
+
+export interface TableOfContentsItemProps {
+	serializedMembers: TableOfContentsSerialized[];
+}
+
+export function TableOfContentsPropertyItem({ property }: { property: TableOfContentsSerializedProperty }) {
+	return (
+		<a
+			className="dark:border-dark-100 border-light-800 dark:hover:bg-dark-200 dark:active:bg-dark-100 hover:bg-light-700 active:bg-light-800 pl-6.5 focus:ring-width-2 focus:ring-blurple ml-[10px] border-l p-[5px] text-sm outline-0 focus:rounded focus:border-0 focus:ring"
+			href={`#${property.name}`}
+			key={property.name}
+			title={property.name}
+		>
+			<span className="line-clamp-1">{property.name}</span>
+		</a>
+	);
+}
+
+export function TableOfContentsMethodItem({ method }: { method: TableOfContentsSerializedMethod }) {
+	if (method.overloadIndex && method.overloadIndex > 1) {
+		return null;
+	}
+
+	const key = `${method.name}${method.overloadIndex && method.overloadIndex > 1 ? `:${method.overloadIndex}` : ''}`;
+
+	return (
+		<a
+			className="dark:border-dark-100 border-light-800 dark:hover:bg-dark-200 dark:active:bg-dark-100 hover:bg-light-700 active:bg-light-800 pl-6.5 focus:ring-width-2 focus:ring-blurple ml-[10px] flex flex-row place-items-center gap-2 border-l p-[5px] text-sm outline-0 focus:rounded focus:border-0 focus:ring"
+			href={`#${key}`}
+			key={key}
+			title={method.name}
+		>
+			<span className="line-clamp-1">{method.name}</span>
+			{method.overloadIndex && method.overloadIndex > 1 ? (
+				<span className="text-xs">{method.overloadIndex}</span>
+			) : null}
+		</a>
+	);
+}
+
+export function TableOfContentItems({ serializedMembers }: TableOfContentsItemProps) {
 	const propertyItems = useMemo(
 		() =>
-			properties.map((prop) => (
-				<a
-					className="dark:border-dark-100 border-light-800 dark:hover:bg-dark-200 dark:active:bg-dark-100 hover:bg-light-700 active:bg-light-800 pl-6.5 focus:ring-width-2 focus:ring-blurple ml-[10px] border-l p-[5px] text-sm outline-0 focus:rounded focus:border-0 focus:ring"
-					href={`#${prop.name}`}
-					key={prop.name}
-					title={prop.name}
-				>
-					<span className="line-clamp-1">{prop.name}</span>
-				</a>
-			)),
-		[properties],
+			serializedMembers
+				.filter(
+					(member): member is TableOfContentsSerializedProperty =>
+						member.kind === 'Property' || member.kind === 'PropertySignature',
+				)
+				.map((prop) => <TableOfContentsPropertyItem key={prop.name} property={prop} />),
+		[serializedMembers],
 	);
 
 	const methodItems = useMemo(
 		() =>
-			methods.map((member) => {
-				if (member.overloadIndex && member.overloadIndex > 1) {
-					return null;
-				}
-
-				const key = `${member.name}${
-					member.overloadIndex && member.overloadIndex > 1 ? `:${member.overloadIndex}` : ''
-				}`;
-
-				return (
-					<a
-						className="dark:border-dark-100 border-light-800 dark:hover:bg-dark-200 dark:active:bg-dark-100 hover:bg-light-700 active:bg-light-800 pl-6.5 focus:ring-width-2 focus:ring-blurple ml-[10px] flex flex-row place-items-center gap-2 border-l p-[5px] text-sm outline-0 focus:rounded focus:border-0 focus:ring"
-						href={`#${key}`}
-						key={key}
-						title={member.name}
-					>
-						<span className="line-clamp-1">{member.name}</span>
-						{member.overloadIndex && member.overloadIndex > 1 ? (
-							<span className="text-xs">{member.overloadIndex}</span>
-						) : null}
-					</a>
-				);
-			}),
-		[methods],
+			serializedMembers
+				.filter(
+					(member): member is TableOfContentsSerializedMethod =>
+						member.kind === 'Method' || member.kind === 'MethodSignature',
+				)
+				.map((member) => (
+					<TableOfContentsMethodItem
+						key={`${member.name}${member.overloadIndex ? `:${member.overloadIndex}` : ''}`}
+						method={member}
+					/>
+				)),
+		[serializedMembers],
 	);
 
 	return (
diff --git a/apps/website/src/components/TypeParamTable.tsx b/apps/website/src/components/TypeParamTable.tsx
index 30fc8210b..cad4bc0cd 100644
--- a/apps/website/src/components/TypeParamTable.tsx
+++ b/apps/website/src/components/TypeParamTable.tsx
@@ -1,10 +1,8 @@
-'use client';
-
-import type { TypeParameterData } from '@discordjs/api-extractor-utils';
+import type { ApiTypeParameterListMixin } from '@microsoft/api-extractor-model';
 import { useMemo } from 'react';
-import { HyperlinkedText } from './HyperlinkedText';
+import { ExcerptText } from './ExcerptText';
 import { Table } from './Table';
-import { TSDoc } from './tsdoc/TSDoc';
+import { TSDoc } from './documentation/tsdoc/TSDoc';
 
 const rowElements = {
 	Name: 'font-mono whitespace-nowrap',
@@ -12,17 +10,22 @@ const rowElements = {
 	Default: 'font-mono whitespace-pre break-normal',
 };
 
-export function TypeParamTable({ data }: { data: TypeParameterData[] }) {
+export function TypeParamTable({ item }: { item: ApiTypeParameterListMixin }) {
+	const model = item.getAssociatedModel()!;
 	const rows = useMemo(
 		() =>
-			data.map((typeParam) => ({
+			item.typeParameters.map((typeParam) => ({
 				Name: typeParam.name,
-				Constraints: <HyperlinkedText tokens={typeParam.constraintTokens} />,
-				Optional: typeParam.optional ? 'Yes' : 'No',
-				Default: <HyperlinkedText tokens={typeParam.defaultTokens} />,
-				Description: typeParam.commentBlock ? <TSDoc node={typeParam.commentBlock} /> : 'None',
+				Constraints: <ExcerptText excerpt={typeParam.constraintExcerpt} model={model} />,
+				Optional: typeParam.isOptional ? 'Yes' : 'No',
+				Default: <ExcerptText excerpt={typeParam.defaultTypeExcerpt} model={model} />,
+				Description: typeParam.tsdocTypeParamBlock ? (
+					<TSDoc item={item} tsdoc={typeParam.tsdocTypeParamBlock.content} />
+				) : (
+					'None'
+				),
 			})),
-		[data],
+		[item, model],
 	);
 
 	return (
diff --git a/apps/website/src/components/documentation/Documentation.tsx b/apps/website/src/components/documentation/Documentation.tsx
new file mode 100644
index 000000000..223abdae7
--- /dev/null
+++ b/apps/website/src/components/documentation/Documentation.tsx
@@ -0,0 +1,8 @@
+import type { PropsWithChildren } from 'react';
+
+/**
+ * Layout parent of documentation pages.
+ */
+export function Documentation({ children }: PropsWithChildren) {
+	return <div className="w-full flex-col space-y-4">{children}</div>;
+}
diff --git a/apps/website/src/components/documentation/Header.tsx b/apps/website/src/components/documentation/Header.tsx
new file mode 100644
index 000000000..1e27d27e7
--- /dev/null
+++ b/apps/website/src/components/documentation/Header.tsx
@@ -0,0 +1,36 @@
+import { ApiItemKind } from '@microsoft/api-extractor-model';
+import { VscSymbolClass } from '@react-icons/all-files/vsc/VscSymbolClass';
+import { VscSymbolEnum } from '@react-icons/all-files/vsc/VscSymbolEnum';
+import { VscSymbolInterface } from '@react-icons/all-files/vsc/VscSymbolInterface';
+import { VscSymbolMethod } from '@react-icons/all-files/vsc/VscSymbolMethod';
+import { VscSymbolVariable } from '@react-icons/all-files/vsc/VscSymbolVariable';
+import type { PropsWithChildren } from 'react';
+
+function generateIcon(kind: ApiItemKind) {
+	switch (kind) {
+		case ApiItemKind.Class:
+			return <VscSymbolClass />;
+		case ApiItemKind.Function:
+		case ApiItemKind.Method:
+			return <VscSymbolMethod />;
+		case ApiItemKind.Enum:
+			return <VscSymbolEnum />;
+		case ApiItemKind.Interface:
+			return <VscSymbolInterface />;
+		case ApiItemKind.TypeAlias:
+			return <VscSymbolVariable />;
+		default:
+			return <VscSymbolMethod />;
+	}
+}
+
+export function Header({ kind, name }: PropsWithChildren<{ kind: ApiItemKind; name: string }>) {
+	return (
+		<div className="flex flex-col">
+			<h2 className="flex flex-row place-items-center gap-2 break-all text-2xl font-bold">
+				<span>{generateIcon(kind)}</span>
+				{name}
+			</h2>
+		</div>
+	);
+}
diff --git a/apps/website/src/components/documentation/HierarchyText.tsx b/apps/website/src/components/documentation/HierarchyText.tsx
new file mode 100644
index 000000000..dc5bd4007
--- /dev/null
+++ b/apps/website/src/components/documentation/HierarchyText.tsx
@@ -0,0 +1,51 @@
+import type { ApiClass, ApiInterface, Excerpt } from '@microsoft/api-extractor-model';
+import { ApiItemKind } from '@microsoft/api-extractor-model';
+import { ExcerptText } from '../ExcerptText';
+
+export function HierarchyText({ item, type }: { item: ApiClass | ApiInterface; type: 'Extends' | 'Implements' }) {
+	const model = item.getAssociatedModel()!;
+
+	if (
+		(item.kind === ApiItemKind.Class &&
+			(item as ApiClass).extendsType === undefined &&
+			(item as ApiClass).implementsTypes.length === 0) ||
+		(item.kind === ApiItemKind.Interface && !(item as ApiInterface).extendsTypes)
+	) {
+		return null;
+	}
+
+	let excerpts: Excerpt[];
+
+	if (item.kind === ApiItemKind.Class) {
+		if (type === 'Implements') {
+			if ((item as ApiClass).implementsTypes.length === 0) {
+				return null;
+			}
+
+			excerpts = (item as ApiClass).implementsTypes.map((typeExcerpt) => typeExcerpt.excerpt);
+		} else {
+			if (!(item as ApiClass).extendsType) {
+				return null;
+			}
+
+			excerpts = [(item as ApiClass).extendsType!.excerpt];
+		}
+	} else {
+		if ((item as ApiInterface).extendsTypes.length === 0) {
+			return null;
+		}
+
+		excerpts = (item as ApiInterface).extendsTypes.map((typeExcerpt) => typeExcerpt.excerpt);
+	}
+
+	return (
+		<div className="flex flex-row place-items-center gap-4">
+			<h3 className="text-xl font-bold">{type}</h3>
+			<span className="space-y-2 break-all font-mono">
+				{excerpts.map((excerpt, index) => (
+					<ExcerptText excerpt={excerpt} key={index} model={model} />
+				))}
+			</span>
+		</div>
+	);
+}
diff --git a/apps/website/src/components/documentation/MemberContainerDocumentation.tsx b/apps/website/src/components/documentation/MemberContainerDocumentation.tsx
new file mode 100644
index 000000000..244b3f9fe
--- /dev/null
+++ b/apps/website/src/components/documentation/MemberContainerDocumentation.tsx
@@ -0,0 +1,33 @@
+import type { ApiDeclaredItem, ApiItemContainerMixin, ApiTypeParameterListMixin } from '@microsoft/api-extractor-model';
+import type { ReactNode } from 'react';
+import { Outline } from '../Outline';
+import { SyntaxHighlighter } from '../SyntaxHighlighter';
+import { Documentation } from './Documentation';
+import { MethodsSection } from './section/MethodsSection';
+import { PropertiesSection } from './section/PropertiesSection';
+import { SummarySection } from './section/SummarySection';
+import { TypeParameterSection } from './section/TypeParametersSection';
+import { hasProperties, hasMethods, serializeMembers } from './util';
+
+export function MemberContainerDocumentation({
+	item,
+	version,
+	subheading,
+}: {
+	item: ApiDeclaredItem & ApiItemContainerMixin & ApiTypeParameterListMixin;
+	subheading?: ReactNode;
+	version: string;
+}) {
+	return (
+		<Documentation item={item}>
+			{subheading}
+			<SyntaxHighlighter code={item.excerpt.text} />
+			<SummarySection item={item} />
+			{item.typeParameters.length ? <TypeParameterSection item={item} /> : null}
+			{hasProperties(item) ? <PropertiesSection item={item} /> : null}
+			{hasMethods(item) ? <MethodsSection item={item} /> : null}
+
+			<Outline members={serializeMembers(item)} />
+		</Documentation>
+	);
+}
diff --git a/apps/website/src/components/documentation/Members.tsx b/apps/website/src/components/documentation/Members.tsx
new file mode 100644
index 000000000..8c21ceef8
--- /dev/null
+++ b/apps/website/src/components/documentation/Members.tsx
@@ -0,0 +1,13 @@
+import type { ApiDeclaredItem, ApiItemContainerMixin } from '@microsoft/api-extractor-model';
+import { MethodsSection } from './section/MethodsSection';
+import { PropertiesSection } from './section/PropertiesSection';
+import { hasProperties, hasMethods } from './util';
+
+export function Members({ item }: { item: ApiDeclaredItem & ApiItemContainerMixin }) {
+	return (
+		<>
+			{hasProperties(item) ? <PropertiesSection item={item} /> : null}
+			{hasMethods(item) ? <MethodsSection item={item} /> : null}
+		</>
+	);
+}
diff --git a/apps/website/src/components/documentation/ObjectHeader.tsx b/apps/website/src/components/documentation/ObjectHeader.tsx
new file mode 100644
index 000000000..acf41084c
--- /dev/null
+++ b/apps/website/src/components/documentation/ObjectHeader.tsx
@@ -0,0 +1,18 @@
+import type { ApiDeclaredItem, ApiItemContainerMixin } from '@microsoft/api-extractor-model';
+import { SyntaxHighlighter } from '../SyntaxHighlighter';
+import { Header } from './Header';
+import { SummarySection } from './section/SummarySection';
+
+export interface ObjectHeaderProps {
+	item: ApiDeclaredItem & ApiItemContainerMixin;
+}
+
+export function ObjectHeader({ item }: ObjectHeaderProps) {
+	return (
+		<>
+			<Header kind={item.kind} name={item.displayName} />
+			<SyntaxHighlighter code={item.excerpt.text} />
+			<SummarySection item={item} />
+		</>
+	);
+}
diff --git a/apps/website/src/components/documentation/section/ConstructorSection.tsx b/apps/website/src/components/documentation/section/ConstructorSection.tsx
new file mode 100644
index 000000000..eb07e6eb3
--- /dev/null
+++ b/apps/website/src/components/documentation/section/ConstructorSection.tsx
@@ -0,0 +1,30 @@
+import type { ApiConstructor } from '@microsoft/api-extractor-model';
+import { VscSymbolMethod } from '@react-icons/all-files/vsc/VscSymbolMethod';
+import { useCallback } from 'react';
+import { TSDoc } from '../tsdoc/TSDoc';
+import { ResponsiveSection } from './ResponsiveSection';
+import { ParameterTable } from '~/components/ParameterTable';
+
+export function ConstructorSection({ item }: { item: ApiConstructor }) {
+	const getShorthandName = useCallback(
+		(ctor: ApiConstructor) =>
+			`constructor(${ctor.parameters.reduce((prev, cur, index) => {
+				if (index === 0) {
+					return `${prev}${cur.isOptional ? `${cur.name}?` : cur.name}`;
+				}
+
+				return `${prev}, ${cur.isOptional ? `${cur.name}?` : cur.name}`;
+			}, '')})`,
+		[],
+	);
+
+	return (
+		<ResponsiveSection icon={<VscSymbolMethod size={20} />} padded title="Constructor">
+			<div className="flex flex-col gap-2">
+				<h4 className="break-all font-mono text-lg font-bold">{getShorthandName(item)}</h4>
+				{item.tsdocComment ? <TSDoc item={item} tsdoc={item.tsdocComment} /> : null}
+				<ParameterTable item={item} />
+			</div>
+		</ResponsiveSection>
+	);
+}
diff --git a/apps/website/src/components/documentation/section/MethodsSection.tsx b/apps/website/src/components/documentation/section/MethodsSection.tsx
new file mode 100644
index 000000000..84b7c263c
--- /dev/null
+++ b/apps/website/src/components/documentation/section/MethodsSection.tsx
@@ -0,0 +1,45 @@
+import type {
+	ApiDeclaredItem,
+	ApiItem,
+	ApiItemContainerMixin,
+	ApiMethod,
+	ApiMethodSignature,
+} from '@microsoft/api-extractor-model';
+import { ApiItemKind } from '@microsoft/api-extractor-model';
+import { VscSymbolMethod } from '@react-icons/all-files/vsc/VscSymbolMethod';
+import { useMemo, Fragment } from 'react';
+import { ResponsiveSection } from './ResponsiveSection';
+import { Method } from '~/components/model/method/Method';
+import { resolveMembers } from '~/util/members';
+
+function isMethodLike(item: ApiItem): item is ApiMethod | ApiMethodSignature {
+	return (
+		item.kind === ApiItemKind.Method ||
+		(item.kind === ApiItemKind.MethodSignature && (item as ApiMethod).overloadIndex <= 1)
+	);
+}
+
+export function MethodsSection({ item }: { item: ApiItemContainerMixin }) {
+	const members = resolveMembers(item, isMethodLike);
+
+	const methodItems = useMemo(
+		() =>
+			members.map(({ item: method, inherited }) => (
+				<Fragment
+					key={`${method.displayName}${
+						method.overloadIndex && method.overloadIndex > 1 ? `:${(method as ApiMethod).overloadIndex}` : ''
+					}`}
+				>
+					<Method inheritedFrom={inherited as ApiDeclaredItem & ApiItemContainerMixin} method={method} />
+					<div className="border-light-900 dark:border-dark-100 -mx-8 border-t-2" />
+				</Fragment>
+			)),
+		[members],
+	);
+
+	return (
+		<ResponsiveSection icon={<VscSymbolMethod size={20} />} padded title="Methods">
+			<div className="flex flex-col gap-4">{methodItems}</div>
+		</ResponsiveSection>
+	);
+}
diff --git a/apps/website/src/components/documentation/section/ParametersSection.tsx b/apps/website/src/components/documentation/section/ParametersSection.tsx
new file mode 100644
index 000000000..12e457b42
--- /dev/null
+++ b/apps/website/src/components/documentation/section/ParametersSection.tsx
@@ -0,0 +1,12 @@
+import type { ApiParameterListMixin } from '@microsoft/api-extractor-model';
+import { VscSymbolParameter } from '@react-icons/all-files/vsc/VscSymbolParameter';
+import { ResponsiveSection } from './ResponsiveSection';
+import { ParameterTable } from '~/components/ParameterTable';
+
+export function ParameterSection({ item }: { item: ApiParameterListMixin }) {
+	return (
+		<ResponsiveSection icon={<VscSymbolParameter size={20} />} padded title="Parameters">
+			<ParameterTable item={item} />
+		</ResponsiveSection>
+	);
+}
diff --git a/apps/website/src/components/documentation/section/PropertiesSection.tsx b/apps/website/src/components/documentation/section/PropertiesSection.tsx
new file mode 100644
index 000000000..53c6a3983
--- /dev/null
+++ b/apps/website/src/components/documentation/section/PropertiesSection.tsx
@@ -0,0 +1,12 @@
+import type { ApiItemContainerMixin } from '@microsoft/api-extractor-model';
+import { VscSymbolProperty } from '@react-icons/all-files/vsc/VscSymbolProperty';
+import { ResponsiveSection } from './ResponsiveSection';
+import { PropertyList } from '~/components/PropertyList';
+
+export function PropertiesSection({ item }: { item: ApiItemContainerMixin }) {
+	return (
+		<ResponsiveSection icon={<VscSymbolProperty size={20} />} padded title="Properties">
+			<PropertyList item={item} />
+		</ResponsiveSection>
+	);
+}
diff --git a/apps/website/src/components/documentation/section/ResponsiveSection.tsx b/apps/website/src/components/documentation/section/ResponsiveSection.tsx
new file mode 100644
index 000000000..b17113b86
--- /dev/null
+++ b/apps/website/src/components/documentation/section/ResponsiveSection.tsx
@@ -0,0 +1,24 @@
+'use client';
+
+import type { SectionOptions } from '@discordjs/ui';
+import { Section } from '@discordjs/ui';
+import type { PropsWithChildren } from 'react';
+import { useMedia } from 'react-use';
+
+export function ResponsiveSection(opts: PropsWithChildren<SectionOptions & { separator?: boolean }>) {
+	const matches = useMedia('(max-width: 768px)', true);
+
+	const { children, separator, ...rest } = opts;
+
+	const props = {
+		...rest,
+		dense: matches,
+	};
+
+	return (
+		<Section {...props}>
+			{children}
+			{separator ? <div className="border-light-900 dark:border-dark-100 -mx-8 mt-6 border-t-2" /> : null}
+		</Section>
+	);
+}
diff --git a/apps/website/src/components/documentation/section/SummarySection.tsx b/apps/website/src/components/documentation/section/SummarySection.tsx
new file mode 100644
index 000000000..ab44bad89
--- /dev/null
+++ b/apps/website/src/components/documentation/section/SummarySection.tsx
@@ -0,0 +1,16 @@
+import type { ApiDeclaredItem } from '@microsoft/api-extractor-model';
+import { VscListSelection } from '@react-icons/all-files/vsc/VscListSelection';
+import { TSDoc } from '../tsdoc/TSDoc';
+import { ResponsiveSection } from './ResponsiveSection';
+
+export function SummarySection({ item }: { item: ApiDeclaredItem }) {
+	return (
+		<ResponsiveSection icon={<VscListSelection size={20} />} padded separator title="Summary">
+			{item.tsdocComment?.summarySection ? (
+				<TSDoc item={item} tsdoc={item.tsdocComment} />
+			) : (
+				<p>No summary provided.</p>
+			)}
+		</ResponsiveSection>
+	);
+}
diff --git a/apps/website/src/components/documentation/section/TypeParametersSection.tsx b/apps/website/src/components/documentation/section/TypeParametersSection.tsx
new file mode 100644
index 000000000..8969bf279
--- /dev/null
+++ b/apps/website/src/components/documentation/section/TypeParametersSection.tsx
@@ -0,0 +1,12 @@
+import type { ApiTypeParameterListMixin } from '@microsoft/api-extractor-model';
+import { VscSymbolParameter } from '@react-icons/all-files/vsc/VscSymbolParameter';
+import { ResponsiveSection } from './ResponsiveSection';
+import { TypeParamTable } from '~/components/TypeParamTable';
+
+export function TypeParameterSection({ item }: { item: ApiTypeParameterListMixin }) {
+	return (
+		<ResponsiveSection icon={<VscSymbolParameter size={20} />} padded title="Type Parameters">
+			<TypeParamTable item={item} />
+		</ResponsiveSection>
+	);
+}
diff --git a/apps/website/src/components/documentation/tsdoc/BlockComment.tsx b/apps/website/src/components/documentation/tsdoc/BlockComment.tsx
new file mode 100644
index 000000000..924b28674
--- /dev/null
+++ b/apps/website/src/components/documentation/tsdoc/BlockComment.tsx
@@ -0,0 +1,38 @@
+import { Alert } from '@discordjs/ui';
+import type { PropsWithChildren } from 'react';
+
+export function Block({ children, title }: PropsWithChildren<{ title: string }>) {
+	return (
+		<div className="flex flex-col gap-2">
+			<h5 className="font-bold">{title}</h5>
+			{children}
+		</div>
+	);
+}
+
+export function ExampleBlock({
+	children,
+	exampleIndex,
+}: PropsWithChildren<{ exampleIndex?: number | undefined }>): JSX.Element {
+	return <Block title={`Example ${exampleIndex ? exampleIndex : ''}`}>{children}</Block>;
+}
+
+export function DefaultValueBlock({ children }: PropsWithChildren): JSX.Element {
+	return <Block title="Default value">{children}</Block>;
+}
+
+export function RemarksBlock({ children }: PropsWithChildren): JSX.Element {
+	return <Block title="Remarks">{children}</Block>;
+}
+
+export function DeprecatedBlock({ children }: PropsWithChildren): JSX.Element {
+	return (
+		<Alert title="Deprecated" type="danger">
+			{children}
+		</Alert>
+	);
+}
+
+export function SeeBlock({ children }: PropsWithChildren): JSX.Element {
+	return <Block title="See Also">{children}</Block>;
+}
diff --git a/apps/website/src/components/documentation/tsdoc/TSDoc.tsx b/apps/website/src/components/documentation/tsdoc/TSDoc.tsx
new file mode 100644
index 000000000..f0771fe7a
--- /dev/null
+++ b/apps/website/src/components/documentation/tsdoc/TSDoc.tsx
@@ -0,0 +1,121 @@
+import type { ApiItem } from '@microsoft/api-extractor-model';
+import type { DocComment, DocFencedCode, DocLinkTag, DocNode, DocNodeContainer, DocPlainText } from '@microsoft/tsdoc';
+import { DocNodeKind, StandardTags } from '@microsoft/tsdoc';
+import Link from 'next/link';
+import { Fragment, useCallback, type ReactNode } from 'react';
+import { SyntaxHighlighter } from '../../SyntaxHighlighter';
+import { resolveItemURI } from '../util';
+import { DeprecatedBlock, ExampleBlock, RemarksBlock, SeeBlock } from './BlockComment';
+import { ItemLink } from '~/components/ItemLink';
+
+export function TSDoc({ item, tsdoc }: { item: ApiItem; tsdoc: DocNode }): JSX.Element {
+	const createNode = useCallback(
+		(tsdoc: DocNode, idx?: number): ReactNode => {
+			switch (tsdoc.kind) {
+				case DocNodeKind.PlainText:
+					return (
+						<span className="break-words" key={idx}>
+							{(tsdoc as DocPlainText).text}
+						</span>
+					);
+				case DocNodeKind.Section:
+				case DocNodeKind.Paragraph:
+					return (
+						<span className="break-words leading-relaxed" key={idx}>
+							{(tsdoc as DocNodeContainer).nodes.map((node, idx) => createNode(node, idx))}
+						</span>
+					);
+				case DocNodeKind.SoftBreak:
+					return <Fragment key={idx} />;
+				case DocNodeKind.LinkTag: {
+					const { codeDestination, urlDestination, linkText } = tsdoc as DocLinkTag;
+
+					if (codeDestination) {
+						const foundItem = item
+							.getAssociatedModel()
+							?.resolveDeclarationReference(codeDestination, item).resolvedApiItem;
+
+						if (!foundItem) return null;
+
+						return (
+							<ItemLink
+								className="text-blurple focus:ring-width-2 focus:ring-blurple rounded font-mono outline-0 focus:ring"
+								itemURI={resolveItemURI(foundItem)}
+								key={idx}
+							>
+								{linkText ?? foundItem.displayName}
+							</ItemLink>
+						);
+					}
+
+					if (urlDestination) {
+						return (
+							<Link
+								className="text-blurple focus:ring-width-2 focus:ring-blurple rounded font-mono outline-0 focus:ring"
+								href={urlDestination}
+								key={idx}
+							>
+								{linkText ?? urlDestination}
+							</Link>
+						);
+					}
+
+					return null;
+				}
+
+				case DocNodeKind.CodeSpan: {
+					const { code } = tsdoc as DocFencedCode;
+					return (
+						<code className="font-mono text-sm" key={idx}>
+							{code}
+						</code>
+					);
+				}
+
+				case DocNodeKind.FencedCode: {
+					const { language, code } = tsdoc as DocFencedCode;
+					return <SyntaxHighlighter code={code} key={idx} language={language} />;
+				}
+
+				case DocNodeKind.Comment: {
+					const comment = tsdoc as DocComment;
+
+					const exampleBlocks = comment.customBlocks.filter(
+						(block) => block.blockTag.tagName.toUpperCase() === StandardTags.example.tagNameWithUpperCase,
+					);
+
+					return (
+						<div className="flex flex-col space-y-2">
+							{comment.deprecatedBlock ? (
+								<DeprecatedBlock>{createNode(comment.deprecatedBlock.content)}</DeprecatedBlock>
+							) : null}
+							{comment.summarySection ? createNode(comment.summarySection) : null}
+							{comment.remarksBlock ? <RemarksBlock>{createNode(comment.remarksBlock.content)}</RemarksBlock> : null}
+							{exampleBlocks.length
+								? exampleBlocks.map((block, idx) => <ExampleBlock key={idx}>{createNode(block.content)}</ExampleBlock>)
+								: null}
+							{comment.seeBlocks.length ? (
+								<SeeBlock>{comment.seeBlocks.map((seeBlock, idx) => createNode(seeBlock.content, idx))}</SeeBlock>
+							) : null}
+						</div>
+					);
+				}
+
+				default:
+					// console.log(`Captured unknown node kind: ${node.kind}`);
+					return null;
+			}
+		},
+		[item],
+	);
+
+	return (
+		<>
+			{tsdoc.kind === 'Paragraph' || tsdoc.kind === 'Section' ? (
+				<>{(tsdoc as DocNodeContainer).nodes.map((node, idx) => createNode(node, idx))}</>
+			) : (
+				createNode(tsdoc)
+			)}
+		</>
+	);
+}
diff --git a/apps/website/src/components/documentation/util.ts b/apps/website/src/components/documentation/util.ts
new file mode 100644
index 000000000..72f7d7097
--- /dev/null
+++ b/apps/website/src/components/documentation/util.ts
@@ -0,0 +1,53 @@
+import { ApiItemKind } from '@microsoft/api-extractor-model';
+import type {
+	ApiItem,
+	ApiItemContainerMixin,
+	ApiMethod,
+	ApiMethodSignature,
+	ApiProperty,
+	ApiPropertySignature,
+} from '@microsoft/api-extractor-model';
+import type { TableOfContentsSerialized } from '../TableOfContentItems';
+import { resolveMembers } from '~/util/members';
+
+export function hasProperties(item: ApiItemContainerMixin) {
+	return resolveMembers(item, memberPredicate).some(
+		({ item: member }) => member.kind === ApiItemKind.Property || member.kind === ApiItemKind.PropertySignature,
+	);
+}
+
+export function hasMethods(item: ApiItemContainerMixin) {
+	return resolveMembers(item, memberPredicate).some(
+		({ item: member }) => member.kind === ApiItemKind.Method || member.kind === ApiItemKind.MethodSignature,
+	);
+}
+
+export function resolveItemURI(item: ApiItem): string {
+	return `/${item.displayName}:${item.kind}`;
+}
+
+function memberPredicate(item: ApiItem): item is ApiMethod | ApiMethodSignature | ApiProperty | ApiPropertySignature {
+	return (
+		item.kind === ApiItemKind.Property ||
+		item.kind === ApiItemKind.PropertySignature ||
+		item.kind === ApiItemKind.Method ||
+		item.kind === ApiItemKind.MethodSignature
+	);
+}
+
+export function serializeMembers(clazz: ApiItemContainerMixin): TableOfContentsSerialized[] {
+	return resolveMembers(clazz, memberPredicate).map(({ item: member }) => {
+		if (member.kind === 'Method' || member.kind === 'MethodSignature') {
+			return {
+				kind: member.kind as 'Method' | 'MethodSignature',
+				name: member.displayName,
+			};
+		} else {
+			return {
+				kind: member.kind as 'Property' | 'PropertySignature',
+				name: member.displayName,
+				overloadIndex: (member as ApiMethod | ApiMethodSignature).overloadIndex,
+			};
+		}
+	});
+}
diff --git a/apps/website/src/components/model/Class.tsx b/apps/website/src/components/model/Class.tsx
index 65f6d3957..2ead692cb 100644
--- a/apps/website/src/components/model/Class.tsx
+++ b/apps/website/src/components/model/Class.tsx
@@ -1,25 +1,28 @@
-'use client';
+import type { ApiClass, ApiConstructor } from '@microsoft/api-extractor-model';
+import { ApiItemKind } from '@microsoft/api-extractor-model';
+import { Outline } from '../Outline';
+import { Documentation } from '../documentation/Documentation';
+import { HierarchyText } from '../documentation/HierarchyText';
+import { Members } from '../documentation/Members';
+import { ObjectHeader } from '../documentation/ObjectHeader';
+import { ConstructorSection } from '../documentation/section/ConstructorSection';
+import { TypeParameterSection } from '../documentation/section/TypeParametersSection';
+import { serializeMembers } from '../documentation/util';
 
-import type { ApiClassJSON } from '@discordjs/api-extractor-utils';
-import { DocContainer } from '../DocContainer';
-import { ConstructorSection, MethodsSection, PropertiesSection } from '../Sections';
+export function Class({ clazz }: { clazz: ApiClass }) {
+	const constructor = clazz.members.find((member) => member.kind === ApiItemKind.Constructor) as
+		| ApiConstructor
+		| undefined;
 
-export function Class({ data }: { data: ApiClassJSON }) {
 	return (
-		<DocContainer
-			excerpt={data.excerpt}
-			extendsTokens={data.extendsTokens}
-			implementsTokens={data.implementsTokens}
-			kind={data.kind}
-			methods={data.methods}
-			name={data.name}
-			properties={data.properties}
-			summary={data.summary}
-			typeParams={data.typeParameters}
-		>
-			{data.constructor ? <ConstructorSection data={data.constructor} /> : null}
-			<PropertiesSection data={data.properties} />
-			<MethodsSection data={data.methods} />
-		</DocContainer>
+		<Documentation>
+			<ObjectHeader item={clazz} />
+			<HierarchyText item={clazz} type="Extends" />
+			<HierarchyText item={clazz} type="Implements" />
+			{clazz.typeParameters.length ? <TypeParameterSection item={clazz} /> : null}
+			{constructor ? <ConstructorSection item={constructor} /> : null}
+			<Members item={clazz} />
+			<Outline members={serializeMembers(clazz)} />
+		</Documentation>
 	);
 }
diff --git a/apps/website/src/components/model/Enum.tsx b/apps/website/src/components/model/Enum.tsx
deleted file mode 100644
index d317d85df..000000000
--- a/apps/website/src/components/model/Enum.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-'use client';
-
-import type { ApiEnumJSON } from '@discordjs/api-extractor-utils';
-import { Section } from '@discordjs/ui';
-import { VscSymbolEnumMember } from '@react-icons/all-files/vsc/VscSymbolEnumMember';
-import { Fragment } from 'react';
-import { useMedia } from 'react-use';
-import { CodeListing, CodeListingSeparatorType } from '../CodeListing';
-import { DocContainer } from '../DocContainer';
-
-export function Enum({ data }: { data: ApiEnumJSON }) {
-	const matches = useMedia('(max-width: 768px)', true);
-
-	return (
-		<DocContainer excerpt={data.excerpt} kind={data.kind} name={data.name} summary={data.summary}>
-			<Section dense={matches} icon={<VscSymbolEnumMember size={20} />} padded title="Members">
-				<div className="flex flex-col gap-4">
-					{data.members.map((member) => (
-						<Fragment key={member.name}>
-							<CodeListing
-								name={member.name}
-								separator={CodeListingSeparatorType.Value}
-								summary={member.summary}
-								typeTokens={member.initializerTokens}
-							/>
-							<div className="border-light-900 dark:border-dark-100 -mx-8 border-t-2" />
-						</Fragment>
-					))}
-				</div>
-			</Section>
-		</DocContainer>
-	);
-}
diff --git a/apps/website/src/components/model/Function.tsx b/apps/website/src/components/model/Function.tsx
deleted file mode 100644
index 99b5df3dd..000000000
--- a/apps/website/src/components/model/Function.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-'use client';
-
-import type { ApiFunctionJSON } from '@discordjs/api-extractor-utils';
-import { VscChevronDown } from '@react-icons/all-files/vsc/VscChevronDown';
-import { VscVersions } from '@react-icons/all-files/vsc/VscVersions';
-import { Menu, MenuButton, MenuItem, useMenuState } from 'ariakit/menu';
-import { useState } from 'react';
-import { DocContainer } from '../DocContainer';
-import { ParametersSection } from '../Sections';
-
-export function Function({ data }: { data: ApiFunctionJSON }) {
-	const [overloadIndex, setOverloadIndex] = useState(1);
-	const overloadedData = data.mergedSiblings[overloadIndex - 1]!;
-	const menu = useMenuState({ gutter: 8, sameWidth: true, fitViewport: true });
-
-	return (
-		<DocContainer
-			excerpt={overloadedData.excerpt}
-			kind={overloadedData.kind}
-			name={`${overloadedData.name}${
-				overloadedData.overloadIndex && overloadedData.overloadIndex > 1 ? ` (${overloadedData.overloadIndex})` : ''
-			}`}
-			subHeading={
-				data.mergedSiblings.length > 1 ? (
-					<div className="flex flex-row place-items-center gap-2">
-						<MenuButton
-							className="bg-light-600 hover:bg-light-700 active:bg-light-800 dark:bg-dark-600 dark:hover:bg-dark-500 dark:active:bg-dark-400 focus:ring-width-2 focus:ring-blurple rounded p-3 outline-0 focus:ring"
-							state={menu}
-						>
-							<div className="flex flex-row place-content-between place-items-center gap-2">
-								<VscVersions size={20} />
-								<div>
-									<span className="font-semibold">{`Overload ${overloadIndex}`}</span>
-									{` of ${data.mergedSiblings.length}`}
-								</div>
-								<VscChevronDown
-									className={`transform transition duration-150 ease-in-out ${menu.open ? 'rotate-180' : 'rotate-0'}`}
-									size={20}
-								/>
-							</div>
-						</MenuButton>
-						<Menu
-							className="dark:bg-dark-600 border-light-800 dark:border-dark-100 focus:ring-width-2 focus:ring-blurple z-20 flex flex-col rounded border bg-white p-1 outline-0 focus:ring"
-							state={menu}
-						>
-							{data.mergedSiblings.map((_, idx) => (
-								<MenuItem
-									className="hover:bg-light-700 active:bg-light-800 dark:bg-dark-600 dark:hover:bg-dark-500 dark:active:bg-dark-400 focus:ring-width-2 focus:ring-blurple my-0.5 cursor-pointer rounded bg-white p-3 text-sm outline-0 focus:ring"
-									key={idx}
-									onClick={() => setOverloadIndex(idx + 1)}
-								>
-									{`Overload ${idx + 1}`}
-								</MenuItem>
-							))}
-						</Menu>
-					</div>
-				) : null
-			}
-			summary={overloadedData.summary}
-			typeParams={overloadedData.typeParameters}
-		>
-			<ParametersSection data={overloadedData.parameters} />
-		</DocContainer>
-	);
-}
diff --git a/apps/website/src/components/model/Interface.tsx b/apps/website/src/components/model/Interface.tsx
index 8065836d8..9f19e371c 100644
--- a/apps/website/src/components/model/Interface.tsx
+++ b/apps/website/src/components/model/Interface.tsx
@@ -1,22 +1,20 @@
-'use client';
+import type { ApiInterface } from '@microsoft/api-extractor-model';
+import { Outline } from '../Outline';
+import { Documentation } from '../documentation/Documentation';
+import { HierarchyText } from '../documentation/HierarchyText';
+import { Members } from '../documentation/Members';
+import { ObjectHeader } from '../documentation/ObjectHeader';
+import { TypeParameterSection } from '../documentation/section/TypeParametersSection';
+import { serializeMembers } from '../documentation/util';
 
-import type { ApiInterfaceJSON } from '@discordjs/api-extractor-utils';
-import { DocContainer } from '../DocContainer';
-import { MethodsSection, PropertiesSection } from '../Sections';
-
-export function Interface({ data }: { data: ApiInterfaceJSON }) {
+export function Interface({ item }: { item: ApiInterface }) {
 	return (
-		<DocContainer
-			excerpt={data.excerpt}
-			kind={data.kind}
-			methods={data.methods}
-			name={data.name}
-			properties={data.properties}
-			summary={data.summary}
-			typeParams={data.typeParameters}
-		>
-			<PropertiesSection data={data.properties} />
-			<MethodsSection data={data.methods} />
-		</DocContainer>
+		<Documentation>
+			<ObjectHeader item={item} />
+			<HierarchyText item={item} type="Extends" />
+			{item.typeParameters.length ? <TypeParameterSection item={item} /> : null}
+			<Members item={item} />
+			<Outline members={serializeMembers(item)} />
+		</Documentation>
 	);
 }
diff --git a/apps/website/src/components/model/TypeAlias.tsx b/apps/website/src/components/model/TypeAlias.tsx
index 1f09e32b4..981b202ea 100644
--- a/apps/website/src/components/model/TypeAlias.tsx
+++ b/apps/website/src/components/model/TypeAlias.tsx
@@ -1,16 +1,13 @@
-'use client';
+import type { ApiTypeAlias } from '@microsoft/api-extractor-model';
+import { SyntaxHighlighter } from '../SyntaxHighlighter';
+import { Documentation } from '../documentation/Documentation';
+import { SummarySection } from '../documentation/section/SummarySection';
 
-import type { ApiTypeAliasJSON } from '@discordjs/api-extractor-utils';
-import { DocContainer } from '../DocContainer';
-
-export function TypeAlias({ data }: { data: ApiTypeAliasJSON }) {
+export function TypeAlias({ item }: { item: ApiTypeAlias }) {
 	return (
-		<DocContainer
-			excerpt={data.excerpt}
-			kind={data.kind}
-			name={data.name}
-			summary={data.summary}
-			typeParams={data.typeParameters}
-		/>
+		<Documentation item={item}>
+			<SyntaxHighlighter code={item.excerpt.text} />
+			<SummarySection item={item} />
+		</Documentation>
 	);
 }
diff --git a/apps/website/src/components/model/Variable.tsx b/apps/website/src/components/model/Variable.tsx
index 356156a6f..e841897b6 100644
--- a/apps/website/src/components/model/Variable.tsx
+++ b/apps/website/src/components/model/Variable.tsx
@@ -1,8 +1,13 @@
-'use client';
+import type { ApiVariable } from '@microsoft/api-extractor-model';
+import { SyntaxHighlighter } from '../SyntaxHighlighter';
+import { Documentation } from '../documentation/Documentation';
+import { SummarySection } from '../documentation/section/SummarySection';
 
-import type { ApiVariableJSON } from '@discordjs/api-extractor-utils';
-import { DocContainer } from '../DocContainer';
-
-export function Variable({ data }: { data: ApiVariableJSON }) {
-	return <DocContainer excerpt={data.excerpt} kind={data.kind} name={data.name} summary={data.summary} />;
+export function Variable({ item }: { item: ApiVariable }) {
+	return (
+		<Documentation item={item}>
+			<SyntaxHighlighter code={item.excerpt.text} />
+			<SummarySection item={item} />
+		</Documentation>
+	);
 }
diff --git a/apps/website/src/components/model/enum/Enum.tsx b/apps/website/src/components/model/enum/Enum.tsx
new file mode 100644
index 000000000..e6a93037e
--- /dev/null
+++ b/apps/website/src/components/model/enum/Enum.tsx
@@ -0,0 +1,26 @@
+import type { ApiEnum } from '@microsoft/api-extractor-model';
+import { VscSymbolEnum } from '@react-icons/all-files/vsc/VscSymbolEnum';
+import { Documentation } from '../../documentation/Documentation';
+import { EnumMember } from './EnumMember';
+import { Panel } from '~/components/Panel';
+import { SyntaxHighlighter } from '~/components/SyntaxHighlighter';
+import { ResponsiveSection } from '~/components/documentation/section/ResponsiveSection';
+import { SummarySection } from '~/components/documentation/section/SummarySection';
+
+export function Enum({ item }: { item: ApiEnum }) {
+	return (
+		<Documentation item={item}>
+			<SyntaxHighlighter code={item.excerpt.text} />
+			<SummarySection item={item} />
+			<ResponsiveSection icon={<VscSymbolEnum size={20} />} padded title="Members">
+				<div className="flex flex-col gap-4">
+					{item.members.map((member) => (
+						<Panel key={member.containerKey}>
+							<EnumMember member={member} />
+						</Panel>
+					))}
+				</div>
+			</ResponsiveSection>
+		</Documentation>
+	);
+}
diff --git a/apps/website/src/components/model/enum/EnumMember.tsx b/apps/website/src/components/model/enum/EnumMember.tsx
new file mode 100644
index 000000000..8775eac55
--- /dev/null
+++ b/apps/website/src/components/model/enum/EnumMember.tsx
@@ -0,0 +1,20 @@
+import type { ApiEnumMember } from '@microsoft/api-extractor-model';
+import { Anchor } from '~/components/Anchor';
+import { NameText } from '~/components/NameText';
+import { SignatureText } from '~/components/SignatureText';
+import { TSDoc } from '~/components/documentation/tsdoc/TSDoc';
+
+export function EnumMember({ member }: { member: ApiEnumMember }) {
+	return (
+		<div className="flex flex-col">
+			<div className="md:-ml-8.5 flex flex-col gap-2 md:flex-row md:place-items-center">
+				<Anchor href={`#${member.displayName}`} />
+				<NameText name={member.name} />
+				{member.initializerExcerpt ? (
+					<SignatureText excerpt={member.initializerExcerpt} model={member.getAssociatedModel()!} />
+				) : null}
+			</div>
+			{member.tsdocComment ? <TSDoc item={member} tsdoc={member.tsdocComment.summarySection} /> : null}
+		</div>
+	);
+}
diff --git a/apps/website/src/components/model/function/Function.tsx b/apps/website/src/components/model/function/Function.tsx
new file mode 100644
index 000000000..66f172de1
--- /dev/null
+++ b/apps/website/src/components/model/function/Function.tsx
@@ -0,0 +1,28 @@
+import type { ApiFunction } from '@microsoft/api-extractor-model';
+import { OverloadSwitcher } from '../../OverloadSwitcher';
+import { FunctionBody } from './FunctionBody';
+import { Header } from '~/components/documentation/Header';
+
+export function Function({ item }: { item: ApiFunction }) {
+	const header = <Header kind={item.kind} name={item.name} />;
+
+	if (item.getMergedSiblings().length > 1) {
+		const overloads = item
+			.getMergedSiblings()
+			.map((sibling, idx) => <FunctionBody item={sibling as ApiFunction} key={idx} />);
+
+		return (
+			<div>
+				{header}
+				<OverloadSwitcher overloads={overloads} />
+			</div>
+		);
+	}
+
+	return (
+		<div>
+			<Header kind={item.kind} name={item.name} />
+			<FunctionBody item={item} />
+		</div>
+	);
+}
diff --git a/apps/website/src/components/model/function/FunctionBody.tsx b/apps/website/src/components/model/function/FunctionBody.tsx
new file mode 100644
index 000000000..765c3266e
--- /dev/null
+++ b/apps/website/src/components/model/function/FunctionBody.tsx
@@ -0,0 +1,23 @@
+import type { ApiFunction } from '@microsoft/api-extractor-model';
+import { SyntaxHighlighter } from '~/components/SyntaxHighlighter';
+import { Documentation } from '~/components/documentation/Documentation';
+import { Header } from '~/components/documentation/Header';
+import { ParameterSection } from '~/components/documentation/section/ParametersSection';
+import { SummarySection } from '~/components/documentation/section/SummarySection';
+import { TypeParameterSection } from '~/components/documentation/section/TypeParametersSection';
+
+export interface FunctionBodyProps {
+	mergedSiblingCount: number;
+	overloadDocumentation: React.ReactNode[];
+}
+
+export function FunctionBody({ item }: { item: ApiFunction }) {
+	return (
+		<Documentation item={item} showHeader={false}>
+			<SyntaxHighlighter code={item.excerpt.text} />
+			<SummarySection item={item} />
+			{item.typeParameters.length ? <TypeParameterSection item={item} /> : null}
+			<ParameterSection item={item} />
+		</Documentation>
+	);
+}
diff --git a/apps/website/src/components/model/method/Method.tsx b/apps/website/src/components/model/method/Method.tsx
new file mode 100644
index 000000000..f475b8be6
--- /dev/null
+++ b/apps/website/src/components/model/method/Method.tsx
@@ -0,0 +1,39 @@
+import type {
+	ApiDeclaredItem,
+	ApiItemContainerMixin,
+	ApiMethod,
+	ApiMethodSignature,
+} from '@microsoft/api-extractor-model';
+import { OverloadSwitcher } from '../../OverloadSwitcher';
+import { MethodDocumentation } from './MethodDocumentation';
+import { MethodHeader } from './MethodHeader';
+
+export function Method({
+	method,
+	inheritedFrom,
+}: {
+	inheritedFrom?: (ApiDeclaredItem & ApiItemContainerMixin) | undefined;
+	method: ApiMethod | ApiMethodSignature;
+}) {
+	if (method.getMergedSiblings().length > 1) {
+		// We have overloads, use the overload switcher, but render
+		// each overload node on the server.
+		const overloads = method
+			.getMergedSiblings()
+			.map((sibling, idx) => <MethodDocumentation key={idx} method={sibling as ApiMethod | ApiMethodSignature} />);
+
+		return (
+			<OverloadSwitcher overloads={overloads}>
+				<MethodHeader method={method} />
+			</OverloadSwitcher>
+		);
+	}
+
+	// We have just a single method, render it on the server.
+	return (
+		<>
+			<MethodHeader method={method} />
+			<MethodDocumentation inheritedFrom={inheritedFrom} method={method} />
+		</>
+	);
+}
diff --git a/apps/website/src/components/model/method/MethodDocumentation.tsx b/apps/website/src/components/model/method/MethodDocumentation.tsx
new file mode 100644
index 000000000..bf75419e1
--- /dev/null
+++ b/apps/website/src/components/model/method/MethodDocumentation.tsx
@@ -0,0 +1,32 @@
+import type {
+	ApiDeclaredItem,
+	ApiItemContainerMixin,
+	ApiMethod,
+	ApiMethodSignature,
+} from '@microsoft/api-extractor-model';
+import type { DocSection } from '@microsoft/tsdoc';
+import { InheritanceText } from '~/components/InheritanceText';
+import { ParameterTable } from '~/components/ParameterTable';
+import { TSDoc } from '~/components/documentation/tsdoc/TSDoc';
+
+export interface MethodDocumentationProps {
+	fallbackSummary?: DocSection;
+	inheritedFrom?: (ApiDeclaredItem & ApiItemContainerMixin) | undefined;
+	method: ApiMethod | ApiMethodSignature;
+}
+
+export function MethodDocumentation({ method, fallbackSummary, inheritedFrom }: MethodDocumentationProps) {
+	const parent = method.parent as ApiDeclaredItem;
+
+	if (!(method.tsdocComment?.summarySection || method.parameters.length > 0)) {
+		return null;
+	}
+
+	return (
+		<div className="mb-4 flex flex-col gap-4">
+			{method.tsdocComment ? <TSDoc item={method} tsdoc={method.tsdocComment} /> : null}
+			{method.parameters.length ? <ParameterTable item={method} /> : null}
+			{inheritedFrom && parent ? <InheritanceText parent={inheritedFrom} /> : null}
+		</div>
+	);
+}
diff --git a/apps/website/src/components/model/method/MethodHeader.tsx b/apps/website/src/components/model/method/MethodHeader.tsx
new file mode 100644
index 000000000..61ffa38dc
--- /dev/null
+++ b/apps/website/src/components/model/method/MethodHeader.tsx
@@ -0,0 +1,62 @@
+import type { ApiMethod, ApiMethodSignature } from '@microsoft/api-extractor-model';
+import { ApiItemKind } from '@microsoft/api-extractor-model';
+import { useCallback, useMemo } from 'react';
+import { Anchor } from '~/components/Anchor';
+import { ExcerptText } from '~/components/ExcerptText';
+
+export function MethodHeader({ method }: { method: ApiMethod | ApiMethodSignature }) {
+	const isDeprecated = Boolean(method.tsdocComment?.deprecatedBlock);
+
+	const key = useMemo(
+		() => `${method.displayName}${method.overloadIndex && method.overloadIndex > 1 ? `:${method.overloadIndex}` : ''}`,
+		[method.displayName, method.overloadIndex],
+	);
+
+	const getShorthandName = useCallback(
+		(method: ApiMethod | ApiMethodSignature) =>
+			`${method.name}${method.isOptional ? '?' : ''}(${method.parameters.reduce((prev, cur, index) => {
+				if (index === 0) {
+					return `${prev}${cur.isOptional ? `${cur.name}?` : cur.name}`;
+				}
+
+				return `${prev}, ${cur.isOptional ? `${cur.name}?` : cur.name}`;
+			}, '')})`,
+		[],
+	);
+
+	return (
+		<div className="flex flex-col">
+			<div className="flex flex-col gap-2 md:-ml-9 md:flex-row md:place-items-center">
+				<Anchor href={`#${key}`} />
+				{isDeprecated ||
+				(method.kind === ApiItemKind.Method && (method as ApiMethod).isProtected) ||
+				(method.kind === ApiItemKind.Method && (method as ApiMethod).isStatic) ? (
+					<div className="flex flex-row gap-1">
+						{isDeprecated ? (
+							<div className="flex h-5 flex-row place-content-center place-items-center rounded-full bg-red-500 px-3 text-center text-xs font-semibold uppercase text-white">
+								Deprecated
+							</div>
+						) : null}
+						{method.kind === ApiItemKind.Method && (method as ApiMethod).isProtected ? (
+							<div className="bg-blurple flex h-5 flex-row place-content-center place-items-center rounded-full px-3 text-center text-xs font-semibold uppercase text-white">
+								Protected
+							</div>
+						) : null}
+						{method.kind === ApiItemKind.Method && (method as ApiMethod).isStatic ? (
+							<div className="bg-blurple flex h-5 flex-row place-content-center place-items-center rounded-full px-3 text-center text-xs font-semibold uppercase text-white">
+								Static
+							</div>
+						) : null}
+					</div>
+				) : null}
+				<div className="flex flex-row flex-wrap gap-1">
+					<h4 className="break-all font-mono text-lg font-bold">{getShorthandName(method)}</h4>
+					<h4 className="font-mono text-lg font-bold">:</h4>
+					<h4 className="break-all font-mono text-lg font-bold">
+						<ExcerptText excerpt={method.returnTypeExcerpt} model={method.getAssociatedModel()!} />
+					</h4>
+				</div>
+			</div>
+		</div>
+	);
+}
diff --git a/apps/website/src/components/tsdoc/BlockComment.tsx b/apps/website/src/components/tsdoc/BlockComment.tsx
deleted file mode 100644
index 249de9e4c..000000000
--- a/apps/website/src/components/tsdoc/BlockComment.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-'use client';
-
-import { Alert } from '@discordjs/ui';
-import { StandardTags } from '@microsoft/tsdoc';
-import type { PropsWithChildren } from 'react';
-
-export function Block({ children, title }: PropsWithChildren<{ title: string }>) {
-	return (
-		<div className="flex flex-col gap-2">
-			<h5 className="font-bold">{title}</h5>
-			{children}
-		</div>
-	);
-}
-
-export function ExampleBlock({
-	children,
-	exampleIndex,
-}: PropsWithChildren<{ exampleIndex?: number | undefined }>): JSX.Element {
-	return <Block title={`Example ${exampleIndex ? exampleIndex : ''}`}>{children}</Block>;
-}
-
-export function DefaultValueBlock({ children }: PropsWithChildren): JSX.Element {
-	return <Block title="Default value">{children}</Block>;
-}
-
-export function RemarksBlock({ children }: PropsWithChildren): JSX.Element {
-	return <Block title="Remarks">{children}</Block>;
-}
-
-export function BlockComment({
-	children,
-	tagName,
-	index,
-}: PropsWithChildren<{
-	index?: number | undefined;
-	tagName: string;
-}>): JSX.Element {
-	switch (tagName.toUpperCase()) {
-		case StandardTags.example.tagNameWithUpperCase:
-			return <ExampleBlock exampleIndex={index}>{children}</ExampleBlock>;
-		case StandardTags.deprecated.tagNameWithUpperCase:
-			return (
-				<Alert title="Deprecated" type="danger">
-					{children}
-				</Alert>
-			);
-		case StandardTags.remarks.tagNameWithUpperCase:
-			return <RemarksBlock>{children}</RemarksBlock>;
-		case StandardTags.defaultValue.tagNameWithUpperCase:
-			return <DefaultValueBlock>{children}</DefaultValueBlock>;
-		case StandardTags.typeParam.tagNameWithUpperCase:
-		case StandardTags.param.tagNameWithUpperCase:
-			return <span>{children}</span>;
-		default: // TODO: Support more blocks in the future.
-			return <>{children}</>;
-	}
-}
diff --git a/apps/website/src/components/tsdoc/TSDoc.tsx b/apps/website/src/components/tsdoc/TSDoc.tsx
deleted file mode 100644
index 169b90d66..000000000
--- a/apps/website/src/components/tsdoc/TSDoc.tsx
+++ /dev/null
@@ -1,129 +0,0 @@
-'use client';
-
-import type {
-	AnyDocNodeJSON,
-	DocPlainTextJSON,
-	DocNodeContainerJSON,
-	DocLinkTagJSON,
-	DocFencedCodeJSON,
-	DocBlockJSON,
-	DocCommentJSON,
-} from '@discordjs/api-extractor-utils';
-import { DocNodeKind, StandardTags } from '@microsoft/tsdoc';
-import Link from 'next/link';
-import { Fragment, useCallback, type ReactNode } from 'react';
-import { SyntaxHighlighter } from '../SyntaxHighlighter';
-import { BlockComment } from './BlockComment';
-
-export function TSDoc({ node }: { node: AnyDocNodeJSON }): JSX.Element {
-	const createNode = useCallback((node: AnyDocNodeJSON, idx?: number): ReactNode => {
-		let numberOfExamples = 0;
-		let exampleIndex = 0;
-
-		switch (node.kind) {
-			case DocNodeKind.PlainText:
-				return (
-					<span className="break-words" key={idx}>
-						{(node as DocPlainTextJSON).text}
-					</span>
-				);
-			case DocNodeKind.Paragraph:
-				return (
-					<span className="break-words leading-relaxed" key={idx}>
-						{(node as DocNodeContainerJSON).nodes.map((node, idx) => createNode(node, idx))}
-					</span>
-				);
-			case DocNodeKind.SoftBreak:
-				return <Fragment key={idx} />;
-			case DocNodeKind.LinkTag: {
-				const { codeDestination, urlDestination, text } = node as DocLinkTagJSON;
-
-				if (codeDestination) {
-					return (
-						<Link
-							className="text-blurple focus:ring-width-2 focus:ring-blurple rounded font-mono outline-0 focus:ring"
-							href={codeDestination.path}
-							key={idx}
-						>
-							{text ?? codeDestination.name}
-						</Link>
-					);
-				}
-
-				if (urlDestination) {
-					return (
-						<Link
-							className="text-blurple focus:ring-width-2 focus:ring-blurple rounded font-mono outline-0 focus:ring"
-							href={urlDestination}
-							key={idx}
-						>
-							{text ?? urlDestination}
-						</Link>
-					);
-				}
-
-				return null;
-			}
-
-			case DocNodeKind.CodeSpan: {
-				const { code } = node as DocFencedCodeJSON;
-				return (
-					<code className="font-mono text-sm" key={idx}>
-						{code}
-					</code>
-				);
-			}
-
-			case DocNodeKind.FencedCode: {
-				const { language, code } = node as DocFencedCodeJSON;
-				return <SyntaxHighlighter code={code} key={idx} language={language} />;
-			}
-
-			case DocNodeKind.ParamBlock:
-			case DocNodeKind.Block: {
-				const { tag } = node as DocBlockJSON;
-
-				if (tag.tagName.toUpperCase() === StandardTags.example.tagNameWithUpperCase) {
-					exampleIndex++;
-				}
-
-				const index = numberOfExamples > 1 ? exampleIndex : undefined;
-
-				return (
-					<BlockComment index={index} key={idx} tagName={tag.tagName}>
-						{(node as DocBlockJSON).content.map((node, idx) => createNode(node, idx))}
-					</BlockComment>
-				);
-			}
-
-			case DocNodeKind.Comment: {
-				const comment = node as DocCommentJSON;
-
-				if (!comment.customBlocks.length) {
-					return null;
-				}
-
-				// Cheat a bit by finding out how many comments we have beforehand...
-				numberOfExamples = comment.customBlocks.filter(
-					(block) => block.tag.tagName.toUpperCase() === StandardTags.example.tagNameWithUpperCase,
-				).length;
-
-				return <div key={idx}>{comment.customBlocks.map((node, idx) => createNode(node, idx))}</div>;
-			}
-
-			default:
-				// console.log(`Captured unknown node kind: ${node.kind}`);
-				return null;
-		}
-	}, []);
-
-	return (
-		<>
-			{node.kind === 'Paragraph' || node.kind === 'Section' ? (
-				<>{(node as DocNodeContainerJSON).nodes.map((node, idx) => createNode(node, idx))}</>
-			) : (
-				createNode(node)
-			)}
-		</>
-	);
-}
diff --git a/apps/website/src/util/constants.ts b/apps/website/src/util/constants.ts
index f44168b96..98f948e3f 100644
--- a/apps/website/src/util/constants.ts
+++ b/apps/website/src/util/constants.ts
@@ -11,6 +11,10 @@ export const PACKAGES = [
 	'ws',
 ];
 
+export const N_RECENT_VERSIONS = 2;
+
+export const OVERLOAD_SEPARATOR = ':';
+
 export const DESCRIPTION =
 	"discord.js is a powerful node.js module that allows you to interact with the Discord API very easily. It takes a much more object-oriented approach than most other JS Discord libraries, making your bot's code significantly tidier and easier to comprehend.";
 
diff --git a/apps/website/src/util/members.ts b/apps/website/src/util/members.ts
new file mode 100644
index 000000000..78cbc543b
--- /dev/null
+++ b/apps/website/src/util/members.ts
@@ -0,0 +1,37 @@
+import type { ApiItem, ApiItemContainerMixin } from '@microsoft/api-extractor-model';
+
+/**
+ * Resolves all inherited members (including merged members) of a given parent.
+ *
+ * @param parent - The parent to resolve the inherited members of.
+ * @param predicate - A predicate to filter the members by.
+ */
+export function resolveMembers<T extends ApiItem>(
+	parent: ApiItemContainerMixin,
+	predicate: (item: ApiItem) => item is T,
+) {
+	const seenItems = new Set<string>();
+	const inheritedMembers = parent.findMembersWithInheritance().items.reduce((acc, item) => {
+		if (predicate(item)) {
+			acc.push({
+				item,
+				inherited:
+					item.parent?.containerKey === parent.containerKey
+						? undefined
+						: (item.parent as ApiItemContainerMixin | undefined),
+			});
+			seenItems.add(item.containerKey);
+		}
+
+		return acc;
+	}, new Array<{ inherited?: ApiItemContainerMixin | undefined; item: T }>());
+
+	const mergedMembers = parent
+		.getMergedSiblings()
+		.filter((sibling) => sibling.containerKey !== parent.containerKey)
+		.flatMap((sibling) => (sibling as ApiItemContainerMixin).findMembersWithInheritance().items)
+		.filter((item) => predicate(item) && !seenItems.has(item.containerKey))
+		.map((item) => ({ item: item as T, inherited: item.parent ? (item.parent as ApiItemContainerMixin) : undefined }));
+
+	return [...inheritedMembers, ...mergedMembers];
+}
diff --git a/apps/website/src/util/model.server.ts b/apps/website/src/util/model.server.ts
index 360f8ccdc..521c10113 100644
--- a/apps/website/src/util/model.server.ts
+++ b/apps/website/src/util/model.server.ts
@@ -1,33 +1,15 @@
-import { findPackage, ApiNodeJSONEncoder } from '@discordjs/api-extractor-utils';
-import type { ApiEntryPoint, ApiModel } from '@microsoft/api-extractor-model';
+import type { ApiEntryPoint, ApiItem, ApiModel } from '@microsoft/api-extractor-model';
 
-export function findMemberByKey(model: ApiModel, packageName: string, containerKey: string, version: string) {
-	const pkg = findPackage(model, packageName)!;
-	const member = (pkg.members[0] as ApiEntryPoint).tryGetMemberByKey(containerKey);
-
-	if (!member) {
-		return undefined;
-	}
-
-	return ApiNodeJSONEncoder.encode(model, member, version);
+export function findMemberByKey(model: ApiModel, packageName: string, containerKey: string) {
+	const pkg = model.tryGetPackageByName(`@discordjs/${packageName}`)!;
+	return (pkg.members[0] as ApiEntryPoint).tryGetMemberByKey(containerKey);
 }
 
-export function findMember(
-	model: ApiModel,
-	packageName: string,
-	memberName: string | undefined,
-	version: string,
-): ReturnType<typeof ApiNodeJSONEncoder['encode']> | undefined {
+export function findMember(model: ApiModel, packageName: string, memberName: string | undefined): ApiItem | undefined {
 	if (!memberName) {
 		return undefined;
 	}
 
-	const pkg = findPackage(model, packageName)!;
-	const member = (pkg.members[0] as ApiEntryPoint).findMembersByName(memberName)[0];
-
-	if (!member) {
-		return undefined;
-	}
-
-	return ApiNodeJSONEncoder.encode(model, member, version);
+	const pkg = model.tryGetPackageByName(`@discordjs/${packageName}`)!;
+	return pkg.entryPoints[0]?.findMembersByName(memberName)[0];
 }
diff --git a/apps/website/tsconfig.json b/apps/website/tsconfig.json
index 9ab6810c6..78f616deb 100644
--- a/apps/website/tsconfig.json
+++ b/apps/website/tsconfig.json
@@ -9,6 +9,7 @@
 		"allowJs": false,
 		"incremental": true,
 		"skipLibCheck": true,
+		"sourceMap": true,
 		"plugins": [
 			{
 				"name": "next"
diff --git a/packages/ui/src/lib/components/Section.tsx b/packages/ui/src/lib/components/Section.tsx
index 39846282e..c015c5bf7 100644
--- a/packages/ui/src/lib/components/Section.tsx
+++ b/packages/ui/src/lib/components/Section.tsx
@@ -4,6 +4,7 @@ import type { PropsWithChildren } from 'react';
 
 export interface SectionOptions {
 	background?: boolean | undefined;
+	className?: string;
 	defaultClosed?: boolean | undefined;
 	dense?: boolean | undefined;
 	gutter?: boolean | undefined;
@@ -21,11 +22,12 @@ export function Section({
 	background = false,
 	gutter = false,
 	children,
+	className,
 }: PropsWithChildren<SectionOptions>) {
 	const disclosure = useDisclosureState({ defaultOpen: !defaultClosed });
 
 	return (
-		<div className="flex flex-col">
+		<div className={`flex flex-col ${className}`}>
 			<Disclosure
 				className="bg-light-600 hover:bg-light-700 active:bg-light-800 dark:bg-dark-600 dark:hover:bg-dark-500 dark:active:bg-dark-400 focus:ring-width-2 focus:ring-blurple rounded p-3 outline-0 focus:ring"
 				state={disclosure}
diff --git a/yarn.lock b/yarn.lock
index e179a768f..d555de464 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2440,7 +2440,7 @@ __metadata:
     eslint-formatter-pretty: ^4.1.0
     happy-dom: ^7.7.0
     meilisearch: ^0.30.0
-    next: ^13.0.7-canary.1
+    next: ^13.1.2-canary.4
     next-mdx-remote: ^4.2.0
     next-themes: "npm:@wits/next-themes@latest"
     prettier: ^2.8.0
@@ -3300,10 +3300,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@next/env@npm:13.0.7-canary.1":
-  version: 13.0.7-canary.1
-  resolution: "@next/env@npm:13.0.7-canary.1"
-  checksum: 5c0bc1dfad713a57ed3694b2ef41f0ffc0afb36bb40123327439f99e8cb4ff39174ab06eba4b113f7342f6327637394c3672e7589139c9bff13eaef033206968
+"@next/env@npm:13.1.2-canary.4":
+  version: 13.1.2-canary.4
+  resolution: "@next/env@npm:13.1.2-canary.4"
+  checksum: 250a0bef306fc738b814f7840b6d6a91e751858e39564afc5947737962e698a3b114b2b2e494772b95557fd4935a4cb6ebe4e8951c7b13fded43688eef943763
   languageName: node
   linkType: hard
 
@@ -3316,93 +3316,93 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@next/swc-android-arm-eabi@npm:13.0.7-canary.1":
-  version: 13.0.7-canary.1
-  resolution: "@next/swc-android-arm-eabi@npm:13.0.7-canary.1"
+"@next/swc-android-arm-eabi@npm:13.1.2-canary.4":
+  version: 13.1.2-canary.4
+  resolution: "@next/swc-android-arm-eabi@npm:13.1.2-canary.4"
   conditions: os=android & cpu=arm
   languageName: node
   linkType: hard
 
-"@next/swc-android-arm64@npm:13.0.7-canary.1":
-  version: 13.0.7-canary.1
-  resolution: "@next/swc-android-arm64@npm:13.0.7-canary.1"
+"@next/swc-android-arm64@npm:13.1.2-canary.4":
+  version: 13.1.2-canary.4
+  resolution: "@next/swc-android-arm64@npm:13.1.2-canary.4"
   conditions: os=android & cpu=arm64
   languageName: node
   linkType: hard
 
-"@next/swc-darwin-arm64@npm:13.0.7-canary.1":
-  version: 13.0.7-canary.1
-  resolution: "@next/swc-darwin-arm64@npm:13.0.7-canary.1"
+"@next/swc-darwin-arm64@npm:13.1.2-canary.4":
+  version: 13.1.2-canary.4
+  resolution: "@next/swc-darwin-arm64@npm:13.1.2-canary.4"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@next/swc-darwin-x64@npm:13.0.7-canary.1":
-  version: 13.0.7-canary.1
-  resolution: "@next/swc-darwin-x64@npm:13.0.7-canary.1"
+"@next/swc-darwin-x64@npm:13.1.2-canary.4":
+  version: 13.1.2-canary.4
+  resolution: "@next/swc-darwin-x64@npm:13.1.2-canary.4"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@next/swc-freebsd-x64@npm:13.0.7-canary.1":
-  version: 13.0.7-canary.1
-  resolution: "@next/swc-freebsd-x64@npm:13.0.7-canary.1"
+"@next/swc-freebsd-x64@npm:13.1.2-canary.4":
+  version: 13.1.2-canary.4
+  resolution: "@next/swc-freebsd-x64@npm:13.1.2-canary.4"
   conditions: os=freebsd & cpu=x64
   languageName: node
   linkType: hard
 
-"@next/swc-linux-arm-gnueabihf@npm:13.0.7-canary.1":
-  version: 13.0.7-canary.1
-  resolution: "@next/swc-linux-arm-gnueabihf@npm:13.0.7-canary.1"
+"@next/swc-linux-arm-gnueabihf@npm:13.1.2-canary.4":
+  version: 13.1.2-canary.4
+  resolution: "@next/swc-linux-arm-gnueabihf@npm:13.1.2-canary.4"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@next/swc-linux-arm64-gnu@npm:13.0.7-canary.1":
-  version: 13.0.7-canary.1
-  resolution: "@next/swc-linux-arm64-gnu@npm:13.0.7-canary.1"
+"@next/swc-linux-arm64-gnu@npm:13.1.2-canary.4":
+  version: 13.1.2-canary.4
+  resolution: "@next/swc-linux-arm64-gnu@npm:13.1.2-canary.4"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@next/swc-linux-arm64-musl@npm:13.0.7-canary.1":
-  version: 13.0.7-canary.1
-  resolution: "@next/swc-linux-arm64-musl@npm:13.0.7-canary.1"
+"@next/swc-linux-arm64-musl@npm:13.1.2-canary.4":
+  version: 13.1.2-canary.4
+  resolution: "@next/swc-linux-arm64-musl@npm:13.1.2-canary.4"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@next/swc-linux-x64-gnu@npm:13.0.7-canary.1":
-  version: 13.0.7-canary.1
-  resolution: "@next/swc-linux-x64-gnu@npm:13.0.7-canary.1"
+"@next/swc-linux-x64-gnu@npm:13.1.2-canary.4":
+  version: 13.1.2-canary.4
+  resolution: "@next/swc-linux-x64-gnu@npm:13.1.2-canary.4"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@next/swc-linux-x64-musl@npm:13.0.7-canary.1":
-  version: 13.0.7-canary.1
-  resolution: "@next/swc-linux-x64-musl@npm:13.0.7-canary.1"
+"@next/swc-linux-x64-musl@npm:13.1.2-canary.4":
+  version: 13.1.2-canary.4
+  resolution: "@next/swc-linux-x64-musl@npm:13.1.2-canary.4"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@next/swc-win32-arm64-msvc@npm:13.0.7-canary.1":
-  version: 13.0.7-canary.1
-  resolution: "@next/swc-win32-arm64-msvc@npm:13.0.7-canary.1"
+"@next/swc-win32-arm64-msvc@npm:13.1.2-canary.4":
+  version: 13.1.2-canary.4
+  resolution: "@next/swc-win32-arm64-msvc@npm:13.1.2-canary.4"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@next/swc-win32-ia32-msvc@npm:13.0.7-canary.1":
-  version: 13.0.7-canary.1
-  resolution: "@next/swc-win32-ia32-msvc@npm:13.0.7-canary.1"
+"@next/swc-win32-ia32-msvc@npm:13.1.2-canary.4":
+  version: 13.1.2-canary.4
+  resolution: "@next/swc-win32-ia32-msvc@npm:13.1.2-canary.4"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@next/swc-win32-x64-msvc@npm:13.0.7-canary.1":
-  version: 13.0.7-canary.1
-  resolution: "@next/swc-win32-x64-msvc@npm:13.0.7-canary.1"
+"@next/swc-win32-x64-msvc@npm:13.1.2-canary.4":
+  version: 13.1.2-canary.4
+  resolution: "@next/swc-win32-x64-msvc@npm:13.1.2-canary.4"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
@@ -15650,28 +15650,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"next@npm:^13.0.7-canary.1":
-  version: 13.0.7-canary.1
-  resolution: "next@npm:13.0.7-canary.1"
+"next@npm:^13.1.2-canary.4":
+  version: 13.1.2-canary.4
+  resolution: "next@npm:13.1.2-canary.4"
   dependencies:
-    "@next/env": 13.0.7-canary.1
-    "@next/swc-android-arm-eabi": 13.0.7-canary.1
-    "@next/swc-android-arm64": 13.0.7-canary.1
-    "@next/swc-darwin-arm64": 13.0.7-canary.1
-    "@next/swc-darwin-x64": 13.0.7-canary.1
-    "@next/swc-freebsd-x64": 13.0.7-canary.1
-    "@next/swc-linux-arm-gnueabihf": 13.0.7-canary.1
-    "@next/swc-linux-arm64-gnu": 13.0.7-canary.1
-    "@next/swc-linux-arm64-musl": 13.0.7-canary.1
-    "@next/swc-linux-x64-gnu": 13.0.7-canary.1
-    "@next/swc-linux-x64-musl": 13.0.7-canary.1
-    "@next/swc-win32-arm64-msvc": 13.0.7-canary.1
-    "@next/swc-win32-ia32-msvc": 13.0.7-canary.1
-    "@next/swc-win32-x64-msvc": 13.0.7-canary.1
+    "@next/env": 13.1.2-canary.4
+    "@next/swc-android-arm-eabi": 13.1.2-canary.4
+    "@next/swc-android-arm64": 13.1.2-canary.4
+    "@next/swc-darwin-arm64": 13.1.2-canary.4
+    "@next/swc-darwin-x64": 13.1.2-canary.4
+    "@next/swc-freebsd-x64": 13.1.2-canary.4
+    "@next/swc-linux-arm-gnueabihf": 13.1.2-canary.4
+    "@next/swc-linux-arm64-gnu": 13.1.2-canary.4
+    "@next/swc-linux-arm64-musl": 13.1.2-canary.4
+    "@next/swc-linux-x64-gnu": 13.1.2-canary.4
+    "@next/swc-linux-x64-musl": 13.1.2-canary.4
+    "@next/swc-win32-arm64-msvc": 13.1.2-canary.4
+    "@next/swc-win32-ia32-msvc": 13.1.2-canary.4
+    "@next/swc-win32-x64-msvc": 13.1.2-canary.4
     "@swc/helpers": 0.4.14
     caniuse-lite: ^1.0.30001406
     postcss: 8.4.14
-    styled-jsx: 5.1.0
+    styled-jsx: 5.1.1
   peerDependencies:
     fibers: ">= 3.1.0"
     node-sass: ^6.0.0 || ^7.0.0
@@ -15714,7 +15714,7 @@ __metadata:
       optional: true
   bin:
     next: dist/bin/next
-  checksum: 03e6b1462c8e32e745716705cdf1d3ac1f85345ba0373a7fd58f9a4d638d95a757f651e9a42b3c29006fa15306149df4b35aa444f77aef53306e8ad6f778eaa8
+  checksum: 486ac0a6f8d35d5a59ad0995deff75881ea5bc6b57df79564d016b911e1cdc27e50eecd458b7d3339b0d0ef502ac5dc71d25465090250ca9b9525c49b9072d3f
   languageName: node
   linkType: hard
 
@@ -19348,9 +19348,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"styled-jsx@npm:5.1.0":
-  version: 5.1.0
-  resolution: "styled-jsx@npm:5.1.0"
+"styled-jsx@npm:5.1.1":
+  version: 5.1.1
+  resolution: "styled-jsx@npm:5.1.1"
   dependencies:
     client-only: 0.0.1
   peerDependencies:
@@ -19360,7 +19360,7 @@ __metadata:
       optional: true
     babel-plugin-macros:
       optional: true
-  checksum: e5b70476fd9059147dfe35dd912e537e422a7f900cc88f80456c97da495c655598875d64de2199641d627770a7e55ed08be0fd82646bc386791fdb1d0e5af2b1
+  checksum: 523a33b38603492547e861b98e29c873939b04e15fbe5ef16132c6f1e15958126647983c7d4675325038b428a5e91183d996e90141b18bdd1bbadf6e2c45b2fa
   languageName: node
   linkType: hard