diff --git a/apps/svelte.dev/src/routes/(authed)/apps/+page.svelte b/apps/svelte.dev/src/routes/(authed)/apps/+page.svelte
index 5fd0c43d94..7a9782ebb6 100644
--- a/apps/svelte.dev/src/routes/(authed)/apps/+page.svelte
+++ b/apps/svelte.dev/src/routes/(authed)/apps/+page.svelte
@@ -143,7 +143,7 @@
 <style>
 	.apps {
 		padding: var(--sk-page-padding-top) var(--sk-page-padding-side) 6rem var(--sk-page-padding-side);
-		max-width: var(--sk-page-main-width);
+		max-width: var(--sk-page-content-width);
 		margin: 0 auto;
 	}
 
diff --git a/apps/svelte.dev/src/routes/blog/+page.svelte b/apps/svelte.dev/src/routes/blog/+page.svelte
index 9f9a4127ef..44474755a1 100644
--- a/apps/svelte.dev/src/routes/blog/+page.svelte
+++ b/apps/svelte.dev/src/routes/blog/+page.svelte
@@ -36,7 +36,7 @@
 		grid-gap: 1em;
 		min-height: calc(100vh - var(--sk-nav-height) - var(--sk-banner-bottom-height));
 		padding: var(--sk-page-padding-top) var(--sk-page-padding-side) 6rem var(--sk-page-padding-side);
-		max-width: var(--sk-page-main-width);
+		max-width: var(--sk-page-content-width);
 		box-sizing: content-box;
 		margin: 0 auto;
 		text-wrap: balance;
diff --git a/apps/svelte.dev/src/routes/blog/[slug]/+page.svelte b/apps/svelte.dev/src/routes/blog/[slug]/+page.svelte
index 57a7917000..88565531ac 100644
--- a/apps/svelte.dev/src/routes/blog/[slug]/+page.svelte
+++ b/apps/svelte.dev/src/routes/blog/[slug]/+page.svelte
@@ -46,7 +46,7 @@
 <style>
 	.post {
 		padding: var(--sk-page-padding-top) var(--sk-page-padding-side);
-		max-width: var(--sk-page-main-width);
+		max-width: var(--sk-page-content-width);
 		box-sizing: content-box;
 		margin: 0 auto;
 	}
