diff --git a/site/content/docs/01-component-format.md b/site/content/docs/01-component-format.md
index 93af09b28363..ea206e5ffacb 100644
--- a/site/content/docs/01-component-format.md
+++ b/site/content/docs/01-component-format.md
@@ -30,7 +30,7 @@ A `<script>` block contains JavaScript that runs when a component instance is cr
 
 Svelte uses the `export` keyword to mark a variable declaration as a *property* or *prop*, which means it becomes accessible to consumers of the component:
 
-```html
+```sv
 <script>
 	// these properties can be set externally
 	export let foo;
@@ -58,7 +58,7 @@ Update expressions (`count += 1`) and property assignments (`obj.x = y`) have th
 
 Because Svelte's reactivity is based on assignments, using array methods like `.push()` and `.splice()` won't automatically trigger updates. Options for getting around this can be found in the [tutorial](tutorial/updating-arrays-and-objects).
 
-```html
+```sv
 <script>
 	let count = 0;
 
@@ -76,7 +76,7 @@ Because Svelte's reactivity is based on assignments, using array methods like `.
 
 Any top-level statement (i.e. not inside a block or a function) can be made reactive by prefixing it with the `$:` label. Reactive statements run immediately before the component updates, whenever the values that they depend on have changed.
 
-```html
+```sv
 <script>
 	export let title;
 
@@ -95,7 +95,7 @@ Any top-level statement (i.e. not inside a block or a function) can be made reac
 
 If a statement consists entirely of an assignment to an undeclared variable, Svelte will inject a `let` declaration on your behalf.
 
-```html
+```sv
 <script>
 	export let num;
 
@@ -116,7 +116,7 @@ Note that the store must be declared at the top level of the component — not i
 
 Local variables (that do not represent store values) must *not* have a `$` prefix.
 
-```html
+```sv
 <script>
 	import { writable } from 'svelte/store';
 
@@ -139,7 +139,7 @@ You can `export` bindings from this block, and they will become exports of the c
 
 You cannot `export default`, since the default export is the component itself.
 
-```html
+```sv
 <script context="module">
 	let totalComponents = 0;
 
@@ -178,7 +178,7 @@ This works by adding a class to affected elements, which is based on a hash of t
 
 To apply styles to a selector globally, use the `:global(...)` modifier.
 
