diff --git a/site/src/routes/tutorial/[slug]/_components/ScreenToggle.svelte b/site/src/routes/tutorial/[slug]/_components/ScreenToggle.svelte
index 658afefd52..e1610c3c0c 100644
--- a/site/src/routes/tutorial/[slug]/_components/ScreenToggle.svelte
+++ b/site/src/routes/tutorial/[slug]/_components/ScreenToggle.svelte
@@ -7,7 +7,7 @@
 		position: fixed;
 		bottom: 0;
 		width: 100%;
-		height: 42px;
+		height: 4.6rem;
 		display: flex;
 		justify-content: center;
 		align-items: center;
@@ -16,15 +16,15 @@
 	}
 
 	button {
-		padding: 0.3em 0.6em;
-		border-radius: 1em;
-		line-height: 1;
+		margin: 0 .15em;
+		width: 4em;
 		height: 1em;
+		padding: .2em .4em .3em;
+		border-radius: var(--border-r);
+		line-height: 1;
 		box-sizing: content-box;
-		color: #999;
-		border: 1px solid #f4f4f4;
-		width: 4em;
-		margin: 0 0.15em;
+		color: #888;
+		border: 1px solid var(--back-light);
 	}
 
 	.selected {
@@ -37,4 +37,4 @@
 	<button class:selected={offset === 0} on:click={() => offset = 0}>tutorial</button>
 	<button class:selected={offset === 1} on:click={() => offset = 1}>input</button>
 	<button class:selected={offset === 2} on:click={() => offset = 2}>output</button>
-</div>
\ No newline at end of file
+</div>
diff --git a/site/src/routes/tutorial/[slug]/_components/TableOfContents.svelte b/site/src/routes/tutorial/[slug]/_components/TableOfContents.svelte
index 616738268c..1102b704d9 100644
--- a/site/src/routes/tutorial/[slug]/_components/TableOfContents.svelte
+++ b/site/src/routes/tutorial/[slug]/_components/TableOfContents.svelte
@@ -38,13 +38,8 @@
 		opacity: 0.4;
 	}
 
-	span {
-		white-space: nowrap;
-	}
-
-	strong {
-		opacity: 0.7;
-	}
+	span   { white-space: nowrap }
+	strong { opacity: 0.7 }
 
 	select {
 		position: absolute;
@@ -86,4 +81,4 @@
 	<a rel="prefetch" href="tutorial/{(selected.next || selected).slug}" class:disabled={!selected.next}>
 		<Icon name="arrow-right" />
 	</a>
-</nav>
\ No newline at end of file
+</nav>
diff --git a/site/src/routes/tutorial/[slug]/index.svelte b/site/src/routes/tutorial/[slug]/index.svelte
index 158f4aa987..1bcca2e2ed 100644
--- a/site/src/routes/tutorial/[slug]/index.svelte
+++ b/site/src/routes/tutorial/[slug]/index.svelte
@@ -114,7 +114,6 @@
 		height: calc(100vh - var(--nav-h));
 		overflow: hidden;
 		padding: 0 0 42px 0;
-		/* margin: 0 calc(var(--side-nav) * -1); */
 		box-sizing: border-box;
 	}
 
@@ -123,7 +122,7 @@
 		width: 300%;
 		height: 100%;
 		grid-template-columns: 33.333% 66.666%;
-		transition: transform 0.3s;
+		transition: transform .3s;
 		grid-auto-rows: 100%;
 	}
 
@@ -131,9 +130,7 @@
 	.offset-2 { transform: translate(-66.666%, 0); }
 
 	@media (min-width: 768px) {
-		.tutorial-outer {
-			padding: 0;
-		}
+		.tutorial-outer { padding: 0 }
 
 		.viewport {
 			width: 100%;
@@ -157,19 +154,23 @@
 	}
 
 	.chapter-markup {
-		padding: 1em;
+		padding: 3.2rem 4rem;
 		overflow: auto;
 		flex: 1;
 		height: 0;
 	}
 
 	.chapter-markup :global(h2) {
+		margin: 4rem 0 1.6rem 0;
 		font-size: var(--h3);
-		margin: 3.2rem 0 1.6rem 0;
 		line-height: 1;
 		color: white;
 	}
 
+	.chapter-markup :global(h2:first-child) {
+		margin-top: .4rem;
+	}
+
 	.chapter-markup :global(a) {
 		text-decoration: underline;
 	}
@@ -179,7 +180,7 @@
 	}
 
 	.chapter-markup :global(blockquote) {
-		background-color: rgba(255,255,255,0.1);
+		background-color: rgba(255,255,255,.1);
 		color: white;
 	}
 
@@ -189,7 +190,7 @@
 	}
 
 	.chapter-markup::-webkit-scrollbar-thumb {
-		background-color: rgba(255,255,255,0.7);
+		background-color: rgba(255,255,255,.7);
 		border-radius: 1em;
 		outline: 1px solid green;
 	}
@@ -197,45 +198,49 @@
 	.chapter-markup :global(p) > :global(code),
 	.chapter-markup :global(ul) :global(code) {
 		color: white;
-		background: rgba(255,255,255,0.1);
-		padding: 0.2em 0.4em;
+		background: rgba(255,255,255,.1);
+		padding: .2em .4em;
 		white-space: nowrap;
 	}
 
 	.controls {
-		border-top: 1px solid rgba(255,255,255,0.1);
+		border-top: 1px solid rgba(255,255,255,.1);
 		padding: 1em 0 0 0;
 		display: flex;
 	}
 
 	.show {
-		text-transform: uppercase;
-		background: rgba(255,255,255,0.1);
-		padding: 0.2em 0.7em;
-		border-radius: 2em;
-		top: 0.1em;
+		background: rgba(255,255,255,.1);
+		padding: .2em .7em .3em;
+		border-radius: var(--border-r);
+		top: .1em;
 		position: relative;
 		font-size: var(--h5);
 		font-weight: 300;
 	}
 
 	.show:hover {
-		background: rgba(255,255,255,0.2);
+		background: rgba(255,255,255,.2);
 	}
 
 	a.next {
+		text-decoration: none;
 		margin-left: auto;
 	}
 
+	a.next:hover {
+		text-decoration: underline;
+	}
+
 	.improve-chapter {
 		padding: 1em 0 .5em 0;
 	}
 
 	.improve-chapter a {
+		padding: 0 .1em;
 		font-size: 14px;
 		text-decoration: none;
-		opacity: 0.3;
-		padding: 0 0.1em;
+		opacity: .3;
 	}
 
 	.improve-chapter a:hover {