diff --git a/content/tutorial/01-svelte/04-logic/04-each-blocks/README.md b/content/tutorial/01-svelte/04-logic/04-each-blocks/README.md
index f277503ce..f345bca34 100644
--- a/content/tutorial/01-svelte/04-logic/04-each-blocks/README.md
+++ b/content/tutorial/01-svelte/04-logic/04-each-blocks/README.md
@@ -6,11 +6,13 @@ If you need to loop over lists of data, use an `each` block:
 
 ```svelte
 <ul>
-	{#each cats as cat}
-		<li><a target="_blank" href="https://www.youtube.com/watch?v={cat.id}">
-			{cat.name}
-		</a></li>
-	{/each}
+	+++{#each cats as cat}+++
+		<li>
+			<a href="https://www.youtube.com/watch?v={cat.id}">
+				{cat.name}
+			</a>
+		</li>
+	+++{/each}+++
 </ul>
 ```
 
@@ -19,10 +21,12 @@ If you need to loop over lists of data, use an `each` block:
 You can get the current _index_ as a second argument, like so:
 
 ```svelte
-{#each cats as cat, i}
-	<li><a target="_blank" href="https://www.youtube.com/watch?v={cat.id}">
-		{i + 1}: {cat.name}
-	</a></li>
+{#each cats as cat+++, i}+++
+	<li>
+		<a href="https://www.youtube.com/watch?v={cat.id}">
+			+++{i + 1}:+++ {cat.name}
+		</a>
+	</li>
 {/each}
 ```
 
diff --git a/content/tutorial/01-svelte/04-logic/04-each-blocks/app-a/src/lib/App.svelte b/content/tutorial/01-svelte/04-logic/04-each-blocks/app-a/src/lib/App.svelte
index 490c5f6c3..501254eb1 100644
--- a/content/tutorial/01-svelte/04-logic/04-each-blocks/app-a/src/lib/App.svelte
+++ b/content/tutorial/01-svelte/04-logic/04-each-blocks/app-a/src/lib/App.svelte
@@ -19,13 +19,10 @@
 
 <ul>
 	<!-- open each block -->
-	<li>
-		<a
-			target="_blank"
-			href="https://www.youtube.com/watch?v={cat.id}"
-		>
-			{cat.name}
-		</a>
-	</li>
+		<li>
+			<a href="https://www.youtube.com/watch?v={cat.id}">
+				{cat.name}
+			</a>
+		</li>
 	<!-- close each block -->
 </ul>
