diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 14824ecdfa..457ddb3bab 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,7 +5,7 @@ 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
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80db122cb6..5918d2b7d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,45 @@
 # Svelte changelog
 
-## Unreleased
+## 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
 
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/package-lock.json b/package-lock.json
index 7c521bd93d..06c562e448 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "svelte",
-  "version": "3.20.1",
+  "version": "3.22.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -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 2053ebb76f..ce4ee88ad3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "svelte",
-  "version": "3.20.1",
+  "version": "3.22.3",
   "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 c2b6b9832a..29a2cf75a4 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,7 +109,7 @@ 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}/>
 ```
 
@@ -133,7 +133,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>
 ```
@@ -145,7 +145,7 @@ Text can also contain JavaScript expressions:
 
 You can use HTML comments inside components.
 
-```html
+```sv
 <!-- this is a comment! -->
 <h1>Hello world</h1>
 ```
@@ -154,7 +154,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>
 ```
@@ -176,7 +176,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}
@@ -186,7 +186,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}
@@ -206,6 +206,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
@@ -216,7 +219,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}
@@ -231,7 +234,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}
@@ -241,7 +244,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}
@@ -251,7 +259,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}
@@ -269,7 +277,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}
@@ -294,7 +302,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>
@@ -311,7 +319,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>
@@ -325,7 +333,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}
@@ -346,7 +354,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}
@@ -369,7 +377,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',
@@ -386,7 +394,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}
@@ -420,7 +428,7 @@ on:eventname|modifiers={handler}
 
 Use the `on:` directive to listen to DOM events.
 
-```html
+```sv
 <script>
 	let count = 0;
 
@@ -438,7 +446,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>
@@ -448,7 +456,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 -->
@@ -462,6 +470,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={...}`.
 
@@ -469,7 +478,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>
@@ -479,7 +488,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() {
@@ -506,7 +515,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>
 
@@ -517,7 +526,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>
@@ -527,7 +536,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}>
 ```
@@ -539,7 +548,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>
@@ -551,7 +560,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>
@@ -564,7 +573,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>
@@ -577,7 +586,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>
 ```
 
@@ -604,7 +613,7 @@ Media elements (`<audio>` and `<video>`) have their own set of bindings — six
 
 Videos additionally have readonly `videoWidth` and `videoHeight` bindings.
 
-```html
+```sv
 <video
 	src={clip}
 	bind:duration
@@ -633,7 +642,7 @@ Block-level elements have 4 readonly bindings, measured using a technique simila
 * `offsetWidth`
 * `offsetHeight`
 
-```html
+```sv
 <div
 	bind:offsetWidth={width}
 	bind:offsetHeight={height}
@@ -652,7 +661,7 @@ bind:group={variable}
 
 Inputs that work together can use `bind:group`.
 
-```html
+```sv
 <script>
 	let tortilla = 'Plain';
 	let fillings = [];
@@ -680,7 +689,7 @@ bind:this={dom_node}
 
 To get a reference to a DOM node, use `bind:this`.
 
-```html
+```sv
 <script>
 	import { onMount } from 'svelte';
 
@@ -709,7 +718,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>
@@ -742,7 +751,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
@@ -764,7 +773,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;
 
@@ -817,11 +826,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
@@ -839,7 +848,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
@@ -857,7 +866,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';
 
@@ -888,7 +897,7 @@ A custom transition function can also return a `tick` function, which is called
 
 > If it's possible to use `css` instead of `tick`, do so — CSS animations can run off the main thread, preventing jank on slower devices.
 
-```html
+```sv
 <script>
 	export let visible = false;
 
@@ -934,7 +943,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 }}"
@@ -952,7 +961,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>
@@ -1001,7 +1010,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
@@ -1050,7 +1059,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>
@@ -1065,7 +1074,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}
@@ -1084,7 +1093,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';
 
@@ -1117,7 +1126,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';
 
@@ -1157,7 +1166,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}/>
 ```
 
@@ -1165,7 +1174,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/>
 ```
 
@@ -1180,7 +1189,7 @@ bind:property={variable}
 
 You can bind to component props using the same syntax as for elements.
 
-```html
+```sv
 <Keypad bind:value={pin}/>
 ```
 
