fix comment

2026-04-05 22:52:42 -07:00 · 2019-02-05 18:59:46 +11:00
126 changed files with 3879 additions and 13760 deletions
--- a/.chglog/CHANGELOG.tpl.md
+++ b/.chglog/CHANGELOG.tpl.md
@@ -1,42 +0,0 @@
-{{ if .Versions -}}
-<a name="unreleased"></a>
-## [Unreleased]
-
-{{ if .Unreleased.CommitGroups -}}
-{{ range .Unreleased.CommitGroups -}}
-### {{ .Title }}
-{{ range .Commits -}}
- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
-{{ end }}
-{{ end -}}
-{{ end -}}
-{{ end -}}
-
-{{ range .Versions }}
-<a name="{{ .Tag.Name }}"></a>
-## {{ if .Tag.Previous }}[{{ .Tag.Name }}]{{ else }}{{ .Tag.Name }}{{ end }} - {{ datetime "2006-01-02" .Tag.Date }}
-{{ range .CommitGroups -}}
-### {{ .Title }}
-{{ range .Commits -}}
- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
-{{ end }}
-{{ end -}}
-
-{{- if .NoteGroups -}}
-{{ range .NoteGroups -}}
-### {{ .Title }}
-{{ range .Notes }}
-{{ .Body }}
-{{ end }}
-{{ end -}}
-{{ end -}}
-{{ end -}}
-
-{{- if .Versions }}
-[Unreleased]: {{ .Info.RepositoryURL }}/compare/{{ $latest := index .Versions 0 }}{{ $latest.Tag.Name }}...HEAD
-{{ range .Versions -}}
-{{ if .Tag.Previous -}}
-[{{ .Tag.Name }}]: {{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }}
-{{ end -}}
-{{ end -}}
-{{ end -}}
--- a/.chglog/config.yml
+++ b/.chglog/config.yml
@@ -1,27 +0,0 @@
-style: github
-template: CHANGELOG.tpl.md
-info:
-  title: CHANGELOG
-  repository_url: https://github.com/wailsapp/wails
-options:
-  commits:
-    # filters:
-    #   Type:
-    #     - feat
-    #     - fix
-    #     - perf
-    #     - refactor
-  commit_groups:
-    # title_maps:
-    #   feat: Features
-    #   fix: Bug Fixes
-    #   perf: Performance Improvements
-    #   refactor: Code Refactoring
-  header:
-    pattern: "^(\\w*)\\:\\s(.*)$"
-    pattern_maps:
-      - Type
-      - Subject
-  notes:
-    keywords:
-      - BREAKING CHANGE
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,30 +0,0 @@
---
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: bug
-assignees: ''
-
---
-
-**Description**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behaviour:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behaviour**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**System Details**
-Please paste the output of `wails report` here.
-
-**Additional context**
-Add any other context about the problem here.
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,4 @@
 examples/**/example*
 !examples/**/*.*
 cmd/wails/wails