diff --git a/content/tutorial/01-svelte/04-logic/04-each-blocks/app-b/src/lib/App.svelte b/content/tutorial/01-svelte/04-logic/04-each-blocks/app-b/src/lib/App.svelte
index 5676c3c59..7d5d7187a 100644
--- a/content/tutorial/01-svelte/04-logic/04-each-blocks/app-b/src/lib/App.svelte
+++ b/content/tutorial/01-svelte/04-logic/04-each-blocks/app-b/src/lib/App.svelte
@@ -20,10 +20,7 @@
 <ul>
 	{#each cats as { id, name }, i}
 		<li>
-			<a
-				target="_blank"
-				href="https://www.youtube.com/watch?v={id}"
-			>
+			<a href="https://www.youtube.com/watch?v={id}">
 				{i + 1}: {name}
 			</a>
 		</li>
diff --git a/content/tutorial/01-svelte/04-logic/05-keyed-each-blocks/README.md b/content/tutorial/01-svelte/04-logic/05-keyed-each-blocks/README.md
index d6c0aa3c2..77bf35720 100644
--- a/content/tutorial/01-svelte/04-logic/05-keyed-each-blocks/README.md
+++ b/content/tutorial/01-svelte/04-logic/05-keyed-each-blocks/README.md
@@ -4,14 +4,14 @@ title: Keyed each blocks
 
 By default, when you modify the value of an `each` block, it will add and remove items at the _end_ of the block, and update any values that have changed. That might not be what you want.
 
-It's easier to show why than to explain. Click the 'Remove first thing' button a few times, and notice what happens: It removes the first `<Thing>` component, but the _last_ DOM node. Then it updates the `name` value in the remaining DOM nodes, but not the emoji.
+It's easier to show why than to explain. Click the 'Remove first thing' button a few times, and notice what happens: It removes the first `<Thing>` component, but the _last_ DOM node. Then it updates the `name` value in the remaining DOM nodes, but not the emoji, which in `Thing.svelte` is fixed when the component is created.
 
 Instead, we'd like to remove only the first `<Thing>` component and its DOM node, and leave the others unaffected.
 
 To do that, we specify a unique identifier (or "key") for the `each` block:
 
 ```svelte
-{#each things as thing (thing.id)}
+{#each things as thing (+++thing.id+++)}
 	<Thing name={thing.name}/>
 {/each}
 ```
diff --git a/content/tutorial/01-svelte/04-logic/05-keyed-each-blocks/app-a/src/lib/Thing.svelte b/content/tutorial/01-svelte/04-logic/05-keyed-each-blocks/app-a/src/lib/Thing.svelte
index 3eb272b93..f5284f746 100644
--- a/content/tutorial/01-svelte/04-logic/05-keyed-each-blocks/app-a/src/lib/Thing.svelte
+++ b/content/tutorial/01-svelte/04-logic/05-keyed-each-blocks/app-a/src/lib/Thing.svelte
@@ -1,6 +1,4 @@
 <script>
-	import { onDestroy } from 'svelte';
-
 	const emojis = {
 		apple: '🍎',
 		banana: '🍌',
@@ -12,13 +10,9 @@
 	// the name is updated whenever the prop value changes...
 	export let name;
 
-	// ...but the "emoji" variable is fixed upon initialisation of the component
+	// ...but the "emoji" variable is fixed upon initialisation
+	// of the component because it uses `const` instead of `$:`
 	const emoji = emojis[name];
-
-	// observe in the console which entry is removed
-	onDestroy(() => {
-		console.log('thing destroyed: ' + name);
-	});
 </script>
 
 <p>
diff --git a/content/tutorial/01-svelte/04-logic/05-keyed-each-blocks/app-b/src/lib/Thing.svelte b/content/tutorial/01-svelte/04-logic/05-keyed-each-blocks/app-b/src/lib/Thing.svelte
deleted file mode 100644
index 9ca6b8b17..000000000
--- a/content/tutorial/01-svelte/04-logic/05-keyed-each-blocks/app-b/src/lib/Thing.svelte
+++ /dev/null
@@ -1,45 +0,0 @@
-<script>
-	import { onDestroy } from 'svelte';
-
-	const emojis = {
-		apple: '🍎',
-		banana: '🍌',
-		carrot: '🥕',
-		doughnut: '🍩',
-		egg: '🥚'
-	};
-
-	// the name is updated whenever the prop value changes...
-	export let name;
-
-	// ...but the "emoji" variable is fixed upon initialisation of the component
-	const emoji = emojis[name];
-
-	// observe in the console which entry is removed
-	onDestroy(() => {
-		console.log('thing destroyed: ' + name);
-	});
-</script>
-
-<p>
-	<span>The emoji for {name} is {emoji}</span>
-</p>
-
-<style>
-	p {
-		margin: 0.8em 0;
-	}
-	span {
-		display: inline-block;
-		padding: 0.2em 1em 0.3em;
-		text-align: center;
-		border-radius: 0.2em;
-		background-color: #ffdfd3;
-	}
-
-	@media (prefers-color-scheme: dark) {
-		span {
-			background-color: #4f352b;
-		}
-	}
-</style>
diff --git a/content/tutorial/01-svelte/04-logic/06-await-blocks/app-a/src/lib/App.svelte b/content/tutorial/01-svelte/04-logic/06-await-blocks/app-a/src/lib/App.svelte
index 524f9bfa0..7af6f29b5 100644
--- a/content/tutorial/01-svelte/04-logic/06-await-blocks/app-a/src/lib/App.svelte
+++ b/content/tutorial/01-svelte/04-logic/06-await-blocks/app-a/src/lib/App.svelte
@@ -1,14 +1,14 @@
 <script>
 	async function getRandomNumber() {
-		const res = await fetch(
-			`https://svelte.dev/tutorial/random-number`
-		);
-		const text = await res.text();
+		// Fetch a random number between 0 and 100
+		// (with a delay, so that we can see it)
+		const res = await fetch('/random-number');
 
 		if (res.ok) {
-			return text;
+			return await res.text();
 		} else {
-			throw new Error(text);
+			// Sometimes the API will fail!
+			throw new Error('Request failed');
 		}
 	}
 
@@ -19,7 +19,9 @@
 	}
 </script>
 
-<button on:click={handleClick}> generate random number </button>
+<button on:click={handleClick}>
+	generate random number
+</button>
 
 <!-- replace this element -->
 <p>{promise}</p>
diff --git a/content/tutorial/01-svelte/04-logic/06-await-blocks/app-a/src/routes/random-number/+server.js b/content/tutorial/01-svelte/04-logic/06-await-blocks/app-a/src/routes/random-number/+server.js
new file mode 100644
index 000000000..e051d80bd
--- /dev/null
+++ b/content/tutorial/01-svelte/04-logic/06-await-blocks/app-a/src/routes/random-number/+server.js
@@ -0,0 +1,23 @@
+export async function GET(req) {
+	const query = req.url.searchParams;
+	let min = query.get('min') || '0';
+	let max = query.get('max') || '100';
+	min = +min;
+	max = +max;
+
+	// simulate a long delay
+	await new Promise((res) => setTimeout(res, 1000));
+
+	// fail sometimes
+	if (Math.random() < 0.333) {
+		return new Response(`Failed to generate random number. Please try again`, {
+			status: 400,
+			headers: { 'Access-Control-Allow-Origin': '*' }
+		});
+	}
+
+	const num = min + Math.round(Math.random() * (max - min));
+	return new Response(String(num), {
+		headers: { 'Access-Control-Allow-Origin': '*' }
+	});
+}
\ No newline at end of file
diff --git a/content/tutorial/01-svelte/04-logic/06-await-blocks/app-b/src/lib/App.svelte b/content/tutorial/01-svelte/04-logic/06-await-blocks/app-b/src/lib/App.svelte
index 7a0cd07fd..73b7d3f19 100644
--- a/content/tutorial/01-svelte/04-logic/06-await-blocks/app-b/src/lib/App.svelte
+++ b/content/tutorial/01-svelte/04-logic/06-await-blocks/app-b/src/lib/App.svelte
@@ -1,14 +1,14 @@
 <script>
 	async function getRandomNumber() {
-		const res = await fetch(
-			`https://svelte.dev/tutorial/random-number`
-		);
-		const text = await res.text();
+		// Fetch a random number between 0 and 100
+		// (with a delay, so that we can see it)
+		const res = await fetch('/random-number');
 
 		if (res.ok) {
-			return text;
+			return await res.text();
 		} else {
-			throw new Error(text);
+			// Sometimes the API will fail!
+			throw new Error('Request failed');
 		}
 	}
 
@@ -19,7 +19,9 @@
 	}
 </script>
 