@@ -1196,7 +1205,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()}>
@@ -1224,7 +1233,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>
 
@@ -1246,7 +1255,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>
@@ -1269,7 +1278,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>
@@ -1289,7 +1298,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>
@@ -1317,7 +1326,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>
@@ -1342,7 +1351,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}/>
 ```
 
@@ -1360,7 +1369,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`);
@@ -1384,7 +1393,7 @@ You can also bind to the following properties:
 
 All except `scrollX` and `scrollY` are readonly.
 
-```html
+```sv
 <svelte:window bind:scrollY={y}/>
 ```
 
@@ -1399,7 +1408,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}
@@ -1417,7 +1426,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>
@@ -1441,6 +1450,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 85661bd3b9..56c58634b7 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}`)
@@ -413,7 +413,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 +452,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 +499,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 +521,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 six functions: `fade`, `fly`, `slide`, `scale`, `draw` and `crossfade`. They are for use with Svelte [`transitions`](docs#transition_fn).
 
 #### `fade`
 
@@ -546,7 +546,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 +582,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 +621,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 +656,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 +693,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 +731,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 +758,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 +785,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';
@@ -973,7 +973,7 @@ 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
+```sv
 <svelte:options tag="my-element" />
 
 <script>
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/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/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/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/300-is-svelte-dev-down.md b/site/content/faq/300-is-svelte-dev-down.md
new file mode 100644
index 0000000000..a7ce9984b7
--- /dev/null
+++ b/site/content/faq/300-is-svelte-dev-down.md
@@ -0,0 +1,5 @@
+---
+question: 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).
\ No newline at end of file
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..dae27143ed
--- /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) and build [additional CLI tooling](https://github.com/sveltejs/language-tools/issues/68)
\ No newline at end of file
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/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/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/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 68fcf1f289..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,9 +1291,9 @@
       }
     },
     "@sveltejs/svelte-repl": {
-      "version": "0.1.18",
-      "resolved": "https://registry.npmjs.org/@sveltejs/svelte-repl/-/svelte-repl-0.1.18.tgz",
-      "integrity": "sha512-b1psPdlJ9qRqn28l+sPSma6OSfilue0dGK4BcS75MOsfdjZjSvsc0AIAoriQ3q1mB/frCoyUri6nxFGgEKv0iQ==",
+      "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",
@@ -1601,9 +1601,9 @@
       "dev": true
     },
     "codemirror": {
-      "version": "5.52.2",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.52.2.tgz",
-      "integrity": "sha512-WCGCixNUck2HGvY8/ZNI1jYfxPG5cRHv0VjmWuNzbtCLz8qYA5d+je4QhSSCtCaagyeOwMi/HmmPTjBgiTm2lQ==",
+      "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": {
@@ -3164,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",
diff --git a/site/package.json b/site/package.json
index 057d9f9adf..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.18",
+    "@sveltejs/site-kit": "^1.1.5",
+    "@sveltejs/svelte-repl": "^0.1.19",
     "degit": "^2.1.4",
     "dotenv": "^8.1.0",
     "esm": "^3.2.25",
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/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/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/src/compiler/compile/Component.ts b/src/compiler/compile/Component.ts
index bb1546ceee..a5a31c8070 100644
--- a/src/compiler/compile/Component.ts
+++ b/src/compiler/compile/Component.ts
@@ -205,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 {
@@ -632,7 +632,6 @@ export default class Component {
 			this.add_var({
 				name,
 				initialised: instance_scope.initialised_declarations.has(name),
-				hoistable: /^Import/.test(node.type),
 				writable
 			});
 
@@ -715,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);
 				}
@@ -743,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);
@@ -986,6 +995,7 @@ export default class Component {
 			hoistable_nodes,
 			var_lookup,
 			injected_reactive_declaration_vars,
+			imports,
 		} = this;
 
 		const top_level_function_declarations = new Map();
@@ -1137,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() {
@@ -1251,7 +1269,7 @@ export default class Component {
 
 		const add_declaration = declaration => {
 			if (this.reactive_declarations.includes(declaration)) return;
-			
+
 			declaration.dependencies.forEach(name => {
 				if (declaration.assignees.has(name)) return;
 				const earlier_declarations = lookup.get(name);
diff --git a/src/compiler/compile/nodes/AwaitBlock.ts b/src/compiler/compile/nodes/AwaitBlock.ts
index a7b8fb815e..66bc15364c 100644
--- a/src/compiler/compile/nodes/AwaitBlock.ts
+++ b/src/compiler/compile/nodes/AwaitBlock.ts
@@ -3,17 +3,21 @@ import PendingBlock from './PendingBlock';
 import ThenBlock from './ThenBlock';
 import CatchBlock from './CatchBlock';
 import Expression from './shared/Expression';
-import { Pattern } from 'estree';
 import Component from '../Component';
 import TemplateScope from './shared/TemplateScope';
 import { TemplateNode } from '../../interfaces';
-import traverse_destructure_pattern from '../utils/traverse_destructure_pattern';
+import { Context, unpack_destructuring } from './shared/Context';
+import { Node as ESTreeNode } from 'estree';
 
 export default class AwaitBlock extends Node {
 	type: 'AwaitBlock';
 	expression: Expression;
-	value: DestructurePattern;
-	error: DestructurePattern;
+
+	then_contexts: Context[];
+	catch_contexts: Context[];
+
+	then_node: ESTreeNode | null;
+	catch_node: ESTreeNode | null;
 
 	pending: PendingBlock;
 	then: ThenBlock;
@@ -24,24 +28,21 @@ export default class AwaitBlock extends Node {
 
 		this.expression = new Expression(component, this, scope, info.expression);
 
-		this.value = info.value && new DestructurePattern(info.value);
-		this.error = info.error && new DestructurePattern(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);
 		this.catch = new CatchBlock(component, this, scope, info.catch);
 	}
 }
-
-export class DestructurePattern {
-	pattern: Pattern;
-	expressions: string[];
-	identifier_name: string | undefined;
-
-	constructor(pattern: Pattern) {
-		this.pattern = pattern;
-		this.expressions = [];
-		traverse_destructure_pattern(pattern, (node) => this.expressions.push(node.name));
-		this.identifier_name = this.pattern.type === 'Identifier' ? this.pattern.name : undefined;
-	}
-}
diff --git a/src/compiler/compile/nodes/CatchBlock.ts b/src/compiler/compile/nodes/CatchBlock.ts
index 8b3736a2b9..1a92f617bb 100644
--- a/src/compiler/compile/nodes/CatchBlock.ts
+++ b/src/compiler/compile/nodes/CatchBlock.ts
@@ -13,9 +13,9 @@ export default class CatchBlock extends AbstractBlock {
 		super(component, parent, scope, info);
 
 		this.scope = scope.child();
-		if (parent.error) {
-			parent.error.expressions.forEach(expression => {
-				this.scope.add(expression, 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);
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 d8e8902aec..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,6 +277,7 @@ export default class Element extends Node {
 		}
 
 		this.validate_attributes();
+		this.validate_special_cases();
 		this.validate_bindings();
 		this.validate_content();
 		this.validate_event_handlers();
@@ -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, {
@@ -412,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));
@@ -443,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() {
@@ -769,4 +828,4 @@ function within_custom_element(parent: INode) {
 		parent = parent.parent;
 	}
 	return false;
-}
\ No newline at end of file
+}
diff --git a/src/compiler/compile/nodes/ThenBlock.ts b/src/compiler/compile/nodes/ThenBlock.ts
index 7eefe2e6fb..720f88ad78 100644
--- a/src/compiler/compile/nodes/ThenBlock.ts
+++ b/src/compiler/compile/nodes/ThenBlock.ts
@@ -13,9 +13,9 @@ export default class ThenBlock extends AbstractBlock {
 		super(component, parent, scope, info);
 
 		this.scope = scope.child();
-		if (parent.value) {
-			parent.value.expressions.forEach(expression => {
-				this.scope.add(expression, 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);
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/render_dom/Block.ts b/src/compiler/compile/render_dom/Block.ts
index f5c4281710..b29b4d4afd 100644
--- a/src/compiler/compile/render_dom/Block.ts
+++ b/src/compiler/compile/render_dom/Block.ts
@@ -185,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});`);
 		}
 	}
