diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 14824ecdfa..ff0ec4f633 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,10 +5,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node-version: [8, 10, 12]
+        node-version: [8, 10, 12, 14]
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
-    - run: git config --global core.autocrlf false
     - uses: actions/checkout@v1
     - uses: actions/setup-node@v1
       with:
@@ -24,7 +23,10 @@ jobs:
     - uses: actions/setup-node@v1
     - run: 'npm i && npm run lint'
   Unit:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
     - uses: actions/checkout@v1
     - uses: actions/setup-node@v1
diff --git a/.gitignore b/.gitignore
index 7a14244929..f7fac04eba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .idea
 .DS_Store
 .nyc_output
+.vscode
 node_modules
 *.map
 /src/compiler/compile/internal_exports.ts
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1564848b5..73bc68d72f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,76 @@
 # Svelte changelog
 
+## 3.23.0
+
+* Update `<select>` with `bind:value` when the available `<option>`s change ([#1764](https://github.com/sveltejs/svelte/issues/1764))
+* Add `muted` binding for media elements ([#2998](https://github.com/sveltejs/svelte/issues/2998))
+* Fix inconsistencies when setting a two-way bound `<input>` to `undefined` ([#3569](https://github.com/sveltejs/svelte/issues/3569))
+* Fix setting `<select multiple>` when there are spread attributes ([#4392](https://github.com/sveltejs/svelte/issues/4392))
+* Fix let-less `<slot>` with context overflow ([#4624](https://github.com/sveltejs/svelte/issues/4624))
+* Fix resize listening on certain older browsers ([#4752](https://github.com/sveltejs/svelte/issues/4752))
+* Add `a11y-no-onchange` warning ([#4788](https://github.com/sveltejs/svelte/pull/4788))
+* Fix `use:` actions being recreated when a keyed `{#each}` is reordered ([#4693](https://github.com/sveltejs/svelte/issues/4693))
+* Fix `{@html}` when using tags that can only appear inside certain tags ([#4852](https://github.com/sveltejs/svelte/issues/4852))
+* Fix reactivity when binding directly to `{#each}` context ([#4879](https://github.com/sveltejs/svelte/issues/4879))
+
+## 3.22.3
+
+* Support default values and trailing commas in destructuring `{#await}` ([#4560](https://github.com/sveltejs/svelte/issues/4560), [#4810](https://github.com/sveltejs/svelte/issues/4810))
+* Fix handling of `tweened` store when set using `duration: 0` ([#4799](https://github.com/sveltejs/svelte/issues/4799), [#4846](https://github.com/sveltejs/svelte/issues/4846))
+* Fix setting `value` attribute with `bind:group` and attribute spread ([#4803](https://github.com/sveltejs/svelte/issues/4803))
+* Fix issue with compound `{#if}` block involving static condition, dynamic condition, and inline component ([#4840](https://github.com/sveltejs/svelte/issues/4840))
+* Update a11y warnings per ARIA 1.2 working draft ([#4844](https://github.com/sveltejs/svelte/issues/4844))
+
+## 3.22.2
+
+* Fix compiler exception with `a11y-img-redundant-alt` and value-less `alt` attribute ([#4777](https://github.com/sveltejs/svelte/issues/4777))
+
+## 3.22.1
+
+* Fix compiler exception with `a11y-img-redundant-alt` and dynamic `alt` attribute ([#4770](https://github.com/sveltejs/svelte/issues/4770))
+
+## 3.22.0
+
+* Fix misaligned line numbers in source maps ([#3906](https://github.com/sveltejs/svelte/issues/3906))
+* Make setting a `tweened` store using `duration: 0` instantly update the value ([#4399](https://github.com/sveltejs/svelte/issues/4399))
+* Fix reactivity with imported values that are then mutated ([#4555](https://github.com/sveltejs/svelte/issues/4555))
+* Fix contextual dynamic `bind:this` inside `{#each}` block ([#4686](https://github.com/sveltejs/svelte/issues/4686))
+* Do not display a11y warning about missing `href` for `<a>` with `name` or `id` ([#4697](https://github.com/sveltejs/svelte/issues/4697))
+* Disable infinite loop guard inside generators ([#4698](https://github.com/sveltejs/svelte/issues/4698))
+* Display `a11y-invalid-attribute` warning for `href="javascript:..."` ([#4733](https://github.com/sveltejs/svelte/pull/4733))
+* Implement `a11y-img-redundant-alt` warning ([#4750](https://github.com/sveltejs/svelte/pull/4750))
+* Fix variable name conflict with component called `<Anchor>` ([#4768](https://github.com/sveltejs/svelte/issues/4768))
+
+## 3.21.0
+
+* Support dimension bindings in cross-origin environments ([#2147](https://github.com/sveltejs/svelte/issues/2147))
+* Fix several related outro bugs ([#3202](https://github.com/sveltejs/svelte/issues/3202), [#3410](https://github.com/sveltejs/svelte/issues/3410), [#3685](https://github.com/sveltejs/svelte/issues/3685), [#4620](https://github.com/sveltejs/svelte/issues/4620), [#4630](https://github.com/sveltejs/svelte/issues/4630))
+* Try using `globalThis` rather than `globals` for the benefit of non-Node servers and web workers ([#3561](https://github.com/sveltejs/svelte/issues/3561), [#4545](https://github.com/sveltejs/svelte/issues/4545))
+* Support `{#await ... catch ...}` syntax shorthand ([#3623](https://github.com/sveltejs/svelte/issues/3623))
+* Fix attaching of JS debugging comments to HTML comments ([#4565](https://github.com/sveltejs/svelte/issues/4565))
+* Fix `<svelte:component/>` within `<slot/>` ([#4597](https://github.com/sveltejs/svelte/issues/4597))
+* Fix bug with updating simple `{#if}` blocks ([#4629](https://github.com/sveltejs/svelte/issues/4629))
+* Fix issues with `<input type="number">` updates ([#4631](https://github.com/sveltejs/svelte/issues/4631), [#4687](https://github.com/sveltejs/svelte/issues/4687))
+* Prevent illegal attribute names ([#4648](https://github.com/sveltejs/svelte/issues/4648))
+* Fix `{#if}` block directly within `<slot/>` ([#4703](https://github.com/sveltejs/svelte/issues/4703))
+
+## 3.20.1
+
+* Fix compiler regression with slots ([#4562](https://github.com/sveltejs/svelte/issues/4562))
+
+## 3.20.0
+
+* Allow destructuring in `{#await}` blocks ([#1851](https://github.com/sveltejs/svelte/issues/1851))
+* Allow `<svelte:self>` to be used in a slot ([#2798](https://github.com/sveltejs/svelte/issues/2798))
+* Expose object of unknown props in `$$restProps` ([#2930](https://github.com/sveltejs/svelte/issues/2930))
+* Prevent passing named slots other than from the top level within a component ([#3385](https://github.com/sveltejs/svelte/issues/3385))
+* Allow transitions and animations to work within iframes ([#3624](https://github.com/sveltejs/svelte/issues/3624))
+* Fix initialising slot fallbacks when unnecessary ([#3763](https://github.com/sveltejs/svelte/issues/3763))
+* Disallow binding directly to `const` variables ([#4479](https://github.com/sveltejs/svelte/issues/4479))
+* Fix re-attaching event handlers on keyed `{#each}` blocks ([#4491](https://github.com/sveltejs/svelte/issues/4491))
+* Fix updating keyed `{#each}` blocks with `{:else}` ([#4536](https://github.com/sveltejs/svelte/issues/4536), [#4549](https://github.com/sveltejs/svelte/issues/4549))
+* Fix hydration of top-level content ([#4542](https://github.com/sveltejs/svelte/issues/4542))
+
 ## 3.19.2
 
 * In `dev` mode, display a runtime warning when a component is passed an unexpected slot ([#1020](https://github.com/sveltejs/svelte/issues/1020), [#1447](https://github.com/sveltejs/svelte/issues/1447))
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f7df9770db..c3eff81da3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -93,7 +93,7 @@ Test samples are kept in `/test/xxx/samples` folder.
 
 #### Running tests
 
-1. To run test, run `npm run test`
+1. To run test, run `npm run test`.
 1. To run test for a specific feature, you can use the `-g` (aka `--grep`) option. For example, to only run test involving transitions, run `npm run test -- -g transition`.
 
 ##### Running solo test
@@ -130,7 +130,7 @@ The core Svelte team will be monitoring for pull requests. Do help us by making
 
 ### Code conventions
 
-- `snake_case` for internal variable names and methods
+- `snake_case` for internal variable names and methods.
 - `camelCase` for public variable names and methods.
 
 ## License
diff --git a/README.md b/README.md
index fa725804a9..e2e4fcd532 100644
--- a/README.md
+++ b/README.md
@@ -34,11 +34,6 @@ npm install
 
 > Do not use Yarn to install the dependencies, as the specific package versions in `package-lock.json` are used to build and test Svelte.
 
-> Many tests depend on newlines being preserved as `<LF>`. On Windows, you can ensure this by cloning with:
-> ```bash
-> git -c core.autocrlf=false clone https://github.com/sveltejs/svelte.git
-> ```
-
 To build the compiler, and all the other modules included in the package:
 
 ```bash
@@ -77,6 +72,9 @@ npm install && npm run update
 npm run dev
 ```
 
+### Is svelte.dev down?
+
+Probably not, but it's possible. If you can't seem to access any `.dev` sites, check out [this SuperUser question and answer](https://superuser.com/q/1413402).
 
 ## License
 
diff --git a/banner.png b/banner.png
deleted file mode 100644
index 0d117c3c09..0000000000
Binary files a/banner.png and /dev/null differ
diff --git a/package-lock.json b/package-lock.json
index 014348f37e..cd9a83e04b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "svelte",
-  "version": "3.19.2",
+  "version": "3.23.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -280,9 +280,9 @@
       "dev": true
     },
     "acorn": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz",
-      "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz",
+      "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==",
       "dev": true
     },
     "acorn-globals": {
@@ -296,9 +296,9 @@
       },
       "dependencies": {
         "acorn": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz",
-          "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==",
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
+          "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
           "dev": true
         }
       }
@@ -492,6 +492,12 @@
       "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
       "dev": true
     },
+    "buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+      "dev": true
+    },
     "buffer-from": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
@@ -1352,15 +1358,15 @@
       }
     },
     "extract-zip": {
-      "version": "1.6.7",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz",
-      "integrity": "sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz",
+      "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==",
       "dev": true,
       "requires": {
-        "concat-stream": "1.6.2",
-        "debug": "2.6.9",
-        "mkdirp": "0.5.1",
-        "yauzl": "2.4.1"
+        "concat-stream": "^1.6.2",
+        "debug": "^2.6.9",
+        "mkdirp": "^0.5.4",
+        "yauzl": "^2.10.0"
       },
       "dependencies": {
         "debug": {
@@ -1405,9 +1411,9 @@
       "dev": true
     },
     "fd-slicer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
-      "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
       "dev": true,
       "requires": {
         "pend": "~1.2.0"
@@ -1598,26 +1604,6 @@
       "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
       "dev": true
     },
-    "handlebars": {
-      "version": "4.5.3",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.3.tgz",
-      "integrity": "sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==",
-      "dev": true,
-      "requires": {
-        "neo-async": "^2.6.0",
-        "optimist": "^0.6.1",
-        "source-map": "^0.6.1",
-        "uglify-js": "^3.1.4"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
     "har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
@@ -1676,6 +1662,12 @@
         "whatwg-encoding": "^1.0.1"
       }
     },
+    "html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true
+    },
     "http-proxy-agent": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
@@ -1984,12 +1976,12 @@
       }
     },
     "istanbul-reports": {
-      "version": "2.2.6",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.6.tgz",
-      "integrity": "sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==",
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.7.tgz",
+      "integrity": "sha512-uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg==",
       "dev": true,
       "requires": {
-        "handlebars": "^4.1.2"
+        "html-escaper": "^2.0.0"
       }
     },
     "js-tokens": {
@@ -2049,9 +2041,9 @@
       },
       "dependencies": {
         "acorn": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz",
-          "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==",
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
+          "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
           "dev": true
         },
         "ws": {
@@ -2301,26 +2293,18 @@
       }
     },
     "minimist": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-      "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
       "dev": true
     },
     "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
       "dev": true,
       "requires": {
-        "minimist": "0.0.8"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
-        }
+        "minimist": "^1.2.5"
       }
     },
     "mocha": {
@@ -2397,6 +2381,21 @@
             "path-is-absolute": "^1.0.0"
           }
         },
+        "minimist": {
+          "version": "0.0.8",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+          "dev": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
         "ms": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
@@ -2534,12 +2533,6 @@
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
-    "neo-async": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
-      "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
-      "dev": true
-    },
     "nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
@@ -2687,16 +2680,6 @@
         }
       }
     },
-    "optimist": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-      "dev": true,
-      "requires": {
-        "minimist": "~0.0.1",
-        "wordwrap": "~0.0.2"
-      }
-    },
     "optionator": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
@@ -3047,9 +3030,9 @@
       }
     },
     "readable-stream": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
       "dev": true,
       "requires": {
         "core-util-is": "~1.0.0",
@@ -3672,26 +3655,6 @@
       "integrity": "sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==",
       "dev": true
     },
-    "uglify-js": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz",
-      "integrity": "sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "commander": "~2.20.0",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
     "uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
@@ -3860,12 +3823,6 @@
         }
       }
     },
-    "wordwrap": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-      "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
-      "dev": true
-    },
     "wrap-ansi": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
@@ -4112,12 +4069,13 @@
       }
     },
     "yauzl": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
-      "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
       "dev": true,
       "requires": {
-        "fd-slicer": "~1.0.1"
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
       }
     }
   }
diff --git a/package.json b/package.json
index 009e5143a9..90cee0a5d5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "svelte",
-  "version": "3.19.2",
+  "version": "3.23.0",
   "description": "Cybernetically enhanced web apps",
   "module": "index.mjs",
   "main": "index",
diff --git a/site/content/docs/00-introduction.md b/site/content/docs/00-introduction.md
index 15fdffbde2..2ca82a8698 100644
--- a/site/content/docs/00-introduction.md
+++ b/site/content/docs/00-introduction.md
@@ -6,4 +6,6 @@ This page contains detailed API reference documentation. It's intended to be a r
 
 If that's not you (yet), you may prefer to visit the [interactive tutorial](tutorial) or the [examples](examples) before consulting this reference.
 
-Don't be shy about asking for help in the [Discord chatroom](chat).
\ No newline at end of file
+Don't be shy about asking for help in the [Discord chatroom](chat).
+
+Using an older version of Svelte? Have a look at the [v2 docs](https://v2.svelte.dev).
\ No newline at end of file
diff --git a/site/content/docs/01-component-format.md b/site/content/docs/01-component-format.md
index 07a59c69f8..8eac5d3c50 100644
--- a/site/content/docs/01-component-format.md
+++ b/site/content/docs/01-component-format.md
@@ -8,7 +8,7 @@ Components are the building blocks of Svelte applications. They are written into
 
 All three sections — script, styles and markup — are optional.
 
-```html
+```sv
 <script>
 	// logic goes here
 </script>
@@ -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 (see the section on [attributes and props](docs#Attributes_and_props) for more information).
 
-```html
+```sv
 <script>
 	export let foo;
 
@@ -46,7 +46,7 @@ You can specify a default initial value for a prop. It will be used if the compo
 
 In development mode (see the [compiler options](docs#svelte_compile)), a warning will be printed if no default initial value is provided and the consumer does not specify a value. To squelch this warning, ensure that a default initial value is specified, even if it is `undefined`.
 
-```html
+```sv
 <script>
 	export let bar = 'optional default initial value';
 	export let baz = undefined;
@@ -57,7 +57,7 @@ In development mode (see the [compiler options](docs#svelte_compile)), a warning
 
 If you export a `const`, `class` or `function`, it is readonly from outside the component. Function *expressions* are valid props, however.
 
-```html
+```sv
 <script>
 	// these are readonly
 	export const thisIs = 'readonly';
@@ -75,7 +75,7 @@ If you export a `const`, `class` or `function`, it is readonly from outside the
 
 You can use reserved words as prop names.
 
-```html
+```sv
 <script>
 	let className;
 
@@ -95,7 +95,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;
 
@@ -113,7 +113,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 `$:` [JS label syntax](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/label). Reactive statements run immediately before the component updates, whenever the values that they depend on have changed.
 
-```html
+```sv
 <script>
 	export let title;
 
@@ -132,7 +132,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;
 
@@ -157,7 +157,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';
 
@@ -175,7 +175,7 @@ Local variables (that do not represent store values) must *not* have a `$` prefi
 ##### Store contract
 
 ```js
-store = { subscribe: (subscription: (value: any) => void) => () => void, set?: (value: any) => void }
+store = { subscribe: (subscription: (value: any) => void) => (() => void), set?: (value: any) => void }
 ```
 
 You can create your own stores without relying on [`svelte/store`](docs#svelte_store), by implementing the *store contract*:
@@ -199,7 +199,7 @@ You cannot `export default`, since the default export is the component itself.
 
 > Variables defined in `module` scripts are not reactive — reassigning them will not trigger a rerender even though the variable itself will update. For values shared between multiple components, consider using a [store](docs#svelte_store).
 
-```html
+```sv
 <script context="module">
 	let totalComponents = 0;
 
@@ -225,7 +225,7 @@ CSS inside a `<style>` block will be scoped to that component.
 
 This works by adding a class to affected elements, which is based on a hash of the component styles (e.g. `svelte-123xyz`).
 
-```html
+```sv
 <style>
 	p {
 		/* this will only affect <p> elements in this component */
@@ -238,7 +238,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 d25b348254..153eb1b4cc 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>` or `<Namespace.Widget>`, indicates a *component*.
 
-```html
+```sv
 <script>
 	import Widget from './Widget.svelte';
 </script>
@@ -26,7 +26,7 @@ A lowercase tag, like `<div>`, denotes a regular HTML element. A capitalised tag
 
 By default, attributes work exactly like their HTML counterparts.
 
-```html
+```sv
 <div class="foo">
 	<button disabled>can't touch this</button>
 </div>
@@ -36,7 +36,7 @@ By default, attributes work exactly like their HTML counterparts.
 
 As in HTML, values may be unquoted.
 
-```html
+```sv
 <input type=checkbox>
 ```
 
@@ -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>
 ```
 
@@ -71,7 +71,7 @@ All other attributes are included unless their value is [nullish](https://develo
 
 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>
 ```
 
@@ -79,7 +79,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>
@@ -91,7 +91,7 @@ By convention, values passed to components are referred to as *properties* or *p
 
 As with elements, `name={name}` can be replaced with the `{name}` shorthand.
 
-```html
+```sv
 <Widget foo={bar} answer={42} text="hello"/>
 ```
 
@@ -101,7 +101,7 @@ As with elements, `name={name}` can be replaced with the `{name}` shorthand.
 
 An element or component can have multiple spread attributes, interspersed with regular ones.
 
-```html
+```sv
 <Widget {...things}/>
 ```
 
@@ -109,10 +109,22 @@ An element or component can have multiple spread attributes, interspersed with r
 
 *`$$props`* references all props that are passed to a component – including ones that are not declared with `export`. It is useful in rare cases, but not generally recommended, as it is difficult for Svelte to optimise.
 
-```html
+```sv
 <Widget {...$$props}/>
 ```
 
+---
+
+*`$$restProps`* contains only the props which are *not* declared with `export`. It can be used to pass down other unknown attributes to an element in a component.
+
+```html
+<input {...$$restProps}>
+```
+
+
+> The `value` attribute of an `input` element or its children `option` elements must not be set with spread attributes when using `bind:group` or `bind:checked`. Svelte needs to be able to see the element's `value` directly in the markup in these cases so that it can link it to the bound variable.
+
+---
 
 ### Text expressions
 
@@ -124,7 +136,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>
 ```
@@ -136,7 +148,7 @@ Text can also contain JavaScript expressions:
 
 You can use HTML comments inside components.
 
-```html
+```sv
 <!-- this is a comment! -->
 <h1>Hello world</h1>
 ```
@@ -145,7 +157,7 @@ You can use HTML comments inside components.
 
 Comments beginning with `svelte-ignore` disable warnings for the next block of markup. Usually these are accessibility warnings; make sure that you're disabling them for a good reason.
 
-```html
+```sv
 <!-- svelte-ignore a11y-autofocus -->
 <input bind:value={name} autofocus>
 ```
@@ -167,7 +179,7 @@ Comments beginning with `svelte-ignore` disable warnings for the next block of m
 
 Content that is conditionally rendered can be wrapped in an if block.
 
-```html
+```sv
 {#if answer === 42}
 	<p>what was the question?</p>
 {/if}
@@ -177,7 +189,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}
@@ -197,6 +209,9 @@ Additional conditions can be added with `{:else if expression}`, optionally endi
 {#each expression as name, index}...{/each}
 ```
 ```sv
+{#each expression as name (key)}...{/each}
+```
+```sv
 {#each expression as name, index (key)}...{/each}
 ```
 ```sv
@@ -207,7 +222,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}
@@ -222,7 +237,7 @@ You can use each blocks to iterate over any array or array-like value — that i
 
 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}
@@ -232,7 +247,12 @@ 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 (item.id)}
+	<li>{item.name} x {item.qty}</li>
+{/each}
+
+<!-- or with additional index value -->
 {#each items as item, i (item.id)}
 	<li>{i + 1}: {item.name} x {item.qty}</li>
 {/each}
@@ -242,7 +262,7 @@ If a *key* expression is provided — which must uniquely identify each list ite
 
 You can freely use destructuring and rest patterns in each blocks.
 
-```html
+```sv
 {#each items as { id, name, qty }, i (id)}
 	<li>{i + 1}: {name} x {qty}</li>
 {/each}
@@ -260,7 +280,7 @@ You can freely use destructuring and rest patterns in each blocks.
 
 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}
@@ -285,7 +305,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>
@@ -302,7 +322,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>
@@ -316,7 +336,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}
@@ -337,7 +357,7 @@ The expression should be valid standalone HTML — `{@html "<div>"}content{@html
 
 > 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}
@@ -360,7 +380,7 @@ The `{@debug ...}` tag offers an alternative to `console.log(...)`. It logs the
 
 It accepts a comma-separated list of variable names (not arbitrary expressions).
 
-```html
+```sv
 <script>
 	let user = {
 		firstname: 'Ada',
@@ -377,7 +397,7 @@ It accepts a comma-separated list of variable names (not arbitrary expressions).
 
 `{@debug ...}` accepts a comma-separated list of variable names (not arbitrary expressions).
 
-```html
+```sv
 <!-- Compiles -->
 {@debug user}
 {@debug user1, user2, user3}
@@ -411,7 +431,7 @@ on:eventname|modifiers={handler}
 
 Use the `on:` directive to listen to DOM events.
 
-```html
+```sv
 <script>
 	let count = 0;
 
@@ -429,7 +449,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>
@@ -439,7 +459,7 @@ Handlers can be declared inline with no performance penalty. As with attributes,
 
 Add *modifiers* to DOM events with the `|` character.
 
-```html
+```sv
 <form on:submit|preventDefault={handleSubmit}>
 	<!-- the `submit` event's default is prevented,
 	     so the page won't reload -->
@@ -453,6 +473,7 @@ The following modifiers are available:
 * `passive` — improves scrolling performance on touch/wheel events (Svelte will add it automatically where it's safe to do so)
 * `capture` — fires the handler during the *capture* phase instead of the *bubbling* phase
 * `once` — remove the handler after the first time it runs
+* `self` — only trigger handler if event.target is the element itself
 
 Modifiers can be chained together, e.g. `on:click|once|capture={...}`.
 
@@ -460,7 +481,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>
@@ -470,7 +491,7 @@ If the `on:` directive is used without a value, the component will *forward* the
 
 It's possible to have multiple event listeners for the same event:
 
-```html
+```sv
 <script>
 	let counter = 0;
 	function increment() {
@@ -497,7 +518,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>
 
@@ -508,7 +529,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>
@@ -518,7 +539,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}>
 ```
@@ -530,7 +551,7 @@ Numeric input values are coerced; even though `input.value` is a string as far a
 
 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>
@@ -542,7 +563,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>
@@ -555,7 +576,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>
@@ -568,7 +589,7 @@ When the value of an `<option>` matches its text content, the attribute can be o
 
 Elements with the `contenteditable` attribute support `innerHTML` and `textContent` bindings.
 
-```html
+```sv
 <div contenteditable="true" bind:innerHTML={html}></div>
 ```
 
@@ -585,16 +606,17 @@ Media elements (`<audio>` and `<video>`) have their own set of bindings — six
 * `seeking` (readonly) — boolean
 * `ended` (readonly) — boolean
 
-...and four *two-way* bindings:
+...and five *two-way* bindings:
 
 * `currentTime` — the current point in the video, in seconds
 * `playbackRate` — how fast to play the video, where 1 is 'normal'
 * `paused` — this one should be self-explanatory
 * `volume` — a value between 0 and 1
+* `muted` — a boolean value where true is muted
 
 Videos additionally have readonly `videoWidth` and `videoHeight` bindings.
 
-```html
+```sv
 <video
 	src={clip}
 	bind:duration
@@ -606,6 +628,7 @@ Videos additionally have readonly `videoWidth` and `videoHeight` bindings.
 	bind:currentTime
 	bind:paused
 	bind:volume
+	bind:muted
 	bind:videoWidth
 	bind:videoHeight
 ></video>
@@ -622,7 +645,7 @@ Block-level elements have 4 readonly bindings, measured using a technique simila
 * `offsetWidth`
 * `offsetHeight`
 
-```html
+```sv
 <div
 	bind:offsetWidth={width}
 	bind:offsetHeight={height}
@@ -641,7 +664,7 @@ bind:group={variable}
 
 Inputs that work together can use `bind:group`.
 
-```html
+```sv
 <script>
 	let tortilla = 'Plain';
 	let fillings = [];
@@ -669,7 +692,7 @@ bind:this={dom_node}
 
 To get a reference to a DOM node, use `bind:this`.
 
-```html
+```sv
 <script>
 	import { onMount } from 'svelte';
 
@@ -698,7 +721,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>
@@ -731,7 +754,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
@@ -753,7 +776,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;
 
@@ -806,11 +829,11 @@ transition = (node: HTMLElement, params: any) => {
 
 A transition is triggered by an element entering or leaving the DOM as a result of a state change.
 
-When a block is transitioning out, elements inside the block are kept in the DOM until all current transitions have completed.
+When a block is transitioning out, all elements inside the block, including those that do not have their own transitions, are kept in the DOM until every transition in the block has completed.
 
 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
@@ -828,7 +851,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
@@ -846,7 +869,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';
 
@@ -877,14 +900,14 @@ 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;
 
 	function typewriter(node, { speed = 50 }) {
 		const valid = (
 			node.childNodes.length === 1 &&
-			node.childNodes[0].nodeType === 3
+			node.childNodes[0].nodeType === Node.TEXT_NODE
 		);
 
 		if (!valid) return {};
@@ -923,7 +946,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 }}"
@@ -941,7 +964,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>
@@ -990,7 +1013,7 @@ Similar to `transition:`, but only applies to elements entering (`in:`) or leavi
 
 Unlike with `transition:`, transitions applied with `in:` and `out:` are not bidirectional — an in transition will continue to 'play' alongside the out transition, rather than reversing, 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
@@ -1039,7 +1062,7 @@ An animation is triggered when the contents of a [keyed each block](docs#each) a
 
 Animations can be used with Svelte's [built-in animation functions](docs#svelte_animate) or [custom animation functions](docs#Custom_animation_functions).
 
-```html
+```sv
 <!-- When `list` is reordered the animation will run-->
 {#each list as item, index (item)}
 	<li animate:flip>{item}</li>
@@ -1054,7 +1077,7 @@ As with actions and transitions, animations can have parameters.
 
 (The double `{{curlies}}` aren't a special syntax; this is an object literal inside an expression tag.)
 
-```html
+```sv
 {#each list as item, index (item)}
 	<li animate:flip="{{ delay: 500 }}">{item}</li>
 {/each}
@@ -1073,7 +1096,7 @@ The `t` argument passed to `css` is a value that goes from `0` and `1` after the
 The function is called repeatedly *before* the animation begins, with different `t` and `u` arguments.
 
 
-```html
+```sv
 <script>
 	import { cubicOut } from 'svelte/easing';
 
@@ -1106,7 +1129,7 @@ A custom animation 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>
 	import { cubicOut } from 'svelte/easing';
 
@@ -1146,7 +1169,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}/>
 ```
 
@@ -1154,7 +1177,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/>
 ```
 
@@ -1169,7 +1192,7 @@ bind:property={variable}
 
 You can bind to component props using the same syntax as for elements.
 
-```html
+```sv
 <Keypad bind:value={pin}/>
 ```
 
@@ -1185,7 +1208,7 @@ Components also support `bind:this`, allowing you to interact with component ins
 
 > Note that we can't do `{cart.empty}` since `cart` is `undefined` when the button is first rendered and throws an error.
 
-```html
+```sv
 <ShoppingCart bind:this={cart}/>
 
 <button on:click={() => cart.empty()}>
@@ -1213,7 +1236,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></Widget>
 
@@ -1235,7 +1258,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>
@@ -1258,7 +1281,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:prop={thing}>
 	<div>{thing.text}</div>
@@ -1278,7 +1301,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.text}</div>
@@ -1306,7 +1329,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>
@@ -1331,7 +1354,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}/>
 ```
 
@@ -1349,7 +1372,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`);
@@ -1373,7 +1396,7 @@ You can also bind to the following properties:
 
 All except `scrollX` and `scrollY` are readonly.
 
-```html
+```sv
 <svelte:window bind:scrollY={y}/>
 ```
 
@@ -1388,7 +1411,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}
@@ -1406,7 +1429,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 is exposed separately to the main `html` content.
 
-```html
+```sv
 <svelte:head>
 	<link rel="stylesheet" href="tutorial/dark-theme.css">
 </svelte:head>
@@ -1430,6 +1453,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 c75ec694d9..460c393e7e 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';
 
@@ -168,7 +168,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';
 
@@ -188,7 +188,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';
 
@@ -202,7 +202,7 @@ Component events created with `createEventDispatcher` create a [CustomEvent](htt
 
 Events dispatched from child components can be listened to in their parent. Any data provided when the event was dispatched is available on the `detail` property of the event object.
 
-```html
+```sv
 <script>
 	function callbackFunction(event) {
 		console.log(`Notify fired! Detail: ${event.detail}`)
@@ -287,7 +287,9 @@ The second argument to `readable` is the same as the second argument to `writabl
 ```js
 import { readable } from 'svelte/store';
 
-const time = readable(new Date(), set => {
+const time = readable(null, set => {
+	set(new Date());
+
 	const interval = setInterval(() => {
 		set(new Date());
 	}, 1000);
@@ -413,7 +415,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';
@@ -452,7 +454,7 @@ $: $size = big ? 100 : 10;
 
 The `interpolate` option allows you to tween between *any* arbitrary values. It must be an `(a, b) => t => value` function, where `a` is the starting value, `b` is the target value, `t` is a number between 0 and 1, and `value` is the result. For example, we can use the [d3-interpolate](https://github.com/d3/d3-interpolate) package to smoothly interpolate between two colours.
 
-```html
+```sv
 <script>
 	import { interpolateLab } from 'd3-interpolate';
 	import { tweened } from 'svelte/motion';
@@ -499,7 +501,7 @@ Both `set` and `update` can take a second argument — an object with `hard` or
 
 [See a full example on the spring tutorial.](tutorial/spring)
 
-```html
+```sv
 <script>
 	import { spring } from 'svelte/motion';
 
@@ -521,7 +523,7 @@ $: $size = big ? 100 : 10;
 
 ### `svelte/transition`
 
-The `svelte/transition` module exports six functions: `fade`, `fly`, `slide`, `scale`, `draw` and `crossfade`. They are for use with svelte [`transitions`](docs#Transitions).
+The `svelte/transition` module exports seven functions: `fade`, `blur`, `fly`, `slide`, `scale`, `draw` and `crossfade`. They are for use with Svelte [`transitions`](docs#transition_fn).
 
 #### `fade`
 
@@ -546,7 +548,7 @@ Animates the opacity of an element from 0 to the current opacity for `in` transi
 
 You can see the `fade` transition in action in the [transition tutorial](tutorial/transition).
 
-```html
+```sv
 <script>
 	import { fade } from 'svelte/transition';
 </script>
@@ -582,7 +584,7 @@ Animates a `blur` filter alongside an element's opacity.
 * `opacity` (`number`, default 0) - the opacity value to animate out to and in from
 * `amount` (`number`, default 5) - the size of the blur in pixels
 
-```html
+```sv
 <script>
 	import { blur } from 'svelte/transition';
 </script>
@@ -621,7 +623,7 @@ Animates the x and y positions and the opacity of an element. `in` transitions a
 
 You can see the `fly` transition in action in the [transition tutorial](tutorial/adding-parameters-to-transitions).
 
-```html
+```sv
 <script>
 	import { fly } from 'svelte/transition';
 	import { quintOut } from 'svelte/easing';
@@ -656,7 +658,7 @@ Slides an element in and out.
 * `duration` (`number`, default 400) — milliseconds the transition lasts
 * `easing` (`function`, default `cubicOut`) — an [easing function](docs#svelte_easing)
 
-```html
+```sv
 <script>
 	import { slide } from 'svelte/transition';
 	import { quintOut } from 'svelte/easing';
@@ -693,7 +695,7 @@ Animates the opacity and scale of an element. `in` transitions animate from an e
 * `start` (`number`, default 0) - the scale value to animate out to and in from
 * `opacity` (`number`, default 0) - the opacity value to animate out to and in from
 
-```html
+```sv
 <script>
 	import { scale } from 'svelte/transition';
 	import { quintOut } from 'svelte/easing';
@@ -731,7 +733,7 @@ Animates the stroke of an SVG element, like a snake in a tube. `in` transitions
 
 The `speed` parameter is a means of setting the duration of the transition relative to the path's length. It is modifier that is applied to the length of the path: `duration = length / speed`. A path that is 1000 pixels with a speed of 1 will have a duration of `1000ms`, setting the speed to `0.5` will double that duration and setting it to `2` will halve it.
 
-```html
+```sv
 <script>
 	import { draw } from 'svelte/transition';
 	import { quintOut } from 'svelte/easing';
@@ -758,7 +760,7 @@ The `speed` parameter is a means of setting the duration of the transition relat
 
 ### `svelte/animate`
 
-The `svelte/animate` module exports one function for use with svelte [animations](docs#Animations).
+The `svelte/animate` module exports one function for use with Svelte [animations](docs#animate_fn).
 
 #### `flip`
 
@@ -785,7 +787,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';
@@ -804,7 +806,7 @@ You can see a full example on the [animations tutorial](tutorial/animate)
 
 ### `svelte/easing`
 
-Easing functions specificy the rate of change over time and are useful when working with Svelte's built-in transitions and animations as well as the tweened and spring utilities. `svelte/easing` contains 31 named exports, a `linear` ease and 3 variants of 10 different easing functions: `in`, `out` and `inOut`.
+Easing functions specify the rate of change over time and are useful when working with Svelte's built-in transitions and animations as well as the tweened and spring utilities. `svelte/easing` contains 31 named exports, a `linear` ease and 3 variants of 10 different easing functions: `in`, `out` and `inOut`.
 
 You can explore the various eases using the [ease visualiser](examples#easing) in the [examples section](examples).
 
@@ -973,8 +975,8 @@ app.count += 1;
 
 Svelte components can also be compiled to custom elements (aka web components) using the `customElement: true` compiler option. You should specify a tag name for the component using the `<svelte:options>` [element](docs#svelte_options).
 
-```html
-<svelte:options tag="my-element">
+```sv
+<svelte:options tag="my-element" />
 
 <script>
 	export let name = 'world';
diff --git a/site/content/docs/04-compile-time.md b/site/content/docs/04-compile-time.md
index f9bfa772fe..9fa0f92195 100644
--- a/site/content/docs/04-compile-time.md
+++ b/site/content/docs/04-compile-time.md
@@ -183,6 +183,10 @@ const ast = svelte.parse(source, { filename: 'App.svelte' });
 
 ### `svelte.preprocess`
 
+A number of [community-maintained preprocessing plugins](https://github.com/sveltejs/integrations#preprocessors) are available to allow you to use Svelte with tools like TypeScript, PostCSS, SCSS, and Less.
+
+You can write your own preprocessor using the `svelte.preprocess` API.
+
 ```js
 result: {
 	code: string,
diff --git a/site/content/examples/03-logic/04-keyed-each-blocks/App.svelte b/site/content/examples/03-logic/04-keyed-each-blocks/App.svelte
index cd12eed954..2868f90536 100644
--- a/site/content/examples/03-logic/04-keyed-each-blocks/App.svelte
+++ b/site/content/examples/03-logic/04-keyed-each-blocks/App.svelte
@@ -18,7 +18,7 @@
 	Remove first thing
 </button>
 
-<div style="display: grid; grid-template-columns: 1fr 1fr; grip-gap: 1em">
+<div style="display: grid; grid-template-columns: 1fr 1fr; grid-gap: 1em">
 	<div>
 		<h2>Keyed</h2>
 		{#each things as thing (thing.id)}
@@ -32,4 +32,4 @@
 			<Thing current={thing.color}/>
 		{/each}
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/site/content/examples/05-bindings/08-media-elements/App.svelte b/site/content/examples/05-bindings/08-media-elements/App.svelte
index 469e9e12eb..7a071dbe49 100644
--- a/site/content/examples/05-bindings/08-media-elements/App.svelte
+++ b/site/content/examples/05-bindings/08-media-elements/App.svelte
@@ -109,8 +109,8 @@
 
 <div>
 	<video
-		poster="http://sveltejs.github.io/assets/caminandes-llamigos.jpg"
-		src="http://sveltejs.github.io/assets/caminandes-llamigos.mp4"
+		poster="https://sveltejs.github.io/assets/caminandes-llamigos.jpg"
+		src="https://sveltejs.github.io/assets/caminandes-llamigos.mp4"
 		on:mousemove={handleMousemove}
 		on:mousedown={handleMousedown}
 		bind:currentTime={time}
diff --git a/site/content/examples/06-lifecycle/02-update/App.svelte b/site/content/examples/06-lifecycle/02-update/App.svelte
index 3eb2dceb52..419e763c57 100644
--- a/site/content/examples/06-lifecycle/02-update/App.svelte
+++ b/site/content/examples/06-lifecycle/02-update/App.svelte
@@ -20,7 +20,7 @@
 	];
 
 	function handleKeydown(event) {
-		if (event.which === 13) {
+		if (event.key === 'Enter') {
 			const text = event.target.value;
 			if (!text) return;
 
@@ -103,4 +103,4 @@
 	</div>
 
 	<input on:keydown={handleKeydown}>
-</div>
\ No newline at end of file
+</div>
diff --git a/site/content/examples/06-lifecycle/03-tick/App.svelte b/site/content/examples/06-lifecycle/03-tick/App.svelte
index c9cb6de420..477b5ffb79 100644
--- a/site/content/examples/06-lifecycle/03-tick/App.svelte
+++ b/site/content/examples/06-lifecycle/03-tick/App.svelte
@@ -4,7 +4,7 @@
 	let text = `Select some text and hit the tab key to toggle uppercase`;
 
 	async function handleKeydown(event) {
-		if (event.which !== 9) return;
+		if (event.key !== 'Tab') return;
 
 		event.preventDefault();
 
@@ -34,4 +34,4 @@
 	}
 </style>
 
-<textarea value={text} on:keydown={handleKeydown}></textarea>
\ No newline at end of file
+<textarea value={text} on:keydown={handleKeydown}></textarea>
diff --git a/site/content/examples/09-transitions/04-custom-js-transitions/App.svelte b/site/content/examples/09-transitions/04-custom-js-transitions/App.svelte
index 3b3fb94d1c..396c793639 100644
--- a/site/content/examples/09-transitions/04-custom-js-transitions/App.svelte
+++ b/site/content/examples/09-transitions/04-custom-js-transitions/App.svelte
@@ -4,7 +4,7 @@
 	function typewriter(node, { speed = 50 }) {
 		const valid = (
 			node.childNodes.length === 1 &&
-			node.childNodes[0].nodeType === 3
+			node.childNodes[0].nodeType === Node.TEXT_NODE
 		);
 
 		if (!valid) {
@@ -33,4 +33,4 @@
 	<p in:typewriter>
 		The quick brown fox jumps over the lazy dog
 	</p>
-{/if}
\ No newline at end of file
+{/if}
diff --git a/site/content/examples/10-animations/00-animate/App.svelte b/site/content/examples/10-animations/00-animate/App.svelte
index 279821491b..a90d0ecfb5 100644
--- a/site/content/examples/10-animations/00-animate/App.svelte
+++ b/site/content/examples/10-animations/00-animate/App.svelte
@@ -112,7 +112,7 @@
 	<input
 		class="new-todo"
 		placeholder="what needs to be done?"
-		on:keydown="{event => event.which === 13 && add(event.target)}"
+		on:keydown="{event => event.key === 'Enter' && add(event.target)}"
 	>
 
 	<div class='left'>
diff --git a/site/content/examples/21-miscellaneous/01-hacker-news/Item.svelte b/site/content/examples/21-miscellaneous/01-hacker-news/Item.svelte
index e9cd617e96..608d04e497 100644
--- a/site/content/examples/21-miscellaneous/01-hacker-news/Item.svelte
+++ b/site/content/examples/21-miscellaneous/01-hacker-news/Item.svelte
@@ -3,6 +3,8 @@
 
 	export let item;
 	export let returnTo;
+
+	$: url = !item.domain ? `https://news.ycombinator.com/${item.url}` : item.url;
 </script>
 
 <style>
@@ -24,9 +26,11 @@
 <a href={returnTo}>&laquo; back</a>
 
 <article>
-	<a href="{item.url}">
+	<a href="{url}">
 		<h1>{item.title}</h1>
-		<small>{item.domain}</small>
+		{#if item.domain}
+			<small>{item.domain}</small>
+		{/if}
 	</a>
 
 	<p class="meta">submitted by {item.user} {item.time_ago}
@@ -36,4 +40,4 @@
 	{#each item.comments as comment}
 		<Comment {comment}/>
 	{/each}
-</div>
\ No newline at end of file
+</div>
diff --git a/site/content/examples/21-miscellaneous/01-hacker-news/Summary.svelte b/site/content/examples/21-miscellaneous/01-hacker-news/Summary.svelte
index 0ff25964f7..311d01c24e 100644
--- a/site/content/examples/21-miscellaneous/01-hacker-news/Summary.svelte
+++ b/site/content/examples/21-miscellaneous/01-hacker-news/Summary.svelte
@@ -7,6 +7,8 @@
 		const c = item.comments_count;
 		return `${c} ${c === 1 ? 'comment' : 'comments'}`;
 	}
+
+	$: url = item.type === "ask" ? `https://news.ycombinator.com/${item.url}` : item.url;
 </script>
 
 <style>
@@ -33,6 +35,6 @@
 
 <article>
 	<span>{i + offset + 1}</span>
-	<h2><a target="_blank" href={item.url}>{item.title}</a></h2>
+	<h2><a target="_blank" href={url}>{item.title}</a></h2>
 	<p class="meta"><a href="#/item/{item.id}">{comment_text()}</a> by {item.user} {item.time_ago}</p>
-</article>
\ No newline at end of file
+</article>
diff --git a/site/content/faq/100-im-new-to-svelte.md b/site/content/faq/100-im-new-to-svelte.md
new file mode 100644
index 0000000000..18e4b6742f
--- /dev/null
+++ b/site/content/faq/100-im-new-to-svelte.md
@@ -0,0 +1,7 @@
+---
+question: I'm new to Svelte. Where should I start?
+---
+
+We think the best way to get started is playing through the interactive [Tutorial](https://svelte.dev/tutorial). Each step there is mainly focused on one specific aspect and is easy to follow. You'll be editing and running real Svelte components right in your browser.
+
+Five to ten minutes should be enough to get you up and running. An hour and a half should get you through the entire tutorial.
\ No newline at end of file
diff --git a/site/content/faq/1000-how-can-i-update-my-v2-components.md b/site/content/faq/1000-how-can-i-update-my-v2-components.md
new file mode 100644
index 0000000000..0800dff89b
--- /dev/null
+++ b/site/content/faq/1000-how-can-i-update-my-v2-components.md
@@ -0,0 +1,5 @@
+---
+question: How can I update my components written in Svelte v2?
+---
+
+svelte-upgrade isn't fully working for v2->v3 yet, [but it's close](https://github.com/sveltejs/svelte-upgrade/pull/12).
\ No newline at end of file
diff --git a/site/content/faq/1100-is-svelte-v2-still-availabile.md b/site/content/faq/1100-is-svelte-v2-still-availabile.md
new file mode 100644
index 0000000000..0fbc4c039c
--- /dev/null
+++ b/site/content/faq/1100-is-svelte-v2-still-availabile.md
@@ -0,0 +1,7 @@
+---
+question: Is Svelte v2 still available?
+---
+
+New features aren't being added to it, and bugs will probably only be fixed if they are extremely nasty or present some sort of security vulnerability.
+
+The documentation is still available [here](https://v2.svelte.dev/guide).
\ No newline at end of file
diff --git a/site/content/faq/1200-how-do-i-do-hmr.md b/site/content/faq/1200-how-do-i-do-hmr.md
new file mode 100644
index 0000000000..88d08b252f
--- /dev/null
+++ b/site/content/faq/1200-how-do-i-do-hmr.md
@@ -0,0 +1,5 @@
+---
+question: How do I do hot module reloading?
+---
+
+Use the community plugins for [rollup](https://github.com/rixo/rollup-plugin-svelte-hot) and [webpack](https://github.com/rixo/svelte-loader-hot).
diff --git a/site/content/faq/200-are-there-any-video-courses.md b/site/content/faq/200-are-there-any-video-courses.md
new file mode 100644
index 0000000000..0c2c1f680e
--- /dev/null
+++ b/site/content/faq/200-are-there-any-video-courses.md
@@ -0,0 +1,10 @@
+---
+question: Are there any video courses?
+---
+
+There are no official ones, but here are a couple of third-part ones that we know of.
+
+- [Egghead](https://egghead.io/playlists/getting-started-with-svelte-3-05a8541a)
+- [Udemy](https://www.udemy.com/sveltejs-the-complete-guide/)
+
+Note that Udemy very frequently has discounts over 90%.
diff --git a/site/content/faq/400-how-can-i-get-syntax-highlighting.md b/site/content/faq/400-how-can-i-get-syntax-highlighting.md
new file mode 100644
index 0000000000..90f10b254f
--- /dev/null
+++ b/site/content/faq/400-how-can-i-get-syntax-highlighting.md
@@ -0,0 +1,5 @@
+---
+question: How can I get VSCode to syntax-highlight my .svelte files?
+---
+
+There is an [official VSCode extension for Svelte](https://marketplace.visualstudio.com/items?itemName=svelte.svelte-vscode), however it is still in the **beta** testing stage, and not all issues have been ironed out.
\ No newline at end of file
diff --git a/site/content/faq/500-what-about-typescript-support.md b/site/content/faq/500-what-about-typescript-support.md
new file mode 100644
index 0000000000..0088533ca3
--- /dev/null
+++ b/site/content/faq/500-what-about-typescript-support.md
@@ -0,0 +1,5 @@
+---
+question: What about Typescript support?
+---
+
+You need to install a [community supported preprocessor](https://github.com/sveltejs/integrations#preprocessors) such as [svelte-preprocess](https://github.com/kaisermann/svelte-preprocess). Work is ongoing to improve [IDE support](https://github.com/sveltejs/language-tools/issues/83). You can also run type checking from command line with [svelte-check](https://www.npmjs.com/package/svelte-check).
diff --git a/site/content/faq/600-does-svelte-scale.md b/site/content/faq/600-does-svelte-scale.md
new file mode 100644
index 0000000000..06c9b58a97
--- /dev/null
+++ b/site/content/faq/600-does-svelte-scale.md
@@ -0,0 +1,5 @@
+---
+question: Does Svelte scale?
+---
+
+There will be a blog post about this eventually, but in the meantime, check out [this issue](https://github.com/sveltejs/svelte/issues/2546).
diff --git a/site/content/faq/700-is-there-a-component-library.md b/site/content/faq/700-is-there-a-component-library.md
new file mode 100644
index 0000000000..fd771eabda
--- /dev/null
+++ b/site/content/faq/700-is-there-a-component-library.md
@@ -0,0 +1,5 @@
+---
+question: Is there a UI component library?
+---
+
+There are several UI component libraries. Find them under the [code section](https://svelte-community.netlify.com/code) of the Svelte Community website.
diff --git a/site/content/faq/800-how-do-i-test-svelte-apps.md b/site/content/faq/800-how-do-i-test-svelte-apps.md
new file mode 100644
index 0000000000..af67bebf3f
--- /dev/null
+++ b/site/content/faq/800-how-do-i-test-svelte-apps.md
@@ -0,0 +1,6 @@
+---
+question: How do I test Svelte apps?
+---
+
+We don't have a good answer to this yet, but it is a priority. There are a few approaches that people take when testing, but it generally involves compiling the component and mounting it to something and then performing the tests.
+You essentially need to create a bundle for each component you're testing (since svelte is a compiler and not a normal library) and then mount them. You can mount to a JSDOM instance, or you can use Puppeteer if you need a real browser, or you can use a tool like Cypress. There is an example of this in the Sapper starter template.
diff --git a/site/content/faq/900-is-there-a-router.md b/site/content/faq/900-is-there-a-router.md
new file mode 100644
index 0000000000..a78c478943
--- /dev/null
+++ b/site/content/faq/900-is-there-a-router.md
@@ -0,0 +1,13 @@
+---
+question: Is there a router?
+---
+
+You can use any router lib you want. A lot of people use [page.js](https://github.com/visionmedia/page.js). There's also [navaid](https://github.com/lukeed/navaid), which is very similar.
+
+If you prefer a declarative HTML approach, there's [svelte-routing](https://github.com/EmilTholin/svelte-routing).
+
+If you need hash-based routing on the client side, check out [svelte-spa-router](https://github.com/ItalyPaleAle/svelte-spa-router), or [abstract-state-router](https://github.com/TehShrike/abstract-state-router/), a mature router for business software.
+
+For filesystem-based routing, you can take a look at [Routify](https://routify.dev).
+
+For an official solution, there's nothing that's simply a routing library. There is, however, the official [Sapper](https://sapper.svelte.dev/) framework, a Next.js-style application framework built on Svelte, which includes its own filesystem-based routing.
\ No newline at end of file
diff --git a/site/content/tutorial/01-introduction/05-nested-components/text.md b/site/content/tutorial/01-introduction/05-nested-components/text.md
index f1406f93db..078413cc92 100644
--- a/site/content/tutorial/01-introduction/05-nested-components/text.md
+++ b/site/content/tutorial/01-introduction/05-nested-components/text.md
@@ -19,4 +19,6 @@ Add a `<script>` tag that imports `Nested.svelte`...
 <Nested/>
 ```
 
-Notice that even though `Nested.svelte` has a `<p>` element, the styles from `App.svelte` don't leak in.
\ No newline at end of file
+Notice that even though `Nested.svelte` has a `<p>` element, the styles from `App.svelte` don't leak in.
+
+Also notice that the component name `Nested` is capitalised. This convention has been adopted to allow us to differentiate between user-defined components and regular HTML tags.
diff --git a/site/content/tutorial/03-props/02-default-values/text.md b/site/content/tutorial/03-props/02-default-values/text.md
index 1532407380..17b486d0ad 100644
--- a/site/content/tutorial/03-props/02-default-values/text.md
+++ b/site/content/tutorial/03-props/02-default-values/text.md
@@ -2,7 +2,7 @@
 title: Default values
 ---
 
-We can easily specify default values for props:
+We can easily specify default values for props in `Nested.svelte`:
 
 ```html
 <script>
diff --git a/site/content/tutorial/06-bindings/10-media-elements/text.md b/site/content/tutorial/06-bindings/10-media-elements/text.md
index f08f3975d7..0a854f19e9 100644
--- a/site/content/tutorial/06-bindings/10-media-elements/text.md
+++ b/site/content/tutorial/06-bindings/10-media-elements/text.md
@@ -33,11 +33,12 @@ The complete set of bindings for `<audio>` and `<video>` is as follows — six *
 * `seeking` (readonly) — boolean
 * `ended` (readonly) — boolean
 
-...and four *two-way* bindings:
+...and five *two-way* bindings:
 
 * `currentTime` — the current point in the video, in seconds
 * `playbackRate` — how fast to play the video, where `1` is 'normal'
 * `paused` — this one should be self-explanatory
 * `volume` — a value between 0 and 1
+* `muted` — a boolean value where true is muted
 
 Videos additionally have readonly `videoWidth` and `videoHeight` bindings.
\ No newline at end of file
diff --git a/site/content/tutorial/07-lifecycle/03-update/app-a/App.svelte b/site/content/tutorial/07-lifecycle/03-update/app-a/App.svelte
index d8c4caabef..a009b2cc1f 100644
--- a/site/content/tutorial/07-lifecycle/03-update/app-a/App.svelte
+++ b/site/content/tutorial/07-lifecycle/03-update/app-a/App.svelte
@@ -20,7 +20,7 @@
 	];
 
 	function handleKeydown(event) {
-		if (event.which === 13) {
+		if (event.key === 'Enter') {
 			const text = event.target.value;
 			if (!text) return;
 
@@ -104,4 +104,4 @@
 	</div>
 
 	<input on:keydown={handleKeydown}>
-</div>
\ No newline at end of file
+</div>
diff --git a/site/content/tutorial/07-lifecycle/03-update/app-b/App.svelte b/site/content/tutorial/07-lifecycle/03-update/app-b/App.svelte
index bdf42e28a9..97caca99d5 100644
--- a/site/content/tutorial/07-lifecycle/03-update/app-b/App.svelte
+++ b/site/content/tutorial/07-lifecycle/03-update/app-b/App.svelte
@@ -20,7 +20,7 @@
 	];
 
 	function handleKeydown(event) {
-		if (event.which === 13) {
+		if (event.key === 'Enter') {
 			const text = event.target.value;
 			if (!text) return;
 
@@ -104,4 +104,4 @@
 	</div>
 
 	<input on:keydown={handleKeydown}>
-</div>
\ No newline at end of file
+</div>
diff --git a/site/content/tutorial/07-lifecycle/04-tick/app-a/App.svelte b/site/content/tutorial/07-lifecycle/04-tick/app-a/App.svelte
index 3386ff93df..97edefa935 100644
--- a/site/content/tutorial/07-lifecycle/04-tick/app-a/App.svelte
+++ b/site/content/tutorial/07-lifecycle/04-tick/app-a/App.svelte
@@ -2,7 +2,7 @@
 	let text = `Select some text and hit the tab key to toggle uppercase`;
 
 	async function handleKeydown(event) {
-		if (event.which !== 9) return;
+		if (event.key !== 'Tab') return;
 
 		event.preventDefault();
 
@@ -32,4 +32,4 @@
 	}
 </style>
 
-<textarea value={text} on:keydown={handleKeydown}></textarea>
\ No newline at end of file
+<textarea value={text} on:keydown={handleKeydown}></textarea>
diff --git a/site/content/tutorial/07-lifecycle/04-tick/app-b/App.svelte b/site/content/tutorial/07-lifecycle/04-tick/app-b/App.svelte
index c9cb6de420..477b5ffb79 100644
--- a/site/content/tutorial/07-lifecycle/04-tick/app-b/App.svelte
+++ b/site/content/tutorial/07-lifecycle/04-tick/app-b/App.svelte
@@ -4,7 +4,7 @@
 	let text = `Select some text and hit the tab key to toggle uppercase`;
 
 	async function handleKeydown(event) {
-		if (event.which !== 9) return;
+		if (event.key !== 'Tab') return;
 
 		event.preventDefault();
 
@@ -34,4 +34,4 @@
 	}
 </style>
 
-<textarea value={text} on:keydown={handleKeydown}></textarea>
\ No newline at end of file
+<textarea value={text} on:keydown={handleKeydown}></textarea>
diff --git a/site/content/tutorial/07-lifecycle/04-tick/text.md b/site/content/tutorial/07-lifecycle/04-tick/text.md
index b58b024ad6..8f5603a361 100644
--- a/site/content/tutorial/07-lifecycle/04-tick/text.md
+++ b/site/content/tutorial/07-lifecycle/04-tick/text.md
@@ -4,7 +4,7 @@ title: tick
 
 The `tick` function is unlike other lifecycle functions in that you can call it any time, not just when the component first initialises. It returns a promise that resolves as soon as any pending state changes have been applied to the DOM (or immediately, if there are no pending state changes).
 
-When you invalidate component state in Svelte, it doesn't update the DOM immediately. Instead, it waits until the next *microtask* to see if there are any other changes that need to be applied, including in other components. Doing so avoids unnecessary work and allows the browser to batch things more effectively.
+When you update component state in Svelte, it doesn't update the DOM immediately. Instead, it waits until the next *microtask* to see if there are any other changes that need to be applied, including in other components. Doing so avoids unnecessary work and allows the browser to batch things more effectively.
 
 You can see that behaviour in this example. Select a range of text and hit the tab key. Because the `<textarea>` value changes, the current selection is cleared and the cursor jumps, annoyingly, to the end. We can fix this by importing `tick`...
 
diff --git a/site/content/tutorial/10-transitions/05-custom-js-transitions/app-b/App.svelte b/site/content/tutorial/10-transitions/05-custom-js-transitions/app-b/App.svelte
index 3b3fb94d1c..396c793639 100644
--- a/site/content/tutorial/10-transitions/05-custom-js-transitions/app-b/App.svelte
+++ b/site/content/tutorial/10-transitions/05-custom-js-transitions/app-b/App.svelte
@@ -4,7 +4,7 @@
 	function typewriter(node, { speed = 50 }) {
 		const valid = (
 			node.childNodes.length === 1 &&
-			node.childNodes[0].nodeType === 3
+			node.childNodes[0].nodeType === Node.TEXT_NODE
 		);
 
 		if (!valid) {
@@ -33,4 +33,4 @@
 	<p in:typewriter>
 		The quick brown fox jumps over the lazy dog
 	</p>
-{/if}
\ No newline at end of file
+{/if}
diff --git a/site/content/tutorial/10-transitions/05-custom-js-transitions/text.md b/site/content/tutorial/10-transitions/05-custom-js-transitions/text.md
index da775bbeb3..cc25861c7b 100644
--- a/site/content/tutorial/10-transitions/05-custom-js-transitions/text.md
+++ b/site/content/tutorial/10-transitions/05-custom-js-transitions/text.md
@@ -8,7 +8,7 @@ While you should generally use CSS for transitions as much as possible, there ar
 function typewriter(node, { speed = 50 }) {
 	const valid = (
 		node.childNodes.length === 1 &&
-		node.childNodes[0].nodeType === 3
+		node.childNodes[0].nodeType === Node.TEXT_NODE
 	);
 
 	if (!valid) {
@@ -26,4 +26,4 @@ function typewriter(node, { speed = 50 }) {
 		}
 	};
 }
-```
\ No newline at end of file
+```
diff --git a/site/content/tutorial/10-transitions/08-deferred-transitions/app-a/App.svelte b/site/content/tutorial/10-transitions/08-deferred-transitions/app-a/App.svelte
index e869816730..f05c581390 100644
--- a/site/content/tutorial/10-transitions/08-deferred-transitions/app-a/App.svelte
+++ b/site/content/tutorial/10-transitions/08-deferred-transitions/app-a/App.svelte
@@ -56,7 +56,7 @@
 <div class='board'>
 	<input
 		placeholder="what needs to be done?"
-		on:keydown={e => e.which === 13 && add(e.target)}
+		on:keydown={e => e.key === 'Enter' && add(e.target)}
 	>
 
 	<div class='left'>
@@ -145,4 +145,4 @@
 	label:hover button {
 		opacity: 1;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/site/content/tutorial/10-transitions/08-deferred-transitions/app-b/App.svelte b/site/content/tutorial/10-transitions/08-deferred-transitions/app-b/App.svelte
index 3cb21a8ed9..b7447ca7de 100644
--- a/site/content/tutorial/10-transitions/08-deferred-transitions/app-b/App.svelte
+++ b/site/content/tutorial/10-transitions/08-deferred-transitions/app-b/App.svelte
@@ -56,7 +56,7 @@
 <div class='board'>
 	<input
 		placeholder="what needs to be done?"
-		on:keydown={e => e.which === 13 && add(e.target)}
+		on:keydown={e => e.key === 'Enter' && add(e.target)}
 	>
 
 	<div class='left'>
@@ -152,4 +152,4 @@
 	label:hover button {
 		opacity: 1;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/site/content/tutorial/11-animations/01-animate/app-a/App.svelte b/site/content/tutorial/11-animations/01-animate/app-a/App.svelte
index 3cb21a8ed9..b7447ca7de 100644
--- a/site/content/tutorial/11-animations/01-animate/app-a/App.svelte
+++ b/site/content/tutorial/11-animations/01-animate/app-a/App.svelte
@@ -56,7 +56,7 @@
 <div class='board'>
 	<input
 		placeholder="what needs to be done?"
-		on:keydown={e => e.which === 13 && add(e.target)}
+		on:keydown={e => e.key === 'Enter' && add(e.target)}
 	>
 
 	<div class='left'>
@@ -152,4 +152,4 @@
 	label:hover button {
 		opacity: 1;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/site/content/tutorial/11-animations/01-animate/app-b/App.svelte b/site/content/tutorial/11-animations/01-animate/app-b/App.svelte
index 6194dd941e..0d232bf02b 100644
--- a/site/content/tutorial/11-animations/01-animate/app-b/App.svelte
+++ b/site/content/tutorial/11-animations/01-animate/app-b/App.svelte
@@ -57,7 +57,7 @@
 <div class='board'>
 	<input
 		placeholder="what needs to be done?"
-		on:keydown={e => e.which === 13 && add(e.target)}
+		on:keydown={e => e.key === 'Enter' && add(e.target)}
 	>
 
 	<div class='left'>
@@ -155,4 +155,4 @@
 	label:hover button {
 		opacity: 1;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/site/package-lock.json b/site/package-lock.json
index 646ca0ce53..33dfa629a1 100644
--- a/site/package-lock.json
+++ b/site/package-lock.json
@@ -1281,9 +1281,9 @@
       }
     },
     "@sveltejs/site-kit": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/@sveltejs/site-kit/-/site-kit-1.1.4.tgz",
-      "integrity": "sha512-PsFUX1C/fhV0ODdCJaEQ8OwzgmaPJVmdefiSYA+i6zttBeV19d/ow+l7SPMXxBkux+vUIl5can4BwValCukCsw==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/@sveltejs/site-kit/-/site-kit-1.1.5.tgz",
+      "integrity": "sha512-Rs2quQ/H00DAN/ZTFa+unLefL335UW3Yo4I2rTocW5JwW73Kvi5++d7BcY8LsjhMCbG1PkwQmJE2RVrIIxQcOw==",
       "dev": true,
       "requires": {
         "@sindresorhus/slugify": "^0.9.1",
@@ -1291,13 +1291,14 @@
       }
     },
     "@sveltejs/svelte-repl": {
-      "version": "0.1.17",
-      "resolved": "https://registry.npmjs.org/@sveltejs/svelte-repl/-/svelte-repl-0.1.17.tgz",
-      "integrity": "sha512-rM0DC+pZnqwH6PiuxXUmFRwYZ9XNkexxTNt+prR91Qs7ssxGgf0QkH6kGivSNLbrOtOvcgJbt1nUDybWra5HKA==",
+      "version": "0.1.19",
+      "resolved": "https://registry.npmjs.org/@sveltejs/svelte-repl/-/svelte-repl-0.1.19.tgz",
+      "integrity": "sha512-35R94X6uYgy6PHLQnQCsKcZ4zb6rGGQXjBYqjuCkoCykIlSLx8/avq6BGqudmE5pzVWDP3kk4063cHgccy1xYg==",
       "dev": true,
       "requires": {
         "codemirror": "^5.49.2",
         "estree-walker": "^0.9.0",
+        "marked": "^0.8.2",
         "sourcemap-codec": "^1.4.6",
         "svelte-json-tree": "0.0.5",
         "yootils": "0.0.16"
@@ -1309,10 +1310,16 @@
           "integrity": "sha512-12U47o7XHUX329+x3FzNVjCx3SHEzMF0nkDv7r/HnBzX/xNTKxajBk6gyygaxrAFtLj39219oMfbtxv4KpaOiA==",
           "dev": true
         },
+        "marked": {
+          "version": "0.8.2",
+          "resolved": "https://registry.npmjs.org/marked/-/marked-0.8.2.tgz",
+          "integrity": "sha512-EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw==",
+          "dev": true
+        },
         "sourcemap-codec": {
-          "version": "1.4.6",
-          "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.6.tgz",
-          "integrity": "sha512-1ZooVLYFxC448piVLBbtOxFcXwnymH9oUF8nRd3CuYDVvkRBxRl6pB4Mtas5a4drtL+E8LDgFkQNcgIw6tc8Hg==",
+          "version": "1.4.8",
+          "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+          "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
           "dev": true
         }
       }
@@ -1358,9 +1365,9 @@
       }
     },
     "acorn": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.0.0.tgz",
-      "integrity": "sha512-PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz",
+      "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==",
       "dev": true
     },
     "ansi-colors": {
@@ -1594,9 +1601,9 @@
       "dev": true
     },
     "codemirror": {
-      "version": "5.49.2",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.49.2.tgz",
-      "integrity": "sha512-dwJ2HRPHm8w51WB5YTF9J7m6Z5dtkqbU9ntMZ1dqXyFB9IpjoUFDj80ahRVEoVanfIp6pfASJbOlbWdEf8FOzQ==",
+      "version": "5.53.2",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.53.2.tgz",
+      "integrity": "sha512-wvSQKS4E+P8Fxn/AQ+tQtJnF1qH5UOlxtugFLpubEZ5jcdH2iXTVinb+Xc/4QjshuOxRm4fUsU2QPF1JJKiyXA==",
       "dev": true
     },
     "color-convert": {
@@ -3157,6 +3164,11 @@
         "xtend": "^4.0.0"
       }
     },
+    "prism-svelte": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/prism-svelte/-/prism-svelte-0.4.3.tgz",
+      "integrity": "sha512-plS7uY0WWiTBwWZs9KM3M88ZxHWKbrbMUDf52CPum6BqAxiLmKROmaTnmhXtv0krQ0l0HRLcFS8JDwOFyPt/OQ=="
+    },
     "prismjs": {
       "version": "1.17.1",
       "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.17.1.tgz",
@@ -3483,9 +3495,9 @@
       }
     },
     "sapper": {
-      "version": "0.27.8",
-      "resolved": "https://registry.npmjs.org/sapper/-/sapper-0.27.8.tgz",
-      "integrity": "sha512-78K+56yu9nGOEU0B0XjBvNchRuPEv4aHbAKK4D874S4aoapMAkHCT0bHtPK12S3P7JPxvvT8GzHaq/8NetMmbg==",
+      "version": "0.27.11",
+      "resolved": "https://registry.npmjs.org/sapper/-/sapper-0.27.11.tgz",
+      "integrity": "sha512-5EaPZhlc8OnyN3UCI6dRSM1Gz5sxyzLZG/1z5nMvZhg9Ng+rSvEvJx/rW/tSHcnQPa8or7+YcbfvQHKS5oPHiw==",
       "dev": true,
       "requires": {
         "html-minifier": "^4.0.0",
diff --git a/site/package.json b/site/package.json
index a94d264217..ffcf2b9473 100644
--- a/site/package.json
+++ b/site/package.json
@@ -24,6 +24,7 @@
     "marked": "^0.7.0",
     "pg": "^7.12.1",
     "polka": "^1.0.0-next.9",
+    "prism-svelte": "^0.4.3",
     "prismjs": "^1.17.1",
     "sirv": "^1.0.0-next.2",
     "yootils": "0.0.16"
@@ -35,8 +36,8 @@
     "@babel/preset-env": "^7.6.0",
     "@babel/runtime": "^7.6.0",
     "@sindresorhus/slugify": "^0.9.1",
-    "@sveltejs/site-kit": "^1.1.4",
-    "@sveltejs/svelte-repl": "^0.1.17",
+    "@sveltejs/site-kit": "^1.1.5",
+    "@sveltejs/svelte-repl": "^0.1.19",
     "degit": "^2.1.4",
     "dotenv": "^8.1.0",
     "esm": "^3.2.25",
@@ -53,7 +54,7 @@
     "rollup-plugin-replace": "^2.2.0",
     "rollup-plugin-svelte": "^5.1.0",
     "rollup-plugin-terser": "^5.1.1",
-    "sapper": "^0.27.8",
+    "sapper": "^0.27.11",
     "shelljs": "^0.8.3",
     "svelte": "^3.12.0"
   },
diff --git a/site/scripts/get-example-thumbnails/index.js b/site/scripts/get-example-thumbnails/index.js
index e5b977c6d4..770fca852f 100644
--- a/site/scripts/get-example-thumbnails/index.js
+++ b/site/scripts/get-example-thumbnails/index.js
@@ -45,7 +45,7 @@ async function main() {
 			image.autocrop();
 			// image.scale(0.25);
 
-			if (image.bitmap.width > 200 || image.bitmap.width > 200) {
+			if (image.bitmap.width > 200 || image.bitmap.height > 200) {
 				const scale = Math.min(
 					200 / image.bitmap.width,
 					200 / image.bitmap.height
diff --git a/site/src/routes/_layout.svelte b/site/src/routes/_layout.svelte
index 55f4861880..9c1601094a 100644
--- a/site/src/routes/_layout.svelte
+++ b/site/src/routes/_layout.svelte
@@ -54,6 +54,33 @@
 			<Icon name="github"/>
 		</NavItem>
 	</Nav>
+	<div class="BLM">
+		<a
+			target="_blank"
+			rel="noopener noreferrer"
+			href="https://blacklivesmatter.com/"
+		>Black Lives Matter</a>.
+
+		Support
+
+		<a
+			target="_blank"
+			rel="noopener noreferrer"
+			href="https://www.joincampaignzero.org/"
+		>Campaign Zero</a>, the
+
+		<a
+			target="_blank"
+			rel="noopener noreferrer"
+			href="https://support.eji.org/give/153413/#!/donation/checkout"
+		>Equal&nbsp;Justice&nbsp;Initiative</a>, and
+
+		<a
+			target="_blank"
+			rel="noopener noreferrer"
+			href="https://bailfunds.github.io/"
+		>local bail funds</a>.
+	</div>
 {/if}
 
 <main>
@@ -61,11 +88,47 @@
 </main>
 
 <style>
+	.BLM {
+		background-color: black;
+		color: white;
+		position: fixed;
+		bottom: 0;
+		width: 100vw;
+		text-align: center;
+		padding: 1em;
+		z-index: 999;
+	}
+	.BLM a {
+		white-space: nowrap;
+	}
+	:global(header){
+		filter: grayscale(100%) /* BLM */
+	}
 	main {
 		position: relative;
 		margin: 0 auto;
 		/* padding: var(--nav-h) var(--side-nav) 0 var(--side-nav); */
 		padding: var(--nav-h) 0 0 0;
+		padding-bottom: 64px; /* BLM */
 		overflow-x: hidden;
 	}
+
+	@media screen and (max-width: 769px) {
+		main {
+			padding-bottom: 90px; /* BLM */
+		}
+	}
+
+	@media screen and (max-width: 377px) {
+		.BLM {
+			font-size: 85%;
+		}
+		main {
+			padding-bottom: 75px; /* BLM */
+		}
+	}
+
+	main > :global(*) {
+		filter: grayscale(100%) /* BLM */
+	}
 </style>
diff --git a/site/src/routes/blog/[slug].svelte b/site/src/routes/blog/[slug].svelte
index 610fb6506b..d5fd6c0676 100644
--- a/site/src/routes/blog/[slug].svelte
+++ b/site/src/routes/blog/[slug].svelte
@@ -133,44 +133,14 @@
 		border: 0.8rem solid var(--second);
 	}
 
-	/* headers anchors */
-
-	.post :global(.offset-anchor) {
-		position: relative;
-		display: block;
-		top: calc(-1 * (var(--nav-h) + var(--top-offset) - 1rem));
-		width: 0;
-		height: 0;
-	}
-
 	.post :global(.anchor) {
-		position: absolute;
-		display: block;
-		background: url(/icons/link.svg) 0 50% no-repeat;
-		background-size: 1em 1em;
-		width: 1.4em;
-		height: 1em;
 		top: calc((var(--h3) - 24px) / 2);
-		left: -1.4em;
-		opacity: 0;
-		transition: opacity 0.2s;
-		border: none !important; /* TODO get rid of linkify */
 	}
 
-	.post :global(h2):hover :global(.anchor),
-	.post :global(h3):hover :global(.anchor),
-	.post :global(h4):hover :global(.anchor),
-	.post :global(h5):hover :global(.anchor),
-	.post :global(h6):hover :global(.anchor) {
-		opacity: 1;
-	}
-
-
 	@media (max-width: 768px) {
 		.post :global(.anchor) {
 			transform: scale(0.6);
 			opacity: 1;
-			top: calc((1em - 0.6 * 24px) / 2);
 			left: -1.0em;
 		}
 	}
diff --git a/site/src/routes/faq.js b/site/src/routes/faq.js
deleted file mode 100644
index 6263494a4c..0000000000
--- a/site/src/routes/faq.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export function get(req, res) {
-	res.writeHead(302, { Location: 'https://github.com/sveltejs/svelte/wiki/FAQ' });
-	res.end();
-}
\ No newline at end of file
diff --git a/site/src/routes/faq/_faqs.js b/site/src/routes/faq/_faqs.js
new file mode 100644
index 0000000000..fa48e02282
--- /dev/null
+++ b/site/src/routes/faq/_faqs.js
@@ -0,0 +1,58 @@
+import fs from 'fs';
+import path from 'path';
+import { extract_frontmatter, link_renderer } from '@sveltejs/site-kit/utils/markdown.js';
+import marked from 'marked';
+import { makeSlugProcessor } from '../../utils/slug';
+import { highlight } from '../../utils/highlight';
+import { SLUG_PRESERVE_UNICODE } from '../../../config';
+
+const makeSlug = makeSlugProcessor(SLUG_PRESERVE_UNICODE);
+
+export default function get_faqs() {
+	return fs
+		.readdirSync('content/faq')
+		.map(file => {
+			if (path.extname(file) !== '.md') return;
+
+			const match = /^([0-9]+)-(.+)\.md$/.exec(file);
+			if (!match) throw new Error(`Invalid filename '${file}'`);
+
+			const [, order, slug] = match;
+
+			const markdown = fs.readFileSync(`content/faq/${file}`, 'utf-8');
+
+			const { content, metadata } = extract_frontmatter(markdown);
+
+			const renderer = new marked.Renderer();
+
+			renderer.link = link_renderer;
+
+			renderer.code = highlight;
+
+			renderer.heading = (text, level, rawtext) => {
+				const fragment = makeSlug(rawtext);
+
+				return `
+					<h${level}>
+						<span id="${fragment}" class="offset-anchor"></span>
+						<a href="faq#${fragment}" class="anchor" aria-hidden="true"></a>
+						${text}
+					</h${level}>`;
+			};
+
+			const answer = marked(
+				content.replace(/^\t+/gm, match => match.split('\t').join('  ')),
+				{ renderer }
+			);
+
+			const fragment = makeSlug(slug);
+
+			return {
+				fragment,
+				order,
+				answer,
+				metadata
+			};
+		})
+		.sort((a, b) => a.order - b.order);
+}
diff --git a/site/src/routes/faq/index.json.js b/site/src/routes/faq/index.json.js
new file mode 100644
index 0000000000..b6810a984e
--- /dev/null
+++ b/site/src/routes/faq/index.json.js
@@ -0,0 +1,24 @@
+import send from '@polka/send';
+import get_faqs from './_faqs.js';
+
+let json;
+
+export function get(req, res) {
+	if (!json || process.env.NODE_ENV !== 'production') {
+		const faqs = get_faqs()
+			.map(faq => {
+				return {
+					fragment: faq.fragment,
+					answer: faq.answer,
+					metadata: faq.metadata
+				};
+			});
+
+		json = JSON.stringify(faqs);
+	}
+
+	send(res, 200, json, {
+		'Content-Type': 'application/json',
+		'Cache-Control': `max-age=${5 * 60 * 1e3}` // 5 minutes
+	});
+}
diff --git a/site/src/routes/faq/index.svelte b/site/src/routes/faq/index.svelte
new file mode 100644
index 0000000000..c426f5bf3d
--- /dev/null
+++ b/site/src/routes/faq/index.svelte
@@ -0,0 +1,89 @@
+<script context="module">
+	export async function preload() {
+		const faqs = await this.fetch(`faq.json`).then(r => r.json());
+		return { faqs };
+	}
+</script>
+
+<script>
+	const description = "Frequently Asked Questions about Svelte"
+
+	export let faqs;
+</script>
+
+<svelte:head>
+	<title>Frequently Asked Questions • Svelte</title>
+
+	<meta name="twitter:title" content="Svelte FAQ">
+	<meta name="twitter:description" content={description}>
+	<meta name="Description" content={description}>
+</svelte:head>
+
+<div class='faqs stretch'>
+	<h1>Frequently Asked Questions</h1>
+	{#each faqs as faq}
+
+		<article class='faq'>
+			<h2>
+			<span id={faq.fragment} class="offset-anchor"></span>
+			<a class="anchor" rel='prefetch' href='faq#{faq.fragment}' title='{faq.question}'>&nbsp;</a>
+			{faq.metadata.question}
+			</h2>
+			<p>{@html faq.answer}</p>
+		</article>
+	{/each}
+</div>
+
+<style>
+	.faqs {
+		grid-template-columns: 1fr 1fr;
+		grid-gap: 1em;
+		min-height: calc(100vh - var(--nav-h));
+		padding: var(--top-offset) var(--side-nav) 6rem var(--side-nav);
+		max-width: var(--main-width);
+		margin: 0 auto;
+	}
+
+	h2 {
+		display: inline-block;
+		margin: 3.2rem 0 1rem 0;
+		color: var(--text);
+		max-width: 18em;
+		font-size: var(--h3);
+		font-weight: 400;
+	}
+
+	.faq:first-child {
+		margin: 0 0 2rem 0;
+		padding: 0 0 4rem 0;
+		border-bottom: var(--border-w) solid #6767785b; /* based on --second */
+	}
+
+	.faq:first-child h2 {
+		font-size: 4rem;
+		font-weight: 400;
+		color: var(--second);
+	}
+
+	.faq p {
+		font-size: var(--h5);
+		max-width: 30em;
+		color: var(--second);
+	}
+
+	:global(.faqs .faq ul) {
+		margin-left: 3.2rem;
+	}
+
+	.faqs :global(.anchor) {
+		top: calc((var(--h3) - 24px) / 2);
+	}
+
+	@media (max-width: 768px) {
+		.faqs :global(.anchor) {
+			transform: scale(0.6);
+			opacity: 1;
+			left: -1.0em;
+		}
+	}
+</style>
diff --git a/site/src/routes/repl/[id]/_components/AppControls/index.svelte b/site/src/routes/repl/[id]/_components/AppControls/index.svelte
index 007dba3461..10639e91c0 100644
--- a/site/src/routes/repl/[id]/_components/AppControls/index.svelte
+++ b/site/src/routes/repl/[id]/_components/AppControls/index.svelte
@@ -30,7 +30,7 @@
 	$: canSave = $session.user && gist && gist.owner === $session.user.uid;
 
 	function handleKeydown(event) {
-		if (event.which === 83 && (isMac ? event.metaKey : event.ctrlKey)) {
+		if (event.key === 's' && (isMac ? event.metaKey : event.ctrlKey)) {
 			event.preventDefault();
 			save();
 		}
diff --git a/site/src/template.html b/site/src/template.html
index 344684d766..28ea1910a5 100644
--- a/site/src/template.html
+++ b/site/src/template.html
@@ -7,6 +7,7 @@
 
 	%sapper.base%
 
+	<link href=global.css rel=stylesheet>
 	<link href=prism.css rel=stylesheet>
 	<link rel='manifest' href='manifest.json'>
 	<link rel='icon' type='image/png' href='favicon.png'>
diff --git a/site/src/utils/highlight.js b/site/src/utils/highlight.js
index d8be46b3a6..d9e4fe5ec8 100644
--- a/site/src/utils/highlight.js
+++ b/site/src/utils/highlight.js
@@ -1,6 +1,7 @@
 import { langs } from '@sveltejs/site-kit/utils/markdown.js';
 import PrismJS from 'prismjs';
 import 'prismjs/components/prism-bash';
+import 'prism-svelte';
 
 export function highlight(source, lang) {
 	const plang = langs[lang] || '';
diff --git a/site/static/examples/thumbnails/dom-event-forwarding.jpg b/site/static/examples/thumbnails/dom-event-forwarding.jpg
index 0992aef1fd..4c23217bba 100644
Binary files a/site/static/examples/thumbnails/dom-event-forwarding.jpg and b/site/static/examples/thumbnails/dom-event-forwarding.jpg differ
diff --git a/site/static/favicon.png b/site/static/favicon.png
index ddbebf3b4f..21bc302b68 100644
Binary files a/site/static/favicon.png and b/site/static/favicon.png differ
diff --git a/site/static/global.css b/site/static/global.css
index 14e4e0a0c0..7aa0715a98 100644
--- a/site/static/global.css
+++ b/site/static/global.css
@@ -1,500 +1,31 @@
-/*
------------------------------------------------
-	vars – css custom-properties
+/* headers anchors */
 
-	NOTE
-	- some vars change inside media-queries!
-	- under normal conditions, there's no need to touch these
------------------------------------------------
-*/
-:root {
-	--nav-h:       6rem;
-	--top-offset:  6rem;
-	--sidebar-w:  30rem;
-	--sidebar-mid-w: 36rem;
-	--sidebar-large-w: 48rem;
-	--main-width: 80rem;
-	--code-w:      72em;
-	--side-nav:  3.2rem;
-	--side-page:   var(--side-nav);
-
-	/* easings */
-	--in-cubic:    cubic-bezier(0.55, 0.055, 0.675, 0.19);
-	--out-cubic:   cubic-bezier(0.215, 0.61, 0.355, 1);
-	--inout-cubic: cubic-bezier(0.645, 0.045, 0.355, 1);
-
-	--in-back:     cubic-bezier(0.6, -0.28, 0.735, 0.045);
-	--out-back:    cubic-bezier(0.175, 0.885, 0.32, 1.275);
-	--inout-back:  cubic-bezier(0.68, -0.55, 0.265, 1.55);
-}
-
-@media screen and (min-width: 768px) {
-	:root {
-		--side-page:  14vw;
-		--top-offset: 10rem;
-		--side-nav: 4.8rem;
-	}
-}
-
-/*	theme vars */
-.theme-default {
-	--back:       	#ffffff;
-	--back-light: 	#f6fafd;
-	--back-api: 		#eff8ff;
-	--prime:      	#ff3e00;
-	--second:     	#676778;
-	--flash:      	#40b3ff;
-	--heading:	var(--second);
-	--text:      		#444;
-	--sidebar-text: rgba(255, 255, 255, .75);
-	--border-w:  		.3rem; /* border-width  */
-	--border-r:  		.4rem; /* border-radius */
-}
-
-/*	typo vars */
-.typo-default {
-	--unit:     .8rem;
-	--code-fs: 1.3rem;
-	--h6:      1.4rem;
-	--h5:      1.6rem;
-	--h4:      1.8rem; /* default font-size */
-	--h3:      2.6rem;
-	--h2:        3rem;
-	--h1:      3.2rem;
-	--linemax:   42em; /* max line-length */
-	--lh:  		 	  1.5; /* base line-height */
-}
-
-body {
-	--font: 'Overpass', sans-serif;
-	--font-mono: 'Fira Mono', monospace;
-	--font-ui: var(--font-mono);
-	--font-system: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
-}
-
-
-/*	fonts ---------------------------------- */
-/* overpass-300normal - latin */
-@font-face {
-	font-family: 'Overpass';
-	font-style: normal;
-	font-weight: 300;
-	font-display: fallback;
-	src:
-		local('Overpass Light '),
-		local('Overpass-Light'),
-		url('fonts/overpass/overpass-latin-300.woff2') format('woff2');
-}
-
-/* overpass-600normal - latin */
-@font-face {
-	font-family: 'Overpass';
-	font-style: normal;
-	font-weight: 600;
-	font-display: fallback;
-	src:
-		local('Overpass Bold '),
-		local('Overpass-Bold'),
-		url('fonts/overpass/overpass-latin-600.woff2') format('woff2');
-}
-
-/* fira-mono-400normal - latin */
-@font-face {
-	font-family: 'Fira Mono';
-	font-style: normal;
-	font-weight: 400;
-	font-display: fallback;
-	src:
-		local('Fira Mono Regular '),
-		local('Fira Mono-Regular'),
-		url('fonts/fira-mono/fira-mono-latin-400.woff2') format('woff2');
-}
-
-/*	base reset ----------------------------- */
-html {
-	font-size: 62.5%;
-	-ms-text-size-adjust: 62.5%;
-	-webkit-text-size-adjust: 62.5%;
-	-ms-overflow-style: -ms-autohiding-scrollbar;
-	box-sizing: border-box;
-	border-collapse: collapse;
-}
-
-html,
-body,
-#sapper {
-	width: 100%;
-	height: 100%;
-}
-
-* {
-	box-sizing: inherit;
-	margin: 0;
-	padding: 0;
-}
-
-/*	link reset ----------------------------- */
-a {
-	text-decoration: none;
-	cursor: pointer;
-	color: inherit;
-}
-
-a:hover, a:active { color: var(--flash) }
-a:focus { outline: none }
-
-/*
------------------------------------------------
-	global styles
------------------------------------------------
-*/
-
-/*	typography ----------------------------- */
-body {
-	font: 300 var(--h4)/var(--lh) var(--font);
-	background-color: var(--back);
-	color: var(--text);
-
-	/* default spacing of Overpass is a bit too airy */
-	/* letter-spacing: -.013em; */
-}
-
-h1, h2, h3, h4, h5, h6, blockquote {
-	position: relative;
-	margin: 0;
-	color: var(--heading);
-}
-
-/* h1, h2, h3, h4, h5, h6 { font-weight: 600 } */
-h6 { font-size: var(--h6) }
-h5 { font-size: var(--h5) }
-h4 { font-size: var(--h4) }
-h3 { font-size: var(--h3) }
-h2 { font-size: var(--h2) }
-h1 { font-size: var(--h1) }
-
-h1, h2 {
-	font-family: var(--font);
-	line-height: 1.25;
-}
-
-h3 { font-weight: 300 }
-
-p, ol, ul {
-	margin: 0 0 1em 0;
-}
-
-.b, b, strong { font-weight: 600 }
-
-tt, code, kbd, samp {
-	font: 400 var(--code-fs)/1.7 var(--font-mono);
-}
-
-code {
-	position: relative;
-	border-radius: .3em;
-	white-space: nowrap;
-	color: #444;
-	-webkit-font-smoothing: initial;
-}
-
-pre code {
-	top: 0;
-	white-space: inherit;
-	background-color: none;
-}
-
-/* sync CodeMirror with prism  */
-.CodeMirror {
-	font-size: var(--code-fs) !important;
-}
-
-::selection {
-	background: var(--flash);
-	color: white;
-}
-
-/*	opinionated styles --------------------- */
-
-li:not(.white) > h2 {
-	color: var(--second)
-}
-
-blockquote {
-	position: relative;
-	margin: 1.6rem 0 2.4rem;
-	padding: 2rem 2.4rem 1.8rem 2.4rem;
-	border-radius: var(--border-r);
-	font-family: var(--font);
-	max-width: var(--linemax);
-}
-
-blockquote p {
-	font-size: var(--h5);
-}
-
-blockquote :last-child {
-	margin: 0;
-}
-
-/*  buttons -------------------------------- */
-button {
-	font-family: inherit;
-	font-size: inherit;
-	background-color: transparent;
-	border: none;
-	color: currentColor;
-	cursor: pointer;
-}
-
-button:focus,
-.btn:focus { outline: 0 }
-
-button[disabled],
-.btn[disabled],
-.btn:hover[disabled] {
-	opacity: .55;
-	pointer-events: none;
-}
-
-button > svg,
-.btn > svg {
-	position: relative;
-	top: -.1rem;
-	width: 2rem !important;
-	height: 2rem !important;
-	stroke: currentColor !important;
-}
-
-/*  reset ------- */
-.btn {
-  --btn-h: 4rem;
-  --btn-outline: .2rem;
-  --btn-font: var(--font);
-  --btn-calc-h: calc(var(--btn-h) - var(--btn-outline) * 2);
-  --btn-hover: linear-gradient(to top, rgba(0,0,0,.07), rgba(0,0,0,.07));
-
-  position: relative;
-  margin: 0 .8rem .8rem 0;
-  vertical-align: middle;
-  white-space: nowrap;
-  display: inline-block;
-  zoom: 1;
-  border: none transparent;
-	font: var(--h4) var(--btn-font);
-	border-radius: var(--border-r);
-  color: currentColor;
-  cursor: pointer;
-}
-
-/*  default */
-.btn {
-	line-height: var(--btn-h);
-  height: var(--btn-h);
-  padding: 0 1.6rem;
-	transition: all .1s;
-}
-
-.btn:hover  {
-	transform: scale(.98);
-	mix-blend-mode: multiply;
-	background-image: var(--btn-hover);
-}
-
-/*  optional */
-.btn[outline] {
-	line-height: var(--btn-calc-h);
-  height: var(--btn-calc-h);
-  border: var(--btn-outline) solid currentColor;
-  background-color: white;
-  color: currentColor;
-}
-
-/*  links ------------------------------------- */
-a {
-	position: relative;
-	padding: 0 0 1px 0;
-	border-bottom: 1px solid currentColor;
-	user-select: none;
-	color: var(--prime);
-	transition: color .2s, border .2s, padding .2s;
-}
-
-a:hover  {
-	color: var(--flash);
-}
-
-a:hover {
-	padding: 0;
-	border-bottom: 2px solid currentColor;
-}
-
-a.no-underline {
-	border-bottom: none;
-	padding: 0;
-}
-
-/* a:hover:not(.disabled) > .icon { stroke: var(--flash) } */
-
-/*  lists ---------------------------------- */
-.listify ol,
-.listify ul {
-	--list-padding: 2.9rem;
-
-	list-style: none;
-	color: currentColor;
-	margin-left: var(--list-padding);
-}
-
-.listify ol > li,
-.listify ul > li {
-	max-width: calc(var(--linemax) - var(--list-padding));
-	line-height: 1.5;
-	margin: 0 0 0.4rem 0;
-}
-
-.listify ul > li:before {
-	content: '';
-	position: absolute;
-	margin-top: 1.1rem;
-	margin-left: -1.8rem;
-	background-color: var(--second);
-	width: .6rem;
-	height: .6rem;
-	border-radius: 2px;
-	opacity: 0.7;
-}
-
-.listify ol { list-style: decimal }
-
-/*  tables --------------------------------- */
-table {
-	width: 100%;
-	font-size: var(--h5);
-}
-
-td, th {
-	text-align: left;
-	border-bottom: 1px solid #eee;
-	padding: 0.4rem 0.8rem 0.4rem 0;
-}
-
-table code, table span {
-	white-space: pre;
-}
-
-/*	grid ----------------------------------- */
-.grid, .grid.half {
-	display: grid;
-	grid-gap: 2.4rem;
-	grid-template-columns: 1fr;
-	align-items: center;
-}
-
-.grid.stretch { align-items: stretch }
-
-.grid > .cols-2,
-.grid > .cols-3 { grid-column: span 1 }
-
-@media screen and (min-width: 840px) {
-	.grid.half,
-	.grid { grid-template-columns: repeat(2, 1fr) }
-	.grid > .cols-2,
-	.grid > .cols-3 { grid-column: span 2 }
-}
-
-@media screen and (min-width: 1100px) {
-	.grid { grid-template-columns: repeat(3, 1fr) }
-	.grid > .cols-2 { grid-column: span 2 }
-	.grid > .cols-3 { grid-column: span 3 }
-}
-
-/*	helper styles -------------------------- */
-.flex-auto { flex: 1 0 auto }
-
-.py0 {
-	padding-top: 0 !important;
-	padding-bottom: 0 !important;
-}
-
-.legend, figcaption, .post aside {
-	max-width: none;
-	margin: 0 auto;
-	padding: 1.6rem 0 0 .8rem;
-	font: 1.2rem/1.6 var(--font-ui);
-}
-
-.filename {
-	display: inline-block;
-	padding: 1.6rem 0 0 1rem;
-	font: var(--h6) var(--font-ui);
-}
-
-.box {
-	padding: 2.4rem 3.2rem;
-	border-radius: var(--border-r);
-}
-
-/*	theme colors --------------------------- */
-.prime      { color: var(--prime) !important }
-.second     { color: var(--second) !important }
-.flash      { color: var(--flash) !important }
-.black      { color: black !important }
-.white      { color: white !important }
-
-.back       { background-color: var(--back) !important }
-.back-light { background-color: var(--back-light) !important }
-.bg-prime   { background-color: var(--prime) !important }
-.bg-second  { background-color: var(--second) !important }
-.bg-flash   { background-color: var(--flash) !important }
-
-/*	inputs --------------------------------- */
-input[type="checkbox"] {
-	/* display: block; */
+.offset-anchor {
 	position: relative;
-	height: 1em;
-	width: calc(100% - 0.6em);
-	max-width: 2em;
-	top: -2px;
-	border-radius: 0.5em;
-	-webkit-appearance: none;
-	outline: none;
-	margin: 0 0.6em 0 0;
-}
-
-input[type="checkbox"]::before {
-	content: "";
-	position: absolute;
 	display: block;
-	height: 100%;
-	width: 100%;
-	padding: 2px;
-	border-radius: 1em;
-	top: 0;
-	left: 0;
-	background: var(--second);
-	/* box-sizing: border-box; */
-	box-sizing: content-box;
+	top: calc(-1 * (var(--nav-h) + var(--top-offset)) + 11rem);
+	width: 0;
+	height: 0;
 }
 
-input[type="checkbox"]:checked::before {
-	background: var(--prime);
-}
-
-input[type="checkbox"]::after {
-	content: "";
+.anchor {
 	position: absolute;
 	display: block;
+	background: url(/icons/link.svg) 0 50% no-repeat;
+	background-size: 1em 1em;
+	width: 1.4em;
 	height: 1em;
-	width: 1em;
-	top: 2px;
-	left: 2px;
-	border-radius: 1em;
-	background: white;
-	box-shadow: 0 0px 1px rgba(0,0,0,.4), 0 4px 2px rgba(0,0,0,.1);
-	-webkit-transition: background .2s ease-out, left .2s ease-out;
-}
-
-input[type="checkbox"]:checked::after {
-	left: calc(100% - 9px);
+	top: calc(((var(--h3) - 24px) / 2) + 0.6em);
+	left: -1.4em;
+	opacity: 0;
+	transition: opacity 0.2s;
+	border: none !important; /* TODO get rid of linkify */
+}
+
+h2:hover .anchor,
+h3:hover .anchor,
+h4:hover .anchor,
+h5:hover .anchor,
+h6:hover .anchor {
+	opacity: 1;
 }
diff --git a/site/static/icons/arrow-right.svg b/site/static/icons/arrow-right.svg
index 5229286a59..57bb51ed28 100644
--- a/site/static/icons/arrow-right.svg
+++ b/site/static/icons/arrow-right.svg
@@ -1,7 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
-	<g fill="none" stroke="white" stroke-width="2">
-		<line x1='5' y1='12' x2='19' y2='12' />
-		<polyline points='12 5 19 12 12 19' />
-	</g>
-</svg>
\ No newline at end of file
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><g fill="none" stroke="#fff" stroke-width="2"><path d="m5 12h14"/><path d="m12 5 7 7-7 7"/></g></svg>
\ No newline at end of file
diff --git a/site/static/icons/check.svg b/site/static/icons/check.svg
index 5679642c7f..c3e46a42b6 100644
--- a/site/static/icons/check.svg
+++ b/site/static/icons/check.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
-	<path style="fill: #aa1e1e" d="M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z" />
-</svg>
\ No newline at end of file
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m21 7-12 12-5.5-5.5 1.41-1.41 4.09 4.08 10.59-10.58z" fill="#aa1e1e"/></svg>
\ No newline at end of file
diff --git a/site/static/icons/chevron.svg b/site/static/icons/chevron.svg
index 3706f53278..9d582fa803 100644
--- a/site/static/icons/chevron.svg
+++ b/site/static/icons/chevron.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
-	<path style="stroke: #676778; stroke-width: 2; fill: none" d="M2,8 L12,16 L22,8"/>
-</svg>
\ No newline at end of file
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m2 8 10 8 10-8" fill="none" stroke="#676778" stroke-width="2"/></svg>
\ No newline at end of file
diff --git a/site/static/icons/collapse.svg b/site/static/icons/collapse.svg
index 13ff9dee82..795939aec8 100644
--- a/site/static/icons/collapse.svg
+++ b/site/static/icons/collapse.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
-   <path style="fill: #aa1e1e" d="M19.5,3.09L20.91,4.5L16.41,9H20V11H13V4H15V7.59L19.5,3.09M20.91,19.5L19.5,20.91L15,16.41V20H13V13H20V15H16.41L20.91,19.5M4.5,3.09L9,7.59V4H11V11H4V9H7.59L3.09,4.5L4.5,3.09M3.09,19.5L7.59,15H4V13H11V20H9V16.41L4.5,20.91L3.09,19.5Z" />
-</svg>
\ No newline at end of file
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m19.5 3.09 1.41 1.41-4.5 4.5h3.59v2h-7v-7h2v3.59zm1.41 16.41-1.41 1.41-4.5-4.5v3.59h-2v-7h7v2h-3.59zm-16.41-16.41 4.5 4.5v-3.59h2v7h-7v-2h3.59l-4.5-4.5zm-1.41 16.41 4.5-4.5h-3.59v-2h7v7h-2v-3.59l-4.5 4.5z" fill="#aa1e1e"/></svg>
\ No newline at end of file
diff --git a/site/static/icons/download.svg b/site/static/icons/download.svg
index 8d255ff74b..b286a882fe 100644
--- a/site/static/icons/download.svg
+++ b/site/static/icons/download.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
-    <path fill="#aa1e1e" d="M5,20H19V18H5M19,9H15V3H9V9H5L12,16L19,9Z" />
-</svg>
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m5 20h14v-2h-14m14-9h-4v-6h-6v6h-4l7 7z" fill="#aa1e1e"/></svg>
\ No newline at end of file
diff --git a/site/static/icons/dropdown.svg b/site/static/icons/dropdown.svg
index b3fcdbe795..69435856b4 100644
--- a/site/static/icons/dropdown.svg
+++ b/site/static/icons/dropdown.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
-    <path fill="#999" d="M3,6H21V8H3V6M3,11H21V13H3V11M3,16H21V18H3V16Z" />
-</svg>
\ No newline at end of file
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m3 6h18v2h-18zm0 5h18v2h-18zm0 5h18v2h-18z" fill="#999"/></svg>
\ No newline at end of file
diff --git a/site/static/icons/edit.svg b/site/static/icons/edit.svg
index 5e7b182086..760321cd2f 100644
--- a/site/static/icons/edit.svg
+++ b/site/static/icons/edit.svg
@@ -1,7 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
-	<g style="fill: none; stroke: white; stroke-width: 2;">
-		<path d='M20 14.66V20a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h5.34' />
-		<polygon points='18 2 22 6 12 16 8 16 8 12 18 2' />
-	</g>
-</svg>
\ No newline at end of file
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><g fill="none" stroke="#fff" stroke-width="2"><path d="m20 14.66v5.34a2 2 0 0 1 -2 2h-14a2 2 0 0 1 -2-2v-14a2 2 0 0 1 2-2h5.34"/><path d="m18 2 4 4-10 10h-4v-4z"/></g></svg>
\ No newline at end of file
diff --git a/site/static/icons/expand.svg b/site/static/icons/expand.svg
index b429cb53c8..a026808da3 100644
--- a/site/static/icons/expand.svg
+++ b/site/static/icons/expand.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
-    <path style="fill: #aa1e1e" d="M9.5,13.09L10.91,14.5L6.41,19H10V21H3V14H5V17.59L9.5,13.09M10.91,9.5L9.5,10.91L5,6.41V10H3V3H10V5H6.41L10.91,9.5M14.5,13.09L19,17.59V14H21V21H14V19H17.59L13.09,14.5L14.5,13.09M13.09,9.5L17.59,5H14V3H21V10H19V6.41L14.5,10.91L13.09,9.5Z" />
-</svg>
\ No newline at end of file
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m9.5 13.09 1.41 1.41-4.5 4.5h3.59v2h-7v-7h2v3.59zm1.41-3.59-1.41 1.41-4.5-4.5v3.59h-2v-7h7v2h-3.59zm3.59 3.59 4.5 4.5v-3.59h2v7h-7v-2h3.59l-4.5-4.5zm-1.41-3.59 4.5-4.5h-3.59v-2h7v7h-2v-3.59l-4.5 4.5z" fill="#aa1e1e"/></svg>
\ No newline at end of file
diff --git a/site/static/icons/flip.svg b/site/static/icons/flip.svg
index 09326b1e6b..3a18d5ffa1 100644
--- a/site/static/icons/flip.svg
+++ b/site/static/icons/flip.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
-    <path fill="#aa1e1e" d="M12,5C16.97,5 21,7.69 21,11C21,12.68 19.96,14.2 18.29,15.29C19.36,14.42 20,13.32 20,12.13C20,9.29 16.42,7 12,7V10L8,6L12,2V5M12,19C7.03,19 3,16.31 3,13C3,11.32 4.04,9.8 5.71,8.71C4.64,9.58 4,10.68 4,11.88C4,14.71 7.58,17 12,17V14L16,18L12,22V19Z" />
-</svg>
\ No newline at end of file
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m12 5c4.97 0 9 2.69 9 6 0 1.68-1.04 3.2-2.71 4.29 1.07-.87 1.71-1.97 1.71-3.16 0-2.84-3.58-5.13-8-5.13v3l-4-4 4-4zm0 14c-4.97 0-9-2.69-9-6 0-1.68 1.04-3.2 2.71-4.29-1.07.87-1.71 1.97-1.71 3.17 0 2.83 3.58 5.12 8 5.12v-3l4 4-4 4z" fill="#aa1e1e"/></svg>
\ No newline at end of file
diff --git a/site/static/icons/fork.svg b/site/static/icons/fork.svg
index 57ad61bb2f..3e21885495 100644
--- a/site/static/icons/fork.svg
+++ b/site/static/icons/fork.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
-    <path fill="#aa1e1e" d="M3,4V12.5L6,9.5L9,13C10,14 10,15 10,15V21H14V14C14,14 14,13 13.47,12C12.94,11 12,10 12,10L9,6.58L11.5,4M18,4L13.54,8.47L14,9C14,9 14.93,10 15.47,11C15.68,11.4 15.8,11.79 15.87,12.13L21,7" />
-</svg>
\ No newline at end of file
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m3 4v8.5l3-3 3 3.5c1 1 1 2 1 2v6h4v-7s0-1-.53-2-1.47-2-1.47-2l-3-3.42 2.5-2.58m6.5 0-4.46 4.47.46.53s.93 1 1.47 2c.21.4.33.79.4 1.13l5.13-5.13" fill="#aa1e1e"/></svg>
\ No newline at end of file
diff --git a/site/static/icons/link.svg b/site/static/icons/link.svg
index 3b36b03cab..3345bdd0ba 100644
--- a/site/static/icons/link.svg
+++ b/site/static/icons/link.svg
@@ -1,8 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
-	<g fill="none" stroke="#333">
-		<path d="M9,7L6,7A2 2 0 0 0 6,17L9,17"/>
-		<path d="M15,7L18,7A2 2 0 0 1 18,17L15,17"/>
-		<path d="M7,12L17,12"/>
-	</g>
-</svg>
\ No newline at end of file
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><g fill="none" stroke="#333"><path d="m9 7h-3a2 2 0 0 0 0 10h3"/><path d="m15 7h3a2 2 0 0 1 0 10h-3"/><path d="m7 12h10"/></g></svg>
\ No newline at end of file
diff --git a/site/static/icons/save.svg b/site/static/icons/save.svg
index 4bde5edde5..a8a5fa1618 100644
--- a/site/static/icons/save.svg
+++ b/site/static/icons/save.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
-    <path fill="#aa1e1e" d="M15,9H5V5H15M12,19A3,3 0 0,1 9,16A3,3 0 0,1 12,13A3,3 0 0,1 15,16A3,3 0 0,1 12,19M17,3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V7L17,3Z" />
-</svg>
\ No newline at end of file
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m15 9h-10v-4h10m-3 14a3 3 0 0 1 -3-3 3 3 0 0 1 3-3 3 3 0 0 1 3 3 3 3 0 0 1 -3 3m5-16h-12c-1.11 0-2 .9-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-12z" fill="#aa1e1e"/></svg>
\ No newline at end of file
diff --git a/site/static/images/svelte-apple-touch-icon.png b/site/static/images/svelte-apple-touch-icon.png
index 94c9f12f03..5600445b1c 100644
Binary files a/site/static/images/svelte-apple-touch-icon.png and b/site/static/images/svelte-apple-touch-icon.png differ
diff --git a/site/static/images/twitter-card.png b/site/static/images/twitter-card.png
index 1e8271f655..7a66e94003 100644
Binary files a/site/static/images/twitter-card.png and b/site/static/images/twitter-card.png differ
diff --git a/site/static/svelte-logo-mask.svg b/site/static/svelte-logo-mask.svg
index 9e5b40598f..8572d3da6c 100644
--- a/site/static/svelte-logo-mask.svg
+++ b/site/static/svelte-logo-mask.svg
@@ -1,16 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 98.2 118" style="enable-background:new 0 0 98.2 118;" xml:space="preserve">
-<path d="M91.9,15.6C81-0.1,59.3-4.7,43.7,5.3L16.2,22.8C8.7,27.5,3.5,35.2,2,43.9c-1.3,7.3-0.2,14.8,3.3,21.3
-	c-2.4,3.6-4,7.6-4.7,11.8c-1.6,8.9,0.5,18.1,5.7,25.4c11,15.7,32.6,20.3,48.2,10.4L82,95.3c7.5-4.7,12.7-12.4,14.2-21.1
-	c1.3-7.3,0.2-14.8-3.3-21.3c2.4-3.6,4-7.6,4.7-11.8C99.2,32.1,97.2,22.9,91.9,15.6 M41,103.9c-8.9,2.3-18.2-1.2-23.4-8.7
-	c-3.2-4.4-4.4-9.9-3.5-15.3c0.2-0.9,0.4-1.7,0.6-2.6l0.5-1.6l1.4,1c3.3,2.4,6.9,4.2,10.8,5.4l1,0.3l-0.1,1c-0.1,1.4,0.3,2.9,1.1,4.1
-	c1.6,2.3,4.4,3.4,7.1,2.7c0.6-0.2,1.2-0.4,1.7-0.7l27.4-17.5c1.4-0.9,2.3-2.2,2.6-3.8c0.3-1.6-0.1-3.3-1-4.6
-	c-1.6-2.3-4.4-3.3-7.1-2.6c-0.6,0.2-1.2,0.4-1.7,0.7L48,68.3c-1.7,1.1-3.6,1.9-5.6,2.4c-8.9,2.3-18.2-1.2-23.4-8.7
-	c-3.1-4.4-4.4-9.9-3.4-15.3c0.9-5.2,4.1-9.9,8.6-12.7l27.4-17.5c1.7-1.1,3.6-1.9,5.6-2.5c8.9-2.3,18.2,1.2,23.4,8.7
-	c3.2,4.4,4.4,9.9,3.5,15.3c-0.2,0.9-0.4,1.7-0.7,2.6l-0.5,1.6l-1.4-1c-3.3-2.4-6.9-4.2-10.8-5.4l-1-0.3l0.1-1
-	c0.1-1.4-0.3-2.9-1.1-4.1c-1.6-2.3-4.4-3.3-7.1-2.6c-0.6,0.2-1.2,0.4-1.7,0.7L32.5,46.1c-1.4,0.9-2.3,2.2-2.6,3.8
-	c-0.3,1.6,0.1,3.3,1,4.6c1.6,2.3,4.4,3.3,7.1,2.6c0.6-0.2,1.2-0.4,1.7-0.7l10.5-6.7c1.7-1.1,3.6-1.9,5.6-2.5
-	c8.9-2.3,18.2,1.2,23.4,8.7c3.2,4.4,4.4,9.9,3.5,15.3c-0.9,5.2-4.1,9.9-8.6,12.7l-27.4,17.5C44.9,102.5,43,103.3,41,103.9"/>
-</svg>
+<svg enable-background="new 0 0 98.2 118" viewBox="0 0 98.2 118" xmlns="http://www.w3.org/2000/svg"><path d="m91.9 15.6c-10.9-15.7-32.6-20.3-48.2-10.3l-27.5 17.5c-7.5 4.7-12.7 12.4-14.2 21.1-1.3 7.3-.2 14.8 3.3 21.3-2.4 3.6-4 7.6-4.7 11.8-1.6 8.9.5 18.1 5.7 25.4 11 15.7 32.6 20.3 48.2 10.4l27.5-17.5c7.5-4.7 12.7-12.4 14.2-21.1 1.3-7.3.2-14.8-3.3-21.3 2.4-3.6 4-7.6 4.7-11.8 1.6-9-.4-18.2-5.7-25.5m-50.9 88.3c-8.9 2.3-18.2-1.2-23.4-8.7-3.2-4.4-4.4-9.9-3.5-15.3.2-.9.4-1.7.6-2.6l.5-1.6 1.4 1c3.3 2.4 6.9 4.2 10.8 5.4l1 .3-.1 1c-.1 1.4.3 2.9 1.1 4.1 1.6 2.3 4.4 3.4 7.1 2.7.6-.2 1.2-.4 1.7-.7l27.4-17.5c1.4-.9 2.3-2.2 2.6-3.8s-.1-3.3-1-4.6c-1.6-2.3-4.4-3.3-7.1-2.6-.6.2-1.2.4-1.7.7l-10.4 6.6c-1.7 1.1-3.6 1.9-5.6 2.4-8.9 2.3-18.2-1.2-23.4-8.7-3.1-4.4-4.4-9.9-3.4-15.3.9-5.2 4.1-9.9 8.6-12.7l27.4-17.5c1.7-1.1 3.6-1.9 5.6-2.5 8.9-2.3 18.2 1.2 23.4 8.7 3.2 4.4 4.4 9.9 3.5 15.3-.2.9-.4 1.7-.7 2.6l-.5 1.6-1.4-1c-3.3-2.4-6.9-4.2-10.8-5.4l-1-.3.1-1c.1-1.4-.3-2.9-1.1-4.1-1.6-2.3-4.4-3.3-7.1-2.6-.6.2-1.2.4-1.7.7l-27.4 17.6c-1.4.9-2.3 2.2-2.6 3.8s.1 3.3 1 4.6c1.6 2.3 4.4 3.3 7.1 2.6.6-.2 1.2-.4 1.7-.7l10.5-6.7c1.7-1.1 3.6-1.9 5.6-2.5 8.9-2.3 18.2 1.2 23.4 8.7 3.2 4.4 4.4 9.9 3.5 15.3-.9 5.2-4.1 9.9-8.6 12.7l-27.4 17.5c-1.8 1.1-3.7 1.9-5.7 2.5"/></svg>
\ No newline at end of file
diff --git a/site/static/svelte-logo-outline.svg b/site/static/svelte-logo-outline.svg
index 9aac72c957..d93d71c593 100644
--- a/site/static/svelte-logo-outline.svg
+++ b/site/static/svelte-logo-outline.svg
@@ -1,20 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 98.4 118.3" style="enable-background:new 0 0 98.4 118.3;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:none;stroke:#FF3E00;stroke-width:0.25;}
-</style>
-<path class="st0" d="M92,15.7C81.1,0.1,59.5-4.6,43.8,5.4L16.3,22.9C8.8,27.6,3.6,35.3,2.1,44c-1.3,7.3-0.2,14.8,3.3,21.3
-	c-2.4,3.6-4,7.6-4.7,11.8c-1.6,8.9,0.5,18.1,5.7,25.4c11,15.7,32.6,20.3,48.2,10.4l27.5-17.5c7.5-4.7,12.7-12.4,14.2-21.1
-	c1.3-7.3,0.2-14.8-3.3-21.3c2.4-3.6,4-7.6,4.7-11.8C99.4,32.2,97.3,23.1,92,15.7"/>
-<path class="st0" d="M41.1,104c-8.9,2.3-18.2-1.2-23.4-8.7c-3.2-4.4-4.4-9.9-3.5-15.3c0.2-0.9,0.4-1.7,0.6-2.6l0.5-1.6l1.4,1
-	c3.3,2.4,6.9,4.2,10.8,5.4l1,0.3l-0.1,1c-0.1,1.4,0.3,2.9,1.1,4.1c1.6,2.3,4.4,3.4,7.1,2.7c0.6-0.2,1.2-0.4,1.7-0.7l27.4-17.5
-	c1.4-0.9,2.3-2.2,2.6-3.8c0.3-1.6-0.1-3.3-1-4.6c-1.6-2.3-4.4-3.3-7.1-2.6c-0.6,0.2-1.2,0.4-1.7,0.7l-10.5,6.7
-	c-1.7,1.1-3.6,1.9-5.6,2.4c-8.9,2.3-18.2-1.2-23.4-8.7c-3.1-4.4-4.4-9.9-3.4-15.3c0.9-5.2,4.1-9.9,8.6-12.7l27.4-17.5
-	c1.7-1.1,3.6-1.9,5.6-2.5c8.9-2.3,18.2,1.2,23.4,8.7c3.2,4.4,4.4,9.9,3.5,15.3c-0.2,0.9-0.4,1.7-0.7,2.6L83,42.4l-1.4-1
-	c-3.3-2.4-6.9-4.2-10.8-5.4l-1-0.3l0.1-1c0.1-1.4-0.3-2.9-1.1-4.1c-1.6-2.3-4.4-3.3-7.1-2.6c-0.6,0.2-1.2,0.4-1.7,0.7L32.6,46.2
-	C31.2,47,30.3,48.4,30,50c-0.3,1.6,0.1,3.3,1,4.6c1.6,2.3,4.4,3.3,7.1,2.6c0.6-0.2,1.2-0.4,1.7-0.7l10.5-6.7
-	c1.7-1.1,3.6-1.9,5.6-2.5c8.9-2.3,18.2,1.2,23.4,8.7c3.2,4.4,4.4,9.9,3.5,15.3c-0.9,5.2-4.1,9.9-8.6,12.7l-27.4,17.5
-	C45,102.6,43.1,103.5,41.1,104"/>
-</svg>
+<svg enable-background="new 0 0 98.4 118.3" viewBox="0 0 98.4 118.3" xmlns="http://www.w3.org/2000/svg"><g fill="none" stroke="#ff3e00" stroke-width=".25"><path d="m92 15.7c-10.9-15.6-32.5-20.3-48.2-10.3l-27.5 17.5c-7.5 4.7-12.7 12.4-14.2 21.1-1.3 7.3-.2 14.8 3.3 21.3-2.4 3.6-4 7.6-4.7 11.8-1.6 8.9.5 18.1 5.7 25.4 11 15.7 32.6 20.3 48.2 10.4l27.5-17.5c7.5-4.7 12.7-12.4 14.2-21.1 1.3-7.3.2-14.8-3.3-21.3 2.4-3.6 4-7.6 4.7-11.8 1.7-9-.4-18.1-5.7-25.5"/><path d="m41.1 104c-8.9 2.3-18.2-1.2-23.4-8.7-3.2-4.4-4.4-9.9-3.5-15.3.2-.9.4-1.7.6-2.6l.5-1.6 1.4 1c3.3 2.4 6.9 4.2 10.8 5.4l1 .3-.1 1c-.1 1.4.3 2.9 1.1 4.1 1.6 2.3 4.4 3.4 7.1 2.7.6-.2 1.2-.4 1.7-.7l27.4-17.5c1.4-.9 2.3-2.2 2.6-3.8s-.1-3.3-1-4.6c-1.6-2.3-4.4-3.3-7.1-2.6-.6.2-1.2.4-1.7.7l-10.5 6.7c-1.7 1.1-3.6 1.9-5.6 2.4-8.9 2.3-18.2-1.2-23.4-8.7-3.1-4.4-4.4-9.9-3.4-15.3.9-5.2 4.1-9.9 8.6-12.7l27.4-17.5c1.7-1.1 3.6-1.9 5.6-2.5 8.9-2.3 18.2 1.2 23.4 8.7 3.2 4.4 4.4 9.9 3.5 15.3-.2.9-.4 1.7-.7 2.6l-.4 1.6-1.4-1c-3.3-2.4-6.9-4.2-10.8-5.4l-1-.3.1-1c.1-1.4-.3-2.9-1.1-4.1-1.6-2.3-4.4-3.3-7.1-2.6-.6.2-1.2.4-1.7.7l-27.4 17.5c-1.4.8-2.3 2.2-2.6 3.8s.1 3.3 1 4.6c1.6 2.3 4.4 3.3 7.1 2.6.6-.2 1.2-.4 1.7-.7l10.5-6.7c1.7-1.1 3.6-1.9 5.6-2.5 8.9-2.3 18.2 1.2 23.4 8.7 3.2 4.4 4.4 9.9 3.5 15.3-.9 5.2-4.1 9.9-8.6 12.7l-27.4 17.5c-1.8 1.1-3.7 2-5.7 2.5"/></g></svg>
\ No newline at end of file
diff --git a/site/static/svelte-logo-vertical.svg b/site/static/svelte-logo-vertical.svg
index b019147f35..7e2888234d 100644
--- a/site/static/svelte-logo-vertical.svg
+++ b/site/static/svelte-logo-vertical.svg
@@ -1,4 +1 @@
-<svg id="svelte" xmlns="http://www.w3.org/2000/svg" width="256" height="300" viewBox="0 0 256 300">
-<path id="logotype" fill="#4a4a55" d="M44.41,265.87a14,14,0,0,1-8-2.26,11.53,11.53,0,0,1-4.66-6.18l4.86-1.78a9,9,0,0,0,3.18,3.84,8.31,8.31,0,0,0,4.81,1.42,7,7,0,0,0,4.59-1.39,4.83,4.83,0,0,0,1.71-4,4.25,4.25,0,0,0-.47-2A5.93,5.93,0,0,0,49.38,252a7,7,0,0,0-1.84-1.22c-.83-.41-1.51-.73-2.06-.94s-1.35-.51-2.41-.87c-1.32-.46-2.31-.83-3-1.09a23.69,23.69,0,0,1-2.61-1.32,9.63,9.63,0,0,1-2.43-1.83,8.76,8.76,0,0,1-1.46-2.41A8.11,8.11,0,0,1,33,239a8.29,8.29,0,0,1,3-6.45A11.79,11.79,0,0,1,44,229.94a12.16,12.16,0,0,1,7,1.89,9.11,9.11,0,0,1,3.69,5L50,238.43a5.53,5.53,0,0,0-2.31-2.56,7.77,7.77,0,0,0-4-1,6.23,6.23,0,0,0-3.9,1.09,3.66,3.66,0,0,0-1.41,3.07,3.22,3.22,0,0,0,1.09,2.39A7.61,7.61,0,0,0,41.68,243c.8.34,2,.78,3.63,1.34l2.2.82c.48.19,1.19.49,2.11.92a14.36,14.36,0,0,1,2.14,1.17,19.05,19.05,0,0,1,1.73,1.41A7.66,7.66,0,0,1,55,250.46a10.77,10.77,0,0,1,.89,2.24,10.13,10.13,0,0,1,.37,2.8A9.38,9.38,0,0,1,53,263.12,13,13,0,0,1,44.41,265.87Zm31.81-.6L64.31,230.54h5.56l7.89,24.21a39.48,39.48,0,0,1,1.09,4,39.48,39.48,0,0,1,1.09-4l7.79-24.21h5.51L81.38,265.27Zm27.54,0V230.54H125.3v4.86H108.92v9.53h10.57v4.86H108.92v10.62h17.47v4.86Zm35.78,0V230.54h5.16v29.77h17v5Zm41.58-29.77v29.77H176V235.5h-9.83v-5h24.81v5Zm20.49,29.77V230.54h21.54v4.86H206.77v9.53h10.57v4.86H206.77v10.62h17.47v4.86Z"/>
-<path id="back" fill="#ff3e00" d="M191.87,52.11c-16.34-23.39-48.61-30.32-71.94-15.45L79,62.77A47,47,0,0,0,57.72,94.26,49.49,49.49,0,0,0,62.6,126a47.16,47.16,0,0,0-7,17.57,50.1,50.1,0,0,0,8.56,37.89c16.34,23.38,48.61,30.31,71.94,15.45l41-26.12a47,47,0,0,0,21.24-31.49,49.51,49.51,0,0,0-4.88-31.78,47.16,47.16,0,0,0,7-17.57,50.07,50.07,0,0,0-8.56-37.88"/>
-<path id="front" fill="#fff" d="M115.93,183.7A32.55,32.55,0,0,1,81,170.75,30.11,30.11,0,0,1,75.85,148a29.12,29.12,0,0,1,1-3.83l.77-2.35,2.1,1.54a52.87,52.87,0,0,0,16,8l1.52.46-.14,1.52a9.17,9.17,0,0,0,1.65,6.09,9.79,9.79,0,0,0,10.52,3.9,9,9,0,0,0,2.52-1.1l41-26.11a8.53,8.53,0,0,0,3.85-5.71,9,9,0,0,0-1.55-6.87,9.82,9.82,0,0,0-10.52-3.9,9.08,9.08,0,0,0-2.51,1.1l-15.64,10a30.08,30.08,0,0,1-8.32,3.66A32.55,32.55,0,0,1,83.15,121.4,30.15,30.15,0,0,1,78,98.61,28.24,28.24,0,0,1,90.77,79.68l41-26.12a30,30,0,0,1,8.33-3.65,32.54,32.54,0,0,1,34.93,13,30.11,30.11,0,0,1,5.15,22.78,29.12,29.12,0,0,1-1,3.83l-.77,2.35-2.1-1.54a52.64,52.64,0,0,0-16-8l-1.52-.46.14-1.52a9.2,9.2,0,0,0-1.65-6.1,9.82,9.82,0,0,0-10.52-3.9,9,9,0,0,0-2.52,1.11l-41,26.11a8.49,8.49,0,0,0-3.85,5.7,9,9,0,0,0,1.55,6.87A9.81,9.81,0,0,0,111.45,114a9,9,0,0,0,2.52-1.11l15.63-10a29.5,29.5,0,0,1,8.32-3.66,32.54,32.54,0,0,1,34.93,12.95A30.11,30.11,0,0,1,178,135a28.26,28.26,0,0,1-12.77,18.94l-41,26.11a30.27,30.27,0,0,1-8.33,3.66"/></svg>
+<svg height="300" viewBox="0 0 256 300" width="256" xmlns="http://www.w3.org/2000/svg"><path d="m44.41 265.87a14 14 0 0 1 -8-2.26 11.53 11.53 0 0 1 -4.66-6.18l4.86-1.78a9 9 0 0 0 3.18 3.84 8.31 8.31 0 0 0 4.81 1.42 7 7 0 0 0 4.59-1.39 4.83 4.83 0 0 0 1.71-4 4.25 4.25 0 0 0 -.47-2 5.93 5.93 0 0 0 -1.05-1.52 7 7 0 0 0 -1.84-1.22c-.83-.41-1.51-.73-2.06-.94s-1.35-.51-2.41-.87c-1.32-.46-2.31-.83-3-1.09a23.69 23.69 0 0 1 -2.61-1.32 9.63 9.63 0 0 1 -2.43-1.83 8.76 8.76 0 0 1 -1.46-2.41 8.11 8.11 0 0 1 -.57-3.32 8.29 8.29 0 0 1 3-6.45 11.79 11.79 0 0 1 8-2.61 12.16 12.16 0 0 1 7 1.89 9.11 9.11 0 0 1 3.69 5l-4.69 1.6a5.53 5.53 0 0 0 -2.31-2.56 7.77 7.77 0 0 0 -4-1 6.23 6.23 0 0 0 -3.9 1.09 3.66 3.66 0 0 0 -1.41 3.07 3.22 3.22 0 0 0 1.09 2.39 7.61 7.61 0 0 0 2.21 1.58c.8.34 2 .78 3.63 1.34l2.2.82c.48.19 1.19.49 2.11.92a14.36 14.36 0 0 1 2.14 1.17 19.05 19.05 0 0 1 1.73 1.41 7.66 7.66 0 0 1 1.51 1.8 10.77 10.77 0 0 1 .89 2.24 10.13 10.13 0 0 1 .37 2.8 9.38 9.38 0 0 1 -3.26 7.62 13 13 0 0 1 -8.59 2.75zm31.81-.6-11.91-34.73h5.56l7.89 24.21a39.48 39.48 0 0 1 1.09 4 39.48 39.48 0 0 1 1.09-4l7.79-24.21h5.51l-11.86 34.73zm27.54 0v-34.73h21.54v4.86h-16.38v9.53h10.57v4.86h-10.57v10.62h17.47v4.86zm35.78 0v-34.73h5.16v29.77h17v5zm41.58-29.77v29.77h-5.12v-29.77h-9.83v-5h24.81v5zm20.49 29.77v-34.73h21.54v4.86h-16.38v9.53h10.57v4.86h-10.57v10.62h17.47v4.86z" fill="#4a4a55"/><path d="m191.87 52.11c-16.34-23.39-48.61-30.32-71.94-15.45l-40.93 26.11a47 47 0 0 0 -21.28 31.49 49.49 49.49 0 0 0 4.88 31.74 47.16 47.16 0 0 0 -7 17.57 50.1 50.1 0 0 0 8.56 37.89c16.34 23.38 48.61 30.31 71.94 15.45l41-26.12a47 47 0 0 0 21.24-31.49 49.51 49.51 0 0 0 -4.88-31.78 47.16 47.16 0 0 0 7-17.57 50.07 50.07 0 0 0 -8.56-37.88" fill="#ff3e00"/><path d="m115.93 183.7a32.55 32.55 0 0 1 -34.93-12.95 30.11 30.11 0 0 1 -5.15-22.75 29.12 29.12 0 0 1 1-3.83l.77-2.35 2.1 1.54a52.87 52.87 0 0 0 16 8l1.52.46-.14 1.52a9.17 9.17 0 0 0 1.65 6.09 9.79 9.79 0 0 0 10.52 3.9 9 9 0 0 0 2.52-1.1l41-26.11a8.53 8.53 0 0 0 3.85-5.71 9 9 0 0 0 -1.55-6.87 9.82 9.82 0 0 0 -10.52-3.9 9.08 9.08 0 0 0 -2.51 1.1l-15.64 10a30.08 30.08 0 0 1 -8.32 3.66 32.55 32.55 0 0 1 -34.95-13 30.15 30.15 0 0 1 -5.15-22.79 28.24 28.24 0 0 1 12.77-18.93l41-26.12a30 30 0 0 1 8.33-3.65 32.54 32.54 0 0 1 34.93 13 30.11 30.11 0 0 1 5.15 22.78 29.12 29.12 0 0 1 -1 3.83l-.77 2.35-2.1-1.54a52.64 52.64 0 0 0 -16-8l-1.52-.46.14-1.52a9.2 9.2 0 0 0 -1.65-6.1 9.82 9.82 0 0 0 -10.52-3.9 9 9 0 0 0 -2.52 1.11l-41 26.11a8.49 8.49 0 0 0 -3.85 5.7 9 9 0 0 0 1.55 6.87 9.81 9.81 0 0 0 10.51 3.86 9 9 0 0 0 2.52-1.11l15.63-10a29.5 29.5 0 0 1 8.32-3.66 32.54 32.54 0 0 1 34.93 12.95 30.11 30.11 0 0 1 5.15 22.82 28.26 28.26 0 0 1 -12.77 18.94l-41 26.11a30.27 30.27 0 0 1 -8.33 3.66" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/site/static/svelte-logo.svg b/site/static/svelte-logo.svg
index 4bf279659a..d8b477bee1 100644
--- a/site/static/svelte-logo.svg
+++ b/site/static/svelte-logo.svg
@@ -1,20 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 98.1 118" style="enable-background:new 0 0 98.1 118;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FF3E00;}
-	.st1{fill:#FFFFFF;}
-</style>
-<path class="st0" d="M91.8,15.6C80.9-0.1,59.2-4.7,43.6,5.2L16.1,22.8C8.6,27.5,3.4,35.2,1.9,43.9c-1.3,7.3-0.2,14.8,3.3,21.3
-	c-2.4,3.6-4,7.6-4.7,11.8c-1.6,8.9,0.5,18.1,5.7,25.4c11,15.7,32.6,20.3,48.2,10.4l27.5-17.5c7.5-4.7,12.7-12.4,14.2-21.1
-	c1.3-7.3,0.2-14.8-3.3-21.3c2.4-3.6,4-7.6,4.7-11.8C99.2,32.1,97.1,22.9,91.8,15.6"/>
-<path class="st1" d="M40.9,103.9c-8.9,2.3-18.2-1.2-23.4-8.7c-3.2-4.4-4.4-9.9-3.5-15.3c0.2-0.9,0.4-1.7,0.6-2.6l0.5-1.6l1.4,1
-	c3.3,2.4,6.9,4.2,10.8,5.4l1,0.3l-0.1,1c-0.1,1.4,0.3,2.9,1.1,4.1c1.6,2.3,4.4,3.4,7.1,2.7c0.6-0.2,1.2-0.4,1.7-0.7L65.5,72
-	c1.4-0.9,2.3-2.2,2.6-3.8c0.3-1.6-0.1-3.3-1-4.6c-1.6-2.3-4.4-3.3-7.1-2.6c-0.6,0.2-1.2,0.4-1.7,0.7l-10.5,6.7
-	c-1.7,1.1-3.6,1.9-5.6,2.4c-8.9,2.3-18.2-1.2-23.4-8.7c-3.1-4.4-4.4-9.9-3.4-15.3c0.9-5.2,4.1-9.9,8.6-12.7l27.5-17.5
-	c1.7-1.1,3.6-1.9,5.6-2.5c8.9-2.3,18.2,1.2,23.4,8.7c3.2,4.4,4.4,9.9,3.5,15.3c-0.2,0.9-0.4,1.7-0.7,2.6l-0.5,1.6l-1.4-1
-	c-3.3-2.4-6.9-4.2-10.8-5.4l-1-0.3l0.1-1c0.1-1.4-0.3-2.9-1.1-4.1c-1.6-2.3-4.4-3.3-7.1-2.6c-0.6,0.2-1.2,0.4-1.7,0.7L32.4,46.1
-	c-1.4,0.9-2.3,2.2-2.6,3.8s0.1,3.3,1,4.6c1.6,2.3,4.4,3.3,7.1,2.6c0.6-0.2,1.2-0.4,1.7-0.7l10.5-6.7c1.7-1.1,3.6-1.9,5.6-2.5
-	c8.9-2.3,18.2,1.2,23.4,8.7c3.2,4.4,4.4,9.9,3.5,15.3c-0.9,5.2-4.1,9.9-8.6,12.7l-27.5,17.5C44.8,102.5,42.9,103.3,40.9,103.9"/>
-</svg>
+<svg enable-background="new 0 0 98.1 118" viewBox="0 0 98.1 118" xmlns="http://www.w3.org/2000/svg"><path d="m91.8 15.6c-10.9-15.7-32.6-20.3-48.2-10.4l-27.5 17.6c-7.5 4.7-12.7 12.4-14.2 21.1-1.3 7.3-.2 14.8 3.3 21.3-2.4 3.6-4 7.6-4.7 11.8-1.6 8.9.5 18.1 5.7 25.4 11 15.7 32.6 20.3 48.2 10.4l27.5-17.5c7.5-4.7 12.7-12.4 14.2-21.1 1.3-7.3.2-14.8-3.3-21.3 2.4-3.6 4-7.6 4.7-11.8 1.7-9-.4-18.2-5.7-25.5" fill="#ff3e00"/><path d="m40.9 103.9c-8.9 2.3-18.2-1.2-23.4-8.7-3.2-4.4-4.4-9.9-3.5-15.3.2-.9.4-1.7.6-2.6l.5-1.6 1.4 1c3.3 2.4 6.9 4.2 10.8 5.4l1 .3-.1 1c-.1 1.4.3 2.9 1.1 4.1 1.6 2.3 4.4 3.4 7.1 2.7.6-.2 1.2-.4 1.7-.7l27.4-17.5c1.4-.9 2.3-2.2 2.6-3.8s-.1-3.3-1-4.6c-1.6-2.3-4.4-3.3-7.1-2.6-.6.2-1.2.4-1.7.7l-10.5 6.7c-1.7 1.1-3.6 1.9-5.6 2.4-8.9 2.3-18.2-1.2-23.4-8.7-3.1-4.4-4.4-9.9-3.4-15.3.9-5.2 4.1-9.9 8.6-12.7l27.5-17.5c1.7-1.1 3.6-1.9 5.6-2.5 8.9-2.3 18.2 1.2 23.4 8.7 3.2 4.4 4.4 9.9 3.5 15.3-.2.9-.4 1.7-.7 2.6l-.5 1.6-1.4-1c-3.3-2.4-6.9-4.2-10.8-5.4l-1-.3.1-1c.1-1.4-.3-2.9-1.1-4.1-1.6-2.3-4.4-3.3-7.1-2.6-.6.2-1.2.4-1.7.7l-27.4 17.5c-1.4.9-2.3 2.2-2.6 3.8s.1 3.3 1 4.6c1.6 2.3 4.4 3.3 7.1 2.6.6-.2 1.2-.4 1.7-.7l10.5-6.7c1.7-1.1 3.6-1.9 5.6-2.5 8.9-2.3 18.2 1.2 23.4 8.7 3.2 4.4 4.4 9.9 3.5 15.3-.9 5.2-4.1 9.9-8.6 12.7l-27.5 17.5c-1.7 1.1-3.6 1.9-5.6 2.5" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/site/static/tutorial/icons/email.svg b/site/static/tutorial/icons/email.svg
index db656054ff..70d92ca430 100644
--- a/site/static/tutorial/icons/email.svg
+++ b/site/static/tutorial/icons/email.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
-	<path fill="#ff3e00" d="M20,8L12,13L4,8V6L12,11L20,6M20,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V6C22,4.89 21.1,4 20,4Z" />
-</svg>
\ No newline at end of file
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m20 8-8 5-8-5v-2l8 5 8-5m0-2h-16c-1.11 0-2 .89-2 2v12a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2v-12c0-1.11-.9-2-2-2z" fill="#ff3e00"/></svg>
\ No newline at end of file
diff --git a/site/static/tutorial/icons/folder-open.svg b/site/static/tutorial/icons/folder-open.svg
index 9dac0ef9e9..b2a58e7432 100644
--- a/site/static/tutorial/icons/folder-open.svg
+++ b/site/static/tutorial/icons/folder-open.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
-	<path fill="#ff3e00" d="M19,20H4C2.89,20 2,19.1 2,18V6C2,4.89 2.89,4 4,4H10L12,6H19A2,2 0 0,1 21,8H21L4,8V18L6.14,10H23.21L20.93,18.5C20.7,19.37 19.92,20 19,20Z" />
-</svg>
\ No newline at end of file
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m19 20h-15c-1.11 0-2-.9-2-2v-12c0-1.11.89-2 2-2h6l2 2h7a2 2 0 0 1 2 2h-17v10l2.14-8h17.07l-2.28 8.5c-.23.87-1.01 1.5-1.93 1.5z" fill="#ff3e00"/></svg>
\ No newline at end of file
diff --git a/site/static/tutorial/icons/folder.svg b/site/static/tutorial/icons/folder.svg
index 7d4a03f1d2..2e1246a7f9 100644
--- a/site/static/tutorial/icons/folder.svg
+++ b/site/static/tutorial/icons/folder.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
-	<path fill="#ff3e00" d="M10,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V8C22,6.89 21.1,6 20,6H12L10,4Z" />
-</svg>
\ No newline at end of file
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m10 4h-6c-1.11 0-2 .89-2 2v12a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2v-10c0-1.11-.9-2-2-2h-8z" fill="#ff3e00"/></svg>
\ No newline at end of file
diff --git a/site/static/tutorial/icons/gif.svg b/site/static/tutorial/icons/gif.svg
index 315860a247..4b28abcecd 100644
--- a/site/static/tutorial/icons/gif.svg
+++ b/site/static/tutorial/icons/gif.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
-	<path fill="#ff3e00" d="M11,8H13V16H11V8M7.67,8H4.33C3.53,8 3,8.67 3,9.33V14.67C3,15.33 3.53,16 4.33,16H7.67C8.47,16 9,15.33 9,14.67V12H7V14H5V10H9V9.33C9,8.67 8.47,8 7.67,8M21,10V8H15V16H17V14H19.5V12H17V10H21Z" />
-</svg>
\ No newline at end of file
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m11 8h2v8h-2zm-3.33 0h-3.34c-.8 0-1.33.67-1.33 1.33v5.34c0 .66.53 1.33 1.33 1.33h3.34c.8 0 1.33-.67 1.33-1.33v-2.67h-2v2h-2v-4h4v-.67c0-.66-.53-1.33-1.33-1.33m13.33 2v-2h-6v8h2v-2h2.5v-2h-2.5v-2z" fill="#ff3e00"/></svg>
\ No newline at end of file
diff --git a/site/static/tutorial/icons/map-marker.svg b/site/static/tutorial/icons/map-marker.svg
index 4e9466c7bd..40a702db9d 100644
--- a/site/static/tutorial/icons/map-marker.svg
+++ b/site/static/tutorial/icons/map-marker.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
-	<path fill="#ff3e00" d="M12,11.5A2.5,2.5 0 0,1 9.5,9A2.5,2.5 0 0,1 12,6.5A2.5,2.5 0 0,1 14.5,9A2.5,2.5 0 0,1 12,11.5M12,2A7,7 0 0,0 5,9C5,14.25 12,22 12,22C12,22 19,14.25 19,9A7,7 0 0,0 12,2Z" />
-</svg>
\ No newline at end of file
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m12 11.5a2.5 2.5 0 0 1 -2.5-2.5 2.5 2.5 0 0 1 2.5-2.5 2.5 2.5 0 0 1 2.5 2.5 2.5 2.5 0 0 1 -2.5 2.5m0-9.5a7 7 0 0 0 -7 7c0 5.25 7 13 7 13s7-7.75 7-13a7 7 0 0 0 -7-7z" fill="#ff3e00"/></svg>
\ No newline at end of file
diff --git a/site/static/tutorial/icons/md.svg b/site/static/tutorial/icons/md.svg
index 60bc36f4a7..582204d3b7 100644
--- a/site/static/tutorial/icons/md.svg
+++ b/site/static/tutorial/icons/md.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
-	<path fill="#ff3e00" d="M2,16V8H4L7,11L10,8H12V16H10V10.83L7,13.83L4,10.83V16H2M16,8H19V12H21.5L17.5,16.5L13.5,12H16V8Z" />
-</svg>
\ No newline at end of file
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m2 16v-8h2l3 3 3-3h2v8h-2v-5.17l-3 3-3-3v5.17zm14-8h3v4h2.5l-4 4.5-4-4.5h2.5z" fill="#ff3e00"/></svg>
\ No newline at end of file
diff --git a/site/static/tutorial/icons/xlsx.svg b/site/static/tutorial/icons/xlsx.svg
index 6ee32e943d..1a51093a97 100644
--- a/site/static/tutorial/icons/xlsx.svg
+++ b/site/static/tutorial/icons/xlsx.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
-	<path fill="#ff3e00" d="M14,17H7V15H14M17,13H7V11H17M17,9H7V7H17M19,3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5C21,3.89 20.1,3 19,3Z" />
-</svg>
\ No newline at end of file
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m14 17h-7v-2h7m3-2h-10v-2h10m0-2h-10v-2h10m2-4h-14c-1.11 0-2 .89-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-14c0-1.11-.9-2-2-2z" fill="#ff3e00"/></svg>
\ No newline at end of file
diff --git a/site/static/tutorial/kitten.png b/site/static/tutorial/kitten.png
index 6b0cedc945..f1a0ecca19 100644
Binary files a/site/static/tutorial/kitten.png and b/site/static/tutorial/kitten.png differ
diff --git a/src/compiler/compile/Component.ts b/src/compiler/compile/Component.ts
index a7fe2992d1..a5a31c8070 100644
--- a/src/compiler/compile/Component.ts
+++ b/src/compiler/compile/Component.ts
@@ -28,6 +28,7 @@ import { Node, ImportDeclaration, Identifier, Program, ExpressionStatement, Assi
 import add_to_set from './utils/add_to_set';
 import check_graph_for_cycles from './utils/check_graph_for_cycles';
 import { print, x, b } from 'code-red';
+import { is_reserved_keyword } from './utils/reserved_keywords';
 
 interface ComponentOptions {
 	namespace?: string;
@@ -185,7 +186,7 @@ export default class Component {
 
 		if (variable) {
 			variable.referenced = true;
-		} else if (name === '$$props') {
+		} else if (is_reserved_keyword(name)) {
 			this.add_var({
 				name,
 				injected: true,
@@ -204,7 +205,7 @@ export default class Component {
 
 			const variable = this.var_lookup.get(subscribable_name);
 			if (variable) {
-				variable.referenced   = true;
+				variable.referenced = true;
 				variable.subscribable = true;
 			}
 		} else {
@@ -631,7 +632,6 @@ export default class Component {
 			this.add_var({
 				name,
 				initialised: instance_scope.initialised_declarations.has(name),
-				hoistable: /^Import/.test(node.type),
 				writable
 			});
 
@@ -649,7 +649,7 @@ export default class Component {
 					reassigned: true,
 					initialised: true,
 				});
-			} else if (name === '$$props') {
+			} else if (is_reserved_keyword(name)) {
 				this.add_var({
 					name,
 					injected: true,
@@ -714,8 +714,14 @@ export default class Component {
 		};
 		let scope_updated = false;
 
+		let generator_count = 0;
+
 		walk(content, {
 			enter(node: Node, parent, prop, index) {
+				if ((node.type === 'FunctionDeclaration' || node.type === 'FunctionExpression') && node.generator === true) {
+					generator_count++;
+				}
+
 				if (map.has(node)) {
 					scope = map.get(node);
 				}
@@ -742,8 +748,12 @@ export default class Component {
 			},
 
 			leave(node: Node) {
+				if ((node.type === 'FunctionDeclaration' || node.type === 'FunctionExpression') && node.generator === true) {
+					generator_count--;
+				}
+
 				// do it on leave, to prevent infinite loop
-				if (component.compile_options.dev && component.compile_options.loopGuardTimeout > 0) {
+				if (component.compile_options.dev && component.compile_options.loopGuardTimeout > 0 && generator_count <= 0) {
 					const to_replace_for_loop_protect = component.loop_protect(node, scope, component.compile_options.loopGuardTimeout);
 					if (to_replace_for_loop_protect) {
 						this.replace(to_replace_for_loop_protect);
@@ -985,6 +995,7 @@ export default class Component {
 			hoistable_nodes,
 			var_lookup,
 			injected_reactive_declaration_vars,
+			imports,
 		} = this;
 
 		const top_level_function_declarations = new Map();
@@ -1136,6 +1147,14 @@ export default class Component {
 				this.fully_hoisted.push(node);
 			}
 		}
+
+		for (const { specifiers } of imports) {
+			for (const specifier of specifiers) {
+				const variable = var_lookup.get(specifier.local.name);
+
+				if (!variable.mutated) variable.hoistable = true;
+			}
+		}
 	}
 
 	extract_reactive_declarations() {
@@ -1215,7 +1234,6 @@ export default class Component {
 		});
 
 		const lookup = new Map();
-		let seen;
 
 		unsorted_reactive_declarations.forEach(declaration => {
 			declaration.assignees.forEach(name => {
@@ -1250,33 +1268,24 @@ export default class Component {
 		}
 
 		const add_declaration = declaration => {
-			if (this.reactive_declarations.indexOf(declaration) !== -1) {
-				return;
-			}
-
-			seen.add(declaration);
+			if (this.reactive_declarations.includes(declaration)) return;
 
 			declaration.dependencies.forEach(name => {
 				if (declaration.assignees.has(name)) return;
 				const earlier_declarations = lookup.get(name);
 				if (earlier_declarations)
-					earlier_declarations.forEach(declaration => {
-						add_declaration(declaration);
-					});
+					earlier_declarations.forEach(add_declaration);
 			});
 
 			this.reactive_declarations.push(declaration);
 		};
 
-		unsorted_reactive_declarations.forEach(declaration => {
-			seen = new Set();
-			add_declaration(declaration);
-		});
+		unsorted_reactive_declarations.forEach(add_declaration);
 	}
 
 	warn_if_undefined(name: string, node, template_scope: TemplateScope) {
 		if (name[0] === '$') {
-			if (name === '$' || name[1] === '$' && name !== '$$props') {
+			if (name === '$' || name[1] === '$' && !is_reserved_keyword(name)) {
 				this.error(node, {
 					code: 'illegal-global',
 					message: `${name} is an illegal variable name`
@@ -1285,7 +1294,7 @@ export default class Component {
 
 			this.has_reactive_assignments = true; // TODO does this belong here?
 
-			if (name === '$$props') return;
+			if (is_reserved_keyword(name)) return;
 
 			name = name.slice(1);
 		}
diff --git a/src/compiler/compile/nodes/AwaitBlock.ts b/src/compiler/compile/nodes/AwaitBlock.ts
index cd57750d29..66bc15364c 100644
--- a/src/compiler/compile/nodes/AwaitBlock.ts
+++ b/src/compiler/compile/nodes/AwaitBlock.ts
@@ -3,24 +3,43 @@ import PendingBlock from './PendingBlock';
 import ThenBlock from './ThenBlock';
 import CatchBlock from './CatchBlock';
 import Expression from './shared/Expression';
+import Component from '../Component';
+import TemplateScope from './shared/TemplateScope';
+import { TemplateNode } from '../../interfaces';
+import { Context, unpack_destructuring } from './shared/Context';
+import { Node as ESTreeNode } from 'estree';
 
 export default class AwaitBlock extends Node {
 	type: 'AwaitBlock';
 	expression: Expression;
-	value: string;
-	error: string;
+
+	then_contexts: Context[];
+	catch_contexts: Context[];
+
+	then_node: ESTreeNode | null;
+	catch_node: ESTreeNode | null;
 
 	pending: PendingBlock;
 	then: ThenBlock;
 	catch: CatchBlock;
 
-	constructor(component, parent, scope, info) {
+	constructor(component: Component, parent, scope: TemplateScope, info: TemplateNode) {
 		super(component, parent, scope, info);
 
 		this.expression = new Expression(component, this, scope, info.expression);
 
-		this.value = info.value;
-		this.error = info.error;
+		this.then_node = info.value;
+		this.catch_node = info.error;
+
+		if (this.then_node) {
+			this.then_contexts = [];
+			unpack_destructuring(this.then_contexts, info.value, node => node);
+		}
+
+		if (this.catch_node) {
+			this.catch_contexts = [];
+			unpack_destructuring(this.catch_contexts, info.error, node => node);
+		}
 
 		this.pending = new PendingBlock(component, this, scope, info.pending);
 		this.then = new ThenBlock(component, this, scope, info.then);
diff --git a/src/compiler/compile/nodes/Binding.ts b/src/compiler/compile/nodes/Binding.ts
index 7d6fad0a81..bcb07280b0 100644
--- a/src/compiler/compile/nodes/Binding.ts
+++ b/src/compiler/compile/nodes/Binding.ts
@@ -60,7 +60,7 @@ export default class Binding extends Node {
 			scope.dependencies_for_name.get(name).forEach(name => {
 				const variable = component.var_lookup.get(name);
 				if (variable) {
-					variable[this.expression.node.type === 'MemberExpression' ? 'mutated' : 'reassigned'] = true;
+					variable.mutated = true;
 				}
 			});
 		} else {
@@ -72,6 +72,11 @@ export default class Binding extends Node {
 			});
 
 			variable[this.expression.node.type === 'MemberExpression' ? 'mutated' : 'reassigned'] = true;
+
+			if (info.expression.type === 'Identifier' && !variable.writable) component.error(this.expression.node, {
+				code: 'invalid-binding',
+				message: 'Cannot bind to a variable which is not writable',
+			});
 		}
 
 		const type = parent.get_static_attribute_value('type');
diff --git a/src/compiler/compile/nodes/CatchBlock.ts b/src/compiler/compile/nodes/CatchBlock.ts
index 0edc0f76d8..1a92f617bb 100644
--- a/src/compiler/compile/nodes/CatchBlock.ts
+++ b/src/compiler/compile/nodes/CatchBlock.ts
@@ -1,16 +1,23 @@
 import map_children from './shared/map_children';
 import TemplateScope from './shared/TemplateScope';
 import AbstractBlock from './shared/AbstractBlock';
+import AwaitBlock from './AwaitBlock';
+import Component from '../Component';
+import { TemplateNode } from '../../interfaces';
 
 export default class CatchBlock extends AbstractBlock {
 	type: 'CatchBlock';
 	scope: TemplateScope;
 
-	constructor(component, parent, scope, info) {
+	constructor(component: Component, parent: AwaitBlock, scope: TemplateScope, info: TemplateNode) {
 		super(component, parent, scope, info);
 
 		this.scope = scope.child();
-		this.scope.add(parent.error, parent.expression.dependencies, this);
+		if (parent.catch_node) {
+			parent.catch_contexts.forEach(context => {
+				this.scope.add(context.key.name, parent.expression.dependencies, this);
+			});
+		}
 		this.children = map_children(component, parent, this.scope, info.children);
 
 		if (!info.skip) {
diff --git a/src/compiler/compile/nodes/EachBlock.ts b/src/compiler/compile/nodes/EachBlock.ts
index 31850f8745..6458ea0020 100644
--- a/src/compiler/compile/nodes/EachBlock.ts
+++ b/src/compiler/compile/nodes/EachBlock.ts
@@ -4,56 +4,8 @@ import map_children from './shared/map_children';
 import TemplateScope from './shared/TemplateScope';
 import AbstractBlock from './shared/AbstractBlock';
 import Element from './Element';
-import { x } from 'code-red';
-import { Node, Identifier, RestElement } from 'estree';
-
-interface Context {
-	key: Identifier;
-	name?: string;
-	modifier: (node: Node) => Node;
-}
-
-function unpack_destructuring(contexts: Context[], node: Node, modifier: (node: Node) => Node) {
-	if (!node) return;
-
-	if (node.type === 'Identifier' || (node as any).type === 'RestIdentifier') { // TODO is this right? not RestElement?
-		contexts.push({
-			key: node as Identifier,
-			modifier
-		});
-	} else if (node.type === 'ArrayPattern') {
-		node.elements.forEach((element, i) => {
-			if (element && (element as any).type === 'RestIdentifier') {
-				unpack_destructuring(contexts, element, node => x`${modifier(node)}.slice(${i})` as Node);
-			} else {
-				unpack_destructuring(contexts, element, node => x`${modifier(node)}[${i}]` as Node);
-			}
-		});
-	} else if (node.type === 'ObjectPattern') {
-		const used_properties = [];
-
-		node.properties.forEach((property, i) => {
-			if ((property as any).kind === 'rest') { // TODO is this right?
-				const replacement: RestElement = {
-					type: 'RestElement',
-					argument: property.key as Identifier
-				};
-
-				node.properties[i] = replacement as any;
-
-				unpack_destructuring(
-					contexts,
-					property.value,
-					node => x`@object_without_properties(${modifier(node)}, [${used_properties}])` as Node
-				);
-			} else {
-				used_properties.push(x`"${(property.key as Identifier).name}"`);
-
-				unpack_destructuring(contexts, property.value, node => x`${modifier(node)}.${(property.key as Identifier).name}` as Node);
-			}
-		});
-	}
-}
+import { Context, unpack_destructuring } from './shared/Context';
+import { Node } from 'estree';
 
 export default class EachBlock extends AbstractBlock {
 	type: 'EachBlock';
diff --git a/src/compiler/compile/nodes/Element.ts b/src/compiler/compile/nodes/Element.ts
index e8108858c5..517ed3ceb6 100644
--- a/src/compiler/compile/nodes/Element.ts
+++ b/src/compiler/compile/nodes/Element.ts
@@ -19,10 +19,10 @@ import { INode } from './interfaces';
 
 const svg = /^(?:altGlyph|altGlyphDef|altGlyphItem|animate|animateColor|animateMotion|animateTransform|circle|clipPath|color-profile|cursor|defs|desc|discard|ellipse|feBlend|feColorMatrix|feComponentTransfer|feComposite|feConvolveMatrix|feDiffuseLighting|feDisplacementMap|feDistantLight|feDropShadow|feFlood|feFuncA|feFuncB|feFuncG|feFuncR|feGaussianBlur|feImage|feMerge|feMergeNode|feMorphology|feOffset|fePointLight|feSpecularLighting|feSpotLight|feTile|feTurbulence|filter|font|font-face|font-face-format|font-face-name|font-face-src|font-face-uri|foreignObject|g|glyph|glyphRef|hatch|hatchpath|hkern|image|line|linearGradient|marker|mask|mesh|meshgradient|meshpatch|meshrow|metadata|missing-glyph|mpath|path|pattern|polygon|polyline|radialGradient|rect|set|solidcolor|stop|svg|switch|symbol|text|textPath|tref|tspan|unknown|use|view|vkern)$/;
 
-const aria_attributes = 'activedescendant atomic autocomplete busy checked colindex controls current describedby details disabled dropeffect errormessage expanded flowto grabbed haspopup hidden invalid keyshortcuts label labelledby level live modal multiline multiselectable orientation owns placeholder posinset pressed readonly relevant required roledescription rowindex selected setsize sort valuemax valuemin valuenow valuetext'.split(' ');
+const aria_attributes = 'activedescendant atomic autocomplete busy checked colcount colindex colspan controls current describedby details disabled dropeffect errormessage expanded flowto grabbed haspopup hidden invalid keyshortcuts label labelledby level live modal multiline multiselectable orientation owns placeholder posinset pressed readonly relevant required roledescription rowcount rowindex rowspan selected setsize sort valuemax valuemin valuenow valuetext'.split(' ');
 const aria_attribute_set = new Set(aria_attributes);
 
-const aria_roles = 'alert alertdialog application article banner button cell checkbox columnheader combobox command complementary composite contentinfo definition dialog directory document feed figure form grid gridcell group heading img input landmark link list listbox listitem log main marquee math menu menubar menuitem menuitemcheckbox menuitemradio navigation none note option presentation progressbar radio radiogroup range region roletype row rowgroup rowheader scrollbar search searchbox section sectionhead select separator slider spinbutton status structure switch tab table tablist tabpanel term textbox timer toolbar tooltip tree treegrid treeitem widget window'.split(' ');
+const aria_roles = 'alert alertdialog application article banner blockquote button caption cell checkbox code columnheader combobox complementary contentinfo definition deletion dialog directory document emphasis feed figure form generic grid gridcell group heading img link list listbox listitem log main marquee math meter menu menubar menuitem menuitemcheckbox menuitemradio navigation none note option paragraph presentation progressbar radio radiogroup region row rowgroup rowheader scrollbar search searchbox separator slider spinbutton status strong subscript superscript switch tab table tablist tabpanel term textbox time timer toolbar tooltip tree treegrid treeitem'.split(' ');
 const aria_role_set = new Set(aria_roles);
 
 const a11y_required_attributes = {
@@ -56,6 +56,11 @@ const a11y_required_content = new Set([
 	'h6'
 ]);
 
+const a11y_no_onchange = new Set([
+	'select',
+	'option'
+]);
+
 const invisible_elements = new Set(['meta', 'html', 'script', 'style']);
 
 const valid_modifiers = new Set([
@@ -272,13 +277,14 @@ export default class Element extends Node {
 		}
 
 		this.validate_attributes();
+		this.validate_special_cases();
 		this.validate_bindings();
 		this.validate_content();
 		this.validate_event_handlers();
 	}
 
 	validate_attributes() {
-		const { component } = this;
+		const { component, parent } = this;
 
 		const attribute_map = new Map();
 
@@ -378,6 +384,14 @@ export default class Element extends Node {
 				}
 			}
 
+
+			if (/(^[0-9-.])|[\^$@%&#?!|()[\]{}^*+~;]/.test(name)) {
+				component.error(attribute, {
+					code: `illegal-attribute`,
+					message: `'${name}' is not a valid attribute name`,
+				});
+			}
+
 			if (name === 'slot') {
 				if (!attribute.is_static) {
 					component.error(attribute, {
@@ -395,26 +409,10 @@ export default class Element extends Node {
 					component.slot_outlets.add(name);
 				}
 
-				let ancestor = this.parent;
-				do {
-					if (ancestor.type === 'InlineComponent') break;
-					if (ancestor.type === 'Element' && /-/.test(ancestor.name)) break;
-
-					if (ancestor.type === 'IfBlock' || ancestor.type === 'EachBlock') {
-						const type = ancestor.type === 'IfBlock' ? 'if' : 'each';
-						const message = `Cannot place slotted elements inside an ${type}-block`;
-
-						component.error(attribute, {
-							code: `invalid-slotted-content`,
-							message
-						});
-					}
-				} while (ancestor = ancestor.parent);
-
-				if (!ancestor) {
+				if (!(parent.type === 'InlineComponent' || within_custom_element(parent))) {
 					component.error(attribute, {
 						code: `invalid-slotted-content`,
-						message: `Element with a slot='...' attribute must be a descendant of a component or custom element`
+						message: `Element with a slot='...' attribute must be a child of a component or a descendant of a custom element`,
 					});
 				}
 			}
@@ -428,29 +426,47 @@ export default class Element extends Node {
 
 			attribute_map.set(attribute.name, attribute);
 		});
+	}
+
+	validate_special_cases() {
+		const { component, attributes, handlers } = this;
+		const attribute_map = new Map();
+		const handlers_map = new Map();
+
+		attributes.forEach(attribute => (
+			attribute_map.set(attribute.name, attribute)
+		));
+
+		handlers.forEach(handler => (
+			handlers_map.set(handler.name, handler)
+		));
 
-		// handle special cases
 		if (this.name === 'a') {
-			const attribute = attribute_map.get('href') || attribute_map.get('xlink:href');
+			const href_attribute = attribute_map.get('href') || attribute_map.get('xlink:href');
+			const id_attribute = attribute_map.get('id');
+			const name_attribute = attribute_map.get('name');
 
-			if (attribute) {
-				const value = attribute.get_static_value();
+			if (href_attribute) {
+				const href_value = href_attribute.get_static_value();
 
-				if (value === '' || value === '#') {
-					component.warn(attribute, {
+				if (href_value === '' || href_value === '#' || /^\W*javascript:/i.test(href_value)) {
+					component.warn(href_attribute, {
 						code: `a11y-invalid-attribute`,
-						message: `A11y: '${value}' is not a valid ${attribute.name} attribute`
+						message: `A11y: '${href_value}' is not a valid ${href_attribute.name} attribute`
 					});
 				}
 			} else {
-				component.warn(this, {
-					code: `a11y-missing-attribute`,
-					message: `A11y: <a> element should have an href attribute`
-				});
-			}
-		}
+				const id_attribute_valid = id_attribute && id_attribute.get_static_value() !== '';
+				const name_attribute_valid = name_attribute && name_attribute.get_static_value() !== '';
 
-		else {
+				if (!id_attribute_valid && !name_attribute_valid) {
+					component.warn(this, {
+						code: `a11y-missing-attribute`,
+						message: `A11y: <a> element should have an href attribute`
+					});
+				}
+			}
+		} else {
 			const required_attributes = a11y_required_attributes[this.name];
 			if (required_attributes) {
 				const has_attribute = required_attributes.some(name => attribute_map.has(name));
@@ -459,19 +475,46 @@ export default class Element extends Node {
 					should_have_attribute(this, required_attributes);
 				}
 			}
+		}
+
+		if (this.name === 'input') {
+			const type = attribute_map.get('type');
+			if (type && type.get_static_value() === 'image') {
+				const required_attributes = ['alt', 'aria-label', 'aria-labelledby'];
+				const has_attribute = required_attributes.some(name => attribute_map.has(name));
 
-			if (this.name === 'input') {
-				const type = attribute_map.get('type');
-				if (type && type.get_static_value() === 'image') {
-					const required_attributes = ['alt', 'aria-label', 'aria-labelledby'];
-					const has_attribute = required_attributes.some(name => attribute_map.has(name));
+				if (!has_attribute) {
+					should_have_attribute(this, required_attributes, 'input type="image"');
+				}
+			}
+		}
 
-					if (!has_attribute) {
-						should_have_attribute(this, required_attributes, 'input type="image"');
-					}
+		if (this.name === 'img') {
+			const alt_attribute = attribute_map.get('alt');
+			const aria_hidden_attribute = attribute_map.get('aria-hidden');
+
+			const aria_hidden_exist = aria_hidden_attribute && aria_hidden_attribute.get_static_value();
+
+			if (alt_attribute && !aria_hidden_exist) {
+				const alt_value = alt_attribute.get_static_value();
+
+				if (/\b(image|picture|photo)\b/i.test(alt_value)) {
+					component.warn(this, {
+						code: `a11y-img-redundant-alt`,
+						message: `A11y: Screenreaders already announce <img> elements as an image.`
+					});
 				}
 			}
 		}
+
+		if (a11y_no_onchange.has(this.name)) {
+			if (handlers_map.has('change') && !handlers_map.has('blur')) {
+				component.warn(this, {
+					code: `a11y-no-onchange`,
+					message: `A11y: on:blur must be used instead of on:change, unless absolutely necessary and it causes no negative consequences for keyboard only or screen reader users.`
+				});
+			}
+		}
 	}
 
 	validate_bindings() {
@@ -595,6 +638,7 @@ export default class Element extends Node {
 				name === 'seekable' ||
 				name === 'played' ||
 				name === 'volume' ||
+				name === 'muted' ||
 				name === 'playbackRate' ||
 				name === 'seeking' ||
 				name === 'ended'
@@ -776,3 +820,12 @@ function should_have_attribute(
 		message: `A11y: <${name}> element should have ${article} ${sequence} attribute`
 	});
 }
+
+function within_custom_element(parent: INode) {
+	while (parent) {
+		if (parent.type === 'InlineComponent') return false;
+		if (parent.type === 'Element' && /-/.test(parent.name)) return true;
+		parent = parent.parent;
+	}
+	return false;
+}
diff --git a/src/compiler/compile/nodes/ThenBlock.ts b/src/compiler/compile/nodes/ThenBlock.ts
index 7f9bbde0f0..720f88ad78 100644
--- a/src/compiler/compile/nodes/ThenBlock.ts
+++ b/src/compiler/compile/nodes/ThenBlock.ts
@@ -1,16 +1,23 @@
 import map_children from './shared/map_children';
 import TemplateScope from './shared/TemplateScope';
 import AbstractBlock from './shared/AbstractBlock';
+import AwaitBlock from './AwaitBlock';
+import Component from '../Component';
+import { TemplateNode } from '../../interfaces';
 
 export default class ThenBlock extends AbstractBlock {
 	type: 'ThenBlock';
 	scope: TemplateScope;
 
-	constructor(component, parent, scope, info) {
+	constructor(component: Component, parent: AwaitBlock, scope: TemplateScope, info: TemplateNode) {
 		super(component, parent, scope, info);
 
 		this.scope = scope.child();
-		this.scope.add(parent.value, parent.expression.dependencies, this);
+		if (parent.then_node) {
+			parent.then_contexts.forEach(context => {
+				this.scope.add(context.key.name, parent.expression.dependencies, this);
+			});
+		}
 		this.children = map_children(component, parent, this.scope, info.children);
 
 		if (!info.skip) {
diff --git a/src/compiler/compile/nodes/shared/Context.ts b/src/compiler/compile/nodes/shared/Context.ts
new file mode 100644
index 0000000000..797405b0fe
--- /dev/null
+++ b/src/compiler/compile/nodes/shared/Context.ts
@@ -0,0 +1,58 @@
+import { x } from 'code-red';
+import { Node, Identifier, RestElement, Property } from 'estree';
+
+export interface Context {
+	key: Identifier;
+	name?: string;
+	modifier: (node: Node) => Node;
+}
+
+export function unpack_destructuring(contexts: Context[], node: Node, modifier: (node: Node) => Node) {
+	if (!node) return;
+
+	if (node.type === 'Identifier') {
+		contexts.push({
+			key: node as Identifier,
+			modifier
+		});
+	} else if (node.type === 'RestElement') {
+		contexts.push({
+			key: node.argument as Identifier,
+			modifier
+		});
+	} else if (node.type === 'ArrayPattern') {
+		node.elements.forEach((element, i) => {
+			if (element && element.type === 'RestElement') {
+				unpack_destructuring(contexts, element, node => x`${modifier(node)}.slice(${i})` as Node);
+			} else if (element && element.type === 'AssignmentPattern') {
+				unpack_destructuring(contexts, element.left, node => x`${modifier(node)}[${i}] !== undefined ? ${modifier(node)}[${i}] : ${element.right}` as Node);
+			} else {
+				unpack_destructuring(contexts, element, node => x`${modifier(node)}[${i}]` as Node);
+			}
+		});
+	} else if (node.type === 'ObjectPattern') {
+		const used_properties = [];
+
+		node.properties.forEach((property) => {
+			const props: (RestElement | Property) = (property as any);
+
+			if (props.type === 'RestElement') {
+				unpack_destructuring(
+					contexts,
+					props.argument,
+					node => x`@object_without_properties(${modifier(node)}, [${used_properties}])` as Node
+				);
+			} else {
+				const key = property.key as Identifier;
+				const value = property.value;
+
+				used_properties.push(x`"${(key as Identifier).name}"`);
+				if (value.type === 'AssignmentPattern') {
+					unpack_destructuring(contexts, value.left, node => x`${modifier(node)}.${key.name} !== undefined ? ${modifier(node)}.${key.name} : ${value.right}` as Node);
+				} else {
+					unpack_destructuring(contexts, value, node => x`${modifier(node)}.${key.name}` as Node);
+				}
+			}
+		});
+	}
+}
diff --git a/src/compiler/compile/nodes/shared/Expression.ts b/src/compiler/compile/nodes/shared/Expression.ts
index db0908c3f4..2f2541c720 100644
--- a/src/compiler/compile/nodes/shared/Expression.ts
+++ b/src/compiler/compile/nodes/shared/Expression.ts
@@ -13,6 +13,7 @@ import { b } from 'code-red';
 import { invalidate } from '../../render_dom/invalidate';
 import { Node, FunctionExpression, Identifier } from 'estree';
 import { TemplateNode } from '../../../interfaces';
+import { is_reserved_keyword } from '../../utils/reserved_keywords';
 
 type Owner = Wrapper | TemplateNode;
 
@@ -158,7 +159,7 @@ export default class Expression {
 	dynamic_dependencies() {
 		return Array.from(this.dependencies).filter(name => {
 			if (this.template_scope.is_let(name)) return true;
-			if (name === '$$props') return true;
+			if (is_reserved_keyword(name)) return true;
 
 			const variable = this.component.var_lookup.get(name);
 			return is_dynamic(variable);
@@ -355,7 +356,7 @@ function get_function_name(_node, parent) {
 }
 
 function is_contextual(component: Component, scope: TemplateScope, name: string) {
-	if (name === '$$props') return true;
+	if (is_reserved_keyword(name)) return true;
 
 	// if it's a name below root scope, it's contextual
 	if (!scope.is_top_level(name)) return true;
diff --git a/src/compiler/compile/render_dom/Block.ts b/src/compiler/compile/render_dom/Block.ts
index 2da77d3fbf..b77cf61112 100644
--- a/src/compiler/compile/render_dom/Block.ts
+++ b/src/compiler/compile/render_dom/Block.ts
@@ -46,6 +46,7 @@ export default class Block {
 	}>;
 
 	chunks: {
+		declarations: Array<Node | Node[]>;
 		init: Array<Node | Node[]>;
 		create: Array<Node | Node[]>;
 		claim: Array<Node | Node[]>;
@@ -93,6 +94,7 @@ export default class Block {
 		this.bindings = options.bindings;
 
 		this.chunks = {
+			declarations: [],
 			init: [],
 			create: [],
 			claim: [],
@@ -183,7 +185,7 @@ export default class Block {
 			this.chunks.mount.push(b`@append(${parent_node}, ${id});`);
 			if (is_head(parent_node) && !no_detach) this.chunks.destroy.push(b`@detach(${id});`);
 		} else {
-			this.chunks.mount.push(b`@insert(#target, ${id}, anchor);`);
+			this.chunks.mount.push(b`@insert(#target, ${id}, #anchor);`);
 			if (!no_detach) this.chunks.destroy.push(b`if (detaching) @detach(${id});`);
 		}
 	}
@@ -292,8 +294,12 @@ export default class Block {
 
 		if (this.chunks.mount.length === 0) {
 			properties.mount = noop;
+		} else if (this.event_listeners.length === 0) {
+			properties.mount = x`function #mount(#target, #anchor) {
+				${this.chunks.mount}
+			}`;
 		} else {
-			properties.mount = x`function #mount(#target, anchor) {
+			properties.mount = x`function #mount(#target, #anchor) {
 				${this.chunks.mount}
 			}`;
 		}
@@ -384,6 +390,8 @@ export default class Block {
 		const block = dev && this.get_unique_name('block');
 
 		const body = b`
+			${this.chunks.declarations}
+
 			${Array.from(this.variables.values()).map(({ id, init }) => {
 				return init
 					? b`let ${id} = ${init}`
@@ -411,8 +419,8 @@ export default class Block {
 		return body;
 	}
 
-	has_content() {
-		return this.first ||
+	has_content(): boolean {
+		return !!this.first ||
 			this.event_listeners.length > 0 ||
 			this.chunks.intro.length > 0 ||
 			this.chunks.outro.length > 0  ||
@@ -444,6 +452,9 @@ export default class Block {
 
 	render_listeners(chunk: string = '') {
 		if (this.event_listeners.length > 0) {
+			this.add_variable({ type: 'Identifier', name: '#mounted' });
+			this.chunks.destroy.push(b`#mounted = false`);
+
 			const dispose: Identifier = {
 				type: 'Identifier',
 				name: `#dispose${chunk}`
@@ -453,7 +464,12 @@ export default class Block {
 
 			if (this.event_listeners.length === 1) {
 				this.chunks.mount.push(
-					b`${dispose} = ${this.event_listeners[0]};`
+					b`
+						if (!#mounted) {
+							${dispose} = ${this.event_listeners[0]};
+							#mounted = true;
+						}
+					`
 				);
 
 				this.chunks.destroy.push(
@@ -461,9 +477,12 @@ export default class Block {
 				);
 			} else {
 				this.chunks.mount.push(b`
-					${dispose} = [
-						${this.event_listeners}
-					];
+					if (!#mounted) {
+						${dispose} = [
+							${this.event_listeners}
+						];
+						#mounted = true;
+					}
 				`);
 
 				this.chunks.destroy.push(
diff --git a/src/compiler/compile/render_dom/Renderer.ts b/src/compiler/compile/render_dom/Renderer.ts
index 2501279214..ca93c51060 100644
--- a/src/compiler/compile/render_dom/Renderer.ts
+++ b/src/compiler/compile/render_dom/Renderer.ts
@@ -5,6 +5,7 @@ import FragmentWrapper from './wrappers/Fragment';
 import { x } from 'code-red';
 import { Node, Identifier, MemberExpression, Literal, Expression, BinaryExpression } from 'estree';
 import flatten_reference from '../utils/flatten_reference';
+import { reserved_keywords } from '../utils/reserved_keywords';
 
 interface ContextMember {
 	name: string;
@@ -50,9 +51,11 @@ export default class Renderer {
 		// ensure store values are included in context
 		component.vars.filter(v => v.subscribable).forEach(v => this.add_to_context(`$${v.name}`));
 
-		if (component.var_lookup.has('$$props')) {
-			this.add_to_context('$$props');
-		}
+		reserved_keywords.forEach(keyword => {
+			if (component.var_lookup.has(keyword)) {
+				this.add_to_context(keyword);
+			}
+		});
 
 		if (component.slots.size > 0) {
 			this.add_to_context('$$scope');
@@ -281,4 +284,8 @@ export default class Renderer {
 
 		return node;
 	}
+
+	remove_block(block: Block | Node | Node[]) {
+		this.blocks.splice(this.blocks.indexOf(block), 1);
+	}
 }
diff --git a/src/compiler/compile/render_dom/index.ts b/src/compiler/compile/render_dom/index.ts
index fc3c94a2be..4009c6bddf 100644
--- a/src/compiler/compile/render_dom/index.ts
+++ b/src/compiler/compile/render_dom/index.ts
@@ -71,14 +71,24 @@ export default function dom(
 	}
 
 	const uses_props = component.var_lookup.has('$$props');
-	const $$props = uses_props ? `$$new_props` : `$$props`;
+	const uses_rest = component.var_lookup.has('$$restProps');
+	const $$props = uses_props || uses_rest ? `$$new_props` : `$$props`;
 	const props = component.vars.filter(variable => !variable.module && variable.export_name);
 	const writable_props = props.filter(variable => variable.writable);
 
-	const set = (uses_props || writable_props.length > 0 || component.slots.size > 0)
+	const omit_props_names = component.get_unique_name('omit_props_names');
+	const compute_rest = x`@compute_rest_props($$props, ${omit_props_names.name})`;
+	const rest = uses_rest ? b`
+		const ${omit_props_names.name} = [${props.map(prop => `"${prop.export_name}"`).join(',')}];
+		let $$restProps = ${compute_rest};
+	` : null;
+
+	const set = (uses_props || uses_rest || writable_props.length > 0 || component.slots.size > 0)
 		? x`
 			${$$props} => {
 				${uses_props && renderer.invalidate('$$props', x`$$props = @assign(@assign({}, $$props), @exclude_internal_props($$new_props))`)}
+				${uses_rest && !uses_props && x`$$props = @assign(@assign({}, $$props), @exclude_internal_props($$new_props))`}
+				${uses_rest && renderer.invalidate('$$restProps', x`$$restProps = ${compute_rest}`)}
 				${writable_props.map(prop =>
 					b`if ('${prop.export_name}' in ${$$props}) ${renderer.invalidate(prop.name, x`${prop.name} = ${$$props}.${prop.export_name}`)};`
 				)}
@@ -341,20 +351,20 @@ export default function dom(
 
 		component.reactive_declarations.forEach(d => {
 			const dependencies = Array.from(d.dependencies);
-			const uses_props = !!dependencies.find(n => n === '$$props');
+			const uses_rest_or_props = !!dependencies.find(n => n === '$$props' || n === '$$restProps');
 
 			const writable = dependencies.filter(n => {
 				const variable = component.var_lookup.get(n);
 				return variable && (variable.export_name || variable.mutated || variable.reassigned);
 			});
 
-			const condition = !uses_props && writable.length > 0 && renderer.dirty(writable, true);
+			const condition = !uses_rest_or_props && writable.length > 0 && renderer.dirty(writable, true);
 
 			let statement = d.node; // TODO remove label (use d.node.body) if it's not referenced
 
 			if (condition) statement = b`if (${condition}) { ${statement} }`[0] as Statement;
 
-			if (condition || uses_props) {
+			if (condition || uses_rest_or_props) {
 				reactive_declarations.push(statement);
 			} else {
 				fixed_reactive_declarations.push(statement);
@@ -383,7 +393,7 @@ export default function dom(
 		});
 
 		let unknown_props_check;
-		if (component.compile_options.dev && !component.var_lookup.has('$$props')) {
+		if (component.compile_options.dev && !(uses_props || uses_rest)) {
 			unknown_props_check = b`
 				const writable_props = [${writable_props.map(prop => x`'${prop.export_name}'`)}];
 				@_Object.keys($$props).forEach(key => {
@@ -402,6 +412,8 @@ export default function dom(
 
 		body.push(b`
 			function ${definition}(${args}) {
+				${rest}
+
 				${reactive_store_declarations}
 
 				${reactive_store_subscriptions}
@@ -473,7 +485,7 @@ export default function dom(
 							@insert(options.target, this, options.anchor);
 						}
 
-						${(props.length > 0 || uses_props) && b`
+						${(props.length > 0 || uses_props || uses_rest) && b`
 						if (options.props) {
 							this.$set(options.props);
 							@flush();
diff --git a/src/compiler/compile/render_dom/wrappers/AwaitBlock.ts b/src/compiler/compile/render_dom/wrappers/AwaitBlock.ts
index 12b7fc2cef..ceb898bf79 100644
--- a/src/compiler/compile/render_dom/wrappers/AwaitBlock.ts
+++ b/src/compiler/compile/render_dom/wrappers/AwaitBlock.ts
@@ -8,26 +8,37 @@ import FragmentWrapper from './Fragment';
 import PendingBlock from '../../nodes/PendingBlock';
 import ThenBlock from '../../nodes/ThenBlock';
 import CatchBlock from '../../nodes/CatchBlock';
-import { Identifier } from 'estree';
+import { Context } from '../../nodes/shared/Context';
+import { Identifier, Literal, Node } from 'estree';
+
+type Status = 'pending' | 'then' | 'catch';
 
 class AwaitBlockBranch extends Wrapper {
+	parent: AwaitBlockWrapper;
 	node: PendingBlock | ThenBlock | CatchBlock;
 	block: Block;
 	fragment: FragmentWrapper;
 	is_dynamic: boolean;
 
 	var = null;
+	status: Status;
+
+	value: string;
+	value_index: Literal;
+	value_contexts: Context[];
+	is_destructured: boolean;
 
 	constructor(
-		status: string,
+		status: Status,
 		renderer: Renderer,
 		block: Block,
-		parent: Wrapper,
-		node: AwaitBlock,
+		parent: AwaitBlockWrapper,
+		node: PendingBlock | ThenBlock | CatchBlock,
 		strip_whitespace: boolean,
 		next_sibling: Wrapper
 	) {
 		super(renderer, block, parent, node);
+		this.status = status;
 
 		this.block = block.child({
 			comment: create_debugging_comment(node, this.renderer.component),
@@ -35,6 +46,8 @@ class AwaitBlockBranch extends Wrapper {
 			type: status
 		});
 
+		this.add_context(parent.node[status + '_node'], parent.node[status + '_contexts']);
+
 		this.fragment = new FragmentWrapper(
 			renderer,
 			this.block,
@@ -46,6 +59,46 @@ class AwaitBlockBranch extends Wrapper {
 
 		this.is_dynamic = this.block.dependencies.size > 0;
 	}
+
+	add_context(node: Node | null, contexts: Context[]) {
+		if (!node) return;
+
+		if (node.type === 'Identifier') {
+			this.value = node.name;
+			this.renderer.add_to_context(this.value, true);
+		} else {
+			contexts.forEach(context => {
+				this.renderer.add_to_context(context.key.name, true);
+			});
+			this.value = this.block.parent.get_unique_name('value').name;
+			this.value_contexts = contexts;
+			this.renderer.add_to_context(this.value, true);
+			this.is_destructured = true;
+		}
+		this.value_index = this.renderer.context_lookup.get(this.value).index;
+	}
+
+	render(block: Block, parent_node: Identifier, parent_nodes: Identifier) {
+		this.fragment.render(block, parent_node, parent_nodes);
+
+		if (this.is_destructured) {
+			this.render_destructure();
+		}
+	}
+
+	render_destructure() {
+		const props = this.value_contexts.map(prop => b`#ctx[${this.block.renderer.context_lookup.get(prop.key.name).index}] = ${prop.modifier(x`#ctx[${this.value_index}]`)};`);
+		const get_context = this.block.renderer.component.get_unique_name(`get_${this.status}_context`);
+		this.block.renderer.blocks.push(b`
+			function ${get_context}(#ctx) {
+				${props}
+			}
+		`);
+		this.block.chunks.declarations.push(b`${get_context}(#ctx)`);
+		if (this.block.has_update_method) {
+			this.block.chunks.update.push(b`${get_context}(#ctx)`);
+		}
+	}
 }
 
 export default class AwaitBlockWrapper extends Wrapper {
@@ -71,14 +124,12 @@ export default class AwaitBlockWrapper extends Wrapper {
 		this.not_static_content();
 
 		block.add_dependencies(this.node.expression.dependencies);
-		if (this.node.value) block.renderer.add_to_context(this.node.value, true);
-		if (this.node.error) block.renderer.add_to_context(this.node.error, true);
 
 		let is_dynamic = false;
 		let has_intros = false;
 		let has_outros = false;
 
-		['pending', 'then', 'catch'].forEach(status => {
+		['pending', 'then', 'catch'].forEach((status: Status) => {
 			const child = this.node[status];
 
 			const branch = new AwaitBlockBranch(
@@ -105,17 +156,11 @@ export default class AwaitBlockWrapper extends Wrapper {
 			this[status] = branch;
 		});
 
-		this.pending.block.has_update_method = is_dynamic;
-		this.then.block.has_update_method = is_dynamic;
-		this.catch.block.has_update_method = is_dynamic;
-
-		this.pending.block.has_intro_method = has_intros;
-		this.then.block.has_intro_method = has_intros;
-		this.catch.block.has_intro_method = has_intros;
-
-		this.pending.block.has_outro_method = has_outros;
-		this.then.block.has_outro_method = has_outros;
-		this.catch.block.has_outro_method = has_outros;
+		['pending', 'then', 'catch'].forEach(status => {
+			this[status].block.has_update_method = is_dynamic;
+			this[status].block.has_intro_method = has_intros;
+			this[status].block.has_outro_method = has_outros;
+		});
 
 		if (has_outros) {
 			block.add_outro();
@@ -139,9 +184,6 @@ export default class AwaitBlockWrapper extends Wrapper {
 
 		block.maintain_context = true;
 
-		const value_index = this.node.value && block.renderer.context_lookup.get(this.node.value).index;
-		const error_index = this.node.error && block.renderer.context_lookup.get(this.node.error).index;
-
 		const info_props: any = x`{
 			ctx: #ctx,
 			current: null,
@@ -149,8 +191,8 @@ export default class AwaitBlockWrapper extends Wrapper {
 			pending: ${this.pending.block.name},
 			then: ${this.then.block.name},
 			catch: ${this.catch.block.name},
-			value: ${value_index},
-			error: ${error_index},
+			value: ${this.then.value_index},
+			error: ${this.catch.value_index},
 			blocks: ${this.pending.block.has_outro_method && x`[,,,]`}
 		}`;
 
@@ -173,7 +215,7 @@ export default class AwaitBlockWrapper extends Wrapper {
 		}
 
 		const initial_mount_node = parent_node || '#target';
-		const anchor_node = parent_node ? 'null' : 'anchor';
+		const anchor_node = parent_node ? 'null' : '#anchor';
 
 		const has_transitions = this.pending.block.has_intro_method || this.pending.block.has_outro_method;
 
@@ -205,7 +247,7 @@ export default class AwaitBlockWrapper extends Wrapper {
 
 					} else {
 						const #child_ctx = #ctx.slice();
-						${this.node.value && b`#child_ctx[${value_index}] = ${info}.resolved;`}
+						${this.then.value && b`#child_ctx[${this.then.value_index}] = ${info}.resolved;`}
 						${info}.block.p(#child_ctx, #dirty);
 					}
 				`);
@@ -219,7 +261,7 @@ export default class AwaitBlockWrapper extends Wrapper {
 				block.chunks.update.push(b`
 					{
 						const #child_ctx = #ctx.slice();
-						${this.node.value && b`#child_ctx[${value_index}] = ${info}.resolved;`}
+						${this.then.value && b`#child_ctx[${this.then.value_index}] = ${info}.resolved;`}
 						${info}.block.p(#child_ctx, #dirty);
 					}
 				`);
@@ -242,7 +284,7 @@ export default class AwaitBlockWrapper extends Wrapper {
 		`);
 
 		[this.pending, this.then, this.catch].forEach(branch => {
-			branch.fragment.render(branch.block, null, x`#nodes` as Identifier);
+			branch.render(branch.block, null, x`#nodes` as Identifier);
 		});
 	}
 }
diff --git a/src/compiler/compile/render_dom/wrappers/EachBlock.ts b/src/compiler/compile/render_dom/wrappers/EachBlock.ts
index f0dfa5fbcc..1efadfb90c 100644
--- a/src/compiler/compile/render_dom/wrappers/EachBlock.ts
+++ b/src/compiler/compile/render_dom/wrappers/EachBlock.ts
@@ -62,6 +62,8 @@ export default class EachBlockWrapper extends Wrapper {
 
 	context_props: Array<Node | Node[]>;
 	index_name: Identifier;
+	updates: Array<Node | Node[]> = [];
+	dependencies: Set<string>;
 
 	var: Identifier = { type: 'Identifier', name: 'each' };
 
@@ -217,7 +219,7 @@ export default class EachBlockWrapper extends Wrapper {
 			}
 		`);
 
-		const initial_anchor_node: Identifier = { type: 'Identifier', name: parent_node ? 'null' : 'anchor' };
+		const initial_anchor_node: Identifier = { type: 'Identifier', name: parent_node ? 'null' : '#anchor' };
 		const initial_mount_node: Identifier = parent_node || { type: 'Identifier', name: '#target' };
 		const update_anchor_node = needs_anchor
 			? block.get_unique_name(`${this.var.name}_anchor`)
@@ -235,6 +237,12 @@ export default class EachBlockWrapper extends Wrapper {
 			update_mount_node
 		};
 
+		const all_dependencies = new Set(this.block.dependencies); // TODO should be dynamic deps only
+		this.node.expression.dynamic_dependencies().forEach((dependency: string) => {
+			all_dependencies.add(dependency);
+		});
+		this.dependencies = all_dependencies;
+
 		if (this.node.key) {
 			this.render_keyed(args);
 		} else {
@@ -291,7 +299,7 @@ export default class EachBlockWrapper extends Wrapper {
 			`);
 
 			if (this.else.block.has_update_method) {
-				block.chunks.update.push(b`
+				this.updates.push(b`
 					if (!${this.vars.data_length} && ${each_block_else}) {
 						${each_block_else}.p(#ctx, #dirty);
 					} else if (!${this.vars.data_length}) {
@@ -304,7 +312,7 @@ export default class EachBlockWrapper extends Wrapper {
 					}
 				`);
 			} else {
-				block.chunks.update.push(b`
+				this.updates.push(b`
 					if (${this.vars.data_length}) {
 						if (${each_block_else}) {
 							${each_block_else}.d(1);
@@ -323,6 +331,14 @@ export default class EachBlockWrapper extends Wrapper {
 			`);
 		}
 
+		if (this.updates.length) {
+			block.chunks.update.push(b`
+				if (${block.renderer.dirty(Array.from(all_dependencies))}) {
+					${this.updates}
+				}
+			`);
+		}
+
 		this.fragment.render(this.block, null, x`#nodes` as Identifier);
 
 		if (this.else) {
@@ -415,24 +431,17 @@ export default class EachBlockWrapper extends Wrapper {
 				? `@outro_and_destroy_block`
 				: `@destroy_block`;
 
-		const all_dependencies = new Set(this.block.dependencies); // TODO should be dynamic deps only
-		this.node.expression.dynamic_dependencies().forEach((dependency: string) => {
-			all_dependencies.add(dependency);
-		});
+		if (this.dependencies.size) {
+			this.updates.push(b`
+				const ${this.vars.each_block_value} = ${snippet};
+				${this.renderer.options.dev && b`@validate_each_argument(${this.vars.each_block_value});`}
 
-		if (all_dependencies.size) {
-			block.chunks.update.push(b`
-				if (${block.renderer.dirty(Array.from(all_dependencies))}) {
-					const ${this.vars.each_block_value} = ${snippet};
-					${this.renderer.options.dev && b`@validate_each_argument(${this.vars.each_block_value});`}
-
-					${this.block.has_outros && b`@group_outros();`}
-					${this.node.has_animation && b`for (let #i = 0; #i < ${view_length}; #i += 1) ${iterations}[#i].r();`}
-					${this.renderer.options.dev && b`@validate_each_keys(#ctx, ${this.vars.each_block_value}, ${this.vars.get_each_context}, ${get_key});`}
-					${iterations} = @update_keyed_each(${iterations}, #dirty, ${get_key}, ${dynamic ? 1 : 0}, #ctx, ${this.vars.each_block_value}, ${lookup}, ${update_mount_node}, ${destroy}, ${create_each_block}, ${update_anchor_node}, ${this.vars.get_each_context});
-					${this.node.has_animation && b`for (let #i = 0; #i < ${view_length}; #i += 1) ${iterations}[#i].a();`}
-					${this.block.has_outros && b`@check_outros();`}
-				}
+				${this.block.has_outros && b`@group_outros();`}
+				${this.node.has_animation && b`for (let #i = 0; #i < ${view_length}; #i += 1) ${iterations}[#i].r();`}
+				${this.renderer.options.dev && b`@validate_each_keys(#ctx, ${this.vars.each_block_value}, ${this.vars.get_each_context}, ${get_key});`}
+				${iterations} = @update_keyed_each(${iterations}, #dirty, ${get_key}, ${dynamic ? 1 : 0}, #ctx, ${this.vars.each_block_value}, ${lookup}, ${update_mount_node}, ${destroy}, ${create_each_block}, ${update_anchor_node}, ${this.vars.get_each_context});
+				${this.node.has_animation && b`for (let #i = 0; #i < ${view_length}; #i += 1) ${iterations}[#i].a();`}
+				${this.block.has_outros && b`@check_outros();`}
 			`);
 		}
 
@@ -504,12 +513,7 @@ export default class EachBlockWrapper extends Wrapper {
 			}
 		`);
 
-		const all_dependencies = new Set(this.block.dependencies); // TODO should be dynamic deps only
-		this.node.expression.dynamic_dependencies().forEach((dependency: string) => {
-			all_dependencies.add(dependency);
-		});
-
-		if (all_dependencies.size) {
+		if (this.dependencies.size) {
 			const has_transitions = !!(this.block.has_intro_method || this.block.has_outro_method);
 
 			const for_loop_body = this.block.has_update_method
@@ -588,11 +592,7 @@ export default class EachBlockWrapper extends Wrapper {
 				${remove_old_blocks}
 			`;
 
-			block.chunks.update.push(b`
-				if (${block.renderer.dirty(Array.from(all_dependencies))}) {
-					${update}
-				}
-			`);
+			this.updates.push(update);
 		}
 
 		if (this.block.has_outros) {
diff --git a/src/compiler/compile/render_dom/wrappers/Element/Attribute.ts b/src/compiler/compile/render_dom/wrappers/Element/Attribute.ts
index 85f252f57e..ca941b7be9 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/Attribute.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/Attribute.ts
@@ -102,25 +102,12 @@ export default class AttributeWrapper {
 		} else if (is_select_value_attribute) {
 			// annoying special case
 			const is_multiple_select = element.node.get_static_attribute_value('multiple');
-			const i = block.get_unique_name('i');
-			const option = block.get_unique_name('option');
-
-			const if_statement = is_multiple_select
-				? b`
-					${option}.selected = ~${last}.indexOf(${option}.__value);`
-				: b`
-					if (${option}.__value === ${last}) {
-						${option}.selected = true;
-						${{ type: 'BreakStatement' }};
-					}`; // TODO the BreakStatement is gross, but it's unsyntactic otherwise...
-
-			updater = b`
-				for (var ${i} = 0; ${i} < ${element.var}.options.length; ${i} += 1) {
-					var ${option} = ${element.var}.options[${i}];
-
-					${if_statement}
-				}
-			`;
+
+			if (is_multiple_select) {
+				updater = b`@select_options(${element.var}, ${last});`;
+			} else {
+				updater = b`@select_option(${element.var}, ${last});`;
+			}
 
 			block.chunks.mount.push(b`
 				${last} = ${value};
diff --git a/src/compiler/compile/render_dom/wrappers/Element/Binding.ts b/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
index eca6e9d325..6222eb04a4 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
@@ -57,7 +57,7 @@ export default class BindingWrapper {
 
 		this.is_readonly = this.node.is_readonly;
 
-		this.needs_lock = this.node.name === 'currentTime' || (parent.node.name === 'input' && parent.node.get_static_attribute_value('type') === 'number'); // TODO others?
+		this.needs_lock = this.node.name === 'currentTime';  // TODO others?
 	}
 
 	get_dependencies() {
@@ -87,17 +87,29 @@ export default class BindingWrapper {
 		const update_conditions: any[] = this.needs_lock ? [x`!${lock}`] : [];
 		const mount_conditions: any[] = [];
 
-		const dependency_array = [...this.node.expression.dependencies];
+		const dependency_array = Array.from(this.get_dependencies());
 
 		if (dependency_array.length > 0) {
 			update_conditions.push(block.renderer.dirty(dependency_array));
 		}
 
-		if (parent.node.name === 'input') {
-			const type = parent.node.get_static_attribute_value('type');
-
-			if (type === null || type === "" || type === "text" || type === "email" || type === "password") {
-				update_conditions.push(x`${parent.var}.${this.node.name} !== ${this.snippet}`);
+		if (parent.node.name === "input") {
+			const type = parent.node.get_static_attribute_value("type");
+
+			if (
+				type === null ||
+				type === "" ||
+				type === "text" ||
+				type === "email" ||
+				type === "password"
+			) {
+				update_conditions.push(
+					x`${parent.var}.${this.node.name} !== ${this.snippet}`
+				);
+			} else if (type === "number") {
+				update_conditions.push(
+					x`@to_number(${parent.var}.${this.node.name}) !== ${this.snippet}`
+				);
 			}
 		}
 
diff --git a/src/compiler/compile/render_dom/wrappers/Element/index.ts b/src/compiler/compile/render_dom/wrappers/Element/index.ts
index 9291f329b6..f0b8329641 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/index.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/index.ts
@@ -93,7 +93,7 @@ const events = [
 		event_names: ['volumechange'],
 		filter: (node: Element, name: string) =>
 			node.is_media_node() &&
-			name === 'volume'
+			(name === 'volume' || name === 'muted')
 	},
 	{
 		event_names: ['ratechange'],
@@ -320,7 +320,7 @@ export default class ElementWrapper extends Wrapper {
 				block.chunks.destroy.push(b`@detach(${node});`);
 			}
 		} else {
-			block.chunks.mount.push(b`@insert(#target, ${node}, anchor);`);
+			block.chunks.mount.push(b`@insert(#target, ${node}, #anchor);`);
 
 			// TODO we eventually need to consider what happens to elements
 			// that belong to the same outgroup as an outroing element...
@@ -405,7 +405,7 @@ export default class ElementWrapper extends Wrapper {
 	get_render_statement(block: Block) {
 		const { name, namespace } = this.node;
 
-		if (namespace === 'http://www.w3.org/2000/svg') {
+		if (namespace === namespaces.svg) {
 			return x`@svg_element("${name}")`;
 		}
 
@@ -586,7 +586,7 @@ export default class ElementWrapper extends Wrapper {
 					);
 
 					block.chunks.destroy.push(
-						b`${resize_listener}.cancel();`
+						b`${resize_listener}();`
 					);
 				} else {
 					block.event_listeners.push(
@@ -705,10 +705,27 @@ export default class ElementWrapper extends Wrapper {
 		);
 
 		block.chunks.update.push(b`
-			${fn}(${this.var}, @get_spread_update(${levels}, [
+			${fn}(${this.var}, ${data} = @get_spread_update(${levels}, [
 				${updates}
 			]));
 		`);
+
+		// handle edge cases for elements
+		if (this.node.name === 'select') {
+			const dependencies = new Set();
+			for (const attr of this.attributes) {
+				for (const dep of attr.node.dependencies) {
+					dependencies.add(dep);
+				}
+			}
+
+			block.chunks.mount.push(b`
+				if (${data}.multiple) @select_options(${this.var}, ${data}.value);
+			`);
+			block.chunks.update.push(b`
+				if (${block.renderer.dirty(Array.from(dependencies))} && ${data}.multiple) @select_options(${this.var}, ${data}.value);
+			`);
+		}
 	}
 
 	add_transitions(
diff --git a/src/compiler/compile/render_dom/wrappers/IfBlock.ts b/src/compiler/compile/render_dom/wrappers/IfBlock.ts
index 207e1e349e..220b529902 100644
--- a/src/compiler/compile/render_dom/wrappers/IfBlock.ts
+++ b/src/compiler/compile/render_dom/wrappers/IfBlock.ts
@@ -293,7 +293,7 @@ export default class IfBlockWrapper extends Wrapper {
 		`);
 
 		const initial_mount_node = parent_node || '#target';
-		const anchor_node = parent_node ? 'null' : 'anchor';
+		const anchor_node = parent_node ? 'null' : '#anchor';
 
 		if (if_exists_condition) {
 			block.chunks.mount.push(
@@ -334,7 +334,11 @@ export default class IfBlockWrapper extends Wrapper {
 				`);
 			}
 		} else if (dynamic) {
-			block.chunks.update.push(b`${name}.p(#ctx, #dirty);`);
+			if (if_exists_condition) {
+				block.chunks.update.push(b`if (${if_exists_condition}) ${name}.p(#ctx, #dirty);`);
+			} else {
+				block.chunks.update.push(b`${name}.p(#ctx, #dirty);`);
+			}
 		}
 
 		if (if_exists_condition) {
@@ -357,7 +361,7 @@ export default class IfBlockWrapper extends Wrapper {
 		parent_node: Identifier,
 		_parent_nodes: Identifier,
 		dynamic,
-		{ name, anchor, has_else, has_transitions },
+		{ name, anchor, has_else, has_transitions, if_exists_condition },
 		detaching
 	) {
 		const select_block_type = this.renderer.component.get_unique_name(`select_block_type`);
@@ -388,7 +392,7 @@ export default class IfBlockWrapper extends Wrapper {
 						${snippet && (
 							dependencies.length > 0
 								? b`if (${block.renderer.dirty(dependencies)}) ${condition} = !!${snippet}`
-								: b`if (${condition} == -1) ${condition} = !!${snippet}`
+								: b`if (${condition} == null) ${condition} = !!${snippet}`
 						)}
 						if (${condition}) return ${i};`
 						: b`return ${i};`)}
@@ -419,7 +423,7 @@ export default class IfBlockWrapper extends Wrapper {
 		}
 
 		const initial_mount_node = parent_node || '#target';
-		const anchor_node = parent_node ? 'null' : 'anchor';
+		const anchor_node = parent_node ? 'null' : '#anchor';
 
 		block.chunks.mount.push(
 			if_current_block_type_index(
@@ -486,7 +490,11 @@ export default class IfBlockWrapper extends Wrapper {
 				`);
 			}
 		} else if (dynamic) {
-			block.chunks.update.push(b`${name}.p(#ctx, #dirty);`);
+			if (if_exists_condition) {
+				block.chunks.update.push(b`if (${if_exists_condition}) ${name}.p(#ctx, #dirty);`);
+			} else {
+				block.chunks.update.push(b`${name}.p(#ctx, #dirty);`);
+			}
 		}
 
 		block.chunks.destroy.push(
@@ -511,7 +519,7 @@ export default class IfBlockWrapper extends Wrapper {
 		`);
 
 		const initial_mount_node = parent_node || '#target';
-		const anchor_node = parent_node ? 'null' : 'anchor';
+		const anchor_node = parent_node ? 'null' : '#anchor';
 
 		block.chunks.mount.push(
 			b`if (${name}) ${name}.m(${initial_mount_node}, ${anchor_node});`
@@ -520,28 +528,22 @@ export default class IfBlockWrapper extends Wrapper {
 		if (branch.dependencies.length > 0) {
 			const update_mount_node = this.get_update_mount_node(anchor);
 
-			const enter = dynamic
-				? b`
-					if (${name}) {
-						${name}.p(#ctx, #dirty);
-						${has_transitions && b`@transition_in(${name}, 1);`}
-					} else {
-						${name} = ${branch.block.name}(#ctx);
-						${name}.c();
-						${has_transitions && b`@transition_in(${name}, 1);`}
-						${name}.m(${update_mount_node}, ${anchor});
-					}
-				`
-				: b`
-					if (!${name}) {
-						${name} = ${branch.block.name}(#ctx);
-						${name}.c();
-						${has_transitions && b`@transition_in(${name}, 1);`}
-						${name}.m(${update_mount_node}, ${anchor});
-					} else {
-						${has_transitions && b`@transition_in(${name}, 1);`}
+			const enter = b`
+				if (${name}) {
+					${dynamic && b`${name}.p(#ctx, #dirty);`}
+					${
+						has_transitions &&
+						b`if (${block.renderer.dirty(branch.dependencies)}) {
+							@transition_in(${name}, 1);
+						}`
 					}
-				`;
+				} else {
+					${name} = ${branch.block.name}(#ctx);
+					${name}.c();
+					${has_transitions && b`@transition_in(${name}, 1);`}
+					${name}.m(${update_mount_node}, ${anchor});
+				}
+			`;
 
 			if (branch.snippet) {
 				block.chunks.update.push(b`if (${block.renderer.dirty(branch.dependencies)}) ${branch.condition} = ${branch.snippet}`);
diff --git a/src/compiler/compile/render_dom/wrappers/InlineComponent/index.ts b/src/compiler/compile/render_dom/wrappers/InlineComponent/index.ts
index 8c8bd70696..00f803bbbd 100644
--- a/src/compiler/compile/render_dom/wrappers/InlineComponent/index.ts
+++ b/src/compiler/compile/render_dom/wrappers/InlineComponent/index.ts
@@ -155,6 +155,7 @@ export default class InlineComponentWrapper extends Wrapper {
 		// removing empty slot
 		for (const slot of this.slots.keys()) {
 			if (!this.slots.get(slot).block.has_content()) {
+				this.renderer.remove_block(this.slots.get(slot).block);
 				this.slots.delete(slot);
 			}
 		}
@@ -434,7 +435,7 @@ export default class InlineComponentWrapper extends Wrapper {
 
 			block.chunks.mount.push(b`
 				if (${name}) {
-					@mount_component(${name}, ${parent_node || '#target'}, ${parent_node ? 'null' : 'anchor'});
+					@mount_component(${name}, ${parent_node || '#target'}, ${parent_node ? 'null' : '#anchor'});
 				}
 			`);
 
@@ -508,7 +509,7 @@ export default class InlineComponentWrapper extends Wrapper {
 			}
 
 			block.chunks.mount.push(
-				b`@mount_component(${name}, ${parent_node || '#target'}, ${parent_node ? 'null' : 'anchor'});`
+				b`@mount_component(${name}, ${parent_node || '#target'}, ${parent_node ? 'null' : '#anchor'});`
 			);
 
 			block.chunks.intro.push(b`
diff --git a/src/compiler/compile/render_dom/wrappers/RawMustacheTag.ts b/src/compiler/compile/render_dom/wrappers/RawMustacheTag.ts
index 3b13e6c68a..1e6213cf02 100644
--- a/src/compiler/compile/render_dom/wrappers/RawMustacheTag.ts
+++ b/src/compiler/compile/render_dom/wrappers/RawMustacheTag.ts
@@ -53,8 +53,8 @@ export default class RawMustacheTagWrapper extends Tag {
 
 			const update_anchor = in_head ? 'null' : needs_anchor ? html_anchor : this.next ? this.next.var : 'null';
 
-			block.chunks.hydrate.push(b`${html_tag} = new @HtmlTag(${init}, ${update_anchor});`);
-			block.chunks.mount.push(b`${html_tag}.m(${parent_node || '#target'}, ${parent_node ? null : 'anchor'});`);
+			block.chunks.hydrate.push(b`${html_tag} = new @HtmlTag(${update_anchor});`);
+			block.chunks.mount.push(b`${html_tag}.m(${init}, ${parent_node || '#target'}, ${parent_node ? null : '#anchor'});`);
 
 			if (needs_anchor) {
 				block.add_element(html_anchor, x`@empty()`, x`@empty()`, parent_node);
diff --git a/src/compiler/compile/render_dom/wrappers/Slot.ts b/src/compiler/compile/render_dom/wrappers/Slot.ts
index 5f2d331839..268875acaf 100644
--- a/src/compiler/compile/render_dom/wrappers/Slot.ts
+++ b/src/compiler/compile/render_dom/wrappers/Slot.ts
@@ -10,10 +10,12 @@ import get_slot_data from '../../utils/get_slot_data';
 import Expression from '../../nodes/shared/Expression';
 import is_dynamic from './shared/is_dynamic';
 import { Identifier, ObjectExpression } from 'estree';
+import create_debugging_comment from './shared/create_debugging_comment';
 
 export default class SlotWrapper extends Wrapper {
 	node: Slot;
 	fragment: FragmentWrapper;
+	fallback: Block | null = null;
 
 	var: Identifier = { type: 'Identifier', name: 'slot' };
 	dependencies: Set<string> = new Set(['$$scope']);
@@ -30,11 +32,20 @@ export default class SlotWrapper extends Wrapper {
 		this.cannot_use_innerhtml();
 		this.not_static_content();
 
+		if (this.node.children.length) {
+			this.fallback = block.child({
+				comment: create_debugging_comment(this.node.children[0], this.renderer.component),
+				name: this.renderer.component.get_unique_name(`fallback_block`),
+				type: 'fallback'
+			});
+			renderer.blocks.push(this.fallback);
+		}
+
 		this.fragment = new FragmentWrapper(
 			renderer,
-			block,
+			this.fallback,
 			node.children,
-			parent,
+			this,
 			strip_whitespace,
 			next_sibling
 		);
@@ -103,86 +114,91 @@ export default class SlotWrapper extends Wrapper {
 			get_slot_context_fn = 'null';
 		}
 
+		let has_fallback = !!this.fallback;
+		if (this.fallback) {
+			this.fragment.render(this.fallback, null, x`#nodes` as Identifier);
+			has_fallback = this.fallback.has_content();
+			if (!has_fallback) {
+				renderer.remove_block(this.fallback);
+			}
+		}
+
 		const slot = block.get_unique_name(`${sanitize(slot_name)}_slot`);
 		const slot_definition = block.get_unique_name(`${sanitize(slot_name)}_slot_template`);
+		const slot_or_fallback = has_fallback ? block.get_unique_name(`${sanitize(slot_name)}_slot_or_fallback`) : slot;
 
 		block.chunks.init.push(b`
 			const ${slot_definition} = ${renderer.reference('$$slots')}.${slot_name};
 			const ${slot} = @create_slot(${slot_definition}, #ctx, ${renderer.reference('$$scope')}, ${get_slot_context_fn});
+			${has_fallback ? b`const ${slot_or_fallback} = ${slot} || ${this.fallback.name}(#ctx);` : null}
 		`);
 
-		// TODO this is a dreadful hack! Should probably make this nicer
-		const { create, claim, hydrate, mount, update, destroy } = block.chunks;
-
-		block.chunks.create = [];
-		block.chunks.claim = [];
-		block.chunks.hydrate = [];
-		block.chunks.mount = [];
-		block.chunks.update = [];
-		block.chunks.destroy = [];
-
-		const listeners = block.event_listeners;
-		block.event_listeners = [];
-		this.fragment.render(block, parent_node, parent_nodes);
-		block.render_listeners(`_${slot.name}`);
-		block.event_listeners = listeners;
-
-		if (block.chunks.create.length) create.push(b`if (!${slot}) { ${block.chunks.create} }`);
-		if (block.chunks.claim.length) claim.push(b`if (!${slot}) { ${block.chunks.claim} }`);
-		if (block.chunks.hydrate.length) hydrate.push(b`if (!${slot}) { ${block.chunks.hydrate} }`);
-		if (block.chunks.mount.length) mount.push(b`if (!${slot}) { ${block.chunks.mount} }`);
-		if (block.chunks.update.length) update.push(b`if (!${slot}) { ${block.chunks.update} }`);
-		if (block.chunks.destroy.length) destroy.push(b`if (!${slot}) { ${block.chunks.destroy} }`);
-
-		block.chunks.create = create;
-		block.chunks.claim = claim;
-		block.chunks.hydrate = hydrate;
-		block.chunks.mount = mount;
-		block.chunks.update = update;
-		block.chunks.destroy = destroy;
-
 		block.chunks.create.push(
-			b`if (${slot}) ${slot}.c();`
+			b`if (${slot_or_fallback}) ${slot_or_fallback}.c();`
 		);
 
 		if (renderer.options.hydratable) {
 			block.chunks.claim.push(
-				b`if (${slot}) ${slot}.l(${parent_nodes});`
+				b`if (${slot_or_fallback}) ${slot_or_fallback}.l(${parent_nodes});`
 			);
 		}
 
 		block.chunks.mount.push(b`
-			if (${slot}) {
-				${slot}.m(${parent_node || '#target'}, ${parent_node ? 'null' : 'anchor'});
+			if (${slot_or_fallback}) {
+				${slot_or_fallback}.m(${parent_node || '#target'}, ${parent_node ? 'null' : '#anchor'});
 			}
 		`);
 
 		block.chunks.intro.push(
-			b`@transition_in(${slot}, #local);`
+			b`@transition_in(${slot_or_fallback}, #local);`
 		);
 
 		block.chunks.outro.push(
-			b`@transition_out(${slot}, #local);`
+			b`@transition_out(${slot_or_fallback}, #local);`
 		);
 
-		const dynamic_dependencies = Array.from(this.dependencies).filter(name => {
+		const is_dependency_dynamic = name => {
 			if (name === '$$scope') return true;
 			if (this.node.scope.is_let(name)) return true;
 			const variable = renderer.component.var_lookup.get(name);
 			return is_dynamic(variable);
-		});
+		};
+
+		const dynamic_dependencies = Array.from(this.dependencies).filter(is_dependency_dynamic);
 
-		block.chunks.update.push(b`
-			if (${slot} && ${slot}.p && ${renderer.dirty(dynamic_dependencies)}) {
-				${slot}.p(
-					@get_slot_context(${slot_definition}, #ctx, ${renderer.reference('$$scope')}, ${get_slot_context_fn}),
-					@get_slot_changes(${slot_definition}, ${renderer.reference('$$scope')}, #dirty, ${get_slot_changes_fn})
-				);
+		const fallback_dynamic_dependencies = has_fallback
+			? Array.from(this.fallback.dependencies).filter(is_dependency_dynamic)
+			: [];
+
+		const slot_update = b`
+			if (${slot}.p && ${renderer.dirty(dynamic_dependencies)}) {
+				@update_slot(${slot}, ${slot_definition}, #ctx, ${renderer.reference('$$scope')}, #dirty, ${get_slot_changes_fn}, ${get_slot_context_fn});
 			}
-		`);
+		`;
+		const fallback_update = has_fallback && fallback_dynamic_dependencies.length > 0 && b`
+			if (${slot_or_fallback} && ${slot_or_fallback}.p && ${renderer.dirty(fallback_dynamic_dependencies)}) {
+				${slot_or_fallback}.p(#ctx, #dirty);
+			}
+		`;
+
+		if (fallback_update) {
+			block.chunks.update.push(b`
+				if (${slot}) {
+					${slot_update}
+				} else {
+					${fallback_update}
+				}
+			`);
+		} else {
+			block.chunks.update.push(b`
+				if (${slot}) {
+					${slot_update}
+				}
+			`);
+		}
 
 		block.chunks.destroy.push(
-			b`if (${slot}) ${slot}.d(detaching);`
+			b`if (${slot_or_fallback}) ${slot_or_fallback}.d(detaching);`
 		);
 	}
 }
diff --git a/src/compiler/compile/render_dom/wrappers/shared/bind_this.ts b/src/compiler/compile/render_dom/wrappers/shared/bind_this.ts
index 97199a71c2..8a9830b01b 100644
--- a/src/compiler/compile/render_dom/wrappers/shared/bind_this.ts
+++ b/src/compiler/compile/render_dom/wrappers/shared/bind_this.ts
@@ -55,6 +55,9 @@ export default function bind_this(component: Component, block: Block, binding: B
 		const args = [];
 		for (const id of contextual_dependencies) {
 			args.push(id);
+			if (block.variables.has(id.name)) {
+				if (block.renderer.context_lookup.get(id.name).is_contextual) continue;
+			}
 			block.add_variable(id, block.renderer.reference(id.name));
 		}
 
diff --git a/src/compiler/compile/render_dom/wrappers/shared/create_debugging_comment.ts b/src/compiler/compile/render_dom/wrappers/shared/create_debugging_comment.ts
index e2aa0c0b41..1bdc473df0 100644
--- a/src/compiler/compile/render_dom/wrappers/shared/create_debugging_comment.ts
+++ b/src/compiler/compile/render_dom/wrappers/shared/create_debugging_comment.ts
@@ -16,8 +16,16 @@ export default function create_debugging_comment(
 	let d;
 
 	if (node.type === 'InlineComponent' || node.type === 'Element') {
-		d = node.children.length ? node.children[0].start : node.start;
-		while (source[d - 1] !== '>') d -= 1;
+		if (node.children.length) {
+			d = node.children[0].start;
+			while (source[d - 1] !== '>') d -= 1;
+		} else {
+			d = node.start;
+			while (source[d] !== '>') d += 1;
+			d += 1;
+		}
+	} else if (node.type === 'Text' || node.type === 'Comment') {
+		d = node.end;
 	} else {
 		// @ts-ignore
 		d = node.expression ? node.expression.node.end : c;
diff --git a/src/compiler/compile/render_ssr/handlers/AwaitBlock.ts b/src/compiler/compile/render_ssr/handlers/AwaitBlock.ts
index f637826280..6a62f872bb 100644
--- a/src/compiler/compile/render_ssr/handlers/AwaitBlock.ts
+++ b/src/compiler/compile/render_ssr/handlers/AwaitBlock.ts
@@ -14,7 +14,7 @@ export default function(node: AwaitBlock, renderer: Renderer, options: RenderOpt
 	renderer.add_expression(x`
 		function(__value) {
 			if (@is_promise(__value)) return ${pending};
-			return (function(${node.value}) { return ${then}; }(__value));
+			return (function(${node.then_node ? node.then_node : ''}) { return ${then}; }(__value));
 		}(${node.expression.node})
 	`);
 }
diff --git a/src/compiler/compile/render_ssr/index.ts b/src/compiler/compile/render_ssr/index.ts
index ad22869d32..c87fe3bdd9 100644
--- a/src/compiler/compile/render_ssr/index.ts
+++ b/src/compiler/compile/render_ssr/index.ts
@@ -31,6 +31,10 @@ export default function ssr(
 		{ code: null, map: null } :
 		component.stylesheet.render(options.filename, true);
 
+	const uses_rest = component.var_lookup.has('$$restProps');
+	const props = component.vars.filter(variable => !variable.module && variable.export_name);
+	const rest = uses_rest ? b`let $$restProps = @compute_rest_props($$props, [${props.map(prop => `"${prop.export_name}"`).join(',')}]);` : null;
+
 	const reactive_stores = component.vars.filter(variable => variable.name[0] === '$' && variable.name[1] !== '$');
 	const reactive_store_values = reactive_stores
 		.map(({ name }) => {
@@ -130,6 +134,7 @@ export default function ssr(
 			return ${literal};`;
 
 	const blocks = [
+		rest,
 		...reactive_stores.map(({ name }) => {
 			const store_name = name.slice(1);
 			const store = component.var_lookup.get(store_name);
diff --git a/src/compiler/compile/utils/hash.ts b/src/compiler/compile/utils/hash.ts
index 7ac892611b..e10013aca2 100644
--- a/src/compiler/compile/utils/hash.ts
+++ b/src/compiler/compile/utils/hash.ts
@@ -1,5 +1,6 @@
 // https://github.com/darkskyapp/string-hash/blob/master/index.js
 export default function hash(str: string): string {
+	str = str.replace(/\r/g, "");
 	let hash = 5381;
 	let i = str.length;
 
diff --git a/src/compiler/compile/utils/reserved_keywords.ts b/src/compiler/compile/utils/reserved_keywords.ts
new file mode 100644
index 0000000000..75825c1719
--- /dev/null
+++ b/src/compiler/compile/utils/reserved_keywords.ts
@@ -0,0 +1,5 @@
+export const reserved_keywords = new Set(["$$props", "$$restProps"]);
+
+export function is_reserved_keyword(name) {
+	return reserved_keywords.has(name);
+}
\ No newline at end of file
diff --git a/src/compiler/parse/read/context.ts b/src/compiler/parse/read/context.ts
index fe666467f8..8d28bd2024 100644
--- a/src/compiler/parse/read/context.ts
+++ b/src/compiler/parse/read/context.ts
@@ -1,202 +1,82 @@
-import { Parser } from '../index';
-import { reserved } from '../../utils/names';
-
-interface Identifier {
-	start: number;
-	end: number;
-	type: 'Identifier';
-	name: string;
-}
-
-interface Property {
-	start: number;
-	end: number;
-	type: 'Property';
-	kind: 'init' | 'rest';
-	shorthand: boolean;
-	key: Identifier;
-	value: Context;
-}
-
-interface Context {
-	start: number;
-	end: number;
-	type: 'Identifier' | 'ArrayPattern' | 'ObjectPattern' | 'RestIdentifier';
-	name?: string;
-	elements?: Context[];
-	properties?: Property[];
-}
+import { Parser } from "../index";
+import { isIdentifierStart } from "acorn";
+import full_char_code_at from "../../utils/full_char_code_at";
+import {
+	is_bracket_open,
+	is_bracket_close,
+	is_bracket_pair,
+	get_bracket_close
+} from "../utils/bracket";
+import { parse_expression_at } from "../acorn";
+import { Pattern } from "estree";
+
+export default function read_context(
+	parser: Parser
+): Pattern & { start: number; end: number } {
+	const start = parser.index;
+	let i = parser.index;
+
+	const code = full_char_code_at(parser.template, i);
+	if (isIdentifierStart(code, true)) {
+		return {
+			type: "Identifier",
+			name: parser.read_identifier(),
+			start,
+			end: parser.index
+		};
+	}
 
-function error_on_assignment_pattern(parser: Parser) {
-	if (parser.eat('=')) {
+	if (!is_bracket_open(code)) {
 		parser.error({
-			code: 'invalid-assignment-pattern',
-			message: 'Assignment patterns are not supported'
-		}, parser.index - 1);
+			code: "unexpected-token",
+			message: "Expected identifier or destructure pattern"
+		});
 	}
-}
-
-function error_on_rest_pattern_not_last(parser: Parser) {
-	parser.error({
-		code: 'rest-pattern-not-last',
-		message: 'Rest destructuring expected to be last'
-	}, parser.index);
-}
-
-export default function read_context(parser: Parser) {
-	const context: Context = {
-		start: parser.index,
-		end: null,
-		type: null
-	};
 
-	if (parser.eat('[')) {
-		context.type = 'ArrayPattern';
-		context.elements = [];
-
-		do {
-			parser.allow_whitespace();
-
-			const lastContext = context.elements[context.elements.length - 1];
-			if (lastContext && lastContext.type === 'RestIdentifier') {
-				error_on_rest_pattern_not_last(parser);
+	const bracket_stack = [code];
+	i += code <= 0xffff ? 1 : 2;
+
+	while (i < parser.template.length) {
+		const code = full_char_code_at(parser.template, i);
+		if (is_bracket_open(code)) {
+			bracket_stack.push(code);
+		} else if (is_bracket_close(code)) {
+			if (!is_bracket_pair(bracket_stack[bracket_stack.length - 1], code)) {
+				parser.error({
+					code: "unexpected-token",
+					message: `Expected ${String.fromCharCode(
+						get_bracket_close(bracket_stack[bracket_stack.length - 1])
+					)}`
+				});
 			}
-
-			if (parser.template[parser.index] === ',') {
-				context.elements.push(null);
-			} else {
-				context.elements.push(read_context(parser));
-				parser.allow_whitespace();
-			}
-		} while (parser.eat(','));
-
-		error_on_assignment_pattern(parser);
-		parser.eat(']', true);
-		context.end = parser.index;
-	}
-
-	else if (parser.eat('{')) {
-		context.type = 'ObjectPattern';
-		context.properties = [];
-
-		do {
-			parser.allow_whitespace();
-
-			if (parser.eat('...')) {
-				parser.allow_whitespace();
-
-				const start = parser.index;
-				const name = parser.read_identifier();
-				const key: Identifier = {
-					start,
-					end: parser.index,
-					type: 'Identifier',
-					name
-				};
-				const property: Property = {
-					start,
-					end: parser.index,
-					type: 'Property',
-					kind: 'rest',
-					shorthand: true,
-					key,
-					value: key
-				};
-
-				context.properties.push(property);
-
-				parser.allow_whitespace();
-
-				if (parser.eat(',')) {
-					parser.error({
-						code: `comma-after-rest`,
-						message: `Comma is not permitted after the rest element`
-					}, parser.index - 1);
-				}
-
+			bracket_stack.pop();
+			if (bracket_stack.length === 0) {
+				i += code <= 0xffff ? 1 : 2;
 				break;
 			}
-
-			// TODO: DRY this out somehow
-			// We don't know whether we want to allow reserved words until we see whether there's a ':' after it
-			// Probably ideally we'd use Acorn to do all of this
-			const start = parser.index;
-			const name = parser.read_identifier(true);
-			const key: Identifier = {
-				start,
-				end: parser.index,
-				type: 'Identifier',
-				name
-			};
-			parser.allow_whitespace();
-
-			let value: Context;
-			if (parser.eat(':')) {
-				parser.allow_whitespace();
-				value = read_context(parser);
-			} else {
-				if (reserved.has(name)) {
-					parser.error({
-						code: `unexpected-reserved-word`,
-						message: `'${name}' is a reserved word in JavaScript and cannot be used here`
-					}, start);
-				}
-				value = key;
-			}
-
-			const property: Property = {
-				start,
-				end: value.end,
-				type: 'Property',
-				kind: 'init',
-				shorthand: value.type === 'Identifier' && value.name === name,
-				key,
-				value
-			};
-
-			context.properties.push(property);
-
-			parser.allow_whitespace();
-		} while (parser.eat(','));
-
-		error_on_assignment_pattern(parser);
-		parser.eat('}', true);
-		context.end = parser.index;
-	}
-
-	else if (parser.eat('...')) {
-		const name = parser.read_identifier();
-		if (name) {
-			context.type = 'RestIdentifier';
-			context.end = parser.index;
-			context.name = name;
-		}
-
-		else {
-			parser.error({
-				code: 'invalid-context',
-				message: 'Expected a rest pattern'
-			});
 		}
+		i += code <= 0xffff ? 1 : 2;
 	}
 
-	else {
-		const name = parser.read_identifier();
-		if (name) {
-			context.type = 'Identifier';
-			context.end = parser.index;
-			context.name = name;
-		}
-
-		else {
-			parser.error({
-				code: 'invalid-context',
-				message: 'Expected a name, array pattern or object pattern'
-			});
-		}
-
-		error_on_assignment_pattern(parser);
+	parser.index = i;
+
+	const pattern_string = parser.template.slice(start, i);
+	try {
+		// the length of the `space_with_newline` has to be start - 1
+		// because we added a `(` in front of the pattern_string,
+		// which shifted the entire string to right by 1
+		// so we offset it by removing 1 character in the `space_with_newline`
+		// to achieve that, we remove the 1st space encountered,
+		// so it will not affect the `column` of the node
+		let space_with_newline = parser.template.slice(0, start).replace(/[^\n]/g, ' ');
+		const first_space = space_with_newline.indexOf(' ');
+		space_with_newline = space_with_newline.slice(0, first_space) + space_with_newline.slice(first_space + 1);
+
+		return (parse_expression_at(
+			`${space_with_newline}(${pattern_string} = 1)`,
+			start - 1
+		) as any).left;
+	} catch (error) {
+		parser.acorn_error(error);
 	}
-
-	return context;
 }
diff --git a/src/compiler/parse/read/script.ts b/src/compiler/parse/read/script.ts
index 130c346ba1..8260894215 100644
--- a/src/compiler/parse/read/script.ts
+++ b/src/compiler/parse/read/script.ts
@@ -37,7 +37,8 @@ export default function read_script(parser: Parser, start: number, attributes: N
 		message: `<script> must have a closing tag`
 	});
 
-	const source = ' '.repeat(script_start) + parser.template.slice(script_start, script_end);
+	const source = parser.template.slice(0, script_start).replace(/[^\n]/g, ' ') +
+		parser.template.slice(script_start, script_end);
 	parser.index = script_end + script_closing_tag.length;
 
 	let ast: Program;
diff --git a/src/compiler/parse/state/mustache.ts b/src/compiler/parse/state/mustache.ts
index e5e365dddf..4e1d5c5fd4 100644
--- a/src/compiler/parse/state/mustache.ts
+++ b/src/compiler/parse/state/mustache.ts
@@ -196,7 +196,7 @@ export default function mustache(parser: Parser) {
 
 		if (!parser.eat('}')) {
 			parser.require_whitespace();
-			await_block[is_then ? 'value': 'error'] = parser.read_identifier();
+			await_block[is_then ? 'value': 'error'] = read_context(parser);
 			parser.allow_whitespace();
 			parser.eat('}', true);
 		}
@@ -305,7 +305,14 @@ export default function mustache(parser: Parser) {
 		const await_block_shorthand = type === 'AwaitBlock' && parser.eat('then');
 		if (await_block_shorthand) {
 			parser.require_whitespace();
-			block.value = parser.read_identifier();
+			block.value = read_context(parser);
+			parser.allow_whitespace();
+		}
+
+		const await_block_catch_shorthand = !await_block_shorthand && type === 'AwaitBlock' && parser.eat('catch');
+		if (await_block_catch_shorthand) {
+			parser.require_whitespace();
+			block.error = read_context(parser);
 			parser.allow_whitespace();
 		}
 
@@ -319,6 +326,9 @@ export default function mustache(parser: Parser) {
 			if (await_block_shorthand) {
 				block.then.skip = false;
 				child_block = block.then;
+			} else if (await_block_catch_shorthand) {
+				block.catch.skip = false;
+				child_block = block.catch;
 			} else {
 				block.pending.skip = false;
 				child_block = block.pending;
diff --git a/src/compiler/parse/state/tag.ts b/src/compiler/parse/state/tag.ts
index 40bb01de9b..ce8a0a9aa7 100644
--- a/src/compiler/parse/state/tag.ts
+++ b/src/compiler/parse/state/tag.ts
@@ -241,7 +241,7 @@ function read_tag_name(parser: Parser) {
 
 		while (i--) {
 			const fragment = parser.stack[i];
-			if (fragment.type === 'IfBlock' || fragment.type === 'EachBlock') {
+			if (fragment.type === 'IfBlock' || fragment.type === 'EachBlock' || fragment.type === 'InlineComponent') {
 				legal = true;
 				break;
 			}
@@ -250,7 +250,7 @@ function read_tag_name(parser: Parser) {
 		if (!legal) {
 			parser.error({
 				code: `invalid-self-placement`,
-				message: `<svelte:self> components can only exist inside if-blocks or each-blocks`
+				message: `<svelte:self> components can only exist inside {#if} blocks, {#each} blocks, or slots passed to components`
 			}, start);
 		}
 
diff --git a/src/compiler/parse/utils/bracket.ts b/src/compiler/parse/utils/bracket.ts
new file mode 100644
index 0000000000..ffbb9e4952
--- /dev/null
+++ b/src/compiler/parse/utils/bracket.ts
@@ -0,0 +1,28 @@
+const SQUARE_BRACKET_OPEN = "[".charCodeAt(0);
+const SQUARE_BRACKET_CLOSE = "]".charCodeAt(0);
+const CURLY_BRACKET_OPEN = "{".charCodeAt(0);
+const CURLY_BRACKET_CLOSE = "}".charCodeAt(0);
+
+export function is_bracket_open(code) {
+	return code === SQUARE_BRACKET_OPEN || code === CURLY_BRACKET_OPEN;
+}
+
+export function is_bracket_close(code) {
+	return code === SQUARE_BRACKET_CLOSE || code === CURLY_BRACKET_CLOSE;
+}
+
+export function is_bracket_pair(open, close) {
+	return (
+		(open === SQUARE_BRACKET_OPEN && close === SQUARE_BRACKET_CLOSE) ||
+		(open === CURLY_BRACKET_OPEN && close === CURLY_BRACKET_CLOSE)
+	);
+}
+
+export function get_bracket_close(open) {
+	if (open === SQUARE_BRACKET_OPEN) {
+		return SQUARE_BRACKET_CLOSE;
+	}
+	if (open === CURLY_BRACKET_OPEN) {
+		return CURLY_BRACKET_CLOSE;
+	}
+}
\ No newline at end of file
diff --git a/src/compiler/utils/error.ts b/src/compiler/utils/error.ts
index d13222578a..e05ea66df1 100644
--- a/src/compiler/utils/error.ts
+++ b/src/compiler/utils/error.ts
@@ -21,7 +21,7 @@ export default function error(message: string, props: {
 	filename: string;
 	start: number;
 	end?: number;
-}) {
+}): never {
 	const error = new CompileError(message);
 	error.name = props.name;
 
diff --git a/src/runtime/internal/Component.ts b/src/runtime/internal/Component.ts
index 10588a0804..7d2a92fa1b 100644
--- a/src/runtime/internal/Component.ts
+++ b/src/runtime/internal/Component.ts
@@ -1,7 +1,7 @@
 import { add_render_callback, flush, schedule_update, dirty_components } from './scheduler';
 import { current_component, set_current_component } from './lifecycle';
 import { blank_object, is_function, run, run_all, noop } from './utils';
-import { children } from './dom';
+import { children, detach } from './dom';
 import { transition_in } from './transitions';
 
 interface Fragment {
@@ -146,8 +146,10 @@ export function init(component, options, instance, create_fragment, not_equal, p
 
 	if (options.target) {
 		if (options.hydrate) {
+			const nodes = children(options.target);
 			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-			$$.fragment && $$.fragment!.l(children(options.target));
+			$$.fragment && $$.fragment!.l(nodes);
+			nodes.forEach(detach);
 		} else {
 			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 			$$.fragment && $$.fragment!.c();
diff --git a/src/runtime/internal/dom.ts b/src/runtime/internal/dom.ts
index 9ab9a4395f..f67fd13b2d 100644
--- a/src/runtime/internal/dom.ts
+++ b/src/runtime/internal/dom.ts
@@ -57,7 +57,7 @@ export function empty() {
 	return text('');
 }
 
-export function listen(node: Node, event: string, handler: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions | EventListenerOptions) {
+export function listen(node: EventTarget, event: string, handler: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions | EventListenerOptions) {
 	node.addEventListener(event, handler, options);
 	return () => node.removeEventListener(event, handler, options);
 }
@@ -98,7 +98,9 @@ export function set_attributes(node: Element & ElementCSSInlineStyle, attributes
 			node.removeAttribute(key);
 		} else if (key === 'style') {
 			node.style.cssText = attributes[key];
-		} else if (key === '__value' || descriptors[key] && descriptors[key].set) {
+		} else if (key === '__value') {
+			(node as any).value = node[key] = attributes[key];
+		} else if (descriptors[key] && descriptors[key].set) {
 			node[key] = attributes[key];
 		} else {
 			attr(node, key, attributes[key]);
@@ -190,9 +192,7 @@ export function set_data(text, data) {
 }
 
 export function set_input_value(input, value) {
-	if (value != null || input.value) {
-		input.value = value;
-	}
+	input.value = value == null ? '' : value;
 }
 
 export function set_input_type(input, type) {
@@ -234,37 +234,68 @@ export function select_multiple_value(select) {
 	return [].map.call(select.querySelectorAll(':checked'), option => option.__value);
 }
 
-export function add_resize_listener(element, fn) {
-	if (getComputedStyle(element).position === 'static') {
-		element.style.position = 'relative';
+// unfortunately this can't be a constant as that wouldn't be tree-shakeable
+// so we cache the result instead
+let crossorigin: boolean;
+
+export function is_crossorigin() {
+	if (crossorigin === undefined) {
+		crossorigin = false;
+
+		try {
+			if (typeof window !== 'undefined' && window.parent) {
+				void window.parent.document;
+			}
+		} catch (error) {
+			crossorigin = true;
+		}
 	}
 
-	const object = document.createElement('object');
-	object.setAttribute('style', 'display: block; position: absolute; top: 0; left: 0; height: 100%; width: 100%; overflow: hidden; pointer-events: none; z-index: -1;');
-	object.setAttribute('aria-hidden', 'true');
-	object.type = 'text/html';
-	object.tabIndex = -1;
+	return crossorigin;
+}
 
-	let win;
+export function add_resize_listener(node: HTMLElement, fn: () => void) {
+	const computed_style = getComputedStyle(node);
+	const z_index = (parseInt(computed_style.zIndex) || 0) - 1;
 
-	object.onload = () => {
-		win = object.contentDocument.defaultView;
-		win.addEventListener('resize', fn);
-	};
+	if (computed_style.position === 'static') {
+		node.style.position = 'relative';
+	}
+
+	const iframe = element('iframe');
+	iframe.setAttribute('style',
+		`display: block; position: absolute; top: 0; left: 0; width: 100%; height: 100%; ` +
+		`overflow: hidden; border: 0; opacity: 0; pointer-events: none; z-index: ${z_index};`
+	);
+	iframe.setAttribute('aria-hidden', 'true');
+	iframe.tabIndex = -1;
+
+	const crossorigin = is_crossorigin();
 
-	if (/Trident/.test(navigator.userAgent)) {
-		element.appendChild(object);
-		object.data = 'about:blank';
+	let unsubscribe: () => void;
+
+	if (crossorigin) {
+		iframe.src = `data:text/html,<script>onresize=function(){parent.postMessage(0,'*')}</script>`;
+		unsubscribe = listen(window, 'message', (event: MessageEvent) => {
+			if (event.source === iframe.contentWindow) fn();
+		});
 	} else {
-		object.data = 'about:blank';
-		element.appendChild(object);
+		iframe.src = 'about:blank';
+		iframe.onload = () => {
+			unsubscribe = listen(iframe.contentWindow, 'resize', fn);
+		};
 	}
 
-	return {
-		cancel: () => {
-			win && win.removeEventListener && win.removeEventListener('resize', fn);
-			element.removeChild(object);
+	append(node, iframe);
+
+	return () => {
+		if (crossorigin) {
+			unsubscribe();
+		} else if (unsubscribe && iframe.contentWindow) {
+			unsubscribe();
 		}
+
+		detach(iframe);
 	};
 }
 
@@ -288,32 +319,39 @@ export class HtmlTag {
 	t: HTMLElement;
 	a: HTMLElement;
 
-	constructor(html: string, anchor: HTMLElement = null) {
-		this.e = element('div');
+	constructor(anchor: HTMLElement = null) {
 		this.a = anchor;
-		this.u(html);
+		this.e = this.n = null;
 	}
 
-	m(target: HTMLElement, anchor: HTMLElement = null) {
-		for (let i = 0; i < this.n.length; i += 1) {
-			insert(target, this.n[i], anchor);
+	m(html: string, target: HTMLElement, anchor: HTMLElement = null) {
+		if (!this.e) {
+			this.e = element(target.nodeName as keyof HTMLElementTagNameMap);
+			this.t = target;
+			this.h(html);
 		}
 
-		this.t = target;
+		this.i(anchor);
 	}
 
-	u(html: string) {
+	h(html) {
 		this.e.innerHTML = html;
 		this.n = Array.from(this.e.childNodes);
 	}
 
+	i(anchor) {
+		for (let i = 0; i < this.n.length; i += 1) {
+			insert(this.t, this.n[i], anchor);
+		}
+	}
+
 	p(html: string) {
 		this.d();
-		this.u(html);
-		this.m(this.t, this.a);
+		this.h(html);
+		this.i(this.a);
 	}
 
 	d() {
 		this.n.forEach(detach);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/runtime/internal/globals.ts b/src/runtime/internal/globals.ts
index 664093d2e4..b97f81ab9f 100644
--- a/src/runtime/internal/globals.ts
+++ b/src/runtime/internal/globals.ts
@@ -1,3 +1,7 @@
 declare const global: any;
 
-export const globals = (typeof window !== 'undefined' ? window : global) as unknown as typeof globalThis;
+export const globals = (typeof window !== 'undefined'
+	? window
+	: typeof globalThis !== 'undefined'
+	? globalThis
+	: global) as unknown as typeof globalThis;
diff --git a/src/runtime/internal/style_manager.ts b/src/runtime/internal/style_manager.ts
index d9264e3c08..31d7573a76 100644
--- a/src/runtime/internal/style_manager.ts
+++ b/src/runtime/internal/style_manager.ts
@@ -1,9 +1,13 @@
 import { element } from './dom';
 import { raf } from './environment';
 
-let stylesheet;
+interface ExtendedDoc extends Document {
+	__svelte_stylesheet: CSSStyleSheet;
+	__svelte_rules: Record<string, true>;
+}
+
+const active_docs = new Set<ExtendedDoc>();
 let active = 0;
-let current_rules = {};
 
 // https://github.com/darkskyapp/string-hash/blob/master/index.js
 function hash(str: string) {
@@ -25,14 +29,12 @@ export function create_rule(node: Element & ElementCSSInlineStyle, a: number, b:
 
 	const rule = keyframes + `100% {${fn(b, 1 - b)}}\n}`;
 	const name = `__svelte_${hash(rule)}_${uid}`;
+	const doc = node.ownerDocument as ExtendedDoc;
+	active_docs.add(doc);
+	const stylesheet = doc.__svelte_stylesheet || (doc.__svelte_stylesheet = doc.head.appendChild(element('style') as HTMLStyleElement).sheet as CSSStyleSheet);
+	const current_rules = doc.__svelte_rules || (doc.__svelte_rules = {});
 
 	if (!current_rules[name]) {
-		if (!stylesheet) {
-			const style = element('style');
-			document.head.appendChild(style);
-			stylesheet = style.sheet;
-		}
-
 		current_rules[name] = true;
 		stylesheet.insertRule(`@keyframes ${name} ${rule}`, stylesheet.cssRules.length);
 	}
@@ -45,22 +47,28 @@ export function create_rule(node: Element & ElementCSSInlineStyle, a: number, b:
 }
 
 export function delete_rule(node: Element & ElementCSSInlineStyle, name?: string) {
-	node.style.animation = (node.style.animation || '')
-		.split(', ')
-		.filter(name
-			? anim => anim.indexOf(name) < 0 // remove specific animation
-			: anim => anim.indexOf('__svelte') === -1 // remove all Svelte animations
-		)
-		.join(', ');
-
-	if (name && !--active) clear_rules();
+	const previous = (node.style.animation || '').split(', ');
+	const next = previous.filter(name
+		? anim => anim.indexOf(name) < 0 // remove specific animation
+		: anim => anim.indexOf('__svelte') === -1 // remove all Svelte animations
+	);
+	const deleted = previous.length - next.length;
+	if (deleted) {
+		node.style.animation = next.join(', ');
+		active -= deleted;
+		if (!active) clear_rules();
+	}
 }
 
 export function clear_rules() {
 	raf(() => {
 		if (active) return;
-		let i = stylesheet.cssRules.length;
-		while (i--) stylesheet.deleteRule(i);
-		current_rules = {};
+		active_docs.forEach(doc => {
+			const stylesheet = doc.__svelte_stylesheet;
+			let i = stylesheet.cssRules.length;
+			while (i--) stylesheet.deleteRule(i);
+			doc.__svelte_rules = {};
+		});
+		active_docs.clear();
 	});
 }
diff --git a/src/runtime/internal/utils.ts b/src/runtime/internal/utils.ts
index acb88c7669..d752c9de9d 100644
--- a/src/runtime/internal/utils.ts
+++ b/src/runtime/internal/utils.ts
@@ -103,12 +103,27 @@ export function get_slot_changes(definition, $$scope, dirty, fn) {
 	return $$scope.dirty;
 }
 
+export function update_slot(slot, slot_definition, ctx, $$scope, dirty, get_slot_changes_fn, get_slot_context_fn) {
+	const slot_changes = get_slot_changes(slot_definition, $$scope, dirty, get_slot_changes_fn);
+	if (slot_changes) {
+		const slot_context = get_slot_context(slot_definition, ctx, $$scope, get_slot_context_fn);
+		slot.p(slot_context, slot_changes);
+	}
+}
+
 export function exclude_internal_props(props) {
 	const result = {};
 	for (const k in props) if (k[0] !== '$') result[k] = props[k];
 	return result;
 }
 
+export function compute_rest_props(props, keys) {
+	const rest = {};
+	keys = new Set(keys);
+	for (const k in props) if (!keys.has(k) && k[0] !== '$') rest[k] = props[k];
+	return rest;
+}
+
 export function once(fn) {
 	let ran = false;
 	return function(this: any, ...args) {
diff --git a/src/runtime/motion/tweened.ts b/src/runtime/motion/tweened.ts
index e33f0f79f9..c802604c0e 100644
--- a/src/runtime/motion/tweened.ts
+++ b/src/runtime/motion/tweened.ts
@@ -93,6 +93,16 @@ export function tweened<T>(value?: T, defaults: Options<T> = {}): Tweened<T> {
 			interpolate = get_interpolator
 		} = assign(assign({}, defaults), opts);
 
+		if (duration === 0) {
+			if (previous_task) {
+				previous_task.abort();
+				previous_task = null;
+			}
+			
+			store.set(value = target_value);
+			return Promise.resolve();
+		}
+
 		const start = now() + delay;
 		let fn;
 
diff --git a/test/css/index.js b/test/css/index.js
index dc17314597..81d27a94bf 100644
--- a/test/css/index.js
+++ b/test/css/index.js
@@ -56,7 +56,8 @@ describe('css', () => {
 			const config = try_require(`./samples/${dir}/_config.js`) || {};
 			const input = fs
 				.readFileSync(`${__dirname}/samples/${dir}/input.svelte`, 'utf-8')
-				.replace(/\s+$/, '');
+				.replace(/\s+$/, '')
+				.replace(/\r/g, '');
 
 			const expected_warnings = (config.warnings || []).map(normalize_warning);
 
diff --git a/test/custom-elements/index.js b/test/custom-elements/index.js
index d68d3b94c5..b1bdf48219 100644
--- a/test/custom-elements/index.js
+++ b/test/custom-elements/index.js
@@ -63,7 +63,7 @@ describe('custom-elements', function() {
 		const warnings = [];
 
 		(solo ? it.only : skip ? it.skip : it)(dir, async () => {
-			const config = loadConfig(`./custom-elements/samples/${dir}/_config.js`);
+			const config = loadConfig(`${__dirname}/samples/${dir}/_config.js`);
 			const expected_warnings = config.warnings || [];
 
 			const bundle = await rollup({
@@ -82,7 +82,7 @@ describe('custom-elements', function() {
 
 						transform(code, id) {
 							if (id.endsWith('.svelte')) {
-								const compiled = svelte.compile(code, {
+								const compiled = svelte.compile(code.replace(/\r/g, ""), {
 									customElement: true,
 									dev: config.dev
 								});
diff --git a/test/hydration/samples/top-level-cleanup-2/_after.html b/test/hydration/samples/top-level-cleanup-2/_after.html
new file mode 100644
index 0000000000..8dca56dd88
--- /dev/null
+++ b/test/hydration/samples/top-level-cleanup-2/_after.html
@@ -0,0 +1 @@
+<div>Hello world</div>
\ No newline at end of file
diff --git a/test/hydration/samples/top-level-cleanup-2/_before.html b/test/hydration/samples/top-level-cleanup-2/_before.html
new file mode 100644
index 0000000000..fdc2379f63
--- /dev/null
+++ b/test/hydration/samples/top-level-cleanup-2/_before.html
@@ -0,0 +1,2 @@
+<main>This should be thrown away</main>
+<div>hello</div>
\ No newline at end of file
diff --git a/test/hydration/samples/top-level-cleanup-2/_config.js b/test/hydration/samples/top-level-cleanup-2/_config.js
new file mode 100644
index 0000000000..ff8b4c5632
--- /dev/null
+++ b/test/hydration/samples/top-level-cleanup-2/_config.js
@@ -0,0 +1 @@
+export default {};
diff --git a/test/hydration/samples/top-level-cleanup-2/main.svelte b/test/hydration/samples/top-level-cleanup-2/main.svelte
new file mode 100644
index 0000000000..8dca56dd88
--- /dev/null
+++ b/test/hydration/samples/top-level-cleanup-2/main.svelte
@@ -0,0 +1 @@
+<div>Hello world</div>
\ No newline at end of file
diff --git a/test/hydration/samples/top-level-cleanup/_after.html b/test/hydration/samples/top-level-cleanup/_after.html
new file mode 100644
index 0000000000..8dca56dd88
--- /dev/null
+++ b/test/hydration/samples/top-level-cleanup/_after.html
@@ -0,0 +1 @@
+<div>Hello world</div>
\ No newline at end of file
diff --git a/test/hydration/samples/top-level-cleanup/_before.html b/test/hydration/samples/top-level-cleanup/_before.html
new file mode 100644
index 0000000000..c7e4bba233
--- /dev/null
+++ b/test/hydration/samples/top-level-cleanup/_before.html
@@ -0,0 +1 @@
+<main>This should be thrown away</main>
\ No newline at end of file
diff --git a/test/hydration/samples/top-level-cleanup/_config.js b/test/hydration/samples/top-level-cleanup/_config.js
new file mode 100644
index 0000000000..ff8b4c5632
--- /dev/null
+++ b/test/hydration/samples/top-level-cleanup/_config.js
@@ -0,0 +1 @@
+export default {};
diff --git a/test/hydration/samples/top-level-cleanup/main.svelte b/test/hydration/samples/top-level-cleanup/main.svelte
new file mode 100644
index 0000000000..8dca56dd88
--- /dev/null
+++ b/test/hydration/samples/top-level-cleanup/main.svelte
@@ -0,0 +1 @@
+<div>Hello world</div>
\ No newline at end of file
diff --git a/test/js/index.js b/test/js/index.js
index d4ea13ad98..8aa4cc76a9 100644
--- a/test/js/index.js
+++ b/test/js/index.js
@@ -25,7 +25,7 @@ describe("js", () => {
 		(solo ? it.only : it)(dir, () => {
 			const config = loadConfig(`${resolved}/_config.js`);
 
-			const input = fs.readFileSync(`${resolved}/input.svelte`, "utf-8").replace(/\s+$/, "");
+			const input = fs.readFileSync(`${resolved}/input.svelte`, "utf-8").replace(/\s+$/, "").replace(/\r/g, "");
 
 			let actual;
 
@@ -56,8 +56,8 @@ describe("js", () => {
 
 			try {
 				assert.equal(
-					actual.trim().replace(/^[ \t]+$/gm, ""),
-					expected.trim().replace(/^[ \t]+$/gm, "")
+					actual.trim().replace(/^[ \t]+$/gm, "").replace(/\r/g, ""),
+					expected.trim().replace(/^[ \t]+$/gm, "").replace(/\r/g, "")
 				);
 			} catch (error) {
 				if (shouldUpdateExpected()) {
diff --git a/test/js/samples/action-custom-event-handler/expected.js b/test/js/samples/action-custom-event-handler/expected.js
index ead6d90e06..cac2f61b44 100644
--- a/test/js/samples/action-custom-event-handler/expected.js
+++ b/test/js/samples/action-custom-event-handler/expected.js
@@ -14,6 +14,7 @@ import {
 function create_fragment(ctx) {
 	let button;
 	let foo_action;
+	let mounted;
 	let dispose;
 
 	return {
@@ -23,7 +24,11 @@ function create_fragment(ctx) {
 		},
 		m(target, anchor) {
 			insert(target, button, anchor);
-			dispose = action_destroyer(foo_action = foo.call(null, button, /*foo_function*/ ctx[1]));
+
+			if (!mounted) {
+				dispose = action_destroyer(foo_action = foo.call(null, button, /*foo_function*/ ctx[1]));
+				mounted = true;
+			}
 		},
 		p(ctx, [dirty]) {
 			if (foo_action && is_function(foo_action.update) && dirty & /*bar*/ 1) foo_action.update.call(null, /*foo_function*/ ctx[1]);
@@ -32,6 +37,7 @@ function create_fragment(ctx) {
 		o: noop,
 		d(detaching) {
 			if (detaching) detach(button);
+			mounted = false;
 			dispose();
 		}
 	};
diff --git a/test/js/samples/action/expected.js b/test/js/samples/action/expected.js
index 22d9cd939c..d52960bddd 100644
--- a/test/js/samples/action/expected.js
+++ b/test/js/samples/action/expected.js
@@ -14,6 +14,7 @@ import {
 function create_fragment(ctx) {
 	let a;
 	let link_action;
+	let mounted;
 	let dispose;
 
 	return {
@@ -24,13 +25,18 @@ function create_fragment(ctx) {
 		},
 		m(target, anchor) {
 			insert(target, a, anchor);
-			dispose = action_destroyer(link_action = link.call(null, a));
+
+			if (!mounted) {
+				dispose = action_destroyer(link_action = link.call(null, a));
+				mounted = true;
+			}
 		},
 		p: noop,
 		i: noop,
 		o: noop,
 		d(detaching) {
 			if (detaching) detach(a);
+			mounted = false;
 			dispose();
 		}
 	};
diff --git a/test/js/samples/bind-online/expected.js b/test/js/samples/bind-online/expected.js
index e129e66d71..887195bce1 100644
--- a/test/js/samples/bind-online/expected.js
+++ b/test/js/samples/bind-online/expected.js
@@ -10,21 +10,27 @@ import {
 } from "svelte/internal";
 
 function create_fragment(ctx) {
+	let mounted;
 	let dispose;
 	add_render_callback(/*onlinestatuschanged*/ ctx[1]);
 
 	return {
 		c: noop,
 		m(target, anchor) {
-			dispose = [
-				listen(window, "online", /*onlinestatuschanged*/ ctx[1]),
-				listen(window, "offline", /*onlinestatuschanged*/ ctx[1])
-			];
+			if (!mounted) {
+				dispose = [
+					listen(window, "online", /*onlinestatuschanged*/ ctx[1]),
+					listen(window, "offline", /*onlinestatuschanged*/ ctx[1])
+				];
+
+				mounted = true;
+			}
 		},
 		p: noop,
 		i: noop,
 		o: noop,
 		d(detaching) {
+			mounted = false;
 			run_all(dispose);
 		}
 	};
diff --git a/test/js/samples/bind-open/expected.js b/test/js/samples/bind-open/expected.js
index 7d66145f0a..f600157c65 100644
--- a/test/js/samples/bind-open/expected.js
+++ b/test/js/samples/bind-open/expected.js
@@ -12,6 +12,7 @@ import {
 
 function create_fragment(ctx) {
 	let details;
+	let mounted;
 	let dispose;
 
 	return {
@@ -24,7 +25,11 @@ function create_fragment(ctx) {
 		m(target, anchor) {
 			insert(target, details, anchor);
 			details.open = /*open*/ ctx[0];
-			dispose = listen(details, "toggle", /*details_toggle_handler*/ ctx[1]);
+
+			if (!mounted) {
+				dispose = listen(details, "toggle", /*details_toggle_handler*/ ctx[1]);
+				mounted = true;
+			}
 		},
 		p(ctx, [dirty]) {
 			if (dirty & /*open*/ 1) {
@@ -35,6 +40,7 @@ function create_fragment(ctx) {
 		o: noop,
 		d(detaching) {
 			if (detaching) detach(details);
+			mounted = false;
 			dispose();
 		}
 	};
diff --git a/test/js/samples/bind-width-height/expected.js b/test/js/samples/bind-width-height/expected.js
index 5c1888b7db..4848704c4b 100644
--- a/test/js/samples/bind-width-height/expected.js
+++ b/test/js/samples/bind-width-height/expected.js
@@ -30,7 +30,7 @@ function create_fragment(ctx) {
 		o: noop,
 		d(detaching) {
 			if (detaching) detach(div);
-			div_resize_listener.cancel();
+			div_resize_listener();
 		}
 	};
 }
diff --git a/test/js/samples/bindings-readonly-order/expected.js b/test/js/samples/bindings-readonly-order/expected.js
index db0e7cb007..0e845c65b8 100644
--- a/test/js/samples/bindings-readonly-order/expected.js
+++ b/test/js/samples/bindings-readonly-order/expected.js
@@ -17,6 +17,7 @@ function create_fragment(ctx) {
 	let input0;
 	let t;
 	let input1;
+	let mounted;
 	let dispose;
 
 	return {
@@ -32,10 +33,14 @@ function create_fragment(ctx) {
 			insert(target, t, anchor);
 			insert(target, input1, anchor);
 
-			dispose = [
-				listen(input0, "change", /*input0_change_handler*/ ctx[1]),
-				listen(input1, "change", /*input1_change_handler*/ ctx[2])
-			];
+			if (!mounted) {
+				dispose = [
+					listen(input0, "change", /*input0_change_handler*/ ctx[1]),
+					listen(input1, "change", /*input1_change_handler*/ ctx[2])
+				];
+
+				mounted = true;
+			}
 		},
 		p: noop,
 		i: noop,
@@ -44,6 +49,7 @@ function create_fragment(ctx) {
 			if (detaching) detach(input0);
 			if (detaching) detach(t);
 			if (detaching) detach(input1);
+			mounted = false;
 			run_all(dispose);
 		}
 	};
diff --git a/test/js/samples/capture-inject-dev-only/expected.js b/test/js/samples/capture-inject-dev-only/expected.js
index a314b0cff3..a87693dd9e 100644
--- a/test/js/samples/capture-inject-dev-only/expected.js
+++ b/test/js/samples/capture-inject-dev-only/expected.js
@@ -20,6 +20,7 @@ function create_fragment(ctx) {
 	let t0;
 	let t1;
 	let input;
+	let mounted;
 	let dispose;
 
 	return {
@@ -35,7 +36,11 @@ function create_fragment(ctx) {
 			insert(target, t1, anchor);
 			insert(target, input, anchor);
 			set_input_value(input, /*foo*/ ctx[0]);
-			dispose = listen(input, "input", /*input_input_handler*/ ctx[1]);
+
+			if (!mounted) {
+				dispose = listen(input, "input", /*input_input_handler*/ ctx[1]);
+				mounted = true;
+			}
 		},
 		p(ctx, [dirty]) {
 			if (dirty & /*foo*/ 1) set_data(t0, /*foo*/ ctx[0]);
@@ -50,6 +55,7 @@ function create_fragment(ctx) {
 			if (detaching) detach(p);
 			if (detaching) detach(t1);
 			if (detaching) detach(input);
+			mounted = false;
 			dispose();
 		}
 	};
diff --git a/test/js/samples/component-static-var/expected.js b/test/js/samples/component-static-var/expected.js
index a65d9186a7..8a27ab6b24 100644
--- a/test/js/samples/component-static-var/expected.js
+++ b/test/js/samples/component-static-var/expected.js
@@ -24,6 +24,7 @@ function create_fragment(ctx) {
 	let t1;
 	let input;
 	let current;
+	let mounted;
 	let dispose;
 	const foo = new Foo({ props: { x: y } });
 	const bar = new Bar({ props: { x: /*z*/ ctx[0] } });
@@ -44,7 +45,11 @@ function create_fragment(ctx) {
 			insert(target, input, anchor);
 			set_input_value(input, /*z*/ ctx[0]);
 			current = true;
-			dispose = listen(input, "input", /*input_input_handler*/ ctx[1]);
+
+			if (!mounted) {
+				dispose = listen(input, "input", /*input_input_handler*/ ctx[1]);
+				mounted = true;
+			}
 		},
 		p(ctx, [dirty]) {
 			const bar_changes = {};
@@ -72,6 +77,7 @@ function create_fragment(ctx) {
 			destroy_component(bar, detaching);
 			if (detaching) detach(t1);
 			if (detaching) detach(input);
+			mounted = false;
 			dispose();
 		}
 	};
diff --git a/test/js/samples/component-store-reassign-invalidate/expected.js b/test/js/samples/component-store-reassign-invalidate/expected.js
index 771b20dec4..0cf555bf0d 100644
--- a/test/js/samples/component-store-reassign-invalidate/expected.js
+++ b/test/js/samples/component-store-reassign-invalidate/expected.js
@@ -22,6 +22,7 @@ function create_fragment(ctx) {
 	let t0;
 	let t1;
 	let button;
+	let mounted;
 	let dispose;
 
 	return {
@@ -37,7 +38,11 @@ function create_fragment(ctx) {
 			append(h1, t0);
 			insert(target, t1, anchor);
 			insert(target, button, anchor);
-			dispose = listen(button, "click", /*click_handler*/ ctx[2]);
+
+			if (!mounted) {
+				dispose = listen(button, "click", /*click_handler*/ ctx[2]);
+				mounted = true;
+			}
 		},
 		p(ctx, [dirty]) {
 			if (dirty & /*$foo*/ 2) set_data(t0, /*$foo*/ ctx[1]);
@@ -48,6 +53,7 @@ function create_fragment(ctx) {
 			if (detaching) detach(h1);
 			if (detaching) detach(t1);
 			if (detaching) detach(button);
+			mounted = false;
 			dispose();
 		}
 	};
diff --git a/test/js/samples/dont-invalidate-this/expected.js b/test/js/samples/dont-invalidate-this/expected.js
index f5f6d07812..0b155373a1 100644
--- a/test/js/samples/dont-invalidate-this/expected.js
+++ b/test/js/samples/dont-invalidate-this/expected.js
@@ -12,6 +12,7 @@ import {
 
 function create_fragment(ctx) {
 	let input;
+	let mounted;
 	let dispose;
 
 	return {
@@ -20,13 +21,18 @@ function create_fragment(ctx) {
 		},
 		m(target, anchor) {
 			insert(target, input, anchor);
-			dispose = listen(input, "input", make_uppercase);
+
+			if (!mounted) {
+				dispose = listen(input, "input", make_uppercase);
+				mounted = true;
+			}
 		},
 		p: noop,
 		i: noop,
 		o: noop,
 		d(detaching) {
 			if (detaching) detach(input);
+			mounted = false;
 			dispose();
 		}
 	};
diff --git a/test/js/samples/each-block-changed-check/expected.js b/test/js/samples/each-block-changed-check/expected.js
index 5d88032b87..f4f9df0de9 100644
--- a/test/js/samples/each-block-changed-check/expected.js
+++ b/test/js/samples/each-block-changed-check/expected.js
@@ -53,7 +53,7 @@ function create_each_block(ctx) {
 			t5 = text(" ago:");
 			t6 = space();
 			attr(span, "class", "meta");
-			html_tag = new HtmlTag(raw_value, null);
+			html_tag = new HtmlTag(null);
 			attr(div, "class", "comment");
 		},
 		m(target, anchor) {
@@ -67,7 +67,7 @@ function create_each_block(ctx) {
 			append(span, t4);
 			append(span, t5);
 			append(div, t6);
-			html_tag.m(div);
+			html_tag.m(raw_value, div);
 		},
 		p(ctx, dirty) {
 			if (dirty & /*comments*/ 1 && t2_value !== (t2_value = /*comment*/ ctx[4].author + "")) set_data(t2, t2_value);
diff --git a/test/js/samples/event-handler-dynamic/expected.js b/test/js/samples/event-handler-dynamic/expected.js
index 16b4a3f626..dacdfe15ac 100644
--- a/test/js/samples/event-handler-dynamic/expected.js
+++ b/test/js/samples/event-handler-dynamic/expected.js
@@ -26,6 +26,7 @@ function create_fragment(ctx) {
 	let t4;
 	let t5;
 	let button2;
+	let mounted;
 	let dispose;
 
 	return {
@@ -54,13 +55,17 @@ function create_fragment(ctx) {
 			insert(target, t5, anchor);
 			insert(target, button2, anchor);
 
-			dispose = [
-				listen(button0, "click", /*updateHandler1*/ ctx[2]),
-				listen(button1, "click", /*updateHandler2*/ ctx[3]),
-				listen(button2, "click", function () {
-					if (is_function(/*clickHandler*/ ctx[0])) /*clickHandler*/ ctx[0].apply(this, arguments);
-				})
-			];
+			if (!mounted) {
+				dispose = [
+					listen(button0, "click", /*updateHandler1*/ ctx[2]),
+					listen(button1, "click", /*updateHandler2*/ ctx[3]),
+					listen(button2, "click", function () {
+						if (is_function(/*clickHandler*/ ctx[0])) /*clickHandler*/ ctx[0].apply(this, arguments);
+					})
+				];
+
+				mounted = true;
+			}
 		},
 		p(new_ctx, [dirty]) {
 			ctx = new_ctx;
@@ -74,6 +79,7 @@ function create_fragment(ctx) {
 			if (detaching) detach(p1);
 			if (detaching) detach(t5);
 			if (detaching) detach(button2);
+			mounted = false;
 			run_all(dispose);
 		}
 	};
diff --git a/test/js/samples/event-handler-no-passive/expected.js b/test/js/samples/event-handler-no-passive/expected.js
index c519fac668..4d4b910d4e 100644
--- a/test/js/samples/event-handler-no-passive/expected.js
+++ b/test/js/samples/event-handler-no-passive/expected.js
@@ -13,6 +13,7 @@ import {
 
 function create_fragment(ctx) {
 	let a;
+	let mounted;
 	let dispose;
 
 	return {
@@ -23,13 +24,18 @@ function create_fragment(ctx) {
 		},
 		m(target, anchor) {
 			insert(target, a, anchor);
-			dispose = listen(a, "touchstart", touchstart_handler);
+
+			if (!mounted) {
+				dispose = listen(a, "touchstart", touchstart_handler);
+				mounted = true;
+			}
 		},
 		p: noop,
 		i: noop,
 		o: noop,
 		d(detaching) {
 			if (detaching) detach(a);
+			mounted = false;
 			dispose();
 		}
 	};
diff --git a/test/js/samples/event-modifiers/expected.js b/test/js/samples/event-modifiers/expected.js
index c12c3523a0..6aa3c161f9 100644
--- a/test/js/samples/event-modifiers/expected.js
+++ b/test/js/samples/event-modifiers/expected.js
@@ -22,6 +22,7 @@ function create_fragment(ctx) {
 	let button1;
 	let t3;
 	let button2;
+	let mounted;
 	let dispose;
 
 	return {
@@ -44,18 +45,23 @@ function create_fragment(ctx) {
 			append(div, t3);
 			append(div, button2);
 
-			dispose = [
-				listen(button0, "click", stop_propagation(prevent_default(handleClick))),
-				listen(button1, "click", handleClick, { once: true, capture: true }),
-				listen(button2, "click", handleClick, true),
-				listen(div, "touchstart", handleTouchstart, { passive: true })
-			];
+			if (!mounted) {
+				dispose = [
+					listen(button0, "click", stop_propagation(prevent_default(handleClick))),
+					listen(button1, "click", handleClick, { once: true, capture: true }),
+					listen(button2, "click", handleClick, true),
+					listen(div, "touchstart", handleTouchstart, { passive: true })
+				];
+
+				mounted = true;
+			}
 		},
 		p: noop,
 		i: noop,
 		o: noop,
 		d(detaching) {
 			if (detaching) detach(div);
+			mounted = false;
 			run_all(dispose);
 		}
 	};
diff --git a/test/js/samples/if-block-simple/expected.js b/test/js/samples/if-block-simple/expected.js
index b9fad863e2..eb6c8e8949 100644
--- a/test/js/samples/if-block-simple/expected.js
+++ b/test/js/samples/if-block-simple/expected.js
@@ -42,12 +42,12 @@ function create_fragment(ctx) {
 		},
 		p(ctx, [dirty]) {
 			if (/*foo*/ ctx[0]) {
-				if (!if_block) {
+				if (if_block) {
+					
+				} else {
 					if_block = create_if_block(ctx);
 					if_block.c();
 					if_block.m(if_block_anchor.parentNode, if_block_anchor);
-				} else {
-					
 				}
 			} else if (if_block) {
 				if_block.d(1);
diff --git a/test/js/samples/input-files/expected.js b/test/js/samples/input-files/expected.js
index 2a2254fbd7..0069c2e5f8 100644
--- a/test/js/samples/input-files/expected.js
+++ b/test/js/samples/input-files/expected.js
@@ -13,6 +13,7 @@ import {
 
 function create_fragment(ctx) {
 	let input;
+	let mounted;
 	let dispose;
 
 	return {
@@ -23,13 +24,18 @@ function create_fragment(ctx) {
 		},
 		m(target, anchor) {
 			insert(target, input, anchor);
-			dispose = listen(input, "change", /*input_change_handler*/ ctx[1]);
+
+			if (!mounted) {
+				dispose = listen(input, "change", /*input_change_handler*/ ctx[1]);
+				mounted = true;
+			}
 		},
 		p: noop,
 		i: noop,
 		o: noop,
 		d(detaching) {
 			if (detaching) detach(input);
+			mounted = false;
 			dispose();
 		}
 	};
diff --git a/test/js/samples/input-no-initial-value/expected.js b/test/js/samples/input-no-initial-value/expected.js
index d588f0bf73..3354aa3111 100644
--- a/test/js/samples/input-no-initial-value/expected.js
+++ b/test/js/samples/input-no-initial-value/expected.js
@@ -20,6 +20,7 @@ function create_fragment(ctx) {
 	let input;
 	let t0;
 	let button;
+	let mounted;
 	let dispose;
 
 	return {
@@ -39,10 +40,14 @@ function create_fragment(ctx) {
 			append(form, t0);
 			append(form, button);
 
-			dispose = [
-				listen(input, "input", /*input_input_handler*/ ctx[2]),
-				listen(form, "submit", /*handleSubmit*/ ctx[1])
-			];
+			if (!mounted) {
+				dispose = [
+					listen(input, "input", /*input_input_handler*/ ctx[2]),
+					listen(form, "submit", /*handleSubmit*/ ctx[1])
+				];
+
+				mounted = true;
+			}
 		},
 		p(ctx, [dirty]) {
 			if (dirty & /*test*/ 1 && input.value !== /*test*/ ctx[0]) {
@@ -53,6 +58,7 @@ function create_fragment(ctx) {
 		o: noop,
 		d(detaching) {
 			if (detaching) detach(form);
+			mounted = false;
 			run_all(dispose);
 		}
 	};
diff --git a/test/js/samples/input-range/expected.js b/test/js/samples/input-range/expected.js
index 12dfd3e90e..770baa29ed 100644
--- a/test/js/samples/input-range/expected.js
+++ b/test/js/samples/input-range/expected.js
@@ -16,6 +16,7 @@ import {
 
 function create_fragment(ctx) {
 	let input;
+	let mounted;
 	let dispose;
 
 	return {
@@ -27,10 +28,14 @@ function create_fragment(ctx) {
 			insert(target, input, anchor);
 			set_input_value(input, /*value*/ ctx[0]);
 
-			dispose = [
-				listen(input, "change", /*input_change_input_handler*/ ctx[1]),
-				listen(input, "input", /*input_change_input_handler*/ ctx[1])
-			];
+			if (!mounted) {
+				dispose = [
+					listen(input, "change", /*input_change_input_handler*/ ctx[1]),
+					listen(input, "input", /*input_change_input_handler*/ ctx[1])
+				];
+
+				mounted = true;
+			}
 		},
 		p(ctx, [dirty]) {
 			if (dirty & /*value*/ 1) {
@@ -41,6 +46,7 @@ function create_fragment(ctx) {
 		o: noop,
 		d(detaching) {
 			if (detaching) detach(input);
+			mounted = false;
 			run_all(dispose);
 		}
 	};
diff --git a/test/js/samples/input-value/expected.js b/test/js/samples/input-value/expected.js
index 21c7bfc83b..781a2ae603 100644
--- a/test/js/samples/input-value/expected.js
+++ b/test/js/samples/input-value/expected.js
@@ -20,6 +20,7 @@ function create_fragment(ctx) {
 	let h1;
 	let t1;
 	let t2;
+	let mounted;
 	let dispose;
 
 	return {
@@ -37,7 +38,11 @@ function create_fragment(ctx) {
 			insert(target, h1, anchor);
 			append(h1, t1);
 			append(h1, t2);
-			dispose = listen(input, "input", /*onInput*/ ctx[1]);
+
+			if (!mounted) {
+				dispose = listen(input, "input", /*onInput*/ ctx[1]);
+				mounted = true;
+			}
 		},
 		p(ctx, [dirty]) {
 			if (dirty & /*name*/ 1 && input.value !== /*name*/ ctx[0]) {
@@ -52,6 +57,7 @@ function create_fragment(ctx) {
 			if (detaching) detach(input);
 			if (detaching) detach(t0);
 			if (detaching) detach(h1);
+			mounted = false;
 			dispose();
 		}
 	};
diff --git a/test/js/samples/input-without-blowback-guard/expected.js b/test/js/samples/input-without-blowback-guard/expected.js
index fefe867e14..f19f74dc1e 100644
--- a/test/js/samples/input-without-blowback-guard/expected.js
+++ b/test/js/samples/input-without-blowback-guard/expected.js
@@ -13,6 +13,7 @@ import {
 
 function create_fragment(ctx) {
 	let input;
+	let mounted;
 	let dispose;
 
 	return {
@@ -23,7 +24,11 @@ function create_fragment(ctx) {
 		m(target, anchor) {
 			insert(target, input, anchor);
 			input.checked = /*foo*/ ctx[0];
-			dispose = listen(input, "change", /*input_change_handler*/ ctx[1]);
+
+			if (!mounted) {
+				dispose = listen(input, "change", /*input_change_handler*/ ctx[1]);
+				mounted = true;
+			}
 		},
 		p(ctx, [dirty]) {
 			if (dirty & /*foo*/ 1) {
@@ -34,6 +39,7 @@ function create_fragment(ctx) {
 		o: noop,
 		d(detaching) {
 			if (detaching) detach(input);
+			mounted = false;
 			dispose();
 		}
 	};
diff --git a/test/js/samples/instrumentation-script-if-no-block/expected.js b/test/js/samples/instrumentation-script-if-no-block/expected.js
index 7634481a2d..7f51c64550 100644
--- a/test/js/samples/instrumentation-script-if-no-block/expected.js
+++ b/test/js/samples/instrumentation-script-if-no-block/expected.js
@@ -20,6 +20,7 @@ function create_fragment(ctx) {
 	let p;
 	let t2;
 	let t3;
+	let mounted;
 	let dispose;
 
 	return {
@@ -37,7 +38,11 @@ function create_fragment(ctx) {
 			insert(target, p, anchor);
 			append(p, t2);
 			append(p, t3);
-			dispose = listen(button, "click", /*foo*/ ctx[1]);
+
+			if (!mounted) {
+				dispose = listen(button, "click", /*foo*/ ctx[1]);
+				mounted = true;
+			}
 		},
 		p(ctx, [dirty]) {
 			if (dirty & /*x*/ 1) set_data(t3, /*x*/ ctx[0]);
@@ -48,6 +53,7 @@ function create_fragment(ctx) {
 			if (detaching) detach(button);
 			if (detaching) detach(t1);
 			if (detaching) detach(p);
+			mounted = false;
 			dispose();
 		}
 	};
diff --git a/test/js/samples/instrumentation-script-x-equals-x/expected.js b/test/js/samples/instrumentation-script-x-equals-x/expected.js
index c154608cd5..ea0d65acb9 100644
--- a/test/js/samples/instrumentation-script-x-equals-x/expected.js
+++ b/test/js/samples/instrumentation-script-x-equals-x/expected.js
@@ -21,6 +21,7 @@ function create_fragment(ctx) {
 	let t2;
 	let t3_value = /*things*/ ctx[0].length + "";
 	let t3;
+	let mounted;
 	let dispose;
 
 	return {
@@ -38,7 +39,11 @@ function create_fragment(ctx) {
 			insert(target, p, anchor);
 			append(p, t2);
 			append(p, t3);
-			dispose = listen(button, "click", /*foo*/ ctx[1]);
+
+			if (!mounted) {
+				dispose = listen(button, "click", /*foo*/ ctx[1]);
+				mounted = true;
+			}
 		},
 		p(ctx, [dirty]) {
 			if (dirty & /*things*/ 1 && t3_value !== (t3_value = /*things*/ ctx[0].length + "")) set_data(t3, t3_value);
@@ -49,6 +54,7 @@ function create_fragment(ctx) {
 			if (detaching) detach(button);
 			if (detaching) detach(t1);
 			if (detaching) detach(p);
+			mounted = false;
 			dispose();
 		}
 	};
diff --git a/test/js/samples/instrumentation-template-if-no-block/expected.js b/test/js/samples/instrumentation-template-if-no-block/expected.js
index 77780baa99..0c2713a9cc 100644
--- a/test/js/samples/instrumentation-template-if-no-block/expected.js
+++ b/test/js/samples/instrumentation-template-if-no-block/expected.js
@@ -20,6 +20,7 @@ function create_fragment(ctx) {
 	let p;
 	let t2;
 	let t3;
+	let mounted;
 	let dispose;
 
 	return {
@@ -37,7 +38,11 @@ function create_fragment(ctx) {
 			insert(target, p, anchor);
 			append(p, t2);
 			append(p, t3);
-			dispose = listen(button, "click", /*click_handler*/ ctx[1]);
+
+			if (!mounted) {
+				dispose = listen(button, "click", /*click_handler*/ ctx[1]);
+				mounted = true;
+			}
 		},
 		p(ctx, [dirty]) {
 			if (dirty & /*x*/ 1) set_data(t3, /*x*/ ctx[0]);
@@ -48,6 +53,7 @@ function create_fragment(ctx) {
 			if (detaching) detach(button);
 			if (detaching) detach(t1);
 			if (detaching) detach(p);
+			mounted = false;
 			dispose();
 		}
 	};
diff --git a/test/js/samples/instrumentation-template-x-equals-x/expected.js b/test/js/samples/instrumentation-template-x-equals-x/expected.js
index 4fe45616c7..55cd310661 100644
--- a/test/js/samples/instrumentation-template-x-equals-x/expected.js
+++ b/test/js/samples/instrumentation-template-x-equals-x/expected.js
@@ -21,6 +21,7 @@ function create_fragment(ctx) {
 	let t2;
 	let t3_value = /*things*/ ctx[0].length + "";
 	let t3;
+	let mounted;
 	let dispose;
 
 	return {
@@ -38,7 +39,11 @@ function create_fragment(ctx) {
 			insert(target, p, anchor);
 			append(p, t2);
 			append(p, t3);
-			dispose = listen(button, "click", /*click_handler*/ ctx[1]);
+
+			if (!mounted) {
+				dispose = listen(button, "click", /*click_handler*/ ctx[1]);
+				mounted = true;
+			}
 		},
 		p(ctx, [dirty]) {
 			if (dirty & /*things*/ 1 && t3_value !== (t3_value = /*things*/ ctx[0].length + "")) set_data(t3, t3_value);
@@ -49,6 +54,7 @@ function create_fragment(ctx) {
 			if (detaching) detach(button);
 			if (detaching) detach(t1);
 			if (detaching) detach(p);
+			mounted = false;
 			dispose();
 		}
 	};
diff --git a/test/js/samples/media-bindings/expected.js b/test/js/samples/media-bindings/expected.js
index 52fef36792..bcbc0647b8 100644
--- a/test/js/samples/media-bindings/expected.js
+++ b/test/js/samples/media-bindings/expected.js
@@ -19,6 +19,7 @@ function create_fragment(ctx) {
 	let audio_updating = false;
 	let audio_animationframe;
 	let audio_is_paused = true;
+	let mounted;
 	let dispose;
 
 	function audio_timeupdate_handler() {
@@ -29,18 +30,18 @@ function create_fragment(ctx) {
 			audio_updating = true;
 		}
 
-		/*audio_timeupdate_handler*/ ctx[12].call(audio);
+		/*audio_timeupdate_handler*/ ctx[13].call(audio);
 	}
 
 	return {
 		c() {
 			audio = element("audio");
-			if (/*buffered*/ ctx[0] === void 0) add_render_callback(() => /*audio_progress_handler*/ ctx[10].call(audio));
-			if (/*buffered*/ ctx[0] === void 0 || /*seekable*/ ctx[1] === void 0) add_render_callback(() => /*audio_loadedmetadata_handler*/ ctx[11].call(audio));
-			if (/*played*/ ctx[2] === void 0 || /*currentTime*/ ctx[3] === void 0 || /*ended*/ ctx[9] === void 0) add_render_callback(audio_timeupdate_handler);
-			if (/*duration*/ ctx[4] === void 0) add_render_callback(() => /*audio_durationchange_handler*/ ctx[13].call(audio));
-			if (/*seeking*/ ctx[8] === void 0) add_render_callback(() => /*audio_seeking_seeked_handler*/ ctx[17].call(audio));
-			if (/*ended*/ ctx[9] === void 0) add_render_callback(() => /*audio_ended_handler*/ ctx[18].call(audio));
+			if (/*buffered*/ ctx[0] === void 0) add_render_callback(() => /*audio_progress_handler*/ ctx[11].call(audio));
+			if (/*buffered*/ ctx[0] === void 0 || /*seekable*/ ctx[1] === void 0) add_render_callback(() => /*audio_loadedmetadata_handler*/ ctx[12].call(audio));
+			if (/*played*/ ctx[2] === void 0 || /*currentTime*/ ctx[3] === void 0 || /*ended*/ ctx[10] === void 0) add_render_callback(audio_timeupdate_handler);
+			if (/*duration*/ ctx[4] === void 0) add_render_callback(() => /*audio_durationchange_handler*/ ctx[14].call(audio));
+			if (/*seeking*/ ctx[9] === void 0) add_render_callback(() => /*audio_seeking_seeked_handler*/ ctx[18].call(audio));
+			if (/*ended*/ ctx[10] === void 0) add_render_callback(() => /*audio_ended_handler*/ ctx[19].call(audio));
 		},
 		m(target, anchor) {
 			insert(target, audio, anchor);
@@ -49,23 +50,29 @@ function create_fragment(ctx) {
 				audio.volume = /*volume*/ ctx[6];
 			}
 
-			if (!isNaN(/*playbackRate*/ ctx[7])) {
-				audio.playbackRate = /*playbackRate*/ ctx[7];
+			audio.muted = /*muted*/ ctx[7];
+
+			if (!isNaN(/*playbackRate*/ ctx[8])) {
+				audio.playbackRate = /*playbackRate*/ ctx[8];
 			}
 
-			dispose = [
-				listen(audio, "progress", /*audio_progress_handler*/ ctx[10]),
-				listen(audio, "loadedmetadata", /*audio_loadedmetadata_handler*/ ctx[11]),
-				listen(audio, "timeupdate", audio_timeupdate_handler),
-				listen(audio, "durationchange", /*audio_durationchange_handler*/ ctx[13]),
-				listen(audio, "play", /*audio_play_pause_handler*/ ctx[14]),
-				listen(audio, "pause", /*audio_play_pause_handler*/ ctx[14]),
-				listen(audio, "volumechange", /*audio_volumechange_handler*/ ctx[15]),
-				listen(audio, "ratechange", /*audio_ratechange_handler*/ ctx[16]),
-				listen(audio, "seeking", /*audio_seeking_seeked_handler*/ ctx[17]),
-				listen(audio, "seeked", /*audio_seeking_seeked_handler*/ ctx[17]),
-				listen(audio, "ended", /*audio_ended_handler*/ ctx[18])
-			];
+			if (!mounted) {
+				dispose = [
+					listen(audio, "progress", /*audio_progress_handler*/ ctx[11]),
+					listen(audio, "loadedmetadata", /*audio_loadedmetadata_handler*/ ctx[12]),
+					listen(audio, "timeupdate", audio_timeupdate_handler),
+					listen(audio, "durationchange", /*audio_durationchange_handler*/ ctx[14]),
+					listen(audio, "play", /*audio_play_pause_handler*/ ctx[15]),
+					listen(audio, "pause", /*audio_play_pause_handler*/ ctx[15]),
+					listen(audio, "volumechange", /*audio_volumechange_handler*/ ctx[16]),
+					listen(audio, "ratechange", /*audio_ratechange_handler*/ ctx[17]),
+					listen(audio, "seeking", /*audio_seeking_seeked_handler*/ ctx[18]),
+					listen(audio, "seeked", /*audio_seeking_seeked_handler*/ ctx[18]),
+					listen(audio, "ended", /*audio_ended_handler*/ ctx[19])
+				];
+
+				mounted = true;
+			}
 		},
 		p(ctx, [dirty]) {
 			if (!audio_updating && dirty & /*currentTime*/ 8 && !isNaN(/*currentTime*/ ctx[3])) {
@@ -82,14 +89,19 @@ function create_fragment(ctx) {
 				audio.volume = /*volume*/ ctx[6];
 			}
 
-			if (dirty & /*playbackRate*/ 128 && !isNaN(/*playbackRate*/ ctx[7])) {
-				audio.playbackRate = /*playbackRate*/ ctx[7];
+			if (dirty & /*muted*/ 128) {
+				audio.muted = /*muted*/ ctx[7];
+			}
+
+			if (dirty & /*playbackRate*/ 256 && !isNaN(/*playbackRate*/ ctx[8])) {
+				audio.playbackRate = /*playbackRate*/ ctx[8];
 			}
 		},
 		i: noop,
 		o: noop,
 		d(detaching) {
 			if (detaching) detach(audio);
+			mounted = false;
 			run_all(dispose);
 		}
 	};
@@ -103,6 +115,7 @@ function instance($$self, $$props, $$invalidate) {
 	let { duration } = $$props;
 	let { paused } = $$props;
 	let { volume } = $$props;
+	let { muted } = $$props;
 	let { playbackRate } = $$props;
 	let { seeking } = $$props;
 	let { ended } = $$props;
@@ -125,7 +138,7 @@ function instance($$self, $$props, $$invalidate) {
 		ended = this.ended;
 		$$invalidate(2, played);
 		$$invalidate(3, currentTime);
-		$$invalidate(9, ended);
+		$$invalidate(10, ended);
 	}
 
 	function audio_durationchange_handler() {
@@ -140,22 +153,24 @@ function instance($$self, $$props, $$invalidate) {
 
 	function audio_volumechange_handler() {
 		volume = this.volume;
+		muted = this.muted;
 		$$invalidate(6, volume);
+		$$invalidate(7, muted);
 	}
 
 	function audio_ratechange_handler() {
 		playbackRate = this.playbackRate;
-		$$invalidate(7, playbackRate);
+		$$invalidate(8, playbackRate);
 	}
 
 	function audio_seeking_seeked_handler() {
 		seeking = this.seeking;
-		$$invalidate(8, seeking);
+		$$invalidate(9, seeking);
 	}
 
 	function audio_ended_handler() {
 		ended = this.ended;
-		$$invalidate(9, ended);
+		$$invalidate(10, ended);
 	}
 
 	$$self.$set = $$props => {
@@ -166,9 +181,10 @@ function instance($$self, $$props, $$invalidate) {
 		if ("duration" in $$props) $$invalidate(4, duration = $$props.duration);
 		if ("paused" in $$props) $$invalidate(5, paused = $$props.paused);
 		if ("volume" in $$props) $$invalidate(6, volume = $$props.volume);
-		if ("playbackRate" in $$props) $$invalidate(7, playbackRate = $$props.playbackRate);
-		if ("seeking" in $$props) $$invalidate(8, seeking = $$props.seeking);
-		if ("ended" in $$props) $$invalidate(9, ended = $$props.ended);
+		if ("muted" in $$props) $$invalidate(7, muted = $$props.muted);
+		if ("playbackRate" in $$props) $$invalidate(8, playbackRate = $$props.playbackRate);
+		if ("seeking" in $$props) $$invalidate(9, seeking = $$props.seeking);
+		if ("ended" in $$props) $$invalidate(10, ended = $$props.ended);
 	};
 
 	return [
@@ -179,6 +195,7 @@ function instance($$self, $$props, $$invalidate) {
 		duration,
 		paused,
 		volume,
+		muted,
 		playbackRate,
 		seeking,
 		ended,
@@ -206,9 +223,10 @@ class Component extends SvelteComponent {
 			duration: 4,
 			paused: 5,
 			volume: 6,
-			playbackRate: 7,
-			seeking: 8,
-			ended: 9
+			muted: 7,
+			playbackRate: 8,
+			seeking: 9,
+			ended: 10
 		});
 	}
 }
diff --git a/test/js/samples/media-bindings/input.svelte b/test/js/samples/media-bindings/input.svelte
index a079a2e0e5..7c1afcf614 100644
--- a/test/js/samples/media-bindings/input.svelte
+++ b/test/js/samples/media-bindings/input.svelte
@@ -6,9 +6,10 @@
 	export let duration;
 	export let paused;
 	export let volume;
+	export let muted;
 	export let playbackRate;
 	export let seeking;
 	export let ended;
 </script>
 
-<audio bind:buffered bind:seekable bind:played bind:currentTime bind:duration bind:paused bind:volume bind:playbackRate bind:seeking bind:ended/>
+<audio bind:buffered bind:seekable bind:played bind:currentTime bind:duration bind:paused bind:volume bind:muted bind:playbackRate bind:seeking bind:ended/>
diff --git a/test/js/samples/select-dynamic-value/expected.js b/test/js/samples/select-dynamic-value/expected.js
index a93a47bd3a..f1a913c65f 100644
--- a/test/js/samples/select-dynamic-value/expected.js
+++ b/test/js/samples/select-dynamic-value/expected.js
@@ -7,7 +7,8 @@ import {
 	init,
 	insert,
 	noop,
-	safe_not_equal
+	safe_not_equal,
+	select_option
 } from "svelte/internal";
 
 function create_fragment(ctx) {
@@ -33,26 +34,11 @@ function create_fragment(ctx) {
 			append(select, option0);
 			append(select, option1);
 			select_value_value = /*current*/ ctx[0];
-
-			for (var i = 0; i < select.options.length; i += 1) {
-				var option = select.options[i];
-
-				if (option.__value === select_value_value) {
-					option.selected = true;
-					break;
-				}
-			}
+			select_option(select, select_value_value);
 		},
 		p(ctx, [dirty]) {
 			if (dirty & /*current*/ 1 && select_value_value !== (select_value_value = /*current*/ ctx[0])) {
-				for (var i = 0; i < select.options.length; i += 1) {
-					var option = select.options[i];
-
-					if (option.__value === select_value_value) {
-						option.selected = true;
-						break;
-					}
-				}
+				select_option(select, select_value_value);
 			}
 		},
 		i: noop,
diff --git a/test/js/samples/transition-local/expected.js b/test/js/samples/transition-local/expected.js
index a5d3b6318f..25a03f026f 100644
--- a/test/js/samples/transition-local/expected.js
+++ b/test/js/samples/transition-local/expected.js
@@ -28,13 +28,15 @@ function create_if_block(ctx) {
 		},
 		p(ctx, dirty) {
 			if (/*y*/ ctx[1]) {
-				if (!if_block) {
+				if (if_block) {
+					if (dirty & /*y*/ 2) {
+						transition_in(if_block, 1);
+					}
+				} else {
 					if_block = create_if_block_1(ctx);
 					if_block.c();
 					transition_in(if_block, 1);
 					if_block.m(if_block_anchor.parentNode, if_block_anchor);
-				} else {
-					transition_in(if_block, 1);
 				}
 			} else if (if_block) {
 				if_block.d(1);
diff --git a/test/js/samples/transition-repeated-outro/expected.js b/test/js/samples/transition-repeated-outro/expected.js
index 6f071328a4..1f76a93666 100644
--- a/test/js/samples/transition-repeated-outro/expected.js
+++ b/test/js/samples/transition-repeated-outro/expected.js
@@ -63,13 +63,15 @@ function create_fragment(ctx) {
 		},
 		p(ctx, [dirty]) {
 			if (/*num*/ ctx[0] < 5) {
-				if (!if_block) {
+				if (if_block) {
+					if (dirty & /*num*/ 1) {
+						transition_in(if_block, 1);
+					}
+				} else {
 					if_block = create_if_block(ctx);
 					if_block.c();
 					transition_in(if_block, 1);
 					if_block.m(if_block_anchor.parentNode, if_block_anchor);
-				} else {
-					transition_in(if_block, 1);
 				}
 			} else if (if_block) {
 				group_outros();
diff --git a/test/js/samples/use-elements-as-anchors/expected.js b/test/js/samples/use-elements-as-anchors/expected.js
index 52635e9b78..5be8808edb 100644
--- a/test/js/samples/use-elements-as-anchors/expected.js
+++ b/test/js/samples/use-elements-as-anchors/expected.js
@@ -157,12 +157,12 @@ function create_fragment(ctx) {
 		},
 		p(ctx, [dirty]) {
 			if (/*a*/ ctx[0]) {
-				if (!if_block0) {
+				if (if_block0) {
+					
+				} else {
 					if_block0 = create_if_block_4(ctx);
 					if_block0.c();
 					if_block0.m(div, t0);
-				} else {
-					
 				}
 			} else if (if_block0) {
 				if_block0.d(1);
@@ -170,12 +170,12 @@ function create_fragment(ctx) {
 			}
 
 			if (/*b*/ ctx[1]) {
-				if (!if_block1) {
+				if (if_block1) {
+					
+				} else {
 					if_block1 = create_if_block_3(ctx);
 					if_block1.c();
 					if_block1.m(div, t3);
-				} else {
-					
 				}
 			} else if (if_block1) {
 				if_block1.d(1);
@@ -183,12 +183,12 @@ function create_fragment(ctx) {
 			}
 
 			if (/*c*/ ctx[2]) {
-				if (!if_block2) {
+				if (if_block2) {
+					
+				} else {
 					if_block2 = create_if_block_2(ctx);
 					if_block2.c();
 					if_block2.m(div, t4);
-				} else {
-					
 				}
 			} else if (if_block2) {
 				if_block2.d(1);
@@ -196,12 +196,12 @@ function create_fragment(ctx) {
 			}
 
 			if (/*d*/ ctx[3]) {
-				if (!if_block3) {
+				if (if_block3) {
+					
+				} else {
 					if_block3 = create_if_block_1(ctx);
 					if_block3.c();
 					if_block3.m(div, null);
-				} else {
-					
 				}
 			} else if (if_block3) {
 				if_block3.d(1);
@@ -209,12 +209,12 @@ function create_fragment(ctx) {
 			}
 
 			if (/*e*/ ctx[4]) {
-				if (!if_block4) {
+				if (if_block4) {
+					
+				} else {
 					if_block4 = create_if_block(ctx);
 					if_block4.c();
 					if_block4.m(if_block4_anchor.parentNode, if_block4_anchor);
-				} else {
-					
 				}
 			} else if (if_block4) {
 				if_block4.d(1);
diff --git a/test/js/samples/video-bindings/expected.js b/test/js/samples/video-bindings/expected.js
index c8cd1d84ce..d3920ef8c2 100644
--- a/test/js/samples/video-bindings/expected.js
+++ b/test/js/samples/video-bindings/expected.js
@@ -19,6 +19,7 @@ function create_fragment(ctx) {
 	let video_updating = false;
 	let video_animationframe;
 	let video_resize_listener;
+	let mounted;
 	let dispose;
 
 	function video_timeupdate_handler() {
@@ -42,10 +43,14 @@ function create_fragment(ctx) {
 			insert(target, video, anchor);
 			video_resize_listener = add_resize_listener(video, /*video_elementresize_handler*/ ctx[6].bind(video));
 
-			dispose = [
-				listen(video, "timeupdate", video_timeupdate_handler),
-				listen(video, "resize", /*video_resize_handler*/ ctx[5])
-			];
+			if (!mounted) {
+				dispose = [
+					listen(video, "timeupdate", video_timeupdate_handler),
+					listen(video, "resize", /*video_resize_handler*/ ctx[5])
+				];
+
+				mounted = true;
+			}
 		},
 		p(ctx, [dirty]) {
 			if (!video_updating && dirty & /*currentTime*/ 1 && !isNaN(/*currentTime*/ ctx[0])) {
@@ -58,7 +63,8 @@ function create_fragment(ctx) {
 		o: noop,
 		d(detaching) {
 			if (detaching) detach(video);
-			video_resize_listener.cancel();
+			video_resize_listener();
+			mounted = false;
 			run_all(dispose);
 		}
 	};
diff --git a/test/js/samples/window-binding-online/expected.js b/test/js/samples/window-binding-online/expected.js
index e129e66d71..887195bce1 100644
--- a/test/js/samples/window-binding-online/expected.js
+++ b/test/js/samples/window-binding-online/expected.js
@@ -10,21 +10,27 @@ import {
 } from "svelte/internal";
 
 function create_fragment(ctx) {
+	let mounted;
 	let dispose;
 	add_render_callback(/*onlinestatuschanged*/ ctx[1]);
 
 	return {
 		c: noop,
 		m(target, anchor) {
-			dispose = [
-				listen(window, "online", /*onlinestatuschanged*/ ctx[1]),
-				listen(window, "offline", /*onlinestatuschanged*/ ctx[1])
-			];
+			if (!mounted) {
+				dispose = [
+					listen(window, "online", /*onlinestatuschanged*/ ctx[1]),
+					listen(window, "offline", /*onlinestatuschanged*/ ctx[1])
+				];
+
+				mounted = true;
+			}
 		},
 		p: noop,
 		i: noop,
 		o: noop,
 		d(detaching) {
+			mounted = false;
 			run_all(dispose);
 		}
 	};
diff --git a/test/js/samples/window-binding-scroll/expected.js b/test/js/samples/window-binding-scroll/expected.js
index 70c39eedd2..45d992c721 100644
--- a/test/js/samples/window-binding-scroll/expected.js
+++ b/test/js/samples/window-binding-scroll/expected.js
@@ -25,6 +25,7 @@ function create_fragment(ctx) {
 	let p;
 	let t0;
 	let t1;
+	let mounted;
 	let dispose;
 	add_render_callback(/*onwindowscroll*/ ctx[1]);
 
@@ -39,12 +40,16 @@ function create_fragment(ctx) {
 			append(p, t0);
 			append(p, t1);
 
-			dispose = listen(window, "scroll", () => {
-				scrolling = true;
-				clearTimeout(scrolling_timeout);
-				scrolling_timeout = setTimeout(clear_scrolling, 100);
-				/*onwindowscroll*/ ctx[1]();
-			});
+			if (!mounted) {
+				dispose = listen(window, "scroll", () => {
+					scrolling = true;
+					clearTimeout(scrolling_timeout);
+					scrolling_timeout = setTimeout(clear_scrolling, 100);
+					/*onwindowscroll*/ ctx[1]();
+				});
+
+				mounted = true;
+			}
 		},
 		p(ctx, [dirty]) {
 			if (dirty & /*y*/ 1 && !scrolling) {
@@ -60,6 +65,7 @@ function create_fragment(ctx) {
 		o: noop,
 		d(detaching) {
 			if (detaching) detach(p);
+			mounted = false;
 			dispose();
 		}
 	};
diff --git a/test/motion/index.js b/test/motion/index.js
index 33489b18e1..ec58c6df36 100644
--- a/test/motion/index.js
+++ b/test/motion/index.js
@@ -19,5 +19,12 @@ describe('motion', () => {
 			size.set(100);
 			assert.equal(get(size), 100);
 		});
+
+		it('sets immediately when duration is 0', () => {
+			const size = tweened(0);
+
+			size.set(100, { duration : 0 });
+			assert.equal(get(size), 100);
+		});
 	});
 });
diff --git a/test/parser/index.js b/test/parser/index.js
index 27c5ec1563..2c8d516a7d 100644
--- a/test/parser/index.js
+++ b/test/parser/index.js
@@ -20,7 +20,7 @@ describe('parse', () => {
 		(skip ? it.skip : solo ? it.only : it)(dir, () => {
 			const options = tryToLoadJson(`${__dirname}/samples/${dir}/options.json`) || {};
 
-			const input = fs.readFileSync(`${__dirname}/samples/${dir}/input.svelte`, 'utf-8').replace(/\s+$/, '');
+			const input = fs.readFileSync(`${__dirname}/samples/${dir}/input.svelte`, 'utf-8').replace(/\s+$/, '').replace(/\r/g, "");
 			const expectedOutput = tryToLoadJson(`${__dirname}/samples/${dir}/output.json`);
 			const expectedError = tryToLoadJson(`${__dirname}/samples/${dir}/error.json`);
 
@@ -38,13 +38,9 @@ describe('parse', () => {
 			} catch (err) {
 				if (err.name !== 'ParseError') throw err;
 				if (!expectedError) throw err;
-
+				const { code, message, pos, start } = err
 				try {
-					assert.equal(err.code, expectedError.code);
-					assert.equal(err.message, expectedError.message);
-					assert.deepEqual(err.start, expectedError.start);
-					assert.equal(err.pos, expectedError.pos);
-					assert.equal(err.toString().split('\n')[0], `${expectedError.message} (${expectedError.start.line}:${expectedError.start.column})`);
+					assert.deepEqual({ code, message, pos, start }, expectedError);
 				} catch (err2) {
 					const e = err2.code === 'MODULE_NOT_FOUND' ? err : err2;
 					throw e;
diff --git a/test/parser/samples/await-catch/output.json b/test/parser/samples/await-catch/output.json
index 2461f467f2..c543583018 100644
--- a/test/parser/samples/await-catch/output.json
+++ b/test/parser/samples/await-catch/output.json
@@ -25,7 +25,12 @@
 					"name": "thePromise"
 				},
 				"value": null,
-				"error": "theError",
+				"error": {
+					"start": 47,
+					"end": 55,
+					"type": "Identifier",
+					"name": "theError"
+				},
 				"pending": {
 					"start": 19,
 					"end": 39,
diff --git a/test/parser/samples/await-then-catch/output.json b/test/parser/samples/await-then-catch/output.json
index d9defb6932..8e4b7a4c32 100644
--- a/test/parser/samples/await-then-catch/output.json
+++ b/test/parser/samples/await-then-catch/output.json
@@ -24,8 +24,18 @@
 					},
 					"name": "thePromise"
 				},
-				"value": "theValue",
-				"error": "theError",
+				"value": {
+					"start": 46,
+					"end": 54,
+					"type": "Identifier",
+					"name": "theValue"
+				},
+				"error": {
+					"start": 96,
+					"end": 104,
+					"type": "Identifier",
+					"name": "theError"
+				},
 				"pending": {
 					"start": 19,
 					"end": 39,
diff --git a/test/parser/samples/each-block-destructured/input.svelte b/test/parser/samples/each-block-destructured/input.svelte
index 09e9885be0..5313050fa0 100644
--- a/test/parser/samples/each-block-destructured/input.svelte
+++ b/test/parser/samples/each-block-destructured/input.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let animals;
+</script>
+
 {#each animals as [key, value, ...rest]}
 	<p>{key}: {value}</p>
 {/each}
diff --git a/test/parser/samples/each-block-destructured/output.json b/test/parser/samples/each-block-destructured/output.json
index 425c609a2c..69e165c0a4 100644
--- a/test/parser/samples/each-block-destructured/output.json
+++ b/test/parser/samples/each-block-destructured/output.json
@@ -1,24 +1,31 @@
 {
 	"html": {
-		"start": 0,
-		"end": 71,
+		"start": 41,
+		"end": 112,
 		"type": "Fragment",
 		"children": [
 			{
-				"start": 0,
-				"end": 71,
+				"start": 39,
+				"end": 41,
+				"type": "Text",
+				"raw": "\n\n",
+				"data": "\n\n"
+			},
+			{
+				"start": 41,
+				"end": 112,
 				"type": "EachBlock",
 				"expression": {
 					"type": "Identifier",
-					"start": 7,
-					"end": 14,
+					"start": 48,
+					"end": 55,
 					"loc": {
 						"start": {
-							"line": 1,
+							"line": 5,
 							"column": 7
 						},
 						"end": {
-							"line": 1,
+							"line": 5,
 							"column": 14
 						}
 					},
@@ -26,27 +33,27 @@
 				},
 				"children": [
 					{
-						"start": 42,
-						"end": 63,
+						"start": 83,
+						"end": 104,
 						"type": "Element",
 						"name": "p",
 						"attributes": [],
 						"children": [
 							{
-								"start": 45,
-								"end": 50,
+								"start": 86,
+								"end": 91,
 								"type": "MustacheTag",
 								"expression": {
 									"type": "Identifier",
-									"start": 46,
-									"end": 49,
+									"start": 87,
+									"end": 90,
 									"loc": {
 										"start": {
-											"line": 2,
+											"line": 6,
 											"column": 5
 										},
 										"end": {
-											"line": 2,
+											"line": 6,
 											"column": 8
 										}
 									},
@@ -54,27 +61,27 @@
 								}
 							},
 							{
-								"start": 50,
-								"end": 52,
+								"start": 91,
+								"end": 93,
 								"type": "Text",
 								"raw": ": ",
 								"data": ": "
 							},
 							{
-								"start": 52,
-								"end": 59,
+								"start": 93,
+								"end": 100,
 								"type": "MustacheTag",
 								"expression": {
 									"type": "Identifier",
-									"start": 53,
-									"end": 58,
+									"start": 94,
+									"end": 99,
 									"loc": {
 										"start": {
-											"line": 2,
+											"line": 6,
 											"column": 12
 										},
 										"end": {
-											"line": 2,
+											"line": 6,
 											"column": 17
 										}
 									},
@@ -85,31 +92,177 @@
 					}
 				],
 				"context": {
-					"start": 18,
-					"end": 39,
 					"type": "ArrayPattern",
+					"start": 59,
+					"end": 80,
+					"loc": {
+						"start": {
+							"line": 5,
+							"column": 19
+						},
+						"end": {
+							"line": 5,
+							"column": 40
+						}
+					},
 					"elements": [
 						{
-							"start": 19,
-							"end": 22,
 							"type": "Identifier",
+							"start": 60,
+							"end": 63,
+							"loc": {
+								"start": {
+									"line": 5,
+									"column": 20
+								},
+								"end": {
+									"line": 5,
+									"column": 23
+								}
+							},
 							"name": "key"
 						},
 						{
-							"start": 24,
-							"end": 29,
 							"type": "Identifier",
+							"start": 65,
+							"end": 70,
+							"loc": {
+								"start": {
+									"line": 5,
+									"column": 25
+								},
+								"end": {
+									"line": 5,
+									"column": 30
+								}
+							},
 							"name": "value"
 						},
 						{
-							"start": 31,
-							"end": 38,
-							"type": "RestIdentifier",
-							"name": "rest"
+							"type": "RestElement",
+							"start": 72,
+							"end": 79,
+							"loc": {
+								"start": {
+									"line": 5,
+									"column": 32
+								},
+								"end": {
+									"line": 5,
+									"column": 39
+								}
+							},
+							"argument": {
+								"type": "Identifier",
+								"start": 75,
+								"end": 79,
+								"loc": {
+									"start": {
+										"line": 5,
+										"column": 35
+									},
+									"end": {
+										"line": 5,
+										"column": 39
+									}
+								},
+								"name": "rest"
+							}
 						}
 					]
 				}
 			}
 		]
+	},
+	"instance": {
+		"type": "Script",
+		"start": 0,
+		"end": 39,
+		"context": "default",
+		"content": {
+			"type": "Program",
+			"start": 8,
+			"end": 30,
+			"loc": {
+				"start": {
+					"line": 1,
+					"column": 0
+				},
+				"end": {
+					"line": 3,
+					"column": 0
+				}
+			},
+			"body": [
+				{
+					"type": "ExportNamedDeclaration",
+					"start": 10,
+					"end": 29,
+					"loc": {
+						"start": {
+							"line": 2,
+							"column": 1
+						},
+						"end": {
+							"line": 2,
+							"column": 20
+						}
+					},
+					"declaration": {
+						"type": "VariableDeclaration",
+						"start": 17,
+						"end": 29,
+						"loc": {
+							"start": {
+								"line": 2,
+								"column": 8
+							},
+							"end": {
+								"line": 2,
+								"column": 20
+							}
+						},
+						"declarations": [
+							{
+								"type": "VariableDeclarator",
+								"start": 21,
+								"end": 28,
+								"loc": {
+									"start": {
+										"line": 2,
+										"column": 12
+									},
+									"end": {
+										"line": 2,
+										"column": 19
+									}
+								},
+								"id": {
+									"type": "Identifier",
+									"start": 21,
+									"end": 28,
+									"loc": {
+										"start": {
+											"line": 2,
+											"column": 12
+										},
+										"end": {
+											"line": 2,
+											"column": 19
+										}
+									},
+									"name": "animals"
+								},
+								"init": null
+							}
+						],
+						"kind": "let"
+					},
+					"specifiers": [],
+					"source": null
+				}
+			],
+			"sourceType": "module"
+		}
 	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/error-self-reference/error.json b/test/parser/samples/error-self-reference/error.json
index 798b5cb300..31ecab2b12 100644
--- a/test/parser/samples/error-self-reference/error.json
+++ b/test/parser/samples/error-self-reference/error.json
@@ -1,6 +1,6 @@
 {
 	"code": "invalid-self-placement",
-	"message": "<svelte:self> components can only exist inside if-blocks or each-blocks",
+	"message": "<svelte:self> components can only exist inside {#if} blocks, {#each} blocks, or slots passed to components",
 	"start": {
 		"line": 1,
 		"column": 1,
diff --git a/test/parser/samples/no-error-if-before-closing/output.json b/test/parser/samples/no-error-if-before-closing/output.json
index 251cefc0ca..708128a42e 100644
--- a/test/parser/samples/no-error-if-before-closing/output.json
+++ b/test/parser/samples/no-error-if-before-closing/output.json
@@ -115,7 +115,12 @@
 					"value": true,
 					"raw": "true"
 				},
-				"value": "f",
+				"value": {
+					"start": 97,
+					"end": 98,
+					"type": "Identifier",
+					"name": "f"
+				},
 				"error": null,
 				"pending": {
 					"start": 80,
@@ -198,7 +203,12 @@
 					"value": true,
 					"raw": "true"
 				},
-				"value": "f",
+				"value": {
+					"start": 137,
+					"end": 138,
+					"type": "Identifier",
+					"name": "f"
+				},
 				"error": null,
 				"pending": {
 					"start": 123,
diff --git a/test/runtime/index.js b/test/runtime/index.js
index f070eb8185..65157196c9 100644
--- a/test/runtime/index.js
+++ b/test/runtime/index.js
@@ -39,7 +39,7 @@ describe("runtime", () => {
 				filename
 			}, compileOptions);
 
-			const { js: { code } } = compile(fs.readFileSync(filename, "utf-8"), options);
+			const { js: { code } } = compile(fs.readFileSync(filename, "utf-8").replace(/\r/g, ""), options);
 
 			return module._compile(code, filename);
 		};
@@ -103,7 +103,7 @@ describe("runtime", () => {
 
 				try {
 					const { js } = compile(
-						fs.readFileSync(`${cwd}/${file}`, 'utf-8'),
+						fs.readFileSync(`${cwd}/${file}`, 'utf-8').replace(/\r/g, ""),
 						{
 							...compileOptions,
 							filename: file
diff --git a/test/runtime/samples/$$rest-without-props/App.svelte b/test/runtime/samples/$$rest-without-props/App.svelte
new file mode 100644
index 0000000000..e98fec30d4
--- /dev/null
+++ b/test/runtime/samples/$$rest-without-props/App.svelte
@@ -0,0 +1,12 @@
+<script>
+	export let a;
+	export function b() {}
+	export let c = 1;
+
+	$: length = Object.keys($$restProps).length;
+	$: values = Object.values($$restProps);
+</script>
+<div>Length: {length}</div>
+<div>Values: {values.join(',')}</div>
+
+<div {...$$restProps} />
\ No newline at end of file
diff --git a/test/runtime/samples/$$rest-without-props/_config.js b/test/runtime/samples/$$rest-without-props/_config.js
new file mode 100644
index 0000000000..017f9df561
--- /dev/null
+++ b/test/runtime/samples/$$rest-without-props/_config.js
@@ -0,0 +1,54 @@
+export default {
+	props: {
+		a: 3,
+		b: 4,
+		c: 5,
+		d: 6
+	},
+	html: `
+		<div>Length: 3</div>
+		<div>Values: 4,5,1</div>
+		<div d="4" e="5" foo="1"></div>
+		<button></button><button></button><button></button><button></button>
+	`,
+	async test({ assert, target, window, }) {
+		const [btn1, btn2, btn3, btn4] = target.querySelectorAll('button');
+		const clickEvent = new window.MouseEvent('click');
+
+		await btn1.dispatchEvent(clickEvent);
+		
+		assert.htmlEqual(target.innerHTML, `
+			<div>Length: 3</div>
+			<div>Values: 4,5,1</div>
+			<div d="4" e="5" foo="1"></div>
+			<button></button><button></button><button></button><button></button>
+		`);
+
+		await btn2.dispatchEvent(clickEvent);
+		
+		assert.htmlEqual(target.innerHTML, `
+			<div>Length: 3</div>
+			<div>Values: 34,5,1</div>
+			<div d="34" e="5" foo="1"></div>
+			<button></button><button></button><button></button><button></button>
+		`);
+
+		await btn3.dispatchEvent(clickEvent);
+		
+		assert.htmlEqual(target.innerHTML, `
+			<div>Length: 3</div>
+			<div>Values: 34,5,31</div>
+			<div d="34" e="5" foo="31"></div>
+			<button></button><button></button><button></button><button></button>
+		`);
+
+		await btn4.dispatchEvent(clickEvent);
+		
+		assert.htmlEqual(target.innerHTML, `
+			<div>Length: 4</div>
+			<div>Values: 34,5,31,2</div>
+			<div d="34" e="5" foo="31" bar="2"></div>
+			<button></button><button></button><button></button><button></button>
+		`);
+	}
+};
diff --git a/test/runtime/samples/$$rest-without-props/main.svelte b/test/runtime/samples/$$rest-without-props/main.svelte
new file mode 100644
index 0000000000..21b2690584
--- /dev/null
+++ b/test/runtime/samples/$$rest-without-props/main.svelte
@@ -0,0 +1,25 @@
+<script>
+	import App from './App.svelte';
+	let a = 1, b = 2, c = 3, d = 4, e = 5;
+	let f = { foo: 1 };
+
+	function updateProps() {
+		a = 31;
+		b = 32;
+	}
+	function updateRest() {
+		d = 34;
+	}
+	function updateSpread() {
+		f.foo = 31;
+	}
+	function updateSpread2() {
+		f.bar = 2;
+	}
+</script>
+
+<App {a} {b} {c} {d} {e} {...f} />
+<button on:click={updateProps}></button>
+<button on:click={updateRest}></button>
+<button on:click={updateSpread}></button>
+<button on:click={updateSpread2}></button>
\ No newline at end of file
diff --git a/test/runtime/samples/$$rest/App.svelte b/test/runtime/samples/$$rest/App.svelte
new file mode 100644
index 0000000000..875372f670
--- /dev/null
+++ b/test/runtime/samples/$$rest/App.svelte
@@ -0,0 +1,13 @@
+<script>
+	export let a;
+	export function b() {}
+	export let c = 1;
+
+	$: length = Object.keys($$restProps).length;
+	$: values = Object.values($$restProps);
+</script>
+<div>Length: {length}</div>
+<div>Values: {values.join(',')}</div>
+
+<div {...$$restProps} />
+<div {...$$props} />
\ No newline at end of file
diff --git a/test/runtime/samples/$$rest/_config.js b/test/runtime/samples/$$rest/_config.js
new file mode 100644
index 0000000000..255927f354
--- /dev/null
+++ b/test/runtime/samples/$$rest/_config.js
@@ -0,0 +1,60 @@
+export default {
+	props: {
+		a: 3,
+		b: 4,
+		c: 5,
+		d: 6
+	},
+	html: `
+		<div>Length: 3</div>
+		<div>Values: 4,5,1</div>
+		<div d="4" e="5" foo="1"></div>
+		<div a="1" b="2" c="3" d="4" e="5" foo="1"></div>
+		<button></button><button></button><button></button><button></button>
+	`,
+
+	async test({ assert, target, window, }) {
+		const [btn1, btn2, btn3, btn4] = target.querySelectorAll('button');
+		const clickEvent = new window.MouseEvent('click');
+
+		await btn1.dispatchEvent(clickEvent);
+		
+		assert.htmlEqual(target.innerHTML, `
+			<div>Length: 3</div>
+			<div>Values: 4,5,1</div>
+			<div d="4" e="5" foo="1"></div>
+			<div a="31" b="32" c="3" d="4" e="5" foo="1"></div>
+			<button></button><button></button><button></button><button></button>
+		`);
+
+		await btn2.dispatchEvent(clickEvent);
+		
+		assert.htmlEqual(target.innerHTML, `
+			<div>Length: 3</div>
+			<div>Values: 34,5,1</div>
+			<div d="34" e="5" foo="1"></div>
+			<div a="31" b="32" c="3" d="34" e="5" foo="1"></div>
+			<button></button><button></button><button></button><button></button>
+		`);
+
+		await btn3.dispatchEvent(clickEvent);
+		
+		assert.htmlEqual(target.innerHTML, `
+			<div>Length: 3</div>
+			<div>Values: 34,5,31</div>
+			<div d="34" e="5" foo="31"></div>
+			<div a="31" b="32" c="3" d="34" e="5" foo="31"></div>
+			<button></button><button></button><button></button><button></button>
+		`);
+
+		await btn4.dispatchEvent(clickEvent);
+		
+		assert.htmlEqual(target.innerHTML, `
+			<div>Length: 4</div>
+			<div>Values: 34,5,31,2</div>
+			<div d="34" e="5" foo="31" bar="2"></div>
+			<div a="31" b="32" c="3" d="34" e="5" foo="31" bar="2"></div>
+			<button></button><button></button><button></button><button></button>
+		`);
+	}
+};
diff --git a/test/runtime/samples/$$rest/main.svelte b/test/runtime/samples/$$rest/main.svelte
new file mode 100644
index 0000000000..21b2690584
--- /dev/null
+++ b/test/runtime/samples/$$rest/main.svelte
@@ -0,0 +1,25 @@
+<script>
+	import App from './App.svelte';
+	let a = 1, b = 2, c = 3, d = 4, e = 5;
+	let f = { foo: 1 };
+
+	function updateProps() {
+		a = 31;
+		b = 32;
+	}
+	function updateRest() {
+		d = 34;
+	}
+	function updateSpread() {
+		f.foo = 31;
+	}
+	function updateSpread2() {
+		f.bar = 2;
+	}
+</script>
+
+<App {a} {b} {c} {d} {e} {...f} />
+<button on:click={updateProps}></button>
+<button on:click={updateRest}></button>
+<button on:click={updateSpread}></button>
+<button on:click={updateSpread2}></button>
\ No newline at end of file
diff --git a/test/runtime/samples/action-custom-event-handler-this/_config.js b/test/runtime/samples/action-custom-event-handler-this/_config.js
index 194fa08c31..88a30232ab 100644
--- a/test/runtime/samples/action-custom-event-handler-this/_config.js
+++ b/test/runtime/samples/action-custom-event-handler-this/_config.js
@@ -4,7 +4,7 @@ export default {
 	test({ assert, component, target, window }) {
 		const input = target.querySelector('input');
 		const event = new window.KeyboardEvent('keydown', {
-			which: 13
+			key: 'Enter'
 		});
 
 		let blurred = false;
diff --git a/test/runtime/samples/action-custom-event-handler-this/main.svelte b/test/runtime/samples/action-custom-event-handler-this/main.svelte
index a7347cdc99..c3ace108a5 100644
--- a/test/runtime/samples/action-custom-event-handler-this/main.svelte
+++ b/test/runtime/samples/action-custom-event-handler-this/main.svelte
@@ -1,7 +1,7 @@
 <script>
 	function enter(node, callback) {
 		function handleKeydown(event) {
-			if (event.which === 13) {
+			if (event.key === 'Enter') {
 				callback(event);
 			}
 		}
@@ -16,4 +16,4 @@
 	}
 </script>
 
-<input use:enter='{e => e.target.blur()}'>
\ No newline at end of file
+<input use:enter='{e => e.target.blur()}'>
diff --git a/test/runtime/samples/await-catch-shorthand/_config.js b/test/runtime/samples/await-catch-shorthand/_config.js
new file mode 100644
index 0000000000..2e1574145f
--- /dev/null
+++ b/test/runtime/samples/await-catch-shorthand/_config.js
@@ -0,0 +1,41 @@
+let fulfil;
+
+let thePromise = new Promise(f => {
+	fulfil = f;
+});
+
+export default {
+	props: {
+		thePromise
+	},
+
+	html: ``,
+
+	test({ assert, component, target }) {
+		fulfil(42);
+
+		return thePromise
+			.then(() => {
+				assert.htmlEqual(target.innerHTML, ``);
+
+				let reject;
+
+				thePromise = new Promise((f, r) => {
+					reject = r;
+				});
+
+				component.thePromise = thePromise;
+
+				assert.htmlEqual(target.innerHTML, ``);
+
+				reject(new Error('something broke'));
+
+				return thePromise.catch(() => {});
+			})
+			.then(() => {
+				assert.htmlEqual(target.innerHTML, `
+					<p>oh no! something broke</p>
+				`);
+			});
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/await-catch-shorthand/main.svelte b/test/runtime/samples/await-catch-shorthand/main.svelte
new file mode 100644
index 0000000000..844e7da08c
--- /dev/null
+++ b/test/runtime/samples/await-catch-shorthand/main.svelte
@@ -0,0 +1,7 @@
+<script>
+	export let thePromise;
+</script>
+
+{#await thePromise catch theError}
+	<p>oh no! {theError.message}</p>
+{/await}
\ No newline at end of file
diff --git a/test/runtime/samples/await-then-destruct-array/_config.js b/test/runtime/samples/await-then-destruct-array/_config.js
new file mode 100644
index 0000000000..55c48481e0
--- /dev/null
+++ b/test/runtime/samples/await-then-destruct-array/_config.js
@@ -0,0 +1,61 @@
+export default {
+	props: {
+		thePromise: new Promise(resolve => {})
+	},
+
+	html: `
+		loading...
+	`,
+
+	async test({ assert, component, target }) {
+		await (component.thePromise = Promise.resolve([1, 2]));
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<p>a: 1</p>
+				<p>b: 2</p>
+			`
+		);
+
+		await (component.thePromise = Promise.resolve([4, 5]));
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<p>a: 4</p>
+				<p>b: 5</p>
+			`
+		);
+
+		try {
+			await (component.thePromise = Promise.reject(['a', [6, 7]]));
+		} catch (e) {
+			// do nothing
+		}
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<p>c: a</p>
+				<p>d: 6</p>
+				<p>e: 7</p>
+			`
+		);
+
+		try {
+			await (component.thePromise = Promise.reject(['b', [8, 9]]));
+		} catch (e) {
+			// do nothing
+		}
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<p>c: b</p>
+				<p>d: 8</p>
+				<p>e: 9</p>
+			`
+		);
+	}
+};
diff --git a/test/runtime/samples/await-then-destruct-array/main.svelte b/test/runtime/samples/await-then-destruct-array/main.svelte
new file mode 100644
index 0000000000..cc0d217f79
--- /dev/null
+++ b/test/runtime/samples/await-then-destruct-array/main.svelte
@@ -0,0 +1,14 @@
+<script>
+	export let thePromise;
+</script>
+
+{#await thePromise}
+	loading...
+{:then [ a, b ]}
+	<p>a: {a}</p>
+	<p>b: {b}</p>
+{:catch [c, [d, e]]}
+	<p>c: {c}</p>
+	<p>d: {d}</p>
+	<p>e: {e}</p>
+{/await}
\ No newline at end of file
diff --git a/test/runtime/samples/await-then-destruct-default/_config.js b/test/runtime/samples/await-then-destruct-default/_config.js
new file mode 100644
index 0000000000..d0e5a49f28
--- /dev/null
+++ b/test/runtime/samples/await-then-destruct-default/_config.js
@@ -0,0 +1,23 @@
+export default {
+	async test({ assert, component, target }) {
+		await Promise.resolve();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+			<p>a: 3</p>
+			<p>b: 2</p>
+			<p>c: 3</p>
+			<p>a: 1</p>
+			<p>b: 2</p>
+			<p>c: 3</p>
+			<p>a: 3</p>
+			<p>b: 2</p>
+			<p>c: 3</p>
+			<p>a: 1</p>
+			<p>b: 2</p>
+			<p>c: 3</p>
+			`
+		);
+	}
+};
diff --git a/test/runtime/samples/await-then-destruct-default/main.svelte b/test/runtime/samples/await-then-destruct-default/main.svelte
new file mode 100644
index 0000000000..d559aadab1
--- /dev/null
+++ b/test/runtime/samples/await-then-destruct-default/main.svelte
@@ -0,0 +1,34 @@
+<script>
+	let object = Promise.resolve({ b: 2, c: 3 });
+	let array = Promise.resolve([1, 2]);
+	let objectReject = Promise.reject({ b: 2, c: 3 });
+	let arrayReject = Promise.reject([1, 2]);
+</script>
+
+{#await object then { a = 3, b = 4, c }}
+	<p>a: {a}</p>
+	<p>b: {b}</p>
+	<p>c: {c}</p>
+{/await}
+
+{#await array then [a, b, c = 3]}
+	<p>a: {a}</p>
+	<p>b: {b}</p>
+	<p>c: {c}</p>
+{/await}
+
+{#await objectReject then value}
+	resolved
+{:catch { a = 3, b = 4, c }}
+	<p>a: {a}</p>
+	<p>b: {b}</p>
+	<p>c: {c}</p>
+{/await}
+
+{#await arrayReject then value}
+	resolved
+{:catch [a, b, c = 3]}
+	<p>a: {a}</p>
+	<p>b: {b}</p>
+	<p>c: {c}</p>
+{/await}
\ No newline at end of file
diff --git a/test/runtime/samples/await-then-destruct-object/_config.js b/test/runtime/samples/await-then-destruct-object/_config.js
new file mode 100644
index 0000000000..371462de97
--- /dev/null
+++ b/test/runtime/samples/await-then-destruct-object/_config.js
@@ -0,0 +1,63 @@
+export default {
+	props: {
+		thePromise: new Promise(resolve => {})
+	},
+
+	html: `
+		loading...
+	`,
+
+	async test({ assert, component, target }) {
+		await (component.thePromise = Promise.resolve({ error: "error message" }));
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<p>error: error message</p>
+				<p>result: undefined</p>
+			`
+		);
+
+		await (component.thePromise = Promise.resolve({ result: "42" }));
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<p>error: undefined</p>
+				<p>result: 42</p>
+			`
+		);
+
+		try {
+			await (component.thePromise = Promise.reject({
+				error: { message: "oops", code: "123" }
+			}));
+		} catch (e) {
+			// do nothing
+		}
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<p>message: oops</p>
+				<p>code: 123</p>
+			`
+		);
+
+		try {
+			await (component.thePromise = Promise.reject({
+				error: { message: "timeout", code: "456" }
+			}));
+		} catch (e) {
+			// do nothing
+		}
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<p>message: timeout</p>
+				<p>code: 456</p>
+			`
+		);
+	}
+};
diff --git a/test/runtime/samples/await-then-destruct-object/main.svelte b/test/runtime/samples/await-then-destruct-object/main.svelte
new file mode 100644
index 0000000000..ff574b7be8
--- /dev/null
+++ b/test/runtime/samples/await-then-destruct-object/main.svelte
@@ -0,0 +1,13 @@
+<script>
+	export let thePromise;
+</script>
+
+{#await thePromise}
+	loading...
+{:then { result, error }}
+	<p>error: {error}</p>
+	<p>result: {result}</p>
+{:catch { error: { message, code } }}
+	<p>message: {message}</p>
+	<p>code: {code}</p>
+{/await}
\ No newline at end of file
diff --git a/test/runtime/samples/await-then-destruct-rest/_config.js b/test/runtime/samples/await-then-destruct-rest/_config.js
new file mode 100644
index 0000000000..528568e569
--- /dev/null
+++ b/test/runtime/samples/await-then-destruct-rest/_config.js
@@ -0,0 +1,21 @@
+export default {
+	async test({ assert, component, target }) {
+		await Promise.resolve();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+			<p>a: 1</p>
+			<p>rest: {"b":2,"c":3}</p>
+			<p>a: 1</p>
+			<p>b: 2</p>
+			<p>rest: [3,4,5,6]</p>
+			<p>a: 1</p>
+			<p>rest: {"b":2,"c":3}</p>
+			<p>a: 1</p>
+			<p>b: 2</p>
+			<p>rest: [3,4,5,6]</p>
+			`
+		);
+	}
+};
diff --git a/test/runtime/samples/await-then-destruct-rest/main.svelte b/test/runtime/samples/await-then-destruct-rest/main.svelte
new file mode 100644
index 0000000000..a2d57dabf3
--- /dev/null
+++ b/test/runtime/samples/await-then-destruct-rest/main.svelte
@@ -0,0 +1,32 @@
+<script>
+	let object = Promise.resolve({ a: 1, b: 2, c: 3 });
+	let array = Promise.resolve([1, 2, 3, 4, 5, 6]);
+	let objectReject = Promise.reject({ a: 1, b: 2, c: 3 });
+	let arrayReject = Promise.reject([1, 2, 3, 4, 5, 6]);
+</script>
+
+{#await object then { a, ...rest }}
+	<p>a: {a}</p>
+	<p>rest: {JSON.stringify(rest)}</p>
+{/await}
+
+{#await array then [a, b, ...rest]}
+	<p>a: {a}</p>
+	<p>b: {b}</p>
+	<p>rest: {JSON.stringify(rest)}</p>
+{/await}
+
+{#await objectReject then value}
+	resolved
+{:catch { a, ...rest }}
+	<p>a: {a}</p>
+	<p>rest: {JSON.stringify(rest)}</p>
+{/await}
+
+{#await arrayReject then value}
+	resolved
+{:catch [a, b, ...rest]}
+	<p>a: {a}</p>
+	<p>b: {b}</p>
+	<p>rest: {JSON.stringify(rest)}</p>
+{/await}
\ No newline at end of file
diff --git a/test/runtime/samples/binding-audio-currenttime-duration-volume/_config.js b/test/runtime/samples/binding-audio-currenttime-duration-volume/_config.js
index d4c2b7cd0f..158536b5fb 100644
--- a/test/runtime/samples/binding-audio-currenttime-duration-volume/_config.js
+++ b/test/runtime/samples/binding-audio-currenttime-duration-volume/_config.js
@@ -8,6 +8,7 @@ export default {
 		assert.equal(component.t, 0);
 		assert.equal(component.d, 0);
 		assert.equal(component.v, 0.5);
+		assert.equal(component.m, true);
 		assert.equal(component.r, 1);
 		assert.equal(component.paused, true);
 
@@ -20,6 +21,7 @@ export default {
 		audio.currentTime = 10;
 		audio.duration = 20;
 		audio.volume = 0.75;
+		audio.muted = false;
 		audio.playbackRate = 2;
 		audio.dispatchEvent(timeupdate);
 		audio.dispatchEvent(durationchange);
@@ -30,6 +32,7 @@ export default {
 		assert.equal(component.t, 10);
 		assert.equal(component.d, 0); // not 20, because read-only. Not sure how to test this!
 		assert.equal(component.v, 0.75);
+		assert.equal(component.m, false);
 		assert.equal(component.r, 2);
 		assert.equal(component.paused, true); // ditto...
 	}
diff --git a/test/runtime/samples/binding-audio-currenttime-duration-volume/main.svelte b/test/runtime/samples/binding-audio-currenttime-duration-volume/main.svelte
index 69335182e8..e232c920bf 100644
--- a/test/runtime/samples/binding-audio-currenttime-duration-volume/main.svelte
+++ b/test/runtime/samples/binding-audio-currenttime-duration-volume/main.svelte
@@ -4,7 +4,8 @@
 	export let paused;
 	export let v;
 	export let r;
+	export let m;
 </script>
 
-<audio bind:currentTime={t} bind:duration={d} bind:paused bind:volume={v} bind:playbackRate={r}
+<audio bind:currentTime={t} bind:duration={d} bind:paused bind:volume={v} bind:muted={m} bind:playbackRate={r}
 	src='music.mp3'></audio>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-number-2/_config.js b/test/runtime/samples/binding-input-number-2/_config.js
new file mode 100644
index 0000000000..a3510eb757
--- /dev/null
+++ b/test/runtime/samples/binding-input-number-2/_config.js
@@ -0,0 +1,31 @@
+export default {
+	test({ assert, target, window, component }) {
+		const input = target.querySelector("input");
+		const inputEvent = new window.InputEvent("input");
+		assert.equal(component.value, 5);
+		assert.equal(input.value, "5");
+
+		input.value = "5.";
+		input.dispatchEvent(inputEvent);
+
+		// input type number has value === "" if ends with dot/comma
+		assert.equal(component.value, undefined);
+		assert.equal(input.value, "");
+
+		input.value = "5.5";
+		input.dispatchEvent(inputEvent);
+
+		assert.equal(component.value, 5.5);
+		assert.equal(input.value, "5.5");
+
+		input.value = "5.50";
+		input.dispatchEvent(inputEvent);
+
+		assert.equal(component.value, 5.5);
+		assert.equal(input.value, "5.50");
+
+		component.value = 1;
+		assert.equal(component.value, 1);
+		assert.equal(input.value, "1");
+	},
+};
diff --git a/test/runtime/samples/binding-input-number-2/main.svelte b/test/runtime/samples/binding-input-number-2/main.svelte
new file mode 100644
index 0000000000..62119547a0
--- /dev/null
+++ b/test/runtime/samples/binding-input-number-2/main.svelte
@@ -0,0 +1,5 @@
+<script>
+	export let value = 5;
+</script>
+
+<input type="number" bind:value />
diff --git a/test/runtime/samples/binding-input-text-undefined/_config.js b/test/runtime/samples/binding-input-text-undefined/_config.js
new file mode 100644
index 0000000000..009e1b37ba
--- /dev/null
+++ b/test/runtime/samples/binding-input-text-undefined/_config.js
@@ -0,0 +1,30 @@
+export default {
+	html: `
+		<input>
+	`,
+
+	ssrHtml: `
+		<input>
+	`,
+
+	async test({ assert, component, target, window }) {
+		const input = target.querySelector('input');
+		assert.equal(input.value, '');
+
+		component.x = null;
+		assert.equal(input.value, '');
+
+		component.x = undefined;
+		assert.equal(input.value, '');
+
+		component.x = 'string';
+		component.x = undefined;
+		assert.equal(input.value, '');
+
+		component.x = 0;
+		assert.equal(input.value, '0');
+
+		component.x = undefined;
+		assert.equal(input.value, '');
+	},
+};
diff --git a/test/runtime/samples/binding-input-text-undefined/main.svelte b/test/runtime/samples/binding-input-text-undefined/main.svelte
new file mode 100644
index 0000000000..b4c2a84fd2
--- /dev/null
+++ b/test/runtime/samples/binding-input-text-undefined/main.svelte
@@ -0,0 +1,5 @@
+<script>
+	export let x;
+</script>
+
+<input bind:value={x}>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-select-late-2/_config.js b/test/runtime/samples/binding-select-late-2/_config.js
new file mode 100644
index 0000000000..42c45d1366
--- /dev/null
+++ b/test/runtime/samples/binding-select-late-2/_config.js
@@ -0,0 +1,34 @@
+export default {
+	props: {
+		items: [],
+		selected: 'two'
+	},
+
+	html: `
+		<select></select>
+		<p>selected: two</p>
+	`,
+
+	ssrHtml: `
+		<select value="two"></select>
+		<p>selected: two</p>
+	`,
+
+	test({ assert, component, target }) {
+		component.items = [ 'one', 'two', 'three' ];
+
+		const options = target.querySelectorAll('option');
+		assert.ok(!options[0].selected);
+		assert.ok(options[1].selected);
+		assert.ok(!options[2].selected);
+
+		assert.htmlEqual(target.innerHTML, `
+			<select>
+				<option value='one'>one</option>
+				<option value='two'>two</option>
+				<option value='three'>three</option>
+			</select>
+			<p>selected: two</p>
+		`);
+	}
+};
diff --git a/test/runtime/samples/binding-select-late-2/main.svelte b/test/runtime/samples/binding-select-late-2/main.svelte
new file mode 100644
index 0000000000..52cc14528a
--- /dev/null
+++ b/test/runtime/samples/binding-select-late-2/main.svelte
@@ -0,0 +1,12 @@
+<script>
+	export let selected;
+	export let items;
+</script>
+
+<select bind:value={selected}>
+	{#each items as item}
+		<option>{item}</option>
+	{/each}
+</select>
+
+<p>selected: {selected || 'nothing'}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-this-each-object-props/_config.js b/test/runtime/samples/binding-this-each-object-props/_config.js
new file mode 100644
index 0000000000..5372667b82
--- /dev/null
+++ b/test/runtime/samples/binding-this-each-object-props/_config.js
@@ -0,0 +1,14 @@
+export default {
+	html: ``,
+
+	async test({ assert, component, target }) {
+		component.visible = true;
+		assert.htmlEqual(target.innerHTML, `
+			<div>b</div><div>b</div><div>c</div><div>c</div>
+		`);
+		assert.equal(component.items1[1], target.querySelector('div'));
+		assert.equal(component.items2[1], target.querySelector('div:nth-child(2)'));
+		assert.equal(component.items1[2], target.querySelector('div:nth-child(3)'));
+		assert.equal(component.items2[2], target.querySelector('div:last-child'));
+	}
+};
diff --git a/test/runtime/samples/binding-this-each-object-props/main.svelte b/test/runtime/samples/binding-this-each-object-props/main.svelte
new file mode 100644
index 0000000000..9654a58418
--- /dev/null
+++ b/test/runtime/samples/binding-this-each-object-props/main.svelte
@@ -0,0 +1,13 @@
+<script>
+	export const items1 = {};
+	export const items2 = {};
+	export let data = [
+		{id: 1, text: "b"},
+		{id: 2, text: "c"},
+	];
+</script>
+
+{#each data as item (item.id)}
+	<div bind:this={items1[item.id]}>{item.text}</div>
+	<div bind:this={items2[item.id]}>{item.text}</div>
+{/each}
diff --git a/test/runtime/samples/binding-this-each-object-spread/_config.js b/test/runtime/samples/binding-this-each-object-spread/_config.js
new file mode 100644
index 0000000000..cecec08db9
--- /dev/null
+++ b/test/runtime/samples/binding-this-each-object-spread/_config.js
@@ -0,0 +1,14 @@
+export default {
+	html: ``,
+
+	async test({ assert, component, target }) {
+		component.visible = true;
+		assert.htmlEqual(target.innerHTML, `
+			<div>a</div><div>a</div><div>b</div><div>b</div>
+		`);
+		assert.equal(component.items1[1], target.querySelector('div'));
+		assert.equal(component.items2[1], target.querySelector('div:nth-child(2)'));
+		assert.equal(component.items1[2], target.querySelector('div:nth-child(3)'));
+		assert.equal(component.items2[2], target.querySelector('div:last-child'));
+	}
+};
diff --git a/test/runtime/samples/binding-this-each-object-spread/main.svelte b/test/runtime/samples/binding-this-each-object-spread/main.svelte
new file mode 100644
index 0000000000..256ed0ede6
--- /dev/null
+++ b/test/runtime/samples/binding-this-each-object-spread/main.svelte
@@ -0,0 +1,13 @@
+<script>
+	export const items1 = {};
+	export const items2 = {};
+	var data = [
+		{id: 1, text: "a"},
+		{id: 2, text: "b"},
+	];
+</script>
+
+{#each data as {id, text} (id)}
+	<div bind:this={items1[id]}>{text}</div>
+	<div bind:this={items2[id]}>{text}</div>
+{/each}
diff --git a/test/runtime/samples/binding-width-height-a11y/_config.js b/test/runtime/samples/binding-width-height-a11y/_config.js
index 5ab4a7ade7..93856bf0f6 100644
--- a/test/runtime/samples/binding-width-height-a11y/_config.js
+++ b/test/runtime/samples/binding-width-height-a11y/_config.js
@@ -1,8 +1,8 @@
 export default {
 	async test({ assert, target }) {
-		const object = target.querySelector('object');
+		const iframe = target.querySelector('iframe');
 
-		assert.equal(object.getAttribute('aria-hidden'), "true");
-		assert.equal(object.getAttribute('tabindex'), "-1");
+		assert.equal(iframe.getAttribute('aria-hidden'), "true");
+		assert.equal(iframe.getAttribute('tabindex'), "-1");
 	}
 };
diff --git a/test/runtime/samples/bitmask-overflow-slot-6/Slotted.svelte b/test/runtime/samples/bitmask-overflow-slot-6/Slotted.svelte
new file mode 100644
index 0000000000..322a31359e
--- /dev/null
+++ b/test/runtime/samples/bitmask-overflow-slot-6/Slotted.svelte
@@ -0,0 +1,15 @@
+<script>
+	let open = false;
+	function toggle() {
+		open = !open;
+	}
+</script>
+
+<div on:click={toggle}>
+ <slot name="target" {open}></slot>
+	
+	<!-- This actually isn't necessary to reproduce. -->
+	{#if open}
+ 	  <slot name="content"></slot>
+	{/if}
+</div>
diff --git a/test/runtime/samples/bitmask-overflow-slot-6/_config.js b/test/runtime/samples/bitmask-overflow-slot-6/_config.js
new file mode 100644
index 0000000000..8cd8c07a65
--- /dev/null
+++ b/test/runtime/samples/bitmask-overflow-slot-6/_config.js
@@ -0,0 +1,32 @@
+// overflow bitmask + slot missing `let:`
+export default {
+	html: `
+		<div>
+			<button slot="target">Toggle inside 1</button>
+		</div>
+		<button>Toggle outside</button>
+	`,
+
+	async test({ assert, component, target, window }) {
+		const button = target.querySelectorAll('button')[1];
+		const div = target.querySelector('div');
+		await div.dispatchEvent(new window.MouseEvent('click'));
+		
+		assert.htmlEqual(target.innerHTML, `
+			<div>
+				<button slot="target">Toggle inside 1</button>
+				<div slot="content">Open</div>
+			</div>
+			<button>Toggle outside</button>
+		`);
+		
+		await button.dispatchEvent(new window.MouseEvent('click'));
+		assert.htmlEqual(target.innerHTML, `
+			<div>
+				<button slot="target">Toggle inside 2</button>
+				<div slot="content">Open</div>
+			</div>
+			<button>Toggle outside</button>
+		`);
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/bitmask-overflow-slot-6/main.svelte b/test/runtime/samples/bitmask-overflow-slot-6/main.svelte
new file mode 100644
index 0000000000..8845cb2ef5
--- /dev/null
+++ b/test/runtime/samples/bitmask-overflow-slot-6/main.svelte
@@ -0,0 +1,23 @@
+<script>
+	import Slotted from './Slotted.svelte';
+	let lotsOfNumbers = Array.from({length: 50}, () => 1);
+	
+	let [a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, aa, ab, ac, ad, ae, af, ag, ah] = lotsOfNumbers;
+	
+	let last = 1;
+	function toggle () {
+		last = 2;
+	}
+</script>
+
+<Slotted>
+	<button slot="target">
+		Toggle inside {last} 
+	</button>
+	
+	<div slot="content">
+		Open
+	</div>
+</Slotted>
+
+<button on:click={toggle}>Toggle outside</button>
\ No newline at end of file
diff --git a/test/runtime/samples/component-slot-fallback-2/Inner.svelte b/test/runtime/samples/component-slot-fallback-2/Inner.svelte
new file mode 100644
index 0000000000..d1c247ad35
--- /dev/null
+++ b/test/runtime/samples/component-slot-fallback-2/Inner.svelte
@@ -0,0 +1,7 @@
+<script>
+	import { model } from "./store.svelte";
+	export let value = '';
+</script>
+
+<input bind:value={$model} />
+{value}
\ No newline at end of file
diff --git a/test/runtime/samples/component-slot-fallback-2/Outer.svelte b/test/runtime/samples/component-slot-fallback-2/Outer.svelte
new file mode 100644
index 0000000000..1e44ba4db7
--- /dev/null
+++ b/test/runtime/samples/component-slot-fallback-2/Outer.svelte
@@ -0,0 +1,7 @@
+<script>
+	import Inner from "./Inner.svelte";
+	export let defaultValue = '';
+	export let slotProps = '';
+</script>
+
+<slot {slotProps}><Inner value={defaultValue} /></slot>
\ No newline at end of file
diff --git a/test/runtime/samples/component-slot-fallback-2/_config.js b/test/runtime/samples/component-slot-fallback-2/_config.js
new file mode 100644
index 0000000000..585e3b4c9e
--- /dev/null
+++ b/test/runtime/samples/component-slot-fallback-2/_config.js
@@ -0,0 +1,39 @@
+export default {
+	html: `<input> <input> <input>`,
+	ssrHtml: `<input value="Blub"> <input value="Blub"> <input value="Blub">`,
+
+	async test({ assert, target, component, window }) {
+		const [input1, input2, inputFallback] = target.querySelectorAll("input");
+
+		assert.equal(component.getSubscriberCount(), 3);
+
+		input1.value = "a";
+		await input1.dispatchEvent(new window.Event("input"));
+		input1.value = "ab";
+		await input1.dispatchEvent(new window.Event("input"));
+		assert.equal(input1.value, "ab");
+		assert.equal(input2.value, "ab");
+		assert.equal(inputFallback.value, "ab");
+
+		component.props = "hello";
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+			<input> hello
+			<input> hello
+			<input>
+			`
+		);
+
+		component.fallback = "world";
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+			<input> hello
+			<input> hello
+			<input> world
+		`
+		);
+	}
+};
diff --git a/test/runtime/samples/component-slot-fallback-2/main.svelte b/test/runtime/samples/component-slot-fallback-2/main.svelte
new file mode 100644
index 0000000000..4583667015
--- /dev/null
+++ b/test/runtime/samples/component-slot-fallback-2/main.svelte
@@ -0,0 +1,23 @@
+<script>
+	import Outer from "./Outer.svelte";
+	import Inner from "./Inner.svelte";
+	import {model} from "./store.svelte";
+
+	export let props = '';
+	export let fallback = '';
+
+	export function getSubscriberCount() {
+		return model.getCount();
+	}
+</script>
+
+<Outer slotProps={props} defaultValue={fallback} let:slotProps>    
+	<Inner value={slotProps} />
+</Outer>
+
+<Outer slotProps={props} defaultValue={fallback} let:slotProps>    
+	<Inner value={slotProps} />
+</Outer>
+
+<Outer slotProps={props} defaultValue={fallback}>
+</Outer>
diff --git a/test/runtime/samples/component-slot-fallback-2/store.svelte b/test/runtime/samples/component-slot-fallback-2/store.svelte
new file mode 100644
index 0000000000..e377aaf314
--- /dev/null
+++ b/test/runtime/samples/component-slot-fallback-2/store.svelte
@@ -0,0 +1,23 @@
+<script context="module">
+  let value = 'Blub';
+  let count = 0;
+  const subscribers = new Set();
+  export const model = {
+    subscribe(fn) {
+      subscribers.add(fn);
+      count ++;
+      fn(value);
+      return () => {
+        count--;
+        subscribers.delete(fn);
+      };
+    },
+    set(v) {
+      value = v;
+      subscribers.forEach(fn => fn(v));
+    },
+    getCount() {
+      return count;
+    }
+  };
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/component-slot-fallback-3/Inner.svelte b/test/runtime/samples/component-slot-fallback-3/Inner.svelte
new file mode 100644
index 0000000000..db2af272d2
--- /dev/null
+++ b/test/runtime/samples/component-slot-fallback-3/Inner.svelte
@@ -0,0 +1,6 @@
+<slot>
+	<div>Hello</div>
+	<div>world</div>
+	<div>Bye</div>
+	<div>World</div>
+</slot>
diff --git a/test/runtime/samples/component-slot-fallback-3/_config.js b/test/runtime/samples/component-slot-fallback-3/_config.js
new file mode 100644
index 0000000000..b5591fb5e0
--- /dev/null
+++ b/test/runtime/samples/component-slot-fallback-3/_config.js
@@ -0,0 +1,6 @@
+export default {
+	html: `
+	<div>Hello World</div>
+	<div>Hello</div><div>world</div><div>Bye</div><div>World</div>
+	`,
+};
diff --git a/test/runtime/samples/component-slot-fallback-3/main.svelte b/test/runtime/samples/component-slot-fallback-3/main.svelte
new file mode 100644
index 0000000000..eda7ea60e4
--- /dev/null
+++ b/test/runtime/samples/component-slot-fallback-3/main.svelte
@@ -0,0 +1,9 @@
+<script>
+	import Inner from "./Inner.svelte";
+</script>
+
+<Inner>
+	<div>Hello World</div>
+</Inner>
+
+<Inner></Inner>
diff --git a/test/runtime/samples/component-slot-fallback-4/Inner.svelte b/test/runtime/samples/component-slot-fallback-4/Inner.svelte
new file mode 100644
index 0000000000..9eb3ef1401
--- /dev/null
+++ b/test/runtime/samples/component-slot-fallback-4/Inner.svelte
@@ -0,0 +1,3 @@
+<slot name="a"><!-- placeholder--></slot>
+<slot name="b"><!-- placeholder--> </slot>
+<slot name="c"><!-- placeholder--> foobar </slot>
\ No newline at end of file
diff --git a/test/runtime/samples/component-slot-fallback-4/_config.js b/test/runtime/samples/component-slot-fallback-4/_config.js
new file mode 100644
index 0000000000..b7c2b63ed6
--- /dev/null
+++ b/test/runtime/samples/component-slot-fallback-4/_config.js
@@ -0,0 +1,5 @@
+export default {
+	html: `
+	foobar
+	`,
+};
diff --git a/test/runtime/samples/component-slot-fallback-4/main.svelte b/test/runtime/samples/component-slot-fallback-4/main.svelte
new file mode 100644
index 0000000000..206ce21def
--- /dev/null
+++ b/test/runtime/samples/component-slot-fallback-4/main.svelte
@@ -0,0 +1,5 @@
+<script>
+	import Inner from "./Inner.svelte";
+</script>
+
+<Inner></Inner>
diff --git a/test/runtime/samples/component-slot-fallback-5/IconA.svelte b/test/runtime/samples/component-slot-fallback-5/IconA.svelte
new file mode 100644
index 0000000000..8921b6c531
--- /dev/null
+++ b/test/runtime/samples/component-slot-fallback-5/IconA.svelte
@@ -0,0 +1 @@
+Icon A
\ No newline at end of file
diff --git a/test/runtime/samples/component-slot-fallback-5/IconB.svelte b/test/runtime/samples/component-slot-fallback-5/IconB.svelte
new file mode 100644
index 0000000000..8a1a95ead3
--- /dev/null
+++ b/test/runtime/samples/component-slot-fallback-5/IconB.svelte
@@ -0,0 +1 @@
+Icon B
\ No newline at end of file
diff --git a/test/runtime/samples/component-slot-fallback-5/Inner.svelte b/test/runtime/samples/component-slot-fallback-5/Inner.svelte
new file mode 100644
index 0000000000..bc4b224c23
--- /dev/null
+++ b/test/runtime/samples/component-slot-fallback-5/Inner.svelte
@@ -0,0 +1,13 @@
+<script>
+	import IconA from './IconA.svelte';
+	import IconB from './IconB.svelte';
+
+	let variable = false;
+</script>
+
+<button on:click={() => variable = !variable}>Click Me</button>
+<div>
+	<slot>
+		<svelte:component this={variable ? IconA : IconB} />
+	</slot>
+</div>
diff --git a/test/runtime/samples/component-slot-fallback-5/_config.js b/test/runtime/samples/component-slot-fallback-5/_config.js
new file mode 100644
index 0000000000..fa374f3519
--- /dev/null
+++ b/test/runtime/samples/component-slot-fallback-5/_config.js
@@ -0,0 +1,31 @@
+export default {
+	html: `
+	<button>Click Me</button>
+	<div>Icon B</div>
+	`,
+
+	async test({ assert, target, window }) {
+		const btn = target.querySelector("button");
+		const clickEvent = new window.MouseEvent("click");
+
+		await btn.dispatchEvent(clickEvent);
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+			<button>Click Me</button>
+			<div>Icon A</div>
+			`
+		);
+
+		await btn.dispatchEvent(clickEvent);
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+			<button>Click Me</button>
+			<div>Icon B</div>
+			`
+		);
+	}
+};
diff --git a/test/runtime/samples/component-slot-fallback-5/main.svelte b/test/runtime/samples/component-slot-fallback-5/main.svelte
new file mode 100644
index 0000000000..206ce21def
--- /dev/null
+++ b/test/runtime/samples/component-slot-fallback-5/main.svelte
@@ -0,0 +1,5 @@
+<script>
+	import Inner from "./Inner.svelte";
+</script>
+
+<Inner></Inner>
diff --git a/test/runtime/samples/component-slot-nested-error-2/Nested.svelte b/test/runtime/samples/component-slot-nested-error-2/Nested.svelte
new file mode 100644
index 0000000000..c6f086d96c
--- /dev/null
+++ b/test/runtime/samples/component-slot-nested-error-2/Nested.svelte
@@ -0,0 +1 @@
+<slot name="slot2"></slot>
\ No newline at end of file
diff --git a/test/runtime/samples/component-slot-nested-error-2/_config.js b/test/runtime/samples/component-slot-nested-error-2/_config.js
new file mode 100644
index 0000000000..98a9f1cab0
--- /dev/null
+++ b/test/runtime/samples/component-slot-nested-error-2/_config.js
@@ -0,0 +1,3 @@
+export default {
+	error: [`Element with a slot='...' attribute must be a child of a component or a descendant of a custom element`]
+};
diff --git a/test/runtime/samples/component-slot-nested-error-2/main.svelte b/test/runtime/samples/component-slot-nested-error-2/main.svelte
new file mode 100644
index 0000000000..a7142d6dc1
--- /dev/null
+++ b/test/runtime/samples/component-slot-nested-error-2/main.svelte
@@ -0,0 +1,11 @@
+<script>
+  import Nested from "./Nested.svelte";
+</script>
+
+<Nested>
+  <div slot="slot1">
+    <div>
+      <div slot="slot2" />
+    </div>
+  </div>
+</Nested>
diff --git a/test/runtime/samples/component-slot-nested-error-3/Nested.svelte b/test/runtime/samples/component-slot-nested-error-3/Nested.svelte
new file mode 100644
index 0000000000..c6f086d96c
--- /dev/null
+++ b/test/runtime/samples/component-slot-nested-error-3/Nested.svelte
@@ -0,0 +1 @@
+<slot name="slot2"></slot>
\ No newline at end of file
diff --git a/test/runtime/samples/component-slot-nested-error-3/_config.js b/test/runtime/samples/component-slot-nested-error-3/_config.js
new file mode 100644
index 0000000000..98a9f1cab0
--- /dev/null
+++ b/test/runtime/samples/component-slot-nested-error-3/_config.js
@@ -0,0 +1,3 @@
+export default {
+	error: [`Element with a slot='...' attribute must be a child of a component or a descendant of a custom element`]
+};
diff --git a/test/runtime/samples/component-slot-nested-error-3/main.svelte b/test/runtime/samples/component-slot-nested-error-3/main.svelte
new file mode 100644
index 0000000000..a63b1defde
--- /dev/null
+++ b/test/runtime/samples/component-slot-nested-error-3/main.svelte
@@ -0,0 +1,11 @@
+<script>
+  import Nested from "./Nested.svelte";
+</script>
+
+<Nested>
+  <div>
+    <div>
+      <div slot="slot2" />
+    </div>
+  </div>
+</Nested>
diff --git a/test/runtime/samples/component-slot-nested-error/Nested.svelte b/test/runtime/samples/component-slot-nested-error/Nested.svelte
new file mode 100644
index 0000000000..c6f086d96c
--- /dev/null
+++ b/test/runtime/samples/component-slot-nested-error/Nested.svelte
@@ -0,0 +1 @@
+<slot name="slot2"></slot>
\ No newline at end of file
diff --git a/test/runtime/samples/component-slot-nested-error/_config.js b/test/runtime/samples/component-slot-nested-error/_config.js
new file mode 100644
index 0000000000..98a9f1cab0
--- /dev/null
+++ b/test/runtime/samples/component-slot-nested-error/_config.js
@@ -0,0 +1,3 @@
+export default {
+	error: [`Element with a slot='...' attribute must be a child of a component or a descendant of a custom element`]
+};
diff --git a/test/runtime/samples/component-slot-nested-error/main.svelte b/test/runtime/samples/component-slot-nested-error/main.svelte
new file mode 100644
index 0000000000..531c96f08c
--- /dev/null
+++ b/test/runtime/samples/component-slot-nested-error/main.svelte
@@ -0,0 +1,9 @@
+<script>
+	import Nested from "./Nested.svelte";
+</script>
+
+<Nested>
+	<div slot="slot1">
+		<div slot="slot2" />
+	</div>
+</Nested>
diff --git a/test/runtime/samples/deconflict-anchor/Anchor.svelte b/test/runtime/samples/deconflict-anchor/Anchor.svelte
new file mode 100644
index 0000000000..e758d60056
--- /dev/null
+++ b/test/runtime/samples/deconflict-anchor/Anchor.svelte
@@ -0,0 +1 @@
+<p>Anchor</p>
diff --git a/test/runtime/samples/deconflict-anchor/_config.js b/test/runtime/samples/deconflict-anchor/_config.js
new file mode 100644
index 0000000000..817dd42fcb
--- /dev/null
+++ b/test/runtime/samples/deconflict-anchor/_config.js
@@ -0,0 +1,4 @@
+export default {
+	preserveIdentifiers: true,
+	html: `<p>Anchor</p>`
+};
diff --git a/test/runtime/samples/deconflict-anchor/main.svelte b/test/runtime/samples/deconflict-anchor/main.svelte
new file mode 100644
index 0000000000..cce6281e49
--- /dev/null
+++ b/test/runtime/samples/deconflict-anchor/main.svelte
@@ -0,0 +1,5 @@
+<script>
+	import Anchor from './Anchor.svelte';
+</script>
+
+<Anchor/>
diff --git a/test/runtime/samples/dev-warning-unknown-props-with-$$props/Foo.svelte b/test/runtime/samples/dev-warning-unknown-props-with-$$props/Foo.svelte
index 9e5c62339d..375b1a6a0a 100644
--- a/test/runtime/samples/dev-warning-unknown-props-with-$$props/Foo.svelte
+++ b/test/runtime/samples/dev-warning-unknown-props-with-$$props/Foo.svelte
@@ -4,4 +4,4 @@
 </script>
 
 <div>{foo}</div>
-<div>{JSON.stringify($$props)}</div>
+<div>{JSON.stringify($$restProps)}</div>
diff --git a/test/runtime/samples/dev-warning-unknown-props-with-$$rest/Foo.svelte b/test/runtime/samples/dev-warning-unknown-props-with-$$rest/Foo.svelte
new file mode 100644
index 0000000000..9e5c62339d
--- /dev/null
+++ b/test/runtime/samples/dev-warning-unknown-props-with-$$rest/Foo.svelte
@@ -0,0 +1,7 @@
+<script>
+	export let foo = undefined;
+
+</script>
+
+<div>{foo}</div>
+<div>{JSON.stringify($$props)}</div>
diff --git a/test/runtime/samples/dev-warning-unknown-props-with-$$rest/_config.js b/test/runtime/samples/dev-warning-unknown-props-with-$$rest/_config.js
new file mode 100644
index 0000000000..62ad08624d
--- /dev/null
+++ b/test/runtime/samples/dev-warning-unknown-props-with-$$rest/_config.js
@@ -0,0 +1,7 @@
+export default {
+	compileOptions: {
+		dev: true
+	},
+
+	warnings: []
+};
diff --git a/test/runtime/samples/dev-warning-unknown-props-with-$$rest/main.svelte b/test/runtime/samples/dev-warning-unknown-props-with-$$rest/main.svelte
new file mode 100644
index 0000000000..1566cf3e41
--- /dev/null
+++ b/test/runtime/samples/dev-warning-unknown-props-with-$$rest/main.svelte
@@ -0,0 +1,5 @@
+<script>
+	import Foo from './Foo.svelte';
+</script>
+
+<Foo fo="sho"/>
diff --git a/test/runtime/samples/each-block-destructured-default/_config.js b/test/runtime/samples/each-block-destructured-default/_config.js
new file mode 100644
index 0000000000..133fd68532
--- /dev/null
+++ b/test/runtime/samples/each-block-destructured-default/_config.js
@@ -0,0 +1,22 @@
+export default {
+	props: {
+		animalEntries: [
+			{ animal: 'raccoon', class: 'mammal', species: 'P. lotor', kilogram: 25 },
+			{ animal: 'eagle', class: 'bird', kilogram: 5.4 }
+		]
+	},
+
+	html: `
+		<p class="mammal">raccoon - P. lotor - 25kg</p>
+		<p class="bird">eagle - unknown - 5.4kg</p>
+	`,
+
+	
+
+	test({ assert, component, target }) {
+		component.animalEntries = [{ animal: 'cow', class: 'mammal', species: '‎B. taurus' }];
+		assert.htmlEqual(target.innerHTML, `
+			<p class="mammal">cow - ‎B. taurus - 50kg</p>
+		`);
+	},
+};
diff --git a/test/runtime/samples/each-block-destructured-default/main.svelte b/test/runtime/samples/each-block-destructured-default/main.svelte
new file mode 100644
index 0000000000..a91b45299e
--- /dev/null
+++ b/test/runtime/samples/each-block-destructured-default/main.svelte
@@ -0,0 +1,7 @@
+<script>
+	export let animalEntries;
+</script>
+
+{#each animalEntries as { animal, species = 'unknown', kilogram: weight = 50 , ...props } }
+	<p {...props}>{animal} - {species} - {weight}kg</p>
+{/each}
diff --git a/test/runtime/samples/each-block-keyed-component-action/Component.svelte b/test/runtime/samples/each-block-keyed-component-action/Component.svelte
new file mode 100644
index 0000000000..18a6c7452a
--- /dev/null
+++ b/test/runtime/samples/each-block-keyed-component-action/Component.svelte
@@ -0,0 +1,5 @@
+<script>
+	export let action;
+</script>
+
+<div use:action />
diff --git a/test/runtime/samples/each-block-keyed-component-action/_config.js b/test/runtime/samples/each-block-keyed-component-action/_config.js
new file mode 100644
index 0000000000..c4421f89ae
--- /dev/null
+++ b/test/runtime/samples/each-block-keyed-component-action/_config.js
@@ -0,0 +1,21 @@
+export default {
+	test({ assert, component, raf }) {
+		assert.equal(component.count, 0);
+
+		component.arr = ["2"];
+
+		assert.equal(component.count, 1);
+
+		component.arr = ["1", "2"];
+
+		assert.equal(component.count, 2);
+
+		component.arr = ["2", "1"];
+
+		assert.equal(component.count, 2);
+
+		component.arr = [];
+
+		assert.equal(component.count, 0);
+	},
+};
diff --git a/test/runtime/samples/each-block-keyed-component-action/main.svelte b/test/runtime/samples/each-block-keyed-component-action/main.svelte
new file mode 100644
index 0000000000..bfacdf402a
--- /dev/null
+++ b/test/runtime/samples/each-block-keyed-component-action/main.svelte
@@ -0,0 +1,17 @@
+<script>
+	import Component from "./Component.svelte";
+	export let arr = [];
+	export let count = 0;
+	function action(node, params) {
+		count += 1;
+		return {
+			destroy() {
+				count -= 1;
+			}
+		};
+	}
+</script>
+
+{#each arr as item (item)}
+	<Component {action} />
+{/each}
diff --git a/test/runtime/samples/each-block-keyed-else/_config.js b/test/runtime/samples/each-block-keyed-else/_config.js
new file mode 100644
index 0000000000..a5bf722a80
--- /dev/null
+++ b/test/runtime/samples/each-block-keyed-else/_config.js
@@ -0,0 +1,37 @@
+export default {
+	props: {
+		animals: ['alpaca', 'baboon', 'capybara'],
+		foo: 'something else'
+	},
+
+	html: `
+		before
+		<p>alpaca</p>
+		<p>baboon</p>
+		<p>capybara</p>
+		after
+	`,
+
+	test({ assert, component, target }) {
+		component.animals = [];
+		assert.htmlEqual(target.innerHTML, `
+			before
+			<p>no animals, but rather something else</p>
+			after
+		`);
+
+		component.foo = 'something other';
+		assert.htmlEqual(target.innerHTML, `
+			before
+			<p>no animals, but rather something other</p>
+			after
+		`);
+
+		component.animals = ['wombat'];
+		assert.htmlEqual(target.innerHTML, `
+			before
+			<p>wombat</p>
+			after
+		`);
+	}
+};
diff --git a/test/runtime/samples/each-block-keyed-else/main.svelte b/test/runtime/samples/each-block-keyed-else/main.svelte
new file mode 100644
index 0000000000..2a82653ff1
--- /dev/null
+++ b/test/runtime/samples/each-block-keyed-else/main.svelte
@@ -0,0 +1,12 @@
+<script>
+	export let animals;
+	export let foo;
+</script>
+
+before
+{#each animals as animal (animal)}
+	<p>{animal}</p>
+{:else}
+	<p>no animals, but rather {foo}</p>
+{/each}
+after
diff --git a/test/runtime/samples/each-block-unkeyed-else-2/_config.js b/test/runtime/samples/each-block-unkeyed-else-2/_config.js
new file mode 100644
index 0000000000..a5bf722a80
--- /dev/null
+++ b/test/runtime/samples/each-block-unkeyed-else-2/_config.js
@@ -0,0 +1,37 @@
+export default {
+	props: {
+		animals: ['alpaca', 'baboon', 'capybara'],
+		foo: 'something else'
+	},
+
+	html: `
+		before
+		<p>alpaca</p>
+		<p>baboon</p>
+		<p>capybara</p>
+		after
+	`,
+
+	test({ assert, component, target }) {
+		component.animals = [];
+		assert.htmlEqual(target.innerHTML, `
+			before
+			<p>no animals, but rather something else</p>
+			after
+		`);
+
+		component.foo = 'something other';
+		assert.htmlEqual(target.innerHTML, `
+			before
+			<p>no animals, but rather something other</p>
+			after
+		`);
+
+		component.animals = ['wombat'];
+		assert.htmlEqual(target.innerHTML, `
+			before
+			<p>wombat</p>
+			after
+		`);
+	}
+};
diff --git a/test/runtime/samples/each-block-unkeyed-else-2/main.svelte b/test/runtime/samples/each-block-unkeyed-else-2/main.svelte
new file mode 100644
index 0000000000..3275cb1f83
--- /dev/null
+++ b/test/runtime/samples/each-block-unkeyed-else-2/main.svelte
@@ -0,0 +1,12 @@
+<script>
+	export let animals;
+	export let foo;
+</script>
+
+before
+{#each animals as animal}
+	<p>{animal}</p>
+{:else}
+	<p>no animals, but rather {foo}</p>
+{/each}
+after
diff --git a/test/runtime/samples/event-handler-each-modifier/_config.js b/test/runtime/samples/event-handler-each-modifier/_config.js
new file mode 100644
index 0000000000..702addd3c3
--- /dev/null
+++ b/test/runtime/samples/event-handler-each-modifier/_config.js
@@ -0,0 +1,42 @@
+export default {
+	async test({ assert, component, target, window }) {
+		// set first
+		await component.lists.update(() => [
+			{ text: "item1" },
+			{ text: "item2" },
+			{ text: "item3" }
+		]);
+
+		await component.lists.update(() => [
+			{ text: "item3" },
+			{ text: "item2" },
+			{ text: "item1" }
+		]);
+
+		await component.lists.update(() => [
+			{ text: "item1" },
+			{ text: "item2" },
+			{ text: "item3" }
+		]);
+
+		assert.equal(component.updated, 4);
+
+		const [item1, item2] = target.childNodes;
+		const [item1Btn1, item1Btn2] = item1.querySelectorAll('button');
+		const [item2Btn1, item2Btn2] = item2.querySelectorAll('button');
+
+		const clickEvent = new window.MouseEvent('click');
+		
+		await item1Btn1.dispatchEvent(clickEvent);
+		assert.equal(component.getNormalCount(), 1);
+		
+		await item1Btn2.dispatchEvent(clickEvent);
+		assert.equal(component.getModifierCount(), 1);
+
+		await item2Btn1.dispatchEvent(clickEvent);
+		assert.equal(component.getNormalCount(), 2);
+		
+		await item2Btn2.dispatchEvent(clickEvent);
+		assert.equal(component.getModifierCount(), 2);
+	}
+};
diff --git a/test/runtime/samples/event-handler-each-modifier/main.svelte b/test/runtime/samples/event-handler-each-modifier/main.svelte
new file mode 100644
index 0000000000..ca7447f728
--- /dev/null
+++ b/test/runtime/samples/event-handler-each-modifier/main.svelte
@@ -0,0 +1,37 @@
+<script>
+	import {afterUpdate} from 'svelte'
+	import {writable} from 'svelte/store'
+	
+	const normal = writable(0);
+	const modifier = writable(0);
+	export let updated = 0;
+	export const lists = writable([]);
+	
+	const click = (e, type) => {
+		if(type === 'normal'){
+			$normal ++;
+		}else{
+			$modifier ++;
+		}
+	}
+	afterUpdate(() => updated++);
+
+	export function getNormalCount() {
+		return $normal;
+	}
+	export function getModifierCount() {
+		return $modifier;
+	}
+</script>
+
+{#each $lists as item (item.text)}
+	<div>
+		{item.text}
+		<button on:click={(e)=>click(e,'normal')}>
+			Normal
+		</button>
+		<button on:click|preventDefault={(e)=> click(e,'modifier')}>
+			Modifier
+		</button>
+	</div>
+{/each}
diff --git a/test/runtime/samples/if-block-static-with-elseif-else-and-outros/RRR.svelte b/test/runtime/samples/if-block-static-with-elseif-else-and-outros/RRR.svelte
new file mode 100644
index 0000000000..7242373249
--- /dev/null
+++ b/test/runtime/samples/if-block-static-with-elseif-else-and-outros/RRR.svelte
@@ -0,0 +1 @@
+rrr
\ No newline at end of file
diff --git a/test/runtime/samples/if-block-static-with-elseif-else-and-outros/_config.js b/test/runtime/samples/if-block-static-with-elseif-else-and-outros/_config.js
new file mode 100644
index 0000000000..8b2c6d2d66
--- /dev/null
+++ b/test/runtime/samples/if-block-static-with-elseif-else-and-outros/_config.js
@@ -0,0 +1,3 @@
+export default {
+	html: 'eee'
+};
diff --git a/test/runtime/samples/if-block-static-with-elseif-else-and-outros/main.svelte b/test/runtime/samples/if-block-static-with-elseif-else-and-outros/main.svelte
new file mode 100644
index 0000000000..b60885722e
--- /dev/null
+++ b/test/runtime/samples/if-block-static-with-elseif-else-and-outros/main.svelte
@@ -0,0 +1,13 @@
+<script>
+	import RRR from './RRR.svelte';
+
+	export let x;
+</script>
+
+{#if "Eva".startsWith('E')}
+	eee
+{:else if x}
+  def
+{:else}
+	<RRR/>
+{/if}
diff --git a/test/runtime/samples/loop-protect-generator-opt-out/_config.js b/test/runtime/samples/loop-protect-generator-opt-out/_config.js
new file mode 100644
index 0000000000..9b6a24b513
--- /dev/null
+++ b/test/runtime/samples/loop-protect-generator-opt-out/_config.js
@@ -0,0 +1,6 @@
+export default {
+	compileOptions: {
+		dev: true,
+		loopGuardTimeout: 1,
+	},
+};
diff --git a/test/runtime/samples/loop-protect-generator-opt-out/main.svelte b/test/runtime/samples/loop-protect-generator-opt-out/main.svelte
new file mode 100644
index 0000000000..a7aa790681
--- /dev/null
+++ b/test/runtime/samples/loop-protect-generator-opt-out/main.svelte
@@ -0,0 +1,14 @@
+<script>
+	const it = gen();
+	it.next();
+
+	setTimeout(() => {
+		it.next();
+	}, 20)
+
+	function* gen() {
+		while (true) {
+			yield;
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/raw-mustaches-td-tr/_config.js b/test/runtime/samples/raw-mustaches-td-tr/_config.js
new file mode 100644
index 0000000000..dfcb1ce0f0
--- /dev/null
+++ b/test/runtime/samples/raw-mustaches-td-tr/_config.js
@@ -0,0 +1,18 @@
+export default {
+	props: {
+		raw: "<tr><td>1</td><td>2</td></tr>",
+	},
+
+	html: `
+		<table>
+			<tbody>
+				<tr>
+					<td>5</td><td>7</td>
+				</tr>
+				<tr>
+					<td>1</td><td>2</td>
+				</tr>
+			</tbody>
+		</table>
+	`,
+};
diff --git a/test/runtime/samples/raw-mustaches-td-tr/main.svelte b/test/runtime/samples/raw-mustaches-td-tr/main.svelte
new file mode 100644
index 0000000000..07d7299e43
--- /dev/null
+++ b/test/runtime/samples/raw-mustaches-td-tr/main.svelte
@@ -0,0 +1,12 @@
+<script>
+	export let raw;
+</script>
+
+<table>
+	<tbody>
+		<tr>
+			<td>5</td><td>7</td>
+		</tr>
+		{@html raw}
+	</tbody>
+</table>
\ No newline at end of file
diff --git a/test/runtime/samples/reactive-function-called-reassigned/_config.js b/test/runtime/samples/reactive-function-called-reassigned/_config.js
new file mode 100644
index 0000000000..317173f8eb
--- /dev/null
+++ b/test/runtime/samples/reactive-function-called-reassigned/_config.js
@@ -0,0 +1,27 @@
+let value;
+let called = 0;
+function callback(_value) {
+	called ++;
+	value = _value;
+}
+
+export default {
+	props: {
+		callback,
+	},
+	async test({ assert, component, target, window }) {
+		assert.equal(called, 1);
+
+		const input = target.querySelector('input');
+
+		const event = new window.Event('input');
+		input.value = 'h';
+		await input.dispatchEvent(event);
+
+		assert.equal(called, 2);
+		assert.equal(value.length, 3);
+		assert.equal(value[0], 'h');
+		assert.equal(value[1], '2');
+		assert.equal(value[2], '3');
+	}
+};
diff --git a/test/runtime/samples/reactive-function-called-reassigned/main.svelte b/test/runtime/samples/reactive-function-called-reassigned/main.svelte
new file mode 100644
index 0000000000..10a3c79d14
--- /dev/null
+++ b/test/runtime/samples/reactive-function-called-reassigned/main.svelte
@@ -0,0 +1,10 @@
+<script>
+	const refs = ['1','2','3']
+	export let callback = () => {};
+
+	$: callback(refs);
+</script>
+
+{#each refs as ref}
+	<input bind:value={ref} />
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/reactive-import-statement-2/_config.js b/test/runtime/samples/reactive-import-statement-2/_config.js
new file mode 100644
index 0000000000..ccc97cd076
--- /dev/null
+++ b/test/runtime/samples/reactive-import-statement-2/_config.js
@@ -0,0 +1,3 @@
+export default {
+	html: `<p>prop value</p>`
+};
diff --git a/test/runtime/samples/reactive-import-statement-2/data.js b/test/runtime/samples/reactive-import-statement-2/data.js
new file mode 100644
index 0000000000..56fb86982c
--- /dev/null
+++ b/test/runtime/samples/reactive-import-statement-2/data.js
@@ -0,0 +1,3 @@
+export const obj = {
+	prop: 'prop value'
+};
diff --git a/test/runtime/samples/reactive-import-statement-2/main.svelte b/test/runtime/samples/reactive-import-statement-2/main.svelte
new file mode 100644
index 0000000000..2582974b71
--- /dev/null
+++ b/test/runtime/samples/reactive-import-statement-2/main.svelte
@@ -0,0 +1,8 @@
+<script>
+	import { obj } from './data.js';
+
+	$: prop = obj.prop;
+	obj.foo = 'a different prop';
+</script>
+
+<p>{prop}</p>
diff --git a/test/runtime/samples/reactive-import-statement/_config.js b/test/runtime/samples/reactive-import-statement/_config.js
new file mode 100644
index 0000000000..7fb8097ca5
--- /dev/null
+++ b/test/runtime/samples/reactive-import-statement/_config.js
@@ -0,0 +1,38 @@
+import * as path from 'path';
+
+export default {
+	html: `
+		import
+		<p>1 + 2 + 3 + 4 = 10</p>
+		local
+		<p>1 + 2 + 3 + 4 = 10</p>
+		<button>Add a number</button>
+	`,
+	before_test() {
+		delete require.cache[path.resolve(__dirname, 'data.js')];
+	},
+	async test({ assert, target, window, }) {
+		const btn = target.querySelector('button');
+		const clickEvent = new window.MouseEvent('click');
+
+		await btn.dispatchEvent(clickEvent);
+		
+		assert.htmlEqual(target.innerHTML, `
+			import
+			<p>1 + 2 + 3 + 4 + 5 = 15</p>
+			local
+			<p>1 + 2 + 3 + 4 + 5 = 15</p>
+			<button>Add a number</button>
+		`);
+
+		await btn.dispatchEvent(clickEvent);
+		
+		assert.htmlEqual(target.innerHTML, `
+			import
+			<p>1 + 2 + 3 + 4 + 5 + 6 = 21</p>
+			local
+			<p>1 + 2 + 3 + 4 + 5 + 6 = 21</p>
+			<button>Add a number</button>
+		`);
+	}
+};
diff --git a/test/runtime/samples/reactive-import-statement/data.js b/test/runtime/samples/reactive-import-statement/data.js
new file mode 100644
index 0000000000..ad494c7cb0
--- /dev/null
+++ b/test/runtime/samples/reactive-import-statement/data.js
@@ -0,0 +1 @@
+export const numbers = [1, 2, 3, 4];
\ No newline at end of file
diff --git a/test/runtime/samples/reactive-import-statement/main.svelte b/test/runtime/samples/reactive-import-statement/main.svelte
new file mode 100644
index 0000000000..daded0494f
--- /dev/null
+++ b/test/runtime/samples/reactive-import-statement/main.svelte
@@ -0,0 +1,19 @@
+<script>
+	import { numbers } from './data.js';
+	const local_numbers = [1, 2, 3, 4];
+
+	function addNumber() {
+		numbers[numbers.length] = numbers.length + 1;
+		local_numbers[local_numbers.length] = local_numbers.length + 1;
+	}
+
+	$: sum = numbers.reduce((t, n) => t + n, 0);
+	$: local_sum = local_numbers.reduce((t, n) => t + n, 0);
+</script>
+
+import <p>{numbers.join(' + ')} = {sum}</p>
+local <p>{local_numbers.join(' + ')} = {local_sum}</p>
+
+<button on:click={addNumber}>
+	Add a number
+</button>
\ No newline at end of file
diff --git a/test/runtime/samples/self-reference-component/Countdown.svelte b/test/runtime/samples/self-reference-component/Countdown.svelte
new file mode 100644
index 0000000000..21178f2567
--- /dev/null
+++ b/test/runtime/samples/self-reference-component/Countdown.svelte
@@ -0,0 +1,7 @@
+<script>
+	export let count;
+</script>
+
+{#if count > 0}
+	<slot count={count-1}></slot>
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/self-reference-component/_config.js b/test/runtime/samples/self-reference-component/_config.js
new file mode 100644
index 0000000000..e3e0ad3a4f
--- /dev/null
+++ b/test/runtime/samples/self-reference-component/_config.js
@@ -0,0 +1,3 @@
+export default {
+	html: '5 4 3 2 1 0',
+};
\ No newline at end of file
diff --git a/test/runtime/samples/self-reference-component/main.svelte b/test/runtime/samples/self-reference-component/main.svelte
new file mode 100644
index 0000000000..fd28ec4e40
--- /dev/null
+++ b/test/runtime/samples/self-reference-component/main.svelte
@@ -0,0 +1,10 @@
+<script>
+	import Countdown from './Countdown.svelte';
+	export let count = 5;
+</script>
+
+{count}
+
+<Countdown {count} let:count={i}>
+	<svelte:self count={i} />
+</Countdown>
\ No newline at end of file
diff --git a/test/runtime/samples/slot-if-block-update-no-anchor/_config.js b/test/runtime/samples/slot-if-block-update-no-anchor/_config.js
new file mode 100644
index 0000000000..060cbaa619
--- /dev/null
+++ b/test/runtime/samples/slot-if-block-update-no-anchor/_config.js
@@ -0,0 +1,7 @@
+export default {
+	test({ assert, target, component }) {
+		assert.htmlEqual(target.innerHTML, `<span></span>`);
+		component.enabled = true;
+		assert.htmlEqual(target.innerHTML, `<span>enabled</span>`);
+	},
+};
diff --git a/test/runtime/samples/slot-if-block-update-no-anchor/main.svelte b/test/runtime/samples/slot-if-block-update-no-anchor/main.svelte
new file mode 100644
index 0000000000..7960f35bc9
--- /dev/null
+++ b/test/runtime/samples/slot-if-block-update-no-anchor/main.svelte
@@ -0,0 +1,9 @@
+<script>
+	export let enabled = false;
+</script>
+
+<span>
+	<slot>
+		{#if enabled}enabled{/if}
+	</slot>
+</span>
diff --git a/test/runtime/samples/spread-element-input-bind-group-with-value-attr/_config.js b/test/runtime/samples/spread-element-input-bind-group-with-value-attr/_config.js
new file mode 100644
index 0000000000..6e1b890351
--- /dev/null
+++ b/test/runtime/samples/spread-element-input-bind-group-with-value-attr/_config.js
@@ -0,0 +1,15 @@
+export default {
+	props: {
+		props: {
+			'data-foo': 'bar'
+		}
+	},
+
+	html: `<input data-foo="bar" type="radio" value="abc">`,
+
+	async test({ assert, component, target, window }) {
+		const input = target.querySelector('input');
+		assert.equal(input.value, 'abc');
+		assert.equal(input.__value, 'abc');
+	}
+};
diff --git a/test/runtime/samples/spread-element-input-bind-group-with-value-attr/main.svelte b/test/runtime/samples/spread-element-input-bind-group-with-value-attr/main.svelte
new file mode 100644
index 0000000000..ce6b76f093
--- /dev/null
+++ b/test/runtime/samples/spread-element-input-bind-group-with-value-attr/main.svelte
@@ -0,0 +1,6 @@
+<script>
+	export let props;
+	let radioValue;
+</script>
+
+<input type="radio" value="abc" {...props} bind:group={radioValue} />
diff --git a/test/runtime/samples/spread-element-input-select-multiple/_config.js b/test/runtime/samples/spread-element-input-select-multiple/_config.js
new file mode 100644
index 0000000000..1ddcd9eb6d
--- /dev/null
+++ b/test/runtime/samples/spread-element-input-select-multiple/_config.js
@@ -0,0 +1,39 @@
+export default {
+	async test({ assert, component, target, window }) {
+		const [input1, input2] = target.querySelectorAll('input');
+		const select = target.querySelector('select');
+		const [option1, option2] = select.childNodes;
+
+		let selections = Array.from(select.selectedOptions);
+		assert.equal(selections.length, 2);
+		assert.ok(selections.includes(option1));
+		assert.ok(selections.includes(option2));
+
+		const event = new window.Event('change');
+
+		input1.checked = false;
+		await input1.dispatchEvent(event);
+
+		selections = Array.from(select.selectedOptions);
+		assert.equal(selections.length, 1);
+		assert.ok(!selections.includes(option1));
+		assert.ok(selections.includes(option2));
+
+		input2.checked = false;
+		await input2.dispatchEvent(event);
+		input1.checked = true;
+		await input1.dispatchEvent(event);
+
+		selections = Array.from(select.selectedOptions);
+		assert.equal(selections.length, 1);
+		assert.ok(selections.includes(option1));
+		assert.ok(!selections.includes(option2));
+
+		component.spread = { value: ['Hello', 'World'] };
+
+		selections = Array.from(select.selectedOptions);
+		assert.equal(selections.length, 2);
+		assert.ok(selections.includes(option1));
+		assert.ok(selections.includes(option2));
+	}
+};
diff --git a/test/runtime/samples/spread-element-input-select-multiple/main.svelte b/test/runtime/samples/spread-element-input-select-multiple/main.svelte
new file mode 100644
index 0000000000..d2fb12dd20
--- /dev/null
+++ b/test/runtime/samples/spread-element-input-select-multiple/main.svelte
@@ -0,0 +1,12 @@
+<script>
+  let value = ['Hello', 'World'];
+  export let spread = {};
+</script>
+
+<select multiple {value} {...spread}>
+  <option>Hello</option>
+  <option>World</option>
+</select>
+
+<input type="checkbox" value="Hello" bind:group={value}>
+<input type="checkbox" value="World" bind:group={value}>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-css-iframe/Foo.svelte b/test/runtime/samples/transition-css-iframe/Foo.svelte
new file mode 100644
index 0000000000..c79672f21b
--- /dev/null
+++ b/test/runtime/samples/transition-css-iframe/Foo.svelte
@@ -0,0 +1,16 @@
+<script>
+	export let visible;
+
+	function foo() {
+		return {
+			duration: 100,
+			css: t => {
+				return `opacity: ${t}`;
+			}
+		};
+	}
+</script>
+
+{#if visible}
+	<div transition:foo></div>
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-css-iframe/Frame.svelte b/test/runtime/samples/transition-css-iframe/Frame.svelte
new file mode 100644
index 0000000000..c7ac9cf76f
--- /dev/null
+++ b/test/runtime/samples/transition-css-iframe/Frame.svelte
@@ -0,0 +1,58 @@
+<script>
+import { onMount, onDestroy, tick } from 'svelte';
+
+export let component;
+
+let frame;
+let doc;
+let content;
+
+$: mountComponent(doc, component);
+$: updateProps($$props);
+
+function mountComponent(doc) {
+  if (content) content.$destroy();
+  if (doc && component) {
+    const { component, ...props } = $$props;
+    content = new component({ target: doc.body, props });
+  }
+}
+
+function updateProps(props) {
+  if (content) {
+    const { component, ...rest } = props;
+    content.$set(rest);
+  }
+}
+
+function loadHandler() {
+  doc = frame.contentDocument;
+  // import styles
+  Array.from(document.querySelectorAll('style, link[rel="stylesheet"]'))
+    .forEach(node => doc.head.appendChild(node.cloneNode(true)));
+}
+
+onMount(async () => {
+  await tick();
+  if (frame.contentDocument.readyState === 'complete' && frame.contentDocument.defaultView) {
+    loadHandler();
+  } else {
+    frame.addEventListener('load', loadHandler);
+  }
+});
+
+onDestroy(() => {
+  if (frame) frame.removeEventListener('load', loadHandler);
+  if (content) content.$destroy();
+});
+</script>
+
+<iframe bind:this={frame} title="frame"></iframe>
+
+<style>
+iframe {
+  border: none;
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/test/runtime/samples/transition-css-iframe/_config.js b/test/runtime/samples/transition-css-iframe/_config.js
new file mode 100644
index 0000000000..507efe44f4
--- /dev/null
+++ b/test/runtime/samples/transition-css-iframe/_config.js
@@ -0,0 +1,18 @@
+export default {
+	skip_if_ssr: true,
+
+	async test({ assert, component, target, window, raf }) {
+		const frame = target.querySelector('iframe');
+		await Promise.resolve();
+
+		component.visible = true;
+		const div = frame.contentDocument.querySelector('div');
+
+		raf.tick(25);
+
+		component.visible = false;
+
+		raf.tick(26);
+		assert.ok(~div.style.animation.indexOf('25ms'));
+	},
+};
diff --git a/test/runtime/samples/transition-css-iframe/main.svelte b/test/runtime/samples/transition-css-iframe/main.svelte
new file mode 100644
index 0000000000..b1686ff15e
--- /dev/null
+++ b/test/runtime/samples/transition-css-iframe/main.svelte
@@ -0,0 +1,8 @@
+<script>
+	import Frame from './Frame.svelte';
+	import Foo from './Foo.svelte';
+
+	export let visible;
+</script>
+
+<Frame component={Foo} {visible}/>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-outro-unrelated-component-binding-update/Component.svelte b/test/runtime/samples/transition-js-if-outro-unrelated-component-binding-update/Component.svelte
new file mode 100644
index 0000000000..adb9aaea0e
--- /dev/null
+++ b/test/runtime/samples/transition-js-if-outro-unrelated-component-binding-update/Component.svelte
@@ -0,0 +1,18 @@
+<script>
+	export let condition;
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t;
+			}
+		};
+	}
+	let bool = true;
+</script>
+
+<button on:click={() => (condition = false)} />
+<button on:click={() => (bool = !bool)} />
+{#if bool}
+	<div out:foo />
+{/if}
diff --git a/test/runtime/samples/transition-js-if-outro-unrelated-component-binding-update/_config.js b/test/runtime/samples/transition-js-if-outro-unrelated-component-binding-update/_config.js
new file mode 100644
index 0000000000..8a6269ad60
--- /dev/null
+++ b/test/runtime/samples/transition-js-if-outro-unrelated-component-binding-update/_config.js
@@ -0,0 +1,9 @@
+export default {
+	async test({ assert, target, window, raf }) {
+		const button = target.querySelector("button");
+		const event = new window.MouseEvent("click");
+		await button.dispatchEvent(event);
+		raf.tick(500);
+		assert.htmlEqual(target.innerHTML, "");
+	},
+};
diff --git a/test/runtime/samples/transition-js-if-outro-unrelated-component-binding-update/main.svelte b/test/runtime/samples/transition-js-if-outro-unrelated-component-binding-update/main.svelte
new file mode 100644
index 0000000000..bb781ad73c
--- /dev/null
+++ b/test/runtime/samples/transition-js-if-outro-unrelated-component-binding-update/main.svelte
@@ -0,0 +1,8 @@
+<script>
+	import Component from "./Component.svelte";
+	let condition = true;
+</script>
+
+{#if condition}
+	<Component bind:condition />
+{/if}
diff --git a/test/runtime/samples/transition-js-if-outro-unrelated-component-store-update/Component.svelte b/test/runtime/samples/transition-js-if-outro-unrelated-component-store-update/Component.svelte
new file mode 100644
index 0000000000..1096c92468
--- /dev/null
+++ b/test/runtime/samples/transition-js-if-outro-unrelated-component-store-update/Component.svelte
@@ -0,0 +1,18 @@
+<script>
+	export let condition;
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t;
+			}
+		};
+	}
+	$condition;
+	let bool = true;
+</script>
+
+<button on:click={() => (bool = !bool)} />
+{#if bool}
+	<div out:foo />
+{/if}
diff --git a/test/runtime/samples/transition-js-if-outro-unrelated-component-store-update/_config.js b/test/runtime/samples/transition-js-if-outro-unrelated-component-store-update/_config.js
new file mode 100644
index 0000000000..41d28fabf0
--- /dev/null
+++ b/test/runtime/samples/transition-js-if-outro-unrelated-component-store-update/_config.js
@@ -0,0 +1,7 @@
+export default {
+	async test({ assert, target, component, raf }) {
+		await component.condition.set(false);
+		raf.tick(500);
+		assert.htmlEqual(target.innerHTML, "");
+	},
+};
diff --git a/test/runtime/samples/transition-js-if-outro-unrelated-component-store-update/main.svelte b/test/runtime/samples/transition-js-if-outro-unrelated-component-store-update/main.svelte
new file mode 100644
index 0000000000..b5193f6dd4
--- /dev/null
+++ b/test/runtime/samples/transition-js-if-outro-unrelated-component-store-update/main.svelte
@@ -0,0 +1,10 @@
+<script>
+	import { writable } from "svelte/store";
+	import Component from "./Component.svelte";
+	export let condition = writable(true);
+</script>
+
+{#if $condition}
+	<button on:click={() => ($condition = false)} id="1" />
+	<Component {condition} />
+{/if}
diff --git a/test/runtime/samples/window-event-custom/_config.js b/test/runtime/samples/window-event-custom/_config.js
index 207fad1b0b..1c1075c0de 100644
--- a/test/runtime/samples/window-event-custom/_config.js
+++ b/test/runtime/samples/window-event-custom/_config.js
@@ -3,7 +3,7 @@ export default {
 
 	async test({ assert, component, target, window }) {
 		const event = new window.KeyboardEvent('keydown', {
-			which: 27
+			key: 'Escape'
 		});
 
 		await window.dispatchEvent(event);
diff --git a/test/runtime/samples/window-event-custom/main.svelte b/test/runtime/samples/window-event-custom/main.svelte
index ce453d9334..ff286f4309 100644
--- a/test/runtime/samples/window-event-custom/main.svelte
+++ b/test/runtime/samples/window-event-custom/main.svelte
@@ -3,7 +3,7 @@
 
 	function esc(node, callback) {
 		function onKeyDown(event) {
-			if (event.which === 27) callback(event);
+			if (event.key === 'Escape') callback(event);
 		}
 		node.addEventListener('keydown', onKeyDown);
 		return {
@@ -16,4 +16,4 @@
 
 <svelte:window use:esc="{() => escaped = true}" />
 
-<p>escaped: {escaped}</p>
\ No newline at end of file
+<p>escaped: {escaped}</p>
diff --git a/test/server-side-rendering/index.js b/test/server-side-rendering/index.js
index ee1319845d..2d539782ff 100644
--- a/test/server-side-rendering/index.js
+++ b/test/server-side-rendering/index.js
@@ -88,8 +88,8 @@ describe("ssr", () => {
 
 				try {
 					assert.equal(
-						css.code.replace(/^\s+/gm, ""),
-						expectedCss.replace(/^\s+/gm, "")
+						css.code.replace(/^\s+/gm, "").replace(/[\r\n]/g, ""),
+						expectedCss.replace(/^\s+/gm, "").replace(/[\r\n]/g, "")
 					);
 				} catch (error) {
 					if (shouldUpdateExpected()) {
diff --git a/test/sourcemaps/samples/script-after-comment/input.svelte b/test/sourcemaps/samples/script-after-comment/input.svelte
new file mode 100644
index 0000000000..1f06455678
--- /dev/null
+++ b/test/sourcemaps/samples/script-after-comment/input.svelte
@@ -0,0 +1,9 @@
+<!--
+	Multiline
+	comment
+-->
+<script>
+	function assertThisLine() {}
+</script>
+
+{foo.bar.baz}
diff --git a/test/sourcemaps/samples/script-after-comment/test.js b/test/sourcemaps/samples/script-after-comment/test.js
new file mode 100644
index 0000000000..b473970112
--- /dev/null
+++ b/test/sourcemaps/samples/script-after-comment/test.js
@@ -0,0 +1,16 @@
+export function test({ assert, smc, locateInSource, locateInGenerated }) {
+	const expected = locateInSource( 'assertThisLine' );
+	const start = locateInGenerated( 'assertThisLine' );
+
+	const actual = smc.originalPositionFor({
+		line: start.line + 1,
+		column: start.column
+	});
+
+	assert.deepEqual( actual, {
+		source: 'input.svelte',
+		name: null,
+		line: expected.line + 1,
+		column: expected.column
+	});
+}
diff --git a/test/sourcemaps/samples/two-scripts/input.svelte b/test/sourcemaps/samples/two-scripts/input.svelte
new file mode 100644
index 0000000000..4c869827c0
--- /dev/null
+++ b/test/sourcemaps/samples/two-scripts/input.svelte
@@ -0,0 +1,9 @@
+<script context="module">
+	export let first;
+</script>
+
+<script>
+	function assertThisLine() {}
+</script>
+
+{foo.bar.baz}
diff --git a/test/sourcemaps/samples/two-scripts/test.js b/test/sourcemaps/samples/two-scripts/test.js
new file mode 100644
index 0000000000..b473970112
--- /dev/null
+++ b/test/sourcemaps/samples/two-scripts/test.js
@@ -0,0 +1,16 @@
+export function test({ assert, smc, locateInSource, locateInGenerated }) {
+	const expected = locateInSource( 'assertThisLine' );
+	const start = locateInGenerated( 'assertThisLine' );
+
+	const actual = smc.originalPositionFor({
+		line: start.line + 1,
+		column: start.column
+	});
+
+	assert.deepEqual( actual, {
+		source: 'input.svelte',
+		name: null,
+		line: expected.line + 1,
+		column: expected.column
+	});
+}
diff --git a/test/validator/index.js b/test/validator/index.js
index 9bce5e149b..433e1a94ae 100644
--- a/test/validator/index.js
+++ b/test/validator/index.js
@@ -17,7 +17,7 @@ describe("validate", () => {
 		(solo ? it.only : skip ? it.skip : it)(dir, () => {
 			const config = loadConfig(`${__dirname}/samples/${dir}/_config.js`);
 
-			const input = fs.readFileSync(`${__dirname}/samples/${dir}/input.svelte`, "utf-8").replace(/\s+$/, "");
+			const input = fs.readFileSync(`${__dirname}/samples/${dir}/input.svelte`, "utf-8").replace(/\s+$/, "").replace(/\r/g, "");
 			const expected_warnings = tryToLoadJson(`${__dirname}/samples/${dir}/warnings.json`) || [];
 			const expected_errors = tryToLoadJson(`${__dirname}/samples/${dir}/errors.json`);
 			const options = tryToLoadJson(`${__dirname}/samples/${dir}/options.json`);
diff --git a/test/validator/samples/a11y-anchor-is-valid/input.svelte b/test/validator/samples/a11y-anchor-is-valid/input.svelte
index 7b14a80c9f..8933bd7560 100644
--- a/test/validator/samples/a11y-anchor-is-valid/input.svelte
+++ b/test/validator/samples/a11y-anchor-is-valid/input.svelte
@@ -1,3 +1,8 @@
 <a>not actually a link</a>
 <a href=''>invalid</a>
-<a href='#'>invalid</a>
\ No newline at end of file
+<a href='#'>invalid</a>
+<a href='javascript:void(0)'>invalid</a>
+<a name=''>invalid</a>
+<a id=''>invalid</a>
+<a name='fragment'>valid</a>
+<a id='fragment'>valid</a>
\ No newline at end of file
diff --git a/test/validator/samples/a11y-anchor-is-valid/warnings.json b/test/validator/samples/a11y-anchor-is-valid/warnings.json
index 532c44ad24..f04c6f1593 100644
--- a/test/validator/samples/a11y-anchor-is-valid/warnings.json
+++ b/test/validator/samples/a11y-anchor-is-valid/warnings.json
@@ -43,5 +43,50 @@
 			"character": 61
 		},
 		"pos": 53
+	},
+	{
+		"code": "a11y-invalid-attribute",
+		"message": "A11y: 'javascript:void(0)' is not a valid href attribute",
+		"start": {
+			"line": 4,
+			"column": 3,
+			"character": 77
+		},
+		"end": {
+			"line": 4,
+			"column": 28,
+			"character": 102
+		},
+		"pos": 77
+	},
+	{
+		"code": "a11y-missing-attribute",
+		"message": "A11y: <a> element should have an href attribute",
+		"start": {
+			"line": 5,
+			"column": 0,
+			"character": 115
+		},
+		"end": {
+			"line": 5,
+			"column": 22,
+			"character": 137
+		},
+		"pos": 115
+	},
+	{
+		"code": "a11y-missing-attribute",
+		"message": "A11y: <a> element should have an href attribute",
+		"start": {
+			"line": 6,
+			"column": 0,
+			"character": 138
+		},
+		"end": {
+			"line": 6,
+			"column": 20,
+			"character": 158
+		},
+		"pos": 138
 	}
 ]
diff --git a/test/validator/samples/a11y-figcaption-in-non-element-block/input.svelte b/test/validator/samples/a11y-figcaption-in-non-element-block/input.svelte
index 9d4b6ded4d..33e7a891f0 100644
--- a/test/validator/samples/a11y-figcaption-in-non-element-block/input.svelte
+++ b/test/validator/samples/a11y-figcaption-in-non-element-block/input.svelte
@@ -3,7 +3,7 @@
 </script>
 
 <figure>
-	<img src='foo.jpg' alt='a picture of a foo'>
+	<img src='foo.jpg' alt='a foo'>
 	{#if caption}
 		<figcaption>{caption}</figcaption>
 	{/if}
diff --git a/test/validator/samples/a11y-figcaption-right-place/input.svelte b/test/validator/samples/a11y-figcaption-right-place/input.svelte
index 808dbee941..783219c8f8 100644
--- a/test/validator/samples/a11y-figcaption-right-place/input.svelte
+++ b/test/validator/samples/a11y-figcaption-right-place/input.svelte
@@ -1,5 +1,5 @@
 <figure>
-	<img src='foo.jpg' alt='a picture of a foo'>
+	<img src='foo.jpg' alt='a foo'>
 
 	<figcaption>
 		a foo in its natural habitat
diff --git a/test/validator/samples/a11y-figcaption-wrong-place/input.svelte b/test/validator/samples/a11y-figcaption-wrong-place/input.svelte
index ffa7dde65d..e99d1cc86c 100644
--- a/test/validator/samples/a11y-figcaption-wrong-place/input.svelte
+++ b/test/validator/samples/a11y-figcaption-wrong-place/input.svelte
@@ -1,5 +1,5 @@
 <figure>
-	<img src='foo.jpg' alt='a picture of a foo'>
+	<img src='foo.jpg' alt='a foo'>
 
 	<figcaption>
 		a foo in its natural habitat
@@ -9,7 +9,7 @@
 </figure>
 
 <figure>
-	<img src='foo.jpg' alt='a picture of a foo'>
+	<img src='foo.jpg' alt='a foo'>
 
 	<div class='markup-for-styling'>
 		<figcaption>
diff --git a/test/validator/samples/a11y-figcaption-wrong-place/warnings.json b/test/validator/samples/a11y-figcaption-wrong-place/warnings.json
index ee5a89d3ff..eba5b6f31e 100644
--- a/test/validator/samples/a11y-figcaption-wrong-place/warnings.json
+++ b/test/validator/samples/a11y-figcaption-wrong-place/warnings.json
@@ -5,14 +5,14 @@
 		"start": {
 			"line": 4,
 			"column": 1,
-			"character": 57
+			"character": 44
 		},
 		"end": {
 			"line": 6,
 			"column": 14,
-			"character": 115
+			"character": 102
 		},
-		"pos": 57
+		"pos": 44
 	},
 	{
 		"code": "a11y-structure",
@@ -20,13 +20,13 @@
 		"start": {
 			"line": 15,
 			"column": 2,
-			"character": 252
+			"character": 226
 		},
 		"end": {
 			"line": 17,
 			"column": 15,
-			"character": 328
+			"character": 302
 		},
-		"pos": 252
+		"pos": 226
 	}
 ]
diff --git a/test/validator/samples/a11y-img-redundant-alt/input.svelte b/test/validator/samples/a11y-img-redundant-alt/input.svelte
new file mode 100644
index 0000000000..a3528a5c41
--- /dev/null
+++ b/test/validator/samples/a11y-img-redundant-alt/input.svelte
@@ -0,0 +1,9 @@
+<img src="foo" alt="Foo eating a sandwich." />
+<img src="bar" aria-hidden alt="Picture of me taking a photo of an image" />
+<img src="foo" alt="Photo of foo being weird." />
+<img src="bar" alt="Image of me at a bar!" />
+<img src="foo" alt="Picture of baz fixing a bug." />
+<img src="bar" alt="Plant doing photosynthesis in the afternoon" />
+<img src="foo" alt="Picturesque food" />
+<img src="baz" alt={'baz'} />
+<img src="baz" alt />
diff --git a/test/validator/samples/a11y-img-redundant-alt/warnings.json b/test/validator/samples/a11y-img-redundant-alt/warnings.json
new file mode 100644
index 0000000000..44106c23d0
--- /dev/null
+++ b/test/validator/samples/a11y-img-redundant-alt/warnings.json
@@ -0,0 +1,47 @@
+[
+	{
+		"code": "a11y-img-redundant-alt",
+		"message": "A11y: Screenreaders already announce <img> elements as an image.",
+		"end": {
+			"character": 173,
+			"column": 49,
+			"line": 3
+		},
+		"start": {
+			"character": 124,
+			"column": 0,
+			"line": 3
+		},
+		"pos": 124
+	},
+	{
+		"code": "a11y-img-redundant-alt",
+		"message": "A11y: Screenreaders already announce <img> elements as an image.",
+		"end": {
+			"character": 219,
+			"column": 45,
+			"line": 4
+		},
+		"start": {
+			"character": 174,
+			"column": 0,
+			"line": 4
+		},
+		"pos": 174
+	},
+	{
+		"code": "a11y-img-redundant-alt",
+		"message": "A11y: Screenreaders already announce <img> elements as an image.",
+		"end": {
+			"character": 272,
+			"column": 52,
+			"line": 5
+		},
+		"start": {
+			"character": 220,
+			"column": 0,
+			"line": 5
+		},
+		"pos": 220
+	}
+]
\ No newline at end of file
diff --git a/test/validator/samples/a11y-no-onchange/input.svelte b/test/validator/samples/a11y-no-onchange/input.svelte
new file mode 100644
index 0000000000..af2041f406
--- /dev/null
+++ b/test/validator/samples/a11y-no-onchange/input.svelte
@@ -0,0 +1,16 @@
+<select on:change={e => {}}>
+    <option>foo</option>
+    <option>bar</option>
+</select>
+<select on:change={e => {}} on:blur={e => {}}>
+    <option>foo</option>
+    <option>bar</option>
+</select>
+<select>
+    <option on:change={e => {}}>foo</option>
+    <option>bar</option>
+</select>
+<select>
+    <option on:change={e => {}} on:blur={e => {}}>foo</option>
+    <option>bar</option>
+</select>
\ No newline at end of file
diff --git a/test/validator/samples/a11y-no-onchange/warnings.json b/test/validator/samples/a11y-no-onchange/warnings.json
new file mode 100644
index 0000000000..461f546c0b
--- /dev/null
+++ b/test/validator/samples/a11y-no-onchange/warnings.json
@@ -0,0 +1,32 @@
+[
+    {
+        "code": "a11y-no-onchange",
+        "end": {
+            "character": 88,
+            "column": 9,
+            "line": 4
+        },
+        "message": "A11y: on:blur must be used instead of on:change, unless absolutely necessary and it causes no negative consequences for keyboard only or screen reader users.",
+        "pos": 0,
+        "start": {
+            "character": 0,
+            "column": 0,
+            "line": 1
+        }
+    },
+    {
+        "code": "a11y-no-onchange",
+        "end": {
+            "character": 249,
+            "column": 44,
+            "line": 10
+        },
+        "message": "A11y: on:blur must be used instead of on:change, unless absolutely necessary and it causes no negative consequences for keyboard only or screen reader users.",
+        "pos": 209,
+        "start": {
+            "character": 209,
+            "column": 4,
+            "line": 10
+        }
+    }
+]
diff --git a/test/validator/samples/attribute-invalid-name-2/errors.json b/test/validator/samples/attribute-invalid-name-2/errors.json
new file mode 100644
index 0000000000..9e0c437339
--- /dev/null
+++ b/test/validator/samples/attribute-invalid-name-2/errors.json
@@ -0,0 +1,15 @@
+[{
+	"code": "illegal-attribute",
+	"message": "'3aa' is not a valid attribute name",
+	"start": {
+		"line": 1,
+		"column": 3,
+		"character": 3
+	},
+	"end": {
+		"line": 1,
+		"column": 12,
+		"character": 12
+	},
+	"pos": 3
+}]
diff --git a/test/validator/samples/attribute-invalid-name-2/input.svelte b/test/validator/samples/attribute-invalid-name-2/input.svelte
new file mode 100644
index 0000000000..6958a1b5aa
--- /dev/null
+++ b/test/validator/samples/attribute-invalid-name-2/input.svelte
@@ -0,0 +1 @@
+<p 3aa="abc">Test</p>
diff --git a/test/validator/samples/attribute-invalid-name-3/errors.json b/test/validator/samples/attribute-invalid-name-3/errors.json
new file mode 100644
index 0000000000..f583226882
--- /dev/null
+++ b/test/validator/samples/attribute-invalid-name-3/errors.json
@@ -0,0 +1,15 @@
+[{
+	"code": "illegal-attribute",
+	"message": "'a*a' is not a valid attribute name",
+	"start": {
+		"line": 1,
+		"column": 3,
+		"character": 3
+	},
+	"end": {
+		"line": 1,
+		"column": 6,
+		"character": 6
+	},
+	"pos": 3
+}]
diff --git a/test/validator/samples/attribute-invalid-name-3/input.svelte b/test/validator/samples/attribute-invalid-name-3/input.svelte
new file mode 100644
index 0000000000..87c2df979a
--- /dev/null
+++ b/test/validator/samples/attribute-invalid-name-3/input.svelte
@@ -0,0 +1 @@
+<p a*a>Test</p>
diff --git a/test/validator/samples/attribute-invalid-name-4/errors.json b/test/validator/samples/attribute-invalid-name-4/errors.json
new file mode 100644
index 0000000000..a8959cebf3
--- /dev/null
+++ b/test/validator/samples/attribute-invalid-name-4/errors.json
@@ -0,0 +1,15 @@
+[{
+	"code": "illegal-attribute",
+	"message": "'-a' is not a valid attribute name",
+	"start": {
+		"line": 1,
+		"column": 3,
+		"character": 3
+	},
+	"end": {
+		"line": 1,
+		"column": 5,
+		"character": 5
+	},
+	"pos": 3
+}]
diff --git a/test/validator/samples/attribute-invalid-name-4/input.svelte b/test/validator/samples/attribute-invalid-name-4/input.svelte
new file mode 100644
index 0000000000..92f68449b9
--- /dev/null
+++ b/test/validator/samples/attribute-invalid-name-4/input.svelte
@@ -0,0 +1 @@
+<p -a>Test</p>
diff --git a/test/validator/samples/attribute-invalid-name-5/errors.json b/test/validator/samples/attribute-invalid-name-5/errors.json
new file mode 100644
index 0000000000..b1e3acc5ef
--- /dev/null
+++ b/test/validator/samples/attribute-invalid-name-5/errors.json
@@ -0,0 +1,15 @@
+[{
+	"code": "illegal-attribute",
+	"message": "'a;' is not a valid attribute name",
+	"start": {
+		"line": 1,
+		"column": 3,
+		"character": 3
+	},
+	"end": {
+		"line": 1,
+		"column": 11,
+		"character": 11
+	},
+	"pos": 3
+}]
diff --git a/test/validator/samples/attribute-invalid-name-5/input.svelte b/test/validator/samples/attribute-invalid-name-5/input.svelte
new file mode 100644
index 0000000000..3a7dd05137
--- /dev/null
+++ b/test/validator/samples/attribute-invalid-name-5/input.svelte
@@ -0,0 +1 @@
+<p a;="abc">Test</p>
diff --git a/test/validator/samples/attribute-invalid-name/errors.json b/test/validator/samples/attribute-invalid-name/errors.json
new file mode 100644
index 0000000000..9bdde1ee46
--- /dev/null
+++ b/test/validator/samples/attribute-invalid-name/errors.json
@@ -0,0 +1,15 @@
+[{
+	"code": "illegal-attribute",
+	"message": "'}' is not a valid attribute name",
+	"start": {
+		"line": 1,
+		"column": 3,
+		"character": 3
+	},
+	"end": {
+		"line": 1,
+		"column": 4,
+		"character": 4
+	},
+	"pos": 3
+}]
diff --git a/test/validator/samples/attribute-invalid-name/input.svelte b/test/validator/samples/attribute-invalid-name/input.svelte
new file mode 100644
index 0000000000..56d9cfe23f
--- /dev/null
+++ b/test/validator/samples/attribute-invalid-name/input.svelte
@@ -0,0 +1 @@
+<p }>Test</p>
diff --git a/test/validator/samples/await-shorthand-no-then/input.svelte b/test/validator/samples/await-shorthand-no-then/input.svelte
new file mode 100644
index 0000000000..6e8a99f131
--- /dev/null
+++ b/test/validator/samples/await-shorthand-no-then/input.svelte
@@ -0,0 +1,7 @@
+<script>
+	let promise;
+</script>
+
+{#await promise catch error}
+	<p>Error: {error}</p>
+{/await}
diff --git a/test/validator/samples/await-shorthand-no-then/warnings.json b/test/validator/samples/await-shorthand-no-then/warnings.json
new file mode 100644
index 0000000000..fe51488c70
--- /dev/null
+++ b/test/validator/samples/await-shorthand-no-then/warnings.json
@@ -0,0 +1 @@
+[]
diff --git a/test/validator/samples/binding-const-field/errors.json b/test/validator/samples/binding-const-field/errors.json
new file mode 100644
index 0000000000..fe51488c70
--- /dev/null
+++ b/test/validator/samples/binding-const-field/errors.json
@@ -0,0 +1 @@
+[]
diff --git a/test/validator/samples/binding-const-field/input.svelte b/test/validator/samples/binding-const-field/input.svelte
new file mode 100644
index 0000000000..055a16438d
--- /dev/null
+++ b/test/validator/samples/binding-const-field/input.svelte
@@ -0,0 +1,7 @@
+<script>
+	const dummy = {
+		foo: 'bar'
+	};
+</script>
+
+<input bind:value={dummy.foo}>
diff --git a/test/validator/samples/binding-const/errors.json b/test/validator/samples/binding-const/errors.json
new file mode 100644
index 0000000000..6d48af9c4e
--- /dev/null
+++ b/test/validator/samples/binding-const/errors.json
@@ -0,0 +1,15 @@
+[{
+	"code": "invalid-binding",
+	"message": "Cannot bind to a variable which is not writable",
+	"pos": 61,
+	"start": {
+		"line": 5,
+		"column": 19,
+		"character": 61
+	},
+	"end": {
+		"line": 5,
+		"column": 24,
+		"character": 66
+	}
+}]
\ No newline at end of file
diff --git a/test/validator/samples/binding-const/input.svelte b/test/validator/samples/binding-const/input.svelte
new file mode 100644
index 0000000000..1857a1932c
--- /dev/null
+++ b/test/validator/samples/binding-const/input.svelte
@@ -0,0 +1,5 @@
+<script>
+	const dummy = 'foo';
+</script>
+
+<input bind:value={dummy}>
diff --git a/test/validator/samples/component-slotted-custom-element-2/errors.json b/test/validator/samples/component-slotted-custom-element-2/errors.json
new file mode 100644
index 0000000000..06be51d72d
--- /dev/null
+++ b/test/validator/samples/component-slotted-custom-element-2/errors.json
@@ -0,0 +1,9 @@
+[
+	{
+		"code": "invalid-slotted-content",
+		"message": "Element with a slot='...' attribute must be a child of a component or a descendant of a custom element",
+		"start": { "line": 10, "column": 9, "character": 138 },
+		"end": { "line": 10, "column": 19, "character": 148 },
+		"pos": 138
+	}
+]
diff --git a/test/validator/samples/component-slotted-custom-element-2/input.svelte b/test/validator/samples/component-slotted-custom-element-2/input.svelte
new file mode 100644
index 0000000000..221659ca4d
--- /dev/null
+++ b/test/validator/samples/component-slotted-custom-element-2/input.svelte
@@ -0,0 +1,14 @@
+<script>
+	import Nested from './Nested.svelte';
+	let thing = false;
+</script>
+
+<custom-element>
+	<Nested>
+		{#if thing}
+			<div>
+				<div slot='bar' />
+			</div>
+		{/if}
+	</Nested>
+</custom-element>
\ No newline at end of file
diff --git a/test/validator/samples/component-slotted-custom-element/errors.json b/test/validator/samples/component-slotted-custom-element/errors.json
new file mode 100644
index 0000000000..0637a088a0
--- /dev/null
+++ b/test/validator/samples/component-slotted-custom-element/errors.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/test/validator/samples/component-slotted-custom-element/input.svelte b/test/validator/samples/component-slotted-custom-element/input.svelte
new file mode 100644
index 0000000000..e0e27834c1
--- /dev/null
+++ b/test/validator/samples/component-slotted-custom-element/input.svelte
@@ -0,0 +1,15 @@
+<script>
+	import Nested from './Nested.svelte';
+	let thing = false;
+</script>
+
+<Nested>
+	<custom-element>
+		<div>
+			<div slot='foo' />
+		</div>
+		{#if thing}
+			<div slot='bar' />
+		{/if}
+	</custom-element>
+</Nested>
\ No newline at end of file
diff --git a/test/validator/samples/component-slotted-each-block/errors.json b/test/validator/samples/component-slotted-each-block/errors.json
index 89f394bca4..2944acae17 100644
--- a/test/validator/samples/component-slotted-each-block/errors.json
+++ b/test/validator/samples/component-slotted-each-block/errors.json
@@ -1,6 +1,6 @@
 [{
 	"code": "invalid-slotted-content",
-	"message": "Cannot place slotted elements inside an each-block",
+	"message": "Element with a slot='...' attribute must be a child of a component or a descendant of a custom element",
 	"start": {
 		"line": 7,
 		"column": 7,
diff --git a/test/validator/samples/component-slotted-if-block/errors.json b/test/validator/samples/component-slotted-if-block/errors.json
index ab35a77fce..3ae07c1b3b 100644
--- a/test/validator/samples/component-slotted-if-block/errors.json
+++ b/test/validator/samples/component-slotted-if-block/errors.json
@@ -1,6 +1,6 @@
 [{
 	"code": "invalid-slotted-content",
-	"message": "Cannot place slotted elements inside an if-block",
+	"message": "Element with a slot='...' attribute must be a child of a component or a descendant of a custom element",
 	"start": {
 		"line": 7,
 		"column": 7,
diff --git a/test/validator/samples/each-block-destructured-object-rest-comma-after/errors.json b/test/validator/samples/each-block-destructured-object-rest-comma-after/errors.json
index 549b6960eb..df899b7702 100644
--- a/test/validator/samples/each-block-destructured-object-rest-comma-after/errors.json
+++ b/test/validator/samples/each-block-destructured-object-rest-comma-after/errors.json
@@ -1,5 +1,5 @@
 [{
-	"code": "comma-after-rest",
+	"code": "parse-error",
 	"message": "Comma is not permitted after the rest element",
 	"pos": 100,
 	"start": {
diff --git a/test/validator/samples/each-block-invalid-context-destructured-object/errors.json b/test/validator/samples/each-block-invalid-context-destructured-object/errors.json
index 085021ff5a..c96e3d2c8c 100644
--- a/test/validator/samples/each-block-invalid-context-destructured-object/errors.json
+++ b/test/validator/samples/each-block-invalid-context-destructured-object/errors.json
@@ -1,6 +1,6 @@
 [{
-	"code": "unexpected-reserved-word",
-	"message": "'case' is a reserved word in JavaScript and cannot be used here",
+	"code": "parse-error",
+	"message": "Unexpected keyword 'case'",
 	"start": {
 		"line": 1,
 		"column": 18,
diff --git a/test/validator/samples/each-block-invalid-context-destructured/errors.json b/test/validator/samples/each-block-invalid-context-destructured/errors.json
index afe99ee219..62d6f62e87 100644
--- a/test/validator/samples/each-block-invalid-context-destructured/errors.json
+++ b/test/validator/samples/each-block-invalid-context-destructured/errors.json
@@ -1,6 +1,6 @@
 [{
-	"code": "unexpected-reserved-word",
-	"message": "'case' is a reserved word in JavaScript and cannot be used here",
+	"code": "parse-error",
+	"message": "Unexpected token",
 	"start": {
 		"line": 1,
 		"column": 17,
diff --git a/test/validator/samples/slot-attribute-invalid/errors.json b/test/validator/samples/slot-attribute-invalid/errors.json
index fc01fa9792..a75fdc065c 100644
--- a/test/validator/samples/slot-attribute-invalid/errors.json
+++ b/test/validator/samples/slot-attribute-invalid/errors.json
@@ -1,6 +1,6 @@
 [{
 	"code": "invalid-slotted-content",
-	"message": "Element with a slot='...' attribute must be a descendant of a component or custom element",
+	"message": "Element with a slot='...' attribute must be a child of a component or a descendant of a custom element",
 	"start": {
 		"line": 1,
 		"column": 5,