diff --git a/cmd/templates/vuebasic/frontend/babel.config.js b/cmd/templates/vuebasic/frontend/babel.config.js
index ba179669a..a6106c484 100644
--- a/cmd/templates/vuebasic/frontend/babel.config.js
+++ b/cmd/templates/vuebasic/frontend/babel.config.js
@@ -1,5 +1,5 @@
 module.exports = {
   presets: [
-    '@vue/app'
+		[ '@vue/app', { useBuiltIns: 'entry' } ]
   ]
 }
diff --git a/cmd/templates/vuebasic/frontend/package.json.template b/cmd/templates/vuebasic/frontend/package.json.template
index 95c1db966..271f969bd 100644
--- a/cmd/templates/vuebasic/frontend/package.json.template
+++ b/cmd/templates/vuebasic/frontend/package.json.template
@@ -8,7 +8,8 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "core-js": "^2.6.4",
+    "core-js": "^3.6.1",
+    "regenerator-runtime": "^0.13.3",
     "vue": "^2.5.22",
     "@wailsapp/runtime": "^1.0.0"
   },
diff --git a/cmd/templates/vuebasic/frontend/src/main.js b/cmd/templates/vuebasic/frontend/src/main.js
index 739f1a3fb..ce05741b7 100644
--- a/cmd/templates/vuebasic/frontend/src/main.js
+++ b/cmd/templates/vuebasic/frontend/src/main.js
@@ -1,3 +1,5 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
 import Vue from 'vue';
 import App from './App.vue';
 
diff --git a/cmd/templates/vuetify-basic/frontend/babel.config.js b/cmd/templates/vuetify-basic/frontend/babel.config.js
index ba179669a..a6106c484 100644
--- a/cmd/templates/vuetify-basic/frontend/babel.config.js
+++ b/cmd/templates/vuetify-basic/frontend/babel.config.js
@@ -1,5 +1,5 @@
 module.exports = {
   presets: [
-    '@vue/app'
+		[ '@vue/app', { useBuiltIns: 'entry' } ]
   ]
 }
diff --git a/cmd/templates/vuetify-basic/frontend/package.json.template b/cmd/templates/vuetify-basic/frontend/package.json.template
index 42555b90a..d737c25cd 100644
--- a/cmd/templates/vuetify-basic/frontend/package.json.template
+++ b/cmd/templates/vuetify-basic/frontend/package.json.template
@@ -8,8 +8,8 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "babel-polyfill": "^6.26.0",
-    "core-js": "^2.6.4",
+    "core-js": "^3.6.1",
+    "regenerator-runtime": "^0.13.3",
     "material-design-icons-iconfont": "^5.0.1",
     "vue": "^2.5.22",
     "vuetify": "^1.5.14",
@@ -50,4 +50,4 @@
     "last 2 versions",
     "not ie <= 8"
   ]
-}
\ No newline at end of file
+}
diff --git a/cmd/templates/vuetify-basic/frontend/src/main.js b/cmd/templates/vuetify-basic/frontend/src/main.js
index de57f6b7a..bbe42e116 100644
--- a/cmd/templates/vuetify-basic/frontend/src/main.js
+++ b/cmd/templates/vuetify-basic/frontend/src/main.js
@@ -1,4 +1,5 @@
-import 'babel-polyfill';
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
 import Vue from 'vue';
 
 // Setup Vuetify