@@ -295,11 +295,11 @@ 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) {
+			properties.mount = x`function #mount(#target, #anchor) {
 				${this.chunks.mount}
 			}`;
 		} else {
-			properties.mount = x`function #mount(#target, anchor, #remount) {
+			properties.mount = x`function #mount(#target, #anchor, #remount) {
 				${this.chunks.mount}
 			}`;
 		}
diff --git a/src/compiler/compile/render_dom/wrappers/AwaitBlock.ts b/src/compiler/compile/render_dom/wrappers/AwaitBlock.ts
index d6ac17f0ce..ceb898bf79 100644
--- a/src/compiler/compile/render_dom/wrappers/AwaitBlock.ts
+++ b/src/compiler/compile/render_dom/wrappers/AwaitBlock.ts
@@ -8,27 +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 traverse_destructure_pattern from '../../utils/traverse_destructure_pattern';
+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),
@@ -36,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,
@@ -48,20 +60,43 @@ 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);
-	}
 
-	render_destructure(block: Block, value, node, index) {
-		if (value && node.pattern.type !== 'Identifier') {
-			traverse_destructure_pattern(node.pattern, (node, parent, index) => {
-				parent[index] = x`#ctx[${block.renderer.context_lookup.get(node.name).index}]`;
-			});
+		if (this.is_destructured) {
+			this.render_destructure();
+		}
+	}
 