@@ -109,7 +109,7 @@
 	@media (min-width: 910px) {
 		.post :global(.max) {
 			width: calc(100vw - 2 * var(--sk-page-padding-side));
-			margin: 0 calc(var(--sk-page-main-width) / 2 - 50vw);
+			margin: 0 calc(var(--sk-page-content-width) / 2 - 50vw);
 			text-align: center;
 		}
 
diff --git a/apps/svelte.dev/src/routes/docs/+page.svelte b/apps/svelte.dev/src/routes/docs/+page.svelte
index 874a88f2ff..ebead4145f 100644
--- a/apps/svelte.dev/src/routes/docs/+page.svelte
+++ b/apps/svelte.dev/src/routes/docs/+page.svelte
@@ -101,7 +101,7 @@
 <style>
 	.page {
 		padding: var(--sk-page-padding-top) var(--sk-page-padding-side);
-		max-width: var(--sk-page-main-width);
+		max-width: var(--sk-page-content-width);
 		box-sizing: content-box;
 		margin: auto;
 		text-wrap: balance;
diff --git a/apps/svelte.dev/src/routes/docs/[...path]/+layout.svelte b/apps/svelte.dev/src/routes/docs/[...path]/+layout.svelte
index d1e8a66951..c90495b60e 100644
--- a/apps/svelte.dev/src/routes/docs/[...path]/+layout.svelte
+++ b/apps/svelte.dev/src/routes/docs/[...path]/+layout.svelte
@@ -77,7 +77,7 @@
 				calc(
 					0.5 *
 						(
-							100vw - var(--sk-line-max-width) - var(--sk-page-padding-side) -
+							100vw - var(--sk-page-content-width) - var(--sk-page-padding-side) -
 								var(--sk-page-padding-side)
 						)
 				)
diff --git a/apps/svelte.dev/src/routes/docs/[...path]/+page.svelte b/apps/svelte.dev/src/routes/docs/[...path]/+page.svelte
index 3cb73e71ed..9fff59add0 100644
--- a/apps/svelte.dev/src/routes/docs/[...path]/+page.svelte
+++ b/apps/svelte.dev/src/routes/docs/[...path]/+page.svelte
@@ -90,7 +90,7 @@
 	}
 
 	.controls {
-		max-width: calc(var(--sk-line-max-width) + 1rem);
+		max-width: calc(var(--sk-page-content-width) + 1rem);
 		border-top: 1px solid var(--sk-back-4);
 		padding: 1rem 0 0 0;
 		display: grid;
diff --git a/apps/svelte.dev/src/routes/tutorial/[slug]/Menu.svelte b/apps/svelte.dev/src/routes/tutorial/[slug]/Menu.svelte
index 2e5f6aa69c..90272fee5b 100644
--- a/apps/svelte.dev/src/routes/tutorial/[slug]/Menu.svelte
+++ b/apps/svelte.dev/src/routes/tutorial/[slug]/Menu.svelte
@@ -246,7 +246,7 @@
 		text-overflow: ellipsis;
 		text-align: center;
 		color: var(--sk-text-2);
-		font-size: var(--sk-font-size-ui-small);
+		font-size: var(--sk-font-size-ui-medium);
 
 		.desktop {
 			display: flex;
diff --git a/packages/repl/src/lib/InputOutputToggle.svelte b/packages/repl/src/lib/InputOutputToggle.svelte
index 61a739f703..07efefc504 100644
--- a/packages/repl/src/lib/InputOutputToggle.svelte
+++ b/packages/repl/src/lib/InputOutputToggle.svelte
@@ -25,7 +25,9 @@
 		justify-content: center;
 		width: 100%;
 		height: var(--pane-controls-h);
-		border-top: 1px solid var(--sk-theme-2);
+		border-top: 1px solid var(--sk-back-5);
+		font-family: var(--sk-font-ui);
+		font-size: var(--sk-font-size-ui-small);
 		z-index: 2;
 	}
 
diff --git a/packages/repl/src/lib/Repl.svelte b/packages/repl/src/lib/Repl.svelte
index 555c07317d..8b5d76e595 100644
--- a/packages/repl/src/lib/Repl.svelte
+++ b/packages/repl/src/lib/Repl.svelte
@@ -361,9 +361,7 @@
 			}
 
 			.divider::after {
-				background-color: var(--sk-text-1);
-				filter: drop-shadow(0 0 3px hsl(0 0 0 / 0.5));
-				opacity: 0.1;
+				background-color: var(--sk-back-5);
 			}
 
 			[data-pane='main'] > .divider::after {
diff --git a/packages/site-kit/src/lib/components/Text.svelte b/packages/site-kit/src/lib/components/Text.svelte
index a6ccc15930..eccd3eebb5 100644
--- a/packages/site-kit/src/lib/components/Text.svelte
+++ b/packages/site-kit/src/lib/components/Text.svelte
@@ -357,7 +357,7 @@
 
 		li {
 			position: relative;
-			max-width: calc(var(--sk-line-max-width) - var(--list-padding));
+			max-width: calc(var(--sk-page-content-width) - var(--list-padding));
 			margin: 0 0 0.5em 0;
 		}
 
diff --git a/packages/site-kit/src/lib/nav/Nav.svelte b/packages/site-kit/src/lib/nav/Nav.svelte
index 8b50313298..774c52e75c 100644
--- a/packages/site-kit/src/lib/nav/Nav.svelte
+++ b/packages/site-kit/src/lib/nav/Nav.svelte
@@ -148,7 +148,7 @@ Top navigation bar for the application. It provides a slot for the left side, th
 		isolation: isolate;
 		font-family: var(--sk-font-ui);
 
-		&.shadow::after {
+		&::after {
 			content: '';
 			position: absolute;
 			left: 0;
@@ -168,8 +168,7 @@ Top navigation bar for the application. It provides a slot for the left side, th
 		align-items: center;
 		color: var(--sk-text-3);
 		margin-left: 0.4em;
-		padding: 0.1rem 0 0 0;
-		font-size: var(--sk-font-size-ui-small);
+		font-size: var(--sk-font-size-ui-medium);
 	}
 
 	@media (max-width: 799px) {
@@ -208,7 +207,7 @@ Top navigation bar for the application. It provides a slot for the left side, th
 
 	.home-link {
 		--padding-right: 1rem;
-		width: 13rem;
+		width: 16rem;
 		height: 100%;
 		background: url(../branding/svelte.svg) no-repeat var(--sk-page-padding-side) 50% /
 			calc(100% - var(--sk-page-padding-side) - var(--padding-right)) auto;
diff --git a/packages/site-kit/src/lib/search/SearchBox.svelte b/packages/site-kit/src/lib/search/SearchBox.svelte
index b00d5a75f0..55c8203d57 100644
--- a/packages/site-kit/src/lib/search/SearchBox.svelte
+++ b/packages/site-kit/src/lib/search/SearchBox.svelte
@@ -160,7 +160,7 @@ It appears when the user clicks on the `Search` component or presses the corresp
 		use:trap
 	>
 		<div class="search-box">
-			<div style="background: var(--background)">
+			<div style="background: var(--background); padding: 0.5rem">
 				<!-- svelte-ignore a11y_autofocus -->
 				<input
 					autofocus
@@ -307,7 +307,7 @@ It appears when the user clicks on the `Search` component or presses the corresp
 	input {
 		font-size: var(--sk-font-size-ui-large);
 		width: 100%;
-		padding: var(--padding) 5rem var(--padding) var(--padding);
+		padding: calc(var(--padding) - 0.5rem) 5rem calc(var(--padding) - 0.5rem) var(--padding);
 		height: 6rem;
 		border: none;
 		border-bottom: 1px solid var(--sk-back-3);
@@ -332,7 +332,7 @@ It appears when the user clicks on the `Search` component or presses the corresp
 	button[aria-label='Close'] {
 		--size: 2rem;
 		position: absolute;
-		top: 0;
+		top: 0.5rem;
 		right: 0;
 		width: 5rem;
 		height: 6rem;
diff --git a/packages/site-kit/src/lib/styles/base.css b/packages/site-kit/src/lib/styles/base.css
index 0f76050c62..bfaf88c2ae 100644
--- a/packages/site-kit/src/lib/styles/base.css
+++ b/packages/site-kit/src/lib/styles/base.css
@@ -129,7 +129,7 @@ blockquote {
 	position: relative;
 	margin: 2.4rem 0;
 	padding: 2rem 2.4rem 1.8rem 2.4rem;
-	max-width: var(--sk-line-max-width);
+	max-width: var(--sk-page-content-width);
 }
 
 blockquote :where(p, ul) {
diff --git a/packages/site-kit/src/lib/styles/text.css b/packages/site-kit/src/lib/styles/text.css
index e73a4b1f1a..205a98f61b 100644
--- a/packages/site-kit/src/lib/styles/text.css
+++ b/packages/site-kit/src/lib/styles/text.css
@@ -39,7 +39,7 @@
 	background: var(--sk-back-4);
 	padding: 1rem;
 	margin-bottom: 1rem;
-	max-width: var(--sk-line-max-width);
+	max-width: var(--sk-page-content-width);
 	border-radius: var(--sk-border-radius);
 }
 
diff --git a/packages/site-kit/src/lib/styles/tokens.css b/packages/site-kit/src/lib/styles/tokens.css
index dd8acb34bd..b7412a40d8 100644
--- a/packages/site-kit/src/lib/styles/tokens.css
+++ b/packages/site-kit/src/lib/styles/tokens.css
@@ -18,7 +18,7 @@
 	--sk-page-padding-side: 2.4rem;
 	--sk-thick-border-width: 0.3rem;
 	--sk-border-radius: 0.4rem;
-	--sk-page-main-width: 84rem;
+	--sk-page-content-width: 84rem;
 	--sk-banner-bottom-height: 0px;
 
 	/* typography */
@@ -32,13 +32,11 @@
 	--sk-font-size-h3: 2.4rem;
 	--sk-font-size-body: 2.1rem;
 	--sk-font-size-body-small: 1.8rem;
-	--sk-font-size-ui-small: 1.4rem;
-	--sk-font-size-ui-medium: 1.8rem;
-	--sk-font-size-ui-large: 3rem; /* TODO add regular/small */
+	--sk-font-size-ui-small: 1.3rem;
+	--sk-font-size-ui-medium: 1.6rem;
+	--sk-font-size-ui-large: 3rem;
 	--sk-font-size-code: 1.4rem;
 
-	--sk-line-max-width: 84rem; /* TODO can this be merged with --sk-page-main-width?
-
 	/* Base colors */
 	--sk-theme-1-hsl: 12, 93%, 43%;
 	--sk-theme-2-hsl: 240, 8%, 44%;
@@ -50,7 +48,7 @@
 	--sk-back-2: hsla(0, 0%, 100%, 1);
 	--sk-back-3: hsla(0, 0%, 99%, 1);
 	--sk-back-4: hsl(0, 0%, 95%);
-	--sk-back-5: hsl(0, 0%, 80%);
+	--sk-back-5: hsl(0, 0%, 92%);
 
 	--sk-text-1: hsla(0, 0%, 0%, 0.95);
 	--sk-text-2: hsla(0, 0%, 0%, 0.88);
@@ -94,7 +92,7 @@
 		--sk-back-2: hsl(0 0 18);
 		--sk-back-3: hsl(0 0 12);
 		--sk-back-4: hsl(0 0 22);
-		--sk-back-5: hsl(0 0 40);
+		--sk-back-5: hsl(0 0 25);
 		--sk-back-translucent: hsla(0, 0%, 100%, 0.1);
 		--sk-theme-1-hsl: 12, 94%, 62%;
 		--sk-theme-2-hsl: 240, 8%, 44%;