-```html
+```sv
 <style>
 	:global(body) {
 		/* this will apply to <body> */
diff --git a/site/content/docs/02-template-syntax.md b/site/content/docs/02-template-syntax.md
index 917673a7b01e..a086998e6981 100644
--- a/site/content/docs/02-template-syntax.md
+++ b/site/content/docs/02-template-syntax.md
@@ -9,7 +9,7 @@ title: Template syntax
 
 A lowercase tag, like `<div>`, denotes a regular HTML element. A capitalised tag, such as `<Widget>`, indicates a *component*.
 
-```html
+```sv
 <script>
 	import Widget from './Widget.svelte';
 </script>
@@ -44,7 +44,7 @@ As in HTML, values may be unquoted.
 
 Attribute values can contain JavaScript expressions.
 
-```html
+```sv
 <a href="page/{p}">page {p}</a>
 ```
 
@@ -52,7 +52,7 @@ Attribute values can contain JavaScript expressions.
 
 Or they can *be* JavaScript expressions.
 
-```html
+```sv
 <button disabled={!clickable}>...</button>
 ```
 
@@ -60,7 +60,7 @@ Or they can *be* JavaScript expressions.
 
 An expression might include characters that would cause syntax highlighting to fail in regular HTML, so quoting the value is permitted. The quotes do not affect how the value is parsed:
 
-```html
+```sv
 <button disabled="{number !== 42}">...</button>
 ```
 
@@ -68,7 +68,7 @@ An expression might include characters that would cause syntax highlighting to f
 
 When the attribute name and value match (`name={name}`), they can be replaced with `{name}`.
 
-```html
+```sv
 <!-- These are equivalent -->
 <button disabled={disabled}>...</button>
 <button {disabled}>...</button>
@@ -80,7 +80,7 @@ When the attribute name and value match (`name={name}`), they can be replaced wi
 
 An element or component can have multiple spread attributes, interspersed with regular ones.
 
-```html
+```sv
 <Widget {...things}/>
 ```
 
@@ -95,7 +95,7 @@ An element or component can have multiple spread attributes, interspersed with r
 
 Text can also contain JavaScript expressions:
 
-```html
+```sv
 <h1>Hello {name}!</h1>
 <p>{a} + {b} = {a + b}.</p>
 ```
@@ -113,7 +113,7 @@ In a text expression, characters like `<` and `>` are escaped. With HTML express
 
 > Svelte does not sanitize expressions before injecting HTML. If the data comes from an untrusted source, you must sanitize it, or you are exposing your users to an XSS vulnerability.
 
-```html
+```sv
 <div class="blog-post">
 	<h1>{post.title}</h1>
 	{@html post.content}
@@ -137,7 +137,7 @@ In a text expression, characters like `<` and `>` are escaped. With HTML express
 
 Content that is conditionally rendered can be wrapped in an if block.
 
-```html
+```sv
 {#if answer === 42}
 	<p>what was the question?</p>
 {/if}
@@ -147,7 +147,7 @@ Content that is conditionally rendered can be wrapped in an if block.
 
 Additional conditions can be added with `{:else if expression}`, optionally ending in an `{:else}` clause.
 
-```html
+```sv
 {#if porridge.temperature > 100}
 	<p>too hot!</p>
 {:else if 80 > porridge.temperature}
@@ -177,7 +177,7 @@ Additional conditions can be added with `{:else if expression}`, optionally endi
 
 Iterating over lists of values can be done with an each block.
 
-```html
+```sv
 <h1>Shopping list</h1>
 <ul>
 	{#each items as item}
@@ -190,7 +190,7 @@ Iterating over lists of values can be done with an each block.
 
 An each block can also specify an *index*, equivalent to the second argument in an `array.map(...)` callback:
 
-```html
+```sv
 {#each items as item, i}
 	<li>{i + 1}: {item.name} x {item.qty}</li>
 {/each}
@@ -200,7 +200,7 @@ An each block can also specify an *index*, equivalent to the second argument in
 
 If a *key* expression is provided — which must uniquely identify each list item — Svelte will use it to diff the list when data changes, rather than adding or removing items at the end. The key can be any object, but strings and numbers are recommended since they allow identity to persist when the objects themselves change.
 
-```html
+```sv
 {#each items as item, i (item.id)}
 	<li>{i + 1}: {item.name} x {item.qty}</li>
 {/each}
@@ -210,17 +210,37 @@ If a *key* expression is provided — which must uniquely identify each list ite
 
 You can freely use destructuring patterns in each blocks.
 
-```html
-{#each items as { id, name, qty }, i (id)}
+```sv
+{#each items as {id, name, qty}, i (id)}
 	<li>{i + 1}: {name} x {qty}</li>
 {/each}
 ```
 
 ---
 
+You can use rest syntax when destructuring objects *(since [v3.2.0](https://github.com/sveltejs/svelte/blob/master/CHANGELOG.md#320))*.
+
+```sv
+{#each items as {id, ...rest}}
+	<li><span>{id}</span><MyComponent {...rest} /></li>
+{/each}
+```
+
+---
+
+You can use rest syntax when destructuring arrays *(since [v3.2.0](https://github.com/sveltejs/svelte/blob/master/CHANGELOG.md#320))*.
+
+```sv
+{#each items as [id, ...rest]}
+	<li><span>{id}</span><MyComponent values={rest} /></li>
+{/each}
+```
+
+---
+
 An each block can also have an `{:else}` clause, which is rendered if the list is empty.
 
-```html
+```sv
 {#each todos as todo}
 	<p>{todo.text}</p>
 {:else}
@@ -245,7 +265,7 @@ An each block can also have an `{:else}` clause, which is rendered if the list i
 
 Await blocks allow you to branch on the three possible states of a Promise — pending, fulfilled or rejected.
 
-```html
+```sv
 {#await promise}
 	<!-- promise is pending -->
 	<p>waiting for the promise to resolve...</p>
@@ -262,7 +282,7 @@ Await blocks allow you to branch on the three possible states of a Promise — p
 
 The `catch` block can be omitted if you don't need to render anything when the promise rejects (or no error is possible).
 
-```html
+```sv
 {#await promise}
 	<!-- promise is pending -->
 	<p>waiting for the promise to resolve...</p>
@@ -276,7 +296,7 @@ The `catch` block can be omitted if you don't need to render anything when the p
 
 If you don't care about the pending state, you can also omit the initial block.
 
-```html
+```sv
 {#await promise then value}
 	<p>The value is {value}</p>
 {/await}
@@ -296,7 +316,7 @@ on:eventname|modifiers={handler}
 
 Use the `on:` directive to listen to DOM events.
 
-```html
+```sv
 <script>
 	let count = 0;
 
@@ -314,7 +334,7 @@ Use the `on:` directive to listen to DOM events.
 
 Handlers can be declared inline with no performance penalty. As with attributes, directive values may be quoted for the sake of syntax highlighters.
 
-```html
+```sv
 <button on:click="{() => count += 1}">
 	count: {count}
 </button>
@@ -334,7 +354,7 @@ The following modifiers are available:
 
 Modifiers can be chained together, e.g. `on:click|once|capture={...}`.
 
-```html
+```sv
 <form on:submit|preventDefault={handleSubmit}>
 	<!-- the `submit` event's default is prevented,
 	     so the page won't reload -->
@@ -345,7 +365,7 @@ Modifiers can be chained together, e.g. `on:click|once|capture={...}`.
 
 If the `on:` directive is used without a value, the component will *forward* the event, meaning that a consumer of the component can listen for it.
 
-```html
+```sv
 <button on:click>
 	The component itself will emit the click event
 </button>
@@ -362,7 +382,7 @@ on:eventname={handler}
 
 Components can emit events using [createEventDispatcher](docs#createEventDispatcher), or by forwarding DOM events. Listening for component events looks the same as listening for DOM events:
 
-```html
+```sv
 <SomeComponent on:whatever={handler}/>
 ```
 
@@ -370,7 +390,7 @@ Components can emit events using [createEventDispatcher](docs#createEventDispatc
 
 As with DOM events, if the `on:` directive is used without a value, the component will *forward* the event, meaning that a consumer of the component can listen for it.
 
-```html
+```sv
 <SomeComponent on:whatever/>
 ```
 
@@ -392,7 +412,7 @@ Data ordinarily flows down, from parent to child. The `bind:` directive allows d
 
 The simplest bindings reflect the value of a property, such as `input.value`.
 
-```html
+```sv
 <input bind:value={name}>
 <textarea bind:value={text}></textarea>
 
@@ -403,7 +423,7 @@ The simplest bindings reflect the value of a property, such as `input.value`.
 
 If the name matches the value, you can use a shorthand.
 
-```html
+```sv
 <!-- These are equivalent -->
 <input bind:value={value}>
 <input bind:value>
@@ -413,7 +433,7 @@ If the name matches the value, you can use a shorthand.
 
 Numeric input values are coerced; even though `input.value` is a string as far as the DOM is concerned, Svelte will treat it as a number. If the input is empty or invalid (in the case of `type="number"`), the value is `undefined`.
 
-```html
+```sv
 <input type="number" bind:value={num}>
 <input type="range" bind:value={num}>
 ```
@@ -424,7 +444,7 @@ Numeric input values are coerced; even though `input.value` is a string as far a
 
 Inputs that work together can use `bind:group`.
 
-```html
+```sv
 <script>
 	let tortilla = 'Plain';
 	let fillings = [];
@@ -448,7 +468,7 @@ Inputs that work together can use `bind:group`.
 
 A `<select>` value binding corresponds to the `value` property on the selected `<option>`, which can be any value (not just strings, as is normally the case in the DOM).
 
-```html
+```sv
 <select bind:value={selected}>
 	<option value={a}>a</option>
 	<option value={b}>b</option>
@@ -460,7 +480,7 @@ A `<select>` value binding corresponds to the `value` property on the selected `
 
 A `<select multiple>` element behaves similarly to a checkbox group.
 
-```html
+```sv
 <select multiple bind:value={fillings}>
 	<option value="Rice">Rice</option>
 	<option value="Beans">Beans</option>
@@ -473,7 +493,7 @@ A `<select multiple>` element behaves similarly to a checkbox group.
 
 When the value of an `<option>` matches its text content, the attribute can be omitted.
 
-```html
+```sv
 <select multiple bind:value={fillings}>
 	<option>Rice</option>
 	<option>Beans</option>
@@ -499,7 +519,7 @@ Media elements (`<audio>` and `<video>`) have their own set of bindings — four
 * `paused` — this one should be self-explanatory
 * `volume` — a value between 0 and 1
 
-```html
+```sv
 <video
 	src={clip}
 	bind:duration
@@ -523,7 +543,7 @@ Block-level elements have 4 readonly bindings, measured using a technique simila
 * `offsetWidth`
 * `offsetHeight`
 
-```html
+```sv
 <div
 	bind:offsetWidth={width}
 	bind:offsetHeight={height}
@@ -538,7 +558,7 @@ Block-level elements have 4 readonly bindings, measured using a technique simila
 
 To get a reference to a DOM node, use `bind:this`.
 
-```html
+```sv
 <script>
 	import { onMount } from 'svelte';
 
@@ -567,7 +587,7 @@ bind:this={component_instance}
 
 You can bind to component props using the same mechanism.
 
-```html
+```sv
 <Keypad bind:value={pin}/>
 ```
 
@@ -577,7 +597,7 @@ Components also support `bind:this`, allowing you to interact with component ins
 
 > Note that we can do `{cart.empty}` rather than `{() => cart.empty()}`, since component methods are closures. You don't need to worry about the value of `this` when calling them.
 
-```html
+```sv
 <ShoppingCart bind:this={cart}/>
 
 <button on:click={cart.empty}>
@@ -599,7 +619,7 @@ class:name
 
 A `class:` directive provides a shorter way of toggling a class on an element.
 
-```html
+```sv
 <!-- These are equivalent -->
 <div class="{active ? 'active' : ''}">...</div>
 <div class:active={active}>...</div>
@@ -632,7 +652,7 @@ action = (node: HTMLElement, parameters: any) => {
 
 Actions are functions that are called when an element is created. They can return an object with a `destroy` method that is called after the element is unmounted:
 
-```html
+```sv
 <script>
 	function foo(node) {
 		// the node has been mounted in the DOM
@@ -654,7 +674,7 @@ An action can have parameters. If the returned value has an `update` method, it
 
 > Don't worry about the fact that we're redeclaring the `foo` function for every component instance — Svelte will hoist any functions that don't depend on local state out of the component definition.
 
-```html
+```sv
 <script>
 	export let bar;
 
@@ -735,7 +755,7 @@ Elements inside an *outroing* block are kept in the DOM until all current transi
 
 The `transition:` directive indicates a *bidirectional* transition, which means it can be smoothly reversed while the transition is in progress.
 
-```html
+```sv
 {#if visible}
 	<div transition:fade>
 		fades in and out
@@ -747,7 +767,7 @@ The `transition:` directive indicates a *bidirectional* transition, which means
 
 The `in:` and `out:` directives are not bidirectional. An in transition will continue to 'play' alongside the out transition, if the block is outroed while the transition is in progress. If an out transition is aborted, transitions will restart from scratch.
 
-```html
+```sv
 {#if visible}
 	<div in:fly out:fade>
 		flies in, fades out
@@ -765,7 +785,7 @@ Like actions, transitions can have parameters.
 
 (The double `{{curlies}}` aren't a special syntax; this is an object literal inside an expression tag.)
 
-```html
+```sv
 {#if visible}
 	<div transition:fade="{{ duration: 2000 }}">
 		flies in, fades out over two seconds
@@ -783,7 +803,7 @@ The `t` argument passed to `css` is a value between `0` and `1` after the `easin
 
 The function is called repeatedly *before* the transition begins, with different `t` and `u` arguments.
 
-```html
+```sv
 <script>
 	import { elasticOut } from 'svelte/easing';
 
@@ -814,7 +834,7 @@ A custom transition function can also return a `tick` function, which is called
 
 > If it's possible to use `css` instead of `tick`, do so — CSS animations can run off the main thread, preventing jank on slower devices.
 
-```html
+```sv
 <script>
 	export let visible = false;
 
@@ -860,7 +880,7 @@ An element with transitions will dispatch the following events in addition to an
 * `outrostart`
 * `outroend`
 
-```html
+```sv
 {#if visible}
 	<p
 		transition:fly="{{ y: 200, duration: 2000 }}"
@@ -878,7 +898,7 @@ An element with transitions will dispatch the following events in addition to an
 
 Local transitions only play when the block they belong to is created or destroyed, *not* when parent blocks are created or destroyed.
 
-```html
+```sv
 {#if x}
 	{#if y}
 		<p transition:fade>
@@ -916,7 +936,7 @@ Components can have child content, in the same way that elements can.
 
 The content is exposed in the child component using the `<slot>` element, which can contain fallback content that is rendered if no children are provided.
 
-```html
+```sv
 <!-- App.svelte -->
 <Widget>
 	<p>this is some child content</p>
@@ -934,7 +954,7 @@ The content is exposed in the child component using the `<slot>` element, which
 
 Named slots allow consumers to target specific areas. They can also have fallback content.
 
-```html
+```sv
 <!-- App.svelte -->
 <Widget>
 	<h1 slot="header">Hello</h1>
@@ -955,7 +975,7 @@ Slots can be rendered zero or more times, and can pass values *back* to the pare
 
 The usual shorthand rules apply — `let:item` is equivalent to `let:item={item}`, and `<slot {item}>` is equivalent to `<slot item={item}>`.
 
-```html
+```sv
 <!-- App.svelte -->
 <FancyList {items} let:item={item}>
 	<div>{item.text}</div>
@@ -975,7 +995,7 @@ The usual shorthand rules apply — `let:item` is equivalent to `let:item={item}
 
 Named slots can also expose values. The `let:` directive goes on the element with the `slot` attribute.
 
-```html
+```sv
 <!-- App.svelte -->
 <FancyList {items}>
 	<div slot="item" let:item={item}>{item.text}</div>
@@ -1003,7 +1023,7 @@ The `<svelte:self>` element allows a component to include itself, recursively.
 
 It cannot appear at the top level of your markup; it must be inside an if or each block to prevent an infinite loop.
 
-```html
+```sv
 <script>
 	export let count;
 </script>
@@ -1028,7 +1048,7 @@ The `<svelte:component>` element renders a component dynamically, using the comp
 
 If `this` is falsy, no component is rendered.
 
-```html
+```sv
 <svelte:component this={currentSelection.component} foo={bar}/>
 ```
 
@@ -1046,7 +1066,7 @@ If `this` is falsy, no component is rendered.
 
 The `<svelte:window>` element allows you to add event listeners to the `window` object without worrying about removing them when the component is destroyed, or checking for the existence of `window` when server-side rendering.
 
-```html
+```sv
 <script>
 	function handleKeydown(event) {
 		alert(`pressed the ${event.key} key`);
@@ -1070,7 +1090,7 @@ You can also bind to the following properties:
 
 All except `scrollX` and `scrollY` are readonly.
 
-```html
+```sv
 <svelte:window bind:scrollY={y}/>
 ```
 
@@ -1085,7 +1105,7 @@ All except `scrollX` and `scrollY` are readonly.
 
 As with `<svelte:window>`, this element allows you to add listeners to events on `document.body`, such as `mouseenter` and `mouseleave` which don't fire on `window`.
 
-```html
+```sv
 <svelte:body
 	on:mouseenter={handleMouseenter}
 	on:mouseleave={handleMouseleave}
@@ -1103,7 +1123,7 @@ As with `<svelte:window>`, this element allows you to add listeners to events on
 
 This element makes it possible to insert elements into `document.head`. During server-side rendering, `head` content exposed separately to the main `html` content.
 
-```html
+```sv
 <svelte:head>
 	<link rel="stylesheet" href="tutorial/dark-theme.css">
 </svelte:head>
@@ -1127,6 +1147,6 @@ The `<svelte:options>` element provides a place to specify per-component compile
 * `namespace="..."` — the namespace where this component will be used, most commonly "svg"
 * `tag="..."` — the name to use when compiling this component as a custom element
 
-```html
+```sv
 <svelte:options tag="my-custom-element"/>
 ```
diff --git a/site/content/docs/03-run-time.md b/site/content/docs/03-run-time.md
index dfb270dc979a..8bcf6f13b900 100644
--- a/site/content/docs/03-run-time.md
+++ b/site/content/docs/03-run-time.md
@@ -22,7 +22,7 @@ The `onMount` function schedules a callback to run as soon as the component has
 
 `onMount` does not run inside a [server-side component](docs#Server-side_component_API).
 
-```html
+```sv
 <script>
 	import { onMount } from 'svelte';
 
@@ -36,7 +36,7 @@ The `onMount` function schedules a callback to run as soon as the component has
 
 If a function is returned from `onMount`, it will be called when the component is unmounted.
 
-```html
+```sv
 <script>
 	import { onMount } from 'svelte';
 
@@ -62,7 +62,7 @@ Schedules a callback to run immediately before the component is updated after an
 
 > The first time the callback runs will be before the initial `onMount`
 
-```html
+```sv
 <script>
 	import { beforeUpdate } from 'svelte';
 
@@ -82,7 +82,7 @@ afterUpdate(callback: () => void)
 
 Schedules a callback to run immediately after the component has been updated.
 
-```html
+```sv
 <script>
 	import { afterUpdate } from 'svelte';
 
@@ -104,7 +104,7 @@ Schedules a callback to run once the component is unmounted.
 
 Out of `onMount`, `beforeUpdate`, `afterUpdate` and `onDestroy`, this is the only one that runs inside a server-side component.
 
-```html
+```sv
 <script>
 	import { onDestroy } from 'svelte';
 
@@ -124,7 +124,7 @@ promise: Promise = tick()
 
 Returns a promise that resolves once any pending state changes have been applied, or in the next microtask if there are none.
 
-```html
+```sv
 <script>
 	import { beforeUpdate, tick } from 'svelte';
 
@@ -148,7 +148,7 @@ Associates an arbitrary `context` object with the current component and the spec
 
 Like lifecycle functions, this must be called during component initialisation.
 
-```html
+```sv
 <script>
 	import { setContext } from 'svelte';
 
@@ -166,7 +166,7 @@ context: any = getContext(key: any)
 
 Retrieves the context that belongs to the closest parent component with the specified `key`. Must be called during component initialisation.
 
-```html
+```sv
 <script>
 	import { getContext } from 'svelte';
 
@@ -186,7 +186,7 @@ Creates an event dispatcher that can be used to dispatch [component events](docs
 
 Component events created with `createEventDispatcher` create a [CustomEvent](https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent). These events do not [bubble](https://developer.mozilla.org/en-US/docs/Learn/JavaScript/Building_blocks/Events#Event_bubbling_and_capture) and are not cancellable with `event.preventDefault()`. The `detail` argument corresponds to the [CustomEvent.detail](https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent/detail) property and can contain any type of data.
 
-```html
+```sv
 <script>
 	import { createEventDispatcher } from 'svelte';
 
@@ -231,7 +231,7 @@ unsubscribe();
 
 Stores have special significance inside Svelte components. Their values can be read by prefixing the store's name with the `$` character, which causes Svelte to set up subscriptions and unsubscriptions automatically during the component's lifecycle.
 
-```html
+```sv
 <script>
 	import { count } from './stores.js';
 
@@ -417,7 +417,7 @@ Both functions return a Promise that resolves when the tween completes. If the t
 
 Out of the box, Svelte will interpolate between two numbers, two arrays or two objects (as long as the arrays and objects are the same 'shape', and their 'leaf' properties are also numbers).
 
-```html
+```sv
 <script>
 	import { tweened } from 'svelte/motion';
 	import { cubicOut } from 'svelte/easing';
@@ -537,7 +537,7 @@ The `flip` function calculates the start and end position of an element and anim
 You can see a full example on the [animations tutorial](tutorial/animate)
 
 
-```html
+```sv
 <script>
 	import { flip } from 'svelte/animate';
 	import { quintOut } from 'svelte/easing';