-			this.block.chunks.declarations.push(b`(${node.pattern} = #ctx[${index}])`);
-			if (this.block.has_update_method) {
-				this.block.chunks.update.push(b`(${node.pattern} = #ctx[${index}])`);
+	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)`);
 		}
 	}
 }
@@ -73,9 +108,6 @@ export default class AwaitBlockWrapper extends Wrapper {
 	then: AwaitBlockBranch;
 	catch: AwaitBlockBranch;
 
-	value: string;
-	error: string;
-
 	var: Identifier = { type: 'Identifier', name: 'await_block' };
 
 	constructor(
@@ -92,26 +124,12 @@ export default class AwaitBlockWrapper extends Wrapper {
 		this.not_static_content();
 
 		block.add_dependencies(this.node.expression.dependencies);
-		if (this.node.value) {
-			for (const ctx of this.node.value.expressions) {
-				block.renderer.add_to_context(ctx, true);
-			}
-			this.value = this.node.value.identifier_name || block.get_unique_name('value').name;
-			block.renderer.add_to_context(this.value, true);
-		}
-		if (this.node.error) {
-			for (const ctx of this.node.error.expressions) {
-				block.renderer.add_to_context(ctx, true);
-			}
-			this.error = this.node.error.identifier_name || block.get_unique_name('error').name;
-			block.renderer.add_to_context(this.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(
@@ -166,9 +184,6 @@ export default class AwaitBlockWrapper extends Wrapper {
 
 		block.maintain_context = true;
 
-		const value_index = this.value && block.renderer.context_lookup.get(this.value).index;
-		const error_index = this.error && block.renderer.context_lookup.get(this.error).index;
-
 		const info_props: any = x`{
 			ctx: #ctx,
 			current: null,
@@ -176,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`[,,,]`}
 		}`;
 
@@ -200,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;
 
@@ -232,7 +247,7 @@ export default class AwaitBlockWrapper extends Wrapper {
 
 					} else {
 						const #child_ctx = #ctx.slice();
-						${this.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);
 					}
 				`);
@@ -246,7 +261,7 @@ export default class AwaitBlockWrapper extends Wrapper {
 				block.chunks.update.push(b`
 					{
 						const #child_ctx = #ctx.slice();
-						${this.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);
 					}
 				`);
@@ -271,7 +286,5 @@ export default class AwaitBlockWrapper extends Wrapper {
 		[this.pending, this.then, this.catch].forEach(branch => {
 			branch.render(branch.block, null, x`#nodes` as Identifier);
 		});
-		this.then.render_destructure(block, this.value, this.node.value, value_index);
-		this.catch.render_destructure(block, this.error, this.node.error, error_index);
 	}
 }