-.DS_Store
-tmp
-dist
+.DS_Store
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -1,34 +0,0 @@
-# This is an example goreleaser.yaml file with some sane defaults.
-# Make sure to check the documentation at http://goreleaser.com
-
-builds:
- env:
-  - CGO_ENABLED=0
-  goos:
-    - windows
-    - linux
-    - darwin
-  goarch:
-    - 386
-    - amd64
-  ignore:
-  - goos: darwin
-    goarch: 386
-  main: ./cmd/wails/main.go
-archive:
-  replacements:
-    darwin: Darwin
-    linux: Linux
-    windows: Windows
-    386: i386
-    amd64: x86_64
-checksum:
-  name_template: 'checksums.txt'
-snapshot:
-  name_template: "{{ .Tag }}-next"
-changelog:
-  sort: asc
-  filters:
-    exclude:
-    - '^docs:'
-    - '^test:'
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -5,36 +5,14 @@
  "version": "0.2.0",
  "configurations": [
    {
-      "name": "Wails Init",
+      "name": "Launch",
      "type": "go",
      "request": "launch",
      "mode": "auto",
      "program": "${workspaceFolder}/cmd/wails/main.go",
      "env": {},
-      "cwd": "/tmp",
      "args": [
-        "init",
-        "-name",
-        "runtime",
-        "-dir",
-        "runtime",
-        "-output",
-        "runtime",
-        "-template",
-        "vuebasic"
-      ]
-    },
-    {
-      "name": "Wails Update Pre",
-      "type": "go",
-      "request": "launch",
-      "mode": "auto",
-      "program": "${workspaceFolder}/cmd/wails/main.go",
-      "env": {},
-      "cwd": "/tmp",
-      "args": [
-        "update",
-        "-pre"
+        "setup"
      ]
    }
  ]
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +0,0 @@
-{
-  "go.formatTool": "goimports"
-}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,19 +0,0 @@
-
-<a name="v0.13.0"></a>
-## [v0.13.0] - 2019-05-12
-
-### Feat
- revamped 'update' system
- no need for explicit GO111MODULE=on
-
-### Fix
- documentation typo fixes
- windows init project
- windows 10 colour
- leave windows assets on -p flag
- show prerequisite errors
-
-### Docs
- updated contributors
- added awesomego logo
- added Redhat distro
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1,12 +0,0 @@
-# Contributors
-
-Wails is what it is because of the time and effort given by these great people. A huge thank you to each and every one!
-
-* [Dustin Krysak](https://wiki.ubuntu.com/bashfulrobot)
-* [Qais Patankar](https://github.com/qaisjp)
-* [Anthony Lee](https://github.com/alee792)
-* [Adrian Lanzafame](https://github.com/lanzafame)
-* [0xflotus](https://github.com/0xflotus)
-* [Michael D Henderson](https://github.com/mdhender)
-* [fred2104] (https://github.com/fishfishfish2104)
-* [intelwalk] (https://github.com/intelwalk)
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2018-Present Lea Anthony
+Copyright (c) 2018 wailsapp

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/README.md
+++ b/README.md
@@ -1,120 +1 @@
-<p align="center" style="text-align: center">
-   <img src="https://github.com/wailsapp/docs/raw/master/.vuepress/public/media/logo_cropped.png" width="40%"><br/>
-</p>
-<p align="center">
-   A framework for building desktop applications using Go & Web Technologies.<br/><br/>
-   <a href="https://github.com/wailsapp/wails/blob/master/LICENSE"><img src="https://img.shields.io/badge/License-MIT-blue.svg"></a>
-   <a href="https://goreportcard.com/report/github.com/wailsapp/wails"><img src="https://goreportcard.com/badge/github.com/wailsapp/wails"/></a>
-   <a href="http://godoc.org/github.com/wailsapp/wails"><img src="https://img.shields.io/badge/godoc-reference-blue.svg"/></a>
-   <a href="https://www.codefactor.io/repository/github/wailsapp/wails"><img src="https://www.codefactor.io/repository/github/wailsapp/wails/badge" alt="CodeFactor" /></a>
-   <a href="https://github.com/wailsapp/wails/issues"><img src="https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat" alt="CodeFactor" /></a>
-   <a href="https://houndci.com"><img src="https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg"/></a>
-   <a href="https://github.com/sindresorhus/awesome" rel="nofollow"><img src="https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg" alt="Awesome"></a>-
-</p>
-
-The traditional method of providing web interfaces to Go programs is via a built-in web server. Wails offers a different approach: it provides the ability to wrap both Go code and a web frontend into a single binary. Tools are provided to make this easy for you by handling project creation, compilation and bundling. All you have to do is get creative!
-
-## Features
-
- Use standard Go libraries/frameworks for the backend
- Use any frontend technology to build your UI
- Expose Go methods/functions to the frontend via a single bind command
- Uses native rendering engines - no embedded browser
- Shared events system
- Native file dialogs
- Powerful cli tool
- Multiplatform
-
-## Project Status
-
-Wails is currently in Beta. Please make sure you read the [Project Status](https://wails.app/project_status.html) if you are interested in using this project.
-
-## Installation
-
-Wails uses cgo to bind to the native rendering engines so a number of platform dependent libraries are needed as well as an installation of Go. The basic requirements are:
-
- Go 1.12
- npm
-
-### MacOS
-
-Make sure you have the xcode command line tools installed. This can be done by running:
-
-`xcode-select --install`
-
-### Linux
-
-#### Ubuntu 18.04
-
-`sudo apt install pkg-config build-essential libgtk-3-dev libwebkit2gtk-4.0-dev`
-
-#### Arch Linux
-
-`sudo pacman -S webkit2gtk gtk3`
-
-#### Red Hat Based Distros
-
-`sudo yum install webkit2gtk-devel gtk3-devel`
-
-Note: If you have successfully installed these dependencies on a different flavour of Linux, please consider submitting a PR.
-
-### Windows
-
-Windows requires gcc and related tooling. The recommended download is from [http://tdm-gcc.tdragon.net/download](http://tdm-gcc.tdragon.net/download). Once this is installed, you are good to go.
-
-## Installation
-
-Installation is as simple as running the following command:
-
-<pre style='color:white'>
-go get github.com/wailsapp/wails/cmd/wails
-</pre>
-
-## Next Steps
-
-It is recommended at this stage to read the comprehensive documentation at [https://wails.app](https://wails.app).
-
-## FAQ
-
- * Is this an alternative to Electron?
-
-   Depends on your requirements. It's designed to make it easy for Go programmers to make lightweight desktop applications or add a frontend to their existing applications. Whilst Wails does not currently offer hooks into native elements such as menus, this may change in the future.
-
- * Who is this project aimed at?
-
-   Go programmers who want to bundle an HTML/JS/CSS frontend with their applications, without resorting to creating a server and opening a browser to view it.
-
- * What's with the name?
-
-   When I saw WebView, I thought "What I really want is tooling around building a WebView app, a bit like Rails is to Ruby". So initially it was a play on words (Webview on Rails). It just so happened to also be a homophone of the English name for the [Country](https://en.wikipedia.org/wiki/Wales) I am from. So it stuck.
-
-## Shoulders of Giants
-
-Without the following people, this project would never have existed:
-
-  * [Dustin Krysak](https://wiki.ubuntu.com/bashfulrobot) - His support and feedback has been immense. More patience than you can throw a stick at (Not long now Dustin!).
-  * [Serge Zaitsev](https://github.com/zserge) - Creator of [Webview](https://github.com/zserge/webview) which Wails uses for the windowing.
-
-And without [these people](CONTRIBUTORS.md), it wouldn't be what it is today.
-
-Special Mentions:
-
-  * [Bill Kennedy](https://twitter.com/goinggodotnet) - Go guru, encourager and all-round nice guy, whose infectious energy and inspiration powered me on when I had none left.
-  * [Mark Bates](https://github.com/markbates) - Creator of [Packr](https://github.com/gobuffalo/packr), inspiration for packing strategies which fed into some of the tooling.
-
-This project was mainly coded to the following albums:
-
-  * [Manic Street Preachers - Resistance Is Futile](https://open.spotify.com/album/1R2rsEUqXjIvAbzM0yHrxA)
-  * [Manic Street Preachers - This Is My Truth, Tell Me Yours](https://open.spotify.com/album/4VzCL9kjhgGQeKCiojK1YN)
-  * [The Midnight - Endless Summer](https://open.spotify.com/album/4Krg8zvprquh7TVn9OxZn8)
-  * [Gary Newman - Savage (Songs from a Broken World)](https://open.spotify.com/album/3kMfsD07Q32HRWKRrpcexr)
-  * [Steve Vai - Passion & Warfare](https://open.spotify.com/album/0oL0OhrE2rYVns4IGj8h2m)
-  * [Ben Howard - Every Kingdom](https://open.spotify.com/album/1nJsbWm3Yy2DW1KIc1OKle)
-  * [Ben Howard - Noonday Dream](https://open.spotify.com/album/6astw05cTiXEc2OvyByaPs)
-  * [Adwaith - Melyn](https://open.spotify.com/album/2vBE40Rp60tl7rNqIZjaXM)
-  * [Gwidaith Hen Fran - Cedors Hen Wrach](https://open.spotify.com/album/3v2hrfNGINPLuDP0YDTOjm)
-  * [Metallica - Metallica](https://open.spotify.com/album/2Kh43m04B1UkVcpcRa1Zug)
-  * [Bloc Party - Silent Alarm](https://open.spotify.com/album/6SsIdN05HQg2GwYLfXuzLB)
-  * [Maxthor - Another World](https://open.spotify.com/album/3tklE2Fgw1hCIUstIwPBJF)
-  * [Alun Tan Lan - Y Distawrwydd](https://open.spotify.com/album/0c32OywcLpdJCWWMC6vB8v)
-
+# Coming Soon
--- a/a_wails-packr.go
+++ b/a_wails-packr.go
--- a/app.go
+++ b/app.go
@@ -7,7 +7,7 @@ import (
 // -------------------------------- Compile time Flags ------------------------------

 // BuildMode indicates what mode we are in
-var BuildMode = cmd.BuildModeProd
+var BuildMode = "prod"

 // ----------------------------------------------------------------------------------

@@ -53,7 +53,7 @@ func CreateApp(optionalConfig ...*AppConfig) *App {
 	result.config = appconfig

 	// Set up the CLI if not in release mode
-	if BuildMode != cmd.BuildModeProd {
+	if BuildMode != "prod" {
 		result.cli = result.setupCli()
 	} else {
 		// Disable Inspector in release mode
@@ -65,16 +65,12 @@ func CreateApp(optionalConfig ...*AppConfig) *App {

 // Run the app
 func (a *App) Run() error {
-	if BuildMode != cmd.BuildModeProd {
+	if BuildMode != "prod" {
 		return a.cli.Run()
 	}

 	a.logLevel = "error"
-	err := a.start()
-	if err != nil {
-		a.log.Error(err.Error())
-	}
-	return err
+	return a.start()
 }

 func (a *App) start() error {
@@ -86,7 +82,7 @@ func (a *App) start() error {
 	a.log.Info("Starting")

 	// Check if we are to run in headless mode
-	if BuildMode == cmd.BuildModeBridge {
+	if BuildMode == "bridge" {
 		a.renderer = &Headless{}
 	}

@@ -118,7 +114,9 @@ func (a *App) start() error {
 	a.renderer.AddJSList(a.jsCache)

 	// Run the renderer
-	return a.renderer.Run()
+	a.renderer.Run()
+
+	return nil
 }

 // Bind allows the user to bind the given object
--- a/app_cli.go
+++ b/app_cli.go
@@ -1,6 +1,8 @@
 package wails

 import (
+	"fmt"
+
 	"github.com/wailsapp/wails/cmd"
 )

@@ -9,7 +11,6 @@ func (app *App) setupCli() *cmd.Cli {

 	// Create a new cli
 	result := cmd.NewCli(app.config.Title, "Debug build")
-	result.Version(cmd.Version)

 	// Setup cli to handle loglevel and headless flags
 	result.
@@ -20,6 +21,8 @@ func (app *App) setupCli() *cmd.Cli {
 	// Banner
 	result.PreRun(func(cli *cmd.Cli) error {
 		log := cmd.NewLogger()
+		log.PrintBanner()
+		fmt.Println()
 		log.YellowUnderline(app.config.Title + " - Debug Build")
 		return nil
 	})
--- a/app_config.go
+++ b/app_config.go
@@ -4,9 +4,11 @@ import (
 	"strings"

 	"github.com/dchest/htmlmin"
-	"github.com/leaanthony/mewn"
+	"github.com/gobuffalo/packr"
 )

+var assets = packr.NewBox("./assets/default")
+
 // AppConfig is the configuration structure used when creating a Wails App object
 type AppConfig struct {
 	Width, Height    int
@@ -41,7 +43,7 @@ func (a *AppConfig) merge(in *AppConfig) error {
 		a.HTML = strings.TrimSpace(inlineHTML)

 		// Deduce whether this is a full html page or a fragment
-		// The document is determined to be a fragment if an HTML
+		// The document is determined to be a fragment if an HMTL
 		// tag exists and is located before the first div tag
 		HTMLTagIndex := strings.Index(a.HTML, "<html")
 		DivTagIndex := strings.Index(a.HTML, "<div")
@@ -83,7 +85,7 @@ func newAppConfig(userConfig *AppConfig) (*AppConfig, error) {
 		Resizable: true,
 		Title:     "My Wails App",
 		Colour:    "#FFF", // White by default
-		HTML:      mewn.String("./wailsruntimeassets/default/default.html"),
+		HTML:      BoxString(&defaultAssets, "default.html"),
 	}

 	if userConfig != nil {
--- a/assets/default/default.html
+++ b/assets/default/default.html
@@ -0,0 +1 @@
+<div id="app"></div>
--- a/wailsruntimeassets/default/wails.css
+++ b/wailsruntimeassets/default/wails.css
--- a/wailsruntimeassets/wails.js
+++ b/wailsruntimeassets/wails.js
@@ -1,4 +1,5 @@
 // Wails runtime JS
+
 (function () {
 	window.wails = window.wails || {};
 	window.backend = {};
@@ -12,7 +13,6 @@
 		return window.crypto.getRandomValues(array)[0];
 	}

-
 	// LOLRandom
 	function basicRandom() {
 		return Math.random() * 9007199254740991;
@@ -32,9 +32,9 @@
 		// Don't xss yourself :-)
 		try {
 			new Function("var " + name);
-			return true;
+			return true
 		} catch (e) {
-			return false;
+			return false
 		}
 	}

@@ -57,7 +57,7 @@
 			elem.appendChild(document.createTextNode(css));
 		}
 		var head = document.head || document.getElementsByTagName('head')[0];
-		head.appendChild(elem);
+		head.appendChild(elem)
 	}

 	/************************* Bindings *************************/
@@ -67,27 +67,25 @@
 	// Creates the path given in the bindings path
 	function addBindingPath(pathSections) {
 		// Start at the base path
-		var currentPath = bindingsBasePath;
+		var currentPath = bindingsBasePath
 		// for each section of the given path
-		for (var sectionIndex in pathSections) {
-
-			var section = pathSections[sectionIndex];
+		for (var section of pathSections) {

 			// Is section a valid javascript identifier?
 			if (!isValidIdentifier(section)) {
-				var errMessage = section + " is not a valid javascript identifier.";
-				var err = new Error(errMessage);
-				return [null, err];
+				var errMessage = section + " is not a valid javascript identifier."
+				var err = new Error(errMessage)
+				return [null, err]
 			}

 			// Add if doesn't exist
 			if (!currentPath[section]) {
-				currentPath[section] = {};
+				currentPath[section] = {}
 			}
 			// update current path to new path
-			currentPath = currentPath[section];
+			currentPath = currentPath[section]
 		}
-		return [currentPath, null];
+		return [currentPath, null]
 	}

 	function newBinding(bindingName) {
@@ -98,17 +96,15 @@
 		// Get the actual function/method call name
 		var callName = bindingSections.pop();

-		var pathToBinding;
-		var err;
+		let pathToBinding;
+		let err;

 		// Add path to binding
-		var bs = addBindingPath(bindingSections);
-		var pathToBinding = bs[0];
-		var err = bs[1];
+		[pathToBinding, err] = addBindingPath(bindingSections)

 		if (err != null) {
 			// We need to return an error
-			return err;
+			return err
 		}

 		// Add binding call
@@ -119,7 +115,7 @@

 			// Actual function
 			function dynamic() {
-				var args = [].slice.call(arguments);
+				var args = [].slice.call(arguments)
 				return call(bindingName, args, timeout);
 			}

@@ -164,12 +160,12 @@
 			var callbackID;
 			do {
 				callbackID = bindingName + "-" + randomFunc();
-			} while (callbacks[callbackID]);
+			} while (callbacks[callbackID])

 			// Set timeout
 			if (timeout > 0) {
 				var timeoutHandle = setTimeout(function () {
-					reject(Error("Call to " + bindingName + " timed out. Request ID: " + callbackID));
+					reject(Error("Call to " + bindingName + " timed out. Request ID: " + callbackID))
 				}, timeout);
 			}

@@ -180,7 +176,7 @@
 				resolve: resolve
 			}
 			try {
-				var payloaddata = JSON.stringify(data);
+				var payloaddata = JSON.stringify(data)
 				// Create the message
 				message = {
 					type: "call",
@@ -192,42 +188,39 @@
 				}

 				// Make the call
-				var payload = JSON.stringify(message);
+				var payload = JSON.stringify(message)
 				external.invoke(payload);
 			} catch (e) {
-				console.error(e);
+				console.error(e)
 			}
 		})
 	}

+
 	// Called by the backend to return data to a previously called
 	// binding invocation
 	function callback(incomingMessage) {
-
-		// Decode the message - Credit: https://stackoverflow.com/a/13865680
-		incomingMessage = decodeURIComponent(incomingMessage.replace(/\s+/g, '').replace(/[0-9a-f]{2}/g, '%$&'));
-
 		// Parse the message
-		var message;
+		var message
 		try {
-			message = JSON.parse(incomingMessage);
+			message = JSON.parse(incomingMessage)
 		} catch (e) {
-			wails.log.debug("Invalid JSON passed to callback: " + e.message);
-			wails.log.debug("Message: " + incomingMessage);
-			return;
-		}
-		callbackID = message.callbackid;
-		callbackData = callbacks[callbackID];
-		if (!callbackData) {
-			console.error("Callback '" + callbackID + "' not registed!!!");
+			wails.log.debug("Invalid JSON passed to callback: " + e.message)
+			wails.log.debug("Message: " + incomingMessage)
 			return
 		}
-		clearTimeout(callbackData.timeoutHandle);
-		delete callbacks[callbackID];
-		if (message.error) {
-			return callbackData.reject(message.error);
+		callbackID = message.callbackid
+		callbackData = callbacks[callbackID]
+		if (!callbackData) {
+			console.error("Callback '" + callbackID + "' not registed!!!")
+			return
 		}
-		return callbackData.resolve(message.data);
+		clearTimeout(callbackData.timeoutHandle)
+		delete callbacks[callbackID]
+		if (message.error) {
+			return callbackData.reject(message.error)
+		}
+		return callbackData.resolve(message.data)
 	}

 	/************************************************************/
@@ -243,12 +236,11 @@
 		eventListeners[eventName].push(callback);
 	}

-
 	// notify informs frontend listeners that an event was emitted with the given data
 	function notify(eventName, data) {
 		if (eventListeners[eventName]) {
-			eventListeners[eventName].forEach(function (element) {
-				var parsedData = [];
+			eventListeners[eventName].forEach(element => {
+				var parsedData = []
 				// Parse data if we have it
 				if (data) {
 					try {
@@ -282,7 +274,6 @@
 	// Events calls
 	window.wails.events = { emit: emit, on: on };

-
 	/************************************************************/

 	/************************* Logging **************************/
@@ -338,7 +329,6 @@
 		addScript: addScript,
 	}

-
 	/************************************************************/

 	// Notify backend that the runtime has finished loading
--- a/wailsruntimeassets/bridge/wailsbridge.js
+++ b/wailsruntimeassets/bridge/wailsbridge.js
@@ -29,8 +29,7 @@ window.wailsbridge = {
    '<div class="wails-reconnect-overlay"><div class="wails-reconnect-overlay-content"><div class="wails-reconnect-overlay-title">Wails Bridge</div><br><div class="wails-reconnect-overlay-loadingspinner"></div><br><div id="wails-reconnect-overlay-message">Waiting for backend</div></div></div>',
  overlayCSS:
    ".wails-reconnect-overlay{position:fixed;top:0;left:0;width:100%;height:100%;background:rgba(0,0,0,.6);font-family:sans-serif;display:none;z-index:999999}.wails-reconnect-overlay-content{padding:20px 30px;text-align:center;width:20em;position:relative;height:14em;border-radius:1em;margin:5% auto 0;background-color:#fff;box-shadow:1px 1px 20px 3px;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC8AAAAuCAMAAACPpbA7AAAAqFBMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAQAAAAAAAAEBAQAAAAAAAAAAAAEBAQEBAQDAwMBAQEAAAABAQEAAAAAAAAAAAABAQEAAAAAAAACAgICAgIBAQEAAAAAAAAAAAAAAAAAAAAAAAABAQEAAAACAgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFBQWKCj6oAAAAN3RSTlMALiIqDhkGBAswJjP0GxP6NR4W9/ztjRDMhWU50G9g5eHXvbZ9XEI9xZTcqZl2aldKo55QwoCvZUgzhAAAAs9JREFUSMeNleeWqjAUhU0BCaH3Itiw9zKT93+zG02QK1hm/5HF+jzZJ6fQe6cyXE+jg9X7o9wxuylIIf4Tv2V3+bOrEXnf8dwQ/KQIGDN2/S+4OmVCVXL/ScBnfibxURqIByP/hONE8r8T+bDMlQ98KSl7Y8hzjpS8v1qtDh8u5f8KQpGpfnPPhqG8JeogN37Hq9eaN2xRhIwAaGnvws8F1ShxqK5ob2twYi1FAMD4rXsYtnC/JEiRbl4cUrCWhnMCLRFemXezXbb59QK4WASOsm6n2W1+4CBT2JmtzQ6fsrbGubR/NFbd2g5Y179+5w/GEHaKsHjYCet7CgrXU3txarNC7YxOVJtIj4/ERzMdZfzc31hp+8cD6eGILgarZY9uZ12hAs03vfBD9C171gS5Omz7OcvxALQIn4u8RRBBBcsi9WW2woO9ipLgfzpYlggg3ZRdROUC8KT7QLqq3W9KB5BbdFVg4929kdwp6+qaZnMCCNBdj+NyN1W885Ry/AL3D4AQbsVV4noCiM/C83kyYq80XlDAYQtralOiDzoRAHlotWl8q2tjvYlOgcg1A8jEApZa+C06TBdAz2Qv0wu11I/zZOyJQ6EwGez2P2b8PIQr1hwwnAZsAxwA4UAYOyXUxM/xp6tHAn4GUmPGM9R28oVxgC0e/zQJJI6DyhyZ1r7uzRQhpcW7x7vTaWSzKSG6aep77kroTEl3U81uSVaUTtgEINfC8epx+Q4F9SpplHG84Ek6m4RAq9/TLkOBrxyeuddZhHvGIp1XXfFy3Z3vtwNblKGiDn+J+92vwwABHghj7HnzlS1H5kB49AZvdGCFgiBPq69qfXPr3y++yilF0ON4R8eR7spAsLpZ95NqAW5tab1c4vkZm6aleajchMwYTdILQQTwE2OV411ZM9WztDjPql12caBi6gDpUKmDd4U1XNdQxZ4LIXQ5/Tr4P7I9tYcFrDK3AAAAAElFTkSuQmCC);background-repeat:no-repeat;background-position:center}.wails-reconnect-overlay-title{font-size:2em}.wails-reconnect-overlay-message{font-size:1.3em}.wails-reconnect-overlay-loadingspinner{pointer-events:none;width:2.5em;height:2.5em;border:.4em solid transparent;border-color:#3E67EC #eee #eee;border-radius:50%;animation:loadingspin 1s linear infinite;margin:auto;padding:2.5em}@keyframes loadingspin{100%{transform:rotate(360deg)}}",
-  log: function (message) {
-    // eslint-disable-next-line
+  log: function(message) {
    console.log(
      "%c wails bridge %c " + message + " ",
      "background: #aa0000; color: #fff; border-radius: 3px 0px 0px 3px; padding: 1px; font-size: 0.7rem",
@@ -102,7 +101,7 @@ function startBridge() {

  // Bridge external.invoke
  window.external = {
-    invoke: function (msg) {
+    invoke: function(msg) {
      window.wailsbridge.websocket.send(msg);
    }
  };
@@ -111,7 +110,6 @@ function startBridge() {
  // Removes it if second parameter is true.
  function addScript(script, remove) {
    var s = document.createElement("script");
-    s.setAttribute('type', 'text/javascript');
    s.textContent = script;
    document.head.appendChild(s);

@@ -143,11 +141,11 @@ function startBridge() {
  // Try to connect to the backend every 300ms (default value).
  // Change this value in the main wailsbridge object.
  function connect() {
-    window.wailsbridge.connectTimer = setInterval(function () {
+    window.wailsbridge.connectTimer = setInterval(function() {
      if (window.wailsbridge.websocket == null) {
        window.wailsbridge.websocket = new WebSocket(window.wailsbridge.wsURL);
        window.wailsbridge.websocket.onopen = handleConnect;
-        window.wailsbridge.websocket.onerror = function (e) {
+        window.wailsbridge.websocket.onerror = function(e) {
          e.stopImmediatePropagation();
          e.stopPropagation();
          e.preventDefault();
@@ -160,6 +158,7 @@ function startBridge() {

  function handleMessage(message) {
    // As a bridge we ignore js and css injections
+
    switch (message.data[0]) {
      // Wails library - inject!
      case "w":
@@ -167,7 +166,7 @@ function startBridge() {

        // Now wails runtime is loaded, wails for the ready event
        // and callback to the main app
-        window.wails.events.on("wails:loaded", function () {
+        window.wails.events.on("wails:loaded", function() {
          window.wailsbridge.log("Wails Ready");
          if (window.wailsbridge.callback) {
            window.wailsbridge.log("Notifying application");
@@ -189,6 +188,7 @@ function startBridge() {
      // Call back
      case "c":
        var callbackData = message.data.slice(1);
+        log("Callback = " + callbackData);
        window.wails._.callback(callbackData);
        break;
    }
@@ -204,7 +204,7 @@ function startBridge() {
 export default {
  // The main function
  // Passes the main Wails object to the callback if given.
-  Start: function (callback) {
+  Start: function(callback) {
    // Save the callback
    window.wailsbridge.callback = callback;

--- a/wailsruntimeassets/bridge/wailsbridge.prod.js
+++ b/wailsruntimeassets/bridge/wailsbridge.prod.js
@@ -11,7 +11,7 @@ export default {
  // Passes the main Wails object to the callback if given.
  Start: function(callback) {
    if (callback) {
-      window.wails.events.on("wails:ready", callback);
+      callback();
    }
  }
 };
--- a/binding_function.go
+++ b/binding_function.go
@@ -153,11 +153,8 @@ func (b *boundFunction) setInputValue(index int, typ reflect.Type, val interface
 		}
 	}()

-	// Translate javascript null values
-	if val == nil {
-		result = reflect.Zero(typ)
-	} else {
-		result = reflect.ValueOf(val).Convert(typ)
-	}
+	// Do the conversion
+	result = reflect.ValueOf(val).Convert(typ)
+
 	return result, err
 }
--- a/cmd/build.go
+++ b/cmd/build.go
@@ -1,10 +0,0 @@
-package cmd
-
-const (
-	// BuildModeProd indicates we are building for prod mode
-	BuildModeProd = "prod"
-	// BuildModeDebug indicates we are building for debug mode
-	BuildModeDebug = "debug"
-	// BuildModeBridge indicates we are building for bridge mode
-	BuildModeBridge = "bridge"
-)
--- a/cmd/cli.go
+++ b/cmd/cli.go
@@ -96,7 +96,6 @@ type Command struct {
 	flagCount         int
 	log               *Logger
 	helpFlag          bool
-	hidden            bool
 }

 // NewCommand creates a new Command
@@ -107,7 +106,6 @@ func NewCommand(name string, description string, app *Cli, parentCommandPath str
 		SubCommandsMap:   make(map[string]*Command),
 		App:              app,
 		log:              NewLogger(),
-		hidden:           false,
 	}

 	// Set up command path
@@ -196,8 +194,10 @@ func (c *Command) Action(callback Action) *Command {

 // PrintHelp - Output the help text for this command
 func (c *Command) PrintHelp() {
-	c.log.PrintBanner()
-
+	versionString := c.AppVersion
+	if versionString != "" {
+		versionString = " " + versionString
+	}
 	commandTitle := c.CommandPath
 	if c.Shortdescription != "" {
 		commandTitle += " - " + c.Shortdescription
@@ -211,12 +211,10 @@ func (c *Command) PrintHelp() {
 		fmt.Println(c.Longdescription + "\n")
 	}
 	if len(c.SubCommands) > 0 {
+		fmt.Println("")
 		c.log.White("Available commands:")
 		fmt.Println("")
 		for _, subcommand := range c.SubCommands {
-			if subcommand.isHidden() {
-				continue
-			}
 			spacer := strings.Repeat(" ", 3+c.longestSubcommand-len(subcommand.Name))
 			isDefault := ""
 			if subcommand.isDefaultCommand() {
@@ -224,9 +222,9 @@ func (c *Command) PrintHelp() {
 			}
 			fmt.Printf("   %s%s%s %s\n", subcommand.Name, spacer, subcommand.Shortdescription, isDefault)
 		}
-		fmt.Println("")
 	}
 	if c.flagCount > 0 {
+		fmt.Println("")
 		c.log.White("Flags:")
 		fmt.Println()
 		c.Flags.SetOutput(os.Stdout)
@@ -242,16 +240,6 @@ func (c *Command) isDefaultCommand() bool {
 	return c.App.defaultCommand == c
 }

-// isHidden returns true if the command is a hidden command
-func (c *Command) isHidden() bool {
-	return c.hidden
-}
-
-// Hidden hides the command from the Help system
-func (c *Command) Hidden() {
-	c.hidden = true
-}
-
 // Command - Defines a subcommand
 func (c *Command) Command(name, description string) *Command {
 	result := NewCommand(name, description, c.App, c.CommandPath)
--- a/cmd/fs.go
+++ b/cmd/fs.go
@@ -1,19 +1,13 @@
 package cmd

 import (
-	"bytes"
 	"crypto/md5"
-	"encoding/json"
 	"fmt"
 	"io"
 	"io/ioutil"
 	"log"
 	"os"
-	"path"
 	"path/filepath"
-	"runtime"
-
-	"github.com/leaanthony/slicer"
 )

 // FSHelper - Wrapper struct for File System utility commands
@@ -47,14 +41,6 @@ func (fs *FSHelper) FileExists(path string) bool {
 	return fi.Mode().IsRegular()
 }

-// CreateFile creates a file at the given filename location with the contents
-// set to the given data. It will create intermediary directories if needed.
-func (fs *FSHelper) CreateFile(filename string, data []byte) error {
-	// Ensure directory exists
-	fs.MkDirs(filepath.Dir(filename))
-	return ioutil.WriteFile(filename, data, 0644)
-}
-
 // MkDirs creates the given nested directories.
 // Returns error on failure
 func (fs *FSHelper) MkDirs(fullPath string, mode ...os.FileMode) error {
@@ -94,49 +80,11 @@ func (fs *FSHelper) Cwd() string {
 	return cwd
 }

-// RemoveFile removes the given filename
-func (fs *FSHelper) RemoveFile(filename string) error {
-	return os.Remove(filename)
-}
-
-// RemoveFiles removes the given filenames
-func (fs *FSHelper) RemoveFiles(files []string) error {
-	for _, filename := range files {
-		err := os.Remove(filename)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// Dir holds information about a directory
-type Dir struct {
-	localPath string
-	fullPath  string
-}
-
-// Directory creates a new Dir struct with the given directory path
-func (fs *FSHelper) Directory(dir string) (*Dir, error) {
-	fullPath, err := filepath.Abs(dir)
-	return &Dir{fullPath: fullPath}, err
-}
-
-// LocalDir creates a new Dir struct based on a path relative to the caller
-func (fs *FSHelper) LocalDir(dir string) (*Dir, error) {
-	_, filename, _, _ := runtime.Caller(1)
-	fullPath, err := filepath.Abs(filepath.Join(path.Dir(filename), dir))
-	return &Dir{
-		localPath: dir,
-		fullPath:  fullPath,
-	}, err
-}
-
 // GetSubdirs will return a list of FQPs to subdirectories in the given directory
-func (d *Dir) GetSubdirs() (map[string]string, error) {
+func (fs *FSHelper) GetSubdirs(dir string) (map[string]string, error) {

 	// Read in the directory information
-	fileInfo, err := ioutil.ReadDir(d.fullPath)
+	fileInfo, err := ioutil.ReadDir(dir)
 	if err != nil {
 		return nil, err
 	}
@@ -148,65 +96,25 @@ func (d *Dir) GetSubdirs() (map[string]string, error) {
 	// map["directoryName"] = "path/to/directoryName"
 	for _, file := range fileInfo {
 		if file.IsDir() {
-			subdirs[file.Name()] = filepath.Join(d.fullPath, file.Name())
+			subdirs[file.Name()] = filepath.Join(dir, file.Name())
 		}
 	}
 	return subdirs, nil
 }

-// GetAllFilenames returns all filename in and below this directory
-func (d *Dir) GetAllFilenames() (*slicer.StringSlicer, error) {
-	result := slicer.String()
-	err := filepath.Walk(d.fullPath, func(dir string, info os.FileInfo, err error) error {
-		if dir == d.fullPath {
-			return nil
-		}
-		if err != nil {
-			return err
-		}
-
-		// Don't copy template metadata
-		result.Add(dir)
-
-		return nil
-	})
-	return result, err
-}
-
 // MkDir creates the given directory.
 // Returns error on failure
 func (fs *FSHelper) MkDir(dir string) error {
 	return os.Mkdir(dir, 0700)
 }

-// SaveAsJSON saves the JSON representation of the given data to the given filename
-func (fs *FSHelper) SaveAsJSON(data interface{}, filename string) error {
-
-	var buf bytes.Buffer
-	e := json.NewEncoder(&buf)
-	e.SetEscapeHTML(false)
-	e.SetIndent("", "  ")
-	e.Encode(data)
-
-	err := ioutil.WriteFile(filename, buf.Bytes(), 0755)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
 // LoadAsString will attempt to load the given file and return
 // its contents as a string
 func (fs *FSHelper) LoadAsString(filename string) (string, error) {
-	bytes, err := fs.LoadAsBytes(filename)
+	bytes, err := ioutil.ReadFile(filename)
 	return string(bytes), err
 }

-// LoadAsBytes returns the contents of the file as a byte slice
-func (fs *FSHelper) LoadAsBytes(filename string) ([]byte, error) {
-	return ioutil.ReadFile(filename)
-}
-
 // FileMD5 returns the md5sum of the given file
 func (fs *FSHelper) FileMD5(filename string) (string, error) {
 	f, err := os.Open(filename)
--- a/cmd/github.go
+++ b/cmd/github.go
@@ -1,108 +0,0 @@
-package cmd
-
-import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"sort"
-)
-
-// GitHubHelper is a utility class for interacting with GitHub
-type GitHubHelper struct {
-}
-
-// NewGitHubHelper returns a new GitHub Helper
-func NewGitHubHelper() *GitHubHelper {
-	return &GitHubHelper{}
-}
-
-// GetVersionTags gets the list of tags on the Wails repo
-// It retuns a list of sorted tags in descending order
-func (g *GitHubHelper) GetVersionTags() ([]*SemanticVersion, error) {
-
-	result := []*SemanticVersion{}
-	var err error
-
-	resp, err := http.Get("https://api.github.com/repos/wailsapp/wails/tags")
-	if err != nil {
-		return result, err
-	}
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return result, err
-	}
-
-	data := []map[string]interface{}{}
-	err = json.Unmarshal(body, &data)
-	if err != nil {
-		return result, err
-	}
-
-	// Convert tag data to Version structs
-	for _, tag := range data {
-		version := tag["name"].(string)
-		semver, err := NewSemanticVersion(version)
-		if err != nil {
-			return result, err
-		}
-		result = append(result, semver)
-	}
-
-	// Reverse Sort
-	sort.Sort(sort.Reverse(SemverCollection(result)))
-
-	return result, err
-}
-
-// GetLatestStableRelease gets the latest stable release on GitHub
-func (g *GitHubHelper) GetLatestStableRelease() (result *SemanticVersion, err error) {
-
-	tags, err := g.GetVersionTags()
-	if err != nil {
-		return nil, err
-	}
-
-	for _, tag := range tags {
-		if tag.IsRelease() {
-			return tag, nil
-		}
-	}
-
-	return nil, fmt.Errorf("no release tag found")
-}
-
-// GetLatestPreRelease gets the latest prerelease on GitHub
-func (g *GitHubHelper) GetLatestPreRelease() (result *SemanticVersion, err error) {
-
-	tags, err := g.GetVersionTags()
-	if err != nil {
-		return nil, err
-	}
-
-	for _, tag := range tags {
-		if tag.IsPreRelease() {
-			return tag, nil
-		}
-	}
-
-	return nil, fmt.Errorf("no prerelease tag found")
-}
-
-// IsValidTag returns true if the given string is a valid tag
-func (g *GitHubHelper) IsValidTag(tagVersion string) (bool, error) {
-	if tagVersion[0] == 'v' {
-		tagVersion = tagVersion[1:]
-	}
-	tags, err := g.GetVersionTags()
-	if err != nil {
-		return false, err
-	}
-
-	for _, tag := range tags {
-		if tag.String() == tagVersion {
-			return true, nil
-		}
-	}
-	return false, nil
-}
--- a/cmd/helpers.go
+++ b/cmd/helpers.go
@@ -5,17 +5,15 @@ import (
 	"io/ioutil"
 	"os"
 	"os/exec"
+	"path"
 	"path/filepath"
 	"runtime"
 	"time"

-	mewn "github.com/leaanthony/mewn"
 	"github.com/leaanthony/slicer"
 	"github.com/leaanthony/spinner"
 )

-var fs = NewFSHelper()
-
 // ValidateFrontendConfig checks if the frontend config is valid
 func ValidateFrontendConfig(projectOptions *ProjectOptions) error {
 	if projectOptions.FrontEnd.Dir == "" {
@@ -36,7 +34,7 @@ func ValidateFrontendConfig(projectOptions *ProjectOptions) error {

 // InstallGoDependencies will run go get in the current directory
 func InstallGoDependencies() error {
-	depSpinner := spinner.New("Ensuring Dependencies are up to date...")
+	depSpinner := spinner.New("Installing Dependencies...")
 	depSpinner.SetSpinSpeed(50)
 	depSpinner.Start()
 	err := NewProgramHelper().RunCommand("go get")
@@ -49,26 +47,9 @@ func InstallGoDependencies() error {
 }

 // BuildApplication will attempt to build the project based on the given inputs
-func BuildApplication(binaryName string, forceRebuild bool, buildMode string, packageApp bool, projectOptions *ProjectOptions) error {
-
-	// Generate Windows assets if needed
-	if runtime.GOOS == "windows" {
-		cleanUp := !packageApp
-		err := NewPackageHelper().PackageWindows(projectOptions, cleanUp)
-		if err != nil {
-			return err
-		}
-	}
-
-	// Check Mewn is installed
-	err := CheckMewn()
-	if err != nil {
-		return err
-	}
-
+func BuildApplication(binaryName string, forceRebuild bool, buildMode string) error {
 	compileMessage := "Packing + Compiling project"
-
-	if buildMode == BuildModeDebug {
+	if buildMode == "debug" {
 		compileMessage += " (Debug Mode)"
 	}

@@ -77,14 +58,7 @@ func BuildApplication(binaryName string, forceRebuild bool, buildMode string, pa
 	packSpinner.Start()

 	buildCommand := slicer.String()
-	buildCommand.Add("mewn")
-
-	if buildMode == BuildModeBridge {
-		// Ignore errors
-		buildCommand.Add("-i")
-	}
-
-	buildCommand.Add("build")
+	buildCommand.AddSlice([]string{"packr", "build"})

 	if binaryName != "" {
 		buildCommand.Add("-o")
@@ -96,50 +70,20 @@ func BuildApplication(binaryName string, forceRebuild bool, buildMode string, pa
 		buildCommand.Add("-a")
 	}

-	// Setup ld flags
-	ldflags := "-w -s "
-	if buildMode == BuildModeDebug {
-		ldflags = ""
-	}
-
-	// Add windows flags
-	if runtime.GOOS == "windows" {
-		ldflags += "-H windowsgui "
-	}
-
-	ldflags += "-X github.com/wailsapp/wails.BuildMode=" + buildMode
-
-	buildCommand.AddSlice([]string{"-ldflags", ldflags})
-	err = NewProgramHelper().RunCommandArray(buildCommand.AsSlice())
+	buildCommand.AddSlice([]string{"-ldflags", "-X github.com/wailsapp/wails.BuildMode=" + buildMode})
+	err := NewProgramHelper().RunCommandArray(buildCommand.AsSlice())
 	if err != nil {
 		packSpinner.Error()
 		return err
 	}
 	packSpinner.Success()
-
-	// packageApp
-	if packageApp {
-		err = PackageApplication(projectOptions)
-		if err != nil {
-			return err
-		}
-	}
-
 	return nil
 }

-// PackageApplication will attempt to package the application in a platform dependent way
+// PackageApplication will attempt to package the application in a pltform dependent way
 func PackageApplication(projectOptions *ProjectOptions) error {
 	// Package app
-	message := "Generating .app"
-	if runtime.GOOS == "windows" {
-		err := CheckWindres()
-		if err != nil {
-			return err
-		}
-		message = "Generating resource bundle"
-	}
-	packageSpinner := spinner.New(message)
+	packageSpinner := spinner.New("Packaging Application")
 	packageSpinner.SetSpinSpeed(50)
 	packageSpinner.Start()
 	err := NewPackageHelper().Package(projectOptions)
@@ -165,14 +109,14 @@ func BuildFrontend(buildCommand string) error {
 	return nil
 }

-// CheckMewn checks if mewn is installed and if not, attempts to fetch it
-func CheckMewn() (err error) {
+// CheckPackr checks if packr is installed and if not, attempts to fetch it
+func CheckPackr() (err error) {
 	programHelper := NewProgramHelper()
-	if !programHelper.IsInstalled("mewn") {
+	if !programHelper.IsInstalled("packr") {
 		buildSpinner := spinner.New()
 		buildSpinner.SetSpinSpeed(50)
-		buildSpinner.Start("Installing Mewn asset packer...")
-		err := programHelper.InstallGoPackage("github.com/leaanthony/mewn/cmd/mewn")
+		buildSpinner.Start("Installing packr...")
+		err := programHelper.InstallGoPackage("github.com/gobuffalo/packr/...")
 		if err != nil {
 			buildSpinner.Error()
 			return err
@@ -182,20 +126,8 @@ func CheckMewn() (err error) {
 	return nil
 }

-// CheckWindres checks if Windres is installed and if not, aborts
-func CheckWindres() (err error) {
-	if runtime.GOOS != "windows" {
-		return nil
-	}
-	programHelper := NewProgramHelper()
-	if !programHelper.IsInstalled("windres") {
-		return fmt.Errorf("windres not installed. It comes by default with mingw. Ensure you have installed mingw correctly")
-	}
-	return nil
-}
-
 // InstallFrontendDeps attempts to install the frontend dependencies based on the given options
-func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forceRebuild bool, caller string) error {
+func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forceRebuild bool) error {

 	// Install frontend deps
 	err := os.Chdir(projectOptions.FrontEnd.Dir)
@@ -204,7 +136,7 @@ func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forc
 	}

 	// Check if frontend deps have been updated
-	feSpinner := spinner.New("Ensuring frontend dependencies are up to date (This may take a while)")
+	feSpinner := spinner.New("Installing frontend dependencies (This may take a while)...")
 	feSpinner.SetSpinSpeed(50)
 	feSpinner.Start()

@@ -249,8 +181,13 @@ func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forc
 		ioutil.WriteFile(md5sumFile, []byte(packageJSONMD5), 0644)
 	}

-	// Install the bridge library
-	err = InstallBridge(caller, projectDir, projectOptions)
+	bridgeFile := "wailsbridge.prod.js"
+
+	// Copy bridge to project
+	_, filename, _, _ := runtime.Caller(1)
+	bridgeFileSource := filepath.Join(path.Dir(filename), "..", "..", "assets", "default", bridgeFile)
+	bridgeFileTarget := filepath.Join(projectDir, projectOptions.FrontEnd.Dir, projectOptions.FrontEnd.Bridge, "wailsbridge.js")
+	err = fs.CopyFile(bridgeFileSource, bridgeFileTarget)
 	if err != nil {
 		return err
 	}
@@ -263,24 +200,6 @@ func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forc
 	return nil
 }

-// InstallBridge installs the relevant bridge javascript library
-func InstallBridge(caller string, projectDir string, projectOptions *ProjectOptions) error {
-	bridgeFile := "wailsbridge.prod.js"
-	if caller == "serve" {
-		bridgeFile = "wailsbridge.js"
-	}
-
-	// Copy bridge to project
-	bridgeAssets := mewn.Group("../wailsruntimeassets/bridge/")
-	bridgeFileData := bridgeAssets.Bytes(bridgeFile)
-	bridgeFileTarget := filepath.Join(projectDir, projectOptions.FrontEnd.Dir, projectOptions.FrontEnd.Bridge, "wailsbridge.js")
-	err := fs.CreateFile(bridgeFileTarget, bridgeFileData)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
 // ServeProject attempts to serve up the current project so that it may be connected to
 // via the Wails bridge
 func ServeProject(projectOptions *ProjectOptions, logger *Logger) error {
--- a/cmd/linux.go
+++ b/cmd/linux.go
@@ -2,9 +2,6 @@ package cmd

 import (
 	"fmt"
-	"io/ioutil"
-	"os"
-	"regexp"
 	"strings"
 )

@@ -13,13 +10,9 @@ type LinuxDistribution int

 const (
 	// Unknown is the catch-all distro
-	Unknown LinuxDistribution = iota
+	Unknown LinuxDistribution = 0
 	// Ubuntu distribution
-	Ubuntu
-	// Arch linux distribution
-	Arch
-	// RedHat linux distribution
-	RedHat
+	Ubuntu  LinuxDistribution = 1
 )

 // DistroInfo contains all the information relating to a linux distribution
@@ -56,8 +49,6 @@ func GetLinuxDistroInfo() *DistroInfo {
 					switch value {
 					case "Ubuntu":
 						result.Distribution = Ubuntu
-					case "Arch", "ManjaroLinux":
-						result.Distribution = Arch
 					}
 				case "Description":
 					result.Description = value
@@ -69,52 +60,20 @@ func GetLinuxDistroInfo() *DistroInfo {
 				}
 			}
 		}
-		// check if /etc/os-release exists
-	} else if _, err := os.Stat("/etc/os-release"); !os.IsNotExist(err) {
-		// read /etc/os-release
-		osRelease, _ := ioutil.ReadFile("/etc/os-release")
-		// compile a regex to find NAME=distro
-		re := regexp.MustCompile(`^NAME=(.*)\n`)
-		// extract the distro name
-		osName := string(re.FindSubmatch(osRelease)[1])
-		// Check distro name against list of RedHat distros
-		if osName == "Fedora" || osName == "CentOS" {
-			//if it matches set result.Distribution to RedHat
-			result.Distribution = RedHat
-		}
+
 	}
 	return result
 }

 // DpkgInstalled uses dpkg to see if a package is installed
 func DpkgInstalled(packageName string) (bool, error) {
+	result := false
 	program := NewProgramHelper()
 	dpkg := program.FindProgram("dpkg")
 	if dpkg == nil {
 		return false, fmt.Errorf("cannot check dependencies: dpkg not found")
 	}
 	_, _, exitCode, _ := dpkg.Run("-L", packageName)
-	return exitCode == 0, nil
-}
-
-// PacmanInstalled uses pacman to see if a package is installed.
-func PacmanInstalled(packageName string) (bool, error) {
-	program := NewProgramHelper()
-	pacman := program.FindProgram("pacman")
-	if pacman == nil {
-		return false, fmt.Errorf("cannot check dependencies: pacman not found")
-	}
-	_, _, exitCode, _ := pacman.Run("-Qs", packageName)
-	return exitCode == 0, nil
-}
-
-// RpmInstalled uses rpm to see if a package is installed
-func RpmInstalled(packageName string) (bool, error) {
-	program := NewProgramHelper()
-	rpm := program.FindProgram("rpm")
-	if rpm == nil {
-		return false, fmt.Errorf("cannot check dependencies: rpm not found")
-	}
-	_, _, exitCode, _ := rpm.Run("--query", packageName)
-	return exitCode == 0, nil
+	result = exitCode == 0
+	return result, nil
 }
--- a/cmd/log.go
+++ b/cmd/log.go
@@ -17,7 +17,7 @@ func NewLogger() *Logger {
 	return &Logger{errorOnly: false}
 }

-// SetErrorOnly ensures that only errors are logged out
+// SetErrorOnly onyl outputs messages if they are an error
 func (l *Logger) SetErrorOnly(errorOnly bool) {
 	l.errorOnly = errorOnly
 }
@@ -100,17 +100,6 @@ func (l *Logger) Error(format string, a ...interface{}) {
 	color.New(color.FgHiRed).PrintfFunc()("Error: "+format+"\n", a...)
 }

-// PrintSmallBanner prints a condensed banner
-func (l *Logger) PrintSmallBanner(message ...string) {
-	yellow := color.New(color.FgYellow).SprintFunc()
-	red := color.New(color.FgRed).SprintFunc()
-	msg := ""
-	if len(message) > 0 {
-		msg = " - " + message[0]
-	}
-	fmt.Printf("%s %s%s\n", yellow("Wails"), red(Version), msg)
-}
-
 // PrintBanner prints the Wails banner before running commands
 func (l *Logger) PrintBanner() error {
 	banner1 := ` _       __      _ __    
--- a/cmd/package.go
+++ b/cmd/package.go
@@ -68,15 +68,15 @@ func (b *PackageHelper) getPackageFileBaseDir() string {

 // Package the application into a platform specific package
 func (b *PackageHelper) Package(po *ProjectOptions) error {
+	// Check we have the exe
+	if !b.fs.FileExists(po.BinaryName) {
+		return fmt.Errorf("cannot bundle non-existant binary file '%s'. Please build with 'wails build' first", po.BinaryName)
+	}
 	switch runtime.GOOS {
 	case "darwin":
-		// Check we have the exe
-		if !b.fs.FileExists(po.BinaryName) {
-			return fmt.Errorf("cannot bundle non-existent binary file '%s'. Please build with 'wails build' first", po.BinaryName)
-		}
 		return b.packageOSX(po)
 	case "windows":
-		return b.PackageWindows(po, false)
+		return fmt.Errorf("windows is not supported at this time. Please see https://github.com/wailsapp/wails/issues/3")
 	case "linux":
 		return fmt.Errorf("linux is not supported at this time. Please see https://github.com/wailsapp/wails/issues/2")
 	default:
@@ -146,73 +146,15 @@ func (b *PackageHelper) packageOSX(po *ProjectOptions) error {
 	if err != nil {
 		return err
 	}
-	err = b.packageIconOSX(resourceDir)
+	err = b.packageIcon(resourceDir)
 	return err
 }

-// PackageWindows packages the application for windows platforms
-func (b *PackageHelper) PackageWindows(po *ProjectOptions, cleanUp bool) error {
-	basename := strings.TrimSuffix(po.BinaryName, ".exe")
-
-	// Copy icon
-	tgtIconFile := filepath.Join(b.fs.Cwd(), basename+".ico")
-	if !b.fs.FileExists(tgtIconFile) {
-		srcIconfile := filepath.Join(b.getPackageFileBaseDir(), "wails.ico")
-		err := b.fs.CopyFile(srcIconfile, tgtIconFile)
-		if err != nil {
-			return err
-		}
-	}
-
-	// Copy manifest
-	tgtManifestFile := filepath.Join(b.fs.Cwd(), basename+".exe.manifest")
-	if !b.fs.FileExists(tgtManifestFile) {
-		srcManifestfile := filepath.Join(b.getPackageFileBaseDir(), "wails.exe.manifest")
-		err := b.fs.CopyFile(srcManifestfile, tgtManifestFile)
-		if err != nil {
-			return err
-		}
-	}
-
-	// Copy rc file
-	tgtRCFile := filepath.Join(b.fs.Cwd(), basename+".rc")
-	if !b.fs.FileExists(tgtRCFile) {
-		srcRCfile := filepath.Join(b.getPackageFileBaseDir(), "wails.rc")
-		rcfilebytes, err := ioutil.ReadFile(srcRCfile)
-		if err != nil {
-			return err
-		}
-		rcfiledata := strings.Replace(string(rcfilebytes), "$NAME$", basename, -1)
-		err = ioutil.WriteFile(tgtRCFile, []byte(rcfiledata), 0755)
-		if err != nil {
-			return err
-		}
-	}
-
-	// Build syso
-	sysofile := filepath.Join(b.fs.Cwd(), basename+"-res.syso")
-	windresCommand := []string{"windres", "-o", sysofile, tgtRCFile}
-	err := NewProgramHelper().RunCommandArray(windresCommand)
-	if err != nil {
-		return err
-	}
-
-	// clean up
-	if cleanUp {
-		filesToDelete := []string{tgtIconFile, tgtManifestFile, tgtRCFile, sysofile}
-		err := b.fs.RemoveFiles(filesToDelete)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (b *PackageHelper) copyIcon(resourceDir string) (string, error) {
+func (b *PackageHelper) packageIcon(resourceDir string) error {

 	// TODO: Read this from project.json
 	const appIconFilename = "appicon.png"
+
 	srcIcon := path.Join(b.fs.Cwd(), appIconFilename)

 	// Check if appicon.png exists
@@ -222,22 +164,14 @@ func (b *PackageHelper) copyIcon(resourceDir string) (string, error) {
 		iconfile := filepath.Join(b.getPackageFileBaseDir(), "icon.png")
 		iconData, err := ioutil.ReadFile(iconfile)
 		if err != nil {
-			return "", err
+			return err
 		}
 		err = ioutil.WriteFile(srcIcon, iconData, 0644)
 		if err != nil {
-			return "", err
+			return err
 		}
 	}
-	return srcIcon, nil
-}

-func (b *PackageHelper) packageIconOSX(resourceDir string) error {
-
-	srcIcon, err := b.copyIcon(resourceDir)
-	if err != nil {
-		return err
-	}
 	tgtBundle := path.Join(resourceDir, "iconfile.icns")
 	imageFile, err := os.Open(srcIcon)
 	if err != nil {
@@ -255,5 +189,9 @@ func (b *PackageHelper) packageIconOSX(resourceDir string) error {

 	}
 	defer dest.Close()
-	return icns.Encode(dest, srcImg)
+	if err := icns.Encode(dest, srcImg); err != nil {
+		return err
+
+	}
+	return nil
 }
--- a/cmd/packages/windows/icon.png
+++ b/cmd/packages/windows/icon.png
--- a/cmd/packages/windows/wails.exe.manifest
+++ b/cmd/packages/windows/wails.exe.manifest
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
-    <assemblyIdentity type="win32" name="MyApplication" version="1.0.0.0" processorArchitecture="amd64"/>
-
-    <asmv3:application>
-        <asmv3:windowsSettings>
-            <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/pm</dpiAware> <!-- fallback for Windows 7 and 8 -->
-            <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">permonitorv2,permonitor</dpiAwareness> <!-- falls back to per-monitor if per-monitor v2 is not supported -->
-            <gdiScaling xmlns="http://schemas.microsoft.com/SMI/2017/WindowsSettings">true</gdiScaling> <!-- enables GDI DPI scaling -->
-        </asmv3:windowsSettings>
-    </asmv3:application>
-</assembly>
--- a/cmd/packages/windows/wails.ico
+++ b/cmd/packages/windows/wails.ico
--- a/cmd/packages/windows/wails.rc
+++ b/cmd/packages/windows/wails.rc
@@ -1,2 +0,0 @@
-100 ICON    "$NAME$.ico"
-100 24      "$NAME$.exe.manifest"
--- a/cmd/prerequisites.go
+++ b/cmd/prerequisites.go
@@ -52,7 +52,7 @@ func getRequiredProgramsLinux() *Prerequisites {
 	case Ubuntu:
 		result.Add(newPrerequisite("gcc", "Please install with `sudo apt install build-essentials` and try again"))
 		result.Add(newPrerequisite("pkg-config", "Please install with `sudo apt install pkg-config` and try again"))
-		result.Add(newPrerequisite("npm", "Please install with `sudo snap install node --channel=12/stable --classic` and try again"))
+		result.Add(newPrerequisite("npm", "Please install with `sudo apt install npm` and try again"))

 	default:
 		result.Add(newPrerequisite("gcc", "Please install with your system package manager and try again"))
@@ -97,12 +97,6 @@ func getRequiredLibrariesLinux() (*Prerequisites, error) {
 	case Ubuntu:
 		result.Add(newPrerequisite("libgtk-3-dev", "Please install with `sudo apt install libgtk-3-dev` and try again"))
 		result.Add(newPrerequisite("libwebkit2gtk-4.0-dev", "Please install with `sudo apt install libwebkit2gtk-4.0-dev` and try again"))
-	case Arch:
-		result.Add(newPrerequisite("gtk3", "Please install with `sudo pacman -S gtk3` and try again"))
-		result.Add(newPrerequisite("webkit2gtk", "Please install with `sudo pacman -S webkit2gtk` and try again"))
-	case RedHat:
-		result.Add(newPrerequisite("gtk3-devel", "Please install with `sudo yum install gtk3-devel` and try again"))
-		result.Add(newPrerequisite("webkit2gtk3-devel", "Please install with `sudo yum install webkit2gtk3-devel` and try again"))
 	default:
 		result.Add(newPrerequisite("libgtk-3-dev", "Please install with your system package manager and try again"))
 		result.Add(newPrerequisite("libwebkit2gtk-4.0-dev", "Please install with your system package manager and try again"))
--- a/cmd/program.go
+++ b/cmd/program.go
@@ -56,7 +56,7 @@ func (p *Program) GetFullPathToBinary() (string, error) {
 }

 // Run will execute the program with the given parameters
-// Returns stdout + stderr as strings and an error if one occurred
+// Returns stdout + stderr as strings and an error if one occured
 func (p *Program) Run(vars ...string) (stdout, stderr string, exitCode int, err error) {
 	command, err := p.GetFullPathToBinary()
 	if err != nil {
@@ -92,7 +92,7 @@ func (p *Program) Run(vars ...string) (stdout, stderr string, exitCode int, err

 // InstallGoPackage installs the given Go package
 func (p *ProgramHelper) InstallGoPackage(packageName string) error {
-	args := strings.Split("get "+packageName, " ")
+	args := strings.Split("get -u "+packageName, " ")
 	_, stderr, err := p.shell.Run("go", args...)
 	if err != nil {
 		fmt.Println(stderr)
@@ -107,7 +107,7 @@ func (p *ProgramHelper) RunCommand(command string) error {
 }

 // RunCommandArray runs the command specified in the array
-func (p *ProgramHelper) RunCommandArray(args []string, dir ...string) error {
+func (p *ProgramHelper) RunCommandArray(args []string) error {
 	program := args[0]
 	// TODO: Run FindProgram here and get the full path to the exe
 	program, err := exec.LookPath(program)
@@ -116,13 +116,8 @@ func (p *ProgramHelper) RunCommandArray(args []string, dir ...string) error {
 		return err
 	}
 	args = args[1:]
-	var stderr string
 	// fmt.Printf("RunCommandArray = %s %+v\n", program, args)
-	if len(dir) > 0 {
-		_, stderr, err = p.shell.RunInDirectory(dir[0], program, args...)
-	} else {
-		_, stderr, err = p.shell.Run(program, args...)
-	}
+	_, stderr, err := p.shell.Run(program, args...)
 	if err != nil {
 		fmt.Println(stderr)
 	}
--- a/cmd/project.go
+++ b/cmd/project.go
@@ -4,12 +4,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
-	"os"
 	"path/filepath"
-	"runtime"
 	"strings"

-	"github.com/leaanthony/slicer"
+	"github.com/AlecAivazis/survey"
 )

 type author struct {
@@ -50,14 +48,22 @@ func NewProjectHelper() *ProjectHelper {
 // GenerateProject generates a new project using the options given
 func (ph *ProjectHelper) GenerateProject(projectOptions *ProjectOptions) error {

+	fs := NewFSHelper()
+	exists, err := ph.templates.TemplateExists(projectOptions.Template)
+	if err != nil {
+		return err
+	}
+
+	if !exists {
+		return fmt.Errorf("template '%s' is invalid", projectOptions.Template)
+	}
+
 	// Calculate project path
 	projectPath, err := filepath.Abs(projectOptions.OutputDirectory)
 	if err != nil {
 		return err
 	}

-	_ = projectPath
-
 	if fs.DirExists(projectPath) {
 		return fmt.Errorf("directory '%s' already exists", projectPath)
 	}
@@ -78,25 +84,11 @@ func (ph *ProjectHelper) GenerateProject(projectOptions *ProjectOptions) error {
 	if err != nil {
 		return err
 	}
-
-	// // If we are on windows, dump a windows_resource.json
-	// if runtime.GOOS == "windows" {
-	// 	ph.GenerateWindowsResourceConfig(projectOptions)
-	// }
-
+	ph.log.Yellow("Project '%s' generated in directory '%s'!", projectOptions.Name, projectOptions.OutputDirectory)
+	ph.log.Yellow("To compile the project, run 'wails build' in the project directory.")
 	return nil
 }

-// // GenerateWindowsResourceConfig generates the default windows resource file
-// func (ph *ProjectHelper) GenerateWindowsResourceConfig(po *ProjectOptions) {
-
-// 	fmt.Println(buffer.String())
-
-// 	// vi.Build()
-// 	// vi.Walk()
-// 	// err := vi.WriteSyso(outPath, runtime.GOARCH)
-// }
-
 // LoadProjectConfig loads the project config from the given directory
 func (ph *ProjectHelper) LoadProjectConfig(dir string) (*ProjectOptions, error) {
 	po := ph.NewProjectOptions()
@@ -107,14 +99,15 @@ func (ph *ProjectHelper) LoadProjectConfig(dir string) (*ProjectOptions, error)
 // NewProjectOptions creates a new default set of project options
 func (ph *ProjectHelper) NewProjectOptions() *ProjectOptions {
 	result := ProjectOptions{
-		Name:        "",
-		Description: "Enter your project description",
-		Version:     "0.1.0",
-		BinaryName:  "",
-		system:      NewSystemHelper(),
-		log:         NewLogger(),
-		templates:   NewTemplateHelper(),
-		Author:      &author{},
+		Name:            "",
+		Description:     "Enter your project description",
+		Version:         "0.1.0",
+		BinaryName:      "",
+		system:          NewSystemHelper(),
+		log:             NewLogger(),
+		templates:       NewTemplateHelper(),
+		templateNameMap: make(map[string]string),
+		Author:          &author{},
 	}

 	// Populate system config
@@ -127,90 +120,119 @@ func (ph *ProjectHelper) NewProjectOptions() *ProjectOptions {
 	return &result
 }

+// SelectQuestion creates a new select type question for Survey
+func SelectQuestion(name, message string, options []string, defaultValue string, required bool) *survey.Question {
+	result := survey.Question{
+		Name: name,
+		Prompt: &survey.Select{
+			Message: message,
+			Options: options,
+			Default: defaultValue,
+		},
+	}
+	if required {
+		result.Validate = survey.Required
+	}
+	return &result
+}
+
+// InputQuestion creates a new input type question for Survey
+func InputQuestion(name, message string, defaultValue string, required bool) *survey.Question {
+	result := survey.Question{
+		Name: name,
+		Prompt: &survey.Input{
+			Message: message + ":",
+			Default: defaultValue,
+		},
+	}
+	if required {
+		result.Validate = survey.Required
+	}
+	return &result
+}
+
 // ProjectOptions holds all the options available for a project
 type ProjectOptions struct {
-	Name             string    `json:"name"`
-	Description      string    `json:"description"`
-	Author           *author   `json:"author,omitempty"`
-	Version          string    `json:"version"`
-	OutputDirectory  string    `json:"-"`
-	UseDefaults      bool      `json:"-"`
-	Template         string    `json:"-"`
-	BinaryName       string    `json:"binaryname"`
-	FrontEnd         *frontend `json:"frontend,omitempty"`
-	NPMProjectName   string    `json:"-"`
-	system           *SystemHelper
-	log              *Logger
-	templates        *TemplateHelper
-	selectedTemplate *TemplateDetails
+	Name            string    `json:"name"`
+	Description     string    `json:"description"`
+	Author          *author   `json:"author,omitempty"`
+	Version         string    `json:"version"`
+	OutputDirectory string    `json:"-"`
+	UseDefaults     bool      `json:"-"`
+	Template        string    `json:"-"`
+	BinaryName      string    `json:"binaryname"`
+	FrontEnd        *frontend `json:"frontend,omitempty"`
+	NPMProjectName  string    `json:"-"`
+	system          *SystemHelper
+	log             *Logger
+	templates       *TemplateHelper
+	templateNameMap map[string]string // Converts template prompt text to template name
 }

 // Defaults sets the default project template
 func (po *ProjectOptions) Defaults() {
-	po.Template = "vuebasic"
+	po.Template = "basic"
 }

 // PromptForInputs asks the user to input project details
 func (po *ProjectOptions) PromptForInputs() error {

-	processProjectName(po)
+	var questions []*survey.Question

-	processBinaryName(po)
+	processProjectName(po.Name, &questions)

-	err := processOutputDirectory(po)
+	processBinaryName(po.BinaryName, po.Name, &questions)
+
+	err := processOutputDirectory(po.OutputDirectory, &questions)
 	if err != nil {
 		return err
 	}

-	// Process Templates
-	templateList := slicer.Interface()
-	options := slicer.String()
 	templateDetails, err := po.templates.GetTemplateDetails()
 	if err != nil {
 		return err
 	}

-	if po.Template != "" {
-		// Check template is valid if given
-		if templateDetails[po.Template] == nil {
-			keys := make([]string, 0, len(templateDetails))
-			for k := range templateDetails {
-				keys = append(keys, k)
+	templates := []string{}
+	// Add a Custom Template
+	// templates = append(templates, "Custom - Choose your own CSS framework")
+	for templateName, templateDetails := range templateDetails {
+		templateText := templateName
+		// Check if metadata json exists
+		if templateDetails.Metadata != nil {
+			shortdescription := templateDetails.Metadata["shortdescription"]
+			if shortdescription != "" {
+				templateText += " - " + shortdescription.(string)
 			}
-			return fmt.Errorf("invalid template name '%s'. Valid options: %s", po.Template, strings.Join(keys, ", "))
 		}
-		po.selectedTemplate = templateDetails[po.Template]
-	} else {
-
-		for _, templateDetail := range templateDetails {
-			templateList.Add(templateDetail)
-			options.Add(fmt.Sprintf("%s - %s", templateDetail.Metadata.Name, templateDetail.Metadata.ShortDescription))
-		}
-
-		templateIndex := 0
-
-		if len(options.AsSlice()) > 1 {
-			templateIndex = PromptSelection("Please select a template", options.AsSlice(), 0)
-		}
-
-		if len(templateList.AsSlice()) == 0 {
-			return fmt.Errorf("aborting: no templates found")
-		}
-
-		// After selection do this....
-		po.selectedTemplate = templateList.AsSlice()[templateIndex].(*TemplateDetails)
+		templates = append(templates, templateText)
+		po.templateNameMap[templateText] = templateName
 	}

-	fmt.Println("Template: " + po.selectedTemplate.Metadata.Name)
+	if po.Template != "" {
+		if _, ok := templateDetails[po.Template]; !ok {
+			po.log.Error("Template '%s' invalid.", po.Template)
+			questions = append(questions, SelectQuestion("Template", "Select template", templates, templates[0], true))
+		}
+	} else {
+		questions = append(questions, SelectQuestion("Template", "Select template", templates, templates[0], true))
+	}
+
+	err = survey.Ask(questions, po)
+	if err != nil {
+		return err
+	}

 	// Setup NPM Project name
 	po.NPMProjectName = strings.ToLower(strings.Replace(po.Name, " ", "_", -1))

 	// Fix template name
-	po.Template = strings.Split(po.selectedTemplate.Path, string(os.PathSeparator))[0]
+	if po.templateNameMap[po.Template] != "" {
+		po.Template = po.templateNameMap[po.Template]
+	}

-	// // Populate template details
-	templateMetadata := po.selectedTemplate.Metadata
+	// Populate template details
+	templateMetadata := templateDetails[po.Template].Metadata

 	err = processTemplateMetadata(templateMetadata, po)
 	if err != nil {
@@ -259,74 +281,72 @@ func computeBinaryName(projectName string) string {
 	return binaryNameComputed
 }

-func processOutputDirectory(po *ProjectOptions) error {
-	// po.OutputDirectory
-	if po.OutputDirectory == "" {
-		po.OutputDirectory = PromptRequired("Project directory name", computeBinaryName(po.Name))
-	}
-	projectPath, err := filepath.Abs(po.OutputDirectory)
-	if err != nil {
-		return err
-	}
+func processOutputDirectory(outputDirectory string, questions *[]*survey.Question) error {

-	if NewFSHelper().DirExists(projectPath) {
-		return fmt.Errorf("directory '%s' already exists", projectPath)
-	}
+	if outputDirectory != "" {
+		projectPath, err := filepath.Abs(outputDirectory)
+		if err != nil {
+			return err
+		}

-	fmt.Println("Project Directory: " + po.OutputDirectory)
+		if NewFSHelper().DirExists(projectPath) {
+			return fmt.Errorf("directory '%s' already exists", projectPath)
+		}
+
+		fmt.Println("Project Directory: " + outputDirectory)
+	} else {
+		*questions = append(*questions, InputQuestion("OutputDirectory", "Project directory name", "", true))
+	}
 	return nil
 }

-func processProjectName(po *ProjectOptions) {
-	if po.Name == "" {
-		po.Name = Prompt("The name of the project", "My Project")
+func processProjectName(name string, questions *[]*survey.Question) {
+	if name == "" {
+		*questions = append(*questions, InputQuestion("Name", "The name of the project", "My Project", true))
+	} else {
+		fmt.Println("Project Name: " + name)
 	}
-	fmt.Println("Project Name: " + po.Name)
 }

-func processBinaryName(po *ProjectOptions) {
-	if po.BinaryName == "" {
-		var binaryNameComputed = computeBinaryName(po.Name)
-		po.BinaryName = Prompt("The output binary name", binaryNameComputed)
-		if runtime.GOOS == "windows" {
-			if !strings.HasSuffix(po.BinaryName, ".exe") {
-				po.BinaryName += ".exe"
-			}
-		}
+func processBinaryName(binaryName string, name string, questions *[]*survey.Question) {
+	if binaryName == "" {
+		var binaryNameComputed = computeBinaryName(name)
+		*questions = append(*questions, InputQuestion("BinaryName", "The output binary name", binaryNameComputed, true))
+	} else {
+		fmt.Println("Output binary Name: " + binaryName)
 	}
-	fmt.Println("Output binary Name: " + po.BinaryName)
 }

-func processTemplateMetadata(templateMetadata *TemplateMetadata, po *ProjectOptions) error {
-	if templateMetadata.FrontendDir != "" {
+func processTemplateMetadata(templateMetadata map[string]interface{}, po *ProjectOptions) error {
+	if templateMetadata["frontenddir"] != nil {
 		po.FrontEnd = &frontend{}
-		po.FrontEnd.Dir = templateMetadata.FrontendDir
+		po.FrontEnd.Dir = templateMetadata["frontenddir"].(string)
 	}
-	if templateMetadata.Install != "" {
+	if templateMetadata["install"] != nil {
 		if po.FrontEnd == nil {
 			return fmt.Errorf("install set in template metadata but not frontenddir")
 		}
-		po.FrontEnd.Install = templateMetadata.Install
+		po.FrontEnd.Install = templateMetadata["install"].(string)
 	}
-	if templateMetadata.Build != "" {
+	if templateMetadata["build"] != nil {
 		if po.FrontEnd == nil {
 			return fmt.Errorf("build set in template metadata but not frontenddir")
 		}
-		po.FrontEnd.Build = templateMetadata.Build
+		po.FrontEnd.Build = templateMetadata["build"].(string)
 	}

-	if templateMetadata.Bridge != "" {
+	if templateMetadata["bridge"] != nil {
 		if po.FrontEnd == nil {
 			return fmt.Errorf("bridge set in template metadata but not frontenddir")
 		}
-		po.FrontEnd.Bridge = templateMetadata.Bridge
+		po.FrontEnd.Bridge = templateMetadata["bridge"].(string)
 	}

-	if templateMetadata.Serve != "" {
+	if templateMetadata["serve"] != nil {
 		if po.FrontEnd == nil {
 			return fmt.Errorf("serve set in template metadata but not frontenddir")
 		}
-		po.FrontEnd.Serve = templateMetadata.Serve
+		po.FrontEnd.Serve = templateMetadata["serve"].(string)
 	}
 	return nil
 }
--- a/cmd/prompt.go
+++ b/cmd/prompt.go
@@ -1,85 +0,0 @@
-package cmd
-
-import (
-	"bufio"
-	"fmt"
-	"os"
-	"runtime"
-	"strconv"
-	"strings"
-)
-
-// Prompt asks the user for a value
-func Prompt(question string, defaultValue ...string) string {
-	var answer string
-
-	if len(defaultValue) > 0 {
-		answer = defaultValue[0]
-		question = fmt.Sprintf("%s (%s)", question, answer)
-	}
-	fmt.Printf(question + ": ")
-	reader := bufio.NewReader(os.Stdin)
-	input, _ := reader.ReadString('\n')
-	EOL := "\n"
-	if runtime.GOOS == "windows" {
-		EOL = "\r\n"
-	}
-	input = strings.Replace(input, EOL, "", -1)
-
-	if input != "" {
-		answer = input
-	}
-
-	return answer
-}
-
-// PromptRequired calls Prompt repeatedly until a value is given
-func PromptRequired(question string, defaultValue ...string) string {
-	for {
-		result := Prompt(question, defaultValue...)
-		if result != "" {
-			return result
-		}
-	}
-}
-
-// PromptSelection asks the user to choose an option
-func PromptSelection(question string, options []string, optionalDefaultValue ...int) int {
-
-	defaultValue := -1
-	message := "Please choose an option"
-	fmt.Println(question + ":")
-
-	if len(optionalDefaultValue) > 0 {
-		defaultValue = optionalDefaultValue[0] + 1
-		message = fmt.Sprintf("%s [%d]", message, defaultValue)
-	}
-
-	for index, option := range options {
-		fmt.Printf("  %d: %s\n", index+1, option)
-	}
-
-	selectedValue := -1
-
-	for {
-		choice := Prompt(message)
-		if choice == "" && defaultValue > -1 {
-			selectedValue = defaultValue - 1
-			break
-		}
-
-		// index
-		number, err := strconv.Atoi(choice)
-		if err == nil {
-			if number > 0 && number <= len(options) {
-				selectedValue = number - 1
-				break
-			} else {
-				continue
-			}
-		}
-
-	}
-
-	return selectedValue
-}
--- a/cmd/semver.go
+++ b/cmd/semver.go
@@ -1,98 +0,0 @@
-package cmd
-
-import (
-	"fmt"
-
-	"github.com/masterminds/semver"
-)
-
-// SemanticVersion is a struct containing a semantic version
-type SemanticVersion struct {
-	Version *semver.Version
-}
-
-// NewSemanticVersion creates a new SemanticVersion object with the given version string
-func NewSemanticVersion(version string) (*SemanticVersion, error) {
-	semverVersion, err := semver.NewVersion(version)
-	if err != nil {
-		return nil, err
-	}
-	return &SemanticVersion{
-		Version: semverVersion,
-	}, nil
-}
-
-// IsRelease returns true if it's a release version
-func (s *SemanticVersion) IsRelease() bool {
-	return len(s.Version.Prerelease()) == 0 && len(s.Version.Metadata()) == 0
-}
-
-// IsPreRelease returns true if it's a prerelease version
-func (s *SemanticVersion) IsPreRelease() bool {
-	return len(s.Version.Prerelease()) > 0
-}
-
-func (s *SemanticVersion) String() string {
-	return s.Version.String()
-}
-
-// IsGreaterThan returns true if this version is greater than the given version
-func (s *SemanticVersion) IsGreaterThan(version *SemanticVersion) (bool, error) {
-	// Set up new constraint
-	constraint, err := semver.NewConstraint("> " + version.Version.String())
-	if err != nil {
-		return false, err
-	}
-
-	// Check if the desired one is greater than the requested on
-	success, msgs := constraint.Validate(s.Version)
-	if !success {
-		return false, msgs[0]
-	}
-	return true, nil
-}
-
-// IsGreaterThanOrEqual returns true if this version is greater than or equal the given version
-func (s *SemanticVersion) IsGreaterThanOrEqual(version *SemanticVersion) (bool, error) {
-	// Set up new constraint
-	constraint, err := semver.NewConstraint(">= " + version.Version.String())
-	if err != nil {
-		return false, err
-	}
-
-	// Check if the desired one is greater than the requested on
-	success, msgs := constraint.Validate(s.Version)
-	if !success {
-		return false, msgs[0]
-	}
-	return true, nil
-}
-
-// MainVersion returns the main version of any version+prerelease+metadata
-// EG: MainVersion("1.2.3-pre") => "1.2.3"
-func (s *SemanticVersion) MainVersion() *SemanticVersion {
-	mainVersion := fmt.Sprintf("%d.%d.%d", s.Version.Major(), s.Version.Minor(), s.Version.Patch())
-	result, _ := NewSemanticVersion(mainVersion)
-	return result
-}
-
-// SemverCollection is a collection of SemanticVersion objects
-type SemverCollection []*SemanticVersion
-
-// Len returns the length of a collection. The number of Version instances
-// on the slice.
-func (c SemverCollection) Len() int {
-	return len(c)
-}
-
-// Less is needed for the sort interface to compare two Version objects on the
-// slice. If checks if one is less than the other.
-func (c SemverCollection) Less(i, j int) bool {
-	return c[i].Version.LessThan(c[j].Version)
-}
-
-// Swap is needed for the sort interface to replace the Version objects
-// at two different positions in the slice.
-func (c SemverCollection) Swap(i, j int) {
-	c[i], c[j] = c[j], c[i]
-}
--- a/cmd/setup.go
+++ b/cmd/setup.go
@@ -0,0 +1 @@
+package cmd
--- a/cmd/shell.go
+++ b/cmd/shell.go
@@ -2,7 +2,6 @@ package cmd

 import (
 	"bytes"
-	"os"
 	"os/exec"
 )

@@ -18,21 +17,6 @@ func NewShellHelper() *ShellHelper {
 // Run the given command
 func (sh *ShellHelper) Run(command string, vars ...string) (stdout, stderr string, err error) {
 	cmd := exec.Command(command, vars...)
-	cmd.Env = append(os.Environ(), "GO111MODULE=on")
-	var stdo, stde bytes.Buffer
-	cmd.Stdout = &stdo
-	cmd.Stderr = &stde
-	err = cmd.Run()
-	stdout = string(stdo.Bytes())
-	stderr = string(stde.Bytes())
-	return
-}
-
-// RunInDirectory runs the given command in the given directory
-func (sh *ShellHelper) RunInDirectory(dir string, command string, vars ...string) (stdout, stderr string, err error) {
-	cmd := exec.Command(command, vars...)
-	cmd.Dir = dir
-	cmd.Env = append(os.Environ(), "GO111MODULE=on")
 	var stdo, stde bytes.Buffer
 	cmd.Stdout = &stdo
 	cmd.Stderr = &stde
--- a/cmd/system.go
+++ b/cmd/system.go
@@ -10,6 +10,7 @@ import (
 	"strconv"
 	"time"

+	"github.com/AlecAivazis/survey"
 	homedir "github.com/mitchellh/go-homedir"
 )

@@ -68,17 +69,6 @@ func (s *SystemHelper) ConfigFileIsValid() bool {
 	return err == nil
 }

-// GetAuthor returns a formatted string of the user's name and email
-func (s *SystemHelper) GetAuthor() (string, error) {
-	var config *SystemConfig
-	config, err := s.LoadConfig()
-	if err != nil {
-		return "", err
-	}
-
-	return fmt.Sprintf("%s <%s>", config.Name, config.Email), nil
-}
-
 // BackupConfig attempts to backup the system config file
 func (s *SystemHelper) BackupConfig() (string, error) {
 	now := strconv.FormatInt(time.Now().UTC().UnixNano(), 10)
@@ -92,43 +82,55 @@ func (s *SystemHelper) BackupConfig() (string, error) {

 func (s *SystemHelper) setup() error {

-	systemConfig := make(map[string]string)
+	// Answers. We all need them.
+	answers := &SystemConfig{}

 	// Try to load current values - ignore errors
-	config, _ := s.LoadConfig()
-
-	if config.Name != "" {
-		systemConfig["name"] = PromptRequired("What is your name", config.Name)
-	} else {
-		systemConfig["name"] = PromptRequired("What is your name")
+	config, err := s.LoadConfig()
+	defaultName := ""
+	defaultEmail := ""
+	if config != nil {
+		defaultName = config.Name
+		defaultEmail = config.Email
 	}
-	if config.Email != "" {
-		systemConfig["email"] = PromptRequired("What is your email address", config.Email)
-	} else {
-		systemConfig["email"] = PromptRequired("What is your email address")
+	// Questions
+	var simpleQs = []*survey.Question{
+		{
+			Name: "Name",
+			Prompt: &survey.Input{
+				Message: "What is your name:",
+				Default: defaultName,
+			},
+			Validate: survey.Required,
+		},
+		{
+			Name: "Email",
+			Prompt: &survey.Input{
+				Message: "What is your email address:",
+				Default: defaultEmail,
+			},
+			Validate: survey.Required,
+		},
+	}
+
+	// ask the questions
+	err = survey.Ask(simpleQs, answers)
+	if err != nil {
+		return err
 	}

 	// Create the directory
-	err := s.fs.MkDirs(s.wailsSystemDir)
+	err = s.fs.MkDirs(s.wailsSystemDir)
 	if err != nil {
 		return err
 	}

-	// Save
-	configData, err := json.Marshal(&systemConfig)
-	if err != nil {
-		return err
-	}
-	err = ioutil.WriteFile(s.wailsSystemConfig, configData, 0755)
-	if err != nil {
-		return err
-	}
 	fmt.Println()
 	s.log.White("Wails config saved to: " + s.wailsSystemConfig)
 	s.log.White("Feel free to customise these settings.")
 	fmt.Println()

-	return nil
+	return answers.Save(s.wailsSystemConfig)
 }

 const introText = `
@@ -256,7 +258,7 @@ func CheckDependencies(logger *Logger) (bool, error) {
 		bin := programHelper.FindProgram(program.Name)
 		if bin == nil {
 			errors = true
-			logger.Error("Program '%s' not found. %s", program.Name, program.Help)
+			logger.Red("Program '%s' not found. %s", program.Name, program.Help)
 		} else {
 			logger.Green("Program '%s' found: %s", program.Name, bin.Path)
 		}
@@ -279,30 +281,7 @@ func CheckDependencies(logger *Logger) (bool, error) {
 				}
 				if !installed {
 					errors = true
-					logger.Error("Library '%s' not found. %s", library.Name, library.Help)
-				} else {
-					logger.Green("Library '%s' installed.", library.Name)
-				}
-			case Arch:
-				installed, err := PacmanInstalled(library.Name)
-				if err != nil {
-					return false, err
-				}
-				if !installed {
-					errors = true
-					logger.Error("Library '%s' not found. %s", library.Name, library.Help)
-				} else {
-					logger.Green("Library '%s' installed.", library.Name)
-				}
-			case RedHat:
-
-				installed, err := RpmInstalled(library.Name)
-				if err != nil {
-					return false, err
-				}
-				if !installed {
-					errors = true
-					logger.Error("Library '%s' not found. %s", library.Name, library.Help)
+					logger.Red("Library '%s' not found. %s", library.Name, library.Help)
 				} else {
 					logger.Green("Library '%s' installed.", library.Name)
 				}
--- a/cmd/templates.go
+++ b/cmd/templates.go
@@ -5,94 +5,91 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
-	"log"
+	"os"
+	"path"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"text/template"
-
-	"github.com/kennygrant/sanitize"
-	"github.com/leaanthony/slicer"
 )

-// TemplateMetadata holds all the metadata for a Wails template
-type TemplateMetadata struct {
-	Name             string `json:"name"`
-	Version          string `json:"version"`
-	ShortDescription string `json:"shortdescription"`
-	Description      string `json:"description"`
-	Install          string `json:"install"`
-	Build            string `json:"build"`
-	Author           string `json:"author"`
-	Created          string `json:"created"`
-	FrontendDir      string `json:"frontenddir"`
-	Serve            string `json:"serve"`
-	Bridge           string `json:"bridge"`
-	WailsDir         string `json:"wailsdir"`
-}
+const templateSuffix = ".template"

-// TemplateDetails holds information about a specific template
-type TemplateDetails struct {
-	Name     string
-	Path     string
-	Metadata *TemplateMetadata
-	fs       *FSHelper
-}
-
-// TemplateHelper is a utility object to help with processing templates
+// TemplateHelper helps with creating projects
 type TemplateHelper struct {
-	templateDir      *Dir
-	fs               *FSHelper
+	system      *SystemHelper
+	fs          *FSHelper
+	templateDir string
+	// templates   map[string]string
+	templateSuffix   string
 	metadataFilename string
 }

+// Template defines a single template
+type Template struct {
+	Name     string
+	Dir      string
+	Metadata map[string]interface{}
+}
+
 // NewTemplateHelper creates a new template helper
 func NewTemplateHelper() *TemplateHelper {
-
-	templateDir, err := fs.LocalDir("./templates")
-	if err != nil {
-		log.Fatal("Unable to find the template directory. Please reinstall Wails.")
-	}
-
-	return &TemplateHelper{
-		templateDir:      templateDir,
+	result := TemplateHelper{
+		system:           NewSystemHelper(),
+		fs:               NewFSHelper(),
+		templateSuffix:   ".template",
 		metadataFilename: "template.json",
 	}
+	// Calculate template base dir
+	_, filename, _, _ := runtime.Caller(1)
+	result.templateDir = filepath.Join(path.Dir(filename), "templates")
+	// result.templateDir = filepath.Join(result.system.homeDir, "go", "src", "github.com", "wailsapp", "wails", "cmd", "templates")
+	return &result
 }

-// IsValidTemplate returns true if the given tempalte name resides on disk
-func (t *TemplateHelper) IsValidTemplate(templateName string) bool {
-	pathToTemplate := filepath.Join(t.templateDir.fullPath, templateName)
-	return t.fs.DirExists(pathToTemplate)
-}
-
-// SanitizeFilename sanitizes the given string to make a valid filename
-func (t *TemplateHelper) SanitizeFilename(name string) string {
-	return sanitize.Name(name)
-}
-
-// CreateNewTemplate creates a new template based on the given directory name and string
-func (t *TemplateHelper) CreateNewTemplate(dirname string, details *TemplateMetadata) (string, error) {
-
-	// Check if this template has already been created
-	if t.IsValidTemplate(dirname) {
-		return "", fmt.Errorf("cannot create template in directory '%s' - already exists", dirname)
-	}
-
-	targetDir := filepath.Join(t.templateDir.fullPath, dirname)
-	err := t.fs.MkDir(targetDir)
+// GetTemplateNames returns a map of all available templates
+func (t *TemplateHelper) GetTemplateNames() (map[string]string, error) {
+	templateDirs, err := t.fs.GetSubdirs(t.templateDir)
 	if err != nil {
-		return "", err
+		return nil, err
 	}
-	targetMetadata := filepath.Join(targetDir, t.metadataFilename)
-	err = t.fs.SaveAsJSON(details, targetMetadata)
+	return templateDirs, nil
+}

-	return targetDir, err
+// GetTemplateDetails returns a map of Template structs containing details
+// of the found templates
+func (t *TemplateHelper) GetTemplateDetails() (map[string]*Template, error) {
+	templateDirs, err := t.fs.GetSubdirs(t.templateDir)
+	if err != nil {
+		return nil, err
+	}
+
+	result := make(map[string]*Template)
+
+	for name, dir := range templateDirs {
+		result[name] = &Template{
+			Dir: dir,
+		}
+		metadata, err := t.LoadMetadata(dir)
+		if err != nil {
+			return nil, err
+		}
+		result[name].Metadata = metadata
+		if metadata["name"] != nil {
+			result[name].Name = metadata["name"].(string)
+		} else {
+			// Ignore bad templates?
+			result[name] = nil
+		}
+	}
+
+	return result, nil
 }

 // LoadMetadata loads the template's 'metadata.json' file
-func (t *TemplateHelper) LoadMetadata(dir string) (*TemplateMetadata, error) {
+func (t *TemplateHelper) LoadMetadata(dir string) (map[string]interface{}, error) {
 	templateFile := filepath.Join(dir, t.metadataFilename)
-	result := &TemplateMetadata{}
+	result := make(map[string]interface{})
 	if !t.fs.FileExists(templateFile) {
 		return nil, nil
 	}
@@ -104,48 +101,14 @@ func (t *TemplateHelper) LoadMetadata(dir string) (*TemplateMetadata, error) {
 	return result, err
 }

-// GetTemplateDetails returns a map of Template structs containing details
-// of the found templates
-func (t *TemplateHelper) GetTemplateDetails() (map[string]*TemplateDetails, error) {
-
-	// Get the subdirectory details
-	templateDirs, err := t.templateDir.GetSubdirs()
+// TemplateExists returns true if the given template name exists
+func (t *TemplateHelper) TemplateExists(templateName string) (bool, error) {
+	templates, err := t.GetTemplateNames()
 	if err != nil {
-		return nil, err
+		return false, err
 	}
-
-	result := make(map[string]*TemplateDetails)
-
-	for name, dir := range templateDirs {
-		result[name] = &TemplateDetails{
-			Path: dir,
-		}
-		_ = &TemplateMetadata{}
-		metadata, err := t.LoadMetadata(dir)
-		if err != nil {
-			return nil, err
-		}
-		result[name].Metadata = metadata
-		if metadata.Name != "" {
-			result[name].Name = metadata.Name
-		} else {
-			// Ignore bad templates?
-			result[name] = nil
-		}
-	}
-
-	return result, nil
-}
-
-// GetTemplateFilenames returns all the filenames of the given template
-func (t *TemplateHelper) GetTemplateFilenames(template *TemplateDetails) (*slicer.StringSlicer, error) {
-
-	// Get the subdirectory details
-	templateDir, err := t.fs.Directory(template.Path)
-	if err != nil {
-		return nil, err
-	}
-	return templateDir.GetAllFilenames()
+	_, exists := templates[templateName]
+	return exists, nil
 }

 // InstallTemplate installs the template given in the project options to the
@@ -153,61 +116,162 @@ func (t *TemplateHelper) GetTemplateFilenames(template *TemplateDetails) (*slice
 func (t *TemplateHelper) InstallTemplate(projectPath string, projectOptions *ProjectOptions) error {

 	// Get template files
-	templateFilenames, err := t.GetTemplateFilenames(projectOptions.selectedTemplate)
+	template, err := t.getTemplateFiles(projectOptions.Template)
 	if err != nil {
 		return err
 	}

-	templatePath := projectOptions.selectedTemplate.Path
-
-	templateJSONFilename := filepath.Join(templatePath, t.metadataFilename)
-
-	templateFiles := templateFilenames.Filter(func(filename string) bool {
-		filename = filepath.FromSlash(filename)
-		return strings.HasPrefix(filename, templatePath) && filename != templateJSONFilename
-	})
-
-	templateFiles.Each(func(templateFile string) {
-
-		// Setup filenames
-		relativeFilename := strings.TrimPrefix(templateFile, templatePath)[1:]
-		targetFilename, err := filepath.Abs(filepath.Join(projectOptions.OutputDirectory, relativeFilename))
-		if err != nil {
-			return
-		}
-		filedata, err := t.fs.LoadAsBytes(templateFile)
-		if err != nil {
-			return
-		}
-
-		// If file is a template, process it
-		if strings.HasSuffix(templateFile, ".template") {
-			templateData := string(filedata)
-			tmpl := template.New(templateFile)
-			tmpl.Parse(templateData)
-			var tpl bytes.Buffer
-			err = tmpl.Execute(&tpl, projectOptions)
-			if err != nil {
-				return
-			}
-
-			// Remove template suffix
-			targetFilename = strings.TrimSuffix(targetFilename, ".template")
-
-			// Set the filedata to the template result
-			filedata = tpl.Bytes()
-		}
-
-		// Normal file, just copy it
-		err = fs.CreateFile(targetFilename, filedata)
-		if err != nil {
-			return
-		}
-	})
-
+	// Copy files to target
+	err = template.Install(projectPath, projectOptions)
 	if err != nil {
 		return err
 	}

 	return nil
 }
+
+// templateFiles categorises files found in a template
+type templateFiles struct {
+	BaseDir       string
+	StandardFiles []string
+	Templates     []string
+	Dirs          []string
+}
+
+// newTemplateFiles returns a new TemplateFiles struct
+func (t *TemplateHelper) newTemplateFiles(dir string) *templateFiles {
+	pathsep := string(os.PathSeparator)
+	// Ensure base directory has trailing slash
+	if !strings.HasSuffix(dir, pathsep) {
+		dir = dir + pathsep
+	}
+	return &templateFiles{
+		BaseDir: dir,
+	}
+}
+
+// AddStandardFile adds the given file to the list of standard files
+func (t *templateFiles) AddStandardFile(filename string) {
+	localPath := strings.TrimPrefix(filename, t.BaseDir)
+	t.StandardFiles = append(t.StandardFiles, localPath)
+}
+
+// AddTemplate adds the given file to the list of template files
+func (t *templateFiles) AddTemplate(filename string) {
+	localPath := strings.TrimPrefix(filename, t.BaseDir)
+	t.Templates = append(t.Templates, localPath)
+}
+
+// AddDir adds the given directory to the list of template dirs
+func (t *templateFiles) AddDir(dir string) {
+	localPath := strings.TrimPrefix(dir, t.BaseDir)
+	t.Dirs = append(t.Dirs, localPath)
+}
+
+// getTemplateFiles returns a struct categorising files in
+// the template directory
+func (t *TemplateHelper) getTemplateFiles(templateName string) (*templateFiles, error) {
+
+	templates, err := t.GetTemplateNames()
+	if err != nil {
+		return nil, err
+	}
+	templateDir := templates[templateName]
+	result := t.newTemplateFiles(templateDir)
+	var localPath string
+	err = filepath.Walk(templateDir, func(dir string, info os.FileInfo, err error) error {
+		if dir == templateDir {
+			return nil
+		}
+		if err != nil {
+			return err
+		}
+
+		// Don't copy template metadata
+		localPath = strings.TrimPrefix(dir, templateDir+string(filepath.Separator))
+		if localPath == t.metadataFilename {
+			return nil
+		}
+
+		// Categorise the file
+		switch {
+		case info.IsDir():
+			result.AddDir(dir)
+		case strings.HasSuffix(info.Name(), templateSuffix):
+			result.AddTemplate(dir)
+		default:
+			result.AddStandardFile(dir)
+		}
+		return nil
+	})
+
+	if err != nil {
+		return nil, fmt.Errorf("error processing template '%s' in path '%q': %v", templateName, templateDir, err)
+	}
+	return result, err
+}
+
+// Install the template files into the given project path
+func (t *templateFiles) Install(projectPath string, projectOptions *ProjectOptions) error {
+
+	fs := NewFSHelper()
+
+	// Create directories
+	var targetDir string
+	for _, dirname := range t.Dirs {
+		targetDir = filepath.Join(projectPath, dirname)
+		fs.MkDir(targetDir)
+	}
+
+	// Copy standard files
+	var targetFile, sourceFile string
+	var err error
+	for _, filename := range t.StandardFiles {
+		sourceFile = filepath.Join(t.BaseDir, filename)
+		targetFile = filepath.Join(projectPath, filename)
+
+		err = fs.CopyFile(sourceFile, targetFile)
+		if err != nil {
+			return err
+		}
+	}
+
+	// Do we have template files?
+	if len(t.Templates) > 0 {
+
+		// Iterate over the templates
+		var templateFile string
+		var tmpl *template.Template
+		for _, filename := range t.Templates {
+
+			// Load template text
+			templateFile = filepath.Join(t.BaseDir, filename)
+			templateText, err := fs.LoadAsString(templateFile)
+			if err != nil {
+				return err
+			}
+
+			// Apply template
+			tmpl = template.New(templateFile)
+			tmpl.Parse(templateText)
+
+			// Write the template to a buffer
+			var tpl bytes.Buffer
+			err = tmpl.Execute(&tpl, projectOptions)
+			if err != nil {
+				fmt.Println("ERROR!!! " + err.Error())
+				return err
+			}
+
+			// Save buffer to disk
+			targetFilename := strings.TrimSuffix(filename, templateSuffix)
+			targetFile = filepath.Join(projectPath, targetFilename)
+			err = ioutil.WriteFile(targetFile, tpl.Bytes(), 0644)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
--- a/cmd/templates/vuebasic/frontend/package-lock.json
+++ b/cmd/templates/vuebasic/frontend/package-lock.json
--- a/cmd/templates/vuebasic/frontend/package.json.template
+++ b/cmd/templates/vuebasic/frontend/package.json.template
@@ -1,49 +0,0 @@
-{
-  "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": "^2.6.4",
-    "vue": "^2.5.22"
-  },
-  "devDependencies": {
-    "@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"
-  ]
-}
--- a/cmd/templates/vuebasic/frontend/src/components/HelloWorld.vue
+++ b/cmd/templates/vuebasic/frontend/src/components/HelloWorld.vue
@@ -1,55 +0,0 @@
-<template>
-  <div class="container">
-    <h1>{{message}}</h1>
-    <a @click="getMessage">Press Me!</a>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      message: " "
-    };
-  },
-  methods: {
-    getMessage: function() {
-      var self = this;
-      window.backend.basic().then(result => {
-        self.message = result;
-      });
-    }
-  }
-};
-</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>
--- a/cmd/templates/vuebasic/frontend/src/main.js
+++ b/cmd/templates/vuebasic/frontend/src/main.js
@@ -1,13 +0,0 @@
-import Vue from "vue";
-import App from "./App.vue";
-
-Vue.config.productionTip = false;
-Vue.config.devtools = true;
-
-import Bridge from "./wailsbridge";
-
-Bridge.Start(() => {
-  new Vue({
-    render: h => h(App)
-  }).$mount("#app");
-});
--- a/cmd/templates/vuebasic/frontend/src/wailsbridge.js
+++ b/cmd/templates/vuebasic/frontend/src/wailsbridge.js
@@ -1,17 +0,0 @@
-/*
-    Wails Bridge (c) 2019-present Lea Anthony
-
-    This prod version is to get around having to rewrite your code
-    for production. When doing a release build, this file will be used 
-    instead of the full version.
-*/
-
-export default {
-  // The main function
-  // Passes the main Wails object to the callback if given.
-  Start: function(callback) {
-    if (callback) {
-      window.wails.events.on("wails:ready", callback);
-    }
-  }
-};
--- a/cmd/templates/vuebasic/frontend/vue.config.js
+++ b/cmd/templates/vuebasic/frontend/vue.config.js
@@ -1,43 +0,0 @@
-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"
-  }
-};
--- a/cmd/templates/vuebasic/main.go.template
+++ b/cmd/templates/vuebasic/main.go.template
@@ -1,27 +0,0 @@
-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()
-}
--- a/cmd/templates/vuetify-basic/.jshint
+++ b/cmd/templates/vuetify-basic/.jshint
@@ -1,3 +0,0 @@
-{ 
-  "esversion": 6 
-}
--- a/cmd/templates/vuetify-basic/frontend/.gitignore
+++ b/cmd/templates/vuetify-basic/frontend/.gitignore
@@ -1,21 +0,0 @@
-.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*
--- a/cmd/templates/vuetify-basic/frontend/babel.config.js
+++ b/cmd/templates/vuetify-basic/frontend/babel.config.js
@@ -1,5 +0,0 @@
-module.exports = {
-  presets: [
-    '@vue/app'
-  ]
-}
--- a/cmd/templates/vuetify-basic/frontend/package.json.template
+++ b/cmd/templates/vuetify-basic/frontend/package.json.template
@@ -1,52 +0,0 @@
-{
-  "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": {
-    "babel-polyfill": "^6.26.0",
-    "core-js": "^2.6.4",
-    "material-design-icons-iconfont": "^5.0.1",
-    "vue": "^2.5.22",
-    "vuetify": "^1.5.14"
-  },
-  "devDependencies": {
-    "@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"
-  ]
-}
--- a/cmd/templates/vuetify-basic/frontend/src/App.vue
+++ b/cmd/templates/vuetify-basic/frontend/src/App.vue
@@ -1,60 +0,0 @@
-<template>
-  <v-app id="inspire" dark>
-    <v-navigation-drawer v-model="drawer" clipped fixed app>
-      <v-list dense>
-        <v-list-tile>
-          <v-list-tile-action>
-            <v-icon>dashboard</v-icon>
-          </v-list-tile-action>
-          <v-list-tile-content>
-            <v-list-tile-title>Dashboard</v-list-tile-title>
-          </v-list-tile-content>
-        </v-list-tile>
-        <v-list-tile>
-          <v-list-tile-action>
-            <v-icon>settings</v-icon>
-          </v-list-tile-action>
-          <v-list-tile-content>
-            <v-list-tile-title>Settings</v-list-tile-title>
-          </v-list-tile-content>
-        </v-list-tile>
-      </v-list>
-    </v-navigation-drawer>
-    <v-toolbar app fixed clipped-left>
-      <v-toolbar-side-icon @click.stop="drawer = !drawer"></v-toolbar-side-icon>
-      <v-toolbar-title>Application</v-toolbar-title>
-    </v-toolbar>
-    <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>
--- a/cmd/templates/vuetify-basic/frontend/src/assets/images/logo.png
+++ b/cmd/templates/vuetify-basic/frontend/src/assets/images/logo.png
--- a/cmd/templates/vuetify-basic/frontend/src/components/HelloWorld.vue
+++ b/cmd/templates/vuetify-basic/frontend/src/components/HelloWorld.vue
@@ -1,83 +0,0 @@
-<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" dark @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" flat @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>
--- a/cmd/templates/vuetify-basic/frontend/src/main.js
+++ b/cmd/templates/vuetify-basic/frontend/src/main.js
@@ -1,20 +0,0 @@
-import Vue from "vue";
-
-// Setup Vuetify
-import Vuetify from 'vuetify';
-Vue.use(Vuetify);
-import 'vuetify/dist/vuetify.min.css';
-import 'material-design-icons-iconfont';
-
-import App from "./App.vue";
-
-Vue.config.productionTip = false;
-Vue.config.devtools = true;
-
-import Bridge from "./wailsbridge";
-
-Bridge.Start(() => {
-  new Vue({
-    render: h => h(App)
-  }).$mount("#app");
-});
--- a/cmd/templates/vuetify-basic/frontend/vue.config.js
+++ b/cmd/templates/vuetify-basic/frontend/vue.config.js
@@ -1,43 +0,0 @@
-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"
-  }
-};
--- a/cmd/templates/vuetify-basic/go.mod.template
+++ b/cmd/templates/vuetify-basic/go.mod.template
@@ -1 +0,0 @@
-module {{.BinaryName}}
--- a/cmd/templates/vuetify-basic/main.go.template
+++ b/cmd/templates/vuetify-basic/main.go.template
@@ -1,27 +0,0 @@
-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()
-}
--- a/cmd/templates/vuetify-basic/template.json
+++ b/cmd/templates/vuetify-basic/template.json
@@ -1,14 +0,0 @@
-{
-  "name": "Vuetify Basic",
-  "version": "1.0.0",
-  "shortdescription": "Vuetify + Webpack",
-  "description": "Basic template using Vuetify and bundled using Webpack",
-  "install": "npm install",
-  "build": "npm run build",
-  "author": "lea <lea.anthony@gmail.com>",
-  "created": "2019-05-25 09:39:40.009307 +1000 AEST m=+59.539991073",
-  "frontenddir": "frontend",
-  "serve": "npm run serve",
-  "bridge": "src",
-  "wailsdir": ""
-}
--- a/cmd/templates/vuewebpack/frontend/.browserslistrc
+++ b/cmd/templates/vuewebpack/frontend/.browserslistrc
@@ -0,0 +1,3 @@
+> 1%
+last 2 versions
+not ie <= 8
--- a/cmd/templates/vuewebpack/frontend/.gitignore
+++ b/cmd/templates/vuewebpack/frontend/.gitignore
--- a/cmd/templates/vuewebpack/frontend/README.md
+++ b/cmd/templates/vuewebpack/frontend/README.md
@@ -1,35 +1,29 @@
-# vue basic
+# frontend

 ## Project setup
-
 ```
 npm install
 ```

 ### Compiles and hot-reloads for development
-
 ```
 npm run serve
 ```

 ### Compiles and minifies for production
-
 ```
 npm run build
 ```

 ### Run your tests
-
 ```
 npm run test
 ```

 ### Lints and fixes files
-
 ```
 npm run lint
 ```

 ### Customize configuration
-
 See [Configuration Reference](https://cli.vuejs.org/config/).
--- a/cmd/templates/vuewebpack/frontend/babel.config.js
+++ b/cmd/templates/vuewebpack/frontend/babel.config.js
--- a/cmd/templates/vuewebpack/frontend/package.json.template
+++ b/cmd/templates/vuewebpack/frontend/package.json.template
@@ -0,0 +1,18 @@
+{
+  "name": "{{.NPMProjectName}}",
+  "author": "{{.Author.Name}}<{{.Author.Email}}>",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "serve": "vue-cli-service serve",
+    "build": "vue-cli-service build"
+  },
+  "dependencies": {
+    "vue": "^2.5.17"
+  },
+  "devDependencies": {
+    "@vue/cli-plugin-babel": "^3.1.1",
+    "@vue/cli-service": "^3.1.4",
+    "vue-template-compiler": "^2.5.17"
+  }
+}
--- a/cmd/templates/vuewebpack/frontend/postcss.config.js
+++ b/cmd/templates/vuewebpack/frontend/postcss.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+  plugins: {
+    autoprefixer: {}
+  }
+}
--- a/cmd/templates/vuewebpack/frontend/public/favicon.ico
+++ b/cmd/templates/vuewebpack/frontend/public/favicon.ico
--- a/cmd/templates/vuewebpack/frontend/public/index.html
+++ b/cmd/templates/vuewebpack/frontend/public/index.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <title>frontend</title>
+  </head>
+  <body>
+    <noscript>
+      <strong>We're sorry but frontend doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+    </noscript>
+    <div id="app"></div>
+    <!-- built files will be auto injected -->
+  </body>
+</html>
--- a/cmd/templates/vuewebpack/frontend/src/App.vue
+++ b/cmd/templates/vuewebpack/frontend/src/App.vue
@@ -1,18 +1,22 @@
 <template>
  <div id="app">
    <img alt="Wails logo" src="./assets/images/logo.png" class="logo zoomIn">
-    <HelloWorld/>
+    <HelloWorld msg="Welcome to Your Wails App!"/>
+    <Quote/>
  </div>
 </template>

 <script>
 import HelloWorld from "./components/HelloWorld.vue";
+import Quote from "./components/Quote.vue";
 import "./assets/css/main.css";

 export default {
  name: "app",
  components: {
-    HelloWorld
+    HelloWorld,
+    Quote
  }
 };
 </script>
+
--- a/cmd/templates/vuewebpack/frontend/src/assets/css/main.css
+++ b/cmd/templates/vuewebpack/frontend/src/assets/css/main.css
@@ -10,6 +10,21 @@
 html {
  height: 100%;
  overflow: hidden;
+  /* https://leaverou.github.io/css3patterns/#carbon */
+  background: linear-gradient(27deg, #151515 5px, transparent 5px) 0 5px,
+    linear-gradient(207deg, #151515 5px, transparent 5px) 10px 0,
+    linear-gradient(27deg, #222 5px, transparent 5px) 0 10px,
+    linear-gradient(207deg, #222 5px, transparent 5px) 10px 5px,
+    linear-gradient(90deg, #1b1b1b 10px, transparent 10px),
+    linear-gradient(
+      #1d1d1d 25%,
+      #1a1a1a 25%,
+      #1a1a1a 50%,
+      transparent 50%,
+      transparent 75%,
+      #242424 75%,
+      #242424
+    );
  background-color: #131313;
  background-size: 20px 20px;
 }
--- a/cmd/templates/vuewebpack/frontend/src/assets/css/quote.css
+++ b/cmd/templates/vuewebpack/frontend/src/assets/css/quote.css
@@ -0,0 +1,79 @@
+/**
+  Credit: https://codepen.io/harmputman/pen/IpAnb
+**/
+
+body {
+  font: normal 300 1em/1.5em sans-serif;
+}
+
+.container {
+  background: #fff;
+  width: 100%;
+  max-width: 480px;
+  min-width: 320px;
+  margin: 2em auto 0;
+  padding: 1.5em;
+  opacity: 0.8;
+  border-radius: 1em;
+  border-color: #117;
+}
+
+p {
+  margin-bottom: 1.5em;
+}
+p:last-child {
+  margin-bottom: 0;
+}
+
+blockquote {
+  display: block;
+  border-width: 2px 0;
+  border-style: solid;
+  border-color: #eee;
+  padding: 1.5em 0 0.5em;
+  margin: 1.5em 0;
+  position: relative;
+  color: #117;
+}
+blockquote:before {
+  content: "\201C";
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  background: #fff;
+  width: 3rem;
+  height: 2rem;
+  font: 6em/1.08em sans-serif;
+  color: #666;
+  text-align: center;
+}
+blockquote:after {
+  content: "\2013 \2003" attr(cite);
+  display: block;
+  text-align: right;
+  font-size: 0.875em;
+  color: #e70000;
+}
+
+/* https://fdossena.com/?p=html5cool/buttons/i.frag */
+button {
+  display: inline-block;
+  padding: 0.35em 1.2em;
+  border: 0.1em solid #000;
+  margin: 0 0.3em 0.3em 0;
+  border-radius: 0.12em;
+  box-sizing: border-box;
+  text-decoration: none;
+  font-family: "Roboto", sans-serif;
+  font-weight: 300;
+  font-size: 1em;
+  color: #000;
+  text-align: center;
+  transition: all 0.2s;
+}
+button:hover {
+  color: #fff;
+  background-color: #000;
+  cursor: pointer;
+}
--- a/cmd/templates/vuewebpack/frontend/src/assets/fonts/LICENSE.txt
+++ b/cmd/templates/vuewebpack/frontend/src/assets/fonts/LICENSE.txt
--- a/cmd/templates/vuewebpack/frontend/src/assets/fonts/roboto/roboto-v18-latin-regular.eot
+++ b/cmd/templates/vuewebpack/frontend/src/assets/fonts/roboto/roboto-v18-latin-regular.eot
--- a/cmd/templates/vuewebpack/frontend/src/assets/fonts/roboto/roboto-v18-latin-regular.svg
+++ b/cmd/templates/vuewebpack/frontend/src/assets/fonts/roboto/roboto-v18-latin-regular.svg
--- a/cmd/templates/vuewebpack/frontend/src/assets/fonts/roboto/roboto-v18-latin-regular.ttf
+++ b/cmd/templates/vuewebpack/frontend/src/assets/fonts/roboto/roboto-v18-latin-regular.ttf
--- a/cmd/templates/vuewebpack/frontend/src/assets/fonts/roboto/roboto-v18-latin-regular.woff
+++ b/cmd/templates/vuewebpack/frontend/src/assets/fonts/roboto/roboto-v18-latin-regular.woff
--- a/cmd/templates/vuewebpack/frontend/src/assets/fonts/roboto/roboto-v18-latin-regular.woff2
+++ b/cmd/templates/vuewebpack/frontend/src/assets/fonts/roboto/roboto-v18-latin-regular.woff2
--- a/cmd/templates/vuewebpack/frontend/src/assets/images/logo.png
+++ b/cmd/templates/vuewebpack/frontend/src/assets/images/logo.png
--- a/cmd/templates/vuewebpack/frontend/src/components/HelloWorld.vue
+++ b/cmd/templates/vuewebpack/frontend/src/components/HelloWorld.vue
@@ -0,0 +1,38 @@
+<template>
+  <div class="hello">
+    <h1>{{ msg }}</h1>
+    <p></p>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "HelloWorld",
+  props: {
+    msg: String
+  }
+};
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped>
+.hello {
+  margin-top: 2em;
+  position: relative;
+  width: 100%;
+}
+h3 {
+  margin: 40px 0 0;
+}
+ul {
+  list-style-type: none;
+  padding: 0;
+}
+li {
+  display: inline-block;
+  margin: 0 10px;
+}
+a {
+  color: gold;
+}
+</style>
--- a/cmd/templates/vuewebpack/frontend/src/components/Quote.vue
+++ b/cmd/templates/vuewebpack/frontend/src/components/Quote.vue
@@ -0,0 +1,58 @@
+<template>
+  <div class="container">
+    <blockquote v-if="quote != null" :cite="quote.person">{{ quote.text }}</blockquote>
+    <p></p>
+    <button @click="getNewQuote()">Get new Quote</button>
+  </div>
+</template>
+
+<script>
+import "../assets/css/quote.css";
+import { eventBus } from "../main";
+
+export default {
+  data() {
+    return {
+      quote: null
+    };
+  },
+  methods: {
+    getNewQuote: function() {
+      var self = this;
+      backend.QuotesCollection.GetQuote().then(result => {
+        self.quote = result;
+      });
+    }
+  },
+  created() {
+    if( !backend ) {
+    eventBus.$on("ready", this.getNewQuote);
+    } else {
+      this.getNewQuote();
+    }
+  }
+};
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped>
+.hello {
+  margin-top: 2em;
+  position: relative;
+  width: 100%;
+}
+h3 {
+  margin: 40px 0 0;
+}
+ul {
+  list-style-type: none;
+  padding: 0;
+}
+li {
+  display: inline-block;
+  margin: 0 10px;
+}
+a {
+  color: gold;
+}
+</style>
--- a/cmd/templates/vuewebpack/frontend/src/main.js
+++ b/cmd/templates/vuewebpack/frontend/src/main.js
@@ -0,0 +1,13 @@
+import Vue from "vue";
+export const eventBus = new Vue();
+
+import App from "./App.vue";
+new Vue({
+  render: h => h(App)
+}).$mount("#app");
+
+import Bridge from "./wailsbridge";
+Bridge.OnReady(() => {
+  eventBus.$emit("ready");
+});
+Bridge.Start();
--- a/cmd/templates/vuewebpack/frontend/vue.config.js
+++ b/cmd/templates/vuewebpack/frontend/vue.config.js
@@ -0,0 +1,35 @@
+
+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: {
+    extract: {
+      filename: '[name].css',
+      chunkFilename: '[name].css',
+    }
+  },
+  configureWebpack: {
+    output: {
+      filename: '[name].js',
+    },
+    optimization: {
+      splitChunks: false
+    }
+  },
+
+}
--- a/cmd/templates/vuewebpack/go.mod.template
+++ b/cmd/templates/vuewebpack/go.mod.template
--- a/cmd/templates/vuewebpack/main.go.template
+++ b/cmd/templates/vuewebpack/main.go.template
@@ -0,0 +1,21 @@
+package main
+
+import (
+	"github.com/gobuffalo/packr"
+	"github.com/wailsapp/wails"
+)
+
+func main() {
+
+	assets := packr.NewBox("./frontend/dist")
+
+	app := wails.CreateApp(&wails.AppConfig{
+		Width:  1024,
+		Height: 768,
+		Title:  "{{.Name}}",
+		JS:     wails.BoxString(&assets, "app.js"),
+		CSS:    wails.BoxString(&assets, "app.css"),
+	})
+	app.Bind(newQuotesCollection())
+	app.Run()
+}
--- a/cmd/templates/vuewebpack/quotes.go
+++ b/cmd/templates/vuewebpack/quotes.go
@@ -0,0 +1,61 @@
+package main
+
+import (
+	"math/rand"
+	"time"
+)
+
+// Quote holds a single quote and the person who said it
+type Quote struct {
+	Text   string `json:"text"`
+	Person string `json:"person"`
+}
+
+// QuotesCollection holds a collection of quotes!
+type QuotesCollection struct {
+	quotes []*Quote
+}
+
+// AddQuote creates a Quote object with the given inputs and
+// adds it to the Quotes collection
+func (Q *QuotesCollection) AddQuote(text, person string) {
+	Q.quotes = append(Q.quotes, &Quote{Text: text, Person: person})
+}
+
+// GetQuote returns a random Quote object from the Quotes collection
+func (Q *QuotesCollection) GetQuote() *Quote {
+	return Q.quotes[rand.Intn(len(Q.quotes))]
+}
+
+// newQuotesCollection creates a new QuotesCollection
+func newQuotesCollection() *QuotesCollection {
+	result := &QuotesCollection{}
+	rand.Seed(time.Now().Unix())
+	result.AddQuote("Age is an issue of mind over matter. If you don't mind, it doesn't matter", "Mark Twain")
+	result.AddQuote("Anyone who stops learning is old, whether at twenty or eighty. Anyone who keeps learning stays young. The greatest thing in life is to keep your mind young", "Henry Ford")
+	result.AddQuote("Wrinkles should merely indicate where smiles have been", "Mark Twain")
+	result.AddQuote("True terror is to wake up one morning and discover that your high school class is running the country", "Kurt Vonnegut")
+	result.AddQuote("A diplomat is a man who always remembers a woman's birthday but never remembers her age", "Robert Frost")
+	result.AddQuote("As I grow older, I pay less attention to what men say. I just watch what they do", "Andrew Carnegie")
+	result.AddQuote("How incessant and great are the ills with which a prolonged old age is replete", "C. S. Lewis")
+	result.AddQuote("Old age, believe me, is a good and pleasant thing. It is true you are gently shouldered off the stage, but then you are given such a comfortable front stall as spectator", "Confucius")
+	result.AddQuote("Old age has deformities enough of its own. It should never add to them the deformity of vice", "Eleanor Roosevelt")
+	result.AddQuote("Nobody grows old merely by living a number of years. We grow old by deserting our ideals. Years may wrinkle the skin, but to give up enthusiasm wrinkles the soul", "Samuel Ullman")
+	result.AddQuote("An archaeologist is the best husband a woman can have. The older she gets the more interested he is in her", "Agatha Christie")
+	result.AddQuote("All diseases run into one, old age", "Ralph Waldo Emerson")
+	result.AddQuote("Bashfulness is an ornament to youth, but a reproach to old age", "Aristotle")
+	result.AddQuote("Like everyone else who makes the mistake of getting older, I begin each day with coffee and obituaries", "Bill Cosby")
+	result.AddQuote("Age appears to be best in four things old wood best to burn, old wine to drink, old friends to trust, and old authors to read", "Francis Bacon")
+	result.AddQuote("None are so old as those who have outlived enthusiasm", "Henry David Thoreau")
+	result.AddQuote("Every man over forty is a scoundrel", "George Bernard Shaw")
+	result.AddQuote("Forty is the old age of youth fifty the youth of old age", "Victor Hugo")
+	result.AddQuote("You can't help getting older, but you don't have to get old", "George Burns")
+	result.AddQuote("Alas, after a certain age every man is responsible for his face", "Albert Camus")
+	result.AddQuote("Youth is when you're allowed to stay up late on New Year's Eve. Middle age is when you're forced to", "Bill Vaughan")
+	result.AddQuote("Old age is like everything else. To make a success of it, you've got to start young", "Theodore Roosevelt")
+	result.AddQuote("A comfortable old age is the reward of a well-spent youth. Instead of its bringing sad and melancholy prospects of decay, it would give us hopes of eternal youth in a better world", "Maurice Chevalier")
+	result.AddQuote("A man growing old becomes a child again", "Sophocles")
+	result.AddQuote("I will never be an old man. To me, old age is always 15 years older than I am", "Francis Bacon")
+	result.AddQuote("Age considers youth ventures", "Rabindranath Tagore")
+	return result
+}
--- a/cmd/templates/vuewebpack/template.json
+++ b/cmd/templates/vuewebpack/template.json
@@ -1,5 +1,5 @@
 {
-  "name": "Vue2/Webpack Basic",
+  "name": "Vue2/Webpack",
  "shortdescription": "A basic Vue2/WebPack4 template",
  "description": "A basic template using Vue 2 and bundled using Webpack 4",
  "author": "Lea Anthony<lea.anthony@gmail.com>",
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -1,4 +1,5 @@
 package cmd

 // Version - Wails version
-const Version = "v0.14.9-pre"
+// ...oO(There must be a better way)
+const Version = "v0.7.2"
--- a/cmd/wails/0_setup.go
+++ b/cmd/wails/0_setup.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"runtime"

+	"github.com/leaanthony/spinner"
 	"github.com/wailsapp/wails/cmd"
 )

@@ -18,13 +19,9 @@ func init() {

 	setupCommand.Action(func() error {

-		logger.PrintBanner()
-
-		var err error
-
 		system := cmd.NewSystemHelper()
-		err = system.Initialise()
-		if err == nil {
+		err := system.Initialise()
+		if err != nil {
 			return err
 		}

@@ -41,29 +38,35 @@ Create your first project by running 'wails init'.`

 		// Check we have a cgo capable environment
 		logger.Yellow("Checking for prerequisites...")
-		var requiredProgramErrors bool
-		requiredProgramErrors, err = checkRequiredPrograms()
+		errors, err := checkRequiredPrograms()
 		if err != nil {
 			return err
 		}

 		// Linux has library deps
-		var libraryErrors bool
-		libraryErrors, err = checkLibraries()
+		errors, err = checkLibraries()
 		if err != nil {
 			return err
 		}

-		// Check Mewn
-		err = cmd.CheckMewn()
-		if err != nil {
-			return err
+		// packr
+		err = cmd.CheckPackr()
+
+		programHelper := cmd.NewProgramHelper()
+		if !programHelper.IsInstalled("packr") {
+			buildSpinner := spinner.New()
+			buildSpinner.SetSpinSpeed(50)
+			buildSpinner.Start("Installing packr...")
+			err := programHelper.InstallGoPackage("github.com/gobuffalo/packr/...")
+			if err != nil {
+				buildSpinner.Error()
+				return err
+			}
+			buildSpinner.Success()
 		}

 		logger.White("")

-		// Check for errors
-		var errors = libraryErrors || requiredProgramErrors
 		if !errors {
 			logger.Yellow(successMessage)
 		}
--- a/cmd/wails/10.1_dev_newtemplate.go
+++ b/cmd/wails/10.1_dev_newtemplate.go
@@ -1,121 +0,0 @@
-// +build dev
-
-package main
-
-import (
-	"fmt"
-	"time"
-
-	"github.com/wailsapp/wails/cmd"
-	"gopkg.in/AlecAivazis/survey.v1"
-)
-
-var templateHelper = cmd.NewTemplateHelper()
-
-var qs = []*survey.Question{
-	{
-		Name:     "Name",
-		Prompt:   &survey.Input{Message: "Please enter the name of your template (eg: React/Webpack Basic):"},
-		Validate: survey.Required,
-	},
-	{
-		Name:     "ShortDescription",
-		Prompt:   &survey.Input{Message: "Please enter a short description for the template (eg: React with Webpack 4):"},
-		Validate: survey.Required,
-	},
-	{
-		Name:     "Description",
-		Prompt:   &survey.Input{Message: "Please enter a long description:"},
-		Validate: survey.Required,
-	},
-	{
-		Name:     "FrontendDir",
-		Prompt:   &survey.Input{Message: "Please enter the name of the directory the frontend code resides (eg: frontend):"},
-		Validate: survey.Required,
-	},
-	{
-		Name:     "Install",
-		Prompt:   &survey.Input{Message: "Please enter the install command (eg: npm install):"},
-		Validate: survey.Required,
-	},
-	{
-		Name:     "Build",
-		Prompt:   &survey.Input{Message: "Please enter the build command (eg: npm run build):"},
-		Validate: survey.Required,
-	},
-	{
-		Name:     "Serve",
-		Prompt:   &survey.Input{Message: "Please enter the serve command (eg: npm run serve):"},
-		Validate: survey.Required,
-	},
-	{
-		Name:     "Bridge",
-		Prompt:   &survey.Input{Message: "Please enter the name of the directory to copy the wails bridge runtime (eg: src):"},
-		Validate: survey.Required,
-	},
-}
-
-func newTemplate(devCommand *cmd.Command) {
-
-	commandDescription := `This command scaffolds everything needed to develop a new template.`
-	newTemplate := devCommand.Command("newtemplate", "Generate a new template").
-		LongDescription(commandDescription)
-
-	newTemplate.Action(func() error {
-		logger.PrintSmallBanner("Generating new project template")
-		fmt.Println()
-
-		var answers cmd.TemplateMetadata
-
-		// perform the questions
-		err := survey.Ask(qs, &answers)
-		if err != nil {
-			fmt.Println(err.Error())
-			return err
-		}
-
-		dirname := templateHelper.SanitizeFilename(answers.Name)
-		prompt := []*survey.Question{{
-			Prompt: &survey.Input{
-				Message: "Please enter a directory name for the template:",
-				Default: dirname,
-			},
-			Validate: func(val interface{}) error {
-				err := survey.Required(val)
-				if err != nil {
-					return err
-				}
-				if templateHelper.IsValidTemplate(val.(string)) {
-					return fmt.Errorf("template directory already exists")
-				}
-				if templateHelper.SanitizeFilename(val.(string)) != val.(string) {
-					return fmt.Errorf("invalid directory name '%s'", val.(string))
-				}
-				return nil
-			},
-		}}
-		err = survey.Ask(prompt, &dirname)
-		if err != nil {
-			return err
-		}
-
-		answers.Version = "1.0.0"
-		answers.Created = time.Now().String()
-
-		// Get Author info from system info
-		system := cmd.NewSystemHelper()
-		author, err := system.GetAuthor()
-		if err == nil {
-			answers.Author = author
-		}
-
-		templateDirectory, err := templateHelper.CreateNewTemplate(dirname, &answers)
-		if err != nil {
-			return err
-		}
-
-		logger.Green("Created new template '%s' in directory '%s'", answers.Name, templateDirectory)
-
-		return nil
-	})
-}
--- a/cmd/wails/10_dev.go
+++ b/cmd/wails/10_dev.go
@@ -1,18 +0,0 @@
-// +build dev
-
-package main
-
-func init() {
-
-	commandDescription := `This command provides access to developer tooling.`
-	devCommand := app.Command("dev", "A selection of developer tools").
-		LongDescription(commandDescription)
-
-	// Add subcommands
-	newTemplate(devCommand)
-
-	devCommand.Action(func() error {
-		devCommand.PrintHelp()
-		return nil
-	})
-}
--- a/cmd/wails/2_init.go
+++ b/cmd/wails/2_init.go
@@ -2,10 +2,7 @@ package main

 import (
 	"fmt"
-	"os"
-	"path/filepath"

-	"github.com/leaanthony/spinner"
 	"github.com/wailsapp/wails/cmd"
 )

@@ -27,7 +24,7 @@ Any flags that are required and not given will be prompted for.`

 	initCommand.Action(func() error {

-		logger.PrintSmallBanner("Initialising project")
+		logger.WhiteUnderline("Initialising project")
 		fmt.Println()

 		// Check if the system is initialised
@@ -53,33 +50,11 @@ Any flags that are required and not given will be prompted for.`
 			}
 		}

-		genSpinner := spinner.NewSpinner()
-		genSpinner.SetSpinSpeed(50)
-		genSpinner.Start("Generating project...")
-
 		// Generate the project
 		err = projectHelper.GenerateProject(projectOptions)
 		if err != nil {
-			genSpinner.Error()
-			return err
+			logger.Error(err.Error())
 		}
-		genSpinner.Success()
-
-		// Build the project
-		cwd, _ := os.Getwd()
-		projectDir := filepath.Join(cwd, projectOptions.OutputDirectory)
-		program := cmd.NewProgramHelper()
-		buildSpinner := spinner.NewSpinner()
-		buildSpinner.SetSpinSpeed(50)
-		buildSpinner.Start("Building project (this may take a while)...")
-		err = program.RunCommandArray([]string{"wails", "build"}, projectDir)
-		if err != nil {
-			buildSpinner.Error(err.Error())
-			return err
-		}
-		buildSpinner.Success()
-		logger.Yellow("Project '%s' built in directory '%s'!", projectOptions.Name, projectOptions.OutputDirectory)
-
 		return err
 	})
 }
--- a/cmd/wails/4_build.go
+++ b/cmd/wails/4_build.go
@@ -24,16 +24,12 @@ func init() {
 		BoolFlag("d", "Build in Debug mode", &debugMode)

 	initCmd.Action(func() error {
-
+		log := cmd.NewLogger()
 		message := "Building Application"
-		if packageApp {
-			message = "Packaging Application"
-		}
 		if forceRebuild {
 			message += " (force rebuild)"
 		}
-		logger.PrintSmallBanner(message)
-		fmt.Println()
+		log.WhiteUnderline(message)

 		// Project options
 		projectOptions := &cmd.ProjectOptions{}
@@ -43,7 +39,7 @@ func init() {
 		fs := cmd.NewFSHelper()
 		err := projectOptions.LoadConfig(fs.Cwd())
 		if err != nil {
-			return fmt.Errorf("Unable to find 'project.json'. Please check you are in a Wails project directory")
+			return err
 		}

 		// Validate config
@@ -63,12 +59,18 @@ func init() {
 			}
 		}

+		// Check Packr is installed
+		err = cmd.CheckPackr()
+		if err != nil {
+			return err
+		}
+
 		// Save project directory
 		projectDir := fs.Cwd()

 		// Install deps
 		if projectOptions.FrontEnd != nil {
-			err = cmd.InstallFrontendDeps(projectDir, projectOptions, forceRebuild, "build")
+			err = cmd.InstallFrontendDeps(projectDir, projectOptions, forceRebuild)
 			if err != nil {
 				return err
 			}
@@ -87,16 +89,23 @@ func init() {
 		}

 		// Build application
-		buildMode := cmd.BuildModeProd
+		buildMode := "prod"
 		if debugMode {
-			buildMode = cmd.BuildModeDebug
+			buildMode = "debug"
 		}
-
-		err = cmd.BuildApplication(projectOptions.BinaryName, forceRebuild, buildMode, packageApp, projectOptions)
+		err = cmd.BuildApplication(projectOptions.BinaryName, forceRebuild, buildMode)
 		if err != nil {
 			return err
 		}

+		// Package application
+		if packageApp {
+			err = cmd.PackageApplication(projectOptions)
+			if err != nil {
+				return err
+			}
+		}
+
 		logger.Yellow("Awesome! Project '%s' built!", projectOptions.Name)

 		return nil
--- a/cmd/wails/6_serve.go
+++ b/cmd/wails/6_serve.go
@@ -2,6 +2,7 @@ package main

 import (
 	"fmt"
+	"os"

 	"github.com/leaanthony/spinner"
 	"github.com/wailsapp/wails/cmd"
@@ -14,21 +15,17 @@ func init() {
 	buildSpinner.SetSpinSpeed(50)

 	commandDescription := `This command builds then serves your application in bridge mode. Useful for developing your app in a browser.`
-	initCmd := app.Command("serve", "Run your Wails project in bridge mode").
+	initCmd := app.Command("serve", "Run your Wails project in bridge mode.").
 		LongDescription(commandDescription).
 		BoolFlag("f", "Force rebuild of application components", &forceRebuild)

 	initCmd.Action(func() error {
-
-		message := "Serving Application"
-		logger.PrintSmallBanner(message)
-		fmt.Println()
-
-		// Check Mewn is installed
-		err := cmd.CheckMewn()
-		if err != nil {
-			return err
+		log := cmd.NewLogger()
+		message := "Building Application"
+		if forceRebuild {
+			message += " (force rebuild)"
 		}
+		log.WhiteUnderline(message)

 		// Project options
 		projectOptions := &cmd.ProjectOptions{}
@@ -36,7 +33,30 @@ func init() {
 		// Check we are in project directory
 		// Check project.json loads correctly
 		fs := cmd.NewFSHelper()
-		err = projectOptions.LoadConfig(fs.Cwd())
+		err := projectOptions.LoadConfig(fs.Cwd())
+		if err != nil {
+			return err
+		}
+
+		// Validate config
+		// Check if we have a frontend
+		err = cmd.ValidateFrontendConfig(projectOptions)
+		if err != nil {
+			return err
+		}
+
+		// Program checker
+		program := cmd.NewProgramHelper()
+
+		if projectOptions.FrontEnd != nil {
+			// npm
+			if !program.IsInstalled("npm") {
+				return fmt.Errorf("it appears npm is not installed. Please install and run again")
+			}
+		}
+
+		// Check Packr is installed
+		err = cmd.CheckPackr()
 		if err != nil {
 			return err
 		}
@@ -44,8 +64,16 @@ func init() {
 		// Save project directory
 		projectDir := fs.Cwd()

-		// Install the bridge library
-		err = cmd.InstallBridge("serve", projectDir, projectOptions)
+		// Install deps
+		if projectOptions.FrontEnd != nil {
+			err = cmd.InstallFrontendDeps(projectDir, projectOptions, forceRebuild)
+			if err != nil {
+				return err
+			}
+		}
+
+		// Run packr in project directory
+		err = os.Chdir(projectDir)
 		if err != nil {
 			return err
 		}
@@ -56,8 +84,8 @@ func init() {
 			return err
 		}

-		buildMode := cmd.BuildModeBridge
-		err = cmd.BuildApplication(projectOptions.BinaryName, forceRebuild, buildMode, false, projectOptions)
+		buildMode := "bridge"
+		err = cmd.BuildApplication(projectOptions.BinaryName, forceRebuild, buildMode)
 		if err != nil {
 			return err
 		}
--- a/cmd/wails/8_update.go
+++ b/cmd/wails/8_update.go
@@ -1,164 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"log"
-
-	"github.com/leaanthony/spinner"
-	"github.com/mitchellh/go-homedir"
-	"github.com/wailsapp/wails/cmd"
-)
-
-func init() {
-
-	var prereleaseRequired bool
-	var specificVersion string
-
-	// var forceRebuild = false
-	checkSpinner := spinner.NewSpinner()
-	checkSpinner.SetSpinSpeed(50)
-
-	commandDescription := `This command allows you to update your version of Wails.`
-	updateCmd := app.Command("update", "Update to newer [pre]releases or specific versions").
-		LongDescription(commandDescription).
-		BoolFlag("pre", "Update to latest Prerelease", &prereleaseRequired).
-		StringFlag("version", "Install a specific version (Overrides other flags)", &specificVersion)
-
-	updateCmd.Action(func() error {
-
-		message := "Checking for updates..."
-		logger.PrintSmallBanner(message)
-		fmt.Println()
-
-		// Get versions
-		checkSpinner.Start(message)
-
-		github := cmd.NewGitHubHelper()
-		var desiredVersion *cmd.SemanticVersion
-		var err error
-		var valid bool
-
-		if len(specificVersion) > 0 {
-			// Check if this is a valid version
-			valid, err = github.IsValidTag(specificVersion)
-			if err == nil {
-				if !valid {
-					err = fmt.Errorf("version '%s' is invalid", specificVersion)
-				} else {
-					desiredVersion, err = cmd.NewSemanticVersion(specificVersion)
-				}
-			}
-		} else {
-			if prereleaseRequired {
-				desiredVersion, err = github.GetLatestPreRelease()
-			} else {
-				desiredVersion, err = github.GetLatestStableRelease()
-			}
-		}
-		if err != nil {
-			checkSpinner.Error(err.Error())
-			return err
-		}
-		checkSpinner.Success()
-		fmt.Println()
-
-		fmt.Println("    Current Version : " + cmd.Version)
-
-		if len(specificVersion) > 0 {
-			fmt.Printf("    Desired Version : v%s\n", desiredVersion)
-		} else {
-			if prereleaseRequired {
-				fmt.Printf("  Latest Prerelease : v%s\n", desiredVersion)
-			} else {
-				fmt.Printf("     Latest Release : v%s\n", desiredVersion)
-			}
-		}
-
-		return updateToVersion(desiredVersion, len(specificVersion) > 0)
-	})
-}
-
-func updateToVersion(targetVersion *cmd.SemanticVersion, force bool) error {
-
-	var targetVersionString = "v" + targetVersion.String()
-
-	// Early exit
-	if targetVersionString == cmd.Version {
-		logger.Green("Looks like you're up to date!")
-		return nil
-	}
-
-	var desiredVersion string
-
-	if !force {
-
-		compareVersion := cmd.Version
-
-		currentVersion, err := cmd.NewSemanticVersion(compareVersion)
-		if err != nil {
-			return err
-		}
-
-		var success bool
-
-		// Release -> Pre-Release = Massage current version to prerelease format
-		if targetVersion.IsPreRelease() && currentVersion.IsRelease() {
-			testVersion, err := cmd.NewSemanticVersion(compareVersion + "-0")
-			if err != nil {
-				return err
-			}
-			success, _ = targetVersion.IsGreaterThan(testVersion)
-		}
-		// Pre-Release -> Release = Massage target version to prerelease format
-		if targetVersion.IsRelease() && currentVersion.IsPreRelease() {
-			// We are ok with greater than or equal
-			mainversion := currentVersion.MainVersion()
-			targetVersion, err = cmd.NewSemanticVersion(targetVersion.String())
-			if err != nil {
-				return err
-			}
-			success, _ = targetVersion.IsGreaterThanOrEqual(mainversion)
-		}
-
-		// Release -> Release = Standard check
-		if (targetVersion.IsRelease() && currentVersion.IsRelease()) ||
-			(targetVersion.IsPreRelease() && currentVersion.IsPreRelease()) {
-
-			success, _ = targetVersion.IsGreaterThan(currentVersion)
-		}
-
-		// Compare
-		if !success {
-			logger.Red("The requested version is lower than the current version.")
-			logger.Red("If this is what you really want to do, use `wails update -version %s`", targetVersionString)
-			return nil
-		}
-
-		desiredVersion = "v" + targetVersion.String()
-
-	} else {
-		desiredVersion = "v" + targetVersion.String()
-	}
-
-	fmt.Println()
-	updateSpinner := spinner.NewSpinner()
-	updateSpinner.SetSpinSpeed(40)
-	updateSpinner.Start("Installing Wails " + desiredVersion)
-
-	// Run command in non module directory
-	homeDir, err := homedir.Dir()
-	if err != nil {
-		log.Fatal("Cannot find home directory! Please file a bug report!")
-	}
-
-	err = cmd.NewProgramHelper().RunCommandArray([]string{"go", "get", "github.com/wailsapp/wails/cmd/wails@" + desiredVersion}, homeDir)
-	if err != nil {
-		updateSpinner.Error(err.Error())
-		return err
-	}
-	updateSpinner.Success()
-	fmt.Println()
-	logger.Green("Wails updated to " + desiredVersion)
-
-	return nil
-}
--- a/cmd/wails/9_issue.go
+++ b/cmd/wails/9_issue.go
@@ -1,74 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"os"
-	"runtime"
-	"strings"
-
-	"github.com/pkg/browser"
-
-	"github.com/wailsapp/wails/cmd"
-)
-
-func init() {
-
-	commandDescription := `Generates an issue in Github using the given title, description and system report.`
-
-	initCommand := app.Command("issue", "Generates an issue in Github").
-		LongDescription(commandDescription)
-
-	initCommand.Action(func() error {
-
-		logger.PrintSmallBanner("Generate Issue")
-		fmt.Println()
-		message := `Thanks for taking the time to submit an issue!
-
-To help you in this process, we will ask for some information, add Go/Wails details automatically, then prepare the issue for your editing and submission.
-`
-
-		logger.Yellow(message)
-
-		title := cmd.Prompt("Issue Title")
-		description := cmd.Prompt("Issue Description")
-
-		var str strings.Builder
-
-		gomodule, exists := os.LookupEnv("GO111MODULE")
-		if !exists {
-			gomodule = "(Not Set)"
-		}
-
-		str.WriteString("\n| Name   | Value |\n| ----- | ----- |\n")
-		str.WriteString(fmt.Sprintf("| Wails Version | %s |\n", cmd.Version))
-		str.WriteString(fmt.Sprintf("| Go Version    | %s |\n", runtime.Version()))
-		str.WriteString(fmt.Sprintf("| Platform      | %s |\n", runtime.GOOS))
-		str.WriteString(fmt.Sprintf("| Arch          | %s |\n", runtime.GOARCH))
-		str.WriteString(fmt.Sprintf("| GO111MODULE   | %s |\n", gomodule))
-
-		fmt.Println()
-		fmt.Println("Processing template and preparing for upload.")
-
-		// Grab issue template
-		resp, err := http.Get("https://raw.githubusercontent.com/wailsapp/wails/master/.github/ISSUE_TEMPLATE/bug_report.md")
-		if err != nil {
-			logger.Red("Unable to read in issue template. Are you online?")
-			os.Exit(1)
-		}
-		defer resp.Body.Close()
-		template, _ := ioutil.ReadAll(resp.Body)
-		body := string(template)
-		body = "**Description**\n" + (strings.Split(body, "**Description**")[1])
-		fullURL := "https://github.com/wailsapp/wails/issues/new?"
-		body = strings.Replace(body, "A clear and concise description of what the bug is.", description, -1)
-		body = strings.Replace(body, "Please provide your platform, GO version and variables, etc", str.String(), -1)
-		params := "title=" + title + "&body=" + body
-
-		fmt.Println("Opening browser to file issue.")
-		browser.OpenURL(fullURL + url.PathEscape(params))
-		return nil
-	})
-}
--- a/cmd/wails/main.go
+++ b/cmd/wails/main.go
@@ -10,8 +10,15 @@ var logger = cmd.NewLogger()
 // Create main app
 var app = cmd.NewCli("wails", "A cli tool for building Wails applications.")

+// Prints the cli banner
+func printBanner(app *cmd.Cli) error {
+	logger.PrintBanner()
+	return nil
+}
+
 // Main!
 func main() {
+	app.PreRun(printBanner)
 	err := app.Run()
 	if err != nil {
 		logger.Error(err.Error())
--- a/cmd/windows.go
+++ b/cmd/windows.go
@@ -1,19 +0,0 @@
-// +build windows
-
-package cmd
-
-import (
-	"os"
-
-	"golang.org/x/sys/windows"
-)
-
-// Credit: https://stackoverflow.com/a/52579002
-
-func init() {
-	stdout := windows.Handle(os.Stdout.Fd())
-	var originalMode uint32
-
-	_ = windows.GetConsoleMode(stdout, &originalMode)
-	_ = windows.SetConsoleMode(stdout, originalMode|windows.ENABLE_VIRTUAL_TERMINAL_PROCESSING)
-}
--- a/event_manager.go
+++ b/event_manager.go
@@ -87,7 +87,7 @@ func (e *eventManager) start(renderer Renderer) {
 	var wg sync.WaitGroup
 	wg.Add(1)

-	// Run main loop in separate goroutine
+	// Run main loop in seperate goroutine
 	go func() {
 		wg.Done()
 		e.log.Info("Listening")
@@ -126,7 +126,7 @@ func (e *eventManager) start(renderer Renderer) {
 					}
 				}

-				// Remove expired listeners in place
+				// Remove expired listners in place
 				if len(listenersToRemove) > 0 {
 					listeners := e.listeners[event.Name][:0]
 					for _, listener := range listeners {
--- a/go.mod
+++ b/go.mod
@@ -1,31 +1,23 @@
 module github.com/wailsapp/wails

 require (
-	github.com/Masterminds/semver v1.4.2 // indirect
+	github.com/AlecAivazis/survey v1.7.1
+	github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc // indirect
 	github.com/dchest/cssmin v0.0.0-20151210170030-fb8d9b44afdc // indirect
 	github.com/dchest/htmlmin v0.0.0-20150526090704-e254725e81ac
 	github.com/dchest/jsmin v0.0.0-20160823214000-faeced883947 // indirect
 	github.com/fatih/color v1.7.0
 	github.com/go-playground/colors v1.2.0
+	github.com/gobuffalo/packr v1.21.9
 	github.com/gorilla/websocket v1.4.0
 	github.com/jackmordaunt/icns v1.0.0
-	github.com/kennygrant/sanitize v1.2.4
-	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
-	github.com/leaanthony/mewn v0.10.7
-	github.com/leaanthony/slicer v1.3.1
+	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
+	github.com/leaanthony/slicer v0.0.0-20190110113548-aa9ea12f976a
 	github.com/leaanthony/spinner v0.5.0
-	github.com/masterminds/semver v1.4.2
-	github.com/mattn/go-colorable v0.1.1 // indirect
-	github.com/mattn/go-isatty v0.0.7 // indirect
-	github.com/mitchellh/go-homedir v1.1.0
+	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
+	github.com/mitchellh/go-homedir v1.0.0
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
-	github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4
-	github.com/pkg/errors v0.8.1 // indirect
-	github.com/sirupsen/logrus v1.4.1
-	github.com/stretchr/testify v1.3.0 // indirect
-	github.com/wailsapp/webview v0.2.7
-	golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529 // indirect
-	golang.org/x/net v0.0.0-20190509222800-a4d6f7feada5 // indirect
-	golang.org/x/sys v0.0.0-20190509141414-a5b02f93d862
-	gopkg.in/AlecAivazis/survey.v1 v1.8.4
+	github.com/sirupsen/logrus v1.2.0
+	golang.org/x/net v0.0.0-20190107155100-1a61f4433d85 // indirect
+	gopkg.in/AlecAivazis/survey.v1 v1.7.1 // indirect
 )
--- a/Show More
+++ b/Show More