diff --git a/modules/manifest/index.js b/modules/manifest/index.js
index a5199489..6805ccc1 100755
--- a/modules/manifest/index.js
+++ b/modules/manifest/index.js
@@ -3,84 +3,120 @@ const path = require('path')
 const _ = require('lodash')
 const hash = require('hash-sum')
 
-const fixUrl = url => url.replace(/(?!^)\/\//g, '/').replace(':/', '://')// // ~> /
+const fixUrl = url => url.replace(/\/\//g, '/').replace(':/', '://')
+const isUrl = url => url.indexOf('http') === 0 || url.indexOf('//') === 0
 
-module.exports = function nuxtManifest (options) {
-  const routerBase = this.options.router.base === '/' ? '' : this.options.router.base
-  const defaultName = options.name || this.options.manifest.name || process.env.npm_package_name
-  const defaultShortName = process.env.npm_package_name || defaultName
+// const defaultIcon = Object.assign({
+//   src: fixUrl(`${routerBase}/icon.png`),
+//   sizes: '512x512',
+//   type: 'image/png'
+// }, options.defaultIcon, this.options.manifest.defaultIcon)
 
-  const defaultIcon = Object.assign({
-    src: fixUrl(`${routerBase}/icon.png`),
-    sizes: '512x512',
-    type: 'image/png'
-  }, options.defaultIcon, this.options.manifest.defaultIcon)
 
+module.exports = function nuxtManifest (options) {
+  // routerBase and publicPath
+  const routerBase = this.options.router.base
+  let publicPath = fixUrl(`${routerBase}/${this.options.build.publicPath}`)
+  if (isUrl(this.options.build.publicPath)) { // CDN
+    publicPath = this.options.build.publicPath
+    if (publicPath.indexOf('//') === 0) {
+      publicPath = '/' + publicPath
+    }
+  }
+
+  // Infer defaults based on environment
   const defaults = {
-    name: defaultName,
-    short_name: defaultShortName,
-    description: defaultName,
-    icons: [defaultIcon],
-    start_url: fixUrl(`${routerBase}/`),
+    name: process.env.npm_package_name,
+    short_name: process.env.npm_package_name,
+    description: process.env.npm_package_description,
+    icons: [],
+    start_url: routerBase,
     display: 'standalone',
     background_color: '#ffffff',
     theme_color: (this.options.loading && this.options.loading.color) || '#3f51b5',
-    lang: 'en'
+    lang: 'en',
+
+    // Special options
+    _head: true,
+    _icons: true
   }
 
-  // manifest.json
+  // Combine sources
   const manifest = _.defaultsDeep({}, options, this.options.manifest, defaults)
-  // Sanetize
+
+  // Extract options
+  const _head = Boolean(manifest._head)
+  const _icons = Boolean(manifest._icons)
+
+  // Cleanup internals
   delete manifest.src
-  delete manifest.defaultIcon
-  // Write file
-  const manifestFileName = `manifest.${hash(manifest)}.json`
-  const distDir = 'static'
-  const manifestFilePath = path.resolve(this.options.rootDir, distDir, manifestFileName)
-
-  // Fix problem with now deployments which start script is running on a ro environment
-  // We need to somehow detect module is running in build or start mode
-  if (!fs.existsSync(manifestFilePath)) {
-    fs.ensureDirSync(path.resolve(this.options.rootDir, distDir))
-    fs.writeFileSync(manifestFilePath, JSON.stringify(manifest), 'utf8')
-  }
+  delete manifest._head
+  delete manifest._icons
+
+  const manifestSource = JSON.stringify(manifest)
+  const manifestFileName = `manifest.${hash(manifestSource)}.json`
+
+  // Register webpack plugin to emit manifest
+  this.options.build.plugins.push({
+    apply (compiler) {
+      compiler.plugin('emit', function (compilation, cb) {
+        compilation.assets[manifestFileName] = {
+          source: () => manifestSource,
+          size: () => manifestSource.length
+        }
+        cb()
+      })
+    }
+  })
 
   // Add manifest meta
   if (!_.find(this.options.head.link, {rel: 'manifest'})) {
-    this.options.head.link.push({rel: 'manifest', href: fixUrl(`${routerBase}/${manifestFileName}`)})
+    this.options.head.link.push({rel: 'manifest', href: fixUrl(`${publicPath}/${manifestFileName}`)})
+  } else {
+    console.warn('Manifest meta already provided! Skipping manifest.')
   }
 
-  // Add favicon
-  if (!_.find(this.options.head.link, {rel: 'shortcut icon'})) {
-    this.options.head.link.push({rel: 'shortcut icon', href: manifest.icons[0].src})
-  }
+  // More meta
+  if (_head) {
+    // Add favicon
+    if (!_.find(this.options.head.link, {rel: 'shortcut icon'})) {
+      this.options.head.link.push({rel: 'shortcut icon', href: manifest.icons[0].src})
+    }
 
-  if (!_.find(this.options.head.link, {rel: 'apple-touch-icon'})) {
-    this.options.head.link.push({rel: 'apple-touch-icon', href: manifest.icons[0].src})
-  }
+    if (!_.find(this.options.head.link, {rel: 'apple-touch-icon'})) {
+      this.options.head.link.push({rel: 'apple-touch-icon', href: manifest.icons[0].src})
+    }
 
-  // Set title
-  if (manifest.name && !this.options.head.title) {
-    this.options.head.title = manifest.name
-  }
+    // Set title
+    if (manifest.name && !this.options.head.title) {
+      this.options.head.title = manifest.name
+    }
 
-  // Add description meta
-  if (manifest.description && !_.find(this.options.head.meta, {name: 'description'})) {
-    this.options.head.meta.push({name: 'description', content: manifest.description})
-  }
+    // Add description meta
+    if (manifest.description && !_.find(this.options.head.meta, {name: 'description'})) {
+      this.options.head.meta.push({hid: 'description', name: 'description', content: manifest.description})
+    }
 
-  // Add theme-color meta
-  if (manifest.description && !_.find(this.options.head.meta, {name: 'theme-color'})) {
-    this.options.head.meta.push({name: 'theme-color', content: manifest.theme_color})
-  }
+    // Add theme-color meta
+    if (manifest.theme_color && !_.find(this.options.head.meta, {name: 'theme-color'})) {
+      this.options.head.meta.push({name: 'theme-color', content: manifest.theme_color})
+    }
 
-  // Add lang to html tag
-  if (manifest.lang && !(this.options.head.htmlAttrs && this.options.head.htmlAttrs.lang)) {
-    if (!this.options.head.htmlAttrs) {
-      this.options.head.htmlAttrs = {}
+    // Add lang to html tag
+    if (manifest.lang && !(this.options.head.htmlAttrs && this.options.head.htmlAttrs.lang)) {
+      if (!this.options.head.htmlAttrs) {
+        this.options.head.htmlAttrs = {}
+      }
+      this.options.head.htmlAttrs.lang = manifest.lang
     }
-    this.options.head.htmlAttrs.lang = manifest.lang
   }
+
+  // Generate icons
+  if (_icons) {
+    // TODO
+  }
+
 }
 
+
 module.exports.meta = require('./package.json')