diff --git a/build/rollup.config.js b/build/rollup.config.js
index 61a30e53b3..346d3fab8a 100755
--- a/build/rollup.config.js
+++ b/build/rollup.config.js
@@ -81,7 +81,12 @@ function genConfig (opts) {
           'external-helpers'
         ],
         presets: [
-          ['es2015', { modules: false }]
+          ['env', {
+            targets: {
+              node: '6.11.0'
+            },
+            modules: false
+          }]
         ],
         'env': {
           'test': {
diff --git a/build/start.js b/build/start.js
index ac1d3bdf67..9f5eaecc28 100755
--- a/build/start.js
+++ b/build/start.js
@@ -15,7 +15,8 @@ const packageJSON = readJSONSync(resolve(rootDir, 'package.json'))
 // Required and Excluded packages for start
 let requires = [
   'source-map-support',
-  'pretty-error'
+  'pretty-error',
+  'minimist'
 ]
 
 const excludes = [
diff --git a/examples/custom-build/nuxt.config.js b/examples/custom-build/nuxt.config.js
index 5feedeaaef..7f63c66e5c 100644
--- a/examples/custom-build/nuxt.config.js
+++ b/examples/custom-build/nuxt.config.js
@@ -1,15 +1,15 @@
 module.exports = {
   build: {
     filenames: {
-        css: 'styles.[chunkhash].css',    // default: common.[chunkhash].css
-        manifest: 'manifest.[hash].js',   // default: manifest.[hash].js
-        vendor: 'vendor.[hash].js',       // default: vendor.bundle.[hash].js
-        app: 'app.[chunkhash].js'         // default: nuxt.bundle.[chunkhash].js
+      css: 'styles.[chunkhash].css', // default: common.[chunkhash].css
+      manifest: 'manifest.[hash].js', // default: manifest.[hash].js
+      vendor: 'vendor.[hash].js', // default: vendor.bundle.[hash].js
+      app: 'app.[chunkhash].js' // default: nuxt.bundle.[chunkhash].js
     },
     vendor: ['lodash'],
     extend (config, { dev }) {
       if (dev) {
-        config.devtool = (dev ? 'eval-source-map' : false)
+        config.devtool = 'eval-source-map'
       }
       const urlLoader = config.module.rules.find((loader) => loader.loader === 'url-loader')
       // Increase limit to 100KO
diff --git a/examples/dynamic-components/pages/index.vue b/examples/dynamic-components/pages/index.vue
index 74f0026f39..6381e70525 100755
--- a/examples/dynamic-components/pages/index.vue
+++ b/examples/dynamic-components/pages/index.vue
@@ -45,7 +45,7 @@ ul {
   list-style: none;
   margin: 0;
   padding: 0;
-  with: 100%;
+  width: 100%;
   max-width: 300px;
   margin: auto;
 }
@@ -68,4 +68,4 @@ ul li {
   opacity: 0;
   transform: translateY(20px);
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/examples/global-css/assets/roboto.woff2 b/examples/global-css/assets/roboto.woff2
new file mode 100644
index 0000000000..555f98b120
Binary files /dev/null and b/examples/global-css/assets/roboto.woff2 differ
diff --git a/examples/global-css/css/main.css b/examples/global-css/css/main.css
index 762c321cb7..debffff97e 100644
--- a/examples/global-css/css/main.css
+++ b/examples/global-css/css/main.css
@@ -1,3 +1,11 @@
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Roboto'), local('Roboto-Regular'), url(../assets/roboto.woff2) format('woff2');
+  unicode-range: U+0460-052F, U+20B4, U+2DE0-2DFF, U+A640-A69F;
+}
+
 body {
   background: #eee;
   text-align: center;
@@ -7,6 +15,7 @@ body {
   position: absolute;
   top: 0;
   left: 0;
+  font-family: 'Roboto';
 }
 .content {
   margin-top: 100px;
diff --git a/examples/global-css/nuxt.config.js b/examples/global-css/nuxt.config.js
index f916e5a053..3dc2839759 100644
--- a/examples/global-css/nuxt.config.js
+++ b/examples/global-css/nuxt.config.js
@@ -9,5 +9,12 @@ module.exports = {
   css: [
     'bulma/css/bulma.css',
     '~/css/main.css'
-  ]
+  ],
+  render: {
+    bundleRenderer: {
+      shouldPreload: (file, type) => {
+        return ['script', 'style', 'font'].includes(type)
+      }
+    }
+  }
 }
diff --git a/examples/global-css/package.json b/examples/global-css/package.json
index 75e5b4647d..1525d69e4e 100644
--- a/examples/global-css/package.json
+++ b/examples/global-css/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nuxt-global-css",
   "dependencies": {
-    "bulma": "^0.4.3",
+    "bulma": "^0.5.1",
     "nuxt": "latest"
   },
   "scripts": {
diff --git a/examples/i18n/package.json b/examples/i18n/package.json
index 5ca4f709ba..6c75b31cb7 100644
--- a/examples/i18n/package.json
+++ b/examples/i18n/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nuxt-i18n",
   "dependencies": {
-    "nuxt": "latest",
+    "nuxt": "^1.0.0-rc9",
     "vue-i18n": "^7.0.5"
   },
   "scripts": {
diff --git a/examples/i18n/plugins/i18n.js b/examples/i18n/plugins/i18n.js
index e4859aadc9..81293fb7a7 100644
--- a/examples/i18n/plugins/i18n.js
+++ b/examples/i18n/plugins/i18n.js
@@ -3,7 +3,7 @@ import VueI18n from 'vue-i18n'
 
 Vue.use(VueI18n)
 
-export default ({ app, store }) => {
+export default ({ app, isClient, store }) => {
   // Set i18n instance on app
   // This way we can use it in middleware and pages asyncData/fetch
   app.i18n = new VueI18n({
diff --git a/examples/layout-transitions/README.md b/examples/layout-transitions/README.md
new file mode 100644
index 0000000000..3bdd2a9092
--- /dev/null
+++ b/examples/layout-transitions/README.md
@@ -0,0 +1,3 @@
+# Layout transitions with Nuxt.js
+
+https://nuxtjs.org/examples/layout-transitions
diff --git a/examples/layout-transitions/assets/main.css b/examples/layout-transitions/assets/main.css
new file mode 100644
index 0000000000..dbb73ba005
--- /dev/null
+++ b/examples/layout-transitions/assets/main.css
@@ -0,0 +1,52 @@
+body {
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
+}
+
+.container {
+  text-align: center;
+  padding-top: 200px;
+  font-size: 20px;
+  transition: all .5s cubic-bezier(.55,0,.1,1);
+}
+
+.page-enter-active, .page-leave-active {
+  transition: opacity .5s
+}
+.page-enter, .page-leave-active {
+  opacity: 0
+}
+
+.layout-enter-active, .layout-leave-active {
+  transition: opacity .5s
+}
+.layout-enter, .layout-leave-active {
+  opacity: 0
+}
+
+.bounce-enter-active {
+  animation: bounce-in .8s;
+}
+.bounce-leave-active {
+  animation: bounce-out .5s;
+}
+@keyframes bounce-in {
+  0% { transform: scale(0) }
+  50% { transform: scale(1.5) }
+  100% { transform: scale(1) }
+}
+@keyframes bounce-out {
+  0% { transform: scale(1) }
+  50% { transform: scale(1.5) }
+  100% { transform: scale(0) }
+}
+
+.slide-left-enter,
+.slide-right-leave-active {
+  opacity: 0;
+  transform: translate(30px, 0);
+}
+.slide-left-leave-active,
+.slide-right-enter {
+  opacity: 0;
+  transform: translate(-30px, 0);
+}
diff --git a/examples/layout-transitions/layouts/secondary.vue b/examples/layout-transitions/layouts/secondary.vue
new file mode 100644
index 0000000000..d4a9065bd3
--- /dev/null
+++ b/examples/layout-transitions/layouts/secondary.vue
@@ -0,0 +1,11 @@
+<template>
+  <div>
+    <menu>
+      <ul>
+        <li>Option 1</li>
+        <li>Option 2</li>
+      </ul>
+    </menu>
+    <nuxt/>
+  </div>
+</template>
diff --git a/examples/layout-transitions/nuxt.config.js b/examples/layout-transitions/nuxt.config.js
new file mode 100644
index 0000000000..e1b2d64a6c
--- /dev/null
+++ b/examples/layout-transitions/nuxt.config.js
@@ -0,0 +1,10 @@
+module.exports = {
+  build: {
+    vendor: ['axios']
+  },
+  css: ['~/assets/main.css'],
+  layoutTransition: {
+    name: 'layout',
+    mode: 'out-in'
+  }
+}
diff --git a/examples/layout-transitions/package.json b/examples/layout-transitions/package.json
new file mode 100644
index 0000000000..38fd64e26c
--- /dev/null
+++ b/examples/layout-transitions/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "nuxt-layout-transitions",
+  "dependencies": {
+    "axios": "^0.15.3",
+    "nuxt": "latest"
+  },
+  "scripts": {
+    "dev": "../../bin/nuxt",
+    "build": "nuxt build",
+    "start": "nuxt start"
+  }
+}
diff --git a/examples/layout-transitions/pages/about.vue b/examples/layout-transitions/pages/about.vue
new file mode 100644
index 0000000000..0ec094454f
--- /dev/null
+++ b/examples/layout-transitions/pages/about.vue
@@ -0,0 +1,13 @@
+<template>
+  <div class="container">
+    <h1>About page</h1>
+    <nuxt-link to="/">Home page</nuxt-link>
+  </div>
+</template>
+
+<script>
+export default {
+  layout: 'secondary',
+  transition: 'bounce'
+}
+</script>
diff --git a/examples/layout-transitions/pages/index.vue b/examples/layout-transitions/pages/index.vue
new file mode 100644
index 0000000000..fe5ce74005
--- /dev/null
+++ b/examples/layout-transitions/pages/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <div class="container">
+    <h1>Home page</h1>
+    <p><nuxt-link to="/about">About page</nuxt-link></p>
+    <p><nuxt-link to="/users">Lists of users</nuxt-link></p>
+  </div>
+</template>
diff --git a/examples/layout-transitions/pages/users.vue b/examples/layout-transitions/pages/users.vue
new file mode 100644
index 0000000000..84ea80cf23
--- /dev/null
+++ b/examples/layout-transitions/pages/users.vue
@@ -0,0 +1,71 @@
+<template>
+  <div class="container">
+    <nuxt-link v-if="page > 1" :to="'?page=' + (page - 1)">&lt; Prev</nuxt-link>
+    <a v-else class="disabled">&lt; Prev</a>
+    <span>{{ page }}/{{ totalPages }}</span>
+    <nuxt-link v-if="page < totalPages" :to="'?page=' + (page + 1)">Next &gt;</nuxt-link>
+    <a v-else class="disabled">Next &gt;</a>
+    <ul>
+      <li v-for="user in users">
+        <img :src="user.avatar" class="avatar" />
+        <span>{{ user.first_name }} {{ user.last_name }}</span>
+      </li>
+    </ul>
+    <p><nuxt-link to="/">Back home</nuxt-link></p>
+  </div>
+</template>
+
+<script>
+import axios from 'axios'
+
+export default {
+  transition (to, from) {
+    if (!from) return 'slide-left'
+    return +to.query.page < +from.query.page ? 'slide-right' : 'slide-left'
+  },
+  async asyncData ({ query }) {
+    const page = query.page || 1
+    const { data } = await axios.get(`https://reqres.in/api/users?page=${page}`)
+    return {
+      page: +data.page,
+      totalPages: data.total_pages,
+      users: data.data
+    }
+  }
+}
+</script>
+
+<style scoped>
+a {
+  display: inline-block;
+  margin: 0 1em;
+  color: #34495e;
+  text-decoration: none;
+}
+a.disabled {
+  color: #ccc;
+}
+ul {
+  margin: auto;
+  padding: 0;
+  width: 100%;
+  max-width: 400px;
+  padding-top: 40px;
+}
+li {
+  list-style-type: none;
+  width: 400px;
+  border: 1px #ddd solid;
+  overflow: hidden;
+}
+li img {
+  float: left;
+  width: 100px;
+  height: 100px;
+}
+li span {
+  display: inline-block;
+  padding-top: 40px;
+  text-transform: uppercase;
+}
+</style>
diff --git a/examples/spa/nuxt.config.js b/examples/spa/nuxt.config.js
index 1ee2ae7dec..7040b5d3dc 100644
--- a/examples/spa/nuxt.config.js
+++ b/examples/spa/nuxt.config.js
@@ -23,23 +23,19 @@ module.exports = {
   */
   css: ['~/assets/main.css'],
   /*
-  ** Cutomize loading indicator
+  ** Customize loading indicator
   */
   loadingIndicator: {
     /*
     ** See https://github.com/nuxt/nuxt.js/tree/dev/lib/app/views/loading for available loading indicators
     ** You can add a custom indicator by giving a path
-    ** Default: 'circle'
     */
-    name: 'folding-cube',
+    // name: 'folding-cube',
     /*
     ** You can give custom options given to the template
     ** See https://github.com/nuxt/nuxt.js/blob/dev/lib/app/views/loading/folding-cube.html
-    ** Default:
-    ** - color: '#3B8070'
-    ** - background: 'white'
     */
-    color: '#222',
-    background: 'white'
+    // color: '#DBE1EC'
+    // background: 'white'
   }
 }
diff --git a/examples/typescript/modules/typescript.js b/examples/typescript/modules/typescript.js
index ec98f8fd26..a45d341b89 100644
--- a/examples/typescript/modules/typescript.js
+++ b/examples/typescript/modules/typescript.js
@@ -7,7 +7,7 @@ module.exports = function (options) {
       loader: 'ts-loader'
     })
     // Add TypeScript loader for vue files
-    for (rule of config.module.rules) {
+    for (let rule of config.module.rules) {
       if (rule.loader === 'vue-loader') {
         rule.query.loaders.ts = 'ts-loader?{"appendTsSuffixTo":["\\\\.vue$"]}'
       }
diff --git a/examples/vue-apollo/package.json b/examples/vue-apollo/package.json
index 907e221af3..f26ec4014c 100644
--- a/examples/vue-apollo/package.json
+++ b/examples/vue-apollo/package.json
@@ -1,8 +1,8 @@
 {
   "name": "nuxt-vue-apollo",
   "dependencies": {
-    "@nuxtjs/apollo": "^2.0.0",
-    "nuxt": "^1.0.0-rc6"
+    "@nuxtjs/apollo": "^2.1.1",
+    "nuxt": "^1.0.0-rc9"
   },
   "scripts": {
     "dev": "nuxt",
diff --git a/lib/app/App.vue b/lib/app/App.vue
index 37e6d69b37..771bd613f7 100644
--- a/lib/app/App.vue
+++ b/lib/app/App.vue
@@ -1,7 +1,9 @@
 <template>
   <div id="__nuxt">
     <% if (loading) { %><nuxt-loading ref="loading"></nuxt-loading><% } %>
-    <component v-if="layout" :is="nuxt.err ? 'nuxt' : layout"></component>
+    <% if (layoutTransition) { %><transition name="<%= layoutTransition.name %>" mode="<%= layoutTransition.mode %>"><% } %>
+      <component v-if="layout" :is="nuxt.err ? 'nuxt' : layout" :key="layoutName"></component>
+    <% if (layoutTransition) { %></transition><% } %>
   </div>
 </template>
 
diff --git a/lib/app/client.js b/lib/app/client.js
index 724c070344..4c43a21682 100644
--- a/lib/app/client.js
+++ b/lib/app/client.js
@@ -26,18 +26,19 @@ let router
 
 // Try to rehydrate SSR data from window
 const NUXT = window.__NUXT__ || {}
-NUXT.components = window.__COMPONENTS__ || null
 
 <% if (debug || mode === 'spa') { %>
 // Setup global Vue error handler
 const defaultErrorHandler = Vue.config.errorHandler
 Vue.config.errorHandler = function (err, vm, info) {
-  err.statusCode = err.statusCode || err.name || 'Whoops!'
-  err.message = err.message || err.toString()
+  const nuxtError = {
+    statusCode: err.statusCode || err.name || 'Whoops!',
+    message: err.message || err.toString()
+  }
 
   // Show Nuxt Error Page
   if(vm && vm.$root && vm.$root.$nuxt && vm.$root.$nuxt.error && info !== 'render function') {
-    vm.$root.$nuxt.error(err)
+    vm.$root.$nuxt.error(nuxtError)
   }
 
   // Call other handler if exist
@@ -49,7 +50,7 @@ Vue.config.errorHandler = function (err, vm, info) {
   if (process.env.NODE_ENV !== 'production') {
     console.error(err)
   } else {
-    console.error(err.message)
+    console.error(err.message || nuxtError.message)
   }
 }
 <% } %>
@@ -132,30 +133,31 @@ async function loadAsyncComponents (to, from, next) {
   }
 }
 
+function applySSRData(Component, ssrData) {
+  if (NUXT.serverRendered && ssrData) {
+    applyAsyncData(Component, ssrData)
+  }
+  Component._Ctor = Component
+  return Component
+}
+
 // Get matched components
 function resolveComponents(router) {
-  const path = getLocation(router.options.base)
+  const path = getLocation(router.options.base, router.options.mode)
 
   return flatMapComponents(router.match(path), (Component, _, match, key, index) => {
     // If component already resolved
     if (typeof Component !== 'function' || Component.options) {
-      const _Component = sanitizeComponent(Component)
+      const _Component = applySSRData(sanitizeComponent(Component), NUXT.data ? NUXT.data[index] : null)
       match.components[key] = _Component
       return _Component
     }
 
     // Resolve component
     return Component().then(Component => {
-        const _Component = sanitizeComponent(Component)
-        if (NUXT.serverRendered) {
-          applyAsyncData(_Component, NUXT.data[index])
-          if (NUXT.components) {
-            Component.options.components = Object.assign(_Component.options.components, NUXT.components[index])
-          }
-          _Component._Ctor = _Component
-        }
-        match.components[key] = _Component
-        return _Component
+      const _Component = applySSRData(sanitizeComponent(Component), NUXT.data ? NUXT.data[index] : null)
+      match.components[key] = _Component
+      return _Component
     })
   })
 }
@@ -228,7 +230,7 @@ async function render (to, from, next) {
     await callMiddleware.call(this, Components, context, layout)
     if (context._redirected) return
 
-    this.error({ statusCode: 404, message: 'This page could not be found.' })
+    this.error({ statusCode: 404, message: '<%= messages.error_404 %>' })
     return next()
   }
 
@@ -272,7 +274,7 @@ async function render (to, from, next) {
     })
     // ...If .validate() returned false
     if (!isValid) {
-      this.error({ statusCode: 404, message: 'This page could not be found.' })
+      this.error({ statusCode: 404, message: '<%= messages.error_404 %>' })
       return next()
     }
 
diff --git a/lib/app/components/nuxt-child.js b/lib/app/components/nuxt-child.js
index 39b8e3c4e7..8df1feb71d 100644
--- a/lib/app/components/nuxt-child.js
+++ b/lib/app/components/nuxt-child.js
@@ -37,6 +37,19 @@ export default {
   name: 'nuxt-child',
   functional: true,
   render (h, { parent, data }) {
+    const nuxt = parent.$root.nuxt
+    const component = parent.$route.matched[0].components.default
+
+    const layoutUid = parent._uid
+    const layoutName = component.options ? component.options.layout : null
+
+    // If we're changing layout render the stored vnode
+    if (nuxt._layoutUid === layoutUid &&
+      nuxt._layoutName !== layoutName) return nuxt._childVnode
+
+    nuxt._layoutUid = layoutUid
+    nuxt._layoutName = layoutName
+
     data.nuxtChild = true
     const _parent = parent
     const transitions = parent.$nuxt.nuxt.transitions
@@ -62,11 +75,14 @@ export default {
         listeners[key] = transition[key].bind(_parent)
       }
     })
-    return h('transition', {
+
+    nuxt._childVnode = h('transition', {
       props: transitionProps,
       on: listeners
     }, [
       h('router-view', data)
     ])
+
+    return nuxt._childVnode
   }
 }
diff --git a/lib/app/components/nuxt-error.vue b/lib/app/components/nuxt-error.vue
index 68b05a43be..a304f59e85 100644
--- a/lib/app/components/nuxt-error.vue
+++ b/lib/app/components/nuxt-error.vue
@@ -1,32 +1,21 @@
 <template>
-  <div class="__nuxt-error-page">
-    <div class="container">
+<div class="__nuxt-error-page">
+<div class="error">
+  <svg xmlns="http://www.w3.org/2000/svg" width="90" height="90" fill="#DBE1EC" viewBox="0 0 48 48"><path d="M22 30h4v4h-4zm0-16h4v12h-4zm1.99-10C12.94 4 4 12.95 4 24s8.94 20 19.99 20S44 35.05 44 24 35.04 4 23.99 4zM24 40c-8.84 0-16-7.16-16-16S15.16 8 24 8s16 7.16 16 16-7.16 16-16 16z"/></svg>
 
-        <div class="row">
-          <div class="column">
-            <h1>{{ statusCode }} </h1>
-            <h3> {{ message }} </h3>
-            <p v-if="statusCode === 404">
-              <nuxt-link class="error-link" to="/">Back to the home page</nuxt-link>
-            </p>
-            <% if(debug) { %>
-            <small v-else>
-              Open developer tools to view stack trace
-            </small>
-            <% } %>
-          </div>
-        </div>
+  <div class="title">{{ message }}</div>
+  <p class="description" v-if="statusCode === 404">
+    <nuxt-link class="error-link" to="/"><%= messages.back_to_home %></nuxt-link>
+  </p>
+  <% if(debug) { %>
+  <p class="description" v-else><%= messages.client_error_details %></p>
+  <% } %>
 
-        <div class="row">
-          <div class="column">
-            <div class="poweredby">
-              <small> Powered by <a href="https://nuxtjs.org" target="_blank" rel="noopener">Nuxt.js</a> </small>
-            </div>
-          </div>
-        </div>
-
-    </div>
+  <div class="logo">
+    <a href="https://nuxtjs.org" target="_blank" rel="noopener"><%= messages.nuxtjs %></a>
   </div>
+</div>
+</div>
 </template>
 
 <script>
@@ -35,14 +24,17 @@ export default {
   props: ['error'],
   head () {
     return {
-      title: this.statusCode + ' - ' + this.message,
-      link: [
-        { rel: 'stylesheet', href: 'https://cdnjs.cloudflare.com/ajax/libs/normalize/7.0.0/normalize.min.css', type: 'text/css', media: 'all' },
-        { rel: 'stylesheet', href: 'https://cdnjs.cloudflare.com/ajax/libs/milligram/1.3.0/milligram.min.css', type: 'text/css', media: 'all' }
+      title: this.message,
+      meta: [
+        {
+          name: 'viewport',
+          content: 'width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no'
+        }
       ]
     }
   },
   <% if(debug) { %>
+  // Only on debug mode
   data () {
     return {
       mounted: false
@@ -51,13 +43,23 @@ export default {
   mounted () {
     this.mounted = true
   },
+  created () {
+    console.error(this.error)
+  },
+  watch: {
+    error(newErr) {
+      if(newErr) {
+        console.error(newErr)
+      }
+    }
+  },
   <% } %>
   computed: {
     statusCode () {
       return (this.error && this.error.statusCode) || 500
     },
     message () {
-      return this.error.message || 'Nuxt Server Error'
+      return this.error.message || '<%= messages.client_error %>'
     }
   }
 }
@@ -65,29 +67,46 @@ export default {
 
 <style>
 .__nuxt-error-page {
-  background: #F5F7FA;
-  font-size: 14px;
-  word-spacing: 1px;
-  -ms-text-size-adjust: 100%;
-  -webkit-text-size-adjust: 100%;
-  -moz-osx-font-smoothing: grayscale;
-  -webkit-font-smoothing: antialiased;
+  padding: 1rem;
+  background: #F7F8FB;
+  color: #47494E;
   text-align: center;
-}
-.__nuxt-error-page .container {
   display: flex;
   justify-content: center;
   align-items: center;
   flex-direction: column;
-  height: 100vh;
-  margin: 0 auto;
-  max-width: 70%;
+  font-family: sans-serif;
+  font-weight: 100 !important;
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
+  -webkit-font-smoothing: antialiased; 
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
 }
-.__nuxt-error-page .poweredby {
-  text-align: center;
-  margin-top: 10%;
+.__nuxt-error-page .error {
+  max-width: 450px;
+}
+.__nuxt-error-page .title {
+  font-size: 1.5rem;
+  margin-top: 15px;
+  color: #47494E;
+  margin-bottom: 8px; 
+}
+.__nuxt-error-page .description {
+  color: #7F828B;
+  line-height: 21px;
+  margin-bottom: 10px;
 }
 .__nuxt-error-page a {
-  color: #42b983 !important;
+  color: #7F828B !important;
+  text-decoration: none;
+}
+.__nuxt-error-page .logo {
+  position: fixed;
+  left: 12px;
+  bottom: 12px;
 }
 </style>
diff --git a/lib/app/components/nuxt.vue b/lib/app/components/nuxt.vue
index 2817b3af9a..2bdd096dd8 100644
--- a/lib/app/components/nuxt.vue
+++ b/lib/app/components/nuxt.vue
@@ -1,6 +1,8 @@
 <template>
-  <nuxt-error v-if="nuxt.err" :error="nuxt.err"></nuxt-error>
-  <nuxt-child :key="routerViewKey" v-else></nuxt-child>
+  <div class="nuxt">
+    <nuxt-error v-if="nuxt.err" :error="nuxt.err"></nuxt-error>
+    <nuxt-child :key="routerViewKey" v-else></nuxt-child>
+  </div>
 </template>
 
 <script>
diff --git a/lib/app/index.js b/lib/app/index.js
index d3dc52750a..05cf531221 100644
--- a/lib/app/index.js
+++ b/lib/app/index.js
@@ -43,7 +43,11 @@ const defaultTransition = <%=
 async function createApp (ssrContext) {
   const router = createRouter()
 
-  <% if (store) { %>const store = createStore()<% } %>
+  <% if (store) { %>
+  const store = createStore()
+  // Add this.$router into store actions/mutations
+  store.$router = router
+  <% } %>
 
   // Create Root instance
   // here we inject the router and store to all child components,
@@ -135,6 +139,15 @@ async function createApp (ssrContext) {
     <% } %>
   }
 
+  <% if (store) { %>
+  if (process.browser) {
+    // Replace store state before plugins execution
+    if (window.__NUXT__ && window.__NUXT__.state) {
+      store.replaceState(window.__NUXT__.state)
+    }
+  }
+  <% } %>
+
   <% plugins.filter(p => p.ssr).forEach(plugin => { %>
   if (typeof <%= plugin.name %> === 'function') await <%= plugin.name %>(ctx, inject)<% }) %>
   <% if (plugins.filter(p => !p.ssr).length) { %>
@@ -142,14 +155,8 @@ async function createApp (ssrContext) {
     if (typeof <%= plugin.name %> === 'function') await <%= plugin.name %>(ctx, inject)<% }) %>
   }<% } %>
 
-  <% if (store) { %>
-  if (process.browser) {
-    // Replace store state before calling plugins
-    if (window.__NUXT__ && window.__NUXT__.state) {
-      store.replaceState(window.__NUXT__.state)
-    }
-  }
-  <% } %>
+  // Inject context
+  inject('ctx', ctx)
 
   if (process.server && ssrContext && ssrContext.url) {
     await new Promise((resolve, reject) => {
diff --git a/lib/app/server.js b/lib/app/server.js
index d8e4859618..01c62be7e6 100644
--- a/lib/app/server.js
+++ b/lib/app/server.js
@@ -193,7 +193,7 @@ export default async context => {
 
   // If no Components found, returns 404
   if (!Components.length) {
-    context.nuxt.error = context.error({ statusCode: 404, message: 'This page could not be found.' })
+    context.nuxt.error = context.error({ statusCode: 404, message: '<%= messages.error_404 %>' })
   }
 
   <% if (isDev) { %>if (asyncDatas.length) debug('Data fetching ' + context.url + ': ' + (Date.now() - s) + 'ms')<% } %>
diff --git a/lib/app/utils.js b/lib/app/utils.js
index 2ad110a906..d98304dd73 100644
--- a/lib/app/utils.js
+++ b/lib/app/utils.js
@@ -108,6 +108,9 @@ export function getContext (context, app) {
   if (ctx.isServer && context.beforeRenderFns) {
     ctx.beforeNuxtRender = (fn) => context.beforeRenderFns.push(fn)
   }
+  if (ctx.isClient && window.__NUXT__) {
+    ctx.nuxtState = window.__NUXT__
+  }
   return ctx
 }
 
@@ -144,8 +147,11 @@ export function promisify (fn, context) {
 }
 
 // Imported from vue-router
-export function getLocation (base) {
+export function getLocation (base, mode) {
   var path = window.location.pathname
+  if (mode === 'hash') {
+    return window.location.hash.replace(/^#\//, '')
+  }
   if (base && path.indexOf(base) === 0) {
     path = path.slice(base.length)
   }
diff --git a/lib/app/views/error.html b/lib/app/views/error.html
index a194321d69..d769cf4300 100644
--- a/lib/app/views/error.html
+++ b/lib/app/views/error.html
@@ -1,72 +1,23 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>{{ status }} - {{ message }}</title>
-    <style>
-    /*! normalize.css v7.0.0 | MIT License | github.com/necolas/normalize.css */html{line-height:1.15;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,footer,header,nav,section{display:block}h1{font-size:2em;margin:.67em 0}figcaption,figure,main{display:block}figure{margin:1em 40px}hr{box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace,monospace;font-size:1em}a{background-color:transparent;-webkit-text-decoration-skip:objects}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}b,strong{font-weight:inherit}b,strong{font-weight:bolder}code,kbd,samp{font-family:monospace,monospace;font-size:1em}dfn{font-style:italic}mark{background-color:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}audio,video{display:inline-block}audio:not([controls]){display:none;height:0}img{border-style:none}svg:not(:root){overflow:hidden}button,input,optgroup,select,textarea{font-family:sans-serif;font-size:100%;line-height:1.15;margin:0}button,input{overflow:visible}button,select{text-transform:none}[type=reset],[type=submit],button,html [type=button]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{border-style:none;padding:0}[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring,button:-moz-focusring{outline:1px dotted ButtonText}fieldset{padding:.35em .75em .625em}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{display:inline-block;vertical-align:baseline}textarea{overflow:auto}[type=checkbox],[type=radio]{box-sizing:border-box;padding:0}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}details,menu{display:block}summary{display:list-item}canvas{display:inline-block}template{display:none}[hidden]{display:none}/*# sourceMappingURL=normalize.min.css.map */
-    </style>
-    <style>
-    /*!
- * Milligram v1.3.0
- * https://milligram.github.io
- *
- * Copyright (c) 2017 CJ Patoilo
- * Licensed under the MIT license
- */
-
-*,*:after,*:before{box-sizing:inherit}html{box-sizing:border-box;font-size:62.5%}body{color:#606c76;font-family:'Roboto', 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif;font-size:1.6em;font-weight:300;letter-spacing:.01em;line-height:1.6}blockquote{border-left:0.3rem solid #d1d1d1;margin-left:0;margin-right:0;padding:1rem 1.5rem}blockquote *:last-child{margin-bottom:0}.button,button,input[type='button'],input[type='reset'],input[type='submit']{background-color:#9b4dca;border:0.1rem solid #9b4dca;border-radius:.4rem;color:#fff;cursor:pointer;display:inline-block;font-size:1.1rem;font-weight:700;height:3.8rem;letter-spacing:.1rem;line-height:3.8rem;padding:0 3.0rem;text-align:center;text-decoration:none;text-transform:uppercase;white-space:nowrap}.button:focus,.button:hover,button:focus,button:hover,input[type='button']:focus,input[type='button']:hover,input[type='reset']:focus,input[type='reset']:hover,input[type='submit']:focus,input[type='submit']:hover{background-color:#606c76;border-color:#606c76;color:#fff;outline:0}.button[disabled],button[disabled],input[type='button'][disabled],input[type='reset'][disabled],input[type='submit'][disabled]{cursor:default;opacity:.5}.button[disabled]:focus,.button[disabled]:hover,button[disabled]:focus,button[disabled]:hover,input[type='button'][disabled]:focus,input[type='button'][disabled]:hover,input[type='reset'][disabled]:focus,input[type='reset'][disabled]:hover,input[type='submit'][disabled]:focus,input[type='submit'][disabled]:hover{background-color:#9b4dca;border-color:#9b4dca}.button.button-outline,button.button-outline,input[type='button'].button-outline,input[type='reset'].button-outline,input[type='submit'].button-outline{background-color:transparent;color:#9b4dca}.button.button-outline:focus,.button.button-outline:hover,button.button-outline:focus,button.button-outline:hover,input[type='button'].button-outline:focus,input[type='button'].button-outline:hover,input[type='reset'].button-outline:focus,input[type='reset'].button-outline:hover,input[type='submit'].button-outline:focus,input[type='submit'].button-outline:hover{background-color:transparent;border-color:#606c76;color:#606c76}.button.button-outline[disabled]:focus,.button.button-outline[disabled]:hover,button.button-outline[disabled]:focus,button.button-outline[disabled]:hover,input[type='button'].button-outline[disabled]:focus,input[type='button'].button-outline[disabled]:hover,input[type='reset'].button-outline[disabled]:focus,input[type='reset'].button-outline[disabled]:hover,input[type='submit'].button-outline[disabled]:focus,input[type='submit'].button-outline[disabled]:hover{border-color:inherit;color:#9b4dca}.button.button-clear,button.button-clear,input[type='button'].button-clear,input[type='reset'].button-clear,input[type='submit'].button-clear{background-color:transparent;border-color:transparent;color:#9b4dca}.button.button-clear:focus,.button.button-clear:hover,button.button-clear:focus,button.button-clear:hover,input[type='button'].button-clear:focus,input[type='button'].button-clear:hover,input[type='reset'].button-clear:focus,input[type='reset'].button-clear:hover,input[type='submit'].button-clear:focus,input[type='submit'].button-clear:hover{background-color:transparent;border-color:transparent;color:#606c76}.button.button-clear[disabled]:focus,.button.button-clear[disabled]:hover,button.button-clear[disabled]:focus,button.button-clear[disabled]:hover,input[type='button'].button-clear[disabled]:focus,input[type='button'].button-clear[disabled]:hover,input[type='reset'].button-clear[disabled]:focus,input[type='reset'].button-clear[disabled]:hover,input[type='submit'].button-clear[disabled]:focus,input[type='submit'].button-clear[disabled]:hover{color:#9b4dca}code{background:#f4f5f6;border-radius:.4rem;font-size:86%;margin:0 .2rem;padding:.2rem .5rem;white-space:nowrap}pre{background:#f4f5f6;border-left:0.3rem solid #9b4dca;overflow-y:hidden}pre>code{border-radius:0;display:block;padding:1rem 1.5rem;white-space:pre}hr{border:0;border-top:0.1rem solid #f4f5f6;margin:3.0rem 0}input[type='email'],input[type='number'],input[type='password'],input[type='search'],input[type='tel'],input[type='text'],input[type='url'],textarea,select{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:transparent;border:0.1rem solid #d1d1d1;border-radius:.4rem;box-shadow:none;box-sizing:inherit;height:3.8rem;padding:.6rem 1.0rem;width:100%}input[type='email']:focus,input[type='number']:focus,input[type='password']:focus,input[type='search']:focus,input[type='tel']:focus,input[type='text']:focus,input[type='url']:focus,textarea:focus,select:focus{border-color:#9b4dca;outline:0}select{background:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" height="14" viewBox="0 0 29 14" width="29"><path fill="#d1d1d1" d="M9.37727 3.625l5.08154 6.93523L19.54036 3.625"/></svg>') center right no-repeat;padding-right:3.0rem}select:focus{background-image:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" height="14" viewBox="0 0 29 14" width="29"><path fill="#9b4dca" d="M9.37727 3.625l5.08154 6.93523L19.54036 3.625"/></svg>')}textarea{min-height:6.5rem}label,legend{display:block;font-size:1.6rem;font-weight:700;margin-bottom:.5rem}fieldset{border-width:0;padding:0}input[type='checkbox'],input[type='radio']{display:inline}.label-inline{display:inline-block;font-weight:normal;margin-left:.5rem}.container{margin:0 auto;max-width:112.0rem;padding:0 2.0rem;position:relative;width:100%}.row{display:flex;flex-direction:column;padding:0;width:100%}.row.row-no-padding{padding:0}.row.row-no-padding>.column{padding:0}.row.row-wrap{flex-wrap:wrap}.row.row-top{align-items:flex-start}.row.row-bottom{align-items:flex-end}.row.row-center{align-items:center}.row.row-stretch{align-items:stretch}.row.row-baseline{align-items:baseline}.row .column{display:block;flex:1 1 auto;margin-left:0;max-width:100%;width:100%}.row .column.column-offset-10{margin-left:10%}.row .column.column-offset-20{margin-left:20%}.row .column.column-offset-25{margin-left:25%}.row .column.column-offset-33,.row .column.column-offset-34{margin-left:33.3333%}.row .column.column-offset-50{margin-left:50%}.row .column.column-offset-66,.row .column.column-offset-67{margin-left:66.6666%}.row .column.column-offset-75{margin-left:75%}.row .column.column-offset-80{margin-left:80%}.row .column.column-offset-90{margin-left:90%}.row .column.column-10{flex:0 0 10%;max-width:10%}.row .column.column-20{flex:0 0 20%;max-width:20%}.row .column.column-25{flex:0 0 25%;max-width:25%}.row .column.column-33,.row .column.column-34{flex:0 0 33.3333%;max-width:33.3333%}.row .column.column-40{flex:0 0 40%;max-width:40%}.row .column.column-50{flex:0 0 50%;max-width:50%}.row .column.column-60{flex:0 0 60%;max-width:60%}.row .column.column-66,.row .column.column-67{flex:0 0 66.6666%;max-width:66.6666%}.row .column.column-75{flex:0 0 75%;max-width:75%}.row .column.column-80{flex:0 0 80%;max-width:80%}.row .column.column-90{flex:0 0 90%;max-width:90%}.row .column .column-top{align-self:flex-start}.row .column .column-bottom{align-self:flex-end}.row .column .column-center{-ms-grid-row-align:center;align-self:center}@media (min-width: 40rem){.row{flex-direction:row;margin-left:-1.0rem;width:calc(100% + 2.0rem)}.row .column{margin-bottom:inherit;padding:0 1.0rem}}a{color:#9b4dca;text-decoration:none}a:focus,a:hover{color:#606c76}dl,ol,ul{list-style:none;margin-top:0;padding-left:0}dl dl,dl ol,dl ul,ol dl,ol ol,ol ul,ul dl,ul ol,ul ul{font-size:90%;margin:1.5rem 0 1.5rem 3.0rem}ol{list-style:decimal inside}ul{list-style:circle inside}.button,button,dd,dt,li{margin-bottom:1.0rem}fieldset,input,select,textarea{margin-bottom:1.5rem}blockquote,dl,figure,form,ol,p,pre,table,ul{margin-bottom:2.5rem}table{border-spacing:0;width:100%}td,th{border-bottom:0.1rem solid #e1e1e1;padding:1.2rem 1.5rem;text-align:left}td:first-child,th:first-child{padding-left:0}td:last-child,th:last-child{padding-right:0}b,strong{font-weight:bold}p{margin-top:0}h1,h2,h3,h4,h5,h6{font-weight:300;letter-spacing:-.1rem;margin-bottom:2.0rem;margin-top:0}h1{font-size:4.6rem;line-height:1.2}h2{font-size:3.6rem;line-height:1.25}h3{font-size:2.8rem;line-height:1.3}h4{font-size:2.2rem;letter-spacing:-.08rem;line-height:1.35}h5{font-size:1.8rem;letter-spacing:-.05rem;line-height:1.5}h6{font-size:1.6rem;letter-spacing:0;line-height:1.4}img{max-width:100%}.clearfix:after{clear:both;content:' ';display:table}.float-left{float:left}.float-right{float:right}
-</style>
+<title><%= messages.server_error %></title>
+<meta charset="utf-8">
+<meta content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" name=viewport>
 <style>
-.__nuxt-error-page {
-  background: #F5F7FA;
-  font-size: 14px;
-  word-spacing: 1px;
-  -ms-text-size-adjust: 100%;
-  -webkit-text-size-adjust: 100%;
-  -moz-osx-font-smoothing: grayscale;
-  -webkit-font-smoothing: antialiased;
-  text-align: center;
-}
-.__nuxt-error-page .container {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-direction: column;
-  height: 100vh;
-  margin: 0 auto;
-  max-width: 70%;
-}
-.__nuxt-error-page .poweredby {
-  text-align: center;
-  margin-top: 10%;
-}
-.__nuxt-error-page a {
-  color: #42b983 !important;
-}
+.__nuxt-error-page{padding: 1rem;background:#f7f8fb;color:#47494e;text-align:center;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;font-family:sans-serif;font-weight:100!important;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;-webkit-font-smoothing:antialiased;position:absolute;top:0;left:0;right:0;bottom:0}.__nuxt-error-page .error{max-width:450px}.__nuxt-error-page .title{font-size:24px;font-size:1.5rem;margin-top:15px;color:#47494e;margin-bottom:8px}.__nuxt-error-page .description{color:#7f828b;line-height:21px;margin-bottom:10px}.__nuxt-error-page a{color:#7f828b!important;text-decoration:none}.__nuxt-error-page .logo{position:fixed;left:12px;bottom:12px}
 </style>
 </head>
 <body>
   <div class="__nuxt-error-page">
-    <div class="container">
-
-        <div class="row">
-            <div class="column">
-                <h1>{{ status }}</h1>
-                <h4>{{ message }}</h4>
-            </div>
-        </div>
-
-        <div class="row">
-            <div class="column">
-                <div class="poweredby">
-                    <small> Powered by <a href="https://nuxtjs.org" target="_blank" rel="noopener">Nuxt.js</a> </small>
-                </div>
-            </div>
-        </div>
-
+    <div class="error">
+        <svg xmlns="http://www.w3.org/2000/svg" width="90" height="90" fill="#DBE1EC" viewBox="0 0 48 48"><path d="M22 30h4v4h-4zm0-16h4v12h-4zm1.99-10C12.94 4 4 12.95 4 24s8.94 20 19.99 20S44 35.05 44 24 35.04 4 23.99 4zM24 40c-8.84 0-16-7.16-16-16S15.16 8 24 8s16 7.16 16 16-7.16 16-16 16z"/></svg>
+        <div class="title"><%= messages.server_error %></div>
+        <div class="description"><% if (debug) { %>{{ message }}<% } else { %><%= messages.server_error_details %><% } %></div>
+    </div>
+    <div class="logo">
+      <a href="https://nuxtjs.org" target="_blank" rel="noopener"><%= messages.nuxtjs %></a>
     </div>
   </div>
 </body>
 </html>
-
-<!-- Inspired by a design from github.com/fs-opensource/hapi-dev-errors -->
diff --git a/lib/builder/builder.js b/lib/builder/builder.js
index e8a01c9972..655b3a85f9 100644
--- a/lib/builder/builder.js
+++ b/lib/builder/builder.js
@@ -203,6 +203,7 @@ export default class Builder extends Tapable {
     ]
     const templateVars = {
       options: this.options,
+      messages: this.options.messages,
       uniqBy: _.uniqBy,
       isDev: this.options.dev,
       debug: this.options.debug,
@@ -218,6 +219,7 @@ export default class Builder extends Tapable {
       layouts: Object.assign({}, this.options.layouts),
       loading: typeof this.options.loading === 'string' ? this.relativeToBuild(this.options.srcDir, this.options.loading) : this.options.loading,
       transition: this.options.transition,
+      layoutTransition: this.options.layoutTransition,
       components: {
         ErrorPage: this.options.ErrorPage ? this.relativeToBuild(this.options.ErrorPage) : null
       }
@@ -485,9 +487,9 @@ export default class Builder extends Tapable {
         compiler.run((err, stats) => {
           /* istanbul ignore if */
           if (err) {
+            console.error(err) // eslint-disable-line no-console
             return reject(err)
           }
-          if (err) return console.error(err) // eslint-disable-line no-console
 
           // Show build stats for production
           console.log(stats.toString(this.webpackStats)) // eslint-disable-line no-console
@@ -518,7 +520,7 @@ export default class Builder extends Tapable {
 
     this.webpackHotMiddleware = pify(webpackHotMiddleware(this.compiler.client, Object.assign({
       log: false,
-      heartbeat: 1000
+      heartbeat: 10000
     }, this.options.build.hotMiddleware)))
 
     // Inject to renderer instance
diff --git a/lib/builder/webpack/client.config.js b/lib/builder/webpack/client.config.js
index bef3a7b08c..7f6a5da9ea 100644
--- a/lib/builder/webpack/client.config.js
+++ b/lib/builder/webpack/client.config.js
@@ -5,7 +5,6 @@ import HTMLPlugin from 'html-webpack-plugin'
 import FriendlyErrorsWebpackPlugin from 'friendly-errors-webpack-plugin'
 import ProgressBarPlugin from 'progress-bar-webpack-plugin'
 import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer'
-// import MinifyPlugin from 'babel-minify-webpack-plugin'
 import { resolve } from 'path'
 import { existsSync } from 'fs'
 import Debug from 'debug'
@@ -77,7 +76,7 @@ export default function webpackClientConfig () {
   // Env object defined in nuxt.config.js
   let env = {}
   each(this.options.env, (value, key) => {
-    env['process.env.' + key] = (typeof value === 'string' ? JSON.stringify(value) : value)
+    env['process.env.' + key] = (['boolean', 'number'].indexOf(typeof value) !== -1 ? value : JSON.stringify(value))
   })
 
   // Webpack common plugins
@@ -153,7 +152,7 @@ export default function webpackClientConfig () {
     // Add HMR support
     config.entry.app = [
       // https://github.com/glenjamin/webpack-hot-middleware#config
-      `webpack-hot-middleware/client?name=client&reload=true&timeout=3000&path=${this.options.router.base}/__webpack_hmr`.replace(/\/\//g, '/'),
+      `webpack-hot-middleware/client?name=client&reload=true&timeout=30000&path=${this.options.router.base}/__webpack_hmr`.replace(/\/\//g, '/'),
       config.entry.app
     ]
     config.plugins.push(
@@ -191,17 +190,13 @@ export default function webpackClientConfig () {
   if (!this.options.dev) {
     // Scope Hoisting
     config.plugins.push(
-      new webpack.optimize.ModuleConcatenationPlugin()
+      // new webpack.optimize.ModuleConcatenationPlugin()
     )
 
     // https://webpack.js.org/plugins/hashed-module-ids-plugin
     config.plugins.push(new webpack.HashedModuleIdsPlugin())
 
     // Minify JS
-
-    // https://github.com/webpack-contrib/babel-minify-webpack-plugin
-    // config.plugins.push(new MinifyPlugin())
-
     // https://github.com/webpack-contrib/uglifyjs-webpack-plugin
     config.plugins.push(
       new webpack.optimize.UglifyJsPlugin({
diff --git a/lib/builder/webpack/server.config.js b/lib/builder/webpack/server.config.js
index 3b2b10478a..7009ed5603 100644
--- a/lib/builder/webpack/server.config.js
+++ b/lib/builder/webpack/server.config.js
@@ -17,7 +17,7 @@ export default function webpackServerConfig () {
   // env object defined in nuxt.config.js
   let env = {}
   each(this.options.env, (value, key) => {
-    env['process.env.' + key] = (typeof value === 'string' ? JSON.stringify(value) : value)
+    env['process.env.' + key] = (['boolean', 'number'].indexOf(typeof value) !== -1 ? value : JSON.stringify(value))
   })
 
   config = Object.assign(config, {
diff --git a/lib/common/options.js b/lib/common/options.js
index 80b9e789f5..f4e8728d87 100755
--- a/lib/common/options.js
+++ b/lib/common/options.js
@@ -24,6 +24,9 @@ Options.from = function (_options) {
   if (typeof options.transition === 'string') {
     options.transition = { name: options.transition }
   }
+  if (typeof options.layoutTransition === 'string') {
+    options.layoutTransition = { name: options.layoutTransition }
+  }
 
   // Apply defaults
   _.defaultsDeep(options, Options.defaults)
@@ -60,8 +63,8 @@ Options.from = function (_options) {
 
   // Apply defaults to loadingIndicator
   options.loadingIndicator = Object.assign({
-    name: 'circle',
-    color: '#3B8070',
+    name: 'pulse',
+    color: '#dbe1ec',
     background: 'white'
   }, options.loadingIndicator)
 
@@ -243,6 +246,10 @@ Options.defaults = {
     appearActiveClass: 'appear-active',
     appearToClass: 'appear-to'
   },
+  layoutTransition: {
+    name: 'layout',
+    mode: 'out-in'
+  },
   router: {
     mode: 'history',
     base: '/',
@@ -274,5 +281,17 @@ Options.defaults = {
       ignored: /-dll/
     },
     chokidar: {}
+  },
+  editor: {
+    editor: 'code'
+  },
+  messages: {
+    error_404: 'This page could not be found',
+    server_error: 'Server error',
+    nuxtjs: 'Nuxt.js',
+    back_to_home: 'Back to the home page',
+    server_error_details: 'An error occurred in the application and your page could not be served. If you are the application owner, check your logs for details.',
+    client_error: 'Error',
+    client_error_details: 'An error occurred while rendering the page. Check developer tools console for details.'
   }
 }
diff --git a/lib/core/meta.js b/lib/core/meta.js
index fee94285f1..55538f5da4 100644
--- a/lib/core/meta.js
+++ b/lib/core/meta.js
@@ -50,23 +50,28 @@ export default class MetaRenderer {
     // Get vue-meta context
     const m = await this.getMeta(url)
     // HTML_ATTRS
-    meta.HTML_ATTRS = 'data-n-head-ssr ' + m.htmlAttrs.text()
+    meta.HTML_ATTRS = m.htmlAttrs.text()
     // BODY_ATTRS
     meta.BODY_ATTRS = m.bodyAttrs.text()
     // HEAD tags
     meta.HEAD = m.meta.text() + m.title.text() + m.link.text() + m.style.text() + m.script.text() + m.noscript.text()
+    // Resources Hints
+    meta.resourceHints = ''
     // Resource Hints
     const clientManifest = this.renderer.resources.clientManifest
     if (this.options.render.resourceHints && clientManifest) {
       const publicPath = clientManifest.publicPath || '/_nuxt/'
       // Pre-Load initial resources
       if (Array.isArray(clientManifest.initial)) {
-        meta.HEAD += clientManifest.initial.map(r => `<link rel="preload" href="${publicPath}${r}" as="script" />`).join('')
+        meta.resourceHints += clientManifest.initial.map(r => `<link rel="preload" href="${publicPath}${r}" as="script" />`).join('')
       }
-
       // Pre-Fetch async resources
       if (Array.isArray(clientManifest.async)) {
-        meta.HEAD += clientManifest.async.map(r => `<link rel="prefetch" href="${publicPath}${r}" />`).join('')
+        meta.resourceHints += clientManifest.async.map(r => `<link rel="prefetch" href="${publicPath}${r}" />`).join('')
+      }
+      // Add them to HEAD
+      if (meta.resourceHints) {
+        meta.HEAD += meta.resourceHints
       }
     }
 
diff --git a/lib/core/renderer.js b/lib/core/renderer.js
index 4d103cb9cf..9e28ae2ddb 100644
--- a/lib/core/renderer.js
+++ b/lib/core/renderer.js
@@ -108,6 +108,9 @@ export default class Renderer extends Tapable {
       this.resources.loadingHTML = ''
     }
 
+    // Call resourcesLoaded plugin
+    await this.applyPluginsAsync('resourcesLoaded', this.resources)
+
     if (updated.length > 0) {
       // debug('Updated', updated.join(', '), isServer)
       this.createRenderer()
@@ -183,7 +186,7 @@ export default class Renderer extends Tapable {
     }
 
     const handler = m.handler || m
-    const path = (this.options.router.base + (m.path ? m.path : '')).replace(/\/\//g, '/')
+    const path = (((m.prefix !== false) ? this.options.router.base : '') + (m.path ? m.path : '')).replace(/\/\//g, '/')
 
     // Inject $src and $m to final handler
     if (src) handler.$src = src
@@ -193,6 +196,10 @@ export default class Renderer extends Tapable {
     this.app.use(path, handler)
   }
 
+  get publicPath () {
+    return isUrl(this.options.build.publicPath) ? Options.defaults.build.publicPath : this.options.build.publicPath
+  }
+
   async setupMiddleware () {
     // Apply setupMiddleware from modules first
     await this.applyPluginsAsync('setupMiddleware', this.app)
@@ -225,6 +232,32 @@ export default class Renderer extends Tapable {
       })
     }
 
+    // open in editor for debug mode only
+    const _this = this
+    if (this.options.debug) {
+      this.useMiddleware({
+        path: '_open',
+        handler (req, res) {
+          // Lazy load open-in-editor
+          const openInEditor = require('open-in-editor')
+          const editor = openInEditor.configure(_this.options.editor)
+          // Parse Query
+          const query = req.url.split('?')[1].split('&').reduce((q, part) => {
+            const s = part.split('=')
+            q[s[0]] = decodeURIComponent(s[1])
+            return q
+          }, {})
+          // eslint-disable-next-line no-console
+          console.log('[open in editor]', query.file)
+          editor.open(query.file).then(() => {
+            res.end('opened in editor!')
+          }).catch(err => {
+            res.end(err)
+          })
+        }
+      })
+    }
+
     // For serving static/ files to /
     this.useMiddleware(serveStatic(resolve(this.options.srcDir, 'static'), this.options.render.static))
 
@@ -233,10 +266,10 @@ export default class Renderer extends Tapable {
     if (!this.options.dev) {
       const distDir = resolve(this.options.buildDir, 'dist')
       this.useMiddleware({
-        path: isUrl(this.options.build.publicPath) ? Options.defaults.build.publicPath : this.options.build.publicPath,
+        path: this.publicPath,
         handler: serveStatic(distDir, {
           index: false, // Don't serve index.html template
-          maxAge: (this.options.dev ? 0 : '1y') // 1 year in production
+          maxAge: '1y' // 1 year in production
         })
       })
     }
@@ -319,6 +352,11 @@ export default class Renderer extends Tapable {
     err.message = err.message || 'Nuxt Server Error'
     err.name = (!err.name || err.name === 'Error') ? 'NuxtServerError' : err.name
 
+    // We hide actual errors from end users, so show them on server logs
+    if (err.statusCode !== 404) {
+      console.error(err) // eslint-disable-line no-console
+    }
+
     const sendResponse = (content, type = 'text/html') => {
       // Set Headers
       res.statusCode = err.statusCode
@@ -398,7 +436,6 @@ export default class Renderer extends Tapable {
         const contents = smc.sourceContentFor(source)
         if (contents) {
           frame.contents = contents
-          return
         }
       }
     }
@@ -424,12 +461,15 @@ export default class Renderer extends Tapable {
       this.options.buildDir
     ]
 
-    // Scan filesystem
+    // Scan filesystem for real path
     for (let pathDir of searchPath) {
       let fullPath = resolve(pathDir, frame.fileName)
       let source = await fs.readFile(fullPath, 'utf-8').catch(() => null)
       if (source) {
-        frame.contents = source
+        if (!frame.contents) {
+          frame.contents = source
+        }
+        frame.fullPath = fullPath
         return
       }
     }
@@ -453,9 +493,15 @@ export default class Renderer extends Tapable {
     // Basic response if SSR is disabled or spa data provided
     const spa = context.spa || (context.res && context.res.spa)
     if (this.noSSR || spa) {
-      const { HTML_ATTRS, BODY_ATTRS, HEAD } = await this.metaRenderer.render(context)
+      const { HTML_ATTRS, BODY_ATTRS, HEAD, resourceHints } = await this.metaRenderer.render(context)
       const APP = `<div id="__nuxt">${this.resources.loadingHTML}</div>`
 
+      // Detect 404 errors
+      if (url.includes(this.options.build.publicPath) || url.includes('__webpack')) {
+        const err = { statusCode: 404, message: this.options.messages.error_404, name: 'ResourceNotFound' }
+        throw err
+      }
+
       const data = {
         HTML_ATTRS,
         BODY_ATTRS,
@@ -465,7 +511,7 @@ export default class Renderer extends Tapable {
 
       const html = this.resources.spaTemplate(data)
 
-      return { html }
+      return { html, resourceHints }
     }
 
     // Call renderToString from the bundleRenderer and generate the HTML (will update the context as well)
diff --git a/package.json b/package.json
index 48a1f5cd0c..60e6ee9495 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nuxt",
-  "version": "1.0.0-rc7",
+  "version": "1.0.0-rc11",
   "description": "A minimalistic framework for server-rendered Vue.js applications (inspired by Next.js)",
   "contributors": [
     {
@@ -64,20 +64,18 @@
     "npm": ">=3.10.0"
   },
   "dependencies": {
-    "@nuxtjs/youch": "3.0.2",
+    "@nuxtjs/youch": "3.1.0",
     "ansi-html": "^0.0.7",
     "autoprefixer": "^7.1.3",
     "babel-core": "^6.26.0",
     "babel-loader": "^7.1.2",
-    "babel-preset-es2015": "^6.24.1",
-    "babel-preset-vue-app": "^1.2.1",
-    "bulma": "^0.5.1",
+    "babel-preset-vue-app": "^1.3.0",
     "chalk": "^2.1.0",
     "chokidar": "^1.7.0",
     "clone": "^2.1.1",
     "compression": "^1.7.0",
     "connect": "^3.6.3",
-    "css-loader": "https://github.com/nuxt/css-loader.git",
+    "css-loader": "^0.28.7",
     "debug": "^3.0.1",
     "es6-promise": "^4.1.1",
     "etag": "^1.8.0",
@@ -94,6 +92,7 @@
     "lru-cache": "^4.1.1",
     "memory-fs": "^0.4.1",
     "minimist": "^1.2.0",
+    "open-in-editor": "^2.2.0",
     "opencollective": "^1.0.3",
     "pify": "^3.0.0",
     "postcss": "^6.0.10",
@@ -107,7 +106,7 @@
     "serve-static": "^1.12.4",
     "server-destroy": "^1.0.1",
     "source-map": "^0.5.7",
-    "source-map-support": "^0.4.16",
+    "source-map-support": "^0.4.17",
     "tappable": "^1.1.0",
     "url-loader": "^0.5.9",
     "vue": "~2.4.2",
@@ -129,13 +128,12 @@
     "babel-plugin-array-includes": "^2.0.3",
     "babel-plugin-external-helpers": "^6.22.0",
     "babel-plugin-istanbul": "^4.1.4",
-    "babel-preset-es2015": "^6.24.1",
     "codecov": "^2.3.0",
     "copy-webpack-plugin": "^4.0.1",
     "cross-env": "^5.0.5",
-    "eslint": "^4.5.0",
+    "eslint": "^4.6.1",
     "eslint-config-standard": "^10.2.1",
-    "eslint-plugin-html": "^3.2.0",
+    "eslint-plugin-html": "^3.2.1",
     "eslint-plugin-import": "^2.7.0",
     "eslint-plugin-node": "^5.1.1",
     "eslint-plugin-promise": "^3.5.0",
diff --git a/start/package.json b/start/package.json
index 8f2b656b6e..2a158122b0 100644
--- a/start/package.json
+++ b/start/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nuxt-start",
-  "version": "1.0.0-rc7",
+  "version": "1.0.0-rc11",
   "description": "runtime-only build for nuxt",
   "contributors": [
     {
@@ -46,8 +46,9 @@
     "npm": ">=3.10.0"
   },
   "dependencies": {
-    "source-map-support": "^0.4.16",
+    "source-map-support": "^0.4.17",
     "pretty-error": "^2.1.1",
+    "minimist": "^1.2.0",
     "lodash": "^4.17.4",
     "hash-sum": "^1.0.2",
     "tappable": "^1.1.0",
diff --git a/test/basic.test.js b/test/basic.test.js
index 2b7a4093d5..ff9df26c0b 100755
--- a/test/basic.test.js
+++ b/test/basic.test.js
@@ -119,7 +119,7 @@ test('/error status code', async t => {
     await rp(url('/error'))
   } catch (err) {
     t.true(err.statusCode === 500)
-    t.true(err.response.body.includes('Error mouahahah'))
+    t.true(err.response.body.includes('An error occurred in the application and your page could not be served'))
   }
 })
 
diff --git a/test/error.test.js b/test/error.test.js
index 17f13eeda0..96bea41a2f 100644
--- a/test/error.test.js
+++ b/test/error.test.js
@@ -29,7 +29,7 @@ test('/ should display an error', async t => {
 
 test('/404 should display an error too', async t => {
   let { error } = await nuxt.renderRoute('/404')
-  t.true(error.message.includes('This page could not be found.'))
+  t.true(error.message.includes('This page could not be found'))
 })
 
 test('/ with renderAndGetWindow()', async t => {
diff --git a/test/fixtures/with-config/assets/app.css b/test/fixtures/with-config/assets/app.css
index f69fcd8bbc..02152c1c08 100755
--- a/test/fixtures/with-config/assets/app.css
+++ b/test/fixtures/with-config/assets/app.css
@@ -1,3 +1,10 @@
 .global-css-selector {
   color: red;
 }
+
+.test-enter-active, .test-leave-active {
+  transition: opacity .5s
+}
+.test-enter, .test-leave-active {
+  opacity: 0
+}
diff --git a/test/fixtures/with-config/assets/roboto.woff2 b/test/fixtures/with-config/assets/roboto.woff2
new file mode 100644
index 0000000000..555f98b120
Binary files /dev/null and b/test/fixtures/with-config/assets/roboto.woff2 differ
diff --git a/test/fixtures/with-config/layouts/default.vue b/test/fixtures/with-config/layouts/default.vue
index 4555ce65c4..4ab9402ac2 100644
--- a/test/fixtures/with-config/layouts/default.vue
+++ b/test/fixtures/with-config/layouts/default.vue
@@ -4,3 +4,17 @@
     <nuxt/>
   </div>
 </template>
+
+<style>
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Roboto'), local('Roboto-Regular'), url(~/assets/roboto.woff2) format('woff2');
+  unicode-range: U+0460-052F, U+20B4, U+2DE0-2DFF, U+A640-A69F;
+}
+
+body {
+  font-family: 'Roboto';
+}
+</style>
\ No newline at end of file
diff --git a/test/fixtures/with-config/nuxt.config.js b/test/fixtures/with-config/nuxt.config.js
index adf8eac489..2b60043d1c 100644
--- a/test/fixtures/with-config/nuxt.config.js
+++ b/test/fixtures/with-config/nuxt.config.js
@@ -15,6 +15,7 @@ module.exports = {
     }
   },
   transition: 'test',
+  layoutTransition: 'test',
   offline: true,
   plugins: [
     '~/plugins/test.js',
@@ -24,10 +25,18 @@ module.exports = {
   env: {
     bool: true,
     num: 23,
-    string: 'Nuxt.js'
+    string: 'Nuxt.js',
+    object: {
+      bool: false,
+      string: 'ok',
+      num2: 8.23,
+      obj: {
+        again: true
+      }
+    }
   },
   build: {
-    extractCSS: true,
+    // extractCSS: true,
     publicPath: '/orion/',
     analyze: {
       analyzerMode: 'disabled',
@@ -46,6 +55,11 @@ module.exports = {
     http2: {
       push: true
     },
+    bundleRenderer: {
+      shouldPreload: (file, type) => {
+        return ['script', 'style', 'font'].includes(type)
+      }
+    },
     static: {
       maxAge: '1y'
     }
diff --git a/test/fixtures/with-config/pages/env.vue b/test/fixtures/with-config/pages/env.vue
index df9f95d882..5f65ca8d87 100644
--- a/test/fixtures/with-config/pages/env.vue
+++ b/test/fixtures/with-config/pages/env.vue
@@ -1,11 +1,20 @@
 <template>
-  <pre>{{ env }}</pre>
+  <div>
+    <pre>{{ env }}</pre>
+    <p>object:</p>
+    <pre>{{ processEnv }}</pre>
+    <nuxt-link to="/">Home</nuxt-link>
+  </div>
 </template>
 
 <script>
 export default {
   layout: 'custom-env',
+  data() {
+    return { processEnv: process.env.object }
+  },
   asyncData ({ env }) {
+    delete env.object
     return { env }
   }
 }
diff --git a/test/with-config.test.js b/test/with-config.test.js
index 2dacdca53f..579affa5cd 100644
--- a/test/with-config.test.js
+++ b/test/with-config.test.js
@@ -26,9 +26,13 @@ test('/', async t => {
 })
 
 test('/ (global styles inlined)', async t => {
-  // const { html } = await nuxt.renderRoute('/')
-  // t.true(html.includes('.global-css-selector'))
-  t.pass()
+  const { html } = await nuxt.renderRoute('/')
+  t.true(html.includes('.global-css-selector'))
+})
+
+test('/ (preload fonts)', async t => {
+  const { html } = await nuxt.renderRoute('/')
+  t.true(html.includes('<link rel="preload" href="/test/orion/fonts/roboto.7cf5d7c.woff2" as="font" type="font/woff2" crossorigin'))
 })
 
 test('/ (custom app.html)', async t => {
@@ -64,6 +68,10 @@ test('/test/env', async t => {
   t.true(html.includes('"bool": true'))
   t.true(html.includes('"num": 23'))
   t.true(html.includes('"string": "Nuxt.js"'))
+  t.true(html.includes('"bool": false'))
+  t.true(html.includes('"string": "ok"'))
+  t.true(html.includes('"num2": 8.23'))
+  t.true(html.includes('"obj": {'))
 })
 
 test('/test/error', async t => {
@@ -87,7 +95,7 @@ test('/test/about-bis (added with extendRoutes)', async t => {
 
 test('Check stats.json generated by build.analyze', t => {
   const stats = require(resolve(__dirname, 'fixtures/with-config/.nuxt/dist/stats.json'))
-  t.is(stats.assets.length, 28)
+  t.is(stats.assets.length, 27)
 })
 
 test('Check /test/test.txt with custom serve-static options', async t => {
diff --git a/yarn.lock b/yarn.lock
index 64ed700936..83d95b3af1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -961,9 +961,9 @@ babel-preset-es2015@^6.24.1:
     babel-plugin-transform-es2015-unicode-regex "^6.24.1"
     babel-plugin-transform-regenerator "^6.24.1"
 
-babel-preset-vue-app@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-vue-app/-/babel-preset-vue-app-1.2.1.tgz#2f6b71890a21a675019ca1db8d0da15bf017ba24"
+babel-preset-vue-app@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-vue-app/-/babel-preset-vue-app-1.3.0.tgz#4b31f690a353c8735963e06927a072a0bb82126f"
   dependencies:
     babel-plugin-syntax-dynamic-import "^6.18.0"
     babel-plugin-transform-object-rest-spread "^6.26.0"
@@ -1220,10 +1220,6 @@ builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
 
-bulma@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.5.1.tgz#db2831c94afe732250c7b12527a7b792a4dc9ef8"
-
 bytes@2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.5.0.tgz#4c9423ea2d252c270c41b2bdefeff9bb6b62c06a"
@@ -1308,12 +1304,12 @@ caniuse-api@^2.0.0:
     lodash.uniq "^4.5.0"
 
 caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30000718"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000718.tgz#86cdd97987302554934c61e106f4e470f16f993c"
+  version "1.0.30000721"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000721.tgz#cdc52efe8f82dd13916615b78e86f704ece61802"
 
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000718:
-  version "1.0.30000718"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000718.tgz#0dd24290beb11310b2d80f6b70a823c2a65a6fad"
+  version "1.0.30000721"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000721.tgz#931a21a7bd85016300328d21f126d84b73437d35"
 
 capture-stack-trace@^1.0.0:
   version "1.0.0"
@@ -1348,7 +1344,7 @@ chalk@^0.4.0:
     has-color "~0.1.0"
     strip-ansi "~0.1.0"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0:
+chalk@^2.0.1, chalk@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e"
   dependencies:
@@ -1815,9 +1811,9 @@ css-color-names@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
 
-"css-loader@https://github.com/nuxt/css-loader.git":
-  version "0.28.5"
-  resolved "https://github.com/nuxt/css-loader.git#43674428e42dd208f6192cfc0b1679935a0bae4b"
+css-loader@^0.28.7:
+  version "0.28.7"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.7.tgz#5f2ee989dd32edd907717f953317656160999c1b"
   dependencies:
     babel-code-frame "^6.11.0"
     css-selector-tokenizer "^0.7.0"
@@ -2354,11 +2350,12 @@ eslint-module-utils@^2.1.1:
     debug "^2.6.8"
     pkg-dir "^1.0.0"
 
-eslint-plugin-html@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-html/-/eslint-plugin-html-3.2.0.tgz#fb64c2789e9582b97f580a38814a57966f91a7b2"
+eslint-plugin-html@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-html/-/eslint-plugin-html-3.2.1.tgz#4289d38245f3d95134d22c17b1894d78db92c572"
   dependencies:
     htmlparser2 "^3.8.2"
+    semver "^5.4.1"
 
 eslint-plugin-import@^2.7.0:
   version "2.7.0"
@@ -2399,9 +2396,9 @@ eslint-scope@^3.7.1:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.5.0.tgz#bb75d3b8bde97fb5e13efcd539744677feb019c3"
+eslint@^4.6.1:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.6.1.tgz#ddc7fc7fd70bf93205b0b3449bb16a1e9e7d4950"
   dependencies:
     ajv "^5.2.0"
     babel-code-frame "^6.22.0"
@@ -2591,7 +2588,7 @@ extend@~3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
 
-external-editor@^2.0.1, external-editor@^2.0.4:
+external-editor@^2.0.1:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.0.4.tgz#1ed9199da9cbfe2ef2f7a31b2fde8b0d12368972"
   dependencies:
@@ -3249,7 +3246,7 @@ ini@^1.3.4, ini@~1.3.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
 
-inquirer@3.0.6:
+inquirer@3.0.6, inquirer@^3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.0.6.tgz#e04aaa9d05b7a3cb9b0f407d04375f0447190347"
   dependencies:
@@ -3267,25 +3264,6 @@ inquirer@3.0.6:
     strip-ansi "^3.0.0"
     through "^2.3.6"
 
-inquirer@^3.0.6:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.2.2.tgz#c2aaede1507cc54d826818737742d621bef2e823"
-  dependencies:
-    ansi-escapes "^2.0.0"
-    chalk "^2.0.0"
-    cli-cursor "^2.1.0"
-    cli-width "^2.0.0"
-    external-editor "^2.0.4"
-    figures "^2.0.0"
-    lodash "^4.3.0"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rx-lite "^4.0.8"
-    rx-lite-aggregates "^4.0.8"
-    string-width "^2.1.0"
-    strip-ansi "^4.0.0"
-    through "^2.3.6"
-
 interpret@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90"
@@ -4090,7 +4068,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@0.0.8:
+minimist@0.0.8, minimist@~0.0.1:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
@@ -4098,10 +4076,6 @@ minimist@1.2.0, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
-minimist@~0.0.1:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-
 "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
@@ -4130,8 +4104,8 @@ mute-stream@0.0.7:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
 
 nan@^2.3.0:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45"
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46"
 
 natural-compare@^1.4.0:
   version "1.4.0"
@@ -5748,16 +5722,6 @@ run-async@^2.2.0:
   dependencies:
     is-promise "^2.1.0"
 
-rx-lite-aggregates@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
-  dependencies:
-    rx-lite "*"
-
-rx-lite@*, rx-lite@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
-
 rx@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
@@ -5786,7 +5750,7 @@ semver-diff@^2.0.0:
   dependencies:
     semver "^5.0.3"
 
-"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0:
+"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
 
@@ -5915,12 +5879,18 @@ source-list-map@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
 
-source-map-support@^0.4.0, source-map-support@^0.4.15, source-map-support@^0.4.16:
+source-map-support@^0.4.0, source-map-support@^0.4.15:
   version "0.4.16"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.16.tgz#16fecf98212467d017d586a2af68d628b9421cd8"
   dependencies:
     source-map "^0.5.6"
 
+source-map-support@^0.4.17:
+  version "0.4.17"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.17.tgz#6f2150553e6375375d0ccb3180502b78c18ba430"
+  dependencies:
+    source-map "^0.5.6"
+
 source-map@0.5.6:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
@@ -6045,7 +6015,7 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-string-width@^2.0.0, string-width@^2.1.0:
+string-width@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   dependencies:
@@ -6725,14 +6695,10 @@ window-size@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
 
-wordwrap@0.0.2:
+wordwrap@0.0.2, wordwrap@~0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
 
-wordwrap@~0.0.2:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-
 wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"