diff --git a/package-lock.json b/package-lock.json
index 9e0ccfc7a8..7c7363db2e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -149,7 +149,7 @@
     },
     "ansi-escapes": {
       "version": "3.1.0",
-      "resolved": "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
       "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==",
       "dev": true
     },
@@ -209,7 +209,7 @@
     },
     "array-equal": {
       "version": "1.0.0",
-      "resolved": "http://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
       "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=",
       "dev": true
     },
@@ -643,7 +643,7 @@
     },
     "commander": {
       "version": "2.15.1",
-      "resolved": "http://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
       "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
       "dev": true
     },
@@ -894,7 +894,7 @@
       "dependencies": {
         "domelementtype": {
           "version": "1.1.3",
-          "resolved": "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
           "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=",
           "dev": true
         }
@@ -1147,7 +1147,7 @@
         },
         "doctrine": {
           "version": "1.5.0",
-          "resolved": "http://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
           "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
           "dev": true,
           "requires": {
@@ -1842,7 +1842,7 @@
     },
     "is-builtin-module": {
       "version": "1.0.0",
-      "resolved": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
       "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
       "dev": true,
       "requires": {
@@ -2128,7 +2128,7 @@
     },
     "load-json-file": {
       "version": "2.0.0",
-      "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
       "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
       "dev": true,
       "requires": {
@@ -2287,7 +2287,7 @@
     },
     "minimist": {
       "version": "0.0.8",
-      "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
       "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
       "dev": true
     },
@@ -2314,7 +2314,7 @@
     },
     "mkdirp": {
       "version": "0.5.1",
-      "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
       "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
       "dev": true,
       "requires": {
@@ -2624,7 +2624,7 @@
     },
     "os-tmpdir": {
       "version": "1.0.2",
-      "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
       "dev": true
     },
@@ -2708,7 +2708,7 @@
     },
     "path-is-absolute": {
       "version": "1.0.1",
-      "resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
       "dev": true
     },
@@ -2753,7 +2753,7 @@
     },
     "pify": {
       "version": "2.3.0",
-      "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
       "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
       "dev": true
     },
@@ -3456,7 +3456,7 @@
     },
     "safe-regex": {
       "version": "1.1.0",
-      "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
       "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
       "dev": true,
       "requires": {
@@ -4040,7 +4040,7 @@
     },
     "through": {
       "version": "2.3.8",
-      "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
       "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
       "dev": true
     },
diff --git a/site/package-lock.json b/site/package-lock.json
index fd61f824c7..3615067809 100644
--- a/site/package-lock.json
+++ b/site/package-lock.json
@@ -1374,12 +1374,20 @@
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/@sindresorhus/slugify/-/slugify-0.9.1.tgz",
       "integrity": "sha512-b6heYM9dzZD13t2GOiEQTDE0qX+I1GyOotMwKh9VQqzuNiVdPVT8dM43fe9HNb/3ul+Qwd5oKSEDrDIfhq3bnQ==",
-      "dev": true,
       "requires": {
         "escape-string-regexp": "^1.0.5",
         "lodash.deburr": "^4.1.0"
       }
     },
+    "@sveltejs/site-kit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@sveltejs/site-kit/-/site-kit-1.0.1.tgz",
+      "integrity": "sha512-S5mZG2PkWGDXGZaIJQh5JtF7RLG2uIO36f9juUkUHhjqlz6FaBl2D4zyofmvGergSd6m9NgQ+iXLiFIK9WNmBg==",
+      "requires": {
+        "@sindresorhus/slugify": "^0.9.1",
+        "golden-fleece": "^1.0.9"
+      }
+    },
     "@sveltejs/svelte-repl": {
       "version": "0.0.10",
       "resolved": "https://registry.npmjs.org/@sveltejs/svelte-repl/-/svelte-repl-0.0.10.tgz",
@@ -1667,14 +1675,14 @@
       "dev": true
     },
     "browserslist": {
-      "version": "4.5.5",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.5.5.tgz",
-      "integrity": "sha512-0QFO1r/2c792Ohkit5XI8Cm8pDtZxgNl2H6HU4mHrpYz7314pEYcsAVVatM0l/YmxPnEzh9VygXouj4gkFUTKA==",
+      "version": "4.5.6",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.5.6.tgz",
+      "integrity": "sha512-o/hPOtbU9oX507lIqon+UvPYqpx3mHc8cV3QemSBTXwkG8gSQSK6UKvXcE/DcleU3+A59XTUHyCvZ5qGy8xVAg==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30000960",
-        "electron-to-chromium": "^1.3.124",
-        "node-releases": "^1.1.14"
+        "caniuse-lite": "^1.0.30000963",
+        "electron-to-chromium": "^1.3.127",
+        "node-releases": "^1.1.17"
       }
     },
     "buffer": {
@@ -2095,9 +2103,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.127",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.127.tgz",
-      "integrity": "sha512-1o25iFRf/dbgauTWalEzmD1EmRN3a2CzP/K7UVpYLEBduk96LF0FyUdCcf4Ry2mAWJ1VxyblFjC93q6qlLwA2A==",
+      "version": "1.3.129",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.129.tgz",
+      "integrity": "sha512-puirJsgZnedlFEmRa7WEUIaS8ZgHHn7d7inph+RiapCc0x80hdoDyEEpR9z3aRUSZy4fGxOTOFcxnGmySlrmhA==",
       "dev": true
     },
     "emoji-regex": {
@@ -2152,8 +2160,7 @@
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "eslint-plugin-svelte3": {
       "version": "0.4.7",
@@ -2446,9 +2453,9 @@
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
     "fsevents": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.8.tgz",
-      "integrity": "sha512-tPvHgPGB7m40CZ68xqFGkKuzN+RnpGmSV+hgeKxhRpbxdqKXUFJGC3yonBOLzQBcJyGpdZFDfCsdOC2KFsXzeA==",
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
+      "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -3046,9 +3053,9 @@
       }
     },
     "globals": {
-      "version": "11.11.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.11.0.tgz",
-      "integrity": "sha512-WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw==",
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
       "dev": true
     },
     "golden-fleece": {
@@ -3472,9 +3479,9 @@
       }
     },
     "jpeg-js": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.3.4.tgz",