-<button on:click={handleClick}> generate random number </button>
+<button on:click={handleClick}>
+	generate random number
+</button>
 
 {#await promise}
 	<p>...waiting</p>
diff --git a/content/tutorial/01-svelte/05-events/01-dom-events/README.md b/content/tutorial/01-svelte/05-events/01-dom-events/README.md
index 64cfa3217..a0dfceef7 100644
--- a/content/tutorial/01-svelte/05-events/01-dom-events/README.md
+++ b/content/tutorial/01-svelte/05-events/01-dom-events/README.md
@@ -5,7 +5,7 @@ title: DOM events
 As we've briefly seen already, you can listen to any event on an element with the `on:` directive:
 
 ```svelte
-<div on:mousemove={handleMousemove}>
+<div +++on:mousemove={handleMousemove}+++>
 	The mouse position is {m.x} x {m.y}
 </div>
 ```
diff --git a/content/tutorial/01-svelte/05-events/02-inline-handlers/README.md b/content/tutorial/01-svelte/05-events/02-inline-handlers/README.md
index 40585909f..8d59e4dba 100644
--- a/content/tutorial/01-svelte/05-events/02-inline-handlers/README.md
+++ b/content/tutorial/01-svelte/05-events/02-inline-handlers/README.md
@@ -5,11 +5,22 @@ title: Inline handlers
 You can also declare event handlers inline:
 
 ```svelte
-<div on:mousemove="{e => m = { x: e.clientX, y: e.clientY }}">
+<script>
+	let m = { x: 0, y: 0 };
+
+	---function handleMousemove(event) {
+		m.x = event.clientX;
+		m.y = event.clientY;
+	}---
+</script>
+
+<div
+	+++on:mousemove={(e) => {
+		m = { x: e.clientX, y: e.clientY };
+	}}+++
+>
 	The mouse position is {m.x} x {m.y}
 </div>
 ```
 
-The quote marks are optional, but they're helpful for syntax highlighting in some environments.
-
 > In some frameworks you may see recommendations to avoid inline event handlers for performance reasons, particularly inside loops. That advice doesn't apply to Svelte — the compiler will always do the right thing, whichever form you choose.
diff --git a/content/tutorial/01-svelte/05-events/03-event-modifiers/README.md b/content/tutorial/01-svelte/05-events/03-event-modifiers/README.md
index 71954b2fc..4661d8de4 100644
--- a/content/tutorial/01-svelte/05-events/03-event-modifiers/README.md
+++ b/content/tutorial/01-svelte/05-events/03-event-modifiers/README.md
@@ -7,11 +7,11 @@ DOM event handlers can have _modifiers_ that alter their behaviour. For example,
 ```svelte
 <script>
 	function handleClick() {
-		alert('no more alerts')
+		alert(+++'no more alerts'+++)
 	}
 </script>
 
-<button on:click|once={handleClick}>
+<button on:click+++|once+++={handleClick}>
 	Click me
 </button>
 ```
diff --git a/content/tutorial/01-svelte/05-events/03-event-modifiers/app-a/src/lib/App.svelte b/content/tutorial/01-svelte/05-events/03-event-modifiers/app-a/src/lib/App.svelte
index 0a000c832..c56713d01 100644
--- a/content/tutorial/01-svelte/05-events/03-event-modifiers/app-a/src/lib/App.svelte
+++ b/content/tutorial/01-svelte/05-events/03-event-modifiers/app-a/src/lib/App.svelte
@@ -4,4 +4,6 @@
 	}
 </script>
 