diff --git a/cmd/templates/vuetify-basic/template.json b/cmd/templates/vuetify-basic/template.json
index 0df81aa07..b58b5b041 100755
--- a/cmd/templates/vuetify-basic/template.json
+++ b/cmd/templates/vuetify-basic/template.json
@@ -1,8 +1,8 @@
 {
-  "name": "Vuetify Basic",
+  "name": "Vuetify1.5/Webpack Basic",
   "version": "1.0.0",
-  "shortdescription": "Vuetify + Webpack",
-  "description": "Basic template using Vuetify and bundled using Webpack",
+  "shortdescription": "A basic Vuetify1.5/Webpack4 template",
+  "description": "Basic template using Vuetify v1.5 and bundled using Webpack",
   "install": "npm install",
   "build": "npm run build",
   "author": "lea <lea.anthony@gmail.com>",
@@ -11,4 +11,4 @@
   "serve": "npm run serve",
   "bridge": "src",
   "wailsdir": ""
-}
\ No newline at end of file
+}
diff --git a/cmd/templates/vuetify2-basic/.jshint b/cmd/templates/vuetify2-basic/.jshint
new file mode 100644
index 000000000..0557edf11
--- /dev/null
+++ b/cmd/templates/vuetify2-basic/.jshint
@@ -0,0 +1,3 @@
+{ 
+  "esversion": 6 
+}
\ No newline at end of file
diff --git a/cmd/templates/vuetify2-basic/frontend/.gitignore b/cmd/templates/vuetify2-basic/frontend/.gitignore
new file mode 100644
index 000000000..185e66319
--- /dev/null
+++ b/cmd/templates/vuetify2-basic/frontend/.gitignore
@@ -0,0 +1,21 @@
+.DS_Store
+node_modules
+/dist
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw*
diff --git a/cmd/templates/vuetify2-basic/frontend/babel.config.js b/cmd/templates/vuetify2-basic/frontend/babel.config.js
new file mode 100644
index 000000000..57e6d0a51
--- /dev/null
+++ b/cmd/templates/vuetify2-basic/frontend/babel.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+	presets: [
+		[ '@vue/app', { useBuiltIns: 'entry' } ]
+	]
+};
diff --git a/cmd/templates/vuetify2-basic/frontend/package.json.template b/cmd/templates/vuetify2-basic/frontend/package.json.template
new file mode 100644
index 000000000..89f096e86
--- /dev/null
+++ b/cmd/templates/vuetify2-basic/frontend/package.json.template
@@ -0,0 +1,53 @@
+{
+  "name": "{{.NPMProjectName}}",
+  "author": "{{.Author.Name}}<{{.Author.Email}}>",
+  "private": true,
+  "scripts": {
+    "serve": "vue-cli-service serve",
+    "build": "vue-cli-service build",
+    "lint": "vue-cli-service lint"
+  },
+  "dependencies": {
+    "core-js": "^3.6.1",
+    "regenerator-runtime": "^0.13.3",
+    "vue": "^2.5.22",
+    "vuetify": "^2.0.15",
+    "@wailsapp/runtime": "^1.0.0"
+  },
+  "devDependencies": {
+    "@mdi/font": "^4.3.95",
+    "@vue/cli-plugin-babel": "^3.4.0",
+    "@vue/cli-plugin-eslint": "^3.4.0",
+    "@vue/cli-service": "^3.4.0",
+    "babel-eslint": "^10.0.1",
+    "eslint": "^5.8.0",
+    "eslint-plugin-vue": "^5.0.0",
+    "eventsource-polyfill": "^0.9.6",
+    "vue-template-compiler": "^2.5.21",
+    "webpack-hot-middleware": "^2.24.3"
+  },
+  "eslintConfig": {
+    "root": true,
+    "env": {
+      "node": true
+    },
+    "extends": [
+      "plugin:vue/essential",
+      "eslint:recommended"
+    ],
+    "rules": {},
+    "parserOptions": {
+      "parser": "babel-eslint"
+    }
+  },
+  "postcss": {
+    "plugins": {
+      "autoprefixer": {}
+    }
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not ie <= 8"
+  ]
+}
diff --git a/cmd/templates/vuetify2-basic/frontend/src/App.vue b/cmd/templates/vuetify2-basic/frontend/src/App.vue
new file mode 100644
index 000000000..2d4a34228
--- /dev/null
+++ b/cmd/templates/vuetify2-basic/frontend/src/App.vue
@@ -0,0 +1,60 @@
+<template>
+  <v-app id="inspire">
+    <v-navigation-drawer v-model="drawer" clipped fixed app>
+      <v-list dense>
+        <v-list-item>
+          <v-list-item-icon>
+            <v-icon>mdi-view-dashboard</v-icon>
+          </v-list-item-icon>
+          <v-list-item-content>
+            <v-list-item-title>Dashboard</v-list-item-title>
+          </v-list-item-content>
+        </v-list-item>
+        <v-list-item>
+          <v-list-item-icon>
+            <v-icon>mdi-settings</v-icon>
+          </v-list-item-icon>
+          <v-list-item-content>
+            <v-list-item-title>Settings</v-list-item-title>
+          </v-list-item-content>
+        </v-list-item>
+      </v-list>
+    </v-navigation-drawer>
+    <v-app-bar app fixed clipped-left>
+      <v-app-bar-nav-icon @click.stop="drawer = !drawer"></v-app-bar-nav-icon>
+      <v-toolbar-title>Application</v-toolbar-title>
+    </v-app-bar>
+    <v-content>
+      <v-container fluid class="px-0">
+        <v-layout justify-center align-center class="px-0">
+          <hello-world></hello-world>
+        </v-layout>
+      </v-container>
+    </v-content>
+    <v-footer app fixed>
+      <span style="margin-left:1em">&copy; You</span>
+    </v-footer>
+  </v-app>
+</template>
+
+<script>
+  import HelloWorld from "./components/HelloWorld.vue"
+
+  export default {
+    data: () => ({
+      drawer: false
+    }),
+    components: {
+      HelloWorld
+    },
+    props: {
+      source: String
+    }
+  }
+</script>
+
+<style>
+  .logo {
+    width: 16em;
+  }
+</style>
\ No newline at end of file
diff --git a/cmd/templates/vuetify2-basic/frontend/src/assets/images/logo.png b/cmd/templates/vuetify2-basic/frontend/src/assets/images/logo.png
new file mode 100644
index 000000000..31fc8249c
Binary files /dev/null and b/cmd/templates/vuetify2-basic/frontend/src/assets/images/logo.png differ
diff --git a/cmd/templates/vuetify2-basic/frontend/src/components/HelloWorld.vue b/cmd/templates/vuetify2-basic/frontend/src/components/HelloWorld.vue
new file mode 100644
index 000000000..84708401c
--- /dev/null
+++ b/cmd/templates/vuetify2-basic/frontend/src/components/HelloWorld.vue
@@ -0,0 +1,85 @@
+<template>
+  <v-container fluid class="px-0">
+    <v-layout>
+      <v-flex xs12 sm6 offset-sm3>
+        <v-card raised="raised" class="pa-4 ma-4">
+          <v-layout justify-center align-center class="pa-4 ma-4">
+            <v-img :src="require('../assets/images/logo.png')"></v-img>
+          </v-layout>
+          <v-card-actions>
+            <v-layout justify-center align-center class="px-0">
+              <v-btn color="blue" @click="getMessage">Press Me</v-btn>
+            </v-layout>
+          </v-card-actions>
+        </v-card>
+      </v-flex>
+    </v-layout>
+    <div class="text-xs-center">
+      <v-dialog v-model="dialog" width="500">
+        <v-card>
+          <v-card-title class="headline" primary-title>Message from Go</v-card-title>
+          <v-card-text>{{message}}</v-card-text>
+          <v-divider></v-divider>
+          <v-card-actions>
+            <v-spacer></v-spacer>
+            <v-btn color="primary" text @click="dialog = false">Awesome</v-btn>
+          </v-card-actions>
+        </v-card>
+      </v-dialog>
+    </div>
+  </v-container>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        message: " ",
+        raised: true,
+        dialog: false
+      }
+    },
+    methods: {
+      getMessage: function () {
+        var self = this
+        window.backend.basic().then(result => {
+          self.message = result
+          self.dialog = true
+        })
+      }
+    }
+  }
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped>
+  h1 {
+    margin-top: 2em;
+    position: relative;
+    min-height: 5rem;
+    width: 100%;
+  }
+
+  a:hover {
+    font-size: 1.7em;
+    border-color: blue;
+    background-color: blue;
+    color: white;
+    border: 3px solid white;
+    border-radius: 10px;
+    padding: 9px;
+    cursor: pointer;
+    transition: 500ms;
+  }
+
+  a {
+    font-size: 1.7em;
+    border-color: white;
+    background-color: #121212;
+    color: white;
+    border: 3px solid white;
+    border-radius: 10px;
+    padding: 9px;
+    cursor: pointer;
+  }
+</style>
diff --git a/cmd/templates/vuetify2-basic/frontend/src/main.js b/cmd/templates/vuetify2-basic/frontend/src/main.js
new file mode 100644
index 000000000..245eb1e03
--- /dev/null
+++ b/cmd/templates/vuetify2-basic/frontend/src/main.js
@@ -0,0 +1,29 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
+import '@mdi/font/css/materialdesignicons.css';
+import Vue from 'vue';
+import Vuetify from 'vuetify';
+import 'vuetify/dist/vuetify.min.css';
+
+Vue.use(Vuetify);
+
+import App from './App.vue';
+
+Vue.config.productionTip = false;
+Vue.config.devtools = true;
+
+import Wails from '@wailsapp/runtime';
+
+Wails.Init(() => {
+	new Vue({
+		vuetify: new Vuetify({
+			icons: {
+				iconfont: 'mdi'
+			},
+			theme: {
+				dark: true
+			}
+		}),
+		render: h => h(App)
+	}).$mount('#app');
+});
diff --git a/cmd/templates/vuetify2-basic/frontend/vue.config.js b/cmd/templates/vuetify2-basic/frontend/vue.config.js
new file mode 100644
index 000000000..0c073f116
--- /dev/null
+++ b/cmd/templates/vuetify2-basic/frontend/vue.config.js
@@ -0,0 +1,43 @@
+let cssConfig = {};
+
+if (process.env.NODE_ENV == 'production') {
+	cssConfig = {
+		extract: {
+			filename: '[name].css',
+			chunkFilename: '[name].css'
+		}
+	};
+}
+
+module.exports = {
+	chainWebpack: config => {
+		let limit = 9999999999999999;
+		config.module
+			.rule('images')
+			.test(/\.(png|gif|jpg)(\?.*)?$/i)
+			.use('url-loader')
+			.loader('url-loader')
+			.tap(options => Object.assign(options, { limit: limit }));
+		config.module
+			.rule('fonts')
+			.test(/\.(woff2?|eot|ttf|otf|svg)(\?.*)?$/i)
+			.use('url-loader')
+			.loader('url-loader')
+			.options({
+				limit: limit
+			});
+	},
+	css: cssConfig,
+	configureWebpack: {
+		output: {
+			filename: '[name].js'
+		},
+		optimization: {
+			splitChunks: false
+		}
+	},
+	devServer: {
+		disableHostCheck: true,
+		host: 'localhost'
+	}
+};
diff --git a/cmd/templates/vuetify2-basic/go.mod.template b/cmd/templates/vuetify2-basic/go.mod.template
new file mode 100644
index 000000000..780381065
--- /dev/null
+++ b/cmd/templates/vuetify2-basic/go.mod.template
@@ -0,0 +1,5 @@
+module {{.BinaryName}}
+
+require (
+	github.com/wailsapp/wails {{.WailsVersion}}
+)
\ No newline at end of file
diff --git a/cmd/templates/vuetify2-basic/main.go.template b/cmd/templates/vuetify2-basic/main.go.template
new file mode 100644
index 000000000..e2262bd1d
--- /dev/null
+++ b/cmd/templates/vuetify2-basic/main.go.template
@@ -0,0 +1,27 @@
+package main
+
+import (
+  "github.com/leaanthony/mewn"
+  "github.com/wailsapp/wails"
+)
+
+func basic() string {
+  return "Hello World!"
+}
+
+func main() {
+
+  js := mewn.String("./frontend/dist/app.js")
+  css := mewn.String("./frontend/dist/app.css")
+
+  app := wails.CreateApp(&wails.AppConfig{
+    Width:  1024,
+    Height: 768,
+    Title:  "{{.Name}}",
+    JS:     js,
+    CSS:    css,
+    Colour: "#131313",
+  })
+  app.Bind(basic)
+  app.Run()
+}
diff --git a/cmd/templates/vuetify2-basic/template.json b/cmd/templates/vuetify2-basic/template.json
new file mode 100755
index 000000000..a33450fe5
--- /dev/null
+++ b/cmd/templates/vuetify2-basic/template.json
@@ -0,0 +1,14 @@
+{
+  "name": "Vuetify2/Webpack Basic",
+  "version": "1.0.0",
+  "shortdescription": "A basic Vuetify2/Webpack4 template",
+  "description": "Basic template using Vuetify v2 and bundled using Webpack",
+  "install": "npm install",
+  "build": "npm run build",
+  "author": "Michael Hipp <michael@redmule.com>",
+  "created": "2019-09-06",
+  "frontenddir": "frontend",
+  "serve": "npm run serve",
+  "bridge": "src",
+  "wailsdir": ""
+}