diff --git a/src/compiler/compile/render_dom/wrappers/EachBlock.ts b/src/compiler/compile/render_dom/wrappers/EachBlock.ts
index 43a0f754f9..1efadfb90c 100644
--- a/src/compiler/compile/render_dom/wrappers/EachBlock.ts
+++ b/src/compiler/compile/render_dom/wrappers/EachBlock.ts
@@ -219,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`)
diff --git a/src/compiler/compile/render_dom/wrappers/Element/Binding.ts b/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
index b2af152050..10e8d7cd58 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() {
@@ -93,11 +93,23 @@ export default class BindingWrapper {
 			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 1d08b01c51..a50e02e76a 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/index.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/index.ts
@@ -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...
@@ -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(
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 4b1e787cbe..00f803bbbd 100644
--- a/src/compiler/compile/render_dom/wrappers/InlineComponent/index.ts
+++ b/src/compiler/compile/render_dom/wrappers/InlineComponent/index.ts
@@ -435,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'});
 				}
 			`);
 
@@ -509,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..63889dd829 100644
--- a/src/compiler/compile/render_dom/wrappers/RawMustacheTag.ts
+++ b/src/compiler/compile/render_dom/wrappers/RawMustacheTag.ts
@@ -54,7 +54,7 @@ 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.mount.push(b`${html_tag}.m(${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 1111a7cffe..55ed031381 100644
--- a/src/compiler/compile/render_dom/wrappers/Slot.ts
+++ b/src/compiler/compile/render_dom/wrappers/Slot.ts
@@ -45,7 +45,7 @@ export default class SlotWrapper extends Wrapper {
 			renderer,
 			this.fallback,
 			node.children,
-			parent,
+			this,
 			strip_whitespace,
 			next_sibling
 		);
@@ -145,7 +145,7 @@ export default class SlotWrapper extends Wrapper {
 
 		block.chunks.mount.push(b`
 			if (${slot_or_fallback}) {
-				${slot_or_fallback}.m(${parent_node || '#target'}, ${parent_node ? 'null' : 'anchor'});
+				${slot_or_fallback}.m(${parent_node || '#target'}, ${parent_node ? 'null' : '#anchor'});
 			}
 		`);
 
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_ssr/handlers/AwaitBlock.ts b/src/compiler/compile/render_ssr/handlers/AwaitBlock.ts
index d6bb86f1a4..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 ? node.value.pattern : ''}) { return ${then}; }(__value));
+			return (function(${node.then_node ? node.then_node : ''}) { return ${then}; }(__value));
 		}(${node.expression.node})
 	`);
 }
diff --git a/src/compiler/compile/utils/traverse_destructure_pattern.ts b/src/compiler/compile/utils/traverse_destructure_pattern.ts
deleted file mode 100644
index 6c918c28c0..0000000000
--- a/src/compiler/compile/utils/traverse_destructure_pattern.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Pattern, Identifier, RestElement } from "estree";
-import { Node } from "acorn";
-
-export default function traverse_destructure_pattern(
-	node: Pattern,
-	callback: (node: Identifier, parent: Node, key: string | number) => void
-) {
-	function traverse(node: Pattern, parent, key) {
-		switch (node.type) {
-			case "Identifier":
-				return callback(node, parent, key);
-			case "ArrayPattern":
-				for (let i = 0; i < node.elements.length; i++) {
-					const element = node.elements[i];
-					traverse(element, node.elements, i);
-				}
-				break;
-			case "ObjectPattern":
-				for (let i = 0; i < node.properties.length; i++) {
-					const property = node.properties[i];
-					if (property.type === "Property") {
-						traverse(property.value, property, "value");
-					} else {
-						traverse((property as any) as RestElement, node.properties, i);
-					}
-				}
-				break;
-			case "RestElement":
-				return traverse(node.argument, node, 'argument');
-			case "AssignmentPattern":
-        return traverse(node.left, node, 'left');
-		}
-  }
-  traverse(node, null, null);
-}
diff --git a/src/compiler/parse/index.ts b/src/compiler/parse/index.ts
index c21e6d6f79..a809eeebeb 100644
--- a/src/compiler/parse/index.ts
+++ b/src/compiler/parse/index.ts
@@ -5,9 +5,6 @@ import { reserved } from '../utils/names';
 import full_char_code_at from '../utils/full_char_code_at';
 import { TemplateNode, Ast, ParserOptions, Fragment, Style, Script } from '../interfaces';
 import error from '../utils/error';