-      "integrity": "sha512-6IzjQxvnlT8UlklNmDXIJMWxijULjqGrzgqc0OG7YadZdvm7KPQ1j0ehmQQHckgEWOfgpptzcnWgESovxudpTA==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.3.5.tgz",
+      "integrity": "sha512-hvaExqwmQDS8O9qnZAVDXGWU43Tbu1V0wMZmjROjT11jloSgGICZpscG+P6Nyi1BVAvyu2ARRx8qmEW30sxgdQ==",
       "dev": true
     },
     "js-levenshtein": {
@@ -3604,8 +3611,7 @@
     "lodash.deburr": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/lodash.deburr/-/lodash.deburr-4.1.0.tgz",
-      "integrity": "sha1-3bG7s+8HRYwBd7oH3hRCLLAz/5s=",
-      "dev": true
+      "integrity": "sha1-3bG7s+8HRYwBd7oH3hRCLLAz/5s="
     },
     "log-symbols": {
       "version": "2.2.0",
@@ -3927,9 +3933,9 @@
       }
     },
     "node-fetch": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.4.1.tgz",
-      "integrity": "sha512-P9UbpFK87NyqBZzUuDBDz4f6Yiys8xm8j7ACDbi6usvFm6KItklQUKjeoqTrYS/S1k6I8oaOC2YLLDr/gg26Mw=="
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.5.0.tgz",
+      "integrity": "sha512-YuZKluhWGJwCcUu4RlZstdAxr8bFfOVHakc1mplwHkk8J+tqM1Y5yraYvIUpeX8aY7+crCwiELJq7Vl0o0LWXw=="
     },
     "node-releases": {
       "version": "1.1.17",
@@ -4714,22 +4720,22 @@
       }
     },
     "sapper": {
-      "version": "0.26.0-alpha.12",
-      "resolved": "https://registry.npmjs.org/sapper/-/sapper-0.26.0-alpha.12.tgz",
-      "integrity": "sha512-NEXr6Eu5jawY76N5IEQhKMKhcZW6+42E2alH4J8DxFMmOI7Gi2nlwCQ2jcZv7q/S+zMP+OSuqE44c94A5u1H8Q==",
+      "version": "0.26.0",
+      "resolved": "https://registry.npmjs.org/sapper/-/sapper-0.26.0.tgz",
+      "integrity": "sha512-KdouvzoCeCLirGwlf6U1KwT8GDTFNtK9KEQRFV8bQvNJQzwqS7+QyPAK8Z2MnR7gamluo+bDx84cTtnHD9I/mQ==",
       "dev": true,
       "requires": {
         "html-minifier": "^3.5.21",
         "http-link-header": "^1.0.2",
-        "shimport": "0.0.14",
+        "shimport": "^1.0.0",
         "sourcemap-codec": "^1.4.4",
         "string-hash": "^1.1.3"
       },
       "dependencies": {
         "shimport": {
-          "version": "0.0.14",
-          "resolved": "https://registry.npmjs.org/shimport/-/shimport-0.0.14.tgz",
-          "integrity": "sha512-JfzpHhyZ6CYuPYUSitFNw2/IxWEABLN1chs9xDHnn4tPXXCmfIn1METCmIl8Vwvm2FZGW7b8WB4zMCKaJEhY6A==",
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/shimport/-/shimport-1.0.0.tgz",
+          "integrity": "sha512-XKd+39voZT1rFR1ct+pr8sFSYAW6IvM3LeF87FrgcGHc/uSZ4GfOZVA42LE5LXFOpTWgmDC5sS8DNDtiV4Vd4Q==",
           "dev": true
         }
       }
diff --git a/site/package.json b/site/package.json
index e3a0a3b67f..98de1618b7 100644
--- a/site/package.json
+++ b/site/package.json
@@ -39,6 +39,7 @@
     "@babel/runtime": "^7.3.1",
     "@sindresorhus/slugify": "^0.9.1",
     "@sveltejs/svelte-repl": "0.0.10",
+    "@sveltejs/site-kit": "^1.0.1",
     "chokidar": "^2.1.2",
     "degit": "^2.1.3",
     "dotenv": "^7.0.0",
@@ -55,9 +56,9 @@
     "rollup-plugin-replace": "^2.1.0",
     "rollup-plugin-svelte": "^5.0.3",
     "rollup-plugin-terser": "^4.0.4",
-    "sapper": "^0.26.0-alpha.12",
+    "sapper": "^0.26.0",
     "shimport": "0.0.16",
-    "svelte": "^3.0.0-beta.28"
+    "svelte": "^3.1.0"
   },
   "engines": {
     "node": ">=10.0.0"
diff --git a/site/src/components/TopNav.svelte b/site/src/components/TopNav.svelte
deleted file mode 100644
index 1d5040145b..0000000000
--- a/site/src/components/TopNav.svelte
+++ /dev/null
@@ -1,277 +0,0 @@
-<script>
-	import { onMount } from 'svelte';
-	import { Icon } from '@sveltejs/site-kit';
-	import { page } from '@sapper/app';
-
-	export let segment;
-
-	let open = false;
-	let visible = true;
-
-	// hide nav whenever we navigate
-	page.subscribe(() => {
-		open = false;
-	});
-
-	// TODO remove this post-https://github.com/sveltejs/svelte/issues/1914
-	let ul;
-	onMount(() => {
-		function handler(event) {
-			if (!open) {
-				event.preventDefault();
-				event.stopPropagation();
-				open = true;
-			}
-		}
-
-		ul.addEventListener('touchstart', handler, {
-			capture: true
-		});
-
-		return () => {
-			ul.removeEventListener('touchstart', handler, {
-				capture: true
-			});
-		};
-	});
-
-	// Prevents navbar to show/hide when clicking in docs sidebar
-	let hash_changed = false;
-	function handle_hashchange() {
-		hash_changed = true;
-	}
-
-	let last_scroll = 0;
-	function handle_scroll() {
-		const scroll = window.pageYOffset;
-		if (!hash_changed) {
-			visible = (scroll < 50 || scroll < last_scroll);
-		}
-
-		last_scroll = scroll;
-		hash_changed = false;
-	}
-</script>
-
-<style>
-	header {
-		position: fixed;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		width: 100vw;
-		height: var(--nav-h);
-		padding: 0 var(--side-nav);
-		margin: 0 auto;
-		background-color: white;
-		box-shadow: 0 -0.4rem 0.9rem 0.2rem rgba(0,0,0,.5);
-		font-family: var(--font);
-		z-index: 100;
-		user-select: none;
-		transform: translate(0,calc(-100% - 1rem));
-		transition: transform 0.2s;
-	}
-
-	header.visible {
-		transform: none;
-	}
-
-	nav {
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100vw;
-		height: var(--nav-h);
-		padding: 0 var(--side-nav) 0 var(--side-nav);
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		background-color: transparent;
-		transform: none;
-		transition: none;
-		box-shadow: none;
-	}
-
-	.primary {
-		list-style: none;
-		font-family: var(--font);
-		margin: 0;
-		line-height: 1;
-	}
-
-	li {
-		display: block;
-		display: none;
-	}
-
-	li.active {
-		display: block;
-	}
-
-	ul {
-		position: relative;
-		padding: 0 3rem 0 0;
-		background: url(/icons/chevron.svg) calc(100% - 1em) 0.05em no-repeat;
-		background-size: 1em 1em;
-	}
-
-	ul::after {
-		/* prevent clicks from registering if nav is closed */
-		position: absolute;
-		content: '';
-		width: 100%;
-		height: 100%;
-		left: 0;
-		top: 0;
-	}
-
-	ul.open {
-		padding: 0 0 1em 0;
-		background: white;
-		border-left: 1px solid #eee;
-		border-right: 1px solid #eee;
-		border-bottom: 1px solid #eee;
-		border-radius: 0 0 var(--border-r) var(--border-r);
-		align-self: start;
-	}
-
-	ul.open li {
-		display: block;
-		text-align: right
-	}
-
-	ul.open::after {
-		display: none;
-	}
-
-	ul li a {
-		font-size: var(--h5);
-		padding: 0 .8rem;
-	}
-
-	ul.open li a {
-		padding: 1.5rem 3.7rem 1.5rem 4rem;
-		display: block;
-	}
-
-	ul.open li:first-child a {
-		padding-top: 2.3rem;
-	}
-
-	.primary :global(svg) {
-		width: 2rem;
-		height: 2rem;
-	}
-
-	.home {
-		position: relative;
-		top: -.1rem;
-		width: 18rem;
-		height: 4.2rem;
-		-webkit-tap-highlight-color: transparent;
-		-webkit-touch-callout: none;
-		background: url(/svelte-logo-horizontal.svg) 0 50% no-repeat;
-		background-size: auto 100%;
-		/* z-index: 11; */
-	}
-
-	.active {
-		color: var(--prime)
-	}
-
-	.modal-background {
-		position: fixed;
-		width: 100%;
-		height: 100%;
-		left: 0;
-		top: 0;
-		background-color: rgba(255, 255, 255, 0.9);
-	}
-
-	a {
-		color: inherit;
-		border-bottom: none;
-		transition: none;
-	}
-
-	li:not(.active) a:hover {
-		color: var(--flash);
-	}
-
-	@media (min-width: 840px) {
-		ul {
-			padding: 0;
-			background: none;
-		}
-
-		ul.open {
-			padding: 0;
-			background: white;
-			border: none;
-			align-self: initial;
-		}
-
-		ul.open li {
-			display: inline;
-			text-align: left;
-		}
-
-		ul.open li a {
-			font-size: var(--h5);
-			padding: 0 .8rem;
-			display: inline;
-		}
-
-		ul::after {
-			display: none;
-		}
-
-		li {
-			display: inline !important;
-		}
-
-		.hide-if-desktop {
-			display: none !important;
-		}
-	}
-</style>
-
-<svelte:window on:hashchange={handle_hashchange} on:scroll={handle_scroll} />
-
-<header class:visible="{visible || open}">
-	<nav>
-		<a rel="prefetch" href='.' class="home" title='Homepage'></a>
-
-		{#if open}
-			<div class="modal-background hide-if-desktop" on:click="{() => open = false}"></div>
-		{/if}
-
-		<ul
-			bind:this={ul}
-			class="primary"
-			class:open
-			on:mouseenter="{() => open = true}"
-			on:mouseleave="{() => open = false}"
-		>
-			<li class="hide-if-desktop" class:active="{!segment}"><a rel="prefetch" href=".">Home</a></li>
-			<li class:active="{segment === 'tutorial'}"><a rel="prefetch" href="tutorial">Tutorial</a></li>
-			<li class:active="{segment === 'docs'}"><a rel="prefetch" href="docs">API Docs</a></li>
-			<li class:active="{segment === 'examples'}"><a rel="prefetch" href="examples">Examples</a></li>
-			<li class:active="{segment === 'repl'}"><a rel="prefetch" href="repl">REPL</a></li>
-			<li class:active="{segment === 'blog'}"><a rel="prefetch" href="blog">Blog</a></li>
-			<li><a href="https://sapper.svelte.technology">Sapper</a></li>
-
-			<li>
-				<a href="https://discord.gg/yy75DKs" title="Discord Chat">
-					<Icon name="message-square" />
-				</a>
-			</li>
-
-			<li>
-				<a href="https://github.com/sveltejs/svelte" title="Github Repo">
-					<Icon name="github" />
-				</a>
-			</li>
-		</ul>
-	</nav>
-</header>
diff --git a/site/src/routes/_layout.svelte b/site/src/routes/_layout.svelte
index b559691f1f..bc557fb4da 100644
--- a/site/src/routes/_layout.svelte
+++ b/site/src/routes/_layout.svelte
@@ -1,8 +1,9 @@
 <script>
-	import { page, preloading } from '@sapper/app';
+	import { stores } from '@sapper/app';
 	import { Icon, Icons, Nav, NavItem } from '@sveltejs/site-kit';
 	import PreloadingIndicator from '../components/PreloadingIndicator.svelte';
-	// import Nav from '../components/TopNav.svelte';
+
+	const { page, preloading } = stores();
 
 	export let segment;
 </script>
@@ -21,7 +22,7 @@
 		<NavItem segment="repl">REPL</NavItem>
 		<NavItem segment="blog">Blog</NavItem>
 
-		<NavItem external="https://sapper.svelte.technology">Sapper</NavItem>
+		<NavItem external="https://sapper.svelte.dev">Sapper</NavItem>
 
 		<NavItem external="https://discord.gg/yy75DKs" title="Discord Chat">
 			<Icon name="message-square"/>