diff --git a/smoke/docs-main/astro.config.mjs b/smoke/docs-main/astro.config.mjs
index 94290bf17..cb46a32d5 100644
--- a/smoke/docs-main/astro.config.mjs
+++ b/smoke/docs-main/astro.config.mjs
@@ -3,6 +3,10 @@ export default /** @type {import('astro').AstroUserConfig} */ ({
 	buildOptions: {
 		site: 'https://docs.astro.build/',
 	},
+		// TODO: Enable Shiki!
+	// markdownOptions: {
+	// 	render: ['@astrojs/markdown-remark', {syntaxHighlight: 'shiki'}],
+	//   },
 	renderers: [
 		// Our main renderer for frontend components
 		'@astrojs/renderer-preact',
diff --git a/smoke/docs-main/netlify.toml b/smoke/docs-main/netlify.toml
index 9b30d4f68..e1e0be94e 100644
--- a/smoke/docs-main/netlify.toml
+++ b/smoke/docs-main/netlify.toml
@@ -1,2 +1,6 @@
 [build]
   ignore = "git diff --quiet $COMMIT_REF $CACHED_COMMIT_REF -- /"
+
+ [[redirects]]
+  from = "/en/quick-start"
+  to = "/en/installation"
\ No newline at end of file
diff --git a/smoke/docs-main/package.json b/smoke/docs-main/package.json
index 8b64701da..0f7c92816 100644
--- a/smoke/docs-main/package.json
+++ b/smoke/docs-main/package.json
@@ -25,7 +25,8 @@
   },
   "dependencies": {
     "@docsearch/react": "^3.0.0-alpha.50",
-    "sass": "^1.49.8"
+    "sass": "^1.49.8",
+    "@astropub/icons": "^0.1.1"
   },
   "volta": {
     "node": "14.18.1"
diff --git a/smoke/docs-main/public/index.css b/smoke/docs-main/public/index.css
index 1ccddf530..244b7b056 100644
--- a/smoke/docs-main/public/index.css
+++ b/smoke/docs-main/public/index.css
@@ -315,18 +315,23 @@ h2.heading {
 	padding: 0.1rem 1rem;
 	text-transform: uppercase;
 	margin-bottom: 0.5rem;
+	margin-top: 1.5rem;
 }
 
 .header-link {
 	font-size: 1rem;
-	padding: 0.1rem 0 0.1rem 1rem;
+	padding: 1px 0 1px 1rem;
 	border-left: 4px solid var(--theme-divider);
 }
 
 .header-link:hover,
 .header-link:focus {
 	border-left-color: var(--theme-accent);
+}
+.header-link:hover a,
+.header-link:focus a {
 	color: var(--theme-accent);
+	text-decoration: underline;
 }
 .header-link:focus-within {
 	color: var(--theme-text-light);
@@ -342,7 +347,6 @@ h2.heading {
 	display: inline-flex;
 	gap: 0.5em;
 	width: 100%;
-	padding: 0.15em 0 0.15em 0;
 }
 
 .header-link.depth-3 {
@@ -354,7 +358,7 @@ h2.heading {
 
 .header-link a {
 	font: inherit;
-	color: inherit;
+	color: var(--theme-text-light);
 	text-decoration: none;
 }
 
diff --git a/smoke/docs-main/public/theme.css b/smoke/docs-main/public/theme.css
index e44175a6f..2790286a7 100644
--- a/smoke/docs-main/public/theme.css
+++ b/smoke/docs-main/public/theme.css
@@ -59,12 +59,12 @@
 	--theme-accent: hsla(var(--color-orange), 1);
 	--theme-text-accent: hsla(var(--color-orange), 1);
 	--theme-accent-opacity: 0.1;
-	--theme-divider: hsla(var(--color-gray-95), 1);
+	--theme-divider: hsla(var(--color-gray-90), 1);
 	--theme-text: hsla(var(--color-gray-10), 1);
 	--theme-text-light: hsla(var(--color-gray-40), 1);
 	/* @@@: not used anywhere */
 	--theme-text-lighter: hsla(var(--color-gray-80), 1);
-	--theme-bg: hsla(var(--color-base-white), 100%, 1);
+	--theme-bg: #fdfeff;
 	--theme-bg-hover: hsla(var(--color-gray-95), 1);
 	--theme-bg-offset: hsla(var(--color-gray-90), 1);
 	--theme-bg-accent: hsla(var(--color-orange), var(--theme-accent-opacity));
@@ -72,7 +72,7 @@
 	--theme-code-inline-text: var(--theme-text);
 	--theme-code-bg: hsla(217, 19%, 27%, 1);
 	--theme-code-text: hsla(var(--color-gray-95), 1);
-	--theme-navbar-bg: hsla(var(--color-base-white), 100%, 1);
+	--theme-navbar-bg: #fdfeff;
 	--theme-navbar-height: 6rem;
 	--theme-selection-color: hsla(var(--color-orange), 1);
 	--theme-selection-bg: hsla(var(--color-orange), var(--theme-accent-opacity));
@@ -88,7 +88,7 @@ body {
 	--theme-accent-opacity: 0.4;
 	--theme-accent: hsla(var(--color-orange), 1);
 	--theme-text-accent: hsla(var(--color-orange), 1);
-	--theme-divider: hsla(var(--color-gray-10), 1);
+	--theme-divider: #393f4a;
 	--theme-text: hsla(var(--color-gray-90), 1);
 	--theme-text-light: hsla(var(--color-gray-80), 1);
 
@@ -98,7 +98,7 @@ body {
 	--theme-bg-hover: hsla(var(--color-gray-40), 1);
 	--theme-bg-offset: hsla(var(--color-gray-5), 1);
 	--theme-code-inline-bg: hsla(var(--color-gray-10), 1);
-	--theme-code-inline-text: hsla(var(--color-base-white), 100%, 1);
+	--theme-code-inline-text: var(--theme-text-light);
 	--theme-code-bg: hsla(var(--color-gray-5), 1);
 	--theme-code-text: hsla(var(--color-base-white), 100%, 1);
 	--theme-navbar-bg: hsla(215, 28%, 17%, 1);
diff --git a/smoke/docs-main/src/components/Button.astro b/smoke/docs-main/src/components/Button.astro
new file mode 100644
index 000000000..e1bddd915
--- /dev/null
+++ b/smoke/docs-main/src/components/Button.astro
@@ -0,0 +1,173 @@
+---
+const { class: className = '', style, href } = Astro.props;
+// Wrap in <span> because Houdini is disabled for a[href] for security
+
+const { variant = 'primary' } = Astro.props;
+const { before, after } = Astro.slots;
+---
+
+
+
+<span class={`link pixel variant-${variant} ${before ? 'has-before' : ''} ${after ? 'has-after' : ''} ${className}`.trim()} {style}>
+    <a {href}>
+        <slot name="before" />
+        <span><slot /></span>
+        <slot name="after" />
+    </a>
+</span>
+
+<style>
+    .pixel {
+        --link-color-stop-a: #205eff;
+        --link-color-stop-b: #c238bd;
+
+        --border-radius: 8;
+        --pixel-size: 4;
+        --background: var(--gradient-pop-1);
+        position: relative;
+        border-radius: calc(var(--border-radius) * 1px);
+    }
+    .pixel::before {
+        content: '';
+        position: absolute;
+        top: calc(var(--pixel-size) * 1px);
+        right: 0;
+        bottom: calc(var(--pixel-size) * 1px);
+        left: 0;
+        background: var(--background);
+        z-index: -1;
+    }
+    .pixel::after {
+        content: '';
+        position: absolute;
+        top: 0;
+        right: calc(var(--pixel-size) * 1px);
+        bottom: 0;
+        left: calc(var(--pixel-size) * 1px);
+        background: var(--background);
+        z-index: -1;
+    }
+    .pixel.variant-outline {
+        background: rgba(255, 255, 255, 0);
+        border-radius: 0;
+    }
+    .pixel.variant-outline::before {
+        background: rgba(255, 255, 255, 0);
+        border: calc(var(--pixel-size) * 1px) solid var(--background);
+        border-top: 0;
+        border-bottom: 0;
+    }
+    .pixel.variant-outline::after {
+        background: rgba(255, 255, 255, 0);
+        border: calc(var(--pixel-size) * 1px) solid var(--background);
+        border-right: 0;
+        border-left: 0;
+    }
+    @supports (background: paint(pixel)) {
+        :global(.js) .pixel {
+            background: none !important;
+        }
+        :global(.js) .pixel::before {
+            content: '';
+            position: absolute;
+            top: 0;
+            right: 0;
+            bottom: 0;
+            left: 0;
+            display: block;
+            z-index: -1;
+            overflow: hidden;
+            border-radius: 0;
+            background: var(--background);
+            -webkit-mask-image: paint(pixel);
+            mask-image: paint(pixel);
+        }
+       :global(.js) .pixel::after {
+            content: none;
+        }
+    }
+    .link {
+        --border-radius: 8;
+        --duration: 200ms;
+        --delay: 30ms;
+        --background: linear-gradient(180deg, var(--link-color-stop-a), var(--link-color-stop-b));
+        display: flex;
+        color: white;
+        font-family: var(--font-display);
+        font-size: 1.25rem;
+        width: max-content;
+        transition-property: transform, --link-color-stop-a, --link-color-stop-b;
+        transition-duration: var(--duration);
+        transition-delay: var(--delay);
+        transition-timing-function: cubic-bezier(0.22, 1, 0.36, 1);
+    }
+    .link:hover,
+    .link:focus-within {
+        transform: translateY(calc(var(--pixel-size) * -0.5px));
+    }
+    .link:active {
+        transform: translateY(0);
+    }
+    .has-before a :first-child {
+        margin-left: -1rem;
+        margin-right: 0.25rem;
+    }
+    .has-before a :last-child {
+        margin-left: 0.25rem;
+        margin-right: -1rem;
+    }
+    a {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        padding: 0.67rem 1.25rem;
+        width: 100%;
+        height: 100%;
+        text-decoration: none;
+        color: inherit !important;
+    }
+    a > :global(* + *) {
+        margin-left: 0.25rem;
+    }
+
+    .variant-primary {
+        --variant: primary;
+        --background: linear-gradient(180deg, var(--link-color-stop-a), var(--link-color-stop-b));
+    }
+    .variant-primary:hover,
+    .variant-primary:focus-within {
+        --link-color-stop-a: #6D39FF;
+        --link-color-stop-b: #AF43FF;
+    }
+    .variant-primary:active {
+        --link-color-stop-a: #5F31E1;
+        --link-color-stop-b: #A740F3;
+    }
+
+    .variant-outline {
+        --variant: outline;
+        --background: none;
+        color: var(--background);
+    }
+    .variant-outline > a::before {
+        position: absolute;
+        top: 0;
+        right: calc(var(--pixel-size) * 1px);
+        bottom: calc(var(--pixel-size) * 1px);
+        left: calc(var(--pixel-size) * 1px);
+        content: "";
+        display: block;
+        transform-origin: bottom center;
+        background: linear-gradient(to top, var(--background), rgba(255, 255, 255, 0));
+        opacity: 0.3;
+        transform: scaleY(0);
+        transition: transform 200ms cubic-bezier(0.22, 1, 0.36, 1);
+    }
+    .variant-outline:hover > a::before,
+    .variant-outline:focus-within > a::before {
+        transform: scaleY(1);
+    }
+    .variant-outline:active > a::before {
+        transform: scaleY(1);
+    }
+</style>
diff --git a/smoke/docs-main/src/components/HeadCommon.astro b/smoke/docs-main/src/components/HeadCommon.astro
index daa39db13..c2fd24a61 100644
--- a/smoke/docs-main/src/components/HeadCommon.astro
+++ b/smoke/docs-main/src/components/HeadCommon.astro
@@ -30,6 +30,22 @@
 	}
 </script>
 
+<!-- Double-click to highlight code blocks (inline only). -->
+<script>
+	document.addEventListener('dblclick', (el) => {
+		if (el.target.nodeName !== 'CODE') {
+			return;
+		}
+		if (el.target.parentElement.nodeName === 'PRE') {
+			return;
+		}
+		let range = new Range();
+		range.setStart(el.target, 0);
+		range.setEnd(el.target, 1);
+		document.getSelection().removeAllRanges();
+		document.getSelection().addRange(range);
+	});
+</script>
 <!-- Global site tag (gtag.js) - Google Analytics -->
 <script async src="https://www.googletagmanager.com/gtag/js?id=UA-130280175-15"></script>
 <script>
diff --git a/smoke/docs-main/src/components/Header/Header.astro b/smoke/docs-main/src/components/Header/Header.astro
index 9bcf89ca7..249260883 100644
--- a/smoke/docs-main/src/components/Header/Header.astro
+++ b/smoke/docs-main/src/components/Header/Header.astro
@@ -125,7 +125,6 @@ const lang = currentPage && getLanguageFromURL(currentPage);
 		justify-content: flex-end;
 		gap: 1em;
 		width: 100%;
-		max-width: 82em;
 		padding: 0 1rem;
 	}
 	@media (min-width: 50em) {
diff --git a/smoke/docs-main/src/components/Header/Search.tsx b/smoke/docs-main/src/components/Header/Search.tsx
index c4fd6f984..c42bd8847 100644
--- a/smoke/docs-main/src/components/Header/Search.tsx
+++ b/smoke/docs-main/src/components/Header/Search.tsx
@@ -57,7 +57,7 @@ export default function Search(props) {
 						initialScrollY={window.scrollY}
 						onClose={onClose}
 						indexName="astro"
-						appId='7AFBU8EPJU'
+						appId="7AFBU8EPJU"
 						apiKey="4440670147c44d744fd8da35ff652518"
 						searchParameters={{ facetFilters: [[`lang:${lang}`]] }}
 						getMissingResultsUrl={({ query }) => `https://github.com/withastro/docs/issues/new?title=Missing+results+for+query+%22${encodeURIComponent(query)}%22`}
diff --git a/smoke/docs-main/src/components/LeftSidebar/LeftSidebar.astro b/smoke/docs-main/src/components/LeftSidebar/LeftSidebar.astro
index 66963e34e..5cb9651b0 100644
--- a/smoke/docs-main/src/components/LeftSidebar/LeftSidebar.astro
+++ b/smoke/docs-main/src/components/LeftSidebar/LeftSidebar.astro
@@ -1,64 +1,41 @@
 ---
+import Sponsors from './Sponsors.astro';
 import { SIDEBAR } from '../../config.ts';
 import { getLanguageFromURL, removeLeadingSlash, removeTrailingSlash } from '../../util.ts';
+import SidebarContent from './SidebarContent.astro';
+import SidebarSectionToggle from './SidebarSectionToggle.tsx';
 const { currentPage } = Astro.props;
-
 // Get the slug w/o a leading or trailing slash
 const currentPageMatch = removeLeadingSlash(removeTrailingSlash(currentPage));
 const langCode = getLanguageFromURL(currentPage);
 // SIDEBAR is a flat array. Group it by sections to properly render.
-const sidebarSections = SIDEBAR[langCode].reduce((col, item) => {
+const sidebarSections = SIDEBAR[langCode].reduce((collection, item) => {
 	if (item.header) {
-		col.push({ ...item, children: [] });
+		collection.push({ ...item, type: item.type, children: [] });
 	} else {
-		col[col.length - 1].children.push(item);
+		collection[collection.length - 1].children.push(item);
 	}
-	return col;
+	return collection;
 }, []);
+
+const learnSections = sidebarSections.filter((section) => section.type === 'learn');
+const apiSections = sidebarSections.filter((section) => section.type === 'api');
+let activeTab = 'learn';
+for (const section of sidebarSections) {
+	if (section.children.some((item) => item.link === currentPageMatch)) {
+		activeTab = section.type;
+	}
+}
 ---
 
 <nav aria-labelledby="grid-left">
-	<ul class="nav-groups">
+	<SidebarSectionToggle client:load defaultActiveTab={activeTab} />
+	<ul class={`nav-groups`}>
+		<SidebarContent type={'learn'} defaultActiveTab={activeTab} sidebarSections={learnSections} {currentPageMatch} />
+		<SidebarContent type={'api'} defaultActiveTab={activeTab} sidebarSections={apiSections} {currentPageMatch} />
 		<li>
-			<div class="nav-group">
-				<h2 class="sponsors-title">Sponsored by</h2>
-				<div class="sponsors">
-					<a href="https://www.netlify.com/" aria-label="Go to Netlify website">
-						<svg class="sponsor-logo__netlify" viewBox="0 0 147 40" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-							><radialGradient
-								id="netlify-gradient"
-								cx="-779.0521"
-								cy="1839.7205"
-								gradientTransform="matrix(0 38.301 44.1228 0 -81154.2578 29839.2441)"
-								gradientUnits="userSpaceOnUse"
-								r="1.0011"><stop offset="0" stop-color="#20c6b7"></stop><stop offset="1" stop-color="#4d9abf"></stop></radialGradient
-							><path
-								clip-rule="evenodd"
-								d="m53.37 12.98.12 2.2c1.4-1.7 3.24-2.55 5.53-2.55 3.95 0 5.96 2.27 6.03 6.8v12.57h-4.26v-12.32c0-1.21-.26-2.1-.78-2.68s-1.37-.87-2.55-.87c-1.72 0-3 .78-3.84 2.34v13.53h-4.26v-19.02zm24.38 19.37c-2.7 0-4.89-.85-6.57-2.56-1.68-1.7-2.52-3.98-2.52-6.81v-.53c0-1.9.36-3.59 1.1-5.09.73-1.49 1.76-2.66 3.08-3.49s2.79-1.25 4.42-1.25c2.58 0 4.58.83 5.99 2.48s2.11 3.99 2.11 7.01v1.72h-12.4c.13 1.57.65 2.81 1.57 3.73s2.07 1.37 3.46 1.37c1.95 0 3.54-.79 4.77-2.37l2.3 2.2c-.76 1.14-1.77 2.02-3.04 2.65s-2.69.94-4.27.94zm-.51-16.29c-1.17 0-2.11.41-2.83 1.23s-1.18 1.96-1.38 3.43h8.12v-.32c-.09-1.43-.47-2.51-1.14-3.24-.67-.74-1.59-1.1-2.77-1.1zm16.76-7.7v4.62h3.35v3.16h-3.35v10.62c0 .73.14 1.25.43 1.57s.8.48 1.54.48c.5 0 1-.06 1.49-.18v3.31c-.97.27-1.9.4-2.81.4-3.27 0-4.91-1.81-4.91-5.43v-10.77h-3.12v-3.16h3.12v-4.63zm11.14 23.64h-4.26v-27h4.26zm9.17 0h-4.26v-19.02h4.26zm-4.52-23.96c0-.65.21-1.2.62-1.63.42-.43 1.01-.65 1.78-.65s1.37.22 1.79.65.63.98.63 1.64c0 .64-.21 1.18-.63 1.61s-1.02.64-1.79.64-1.36-.21-1.78-.64c-.41-.44-.62-.98-.62-1.62zm10.66 23.96v-15.86h-2.89v-3.16h2.89v-1.74c0-2.11.58-3.74 1.75-4.89s2.81-1.72 4.91-1.72c.75 0 1.54.11 2.39.32l-.1 3.34c-.54-.1-1.08-.15-1.63-.14-2.04 0-3.05 1.05-3.05 3.15v1.69h3.86v3.16h-3.86v15.85zm17.87-6.12 3.86-12.9h4.54l-7.54 21.9c-1.16 3.2-3.12 4.8-5.89 4.8-.62 0-1.3-.11-2.05-.32v-3.31l.81.05c1.07 0 1.88-.2 2.43-.59.54-.39.97-1.05 1.29-1.98l.61-1.64-6.66-18.93h4.6z"
-								fill-rule="evenodd"></path><path
-								d="m27.89 14.14-.01-.01c-.01 0-.02-.01-.02-.01-.02-.02-.03-.06-.03-.09l.77-4.73 3.62 3.63-3.77 1.6c-.01 0-.02.01-.03.01h-.02s-.01-.01-.02-.02c-.14-.16-.31-.29-.49-.38zm5.26-.29 3.88 3.88c.81.81 1.21 1.21 1.35 1.67.02.07.04.14.05.21l-9.26-3.92s-.01 0-.01-.01c-.04-.02-.08-.03-.08-.07s.04-.06.08-.07l.01-.01zm5.12 7c-.2.38-.59.77-1.25 1.43l-4.37 4.37-5.65-1.18-.03-.01c-.05-.01-.1-.02-.1-.06-.04-.47-.28-.9-.66-1.19-.02-.02-.02-.06-.01-.09v-.01l1.06-6.53v-.02c.01-.05.01-.11.06-.11.46-.06.88-.3 1.16-.67.01-.01.01-.02.03-.03.03-.01.07 0 .1.01zm-6.62 6.8-7.19 7.19 1.23-7.56v-.01c0-.01 0-.02.01-.03.01-.02.04-.03.06-.04h.01c.27-.11.51-.29.69-.52.02-.03.05-.06.09-.06h.03zm-8.71 8.71-.81.81-8.95-12.94s-.01-.01-.01-.01c-.01-.02-.03-.04-.03-.06s.01-.03.02-.04l.01-.01c.03-.04.05-.08.07-.12l.02-.03c.01-.02.03-.05.05-.06s.05-.01.07 0l9.92 2.05c.03 0 .05.02.08.03.01.01.02.03.02.04.14.53.52.97 1.03 1.17.03.01.02.05 0 .08-.01.01-.01.03-.01.05-.12.74-1.19 7.27-1.48 9.04zm-1.69 1.69c-.6.59-.95.9-1.35 1.03-.39.12-.81.12-1.21 0-.47-.15-.87-.55-1.67-1.36l-8.99-8.99 2.35-3.64c.01-.02.02-.03.04-.05s.06-.01.09 0c.54.16 1.12.13 1.64-.08.03-.01.05-.02.07 0l.03.03zm-14.09-10.19-2.06-2.06 4.07-1.74c.01 0 .02-.01.03-.01.03 0 .05.03.07.07.04.06.08.12.13.18l.01.02c.01.02 0 .03-.01.05zm-2.98-2.97-2.61-2.61c-.44-.44-.77-.77-.99-1.04l7.94 1.65h.03c.05.01.1.02.1.06 0 .05-.06.07-.11.09l-.02.01zm-4.05-5c.01-.17.04-.33.09-.5.15-.47.55-.87 1.36-1.67l3.34-3.34c1.54 2.23 3.08 4.46 4.63 6.69.03.04.06.08.03.11-.15.16-.29.34-.4.53-.01.02-.03.05-.05.06-.01.01-.03 0-.04 0zm5.68-6.4 4.49-4.49c.42.19 1.96.83 3.33 1.41 1.04.44 1.99.84 2.29.97.03.01.06.02.07.05.01.02 0 .04 0 .06-.14.66.05 1.35.52 1.83.03.03 0 .07-.03.11l-.01.02-4.56 7.06c-.01.02-.02.04-.04.05s-.06.01-.09 0c-.18-.05-.36-.07-.54-.07-.16 0-.34.03-.52.06-.02 0-.04.01-.05 0-.02-.01-.03-.03-.05-.05zm5.4-5.4 5.81-5.81c.81-.81 1.21-1.21 1.67-1.36.39-.12.81-.12 1.21 0 .47.15.87.55 1.67 1.36l1.26 1.26-4.14 6.4c-.01.02-.02.03-.04.05s-.06.01-.09 0c-.66-.2-1.38-.06-1.92.37-.03.03-.07.01-.1 0-.53-.24-4.73-2.01-5.33-2.27zm12.5-3.67 3.82 3.82-.92 5.7v.02c0 .01 0 .03-.01.04-.01.02-.03.02-.05.03-.2.06-.38.15-.55.27-.01.01-.01.01-.02.02s-.02.02-.04.02c-.01 0-.03 0-.04-.01l-5.82-2.47-.01-.01c-.04-.02-.08-.03-.08-.07-.03-.32-.14-.64-.31-.91-.03-.05-.06-.09-.03-.14zm-3.93 8.6 5.45 2.31c.03.01.06.03.08.06.01.02.01.04 0 .06-.02.08-.03.17-.03.26v.15c0 .04-.04.05-.08.07h-.01c-.86.37-12.13 5.17-12.15 5.17s-.03 0-.05-.02c-.03-.03 0-.07.03-.11 0-.01.01-.01.01-.02l4.48-6.94.01-.01c.03-.04.06-.09.1-.09l.05.01c.1.01.19.03.28.03.68 0 1.31-.33 1.69-.9.01-.02.02-.03.03-.04.04-.01.08 0 .11.01zm-6.25 9.19 12.28-5.24s.02 0 .03.02c.07.07.12.11.18.15l.03.02c.02.01.05.03.05.06v.02l-1.05 6.46v.03c-.01.05-.01.11-.06.11-.57.04-1.08.36-1.37.85v.01c-.01.02-.03.05-.05.06s-.05.01-.07 0l-9.79-2.02c-.02-.02-.16-.53-.18-.53z"
-								fill="url(#netlify-gradient)"></path></svg
-						>
-					</a>
-				</div>
-			</div>
+			<Sponsors />
 		</li>
-		{sidebarSections.map((section) => (
-			<li>
-				<div class="nav-group">
-					<h2 class="nav-group-title">{section.text}</h2>
-					<ul>
-						{section.children.map((child) => (
-							<li class="nav-link">
-								<a href={`${Astro.site.pathname}${child.link}`} aria-current={`${currentPageMatch === child.link ? 'page' : 'false'}`}>
-									{child.text}
-								</a>
-							</li>
-						))}
-					</ul>
-				</div>
-			</li>
-		))}
 	</ul>
 </nav>
 
@@ -75,96 +52,13 @@ const sidebarSections = SIDEBAR[langCode].reduce((col, item) => {
 	nav {
 		width: 100%;
 		margin-right: 1rem;
+		padding-top: 0rem;
 	}
 	.nav-groups {
 		height: 100%;
-		padding: 2rem 0;
 		overflow-x: visible;
 		overflow-y: auto;
 		max-height: 100vh;
-
-		> li + li {
-			margin-top: 1.75rem;
-		}
-
-		> :first-child {
-			padding-top: var(--doc-padding);
-		}
-
-		> :last-child {
-			padding-bottom: 2rem;
-			margin-bottom: var(--theme-navbar-height);
-		}
-
-		@media (min-width: 50em) {
-			padding: 0;
-		}
-	}
-
-	.nav-group-title {
-		font-size: 1rem;
-		font-weight: 700;
-		padding: 0.1rem 1rem;
-		text-transform: uppercase;
-		margin-bottom: 0.5rem;
-	}
-
-	.nav-link a {
-		font-size: 1rem;
-		margin: 1px;
-		padding: 0.3rem 1rem;
-		font: inherit;
-		color: inherit;
-		text-decoration: none;
-		display: block;
-
-		&:hover,
-		&:focus {
-			background-color: var(--theme-bg-hover);
-		}
-
-		&[aria-current='page'] {
-			color: var(--theme-text-accent);
-			background-color: var(--theme-bg-accent);
-			font-weight: 600;
-		}
-	}
-
-	:global(:root.theme-dark) .nav-link a[aria-current='page'] {
-		color: hsla(var(--color-base-white), 100%, 1);
-	}
-
-	.sponsors {
-		display: grid;
-		padding-left: 1rem;
-		padding-top: 0.25rem;
-		margin-bottom: -0.375rem; // logo overshoot creates extra perceived space
-		grid-gap: 0.5rem;
-		grid-template-columns: repeat(auto-fit, minmax(80px, 1fr));
-
-		svg {
-			color: var(--theme-text);
-			fill: currentColor;
-		}
-	}
-
-	.sponsor-logo__netlify {
-		width: 90px;
-	}
-
-	.sponsor-logo__vercel {
-		width: 90px;
-	}
-	:global(:root.theme-dark .sponsors-title) {
-		color: hsl(var(--color-base-gray), 75%);
-	}
-	.sponsors-title {
-		color: hsl(var(--color-base-gray), 25%);
-		font-size: 0.8em;
-		font-weight: 300;
-		letter-spacing: 0.0625em;
-		margin: 0 0 0.5rem;
-		padding-left: 1rem;
-		text-transform: uppercase;
+		padding-bottom: var(--theme-navbar-height);
 	}
 </style>
diff --git a/smoke/docs-main/src/components/LeftSidebar/SidebarContent.astro b/smoke/docs-main/src/components/LeftSidebar/SidebarContent.astro
new file mode 100644
index 000000000..e50a8e7e0
--- /dev/null
+++ b/smoke/docs-main/src/components/LeftSidebar/SidebarContent.astro
@@ -0,0 +1,84 @@
+---
+const { type, defaultActiveTab, sidebarSections, currentPageMatch } = Astro.props;
+---
+
+{sidebarSections.length === 0 && (
+	<li class={`nav-group ${type}`}>
+		<div class="placeholder sm-hidden">No Translations Found</div>
+		<a class="placeholder" href="/">
+			View in English
+		</a>
+	</li>
+)}
+{sidebarSections.map((section) => (
+	<li class={`nav-group ${type} ${defaultActiveTab === type ? 'active' : ''}`}>
+		<div>
+			<h2 class="nav-group-title">{section.text}</h2>
+			<ul>
+				{section.children.map((child) => (
+					<li class="nav-link">
+						<a href={`${Astro.site.pathname}${child.link}`} aria-current={`${currentPageMatch === child.link ? 'page' : 'false'}`}>
+							{child.text}
+						</a>
+					</li>
+				))}
+			</ul>
+		</div>
+	</li>
+))}
+
+<style lang="scss">
+	.nav-group {
+		margin-top: 1.75rem;
+	}
+	.nav-group .placeholder {
+		opacity: 0.6;
+		text-align: center;
+		display: block;
+	}
+	@media (max-width: 50em) {
+		.sm-hidden {
+			display: none !important;
+		}
+	}
+	@media (min-width: 50em) {
+		.nav-group {
+			display: none;
+		}
+	}
+	.nav-group.active {
+		display: block;
+	}
+	.nav-group-title {
+		font-size: 1rem;
+		font-weight: 700;
+		padding: 0.1rem 1rem;
+		text-transform: uppercase;
+		margin-bottom: 0.5rem;
+	}
+
+	.nav-link a {
+		font-size: 1rem;
+		margin: 1px;
+		padding: 0.3rem 1rem;
+		font: inherit;
+		color: inherit;
+		text-decoration: none;
+		display: block;
+
+		&:hover,
+		&:focus {
+			background-color: var(--theme-bg-hover);
+		}
+
+		&[aria-current='page'] {
+			color: var(--theme-text-accent);
+			background-color: var(--theme-bg-accent);
+			font-weight: 600;
+		}
+	}
+
+	:global(:root.theme-dark) .nav-link a[aria-current='page'] {
+		color: hsla(var(--color-base-white), 100%, 1);
+	}
+</style>
diff --git a/smoke/docs-main/src/components/LeftSidebar/SidebarSectionToggle.css b/smoke/docs-main/src/components/LeftSidebar/SidebarSectionToggle.css
new file mode 100644
index 000000000..68e873a87
--- /dev/null
+++ b/smoke/docs-main/src/components/LeftSidebar/SidebarSectionToggle.css
@@ -0,0 +1,18 @@
+.SidebarSectionToggle {
+	display: flex;
+}
+.SidebarSectionToggle button {
+	flex-grow: 1;
+	justify-content: center;
+	border-radius: 0;
+	cursor: pointer;
+	padding: 0.6rem;
+	border-bottom: 4px solid var(--theme-divider);
+}
+.SidebarSectionToggle button.is-icon {
+	flex-grow: 0;
+}
+.SidebarSectionToggle button.active {
+	color: var(--theme-accent);
+	border-bottom-color: var(--theme-accent);
+}
diff --git a/smoke/docs-main/src/components/LeftSidebar/SidebarSectionToggle.tsx b/smoke/docs-main/src/components/LeftSidebar/SidebarSectionToggle.tsx
new file mode 100644
index 000000000..13fc8f74c
--- /dev/null
+++ b/smoke/docs-main/src/components/LeftSidebar/SidebarSectionToggle.tsx
@@ -0,0 +1,24 @@
+import { h } from 'preact';
+import { useState } from 'preact/hooks';
+import './SidebarSectionToggle.css';
+
+const SidebarSectionToggle = ({ defaultActiveTab }) => {
+	const [activeTab, setActiveTab] = useState(defaultActiveTab);
+	function toggleType(type: 'learn' | 'api') {
+		document.querySelectorAll(`li.nav-group`).forEach((el) => el.classList.remove('active'));
+		document.querySelectorAll(`li.nav-group.${type}`).forEach((el) => el.classList.add('active'));
+		setActiveTab(type);
+	}
+	return (
+		<div class="SidebarSectionToggle">
+			<button class={activeTab === 'learn' ? 'active' : ''} onClick={() => toggleType('learn')}>
+				Learn
+			</button>
+			<button class={activeTab === 'api' ? 'active' : ''} onClick={() => toggleType('api')}>
+				API
+			</button>
+		</div>
+	);
+};
+
+export default SidebarSectionToggle;
diff --git a/smoke/docs-main/src/components/LeftSidebar/Sponsors.astro b/smoke/docs-main/src/components/LeftSidebar/Sponsors.astro
new file mode 100644
index 000000000..cb4d427f3
--- /dev/null
+++ b/smoke/docs-main/src/components/LeftSidebar/Sponsors.astro
@@ -0,0 +1,64 @@
+<div class="sponsors">
+	<h2 class="sponsors-title">Sponsored by</h2>
+	<div class="sponsor">
+		<a href="https://www.netlify.com/" aria-label="Go to Netlify website">
+			<svg class="sponsor-logo__netlify" viewBox="0 0 147 40" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+				><radialGradient
+					id="netlify-gradient"
+					cx="-779.0521"
+					cy="1839.7205"
+					gradientTransform="matrix(0 38.301 44.1228 0 -81154.2578 29839.2441)"
+					gradientUnits="userSpaceOnUse"
+					r="1.0011"><stop offset="0" stop-color="#20c6b7"></stop><stop offset="1" stop-color="#4d9abf"></stop></radialGradient
+				><path
+					clip-rule="evenodd"
+					d="m53.37 12.98.12 2.2c1.4-1.7 3.24-2.55 5.53-2.55 3.95 0 5.96 2.27 6.03 6.8v12.57h-4.26v-12.32c0-1.21-.26-2.1-.78-2.68s-1.37-.87-2.55-.87c-1.72 0-3 .78-3.84 2.34v13.53h-4.26v-19.02zm24.38 19.37c-2.7 0-4.89-.85-6.57-2.56-1.68-1.7-2.52-3.98-2.52-6.81v-.53c0-1.9.36-3.59 1.1-5.09.73-1.49 1.76-2.66 3.08-3.49s2.79-1.25 4.42-1.25c2.58 0 4.58.83 5.99 2.48s2.11 3.99 2.11 7.01v1.72h-12.4c.13 1.57.65 2.81 1.57 3.73s2.07 1.37 3.46 1.37c1.95 0 3.54-.79 4.77-2.37l2.3 2.2c-.76 1.14-1.77 2.02-3.04 2.65s-2.69.94-4.27.94zm-.51-16.29c-1.17 0-2.11.41-2.83 1.23s-1.18 1.96-1.38 3.43h8.12v-.32c-.09-1.43-.47-2.51-1.14-3.24-.67-.74-1.59-1.1-2.77-1.1zm16.76-7.7v4.62h3.35v3.16h-3.35v10.62c0 .73.14 1.25.43 1.57s.8.48 1.54.48c.5 0 1-.06 1.49-.18v3.31c-.97.27-1.9.4-2.81.4-3.27 0-4.91-1.81-4.91-5.43v-10.77h-3.12v-3.16h3.12v-4.63zm11.14 23.64h-4.26v-27h4.26zm9.17 0h-4.26v-19.02h4.26zm-4.52-23.96c0-.65.21-1.2.62-1.63.42-.43 1.01-.65 1.78-.65s1.37.22 1.79.65.63.98.63 1.64c0 .64-.21 1.18-.63 1.61s-1.02.64-1.79.64-1.36-.21-1.78-.64c-.41-.44-.62-.98-.62-1.62zm10.66 23.96v-15.86h-2.89v-3.16h2.89v-1.74c0-2.11.58-3.74 1.75-4.89s2.81-1.72 4.91-1.72c.75 0 1.54.11 2.39.32l-.1 3.34c-.54-.1-1.08-.15-1.63-.14-2.04 0-3.05 1.05-3.05 3.15v1.69h3.86v3.16h-3.86v15.85zm17.87-6.12 3.86-12.9h4.54l-7.54 21.9c-1.16 3.2-3.12 4.8-5.89 4.8-.62 0-1.3-.11-2.05-.32v-3.31l.81.05c1.07 0 1.88-.2 2.43-.59.54-.39.97-1.05 1.29-1.98l.61-1.64-6.66-18.93h4.6z"
+					fill-rule="evenodd"></path><path
+					d="m27.89 14.14-.01-.01c-.01 0-.02-.01-.02-.01-.02-.02-.03-.06-.03-.09l.77-4.73 3.62 3.63-3.77 1.6c-.01 0-.02.01-.03.01h-.02s-.01-.01-.02-.02c-.14-.16-.31-.29-.49-.38zm5.26-.29 3.88 3.88c.81.81 1.21 1.21 1.35 1.67.02.07.04.14.05.21l-9.26-3.92s-.01 0-.01-.01c-.04-.02-.08-.03-.08-.07s.04-.06.08-.07l.01-.01zm5.12 7c-.2.38-.59.77-1.25 1.43l-4.37 4.37-5.65-1.18-.03-.01c-.05-.01-.1-.02-.1-.06-.04-.47-.28-.9-.66-1.19-.02-.02-.02-.06-.01-.09v-.01l1.06-6.53v-.02c.01-.05.01-.11.06-.11.46-.06.88-.3 1.16-.67.01-.01.01-.02.03-.03.03-.01.07 0 .1.01zm-6.62 6.8-7.19 7.19 1.23-7.56v-.01c0-.01 0-.02.01-.03.01-.02.04-.03.06-.04h.01c.27-.11.51-.29.69-.52.02-.03.05-.06.09-.06h.03zm-8.71 8.71-.81.81-8.95-12.94s-.01-.01-.01-.01c-.01-.02-.03-.04-.03-.06s.01-.03.02-.04l.01-.01c.03-.04.05-.08.07-.12l.02-.03c.01-.02.03-.05.05-.06s.05-.01.07 0l9.92 2.05c.03 0 .05.02.08.03.01.01.02.03.02.04.14.53.52.97 1.03 1.17.03.01.02.05 0 .08-.01.01-.01.03-.01.05-.12.74-1.19 7.27-1.48 9.04zm-1.69 1.69c-.6.59-.95.9-1.35 1.03-.39.12-.81.12-1.21 0-.47-.15-.87-.55-1.67-1.36l-8.99-8.99 2.35-3.64c.01-.02.02-.03.04-.05s.06-.01.09 0c.54.16 1.12.13 1.64-.08.03-.01.05-.02.07 0l.03.03zm-14.09-10.19-2.06-2.06 4.07-1.74c.01 0 .02-.01.03-.01.03 0 .05.03.07.07.04.06.08.12.13.18l.01.02c.01.02 0 .03-.01.05zm-2.98-2.97-2.61-2.61c-.44-.44-.77-.77-.99-1.04l7.94 1.65h.03c.05.01.1.02.1.06 0 .05-.06.07-.11.09l-.02.01zm-4.05-5c.01-.17.04-.33.09-.5.15-.47.55-.87 1.36-1.67l3.34-3.34c1.54 2.23 3.08 4.46 4.63 6.69.03.04.06.08.03.11-.15.16-.29.34-.4.53-.01.02-.03.05-.05.06-.01.01-.03 0-.04 0zm5.68-6.4 4.49-4.49c.42.19 1.96.83 3.33 1.41 1.04.44 1.99.84 2.29.97.03.01.06.02.07.05.01.02 0 .04 0 .06-.14.66.05 1.35.52 1.83.03.03 0 .07-.03.11l-.01.02-4.56 7.06c-.01.02-.02.04-.04.05s-.06.01-.09 0c-.18-.05-.36-.07-.54-.07-.16 0-.34.03-.52.06-.02 0-.04.01-.05 0-.02-.01-.03-.03-.05-.05zm5.4-5.4 5.81-5.81c.81-.81 1.21-1.21 1.67-1.36.39-.12.81-.12 1.21 0 .47.15.87.55 1.67 1.36l1.26 1.26-4.14 6.4c-.01.02-.02.03-.04.05s-.06.01-.09 0c-.66-.2-1.38-.06-1.92.37-.03.03-.07.01-.1 0-.53-.24-4.73-2.01-5.33-2.27zm12.5-3.67 3.82 3.82-.92 5.7v.02c0 .01 0 .03-.01.04-.01.02-.03.02-.05.03-.2.06-.38.15-.55.27-.01.01-.01.01-.02.02s-.02.02-.04.02c-.01 0-.03 0-.04-.01l-5.82-2.47-.01-.01c-.04-.02-.08-.03-.08-.07-.03-.32-.14-.64-.31-.91-.03-.05-.06-.09-.03-.14zm-3.93 8.6 5.45 2.31c.03.01.06.03.08.06.01.02.01.04 0 .06-.02.08-.03.17-.03.26v.15c0 .04-.04.05-.08.07h-.01c-.86.37-12.13 5.17-12.15 5.17s-.03 0-.05-.02c-.03-.03 0-.07.03-.11 0-.01.01-.01.01-.02l4.48-6.94.01-.01c.03-.04.06-.09.1-.09l.05.01c.1.01.19.03.28.03.68 0 1.31-.33 1.69-.9.01-.02.02-.03.03-.04.04-.01.08 0 .11.01zm-6.25 9.19 12.28-5.24s.02 0 .03.02c.07.07.12.11.18.15l.03.02c.02.01.05.03.05.06v.02l-1.05 6.46v.03c-.01.05-.01.11-.06.11-.57.04-1.08.36-1.37.85v.01c-.01.02-.03.05-.05.06s-.05.01-.07 0l-9.79-2.02c-.02-.02-.16-.53-.18-.53z"
+					fill="url(#netlify-gradient)"></path></svg
+			>
+		</a>
+	</div>
+</div>
+
+<style>
+	.sponsors {
+		opacity: 0.75;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		gap: 0.5rem;
+		padding: 2rem 0;
+	}
+	.sponsor {
+		margin-bottom: -0.375rem;
+		/* display: grid;
+		padding-left: 1rem;
+		padding: 0.25rem;
+		grid-gap: 0.5rem;
+		grid-template-columns: repeat(auto-fit, minmax(80px, 1fr)); */
+	}
+	svg {
+		color: var(--theme-text);
+		fill: currentColor;
+	}
+
+	.sponsor-logo__netlify {
+		width: 90px;
+	}
+
+	.sponsor-logo__vercel {
+		width: 90px;
+	}
+	:global(:root.theme-dark .sponsors-title) {
+		color: hsl(var(--color-base-gray), 75%);
+	}
+	.sponsors-title {
+		color: hsl(var(--color-base-gray), 25%);
+		font-size: 0.8em;
+		font-weight: 300;
+		letter-spacing: 0.0625em;
+		margin: 0 0;
+		text-transform: uppercase;
+	}
+</style>
diff --git a/smoke/docs-main/src/components/PageContent/ArticleNavigationButton.astro b/smoke/docs-main/src/components/PageContent/ArticleNavigationButton.astro
new file mode 100644
index 000000000..d080ce563
--- /dev/null
+++ b/smoke/docs-main/src/components/PageContent/ArticleNavigationButton.astro
@@ -0,0 +1,55 @@
+---
+const { item, rel } = Astro.props;
+---
+
+<a class={rel === 'next' ? 'rtl' : 'ltr'} rel="prev" href={new URL(item.link, Astro.site).pathname}>
+	{rel === 'prev' && (
+		<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512" height="32" width="32" fill="currentColor">
+			<path d="M447.1 256C447.1 273.7 433.7 288 416 288H109.3l105.4 105.4c12.5 12.5 12.5 32.75 0 45.25C208.4 444.9 200.2 448 192 448s-16.38-3.125-22.62-9.375l-160-160c-12.5-12.5-12.5-32.75 0-45.25l160-160c12.5-12.5 32.75-12.5 45.25 0s12.5 32.75 0 45.25L109.3 224H416C433.7 224 447.1 238.3 447.1 256z" />
+		</svg>
+	)}
+	{rel === 'next' && (
+		<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512" height="32" width="32" fill="currentColor">
+			<path d="M438.6 278.6l-160 160C272.4 444.9 264.2 448 256 448s-16.38-3.125-22.62-9.375c-12.5-12.5-12.5-32.75 0-45.25L338.8 288H32C14.33 288 .0016 273.7 .0016 256S14.33 224 32 224h306.8l-105.4-105.4c-12.5-12.5-12.5-32.75 0-45.25s32.75-12.5 45.25 0l160 160C451.1 245.9 451.1 266.1 438.6 278.6z" />
+		</svg>
+	)}
+	<div class="copy">
+		<div class="heading">{rel === 'next' ? 'Next Page' : 'Back'}</div>
+		<div class="name">{item.text}</div>
+	</div>
+</a>
+
+<style>
+	a {
+		flex-grow: 1;
+		flex-shrink: 0;
+		border: 1px solid var(--theme-divider);
+		padding: 1rem 1.25rem;
+		display: flex;
+		box-shadow: 0px 1px 2px var(--theme-text-lighter);
+		text-decoration: none;
+		color: var(--theme-text-lighter);
+	}
+	a:hover {
+		color: var(--theme-text-accent);
+		border: 1px solid var(--theme-accent);
+	}
+	.copy {
+		flex-grow: 1;
+	}
+	a.ltr {
+		text-align: right;
+	}
+	a.rtl {
+		flex-direction: row-reverse;
+	}
+	.heading {
+		color: var(--theme-text-light);
+		margin-bottom: -0.2rem;
+	}
+	.name {
+		font-size: 1.3rem;
+		font-weight: bold;
+		color: var(--theme-text);
+	}
+</style>
diff --git a/smoke/docs-main/src/components/PageContent/PageContent.astro b/smoke/docs-main/src/components/PageContent/PageContent.astro
index 01d88a256..849ff4de4 100644
--- a/smoke/docs-main/src/components/PageContent/PageContent.astro
+++ b/smoke/docs-main/src/components/PageContent/PageContent.astro
@@ -1,5 +1,6 @@
 ---
 import MoreMenu from '../RightSidebar/MoreMenu.astro';
+import ArticleNavigationButton from './ArticleNavigationButton.astro';
 import TableOfContents from '../RightSidebar/TableOfContents.tsx';
 import { getLanguageFromURL } from '../../util.ts';
 import { SIDEBAR } from '../../config.ts';
@@ -18,33 +19,17 @@ const previous = index !== -1 ? (index === 0 ? null : links[index - 1]) : null;
 	<section class="main-section">
 		<h1 class="content-title" id="overview">{title}</h1>
 		{headers && (
-			<nav class="block sm-hidden">
+			<nav class="block lg-hidden">
 				<TableOfContents client:media="(max-width: 50em)" headers={headers} />
+				<MoreMenu editHref={githubEditUrl} />
 			</nav>
 		)}
 		<slot />
 	</section>
-	<nav class="block sm-hidden">
-		<MoreMenu editHref={githubEditUrl} />
-	</nav>
 	{(previous || next) && (
-		<aside>
-			{previous && (
-				<div>
-					Previous Article:{' '}
-					<a rel="prev" href={new URL(previous.link, Astro.site).pathname}>
-						{previous.text}
-					</a>
-				</div>
-			)}
-			{next && (
-				<div>
-					Next Article:{' '}
-					<a rel="next" href={new URL(next.link, Astro.site).pathname}>
-						{next.text}
-					</a>
-				</div>
-			)}
+		<aside class="next-previous-nav">
+			{previous && <ArticleNavigationButton rel="prev" item={previous} />}
+			{next && <ArticleNavigationButton rel="next" item={next} />}
 		</aside>
 	)}
 </article>
@@ -57,6 +42,7 @@ const previous = index !== -1 ? (index === 0 ? null : links[index - 1]) : null;
 		height: 100%;
 		display: flex;
 		flex-direction: column;
+		margin: auto;
 	}
 	.content > section {
 		margin-bottom: 4rem;
@@ -64,9 +50,16 @@ const previous = index !== -1 ? (index === 0 ? null : links[index - 1]) : null;
 	.block {
 		display: block;
 	}
+	.next-previous-nav {
+		display: flex;
+		flex-wrap: wrap;
+		width: auto;
+		gap: 1rem;
+		margin-bottom: 1.5rem;
+	}
 
-	@media (min-width: 50em) {
-		.sm-hidden {
+	@media (min-width: 72em) {
+		.lg-hidden {
 			display: none;
 		}
 	}
diff --git a/smoke/docs-main/src/components/RightSidebar/MoreMenu.astro b/smoke/docs-main/src/components/RightSidebar/MoreMenu.astro
index 31d31bdbb..5b35498a7 100644
--- a/smoke/docs-main/src/components/RightSidebar/MoreMenu.astro
+++ b/smoke/docs-main/src/components/RightSidebar/MoreMenu.astro
@@ -1,5 +1,4 @@
 ---
-import ThemeToggleButton from './ThemeToggleButton.tsx';
 const { editHref } = Astro.props;
 ---
 
@@ -60,15 +59,11 @@ const { editHref } = Astro.props;
 		</a>
 	</li>
 </ul>
-<div style="margin: 2rem 0; text-align: center;">
-	<ThemeToggleButton client:visible />
-</div>
 
 <style>
 	.edit-on-github {
 		text-decoration: none;
 		font: inherit;
-		color: inherit;
 		font-size: 1rem;
 	}
 </style>
diff --git a/smoke/docs-main/src/components/RightSidebar/RightSidebar.astro b/smoke/docs-main/src/components/RightSidebar/RightSidebar.astro
index c27232cf6..142e69bc5 100644
--- a/smoke/docs-main/src/components/RightSidebar/RightSidebar.astro
+++ b/smoke/docs-main/src/components/RightSidebar/RightSidebar.astro
@@ -1,5 +1,6 @@
 ---
 import TableOfContents from './TableOfContents.tsx';
+import ThemeToggleButton from './ThemeToggleButton.tsx';
 import MoreMenu from './MoreMenu.astro';
 const { content, githubEditUrl } = Astro.props;
 const headers = content.astro?.headers;
@@ -9,6 +10,9 @@ const headers = content.astro?.headers;
 	<div class="sidebar-nav-inner">
 		{headers && <TableOfContents client:media="(min-width: 50em)" headers={headers} />}
 		<MoreMenu editHref={githubEditUrl} />
+		<div style="margin: 2rem 0; text-align: center;">
+			<ThemeToggleButton client:visible />
+		</div>
 	</div>
 </nav>
 
diff --git a/smoke/docs-main/src/components/TabBox.astro b/smoke/docs-main/src/components/TabBox.astro
new file mode 100644
index 000000000..a5d4bc4ae
--- /dev/null
+++ b/smoke/docs-main/src/components/TabBox.astro
@@ -0,0 +1,104 @@
+---
+import { Markdown, Code, Prism } from 'astro/components';
+---
+<style>
+    .hidden {
+        display: none;
+    }
+    .active {
+        background-color: var(--theme-accent);
+        color: white;
+        font-weight: bold;
+        border-top-left-radius: 1em;
+        border-top-right-radius: 1em;
+        padding: 3em;
+    }
+    .tab-bar {
+        background-color: var(--theme-divider); 
+        display:flex;
+        justify-content: flex-start;
+        margin-bottom:0;
+        padding: 0.5em;
+        padding-bottom: 0;
+        border-top-left-radius: 1em;
+        border-top-right-radius: 1em;
+
+    }
+    pre {
+        border-radius: 0;
+    }
+    .code {
+        margin-top:0;
+        padding-left: 0.5em;
+        max-width: 100vw;
+        overflow: hidden;
+        background-color: hsla(217, 19%, 27%, 1);
+    }
+    .toggle {
+        padding: 0.5em;
+        padding-left: 1em;
+        padding-bottom: 0;
+        cursor: pointer;
+        width: 20%;
+    
+    }
+</style>
+
+
+
+<div class="TabBox">
+    <div class="tab-bar">
+        <div id="install-npm" class="active toggle"><h5>npm</h5></div>
+        <div id="install-yarn" class="toggle"><h5>yarn</h5></div>
+    </div>
+    <div id="npm">
+        <Code lang="bash" code={`# prerequisite: check that Node.js is 14.15.0+, or 16+
+node --version
+
+# Make a new project directory, and navigate into it
+mkdir my-astro-project && cd $_
+
+# prepare for liftoff...
+npm init astro
+
+# install dependencies
+npm install
+
+# start developing!
+npm run dev`}/ >
+    </div>
+    <div id="yarn" class="hidden">
+        <Code lang="bash" code={`# prerequisite: check that Node.js is 14.15.0+, or 16+
+node --version
+
+# Make a new project directory, and navigate into it
+mkdir my-astro-project && cd $_
+
+# prepare for liftoff...
+yarn create astro
+
+# install dependencies
+yarn install
+
+# start developing!
+yarn start`}/>
+    </div>
+</div>
+
+<script type="module">
+document.getElementById("install-npm").addEventListener("click", () => {
+    document.getElementById("npm").classList.remove("hidden");
+    document.getElementById("yarn").classList.add("hidden");
+    document.getElementById("install-npm").classList.add("active");
+    document.getElementById("install-yarn").classList.remove("active");
+    console.log("click");
+  });
+  
+  document.getElementById("install-yarn").addEventListener("click", () => {
+    document.getElementById("yarn").classList.remove("hidden");
+    document.getElementById("npm").classList.add("hidden");
+    document.getElementById("install-yarn").classList.add("active");
+    document.getElementById("install-npm").classList.remove("active");
+    console.log("click");
+  });
+  </script>
\ No newline at end of file
diff --git a/smoke/docs-main/src/config.ts b/smoke/docs-main/src/config.ts
index de3793bf3..e4eeb2b0c 100644
--- a/smoke/docs-main/src/config.ts
+++ b/smoke/docs-main/src/config.ts
@@ -1,13 +1,13 @@
 export const SIDEBAR = {
 	en: [
-		{ text: 'Setup', header: true },
+		{ text: 'Setup', header: true, type: 'learn' },
 		{ text: 'Getting Started', link: 'en/getting-started' },
 		{ text: 'Installation', link: 'en/installation' },
 		{ text: 'Migration Guide', link: 'en/migrate' },
 		{ text: 'Themes', link: 'en/themes' },
-		{ text: 'Integrations', link: `en/integrations/integrations`},
+		{ text: 'Integrations', link: `en/integrations/integrations` },
 
-		{ text: 'Basics', header: true },
+		{ text: 'Basics', header: true, type: 'learn' },
 		{ text: 'Project Structure', link: 'en/core-concepts/project-structure' },
 		{ text: 'Components', link: 'en/core-concepts/astro-components' },
 		{ text: 'Pages', link: 'en/core-concepts/astro-pages' },
@@ -16,7 +16,7 @@ export const SIDEBAR = {
 		{ text: 'Partial Hydration', link: 'en/core-concepts/component-hydration' },
 		{ text: 'Astro vs. X', link: 'en/comparing-astro-vs-other-tools' },
 
-		{ text: 'Guides', header: true },
+		{ text: 'Guides', header: true, type: 'learn' },
 		{ text: 'Styling & CSS', link: 'en/guides/styling' },
 		{ text: 'Markdown', link: 'en/guides/markdown-content' },
 		{ text: 'Debugging', link: 'en/guides/debugging' },
@@ -30,7 +30,7 @@ export const SIDEBAR = {
 		{ text: 'Deploy to the web', link: 'en/guides/deploy' },
 		{ text: 'Publish to npm', link: 'en/guides/publish-to-npm' },
 
-		{ text: 'Reference', header: true },
+		{ text: 'Reference', header: true, type: 'api' },
 		{ text: 'Built-In Components', link: 'en/reference/builtin-components' },
 		{ text: 'API Reference', link: 'en/reference/api-reference' },
 		{ text: 'CLI Reference', link: 'en/reference/cli-reference' },
@@ -41,7 +41,7 @@ export const SIDEBAR = {
 		{ text: 'Renderer Reference', link: 'en/reference/renderer-reference' },
 	],
 	de: [
-		{ text: 'Einrichtung', header: true },
+		{ text: 'Einrichtung', header: true, type: 'learn' },
 		{ text: 'Erste Schritte', link: 'de/getting-started' },
 		{ text: 'Schnellstart', link: 'de/quick-start' },
 		{ text: 'Installation', link: 'de/installation' },
@@ -49,7 +49,7 @@ export const SIDEBAR = {
 		{ text: 'Astro vs. X', link: 'de/comparing-astro-vs-other-tools' },
 		{ text: 'Umstellung auf v0.21', link: 'de/migration/0.21.0' },
 
-		{ text: 'Grundlagen', header: true },
+		{ text: 'Grundlagen', header: true, type: 'learn' },
 		{ text: 'Projektstruktur', link: 'de/core-concepts/project-structure' },
 		{ text: 'Astro-Komponenten', link: 'de/core-concepts/astro-components' },
 		{ text: 'Astro-Seiten', link: 'de/core-concepts/astro-pages' },
@@ -57,30 +57,30 @@ export const SIDEBAR = {
 		{ text: 'Routing', link: 'de/core-concepts/routing' },
 		{ text: 'Partial Hydration', link: 'de/core-concepts/component-hydration' },
 
-		{ text: 'Anleitungen', header: true },
+		{ text: 'Anleitungen', header: true, type: 'learn' },
 		{ text: 'Styling & CSS', link: 'de/guides/styling' },
 
-		{ text: 'Referenz', header: true },
+		{ text: 'Referenz', header: true, type: 'api' },
 	],
 	nl: [
-		{ text: 'Welkom', header: true },
+		{ text: 'Welkom', header: true, type: 'learn' },
 		{ text: 'Beginnen', link: 'nl/getting-started' },
 		{ text: 'Snel start', link: 'nl/quick-start' },
 	],
 	fi: [
-		{ text: 'Tervetuloa', header: true },
+		{ text: 'Tervetuloa', header: true, type: 'learn' },
 		{ text: 'Aloittaminen', link: 'fi/getting-started' },
 		{ text: 'Pika-aloitus', link: 'fi/quick-start' },
 		{ text: 'Asennus', link: 'fi/installation' },
 	],
 	es: [
-		{ text: 'Configuración', header: true },
+		{ text: 'Configuración', header: true, type: 'learn' },
 		{ text: 'Empezando', link: 'es/getting-started' },
 		{ text: 'Comienzo rápido', link: 'es/quick-start' },
 		{ text: 'Instalación', link: 'es/installation' },
 		{ text: 'Astro vs. X', link: 'es/comparing-astro-vs-other-tools' },
 
-		{ text: 'Fundamentos', header: true },
+		{ text: 'Fundamentos', header: true, type: 'learn' },
 		{
 			text: 'Estructura del Proyecto',
 			link: 'es/core-concepts/project-structure',
@@ -97,7 +97,7 @@ export const SIDEBAR = {
 			link: 'es/core-concepts/component-hydration',
 		},
 
-		{ text: 'Guías', header: true },
+		{ text: 'Guías', header: true, type: 'learn' },
 		{ text: 'Estilo y CSS', link: 'es/guides/styling' },
 		{ text: 'Markdown', link: 'es/guides/markdown-content' },
 		{ text: 'Depuración', link: 'es/guides/debugging' },
@@ -109,7 +109,7 @@ export const SIDEBAR = {
 		{ text: 'Desplegar en la web', link: 'es/guides/deploy' },
 		{ text: 'Publicar en npm', link: 'es/guides/publish-to-npm' },
 
-		{ text: 'Referencia', header: true },
+		{ text: 'Referencia', header: true, type: 'api' },
 		{
 			text: 'Componentes incorporados',
 			link: 'es/reference/builtin-components',
@@ -126,7 +126,7 @@ export const SIDEBAR = {
 		},
 	],
 	'zh-CN': [
-		{ text: '起步', header: true },
+		{ text: '起步', header: true, type: 'learn' },
 		{ text: '入门指南', link: 'zh-CN/getting-started' },
 		{ text: '快速入门', link: 'zh-CN/quick-start' },
 		{ text: '安装指南', link: 'zh-CN/installation' },
@@ -137,64 +137,64 @@ export const SIDEBAR = {
 		},
 	],
 	'zh-TW': [
-		{ text: '設定', header: true },
+		{ text: '設定', header: true, type: 'learn' },
 		{ text: '新手上路', link: 'zh-TW/getting-started' },
 		{ text: '快速開始', link: 'zh-TW/quick-start' },
 		{ text: '安裝', link: 'zh-TW/installation' },
 		{ text: '佈景主題', link: 'zh-TW/themes' },
 	],
 	bg: [
-		{ text: 'Главни', header: true },
+		{ text: 'Главни', header: true, type: 'learn' },
 		{ text: 'Започваме!', link: 'bg/getting-started' },
 	],
 	fr: [
-		{ text: 'Bienvenue', header: true },
+		{ text: 'Bienvenue', header: true, type: 'learn' },
 		{ text: 'Bien démarrer', link: 'fr/getting-started' },
 		{ text: 'Démarrage rapide', link: 'fr/quick-start' },
 		{ text: 'Installation', link: 'fr/installation' },
 	],
 	bn: [
-		{ text: 'সেটআপ', header: true },
+		{ text: 'সেটআপ', header: true, type: 'learn' },
 		{ text: 'শুরু করুন', link: 'bn/getting-started' },
 	],
 	kr: [
-		{ text: '환영합니다', header: true },
+		{ text: '환영합니다', header: true, type: 'learn' },
 		{ text: '시작하기', link: 'kr/getting-started' },
 	],
 	ar: [
-		{ text: 'التهيئة', header: true },
+		{ text: 'التهيئة', header: true, type: 'learn' },
 		{ text: 'باشر البدأ', link: 'ar/getting-started' },
 	],
 	da: [
-		{ text: 'Velkommen', header: true },
+		{ text: 'Velkommen', header: true, type: 'learn' },
 		{ text: 'Introduktion', link: 'da/getting-started' },
 	],
 	ja: [
-		{ text: 'セットアップ', header: true },
+		{ text: 'セットアップ', header: true, type: 'learn' },
 		{ text: 'はじめに', link: 'ja/getting-started' },
 		{ text: 'クイックスタート', link: 'ja/quick-start' },
 		{ text: 'インストール', link: 'ja/installation' },
 		{ text: 'テーマ', link: 'ja/themes' },
 		{ text: 'Astro vs. X', link: 'ja/comparing-astro-vs-other-tools' },
 
-		{ text: '基本', header: true },
+		{ text: '基本', header: true, type: 'learn' },
 		{ text: 'ディレクトリ構成', link: 'ja/core-concepts/project-structure' },
 	],
 	ru: [
-		{ text: 'Введение', header: true },
+		{ text: 'Введение', header: true, type: 'learn' },
 		{ text: 'Начало работы', link: 'ru/getting-started' },
 		{ text: 'Быстрый старт', link: 'ru/quick-start' },
 	],
 	it: [
-		{ text: 'Impostare', header: true },
+		{ text: 'Impostare', header: true, type: 'learn' },
 		{ text: 'Come iniziare', link: 'it/getting-started' },
 	],
 	pl: [
-		{ text: 'Konfiguracja', header: true },
+		{ text: 'Konfiguracja', header: true, type: 'learn' },
 		{ text: 'Na początek', link: 'pl/getting-started' },
 	],
 	hu: [
-		{ text: 'Beállítás', header: true },
+		{ text: 'Beállítás', header: true, type: 'learn' },
 		{ text: 'Első Lépések', link: 'hu/getting-started' },
 		{ text: 'Gyors Beállítás', link: 'hu/quick-start' },
 		{ text: 'Telepítés', link: 'hu/installation' },
diff --git a/smoke/docs-main/src/layouts/MainLayout.astro b/smoke/docs-main/src/layouts/MainLayout.astro
index 9ebe2f22e..031c2ea18 100644
--- a/smoke/docs-main/src/layouts/MainLayout.astro
+++ b/smoke/docs-main/src/layouts/MainLayout.astro
@@ -60,6 +60,7 @@ const lang = getLanguageFromURL(Astro.request.url.pathname);
 				display: flex;
 				flex-direction: column;
 				height: 100%;
+				min-width: 0;
 			}
 			#grid-right {
 				display: none;
@@ -91,11 +92,10 @@ const lang = getLanguageFromURL(Astro.request.url.pathname);
 				.layout {
 					grid-template-columns:
 						20rem
-						minmax(0, var(--max-width))
+						1fr
 						18rem;
 					padding-left: 0;
 					padding-right: 0;
-					margin: 0 auto;
 				}
 				#grid-right {
 					grid-column: 3;
diff --git a/smoke/docs-main/src/pages/en/getting-started.md b/smoke/docs-main/src/pages/en/getting-started.md
index b0a879df2..bbef88a38 100644
--- a/smoke/docs-main/src/pages/en/getting-started.md
+++ b/smoke/docs-main/src/pages/en/getting-started.md
@@ -1,72 +1,98 @@
 ---
+setup: |
+    import Button from '../../components/Button.astro'
 layout: ~/layouts/MainLayout.astro
 title: Getting Started
 description: A basic intro to Astro.
 ---
-
-Astro is a modern static site builder. Learn what Astro is all about from [our homepage](https://astro.build/) or [our release post](https://astro.build/blog/introducing-astro). This page is an overview of the Astro documentation and all related resources.
+Static Site Generator  🚀  Bring your own Framework  🚀  Ship Less JavaScript
 
 ## Try Astro
 
-The easiest way to install Astro is to run `npm init astro` in a new directory on your machine. Our CLI wizard will assist you in starting a new Astro project.
-
- 📚 Read our [Installation Guide](/en/installation) for detailed instructions.
-
-### Example Projects
-
-If you prefer to learn Astro by example, check out our [complete library of examples](https://github.com/withastro/astro/tree/main/examples) on GitHub.
-
-You can check out any of these examples on your local machine by running `npm init astro` with the `--template` CLI flag. The `--template` flag also supports third-party, community templates.
-
-```bash
-# Run the init wizard and use this official template
-npm init astro -- --template [OFFICIAL_EXAMPLE_NAME]
-# Run the init wizard and use this community template
-npm init astro -- --template [GITHUB_USER]/[REPO_NAME]
-npm init astro -- --template [GITHUB_USER]/[REPO_NAME]/path/to/example
-```
+We've made it as easy as possible to get started with Astro either in your browser, or on your machine!
 
 ### Online Playgrounds
 
-If you're interested in playing around with Astro in the browser, you can instantly spin up a new Astro project with our UI at [astro.new](https://astro.new/).
+Visit [astro.new](https://astro.new) for the easiest way to "try before you buy." Choose from a variety of starter templates and start building a full, working version of Astro right in your browser!
+
+Or, **instantly launch our basic starter project** with just one click of a button:
+
+<div style="display: flex; flex-wrap: wrap; gap: 0.5rem;">
+    <Button href="https://astro.new/starter?on=codesandbox">Open in CodeSandbox</Button>
+    <Button href="https://astro.new/starter?on=stackblitz">Open in StackBlitz</Button>
+</div>
+
+### Install Astro Locally
+
+Ready to install?
+
+Get a new project up and running locally in no time with our easy `create-astro` CLI wizard!
+
+```bash
+# run this command in a new directory to get started!
+npm init astro
+```
+
+⚙️ Our [Installation Guide](/en/installation) has full, step-by-step instructions for installing Astro with your favourite package manager.
+
+⚙️ See instructions for [manual setup](/en/guides/manual-setup) instead.
+
+
+## Start building with Astro
+
+Jump right in and add some content and features to your site!
+
+🏗️ Add new [Astro (.astro) pages](/en/core-concepts/astro-pages) and/or [Markdown (.md) pages](/en/guides/markdown-content) to your site.
+
+🏗️ Create your first [Layout](/en/core-concepts/layouts).
+
+🏗️ Add additional [CSS and styling](/en/guides/styling) to your site. 
+
+*... and even more Guides under **Learn***
+
 
-You can try Astro in online code editors like Stackblitz, CodeSandbox, Gitpod, and GitHub Codespaces. Click the "Open in Stackblitz" link in any of the examples in our [examples library](https://github.com/withastro/astro/tree/main/examples). Or, [click here](https://stackblitz.com/fork/astro) to start a new project in [Stackblitz](https://stackblitz.com/fork/astro).
 
 ## Learn Astro
 
-All manner of people come to Astro from different backgrounds bringing with them different learning styles. Whether you prefer a more theoretical or a practical approach, we hope you'll find this section helpful.
+See examples of some of the key concepts and patterns of an Astro site!
 
-- If you prefer to **learn by doing**, start with our [examples library](https://github.com/withastro/astro/tree/main/examples).
-- If you prefer to **learn concepts step by step**, start with our [basic concepts and guides](/en/core-concepts/project-structure).
+📚 Read more about Astro’s [project structure.](/en/core-concepts/project-structure)
 
-Like any unfamiliar technology, Astro comes with a slight learning curve. However, with practice and some patience, we know, you _will_ get the hang of it, in no time.
+📚 Learn more about Astro’s [built-in components.](/en/reference/builtin-components)
 
-### Learn `.astro` Syntax
+📚 Explore Astro’s [API.](/en/reference/api-reference)
 
-When you begin to learn Astro, you'll see many files using the `.astro` file extension. This is **Astro’s Component Syntax**: a special HTML-like file format which Astro uses for templating. It was designed to feel familiar to anyone with HTML or JSX experience.
+*... and even more reference material under **API***
 
-Our helpful guide on [Astro components](/en/core-concepts/astro-components) introduces you to the Astro syntax, and is the best way to learn.
+## Integrate with Astro
 
-### API Reference
+Explore different integrations that our users have combined with Astro!
 
-This documentation section is useful when you want to learn more details about a particular Astro API. For example, [Configuration Reference](/en/reference/configuration-reference) lists all possible configuration options available to you. [Built-in Components Reference](/en/reference/builtin-components) lists all available core components, like `<Markdown />` and `<Code />`.
+🧰 Use a CMS with your Astro project.
 
-### Versioned Documentation
+🧰 Set up eCommerce.
 
-This documentation always reflects the latest stable version of Astro. Once we hit the v1.0 milestone, we will add the ability to view versioned documentation.
+🧰 Connect a database to your site.
 
-## Staying Informed
+*... see our [third-party integrations](/en/integrations/integrations)*
 
-The [@astrodotbuild](https://twitter.com/astrodotbuild) Twitter account is the official source for the updates from the Astro team.
 
-We also post release announcements to our [Discord community](https://astro.build/chat) in the #announcements channel.
 
-Not every Astro release deserves its own blog post, but you can find a detailed changelog for every release in the [`CHANGELOG.md` file in the Astro repository](https://github.com/withastro/astro/blob/main/packages/astro/CHANGELOG.md).
+## Join our Community
 
-## Something Missing?
+Join us in the [Astro Discord](https://astro.build/chat) to share with and get help from an active, friendly community!
 
-If something is missing in the documentation or if you found some part confusing, please [file an issue for the documentation](https://github.com/withastro/astro/issues/new/choose) with your suggestions for improvement, or tweet at the [@astrodotbuild](https://twitter.com/astrodotbuild) Twitter account. We love hearing from you!
+💬 Say hi in our `#introduce-yourself` channel!
 
-## Credit
+💬 Ask our Support Squad a question in our `#support` channel!
 
-This getting started guide was originally based off of [React’s](https://reactjs.org/) getting started guide.
+💬 Share what you've been working on in our `#showcase` channel!
+
+
+## Learn More
+
+[Astro Blog](https://astro.build/blog/)
+
+[Astro changelog](https://github.com/withastro/astro/blob/main/packages/astro/CHANGELOG.md)
+
+[Astro Migration Guide](/en/migrate) (for upgrading to v0.21+)
diff --git a/smoke/docs-main/src/pages/en/integrations/integrations.md b/smoke/docs-main/src/pages/en/integrations/integrations.md
index 271c055f2..9d3490d96 100644
--- a/smoke/docs-main/src/pages/en/integrations/integrations.md
+++ b/smoke/docs-main/src/pages/en/integrations/integrations.md
@@ -45,6 +45,8 @@ Here are some production sites, repositories, blog posts and videos from the com
 
 [Chris Bongers](https://aviyel.com/post/1006/adding-typesense-search-to-an-astro-static-generated-website) - **Post**: Adding Typesense Search to an Astro Website
 
+[The Net Ninja](https://www.youtube.com/playlist?list=PL4cUxeGkcC9hZm9NYpd4G-jhoeEk0ls--) - **Video**: Figma and Astro Static Site Build
+
 ## Repositories / Starter Templates
 
 [delucis/astro-netlify-cms](https://github.com/delucis/astro-netlify-cms/) - Astro Starter Template with Netlify CMS
diff --git a/smoke/docs-main/src/pages/en/migration/0.21.0.astro b/smoke/docs-main/src/pages/en/migration/0.21.0.astro
index 038b1e662..efedd1829 100644
--- a/smoke/docs-main/src/pages/en/migration/0.21.0.astro
+++ b/smoke/docs-main/src/pages/en/migration/0.21.0.astro
@@ -1 +1 @@
-<meta http-equiv="refresh" content="5;url=/en/migrate">
\ No newline at end of file
+<meta http-equiv="refresh" content="5;url=/en/migrate" />
diff --git a/smoke/docs-main/src/pages/en/reference/configuration-reference.md b/smoke/docs-main/src/pages/en/reference/configuration-reference.md
index 9c729ee0b..736450287 100644
--- a/smoke/docs-main/src/pages/en/reference/configuration-reference.md
+++ b/smoke/docs-main/src/pages/en/reference/configuration-reference.md
@@ -19,7 +19,19 @@ export default /** @type {import('astro').AstroUserConfig} */ ({
     '@astrojs/renderer-react',
     '@astrojs/renderer-preact',
   ],
+  buildOptions: {
+    site: 'https://my-site.dev/',
+    sitemap: true,
+    pageUrlFormat: 'directory',
+    drafts: false,
+  },
+  devOptions: {
+    hostname: 'localhost',
+    port: 3000,
+    trailingSlash: 'always',
+  },
   vite: {},
+  markdownOptions: {},
 });
 ```
 
@@ -63,10 +75,36 @@ The `renderers` option defines the framework renderers to be used by Astro.
 
 The `buildOptions` option configures how a site is built, including its base URL (`buildOptions.site`), whether it includes a sitemap (`buildOptions.sitemap`), whether markdown draft pages should be included in the build (`buildOptions.drafts`), and whether its pages should be files (`path.html`) or directories (`path/index.html`) (`buildOptions.pageUrlFormat`).
 
+**Defaults**:
+
+- `buildOptions.site`: Public [origin](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Origin) used to generate sitemaps and canonical URLs.
+  - Your public domain, e.g.: `https://my-site.dev/`.
+- `buildOptions.sitemap`: Whether to automatically generate a sitemap.
+  - Either `true` or `false`.
+  - Default: `true`.
+- `buildOptions.pageUrlFormat`: Determines how files built from pages are written.
+  - Either `file` (ex: "/foo.html") or `directory` (ex: "/foo/index.html").
+  - Default: `'directory'`.
+- `buildOptions.drafts`: Determines whether markdown draft pages are included in the build.
+  - Either `true` or `false`.
+  - Default: `false`.
+
+Read more about [markdown draft pages][markdown-draft-pages].
+
 #### devOptions
 
 The `devOptions` option configures features used during development, including the server hostname (`devOptions.hostname`), the server port (`devOptions.port`), and whether urls should include a trailing slash (`devOptions.trailingSlash`).
 
+**Defaults**:
+
+- `devOptions.hostname`: The hostname for the dev server.
+  - Default: `localhost`.
+- `devOptions.port`:  The port to run the dev server on.
+  - Default: `3000`.
+- `devOptions.trailingSlash`: Trailing slash behavior of URL route matching.
+  - Either `always` (ex: "/foo/"), `never` (ex: "/foo"), or `ignore` (regardless of trailing "/").
+  - Default: `'always'`.
+
 #### vite
 
 The `vite` option configures the internals of Vite. These options can be explored on [ViteJS.dev](https://vitejs.dev/config/).
@@ -78,3 +116,5 @@ The `markdownOptions` option assigns options to the Markdown parser. These optio
 ---
 
 You can view the entire configuration API on [GitHub](https://github.com/withastro/astro/blob/latest/packages/astro/src/@types/astro.ts).
+
+[markdown-draft-pages]: /en/guides/markdown-content#markdown-draft-pages
diff --git a/smoke/docs-main/yarn.lock b/smoke/docs-main/yarn.lock
index 2dd920568..1fa7543e0 100644
--- a/smoke/docs-main/yarn.lock
+++ b/smoke/docs-main/yarn.lock
@@ -183,15 +183,6 @@
     unist-util-map "^3.0.0"
     unist-util-visit "^4.1.0"
 
-"@astrojs/parser@^0.22.0":
-  version "0.22.0"
-  resolved "https://registry.yarnpkg.com/@astrojs/parser/-/parser-0.22.0.tgz#a717d4c2d7bb5080ae4c67077aec432cb8bce835"
-  integrity sha512-H3YpRaVuW5mNPrcEEMzfNQla10TX6c/gQ73RrGK089C6yie3jSjIz0pw292E26larYC0zAlNLGH+IwhlYFPklA==
-  dependencies:
-    acorn "^8.6.0"
-    locate-character "^2.0.5"
-    magic-string "^0.25.3"
-
 "@astrojs/prism@0.4.0", "@astrojs/prism@^0.4.0":
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/@astrojs/prism/-/prism-0.4.0.tgz#615c8d9d9ca0c2b4984870b973a935d28b693ac5"
@@ -233,12 +224,17 @@
     "@vitejs/plugin-vue" "^2.2.0"
     vue "^3.2.30"
 
+"@astropub/icons@^0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@astropub/icons/-/icons-0.1.1.tgz#3f9600cc8e2f242fc745d7622e15d837a4968845"
+  integrity sha512-UhKb1KpeV7dvXsZi+m9LV/lg1muVILAARODCDabynNHP0iIqFRLYAio6pmnbh72aPv/P58wck/GeatM/PgPqZw==
+
 "@astropub/webapi@^0.10.1":
   version "0.10.13"
   resolved "https://registry.yarnpkg.com/@astropub/webapi/-/webapi-0.10.13.tgz#28f95706d1e9041495347465fb347eb78035cdd7"
   integrity sha512-efUVnq9IWPHYl5nxSLkDZzp1RvNmKpYApcHhgQnN2A+4D8z6dnTYlXo5Ogl0aAJWMMBKN89Q2GJwDF0zy8Lonw==
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7":
+"@babel/code-frame@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
   integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
@@ -637,14 +633,6 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"
   integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==
 
-"@types/glob@^7.1.1":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
-  integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==
-  dependencies:
-    "@types/minimatch" "*"
-    "@types/node" "*"
-
 "@types/hast@^2.0.0":
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/@types/hast/-/hast-2.3.4.tgz#8aa5ef92c117d20d974a82bdfb6a648b08c0bafc"
@@ -669,16 +657,6 @@
   resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.2.tgz#e2ce9d83a613bacf284c7be7d491945e39e1f8e9"
   integrity sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==
 
-"@types/minimatch@*":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
-  integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
-
-"@types/minimist@^1.2.0":
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
-  integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
-
 "@types/ms@*":
   version "0.7.31"
   resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
@@ -696,11 +674,6 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.17.tgz#a8ddf6e0c2341718d74ee3dc413a13a042c45a0c"
   integrity sha512-e8PUNQy1HgJGV3iU/Bp2+D/DXh3PYeyli8LgIwsQcs1Ar1LoaWHSIT6Rw+H2rNJmiq6SNWiDytfx8+gYj7wDHw==
 
-"@types/normalize-package-data@^2.4.0":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
-  integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
-
 "@types/parse5@^6.0.0", "@types/parse5@^6.0.1":
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-6.0.3.tgz#705bb349e789efa06f43f128cef51240753424cb"
@@ -843,11 +816,6 @@ abbrev@1:
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
-acorn@^8.6.0:
-  version "8.7.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
-  integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
-
 agent-base@6:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
@@ -855,14 +823,6 @@ agent-base@6:
   dependencies:
     debug "4"
 
-aggregate-error@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
-  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
-  dependencies:
-    clean-stack "^2.0.0"
-    indent-string "^4.0.0"
-
 algoliasearch@^4.0.0:
   version "4.12.1"
   resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-4.12.1.tgz#574a2c5424c4b6681c026928fb810be2d2ec3924"
@@ -942,21 +902,11 @@ array-union@^1.0.1:
   dependencies:
     array-uniq "^1.0.1"
 
-array-union@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
-  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
-
 array-uniq@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
   integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
 
-arrify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
-
 assert@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/assert/-/assert-2.0.0.tgz#95fc1c616d48713510680f2eaf2d10dd22e02d32"
@@ -1213,25 +1163,11 @@ calmcard@~0.1.1:
   resolved "https://registry.yarnpkg.com/calmcard/-/calmcard-0.1.1.tgz#35ac2b66492b0ed39ad06a893a0ff6e61124e449"
   integrity sha1-NawrZkkrDtOa0GqJOg/25hEk5Ek=
 
-camelcase-keys@^6.2.2:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"
-  integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==
-  dependencies:
-    camelcase "^5.3.1"
-    map-obj "^4.0.0"
-    quick-lru "^4.0.1"
-
 camelcase@^1.0.2:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
   integrity sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=
 
-camelcase@^5.0.0, camelcase@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
-  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-
 caniuse-lite@^1.0.30001286:
   version "1.0.30001310"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001310.tgz#da02cd07432c9eece6992689d1b84ca18139eea8"
@@ -1352,11 +1288,6 @@ ci-info@^3.2.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2"
   integrity sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==
 
-clean-stack@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
-  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
-
 cli-table@~0.3.1:
   version "0.3.11"
   resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.11.tgz#ac69cdecbe81dccdba4889b9a18b7da312a9d3ee"
@@ -1493,19 +1424,6 @@ debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.3:
   dependencies:
     ms "2.1.2"
 
-decamelize-keys@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
-  integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=
-  dependencies:
-    decamelize "^1.1.0"
-    map-obj "^1.0.0"
-
-decamelize@^1.1.0, decamelize@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
-
 decode-named-character-reference@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/decode-named-character-reference/-/decode-named-character-reference-1.0.1.tgz#57b2bd9112659cacbc449d3577d7dadb8e1f3d1b"
@@ -1532,28 +1450,6 @@ define-properties@^1.1.3:
   dependencies:
     object-keys "^1.0.12"
 
-del-cli@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/del-cli/-/del-cli-3.0.1.tgz#2d27ff260204b5104cadeda86f78f180a4ebe89a"
-  integrity sha512-BLHItGr82rUbHhjMu41d+vw9Md49i81jmZSV00HdTq4t+RTHywmEht/23mNFpUl2YeLYJZJyGz4rdlMAyOxNeg==
-  dependencies:
-    del "^5.1.0"
-    meow "^6.1.1"
-
-del@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/del/-/del-5.1.0.tgz#d9487c94e367410e6eff2925ee58c0c84a75b3a7"
-  integrity sha512-wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA==
-  dependencies:
-    globby "^10.0.1"
-    graceful-fs "^4.2.2"
-    is-glob "^4.0.1"
-    is-path-cwd "^2.2.0"
-    is-path-inside "^3.0.1"
-    p-map "^3.0.0"
-    rimraf "^3.0.0"
-    slash "^3.0.0"
-
 depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
@@ -1589,13 +1485,6 @@ diff@^5.0.0:
   resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
   integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
 
-dir-glob@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
-  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
-  dependencies:
-    path-type "^4.0.0"
-
 dom-serializer@^1.0.1, dom-serializer@^1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91"
@@ -2194,7 +2083,7 @@ extract-zip@^2.0.0:
   optionalDependencies:
     "@types/yauzl" "^2.9.1"
 
-fast-glob@^3.0.3, fast-glob@^3.2.7:
+fast-glob@^3.2.7:
   version "3.2.11"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
   integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
@@ -2238,7 +2127,7 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-find-up@^4.0.0, find-up@^4.1.0:
+find-up@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
   integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
@@ -2350,20 +2239,6 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globby@^10.0.1:
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz#277593e745acaa4646c3ab411289ec47a0392543"
-  integrity sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==
-  dependencies:
-    "@types/glob" "^7.1.1"
-    array-union "^2.1.0"
-    dir-glob "^3.0.1"
-    fast-glob "^3.0.3"
-    glob "^7.1.3"
-    ignore "^5.1.1"
-    merge2 "^1.2.3"
-    slash "^3.0.0"
-
 globby@~6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
@@ -2375,7 +2250,7 @@ globby@~6.1.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.2.2:
+graceful-fs@^4.1.2, graceful-fs@^4.1.3:
   version "4.2.9"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"
   integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==
@@ -2390,11 +2265,6 @@ gray-matter@^4.0.3:
     section-matter "^1.0.0"
     strip-bom-string "^1.0.0"
 
-hard-rejection@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
-  integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==
-
 has-ansi@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-0.1.0.tgz#84f265aae8c0e6a88a12d7022894b7568894c62e"
@@ -2654,21 +2524,11 @@ ieee754@^1.1.13:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-ignore@^5.1.1:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
-  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
-
 immutable@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0.tgz#b86f78de6adef3608395efb269a91462797e2c23"
   integrity sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==
 
-indent-string@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
-  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
-
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -2837,21 +2697,6 @@ is-object@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf"
   integrity sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==
 
-is-path-cwd@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
-  integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
-
-is-path-inside@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
-  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
-
-is-plain-obj@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
-  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
-
 is-plain-obj@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-4.0.0.tgz#06c0999fd7574edf5a906ba5644ad0feb3a84d22"
@@ -2955,11 +2800,6 @@ json-parse-better-errors@^1.0.1:
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
-json-parse-even-better-errors@^2.3.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
-  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
-
 json5@^2.1.2, json5@^2.1.3:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
@@ -2977,7 +2817,7 @@ jsonc-parser@^3.0.0:
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22"
   integrity sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==
 
-kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3:
+kind-of@^6.0.0, kind-of@^6.0.2:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
@@ -3000,11 +2840,6 @@ limited-request-queue@^2.0.0:
     is-browser "^2.0.1"
     parse-domain "~0.2.0"
 
-lines-and-columns@^1.1.6:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
-  integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
-
 link-types@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/link-types/-/link-types-1.1.0.tgz#af65e59db52e70c1ffb18ac4c3cb056bfe796830"
@@ -3020,11 +2855,6 @@ load-json-file@^4.0.0:
     pify "^3.0.0"
     strip-bom "^3.0.0"
 
-locate-character@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/locate-character/-/locate-character-2.0.5.tgz#f2d2614d49820ecb3c92d80d193b8db755f74c0f"
-  integrity sha512-n2GmejDXtOPBAZdIiEFy5dJ5N38xBCXLNOtw2WpB9kGh6pnrEuKlwYI+Tkpofc4wDtVXHtoAOJaMRlYG/oYaxg==
-
 locate-path@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
@@ -3074,23 +2904,13 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-magic-string@^0.25.3, magic-string@^0.25.7:
+magic-string@^0.25.7:
   version "0.25.7"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051"
   integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==
   dependencies:
     sourcemap-codec "^1.4.4"
 
-map-obj@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
-  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
-
-map-obj@^4.0.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a"
-  integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==
-
 markdown-table@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-3.0.2.tgz#9b59eb2c1b22fe71954a65ff512887065a7bb57c"
@@ -3260,24 +3080,7 @@ memorystream@^0.3.1:
   resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
   integrity sha1-htcJCzDORV1j+64S3aUaR93K+bI=
 
-meow@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-6.1.1.tgz#1ad64c4b76b2a24dfb2f635fddcadf320d251467"
-  integrity sha512-3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg==
-  dependencies:
-    "@types/minimist" "^1.2.0"
-    camelcase-keys "^6.2.2"
-    decamelize-keys "^1.1.0"
-    hard-rejection "^2.1.0"
-    minimist-options "^4.0.2"
-    normalize-package-data "^2.5.0"
-    read-pkg-up "^7.0.1"
-    redent "^3.0.0"
-    trim-newlines "^3.0.0"
-    type-fest "^0.13.1"
-    yargs-parser "^18.1.3"
-
-merge2@^1.2.3, merge2@^1.3.0:
+merge2@^1.3.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
@@ -3640,15 +3443,6 @@ minimatch@^3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist-options@^4.0.2:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
-  integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==
-  dependencies:
-    arrify "^1.0.1"
-    is-plain-obj "^1.1.0"
-    kind-of "^6.0.3"
-
 minimist@^1.1.0, minimist@^1.2.0, minimist@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
@@ -3771,7 +3565,7 @@ nopter@~0.3.0:
     object-assign "^2.0.0"
     splitargs "~0.0.3"
 
-normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
+normalize-package-data@^2.3.2:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -3894,13 +3688,6 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
-p-map@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz#d704d9af8a2ba684e2600d9a215983d4141a979d"
-  integrity sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==
-  dependencies:
-    aggregate-error "^3.0.0"
-
 p-timeout@~4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-4.1.0.tgz#788253c0452ab0ffecf18a62dff94ff1bd09ca0a"
@@ -3972,16 +3759,6 @@ parse-json@^4.0.0:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
-parse-json@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
-  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    error-ex "^1.3.1"
-    json-parse-even-better-errors "^2.3.0"
-    lines-and-columns "^1.1.6"
-
 parse-latin@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/parse-latin/-/parse-latin-5.0.0.tgz#a1963445f59fb9cfa3cb1ddf5f839bfeb0ee4b42"
@@ -4047,11 +3824,6 @@ path-type@^3.0.0:
   dependencies:
     pify "^3.0.0"
 
-path-type@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
-  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
-
 pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
@@ -4135,16 +3907,7 @@ prepend-http@^3.0.0:
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-3.0.1.tgz#3e724d58fd5867465b300bb9615009fa2f8ee3b6"
   integrity sha512-BLxfZh+m6UiAiCPZFJ4+vYoL7NrRs5XgCTRrjseATAggXhdZKKxn+JUNmuVYWY23bDHgaEHodxw8mnmtVEDtHw==
 
-prettier-plugin-astro@^0.0.12:
-  version "0.0.12"
-  resolved "https://registry.yarnpkg.com/prettier-plugin-astro/-/prettier-plugin-astro-0.0.12.tgz#5f2ece3e3d18c4cd8660b19ebf39888e159d8eae"
-  integrity sha512-ZSNvHuyQ+fxgqA4qoiOf2FvN8FdWcBrAmnik3gPL466TFtMcOV2hVNVVErBcnG/qMyPf7WLwPvBLtTyWpDEUHg==
-  dependencies:
-    "@astrojs/parser" "^0.22.0"
-    prettier "^2.4.1"
-    sass-formatter "^0.7.2"
-
-prettier@^2.4.1, prettier@^2.5.1:
+prettier@^2.5.1:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz#fff75fa9d519c54cf0fce328c1017d94546bc56a"
   integrity sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==
@@ -4238,11 +4001,6 @@ queue-microtask@^1.2.2:
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
-quick-lru@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
-  integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
-
 randombytes@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
@@ -4272,15 +4030,6 @@ react@^17.0.2:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-read-pkg-up@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
-  integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==
-  dependencies:
-    find-up "^4.1.0"
-    read-pkg "^5.2.0"
-    type-fest "^0.8.1"
-
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
@@ -4290,16 +4039,6 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-read-pkg@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
-  integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
-  dependencies:
-    "@types/normalize-package-data" "^2.4.0"
-    normalize-package-data "^2.5.0"
-    parse-json "^5.0.0"
-    type-fest "^0.6.0"
-
 readable-stream@^2.2.2:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
@@ -4339,14 +4078,6 @@ readdirp@~3.6.0:
   dependencies:
     picomatch "^2.2.1"
 
-redent@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
-  integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==
-  dependencies:
-    indent-string "^4.0.0"
-    strip-indent "^3.0.0"
-
 rehype-raw@^6.1.0:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/rehype-raw/-/rehype-raw-6.1.1.tgz#81bbef3793bd7abacc6bf8335879d1b6c868c9d4"
@@ -4476,7 +4207,7 @@ rimraf@^2.5.2:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^3.0.0, rimraf@^3.0.2:
+rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
@@ -4520,11 +4251,6 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-s.color@0.0.15:
-  version "0.0.15"
-  resolved "https://registry.yarnpkg.com/s.color/-/s.color-0.0.15.tgz#6b32cd22d8dba95703a5122ddede2020a1560186"
-  integrity sha512-AUNrbEUHeKY8XsYr/DYpl+qk5+aM+DChopnWOPEzn8YKzOhv4l2zH6LzZms3tOZP3wwdOyc0RmTciyi46HLIuA==
-
 sade@^1.7.3:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/sade/-/sade-1.8.1.tgz#0a78e81d658d394887be57d2a409bf703a3b2701"
@@ -4552,14 +4278,6 @@ sander@^0.5.0:
     mkdirp "^0.5.1"
     rimraf "^2.5.2"
 
-sass-formatter@^0.7.2:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/sass-formatter/-/sass-formatter-0.7.2.tgz#bfac14c17dd7d3fb3967a5a80f5c34d27ed60daa"
-  integrity sha512-ZGpZC5bWJbv0tiu2glZeLhN85sg3wSySyHxhqov/HZX1/2coczLkY0HXIshrmRC7+G8qiFkeW8Ipl5mS54nl0w==
-  dependencies:
-    suf-log "^2.5.3"
-    suf-regex "^0.3.4"
-
 sass@^1.49.8:
   version "1.49.8"
   resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.8.tgz#9bbbc5d43d14862db07f1c04b786c9da9b641828"
@@ -4673,11 +4391,6 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-slash@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
-  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
-
 slash@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7"
@@ -4907,20 +4620,6 @@ style-to-object@^0.3.0:
   dependencies:
     inline-style-parser "0.1.1"
 
-suf-log@^2.5.3:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/suf-log/-/suf-log-2.5.3.tgz#0919a7fceea532a99b578c97814c4e335b2d64d1"
-  integrity sha512-KvC8OPjzdNOe+xQ4XWJV2whQA0aM1kGVczMQ8+dStAO6KfEB140JEVQ9dE76ONZ0/Ylf67ni4tILPJB41U0eow==
-  dependencies:
-    s.color "0.0.15"
-
-suf-regex@^0.3.4:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/suf-regex/-/suf-regex-0.3.4.tgz#8d1e0cafe1646755264895914cf44442a1202132"
-  integrity sha512-2Txjq2T4BrNKM53ACN8ZXzMulrL2ILDpTwWBy/bXX+gYALWB7pGkCVmCrj/TZrFgGWgmujdXoWmYfeyY2Ky4/g==
-  dependencies:
-    del-cli "^3.0.0"
-
 supports-color@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a"
@@ -5059,11 +4758,6 @@ tr46@~0.0.3:
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
   integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
 
-trim-newlines@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
-  integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
-
 trough@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/trough/-/trough-2.0.2.tgz#94a3aa9d5ce379fc561f6244905b3f36b7458d96"
@@ -5111,16 +4805,6 @@ type-fest@^0.13.1:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"
   integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==
 
-type-fest@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
-  integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
-
-type-fest@^0.8.1:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
-  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
-
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -5559,14 +5243,6 @@ yaml@^1.10.2:
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
-yargs-parser@^18.1.3:
-  version "18.1.3"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
-  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
 yargs-parser@^21.0.0:
   version "21.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.0.tgz#a485d3966be4317426dd56bdb6a30131b281dc55"
diff --git a/yarn.lock b/yarn.lock
index 6af80851a..3a2dfce28 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -181,6 +181,11 @@
     vscode-languageserver-types "^3.16.0"
     vscode-uri "^3.0.2"
 
+"@astropub/icons@^0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@astropub/icons/-/icons-0.1.1.tgz#3f9600cc8e2f242fc745d7622e15d837a4968845"
+  integrity sha512-UhKb1KpeV7dvXsZi+m9LV/lg1muVILAARODCDabynNHP0iIqFRLYAio6pmnbh72aPv/P58wck/GeatM/PgPqZw==
+
 "@astropub/webapi@^0.10.1", "@astropub/webapi@^0.10.13":
   version "0.10.14"
   resolved "https://registry.yarnpkg.com/@astropub/webapi/-/webapi-0.10.14.tgz#f3e118718d1353170ec9ea0adc4a725796717a77"