-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';
 
 type ParserState = (parser: Parser) => (ParserState | void);
 
@@ -173,51 +170,6 @@ export class Parser {
 		return identifier;
 	}
 
-	read_destructure_pattern(): Pattern {
-		const start = this.index;
-		let i = this.index;
-
-		const code = full_char_code_at(this.template, i);
-		if (isIdentifierStart(code, true)) {
-			return { type: 'Identifier', name: this.read_identifier() };
-		}
-
-		if (!is_bracket_open(code)) {
-			this.error({
-				code: 'unexpected-token',
-				message: 'Expected identifier or destructure pattern',
-			});
-		}
-
-		const bracket_stack = [code];
-		i += code <= 0xffff ? 1 : 2;
-
-		while (i < this.template.length) {
-			const code = full_char_code_at(this.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)) {
-					this.error({
-						code: 'unexpected-token',
-						message: `Expected ${String.fromCharCode(get_bracket_close(bracket_stack[bracket_stack.length - 1]))}`
-					});
-				}
-				bracket_stack.pop();
-				if (bracket_stack.length === 0) {
-					i += code <= 0xffff ? 1 : 2;
-					break;
-				}
-			}
-			i += code <= 0xffff ? 1 : 2;
-		}
-
-		this.index = i;
-
-		const pattern_string = this.template.slice(start, i);
-		return (parse_expression_at(`(${pattern_string} = 1)`, 0) as any).left as Pattern;
-	}
-
 	read_until(pattern: RegExp) {
 		if (this.index >= this.template.length)
 			this.error({
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 28ef853f8e..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_destructure_pattern();
+			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_destructure_pattern();
+			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/runtime/internal/dom.ts b/src/runtime/internal/dom.ts
index 9ab9a4395f..02fd3dc23e 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);
 	};
 }
 
@@ -316,4 +347,4 @@ export class HtmlTag {
 	d() {
 		this.n.forEach(detach);
 	}
-}
\ No newline at end of file
+}
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/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/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/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 3cad17b34d..9c5467e1a0 100644
--- a/test/js/samples/video-bindings/expected.js
+++ b/test/js/samples/video-bindings/expected.js
@@ -59,7 +59,7 @@ function create_fragment(ctx) {
 		o: noop,
 		d(detaching) {
 			if (detaching) detach(video);
-			video_resize_listener.cancel();
+			video_resize_listener();
 			run_all(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/samples/await-catch/output.json b/test/parser/samples/await-catch/output.json
index d47d27e4cb..c543583018 100644
--- a/test/parser/samples/await-catch/output.json
+++ b/test/parser/samples/await-catch/output.json
@@ -26,6 +26,8 @@
 				},
 				"value": null,
 				"error": {
+					"start": 47,
+					"end": 55,
 					"type": "Identifier",
 					"name": "theError"
 				},
diff --git a/test/parser/samples/await-then-catch/output.json b/test/parser/samples/await-then-catch/output.json
index 01dc89f3f9..8e4b7a4c32 100644
--- a/test/parser/samples/await-then-catch/output.json
+++ b/test/parser/samples/await-then-catch/output.json
@@ -25,10 +25,14 @@
 					"name": "thePromise"
 				},
 				"value": {
+					"start": 46,
+					"end": 54,
 					"type": "Identifier",
 					"name": "theValue"
 				},
 				"error": {
+					"start": 96,
+					"end": 104,
 					"type": "Identifier",
 					"name": "theError"
 				},
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/no-error-if-before-closing/output.json b/test/parser/samples/no-error-if-before-closing/output.json
index e30c302e0f..708128a42e 100644
--- a/test/parser/samples/no-error-if-before-closing/output.json
+++ b/test/parser/samples/no-error-if-before-closing/output.json
@@ -116,6 +116,8 @@
 					"raw": "true"
 				},
 				"value": {
+					"start": 97,
+					"end": 98,
 					"type": "Identifier",
 					"name": "f"
 				},
@@ -202,6 +204,8 @@
 					"raw": "true"
 				},
 				"value": {
+					"start": 137,
+					"end": 138,
 					"type": "Identifier",
 					"name": "f"
 				},
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/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-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/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/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/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/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/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/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/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/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/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/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,