-<button on:click={handleClick}> Click me </button>
+<button on:click={handleClick}>
+	Click me
+</button>
diff --git a/content/tutorial/common/src/__client.js b/content/tutorial/common/src/__client.js
index 4f4ffee9b..e735c3a65 100644
--- a/content/tutorial/common/src/__client.js
+++ b/content/tutorial/common/src/__client.js
@@ -93,6 +93,22 @@ window.addEventListener('focusin', (e) => {
 	}
 });
 
+window.addEventListener('click', (e) => {
+	let node = e.target;
+	while (node) {
+		if (node.nodeName === 'A') {
+			const href = node.href;
+			const url = new URL(href);
+
+			if (url.origin !== location.origin) {
+				e.preventDefault();
+				window.open(url, '_blank');
+			}
+		}
+		node = node.parent;
+	}
+});
+
 function ping() {
 	parent.postMessage(
 		{
diff --git a/src/routes/tutorial/[slug]/Sidebar.svelte b/src/routes/tutorial/[slug]/Sidebar.svelte
index 541e0bc96..42f5dabd7 100644
--- a/src/routes/tutorial/[slug]/Sidebar.svelte
+++ b/src/routes/tutorial/[slug]/Sidebar.svelte
@@ -130,7 +130,7 @@
 	}
 
 	.text :global(pre) :global(.highlight.add) {
-		--color: rgba(0, 255, 0, 0.1);
+		--color: rgba(0, 255, 0, 0.18);
 	}
 
 	.text :global(pre) :global(.highlight.remove) {
diff --git a/src/routes/tutorial/[slug]/codemirror.css b/src/routes/tutorial/[slug]/codemirror.css
index 3a0f001be..26526680b 100644
--- a/src/routes/tutorial/[slug]/codemirror.css
+++ b/src/routes/tutorial/[slug]/codemirror.css
@@ -69,8 +69,7 @@
 	padding: 0.2rem 0.8rem;
 }
 .cm-editor .cm-diagnostic-warning {
-	/* background: hsl(36, 100%, 32%); */
-	background: hsl(39, 100%, 10%);
+	background: hsl(39, 100%, 70%);
 }
 .cm-editor .cm-diagnosticText {}
 
@@ -87,4 +86,8 @@
 	.cm-editor .cm-diagnostic-warning {
 		background: hsl(39, 100%, 20%);
 	}
+
+	.cm-editor .cm-diagnostic-warning {
+		background: hsl(39, 100%, 10%);
+	}
 }
\ No newline at end of file