diff --git a/index.js b/index.js
index 5b692ca4c9..c5d7ee2547 100644
--- a/index.js
+++ b/index.js
@@ -3,12 +3,14 @@ var net = require('net');
 var os = require('os');
 var fs = require('fs');
 var path = require('path');
+var exec = require('exec');
 
+var autoUpdater = require('auto-updater');
 var app = require('app');
 var BrowserWindow = require('browser-window');
+var ipc = require('ipc');
 
 var dirname = __dirname;
-console.log(dirname);
 
 var freeport = function (callback) {
   var server = net.createServer();
@@ -116,33 +118,75 @@ app.on('activate-with-no-open-windows', function () {
 
 app.on('ready', function() {
   start(function (url, nodeChild, mongoChild) {
-    var cleanUpChildren = function () {
-      console.log('Cleaning up children.');
-      mongoChild.kill();
-      nodeChild.kill();
-      app.quit();
-      process.exit();
-    };
-
-    if (nodeChild && mongoChild) {
-      process.on('exit', cleanUpChildren);
-      process.on('uncaughtException', cleanUpChildren);
-      process.on('SIGINT', cleanUpChildren);
-      process.on('SIGTERM', cleanUpChildren);
-    }
 
     // Create the browser window.
     var windowOptions = {
       width: 800,
       height: 578,
-      frame: false,
       resizable: false,
+      frame: false,
       'web-preferences': {
         'web-security': false
       }
     };
     mainWindow = new BrowserWindow(windowOptions);
-    mainWindow.focus();
+    mainWindow.hide();
     mainWindow.loadUrl(url);
+
+    process.on('uncaughtException', app.quit);
+
+    var saveVMOnQuit = true;
+    app.on('will-quit', function (e) {
+      console.log('Cleaning up children.');
+      if (nodeChild) {
+        nodeChild.kill();
+      }
+      if (mongoChild) {
+        mongoChild.kill();
+      }
+      if (saveVMOnQuit) {
+        exec('VBoxManage controlvm boot2docker-vm savestate', function (stderr, stdout, code) {});
+      }
+    });
+
+    mainWindow.webContents.on('new-window', function (e) {
+      e.preventDefault();
+    });
+
+    mainWindow.webContents.on('did-finish-load', function() {
+      mainWindow.show();
+      mainWindow.focus();
+
+      // Auto Updates
+      autoUpdater.setFeedUrl('https://updates.kitematic.com/releases/latest?version=' + app.getVersion());
+
+      autoUpdater.on('checking-for-update', function (e) {
+        console.log('Checking for update...');
+      });
+
+      autoUpdater.on('update-available', function (e) {
+        console.log('Update available.');
+        console.log(e);
+      });
+
+      autoUpdater.on('update-not-available', function (e) {
+        console.log('Update not available.');
+      });
+
+      autoUpdater.on('update-downloaded', function (e, releaseNotes, releaseName, releaseDate, updateURL) {
+        console.log('Update downloaded.');
+        mainWindow.webContents.send('notify', 'window:update-available');
+      });
+
+      ipc.on('command', function (event, arg) {
+        console.log('Command: ' + arg);
+        if (arg === 'application:quit-install') {
+          saveVMOnQuit = false;
+          autoUpdater.quitAndInstall();
+        }
+      });
+
+      autoUpdater.checkForUpdates();
+    });
   });
 });
diff --git a/meteor/.meteor/release b/meteor/.meteor/release
index 7057f80807..87bf495278 100755
--- a/meteor/.meteor/release
+++ b/meteor/.meteor/release
@@ -1 +1 @@
-METEOR@0.9.4
+METEOR@1.0
diff --git a/meteor/.meteor/versions b/meteor/.meteor/versions
index 7664d0329a..c821689bcb 100644
--- a/meteor/.meteor/versions
+++ b/meteor/.meteor/versions
@@ -1,16 +1,16 @@
 application-configuration@1.0.3
-autoupdate@1.1.2
+autoupdate@1.1.3
 base64@1.0.1
 binary-heap@1.0.1
 blaze-tools@1.0.1
-blaze@2.0.2
+blaze@2.0.3
 boilerplate-generator@1.0.1
 callback-hook@1.0.1
 check@1.0.2
 ctl-helper@1.0.4
 ctl@1.0.2
 dburles:collection-helpers@1.0.1
-ddp@1.0.10
+ddp@1.0.11
 deps@1.0.5
 ejson@1.0.4
 fastclick@1.0.1
@@ -18,23 +18,28 @@ follower-livedata@1.0.2
 geojson-utils@1.0.1
 html-tools@1.0.2
 htmljs@1.0.2
-http@1.0.7
+http@1.0.8
 id-map@1.0.1
-iron:core@0.3.4
-iron:dynamic-template@0.4.1
-iron:layout@0.4.1
-iron:router@0.9.4
+iron:controller@1.0.2
+iron:core@1.0.2
+iron:dynamic-template@1.0.2
+iron:layout@1.0.2
+iron:location@1.0.2
+iron:middleware-stack@1.0.2
+iron:router@1.0.2
+iron:url@1.0.2
 jquery@1.0.1
 json@1.0.1
-less@1.0.10
+launch-screen@1.0.0
+less@1.0.11
 livedata@1.0.11
-logging@1.0.4
-meteor-platform@1.1.2
-meteor@1.1.2
-minifiers@1.1.1
-minimongo@1.0.4
+logging@1.0.5
+meteor-platform@1.2.0
+meteor@1.1.3
+minifiers@1.1.2
+minimongo@1.0.5
 mobile-status-bar@1.0.1
-mongo@1.0.7
+mongo@1.0.8
 mrt:underscore-string-latest@2.3.3
 observe-sequence@1.0.3
 ordered-dict@1.0.1
@@ -44,17 +49,17 @@ reactive-dict@1.0.4
 reactive-var@1.0.3
 reload@1.1.1
 retry@1.0.1
-reywood:iron-router-ga@0.3.2
+reywood:iron-router-ga@0.4.1
 routepolicy@1.0.2
-session@1.0.3
+session@1.0.4
 simison:bootstrap3-less@0.3.0
 spacebars-compiler@1.0.3
 spacebars@1.0.3
 standard-app-packages@1.0.3
-templating@1.0.8
+templating@1.0.9
 tracker@1.0.3
 ui@1.0.4
 underscore@1.0.1
-url@1.0.1
+url@1.0.2
 webapp-hashing@1.0.1
-webapp@1.1.3
+webapp@1.1.4
diff --git a/meteor/client/lib/apputil.js b/meteor/client/lib/apputil.js
index 5ae1610f14..8ceb1c8133 100644
--- a/meteor/client/lib/apputil.js
+++ b/meteor/client/lib/apputil.js
@@ -1,52 +1,33 @@
 var exec = require('exec');
 var path = require('path');
 var fs = require('fs');
+var async = require('async');
 var Convert = require('ansi-to-html');
 var convert = new Convert();
 
 AppUtil = {};
 
-AppUtil.run = function (app) {
+AppUtil.run = function (app, callback) {
   var image = Images.findOne({_id: app.imageId});
-  // Delete old container if one already exists
+  Apps.update(app._id, {$set: {
+    status: 'STARTING'
+  }});
   Docker.removeContainer(app.name, function (err) {
-    if (err) { console.error(err); }
     Docker.runContainer(app, image, function (err, container) {
-      if (err) { throw err; }
+      if (err) { callback(err); }
       Docker.getContainerData(container.id, function (err, data) {
-        if (err) { console.error(err); }
+        if (err) { callback(err); }
         // Set a delay for app to spin up
-        Meteor.setTimeout(function () {
-          Apps.update(app._id, {$set: {
-            docker: data,
-            status: 'READY'
-          }});
-        }, 2500);
+        Apps.update(app._id, {$set: {
+          docker: data,
+          status: 'READY'
+        }});
+        callback();
       });
     });
   });
 };
 
-AppUtil.restartHelper = function (app) {
-  if (app.docker && app.docker.Id) {
-    Docker.restartContainer(app.docker.Id, function (err) {
-      if (err) { console.error(err); }
-      Docker.getContainerData(app.docker.Id, function (err, data) {
-        if (err) { console.error(err); }
-        Util.refreshDNS(app, function (err) {
-          if (err) {
-            console.error(err);
-          }
-          Apps.update(app._id, {$set: {
-            status: 'READY',
-            docker: data
-          }});
-        });
-      });
-    });
-  }
-};
-
 AppUtil.start = function (appId) {
   var app = Apps.findOne(appId);
   if (app && app.docker) {
@@ -57,15 +38,10 @@ AppUtil.start = function (appId) {
       if (err) { console.error(err); }
       Docker.getContainerData(app.docker.Id, function (err, data) {
         if (err) { console.error(err); }
-        Util.refreshDNS(app, function (err) {
-          if (err) {
-            console.error(err);
-          }
-          Apps.update(app._id, {$set: {
-            status: 'READY',
-            docker: data
-          }});
-        });
+        Apps.update(app._id, {$set: {
+          status: 'READY',
+          docker: data
+        }});
       });
     });
   }
@@ -88,27 +64,13 @@ AppUtil.stop = function (appId) {
   }
 };
 
-AppUtil.restart = function (appId) {
-  var app = Apps.findOne(appId);
-  if (app && app.docker) {
-    Apps.update(app._id, {$set: {
-      status: 'STARTING'
-    }});
-    AppUtil.restartHelper(app);
-  }
-};
-
 AppUtil.remove = function (appId) {
   var app = Apps.findOne(appId);
-  Apps.remove({_id: appId});
   if (app.docker) {
     Docker.removeContainer(app.docker.Id, function (err) {
-      if (err) { console.error(err); }
+      Apps.remove({_id: appId});
       var appPath = path.join(Util.KITE_PATH, app.name);
       Util.deleteFolder(appPath);
-      Docker.removeBindFolder(app.name, function () {
-        console.log('Deleted Kite ' + app.name + ' directory.');
-      });
     });
   }
 };
@@ -119,7 +81,11 @@ AppUtil.configVar = function (appId, configVars) {
     status: 'STARTING'
   }});
   var app = Apps.findOne({_id: appId});
-  AppUtil.run(app);
+  AppUtil.run(Apps.findOne(appId), function (err) {
+    if (err) {
+      throw err;
+    }
+  });
 };
 
 AppUtil.logs = function (appId) {
@@ -166,93 +132,112 @@ AppUtil.recover = function () {
   });
 };
 
-AppUtil.sync = function () {
+AppUtil.sync = function (callback) {
   Docker.listContainers(function (err, containers) {
     if (err) {
-      console.error(err);
-    } else {
-      var apps = Apps.find({}).fetch();
-      _.each(apps, function (app) {
-        var app = Apps.findOne(app._id);
-        if (app && app.docker && app.docker.Id) {
-          var duplicateApps = Apps.find({'docker.Id': app.docker.Id, _id: {$ne: app._id}}).fetch();
-          _.each(duplicateApps, function (duplicateApp) {
-            Apps.remove(duplicateApp._id);
-          });
-          Docker.getContainerData(app.docker.Id, function (err, data) {
-            var status = 'STARTING';
-            if (data && data.State && data.State.Running) {
-              status = 'READY';
-            } else if (data && data.State && !data.State.Running) {
-              status = 'ERROR';
-            }
-            Apps.update(app._id, {
-              $set: {
-                docker: data,
-                status: status
-              }
-            })
-          });
-        }
+      callback(err);
+      return;
+    }
+
+    var apps = Apps.find({}).fetch();
+    var guiIds = _.map(apps, function (app) {
+      if (app.docker && app.docker.Id) {
+        return app.docker.Id;
+      }
+    });
+    var containerIds = _.map(containers, function (container) {
+      return container.Id;
+    });
+    var diffApps = _.difference(guiIds, containerIds);
+    _.each(diffApps, function (appContainerId) {
+      var app = Apps.findOne({'docker.Id': appContainerId});
+      if (app && app.status !== 'STARTING') {
+        AppUtil.remove(app._id);
+      }
+    });
+    var diffContainers = _.reject(containers, function (container) {
+      return _.contains(guiIds, container.Id);
+    });
+    _.each(diffContainers, function (container) {
+      var appName = container.Name.substring(1);
+      var startingApp = _.find(apps, function (app) {
+        return app.status === 'STARTING' && app.name === appName;
       });
-      var dockerIds = _.map(apps, function (app) {
-        if (app.docker && app.docker.Id) {
-          return app.docker.Id;
-        }
-      });
-      var containerIds = _.map(containers, function (container) {
-        return container.Id;
-      });
-      var diffApps = _.difference(dockerIds, containerIds);
-      _.each(diffApps, function (appContainerId) {
-        var app = Apps.findOne({'docker.Id': appContainerId});
-        if (app && app.status !== 'STARTING') {
-          AppUtil.remove(app._id);
-        }
-      });
-      var diffContainers = _.reject(containers, function (container) {
-        return _.contains(dockerIds, container.Id);
-      });
-      _.each(diffContainers, function (container) {
-        var appName = container.Name.substring(1);
-        var startingApp = _.find(apps, function (app) {
-          return app.status === 'STARTING' && app.name === appName;
+
+      if (startingApp || _.isEmpty(container.NetworkSettings.Ports)) {
+        return;
+      }
+
+      var appPath = path.join(Util.KITE_PATH, appName);
+      if (!fs.existsSync(appPath)) {
+        console.log('Created Kite ' + appName + ' directory.');
+        fs.mkdirSync(appPath, function (err) {
+          if (err) { throw err; }
         });
-        if (!startingApp && appName !== 'kite-dns') {
-          var appPath = path.join(Util.KITE_PATH, appName);
-          if (!fs.existsSync(appPath)) {
-            console.log('Created Kite ' + appName + ' directory.');
-            fs.mkdirSync(appPath, function (err) {
-              if (err) { throw err; }
-            });
-          }
-          var envVars = container.Config.Env;
-          var config = {};
-          _.each(envVars, function (envVar) {
-            var eqPos = envVar.indexOf('=');
-            var envKey = envVar.substring(0, eqPos);
-            var envVal = envVar.substring(eqPos + 1);
-            config[envKey] = envVal;
-          });
+      }
+      var envVars = container.Config.Env;
+      var config = {};
+      _.each(envVars, function (envVar) {
+        var eqPos = envVar.indexOf('=');
+        var envKey = envVar.substring(0, eqPos);
+        var envVal = envVar.substring(eqPos + 1);
+        config[envKey] = envVal;
+      });
+      var status = 'STARTING';
+      if (container.State.Running) {
+        status = 'READY';
+      } else {
+        status = 'ERROR';
+      }
+
+      var appObj = {
+        name: appName,
+        docker: container,
+        status: status,
+        config: config,
+        path: appPath,
+        logs: [],
+        createdAt: new Date()
+      };
+
+      var image = Images.findOne({'docker.Id': container.Image});
+      if (image) {
+        appObj.imageId = image._id;
+      }
+      if (container.HostConfig.Binds && container.HostConfig.Binds.length) {
+        appObj.volumesEnabled = true;
+      } else {
+        appObj.volumesEnabled = false;
+      }
+      console.log(appObj);
+      Apps.insert(appObj);
+    });
+
+    async.each(apps, function (app, callback) {
+      if (app && app.docker && app.docker.Id) {
+        var duplicateApps = Apps.find({'docker.Id': app.docker.Id, _id: {$ne: app._id}}).fetch();
+        _.each(duplicateApps, function (duplicateApp) {
+          Apps.remove(duplicateApp._id);
+        });
+        Docker.getContainerData(app.docker.Id, function (err, data) {
+          if (err) {callback(err); return;}
           var status = 'STARTING';
-          if (container.State.Running) {
+          if (data && data.State && data.State.Running) {
             status = 'READY';
-          } else {
+          } else if (data && data.State && !data.State.Running) {
             status = 'ERROR';
           }
-          var appObj = {
-            name: appName,
-            docker: container,
-            status: status,
-            config: config,
-            path: appPath,
-            logs: [],
-            createdAt: new Date()
-          };
-          console.log(appObj);
-          Apps.insert(appObj);
-        }
-      });
-    }
+          Apps.update(app._id, {
+            $set: {
+              docker: data,
+              status: status
+            }
+          });
+          callback();
+        });
+      }
+    }, function (err) {
+      callback(err);
+    });
   });
 };
diff --git a/meteor/client/lib/boot2docker.js b/meteor/client/lib/boot2docker.js
index 19966da9b5..36c44ad89d 100644
--- a/meteor/client/lib/boot2docker.js
+++ b/meteor/client/lib/boot2docker.js
@@ -1,24 +1,29 @@
 var exec = require('exec');
 var path = require('path');
 var fs = require('fs');
+var path = require('path');
+var async = require('async');
+var packagejson = JSON.parse(fs.readFileSync(path.join(process.env.DIR, 'package.json'), 'utf8'));
+
 
 Boot2Docker = {};
-
-Boot2Docker.REQUIRED_IP = '192.168.60.103';
+Boot2Docker.VERSION = packagejson['boot2docker-version'];
 
 Boot2Docker.command = function () {
-  return path.join(Util.getBinDir(), 'boot2docker-1.3.0') + ' --vm="kitematic-vm"';
+  return path.join(Util.getBinDir(), 'boot2docker-' + Boot2Docker.VERSION);
 };
 
 Boot2Docker.exec = function (command, callback) {
-  exec(Boot2Docker.command() + ' ' + command, function(err, stdout, stderr) {
-    callback(err, stdout, stderr);
+  var cmd = [Boot2Docker.command()];
+  cmd.push.apply(cmd, command);
+  exec(cmd, function(stderr, stdout, code) {
+    callback(stderr, stdout, code);
   });
 };
 
 Boot2Docker.exists = function (callback) {
-  this.exec('info', function (err) {
-    if (err) {
+  this.exec(['info'], function (stderr, stdout, code) {
+    if (stderr) {
       callback(null, false);
     } else {
       callback(null, true);
@@ -27,49 +32,53 @@ Boot2Docker.exists = function (callback) {
 };
 
 Boot2Docker.stop = function (callback) {
-  this.exec('stop', function (err, stdout) {
-    // Sometimes stop returns an error even though it worked
-    callback(null);
+  this.exec(['stop'], function (stderr, stdout, code) {
+    if (code) {
+      callback(stderr);
+    } else {
+      callback();
+    }
   });
 };
 
 Boot2Docker.erase = function (callback) {
-  var VMFileLocation = path.join(Util.getHomePath(), 'VirtualBox\\ VMs/kitematic-vm');
-  exec('rm -rf ' + VMFileLocation, function (err) {
-    callback(err);
+  var VMFileLocation = path.join(Util.getHomePath(), 'VirtualBox\\ VMs/boot2docker-vm');
+  exec(['rm', '-rf', VMFileLocation], function (stderr) {
+    callback(stderr);
   });
 };
 
 Boot2Docker.upgrade = function (callback) {
   var self = this;
-  self.stop(function (err) {
-    self.exec('upgrade', function (err, stdout) {
-      callback(err);
+  self.stop(function (stderr, stdout, code) {
+    if (code) {callback(stderr); return;}
+    self.exec(['upgrade'], function (stderr, stdout, code) {
+      if (code) {
+        callback(stderr);
+      } else {
+        callback();
+      }
     });
   });
 };
 
 Boot2Docker.ip = function (callback) {
-  this.exec('ip', function (err, stdout) {
-    if (err) {
-      callback(err, null);
+  this.exec(['ip'], function (stderr, stdout, code) {
+    if (code) {
+      callback(stderr, null);
     } else {
       callback(null, stdout);
     }
   });
 };
 
-Boot2Docker.setIp = function (ifname, ip, callback) {
-  Boot2Docker.exec('ssh "sudo ifconfig ' + ifname + ' ' + ip + ' netmask 255.255.255.0"', function (err, stdout) {
-    Boot2Docker.exec('ssh "sudo rm -rf /var/lib/boot2docker/tls/* && sudo /etc/init.d/docker restart"', function (err, stdout) {
-      callback(err);
-    });
-  });
-};
-
 Boot2Docker.init = function (callback) {
-  this.exec('init', function (err) {
-    callback(err);
+  this.exec(['init'], function (stderr, stdout, code) {
+    if (code) {
+      callback(stderr);
+    } else {
+      callback();
+    }
   });
 };
 
@@ -80,33 +89,19 @@ Boot2Docker.start = function (callback) {
       callback('Cannot start if the boot2docker VM doesn\'t exist');
       return;
     }
-    self.exec('start', function (err, stdout) {
-      // Sometimes boot2docker returns an error code even though it's working / waiting, so treat that as success as well
-      if (!err || (err.indexOf('Waiting') !== -1 || err.indexOf('Writing') !== -1 || err.indexOf('Generating a server cert') !== -1)) {
-        self.correct(function (err) {
-          self.injectUtilities(function (err) {
-            callback(err);
-          });
-        });
+    self.exec(['start'], function (stderr, stdout, code) {
+      if (code) {
+        callback(stderr);
       } else {
-        callback(err);
+        callback();
       }
     });
   });
 };
 
-Boot2Docker.correct = function (callback) {
-  Boot2Docker.setIp('eth1', Boot2Docker.REQUIRED_IP, function(err) {
-    if (err) { callback(err); return; }
-    VirtualBox.removeDHCP(function (err) {
-      callback();
-    });
-  });
-};
-
 Boot2Docker.state = function (callback) {
-  this.exec('info', function (err, stdout, stderr) {
-    if (err) { callback(err, null); return; }
+  this.exec(['info'], function (stderr, stdout, code) {
+    if (code) { callback(stderr, null); return; }
     try {
       var info = JSON.parse(stdout);
       callback(null, info.State);
@@ -117,9 +112,9 @@ Boot2Docker.state = function (callback) {
 };
 
 Boot2Docker.diskUsage = function (callback) {
-  this.exec('ssh "df"', function (err, stdout) {
-    if (err) {
-      callback(err, null);
+  this.exec(['ssh', 'df'], function (stderr, stdout, code) {
+    if (code) {
+      callback(stderr, null);
       return;
     }
     try {
@@ -140,15 +135,15 @@ Boot2Docker.diskUsage = function (callback) {
         percent: percent
       });
     } catch (error) {
-      callback(err, null);
+      callback(error, null);
     }
   });
 };
 
 Boot2Docker.memoryUsage = function (callback) {
-  this.exec('ssh "free -m"', function (err, stdout) {
-    if (err) {
-      callback(err, null);
+  this.exec(['ssh', 'free -m'], function (stderr, stdout, code) {
+    if (code) {
+      callback(stderr, null);
       return;
     }
     try {
@@ -208,25 +203,10 @@ Boot2Docker.sshKeyExists = function () {
   return fs.existsSync(path.join(Util.getHomePath(), '.ssh', 'id_boot2docker'));
 };
 
-/**
- * Get the VM's version.
- * Node that this only works if the VM is up and running.
- */
-Boot2Docker.vmVersion = function (callback) {
-  this.exec('ssh "cat /etc/version', function (err, stdout, stderr) {
-    if (err) {
-      callback(err);
-      return;
-    } else {
-      callback(null, stdout);
-    }
-  });
-};
-
 Boot2Docker.version = function (callback) {
-  this.exec('version', function (err, stdout, stderr) {
-    if (err) {
-      callback(err);
+  this.exec(['version'], function (stderr, stdout, code) {
+    if (code) {
+      callback(stderr);
       return;
     }
     var match = stdout.match(/Client version: v(\d\.\d\.\d)/);
@@ -238,12 +218,6 @@ Boot2Docker.version = function (callback) {
   });
 };
 
-Boot2Docker.injectUtilities = function (callback) {
-  exec('/bin/cat ' + path.join(Util.getBinDir(), 'kite-binaries.tar.gz') + ' | ' +  Boot2Docker.command() + ' ssh "sudo tar zx -C /usr/local/bin && sudo chown -R root.root /usr/local/bin"', function (err, stdout) {
-    callback(err);
-  });
-};
-
 Boot2Docker.check = function (callback) {
   var self = this;
   self.exists(function (err, exists) {
@@ -254,33 +228,6 @@ Boot2Docker.check = function (callback) {
       self.state(function (err, state) {
         if (state !== 'running') {
           callback('boot2docker not running');
-        } else {
-          self.correct(function (err) {
-            callback(err);
-          });
-        }
-      });
-    }
-  });
-};
-
-Boot2Docker.resolve = function (callback) {
-  var self = this;
-  self.exists(function (err, exists) {
-    // If somehow the boot2docker VM doesn't exist anymor then re-create it.
-    if (!exists) {
-      self.init(function () {
-        self.start(function (err) {
-          callback(err);
-        });
-      });
-    } else {
-      // If it exists but it's not running.. restart it.
-      self.state(function (err, state) {
-        if (state !== 'running') {
-          self.start(function (err) {
-            callback(err);
-          });
         } else {
           callback();
         }
@@ -288,3 +235,49 @@ Boot2Docker.resolve = function (callback) {
     }
   });
 };
+
+Boot2Docker.vmUpToDate = function (callback) {
+  fs.readFile(path.join(Util.getHomePath(), '.boot2docker', 'boot2docker.iso'), 'utf8', function (err, data) {
+    if (err) {
+      callback(err); return;
+    }
+    var match = data.match(/Boot2Docker-v(\d+\.\d+\.\d+)/);
+    if (!match) {
+      callback('Could not parse boot2docker iso version');
+      return;
+    }
+    callback (null, Util.compareVersions(match[1], Boot2Docker.VERSION) >= 0);
+  });
+};
+
+Boot2Docker.status = function (callback) {
+  this.exec(['status'], function (stderr, stdout, code) {
+    if (code) {callback(stderr); return;}
+    callback(null, stdout.trim());
+  });
+};
+
+Boot2Docker.portAvailable = function (port, protocol, callback) {
+  this.exec(['ssh', 'netstat -lntu | grep LISTEN | grep ' + protocol + ' | grep -c ":::' + port + '\\s"'], function (stdout, stderr, code) {
+    if (stderr.trim() === '0') {
+      callback(true);
+    } else {
+      callback(false);
+    }
+  });
+};
+
+Boot2Docker.waitWhileStatus = function (status, callback) {
+  var current = status;
+  async.whilst(function () {
+    return current === status;
+  }, function (innerCallback) {
+    Boot2Docker.status(function (err, vmStatus) {
+      if (err) {innerCallback(err); return;}
+      current = vmStatus.trim();
+      innerCallback();
+    });
+  }, function (err) {
+    callback(err);
+  });
+};
\ No newline at end of file
diff --git a/meteor/client/lib/docker.js b/meteor/client/lib/docker.js
index 8d8333a3c2..55a3b078ba 100644
--- a/meteor/client/lib/docker.js
+++ b/meteor/client/lib/docker.js
@@ -6,20 +6,22 @@ var fs = require('fs');
 
 Docker = {};
 
-Docker.DEFAULT_IMAGES_FILENAME = 'base-images-0.0.2.tar.gz';
-Docker.DEFAULT_IMAGES_CHECKSUM = 'a3517ac21034a1969d9ff15e3c41b1e2f1aa83c67b16a8bd0bc378ffefaf573b'; // Sha256 Checksum
-Docker.HOST_IP = '192.168.60.103';
-Docker.HOST_PORT = '2376';
+Docker.hostIp = null;
+Docker.hostPort = '2376';
+
+Docker.setHost = function (host) {
+  Docker.hostIp = host;
+};
 
 Docker.client = function () {
-  var certDir = path.join(process.env[(process.platform === 'win32') ? 'USERPROFILE' : 'HOME'], '.boot2docker/certs/kitematic-vm');
+  var certDir = path.join(process.env[(process.platform === 'win32') ? 'USERPROFILE' : 'HOME'], '.boot2docker/certs/boot2docker-vm');
   if (!fs.existsSync(certDir)) {
     return null;
   }
   return new Dockerode({
     protocol: 'https',
-    host: Docker.HOST_IP,
-    port: Docker.HOST_PORT,
+    host: Docker.hostIp,
+    port: Docker.hostPort,
     ca: fs.readFileSync(path.join(certDir, 'ca.pem')),
     cert: fs.readFileSync(path.join(certDir, 'cert.pem')),
     key: fs.readFileSync(path.join(certDir, 'key.pem'))
@@ -93,36 +95,51 @@ Docker.runContainer = function (app, image, callback) {
     var builtStr = key + '=' + app.config[key];
     envParam.push(builtStr);
   });
-  console.log(envParam);
-  Docker.client().createContainer({
+
+  var containerOpts = {
     Image: image.docker.Id,
     Tty: false,
     Env: envParam,
     Hostname: app.name,
     name: app.name
-  }, function (err, container) {
+  };
+
+
+  if (app.docker && app.docker.NetworkSettings.Ports) {
+    containerOpts.ExposedPorts = app.docker.NetworkSettings.Ports;
+  }
+
+  console.log(containerOpts);
+
+  Docker.client().createContainer(containerOpts, function (err, container) {
     if (err) { callback(err, null); return; }
     console.log('Created container: ' + container.id);
     // Bind volumes
     var binds = [];
-    if (image.docker.Config.Volumes && image.docker.Config.Volumes.length > 0) {
+    if (app.volumesEnabled && image.docker.Config.Volumes && image.docker.Config.Volumes.length > 0) {
       _.each(image.docker.Config.Volumes, function (vol) {
-        binds.push('/var/lib/docker/binds/' + app.name + vol.Path + ':' + vol.Path);
+        if (vol.Path && vol.Path.length && vol.Path[0] === '/') {
+          vol.Path = vol.Path.substr(1);
+        }
+        binds.push([Util.getHomePath(), 'Kitematic', app.name, vol.Path].join('/') + ':' + vol.Path);
       });
     }
-    // Start the container
-    container.start({
-      PublishAllPorts: true,
+
+    var startOpts = {
       Binds: binds
-    }, function (err) {
+    };
+
+    if (app.docker && app.docker.NetworkSettings.Ports) {
+      startOpts.PortBindings = app.docker.NetworkSettings.Ports;
+    } else {
+      startOpts.PublishAllPorts = true;
+    }
+
+    console.log(startOpts);
+    container.start(startOpts, function (err) {
       if (err) { callback(err, null); return; }
       console.log('Started container: ' + container.id);
-      Util.refreshDNS(app, function (err) {
-        if (err) {
-          console.error(err);
-        }
-        callback(null, container);
-      });
+      callback(null, container);
     });
   });
 };
@@ -153,19 +170,6 @@ Docker.stopContainer = function (containerId, callback) {
   });
 };
 
-Docker.restartContainer = function (containerId, callback) {
-  var container = Docker.client().getContainer(containerId);
-  container.restart(function (err) {
-    if (err) {
-      console.log(err);
-      callback(err);
-      return;
-    }
-    console.log('Restarted container: ' + containerId);
-    callback(null);
-  });
-};
-
 var convertVolumeObjToArray = function (obj) {
   var result = [];
   if (obj !== null && typeof obj === 'object') {
@@ -180,37 +184,24 @@ var convertVolumeObjToArray = function (obj) {
 };
 
 Docker.getImageData = function (imageId, callback) {
-  Docker.client().listImages({all: false}, function (err, images) {
+  var image = Docker.client().getImage(imageId);
+  image.inspect(function (err, data) {
     if (err) {
       callback(err, null);
-    } else {
-      var dockerImage = _.find(images, function (image) {
-        return image.Id === imageId;
-      });
-      var image = Docker.client().getImage(imageId);
-      image.inspect(function (err, data) {
-        if (err) {
-          callback(err, null);
-        } else {
-          if (data.Config && data.Config.Volumes) {
-            data.Config.Volumes = convertVolumeObjToArray(data.Config.Volumes);
-          }
-          if (data.ContainerConfig && data.ContainerConfig.Volumes) {
-            data.ContainerConfig.Volumes = convertVolumeObjToArray(data.ContainerConfig.Volumes);
-          }
-          if (!dockerImage) {
-            callback(null, data);
-          } else {
-            callback(null, _.extend(dockerImage, data));
-          }
-        }
-      });
+      return;
     }
+    if (data.Config && data.Config.Volumes) {
+      data.Config.Volumes = convertVolumeObjToArray(data.Config.Volumes);
+    }
+    if (data.ContainerConfig && data.ContainerConfig.Volumes) {
+      data.ContainerConfig.Volumes = convertVolumeObjToArray(data.ContainerConfig.Volumes);
+    }
+    callback(null, data);
   });
 };
 
-Docker.listImages = function (callback) {
-  Docker.client().listImages({all: false}, function (err, images) {
+Docker.listImages = function (opts, callback) {
+  Docker.client().listImages(opts, function (err, images) {
     if (err) {
       callback(err, null);
     } else {
@@ -220,7 +211,7 @@ Docker.listImages = function (callback) {
             if (err) {
               cb(err, null);
             } else {
-              cb(null, data);
+              cb(null, _.extend(image, data));
             }
           });
         };
@@ -244,238 +235,3 @@ Docker.removeImage = function (imageId, callback) {
     callback(null);
   });
 };
-
-Docker.removeBindFolder = function (name, callback) {
-  exec(Boot2Docker.command() + ' ssh "sudo rm -rf /var/lib/docker/binds/' + name + '"', function (err, stdout) {
-    callback(err, stdout);
-  });
-};
-
-Docker.defaultContainerOptions = function () {
-  return [
-    {
-      Image: 'kite-dns',
-      name: 'kite-dns',
-      PortBindings: {'53/udp': [{ 'HostPort': '53', 'HostIp': '172.17.42.1' }]},
-      Binds: ['/var/run/docker.sock:/tmp/docker.sock']
-    }
-  ];
-};
-
-Docker.defaultContainerNames = Docker.defaultContainerOptions().map(function (container) {
-  return container.name;
-});
-
-Docker.checkDefaultImages = function (callback) {
-  var defaultNames = Docker.defaultContainerNames;
-  async.each(defaultNames, function (name, innerCallback) {
-    var image = Docker.client().getImage(name);
-    image.inspect(function (err) {
-      if (err) {
-        if (err.reason === 'no such image') {
-          innerCallback('no such image');
-        } else {
-          innerCallback(err);
-        }
-      } else {
-        innerCallback();
-      }
-    });
-  }, function (err) {
-    if (err) {
-      callback(err);
-    } else {
-      callback();
-    }
-  });
-};
-
-Docker.resolveDefaultImages = function () {
-  async.each(Docker.defaultContainerNames, function (name, innerCallback) {
-    var image = Docker.client().getImage(name);
-    image.inspect(function (err) {
-      if (err) {
-        if (err.reason === 'no such image') {
-          Docker.client().loadImage(path.join(Util.getBinDir(), Docker.DEFAULT_IMAGES_FILENAME), {}, function (err) {
-            if (err) {
-              innerCallback(err);
-              return;
-            } else {
-              innerCallback();
-            }
-          });
-        } else {
-          innerCallback(err);
-        }
-      } else {
-        innerCallback();
-      }
-    });
-  });
-};
-
-Docker.checkDefaultContainers = function(callback) {
-  async.each(Docker.defaultContainerNames, function (name, innerCallback) {
-    var container = Docker.client().getContainer(name);
-    container.inspect(function (err, data) {
-      if (err) {
-        innerCallback(err);
-      } else {
-        if (data && data.State && data.State.Running) {
-          innerCallback(null);
-        } else {
-          innerCallback('Not running');
-        }
-      }
-    });
-  }, function (err) {
-    if (err) {
-      callback(err);
-    } else {
-      callback();
-    }
-  });
-};
-
-Docker.resolveDefaultContainers = function (callback) {
-  Docker.killAndRemoveContainers(Docker.defaultContainerNames, function (err) {
-    if (err) {
-      callback(err);
-      return;
-    }
-    Docker.upContainers(Docker.defaultContainerOptions(), function (err) {
-      callback(err);
-    });
-  });
-};
-
-Docker.reloadDefaultContainers = function (callback) {
-  console.log('Reloading default containers.');
-  var ready = false;
-  async.until(function () {
-    return ready;
-  }, function (callback) {
-    Docker.client().listContainers(function (err) {
-      if (!err) {
-        ready = true;
-      }
-      callback();
-    });
-  }, function () {
-    console.log('Removing old Kitematic default containers.');
-    Docker.killAndRemoveContainers(Docker.defaultContainerNames, function (err) {
-      console.log('Removed old Kitematic default containers.');
-      if (err) {
-        console.log('Removing old Kitematic default containers ERROR.');
-        callback(err);
-        return;
-      }
-      console.log('Loading new Kitematic default images.');
-      Docker.client().loadImage(path.join(Util.getResourceDir(), Docker.DEFAULT_IMAGES_FILENAME), {}, function (err) {
-        if (err) {
-          callback(err);
-          return;
-        }
-        console.log('Starting new Kitematic default containers.');
-        Docker.upContainers(Docker.defaultContainerOptions(), function (err) {
-          callback(err);
-        });
-      });
-    });
-  });
-};
-
-Docker.upContainers = function (optionsList, callback) {
-   var createDefaultContainer = function (options, innerCallback) {
-    Docker.client().createContainer(options, function (err, container) {
-      if (err) {
-        innerCallback(err);
-        return;
-      }
-      container.start({
-        PublishAllPorts: true,
-        PortBindings: options.PortBindings,
-        Binds: options.Binds
-      }, function (err) {
-        innerCallback(err);
-      });
-    });
-  };
-
-  async.each(optionsList, function (options, innerCallback) {
-    var container = Docker.client().getContainer(options.name);
-    container.inspect(function (err, data) {
-      if (err) {
-        if (err.reason.indexOf('no such container') !== -1) {
-          createDefaultContainer(options, function (err) {
-            innerCallback(err);
-          });
-        } else {
-          innerCallback(err);
-        }
-      } else {
-        if (data && !data.State.Running) {
-          container.start(function (err) {
-            innerCallback(err);
-          });
-        } else {
-          innerCallback();
-        }
-      }
-    });
-  }, function (err) {
-    callback(err);
-  });
-};
-
-Docker.removeImages = function (names, callback) {
-  async.each(names, function (name, innerCallback) {
-    var image = Docker.client().getImage(name);
-    image.remove(function (err) {
-      if (err) {
-        console.log('remove image error');
-        console.log(err);
-        if (err.reason === 'no such image') {
-          innerCallback();
-        } else {
-          innerCallback(err);
-        }
-      } else {
-        innerCallback();
-      }
-    });
-  }, function (err) {
-    callback(err);
-  });
-};
-
-Docker.killAndRemoveContainers = function (names, callback) {
-  async.each(names, function (name, innerCallback) {
-    var container = Docker.client().getContainer(name);
-    container.inspect(function (err, data) {
-      if (err) {
-        innerCallback();
-        return;
-      }
-      if (data.State.Running) {
-        // Kill it
-        container.kill(function (err) {
-          if (err) {
-            innerCallback(err);
-          } else {
-            // Remove it
-            container.remove(function (err) {
-              innerCallback(err);
-            });
-          }
-        });
-      } else {
-        container.remove(function (err) {
-          innerCallback(err);
-        });
-      }
-    });
-  }, function (err) {
-    callback(err);
-  });
-};
diff --git a/meteor/client/lib/form-schemas.js b/meteor/client/lib/form-schemas.js
index ea165b9b54..f96c5f1904 100644
--- a/meteor/client/lib/form-schemas.js
+++ b/meteor/client/lib/form-schemas.js
@@ -2,11 +2,11 @@ FormSchema = {
 
   formCreateApp: {
     name: {
-      label: 'app name',
+      label: 'container name',
       required: true,
       transforms: ['clean', 'slugify'],
       messages: {
-        'uniqueAppName': "This app name is already being used."
+        'uniqueAppName': "This container name is already being used."
       },
       rules: {
         uniqueAppName: true
diff --git a/meteor/client/lib/imageutil.js b/meteor/client/lib/imageutil.js
index bc6f331d18..24b9e62e39 100644
--- a/meteor/client/lib/imageutil.js
+++ b/meteor/client/lib/imageutil.js
@@ -3,18 +3,10 @@ var convert = new Convert();
 var exec = require('exec');
 var path = require('path');
 var fs = require('fs');
+var async = require('async');
 
 ImageUtil = {};
 
-var createTarFile = function (image, callback) {
-  var TAR_PATH = path.join(Util.KITE_TAR_PATH, image._id + '.tar');
-  exec('tar czf ' + TAR_PATH + ' -C ' + image.path + ' .', function (err) {
-    if (err) { callback(err, null); return; }
-    console.log('Created tar file: ' + TAR_PATH);
-    callback(null, TAR_PATH);
-  });
-};
-
 var getFromImage = function (dockerfile) {
   var patternString = "(FROM)(.*)";
   var regex = new RegExp(patternString, "g");
@@ -54,23 +46,8 @@ ImageUtil.getMetaData = function (directory) {
   return kiteJSON;
 };
 
-ImageUtil.saveFolder = function (directory, imageId, callback) {
-  var destinationPath = path.join(Util.KITE_IMAGES_PATH, imageId);
-  if (!fs.existsSync(destinationPath)) {
-    fs.mkdirSync(destinationPath, function (err) {
-      if (err) { callback(err); return; }
-    });
-    Util.copyFolder(directory, destinationPath, function (err) {
-      if (err) { callback(err); return; }
-      console.log('Copied image folder for: ' + imageId);
-      callback(null);
-    });
-  }
-};
-
 ImageUtil.rebuildHelper = function (image, callback) {
-  Util.deleteFolder(image.path);
-  var imageMetaData = ImageUtil.getMetaData(image.originPath);
+  var imageMetaData = ImageUtil.getMetaData(image.path);
   if (imageMetaData.logo) {
     Images.update(image._id, {
       $set: {
@@ -91,14 +68,11 @@ ImageUtil.rebuildHelper = function (image, callback) {
     }
   });
   image = Images.findOne(image._id);
-  ImageUtil.saveFolder(image.originPath, image._id, function (err) {
-    if (err) { console.error(err); }
-    ImageUtil.pull(fs.readFileSync(path.join(image.path, 'Dockerfile'), 'utf8'), image._id, function (err) {
-      if (err) { callback(err, null); return; }
-      ImageUtil.build(image, function (err) {
-        if (err) { console.error(err); }
-        callback(null, null);
-      });
+  ImageUtil.pull(fs.readFileSync(path.join(image.path, 'Dockerfile'), 'utf8'), image._id, function (err) {
+    if (err) { callback(err, null); return; }
+    ImageUtil.build(image, function (err) {
+      if (err) { console.error(err); }
+      callback(null, null);
     });
   });
 };
@@ -146,7 +120,6 @@ ImageUtil.pull = function (dockerfile, imageId, callback) {
   console.log('From image: ' + fromImage);
   var installedImage = null;
   Docker.getImageData(imageId, function (err, data) {
-    if (err) { console.error(err); }
     installedImage = data;
     if (fromImage && !installedImage) {
       Images.update(imageId, {
@@ -191,15 +164,15 @@ ImageUtil.pull = function (dockerfile, imageId, callback) {
 };
 
 ImageUtil.build = function (image, callback) {
-  createTarFile(image, function (err, tarFilePath) {
+  Util.createTarFile(image.path, path.join(Util.KITE_TAR_PATH, image._id + '.tar'), function (err, tarFilePath) {
     if (err) { console.error(err); }
     Images.update(image._id, {
       $set: {
         buildLogs: []
       }
     });
-    Docker.client().buildImage(tarFilePath, {t: image.meta.name + ':' + image.meta.version}, function (err, response) {
-      if (err) { callback(err); }
+    Docker.client().buildImage(tarFilePath, {forcerm: true, t: image.meta.name + ':' + image.meta.version}, function (err, response) {
+      if (err) { callback(err); return; }
       console.log('Building Docker image...');
       response.setEncoding('utf8');
       response.on('data', function (data) {
@@ -211,7 +184,7 @@ ImageUtil.build = function (image, callback) {
             }
           });
         } catch (e) {
-          console.error(e);
+          // Ignore misc conversion errors
         }
       });
       response.on('end', function () {
@@ -224,7 +197,6 @@ ImageUtil.build = function (image, callback) {
         }
         var imageData = null;
         Docker.getImageData(image.meta.name + ':' + image.meta.version, function (err, data) {
-          console.log(data);
           if (err) {
             console.error(err);
             Images.update(image._id, {
@@ -265,88 +237,98 @@ ImageUtil.remove = function (imageId) {
       if (err) { console.error(err); }
     });
   }
-  try {
-    Util.deleteFolder(image.path);
-  } catch (e) {
-    console.error(e);
-  }
-  Sync.removeAppWatcher(imageId);
 };
 
-ImageUtil.sync = function () {
-  Docker.listImages(function (err, dockerImages) {
+ImageUtil.sync = function (callback) {
+  Docker.listImages({all: 0}, function (err, dockerImages) {
     if (err) {
-      console.error(err);
-    } else {
-      var images = Images.find({}).fetch();
-      _.each(images, function (image) {
-        var image = Images.findOne(image._id);
-        if (image && image.docker && image.docker.Id) {
-          var duplicateImages = Images.find({'docker.Id': image.docker.Id, _id: {$ne: image._id}}).fetch();
-          _.each(duplicateImages, function (duplicateImage) {
-            Images.remove(duplicateImage._id);
-          });
-          var imageData = _.find(dockerImages, function (dockerImage) {
-            return dockerImage.Id === image.docker.Id;
-          });
-          if (imageData && imageData.RepoTags) {
-            Images.update(image._id, {
-              $set: {
-                tags: imageData.RepoTags
-              }
-            });
-          }
-          Docker.getImageData(image.docker.Id, function (err, data) {
-            Images.update(image._id, {
-              $set: {
-                docker: data
-              }
-            })
-          });
-        }
-      });
-      var dockerIds = _.map(images, function (image) {
-        if (image.docker && image.docker.Id) {
-          return image.docker.Id;
-        }
-      });
-      var imageIds = _.map(dockerImages, function (image) {
-        return image.Id;
-      });
-      var diffImages = _.difference(dockerIds, imageIds);
-      _.each(diffImages, function (imageId) {
-        var image = Images.findOne({'docker.Id': imageId});
-        if (image && image.status !== 'BUILDING') {
-          ImageUtil.remove(image._id);
-        }
-      });
-      var diffDockerImages = _.reject(dockerImages, function (image) {
-        return _.contains(dockerIds, image.Id);
-      });
-      _.each(diffDockerImages, function (image) {
-        var repoTag = _.first(image.RepoTags);
-        var repoTagTokens = repoTag.split(':');
-        var name = repoTagTokens[0];
-        var version = repoTagTokens[1];
-        var buildingImage = _.find(images, function (image) {
-          return image.status === 'BUILDING' && image.meta.name === name && image.meta.version === version;
-        });
-        if (!buildingImage && name !== '<none>' && version !== '<none>' && name !== 'kite-dns') {
-          var imageObj = {
-            status: 'READY',
-            docker: image,
-            buildLogs: [],
-            createdAt: new Date(),
-            tags: image.RepoTags,
-            meta: {
-              name: name,
-              version: version
-            }
-          };
-          console.log(imageObj);
-          Images.insert(imageObj);
-        }
-      });
+      callback(err);
+      return;
     }
+    var images = Images.find({}).fetch();
+
+    // Delete missing GUI images
+    var kitematicIds = _.map(images, function (image) {
+      if (image.docker && image.docker.Id) {
+        return image.docker.Id;
+      }
+    });
+    var daemonIds = _.map(dockerImages, function (image) {
+      return image.Id;
+    });
+    var diffImages = _.difference(kitematicIds, daemonIds);
+    _.each(diffImages, function (imageId) {
+      var image = Images.findOne({'docker.Id': imageId});
+      if (image && image.status !== 'BUILDING') {
+        Images.remove(image._id);
+      }
+    });
+
+    // Add missing Daemon images
+    var diffDockerImages = _.reject(dockerImages, function (image) {
+      return _.contains(kitematicIds, image.Id);
+    });
+    _.each(diffDockerImages, function (image) {
+      if (!image.RepoTags || _.isEmpty(image.Config.ExposedPorts)) {
+        return;
+      }
+
+      var meta = {};
+      var repoTag = _.first(image.RepoTags);
+      var repoTagTokens = repoTag.split(':');
+      var name = repoTagTokens[0];
+      var version = repoTagTokens[1];
+      meta = {
+        name: name,
+        version: version
+      };
+      var buildingImage = _.find(images, function (image) {
+        return image.status === 'BUILDING' && image.meta.name === name && image.meta.version === version;
+      });
+      if (!buildingImage) {
+        var imageObj = {
+          status: 'READY',
+          docker: image,
+          buildLogs: [],
+          createdAt: new Date(),
+          tags: image.RepoTags,
+          meta: meta
+        };
+        Images.insert(imageObj);
+      }
+    });
+
+    async.each(images, function (image, callback) {
+      var image = Images.findOne(image._id);
+      if (image && image.docker && image.docker.Id) {
+        var duplicateImages = Images.find({'docker.Id': image.docker.Id, _id: {$ne: image._id}}).fetch();
+        _.each(duplicateImages, function (duplicateImage) {
+          Images.remove(duplicateImage._id);
+        });
+        var imageData = _.find(dockerImages, function (dockerImage) {
+          return dockerImage.Id === image.docker.Id;
+        });
+        if (imageData && imageData.RepoTags) {
+          Images.update(image._id, {
+            $set: {
+              tags: imageData.RepoTags
+            }
+          });
+        }
+        Docker.getImageData(image.docker.Id, function (err, data) {
+          if (err) {callback(err); return;}
+          Images.update(image._id, {
+            $set: {
+              docker: data
+            }
+          });
+          callback();
+        });
+      } else {
+        callback();
+      }
+    }, function (err) {
+      callback(err);
+    });
   });
 };
diff --git a/meteor/client/lib/installer.js b/meteor/client/lib/installer.js
deleted file mode 100644
index 3bff06d94a..0000000000
--- a/meteor/client/lib/installer.js
+++ /dev/null
@@ -1,206 +0,0 @@
-var async = require('async');
-var fs = require('fs');
-var path = require('path');
-var remote = require('remote');
-var app = remote.require('app');
-
-Installer = {};
-
-Installer.CURRENT_VERSION = app.getVersion();
-Installer.BASE_URL = 'https://s3.amazonaws.com/kite-installer/';
-
-Installer.isUpToDate = function () {
-  return !!Installs.findOne({version: Installer.CURRENT_VERSION});
-};
-
-/**
- * Install steps. A step is a function that accepts a function (err) callback and returns once that step is complete.keys:
- * - run: Function that runs the installation step and calls the callback with an error if failed.
- * - pastMessage: Message to show after step completion
- * - message: Message to show while step is running
- * - imperativeMessage: Message to show before running
- */
-Installer.steps = [
-  {
-    run: function (callback, progressCallback) {
-      var installed = VirtualBox.installed();
-      if (!installed) {
-        Util.downloadFile(Installer.BASE_URL + VirtualBox.INSTALLER_FILENAME, path.join(Util.getResourceDir(), VirtualBox.INSTALLER_FILENAME), VirtualBox.INSTALLER_CHECKSUM, function (err) {
-          if (err) {callback(err); return;}
-          VirtualBox.install(function (err) {
-            if (!VirtualBox.installed()) {
-              callback('VirtualBox could not be installed. The installation either failed or was cancelled. Please try closing all VirtualBox instances and try again.');
-            } else {
-              callback(err);
-            }
-          });
-        }, function (progress) {
-          progressCallback(progress);
-        });
-      } else {
-        VirtualBox.version(function (err, installedVersion) {
-          if (err) {callback(err); return;}
-          if (Util.compareVersions(installedVersion, VirtualBox.REQUIRED_VERSION) < 0) {
-            // Download a newer version of Virtualbox
-            Util.downloadFile(Installer.BASE_URL + VirtualBox.INSTALLER_FILENAME, path.join(Util.getResourceDir(), VirtualBox.INSTALLER_FILENAME), VirtualBox.INSTALLER_CHECKSUM, function (err) {
-              if (err) {callback(err); return;}
-              VirtualBox.install(function (err) {
-                if (err) {callback(err); return;}
-                VirtualBox.version(function (err, installedVersion) {
-                  if (err) {callback(err); return;}
-                  if (Util.compareVersions(installedVersion, VirtualBox.REQUIRED_VERSION) < 0) {
-                    callback('VirtualBox could not be installed. The installation either failed or was cancelled. Please try closing all VirtualBox instances and try again.');
-                  } else {
-                    callback(err);
-                  }
-                });
-              });
-            }, function (progress) {
-              progressCallback(progress);
-            });
-          } else {
-            callback();
-          }
-        });
-      }
-    },
-    pastMessage: 'VirtualBox Installed',
-    message: 'Downloading & Installing VirtualBox',
-    futureMessage: 'Download & Install VirtualBox if necessary'
-  },
-
-  // Initialize Boot2Docker if necessary.
-  {
-    run: function (callback) {
-      Boot2Docker.exists(function (err, exists) {
-        if (err) { callback(err); return; }
-        if (!exists) {
-          var vmFilesPath = path.join(Util.getHomePath(), 'VirtualBox\ VMs', 'kitematic-vm');
-          if (fs.existsSync(vmFilesPath)) {
-            Util.deleteFolder(vmFilesPath);
-          }
-          Boot2Docker.init(function (err) {
-            callback(err);
-          });
-        } else {
-          if (!Boot2Docker.sshKeyExists()) {
-            callback('Boot2Docker SSH key doesn\'t exist. Fix by deleting the existing Boot2Docker VM and re-run the installer. This usually occurs because an old version of Boot2Docker is installed.');
-          } else {
-            Boot2Docker.stop(function(err) {
-              Boot2Docker.upgrade(function (err) {
-                callback(err);
-              });
-            });
-          } 
-        }
-      });
-    },
-    pastMessage: 'Setup the Kitematic VM (if required)',
-    message: 'Setting up the Kitematic VM',
-    futureMessage: 'Set up the Kitematic VM (if required)'
-  },
-
-  {
-    run: function (callback) {
-      VirtualBox.addCustomHostAdapter('kitematic-vm', function (err, ifname) {
-        callback(err);
-      });
-    },
-    pastMessage: 'Added custom host adapter to the Kitematic VM',
-    message: 'Adding custom host adapter to the Kitematic VM',
-    futureMessage: 'Add custom host adapter to the Kitematic VM'
-  },
-
-  // Start the Kitematic VM
-  {
-    run: function (callback) {
-      Boot2Docker.state(function (err, state) {
-        if (err) { callback(err); return; }
-        if (state !== 'running') {
-          console.log('starting');
-          Boot2Docker.start(function (err) {
-            if (err) {
-              callback(err);
-              return;
-            }
-            Boot2Docker.setIp('eth1', Boot2Docker.REQUIRED_IP, function(err) {
-              callback(err);
-            });
-          });
-        } else {
-          Boot2Docker.setIp('eth1', Boot2Docker.REQUIRED_IP, function(err) {
-            callback(err);
-          });
-        }
-      });
-    },
-    pastMessage: 'Started the Kitematic VM',
-    message: 'Starting the Kitematic VM',
-    subMessage: '(This may take a few minutes)',
-    futureMessage: 'Start the Kitematic VM'
-  },
-
-  {
-    run: function (callback) {
-      VirtualBox.setupRouting('kitematic-vm', function (err, ifname) {
-        callback(err);
-      });
-    },
-    pastMessage: 'Container routing set up',
-    message: 'Setting up container routing (root required)',
-    futureMessage: 'Set up container routing to VM (root required)'
-  },
-
-  // Set up the default Kitematic images
-  {
-    run: function (callback, progressCallback) {
-      Util.downloadFile(Installer.BASE_URL + Docker.DEFAULT_IMAGES_FILENAME, path.join(Util.getResourceDir(), Docker.DEFAULT_IMAGES_FILENAME), Docker.DEFAULT_IMAGES_CHECKSUM, function (err) {
-        Docker.reloadDefaultContainers(function (err) {
-          callback(err);
-        });
-      }, function (progress) {
-        progressCallback(progress);
-      });
-    },
-    pastMessage: 'Set up the default Kitematic images.',
-    message: 'Setting up the default Kitematic images...',
-    subMessage: '(This may take a few minutes)',
-    futureMessage: 'Set up the default Kitematic images'
-  }
-];
-
-Installer.run = function (callback) {
-  Session.set('installing', true);
-  var currentStep = 0;
-  Session.set('currentInstallStep', currentStep);
-  Session.set('numberOfInstallSteps', this.steps.length);
-  async.eachSeries(this.steps, function (step, callback) {
-    console.log('Performing step ' + currentStep);
-    Session.set('currentInstallStepProgress', 0);
-    step.run(function (err) {
-      if (err) {
-        callback(err);
-      } else {
-        currentStep += 1;
-        Session.set('currentInstallStep', currentStep);
-        callback();
-      }
-    }, function (progress) {
-      Session.set('currentInstallStepProgress', progress);
-    });
-  }, function (err) {
-    if (err) {
-      // if any of the steps fail
-      console.log('Kitematic setup failed at step ' + currentStep);
-      console.log(err);
-      Session.set('failedStep', currentStep);
-      Session.set('failedError', err);
-      callback(err);
-    } else {
-      // Setup Finished
-      Session.set('installing', false);
-      console.log('Setup finished.');
-      callback();
-    }
-  });
-};
diff --git a/meteor/client/lib/ipc.js b/meteor/client/lib/ipc.js
new file mode 100644
index 0000000000..fb655ad56f
--- /dev/null
+++ b/meteor/client/lib/ipc.js
@@ -0,0 +1,15 @@
+var ipc = require('ipc');
+
+// Listen for auto updates
+ipc.on('notify', function (message) {
+  if (message === 'window:update-available') {
+    Session.set('updateAvailable', true);
+  }
+  if (message === 'application:quit') {
+    VirtualBox.saveVMState('boot2docker-vm', function (err) {
+      if (err) {
+        console.log(err);
+      }
+    });
+  }
+});
\ No newline at end of file
diff --git a/meteor/client/lib/router.js b/meteor/client/lib/router.js
index c3bbef1d6b..47444c424a 100755
--- a/meteor/client/lib/router.js
+++ b/meteor/client/lib/router.js
@@ -4,76 +4,60 @@ Router.configure({
     var setting = Settings.findOne({});
     if (setting && setting.tracking) {
       var currentPath = Router.current().path;
-      console.log(currentPath);
       ga('send', 'pageview', currentPath);
     }
-  }
-});
-
-SetupController = RouteController.extend({
-  layoutTemplate: 'setup_layout',
-  waitOn: function () {
-    return [Meteor.subscribe('apps'), Meteor.subscribe('images'), Meteor.subscribe('installs'), Meteor.subscribe('settings')];
+    this.next();
   }
 });
 
 DashboardController = RouteController.extend({
-  layoutTemplate: 'dashboard_layout',
+  layoutTemplate: 'dashboardLayout',
   waitOn: function () {
-    return [Meteor.subscribe('apps'), Meteor.subscribe('images'), Meteor.subscribe('installs'), Meteor.subscribe('settings')];
+    return [Meteor.subscribe('apps'), Meteor.subscribe('images'), Meteor.subscribe('settings')];
   }
 });
 
 AppController = DashboardController.extend({
-  layoutTemplate: 'dashboard_apps_layout',
+  layoutTemplate: 'dashboardAppsLayout',
   data: function () {
     return Apps.findOne({name: this.params.name});
   }
 });
 
 ImageController = DashboardController.extend({
-  layoutTemplate: 'dashboard_images_layout',
+  layoutTemplate: 'dashboardImagesLayout',
   data: function () {
     return Images.findOne({_id: this.params.id});
   }
 });
 
 Router.map(function () {
-
-  this.route('setup_intro', {
-    path: '/setup/intro',
-    controller: 'SetupController',
-    onBeforeAction: function () {
-      Session.set('installing', true);
-    }
-  });
-
-  this.route('setup_install', {
-    path: '/setup/install',
-    controller: 'SetupController'
-  });
-
-  this.route('setup_finish', {
-    path: '/setup/finish',
-    controller: 'SetupController'
-  });
-
-  this.route('setup', {
+  this.route('intro', {
     path: '/',
-    controller: 'SetupController',
+    waitOn: function () {
+      return [Meteor.subscribe('apps'), Meteor.subscribe('images'), Meteor.subscribe('settings')];
+    },
     action: function () {
       if (this.ready()) {
-        if (!Installer.isUpToDate()) {
-          if (!Installs.findOne()) {
-            console.log('No installs detected, running installer again.');
+        this.render();
+        Setup.run(function (err) {
+          if (err) {
+            console.log('Setup failed.');
+            console.log(err);
           } else {
-            // There's an install but it's lower than the current version, re-run as an 'update'.
-            Session.set('isUpdating', true);
+            var settings = Settings.findOne();
+            if (!settings) {
+              Settings.insert({tracking: true});
+            }
+            startUpdatingBoot2DockerUtilization();
+            startSyncingAppState();
+            if (Apps.findOne()) {
+              Router.go('dashboard_apps');
+            } else {
+              Router.go('dashboard_images');
+            }
           }
-          this.redirect('/setup/intro');
-        } else {
-          this.redirect('/apps');
-        }
+        });
       }
     }
   });
diff --git a/meteor/client/lib/setup.js b/meteor/client/lib/setup.js
new file mode 100644
index 0000000000..bda23abf52
--- /dev/null
+++ b/meteor/client/lib/setup.js
@@ -0,0 +1,173 @@
+var async = require('async');
+var fs = require('fs');
+var path = require('path');
+var remote = require('remote');
+var app = remote.require('app');
+
+Setup = {};
+
+Setup.CURRENT_VERSION = app.getVersion();
+Setup.BASE_URL = 'https://s3.amazonaws.com/kite-installer/';
+
+Setup.isUpToDate = function () {
+  return !!Installs.findOne({version: Setup.CURRENT_VERSION});
+};
+
+/**
+ * Install steps. A step is a function that accepts a function (err) callback and returns once that step is complete.keys:
+ * - run: Function that runs the installation step and calls the callback with an error if failed.
+ * - message: Message to show while step is running
+ */
+Setup.steps = [
+  {
+    run: function (callback, progressCallback) {
+      var installed = VirtualBox.installed();
+      if (!installed) {
+        Util.downloadFile(Setup.BASE_URL + VirtualBox.INSTALLER_FILENAME, path.join(Util.getResourceDir(), VirtualBox.INSTALLER_FILENAME), VirtualBox.INSTALLER_CHECKSUM, function (err) {
+          if (err) {callback(err); return;}
+          VirtualBox.install(function (err) {
+            if (!VirtualBox.installed()) {
+              callback('VirtualBox could not be installed. The installation either failed or was cancelled. Please try closing all VirtualBox instances and try again.');
+            } else {
+              callback(err);
+            }
+          });
+        }, function (progress) {
+          progressCallback(progress);
+        });
+      } else {
+        VirtualBox.version(function (err, installedVersion) {
+          if (err) {callback(err); return;}
+          if (Util.compareVersions(installedVersion, VirtualBox.REQUIRED_VERSION) < 0) {
+            // Download a newer version of Virtualbox
+            Util.downloadFile(Setup.BASE_URL + VirtualBox.INSTALLER_FILENAME, path.join(Util.getResourceDir(), VirtualBox.INSTALLER_FILENAME), VirtualBox.INSTALLER_CHECKSUM, function (err) {
+              if (err) {callback(err); return;}
+              VirtualBox.killAllProcesses(function (err) {
+                if (err) {callback(err); return;}
+                VirtualBox.install(function (err) {
+                  if (err) {callback(err); return;}
+                  VirtualBox.version(function (err, installedVersion) {
+                    if (err) {callback(err); return;}
+                    if (Util.compareVersions(installedVersion, VirtualBox.REQUIRED_VERSION) < 0) {
+                      callback('VirtualBox could not be installed. The installation either failed or was cancelled. Please try closing all VirtualBox instances and try again.');
+                    } else {
+                      callback(err);
+                    }
+                  });
+                });
+              });
+            }, function (progress) {
+              progressCallback(progress);
+            });
+          } else {
+            callback();
+          }
+        });
+      }
+    },
+    message: 'Downloading VirtualBox...'
+  },
+  {
+    run: function (callback) {
+      VirtualBox.shutdownVM('kitematic-vm', function (err, removed) {
+        if (err) {
+          console.log(err);
+        }
+        callback();
+      });
+    },
+    message: 'Cleaning up existing Docker VM...'
+  },
+
+  // Initialize Boot2Docker if necessary.
+  {
+    run: function (callback) {
+      Boot2Docker.exists(function (err, exists) {
+        if (err) { callback(err); return; }
+        if (!exists) {
+          Boot2Docker.init(function (err) {
+            callback(err);
+          });
+        } else {
+          if (!Boot2Docker.sshKeyExists()) {
+            callback('Boot2Docker SSH key doesn\'t exist. Fix by removing the existing Boot2Docker VM and re-run the installer. This usually occurs because an old version of Boot2Docker is installed.');
+          } else {
+            Boot2Docker.vmUpToDate(function (err, upToDate) {
+              if (err) {callback(err); return;}
+              if (!upToDate) {
+                Boot2Docker.stop(function(err) {
+                  Boot2Docker.upgrade(function (err) {
+                    callback(err);
+                  });
+                });
+              } else {
+                callback();
+              }
+            });
+          } 
+        }
+      });
+    },
+    message: 'Setting up the Docker VM...'
+  },
+  {
+    run: function (callback) {
+      Boot2Docker.waitWhileStatus('saving', function (err) {
+        Boot2Docker.status(function (err, status) {
+          if (err) {callback(err); return;}
+          if (status !== 'running') {
+            Boot2Docker.start(function (err) {
+              callback(err);
+            });
+          } else {
+            callback();
+          }
+        });
+      });
+    },
+    message: 'Starting the Docker VM...'
+  },
+  {
+    run: function (callback) {
+      Boot2Docker.ip(function (err, ip) {
+        if (err) {callback(err); return;}
+        console.log('Setting host IP to: ' + ip);
+        Docker.setHost(ip);
+        callback(err);
+      });
+    },
+    message: 'Detecting Docker VM...'
+  }
+];
+
+Setup.run = function (callback) {
+  var currentStep = 0;
+  Session.set('currentSetupStepMessage', currentStep);
+  async.eachSeries(this.steps, function (step, callback) {
+    console.log('Performing step ' + currentStep);
+    Session.set('currentSetupStepProgress', 0);
+    Session.set('currentSetupStepMessage', step.message);
+    step.run(function (err) {
+      if (err) {
+        callback(err);
+      } else {
+        currentStep += 1;
+        callback();
+      }
+    }, function (progress) {
+      Session.set('currentSetupStepProgress', progress);
+    });
+  }, function (err) {
+    if (err) {
+      // if any of the steps fail
+      console.log('Kitematic setup failed at step ' + currentStep);
+      console.log(err);
+      Session.set('currentSetupFailedError', err);
+      callback(err);
+    } else {
+      // Setup Finished
+      console.log('Setup finished.');
+      callback();
+    }
+  });
+};
diff --git a/meteor/client/lib/startup.js b/meteor/client/lib/startup.js
index d0b9b6ba8e..c53faaee3e 100644
--- a/meteor/client/lib/startup.js
+++ b/meteor/client/lib/startup.js
@@ -1,4 +1,5 @@
 var fs = require('fs');
+
 Meteor.startup(function () {
   console.log('Kitematic started.');
   if (!fs.existsSync(Util.KITE_PATH)) {
@@ -16,4 +17,11 @@ Meteor.startup(function () {
   if (!fs.existsSync(Util.getResourceDir())) {
     fs.mkdirSync(Util.getResourceDir());
   }
+
+  Boot2Docker.ip(function (err, ip) {
+    if (!err) {
+      console.log('Setting host IP to: ' + ip);
+      Docker.setHost(ip);
+    }
+  });
 });
diff --git a/meteor/client/lib/sync.js b/meteor/client/lib/sync.js
deleted file mode 100644
index 44e053f8d8..0000000000
--- a/meteor/client/lib/sync.js
+++ /dev/null
@@ -1,124 +0,0 @@
-var chokidar = require('chokidar');
-var path = require('path');
-var fs = require('fs');
-var child_process = require('child_process');
-var exec = require('exec');
-
-Sync = {};
-Sync.watchers = {};
-
-Sync.removeAppWatcher = function (id) {
-  if (Sync.watchers[id]) {
-    Sync.watchers[id].watcher.close();
-    delete Sync.watchers[id];
-  }
-};
-
-Sync.addAppWatcher = function (app) {
-  Sync.removeAppWatcher(app._id);
-  var appPath = path.join(Util.getHomePath(), 'Kitematic', app.name);
-  var vmDir = path.join('/var/lib/docker/binds', app.name);
-  var vmPath = 'ssh://docker@localhost:2022/' + vmDir;
-  var watcher = chokidar.watch(appPath, {ignored: /.*\.DS_Store/});
-  var syncing = false;
-  var willSyncAgain = false;
-
-  var syncFunc = function (event, changedPath) {
-    if (syncing) {
-      willSyncAgain = true;
-      return;
-    }
-    syncing = true;
-    var errorPattern = /The\sfile\s(.*)\son\shost/g;
-    var archiveErrorPattern = /Archive\s(.*)\son\shost\s.*\sshould\sbe\sDELETED/g;
-    var cmd = path.join(Util.getBinDir(), 'unison');
-    var args = [
-      cmd,
-      vmPath,
-      appPath,
-      '-prefer',
-      vmPath,
-      '-servercmd',
-      'sudo\ unison',
-      '-batch',
-      '-log=false',
-      '-confirmbigdel=false',
-      '-ignore',
-      'Name\ {*.tmp,*.unison,*.swp,*.pyc,.DS_Store}',
-      '-auto',
-      '-sshargs',
-      '-o\ UserKnownHostsFile=/dev/null\ -o\ StrictHostKeyChecking=no\ -o PreferredAuthentications=publickey\ -i\ ' + path.join(Util.getHomePath(), '.ssh/id_boot2docker')
-    ];
-
-    if (!fs.existsSync(appPath)) {
-      args.push('-ignorearchives');
-      console.log('Created Kite ' + app.name + ' directory.');
-      fs.mkdirSync(appPath, function (err) {
-        if (err) { throw err; }
-      });
-    }
-
-    exec(args, function (err, out, code) {
-      var results = null;
-      var location = null;
-      try {
-        if (err.indexOf('the archives are locked.') !== -1) {
-          results = errorPattern.exec(err);
-          location = results[1].replace(' ', '\\ ');
-          exec('/bin/rm -rf ' + location, function () {
-            console.log('Removed unison file.');
-            console.log(location);
-          });
-        }
-        if (err.indexOf('The archive file is missing on some hosts') !== -1) {
-          results = archiveErrorPattern.exec(err);
-          location = results[1].replace(' ', '\\ ');
-          var fullLocation = path.join(Util.getHomePath(), 'Library/Application Support/Unison', location);
-          var cmd = '/bin/rm -rf ' + fullLocation;
-          exec(cmd, function () {});
-        }
-      } catch (e) {
-        //console.error(e);
-      }
-      syncing = false;
-      if (willSyncAgain) {
-        syncFunc();
-        willSyncAgain = false;
-      }
-    });
-  };
-
-  Sync.watchers[app._id] = {
-    watcher: watcher,
-    sync: syncFunc
-  };
-
-  // do a sync
-  syncFunc();
-  watcher.on('all', syncFunc);
-};
-
-Sync.resolveWatchers = function (callback) {
-  var apps = Apps.find({}).fetch();
-  var ids = _.map(apps, function(app) {
-    return app._id;
-  });
-  var watcherKeys = _.keys(Sync.watchers);
-  var toAdd = _.difference(ids, watcherKeys);
-  var toRemove = _.difference(watcherKeys, ids);
-
-  _.each(toAdd, function (id) {
-    Sync.addAppWatcher(Apps.findOne(id), function () {});
-  });
-
-  _.each(toRemove, function (id) {
-    Sync.removeAppWatcher(id);
-  });
-
-  // Run a sync for 'pulling' changes in the volumes.
-  _.each(Sync.watchers, function (watcher) {
-    watcher.sync();
-  });
-
-  callback();
-};
diff --git a/meteor/client/lib/util.js b/meteor/client/lib/util.js
index 0f1da75816..a1edeb2bc2 100755
--- a/meteor/client/lib/util.js
+++ b/meteor/client/lib/util.js
@@ -9,20 +9,6 @@ ncp.limit = 16;
 
 Util = {};
 
-Util.refreshDNS = function (app, callback) {
-  // Use dig to refresh the DNS
-  exec('/usr/bin/dig ' + app.name + '.kite @172.17.42.1', function (err, stdout, stderr) {
-    console.log(err);
-    console.log(stdout);
-    console.log(stderr);
-    if (err) {
-      callback(err);
-    } else {
-      callback(null);
-    }
-  });
-};
-
 Util.getHomePath = function () {
   return process.env[(process.platform === 'win32') ? 'USERPROFILE' : 'HOME'];
 };
@@ -91,17 +77,24 @@ Util.copyVolumes = function (directory, appName, callback) {
   }
 };
 
+Util.createTarFile = function (sourcePath, destinationFile, callback) {
+  exec(['tar', 'czf', destinationFile, '-C', sourcePath, '.'], function (err) {
+    if (err) {callback(err, null); return;}
+    console.log('Created tar file: ' + destinationFile);
+    callback(null, destinationFile);
+  });
+};
+
 Util.hasDockerfile = function (directory) {
   return fs.existsSync(path.join(directory, 'Dockerfile'));
 };
 
 Util.openTerminal = function (command) {
-  var terminalCmd = path.join(Util.getBinDir(),  'terminal') + ' ' + command;
-  var exec = require('child_process').exec;
-  exec(terminalCmd, function (err, stdout) {
-    console.log(stdout);
-    if (err) {
-      console.log(err);
+  var cmd = [path.join(Util.getBinDir(), 'terminal')];
+  cmd.push.apply(cmd, command);
+  exec(cmd, function (stderr, stdout, code) {
+    if (code) {
+      console.log(stderr);
     }
   });
 };
@@ -142,25 +135,6 @@ Util.downloadFile = function (url, filename, checksum, callback, progressCallbac
  * @param {string} v1 The first version to be compared.
  * @param {string} v2 The second version to be compared.
  * @param {object} [options] Optional flags that affect comparison behavior:
- * <ul>
- *     <li>
- *         <tt>lexicographical: true</tt> compares each part of the version strings lexicographically instead of
- *         naturally; this allows suffixes such as "b" or "dev" but will cause "1.10" to be considered smaller than
- *         "1.2".
- *     </li>
- *     <li>
- *         <tt>zeroExtend: true</tt> changes the result if one version string has less parts than the other. In
- *         this case the shorter string will be padded with "zero" parts instead of being considered smaller.
- *     </li>
- * </ul>
- * @returns {number|NaN}
- * <ul>
- *    <li>0 if the versions are equal</li>
- *    <li>a negative integer iff v1 < v2</li>
- *    <li>a positive integer iff v1 > v2</li>
- *    <li>NaN if either version string is in the wrong format</li>
- * </ul>
- *
  */
 Util.compareVersions = function (v1, v2, options) {
   var lexicographical = options && options.lexicographical,
@@ -217,7 +191,6 @@ trackLink = function (trackLabel) {
   var setting = Settings.findOne({});
   if (setting && setting.tracking) {
     if (trackLabel) {
-      console.log(trackLabel);
       ga('send', 'event', 'link', 'click', trackLabel);
     }
   }
diff --git a/meteor/client/lib/virtualbox.js b/meteor/client/lib/virtualbox.js
index 6c0b6a1c30..17ed9066a2 100644
--- a/meteor/client/lib/virtualbox.js
+++ b/meteor/client/lib/virtualbox.js
@@ -1,6 +1,7 @@
 var fs = require('fs');
 var exec = require('exec');
 var path = require('path');
+var async = require('async');
 
 VirtualBox = {};
 
@@ -9,28 +10,22 @@ VirtualBox.INCLUDED_VERSION = '4.3.18';
 VirtualBox.INSTALLER_FILENAME = 'virtualbox-4.3.18.pkg';
 VirtualBox.INSTALLER_CHECKSUM = '5836c94481c460c648b9216386591a2915293ac86b9bb6c57746637796af6af2'; // Sha256 Checksum
 
-// Info for the hostonly interface we add to the VM.
-VirtualBox.HOSTONLY_HOSTIP = '192.168.60.3';
-VirtualBox.HOSTONLY_NETWORKMASK = '255.255.255.0';
-
 VirtualBox.installed = function () {
   return fs.existsSync('/usr/bin/VBoxManage') &&
     fs.existsSync('/Applications/VirtualBox.app/Contents/MacOS/VirtualBox');
 };
 
 VirtualBox.exec = function (command, callback) {
-  exec('/usr/bin/VBoxManage ' + command, function (error, stdout, stderr) {
-    callback(error, stdout, stderr);
+  exec(['/usr/bin/VBoxManage', command], function (stderr, stdout, code) {
+    callback(stderr, stdout, code);
   });
 };
 
 VirtualBox.install = function (callback) {
   // -W waits for the process to close before finishing.
-  exec('open -W ' + path.join(Util.getResourceDir(), this.INSTALLER_FILENAME).replace(' ', '\\ '), function (error, stdout, stderr) {
-    console.log(stdout);
-    console.log(stderr);
-    if (error) {
-      callback(error);
+  exec('open -W ' + path.join(Util.getResourceDir(), this.INSTALLER_FILENAME).replace(' ', '\\ '), function (stderr, stdout, code) {
+    if (code) {
+      callback(stderr);
       return;
     }
     callback(null);
@@ -42,9 +37,9 @@ VirtualBox.version = function (callback) {
     callback('VirtualBox not installed.');
     return;
   }
-  this.exec('-v', function (err, stdout, stderr) {
-    if (err) {
-      callback(err);
+  this.exec('-v', function (stderr, stdout, code) {
+    if (code) {
+      callback(stderr);
       return;
     }
     // Output is x.x.xryyyyyy
@@ -57,106 +52,67 @@ VirtualBox.version = function (callback) {
   });
 };
 
-VirtualBox.hostOnlyIfs = function (callback) {
-  this.exec('list hostonlyifs', function (err, stdout, stderr) {
-    if (err) {
-      callback(err);
-      return;
-    }
-    var lines = stdout.split('\n');
-    var hostOnlyIfs = {};
-    var currentIf = null;
-    _.each(lines, function (line) {
-      if (!line.length) {
-        return;
-      }
-      var pieces = line.split(':');
-      var key = pieces[0].trim();
-      var value = pieces[1] ? pieces[1].trim() : null;
-      if (key === 'Name') {
-        currentIf = value;
-        hostOnlyIfs[value] = {};
-      }
-      hostOnlyIfs[currentIf][key] = value;
-    });
-    callback(null, hostOnlyIfs);
-  });
-};
-
-VirtualBox.hostOnlyAdapters = function (vm, callback) {
-  this.exec('showvminfo ' + vm + ' --machinereadable', function (err, stdout, stderr) {
-    if (err) {
-      callback(err);
-      return;
-    }
-    var matches = stdout.match(/(hostonlyadapter\d+)="(vboxnet\d+)"/g);
-    if (!matches.length) {
-      callback(null, {});
+VirtualBox.saveRunningVMs = function (callback) {
+  if (!this.installed()) {
+    callback('VirtualBox not installed.');
+    return;
+  }
+  this.exec('list runningvms | sed -E \'s/.*\\{(.*)\\}/\\1/\' | xargs -L1 -I {} VBoxManage controlvm {} savestate', function (stderr, stdout, code) {
+    if (code) {
+      callback(stderr);
     } else {
-      var objs = {};
-      _.each(matches, function (match) {
-        var pieces = match.split('=');
-        objs[pieces[0]] = pieces[1].replace(/"/g, '');
-      });
-      callback(null, objs);
+      callback();
     }
   });
 };
 
-VirtualBox.hostOnlyAdapter = function (callback) {
-  var self = this;
-  self.hostOnlyIfs(function (err, ifs) {
-    var iface = _.findWhere(_.toArray(ifs), {IPAddress: VirtualBox.HOSTONLY_HOSTIP});
-    if (!iface) {
-      self.exec('hostonlyif create', function (err, stdout, stderr) {
-        var match = stdout.match(/Interface '(vboxnet\d+)' was successfully created/);
-        if (!match) {
-          callback('Could not parse output of hostonlyif create');
-          return;
-        }
-        self.exec('hostonlyif ipconfig ' + match[1] + ' --ip ' + VirtualBox.HOSTONLY_HOSTIP + ' --netmask ' + VirtualBox.HOSTONLY_NETWORKMASK, function(err, stdout, stderr) {
+VirtualBox.killAllProcesses = function (callback) {
+  this.saveRunningVMs(function (err) {
+    if (err) {callback(err); return;}
+    exec('pkill VirtualBox', function (stderr, stdout, code) {
+      if (code) {callback(stderr); return;}
+      exec('pkill VBox', function (stderr, stdout, code) {
+        if (code) {callback(stderr); return;}
+        callback();
+      });
+    });
+  });
+};
+
+VirtualBox.vmState = function (name, callback) {
+  VirtualBox.exec('showvminfo ' + name + ' --machinereadable', function (stderr, stdout, code) {
+    if (code) { callback(stderr); return; }
+    var match = stdout.match(/VMState="(\w+)"/);
+    if (!match) {
+      callback('Could not parse VMState');
+      return;
+    }
+    callback(null, match[1]);
+  });
+};
+
+VirtualBox.shutdownVM = function (name, callback) {
+  VirtualBox.vmState(name, function (err, state) {
+    // No VM found
+    if (err) { callback(null, false); return; }
+    VirtualBox.exec('controlvm ' + name + ' acpipowerbutton', function (stderr, stdout, code) {
+      if (code) { callback(stderr, false); return; }
+      var state = null;
+
+      async.until(function () {
+        return state === 'poweroff';
+      }, function (callback) {
+        VirtualBox.vmState(name, function (err, newState) {
           if (err) { callback(err); return; }
-          callback(null, match[1]);
+          state = newState;
+          setTimeout(callback, 250);
+        });
+      }, function (err) {
+        VirtualBox.exec('unregistervm ' + name + ' --delete', function (stderr, stdout, code) {
+          if (code) { callback(err); return; }
+          callback();
         });
       });
-    } else {
-      callback(null, iface.Name);
-    }
-  });
-};
-
-VirtualBox.addCustomHostAdapter = function (vm, callback) {
-  var self = this;
-  self.hostOnlyAdapter(function (err, ifname) {
-    if (err) { callback(err); return; }
-    self.exec('modifyvm ' + vm + ' --nic2 hostonly --nictype2 virtio --cableconnected2 on --hostonlyadapter2 ' + ifname, function (err, stdout, stderr) {
-      callback(err, ifname);
     });
   });
-};
-
-VirtualBox.setupRouting = function (vm, callback) {
-  // Get the host only adapter or create it if it doesn't exist
-  this.addCustomHostAdapter(vm, function (err, ifname) {
-    var installFile = path.join(Util.getBinDir(), 'install');
-    var cocoaSudo = path.join(Util.getBinDir(), 'cocoasudo');
-    var execCommand = cocoaSudo + ' --prompt="Kitematic needs your password to allow routing *.kite requests to containers." ' + installFile;
-    exec(execCommand, {env: {IFNAME: ifname, GATEWAY: Boot2Docker.REQUIRED_IP}}, function (error, stdout, stderr) {
-      if (error) {
-        callback(error);
-        return;
-      }
-      callback();
-    });
-  });
-};
-
-VirtualBox.removeDHCP = function (callback) {
-  var self = this;
-  self.hostOnlyAdapter(function (err, ifname) {
-    if (err) { callback(err); return; }
-    self.exec('dhcpserver remove --ifname ' + ifname, function (err, stdout, stderr) {
-      callback(err);
-    });
-  });
-};
+};
\ No newline at end of file
diff --git a/meteor/client/main.js b/meteor/client/main.js
index 4f04f15b31..c1b3fd6c18 100755
--- a/meteor/client/main.js
+++ b/meteor/client/main.js
@@ -1,11 +1,5 @@
 try {
   moment = require('moment');
-  // gui = require('nw.gui');
-  // gui.App.clearCache();
-  // win = gui.Window.get();
-  // var nativeMenuBar = new gui.Menu({type: 'menubar'});
-  // nativeMenuBar.createMacBuiltin('Kitematic');
-  // win.menu = nativeMenuBar;
 } catch (e) {
   console.error(e);
 }
@@ -75,90 +69,48 @@ Handlebars.registerHelper('displayTags', function (tags, delimiter) {
   }
 });
 
-var fixBoot2DockerVM = function (callback) {
-  Boot2Docker.check(function (err) {
-    if (err) {
-      Session.set('available', false);
-      Boot2Docker.resolve(function (err) {
-        if (err) {
-          callback(err);
+updateBoot2DockerUtilization = function (callback) {
+  Boot2Docker.exists(function (err, exists) {
+    if (err) { callback(err); return; }
+    if (exists) {
+      Boot2Docker.state(function (err, state) {
+        if (err) { callback(err); return; }
+        Session.set('boot2dockerState', state);
+        if (state === 'running') {
+          Boot2Docker.stats(function (err, stats) {
+            if (err) { callback(err); return; }
+            if (stats.state !== 'poweroff' && stats.memory && stats.disk) {
+              Session.set('boot2dockerMemoryUsage', stats.memory);
+              Session.set('boot2dockerDiskUsage', stats.disk);
+            }
+            callback();
+          });
         } else {
-          Session.set('available', true);
           callback();
         }
       });
-    } else {
-      callback();
     }
   });
 };
 
-var fixDefaultImages = function (callback) {
-  Docker.checkDefaultImages(function (err) {
-    if (err) {
-      Session.set('available', false);
-      Docker.resolveDefaultImages(function (err) {
-        if (err) {
-          callback();
-        } else {
-          Session.set('available', true);
-          callback();
-        }
-      });
-    } else {
-      Session.set('available', true);
-      callback();
-    }
+startUpdatingBoot2DockerUtilization = function () {
+  updateBoot2DockerUtilization(function (err) {
+    if (err) {console.log(err);}
+    Meteor.setTimeout(startUpdatingBoot2DockerUtilization, 2000);
   });
 };
 
-var fixDefaultContainers = function (callback) {
-  Docker.checkDefaultContainers(function (err) {
-    if (err) {
-      Session.set('available', false);
-      Docker.resolveDefaultContainers(function (err) {
-        if (err) {
-          callback(err);
-        } else {
-          Session.set('available', true);
-          callback();
-        }
+startSyncingAppState = function () {
+  try {
+    ImageUtil.sync(function (err) {
+      if (err) {throw err;}
+      AppUtil.sync(function (err) {
+        if (err) {throw err;}
+        Meteor.setTimeout(startSyncingAppState, 2000);
       });
-    } else {
-      Session.set('available', true);
-      callback();
-    }
-  });
-};
-
-Meteor.setInterval(function () {
-  if (!Session.get('installing')) {
-    Boot2Docker.exists(function (err, exists) {
-      if (err) { console.log(err); return; }
-      if (exists) {
-        Boot2Docker.state(function (err, state) {
-          if (err) { console.log(err); return; }
-          Session.set('boot2dockerState', state);
-          if (state === 'running') {
-            Boot2Docker.stats(function (err, stats) {
-              if (err) { console.log(err); return; }
-              if (stats.state !== 'poweroff' && stats.memory && stats.disk) {
-                Session.set('boot2dockerMemoryUsage', stats.memory);
-                Session.set('boot2dockerDiskUsage', stats.disk);
-              }
-            });
-          }
-        });
-      }
     });
+  } catch (err) {
+    console.log(err);
+    Meteor.setTimeout(startSyncingAppState, 2000);
   }
-}, 5000);
-
-Meteor.setInterval(function () {
-  if (!Session.get('installing')) {
-    Sync.resolveWatchers(function () {});
-    ImageUtil.sync();
-    AppUtil.sync();
-    AppUtil.recover();
-  }
-}, 5000);
+};
\ No newline at end of file
diff --git a/meteor/client/main.less b/meteor/client/main.less
index 3558ad128d..68d5a05c6d 100755
--- a/meteor/client/main.less
+++ b/meteor/client/main.less
@@ -7,6 +7,6 @@
 @import "stylesheets/widgets.import.less";
 @import "stylesheets/mac.import.less";
 @import "stylesheets/dashboard.import.less";
-@import "stylesheets/setup.import.less";
+@import "stylesheets/intro.import.less";
 @import "stylesheets/spinner.import.less";
-@import "stylesheets/radial-progress.import.less";
+@import "stylesheets/radial.import.less";
diff --git a/meteor/client/stylesheets/dashboard.import.less b/meteor/client/stylesheets/dashboard.import.less
index b97cd726f5..574162f4bc 100755
--- a/meteor/client/stylesheets/dashboard.import.less
+++ b/meteor/client/stylesheets/dashboard.import.less
@@ -20,6 +20,51 @@
       .btn-icon {
         font-size: 20px;
         margin-left: 0.4em;
+        cursor: pointer;
+      }
+      .dropdown {
+        &.open {
+          .tooltip {
+            display: none !important;
+          }
+        }
+      }
+      .ports {
+        position: relative;
+        top: -2px;
+        .dropdown-menu {
+          min-width: 241px;
+          padding: 10px 15px 3px;
+        }
+        .btn-group {
+          top: -2px;
+        }
+        .btn-globe {
+          line-height: 22px;
+          padding: 0 5px;
+          .typcn {
+            font-size: 18px;
+            top: 2px;
+            position: relative;
+          }
+        }
+        .btn-ports {
+          .caret {
+            margin-left: 3px;
+            margin-right: 1px;
+            margin-top: -2px
+          }
+        }
+        .btn-caret {
+          padding-top: 3px;
+          padding-bottom: 3px;
+          border-width: 1px;
+          padding-left: 3px;
+          padding-right: 3px;
+        }
+        &.open + .tooltip {
+          display: none !important;
+        }
       }
     }
     &:hover {
@@ -65,6 +110,28 @@
     }
   }
 
+  .update-alert {
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    margin-bottom: 0;
+    padding: 5px;
+    width: 100%;
+    text-align: right;
+    background: white;
+    font-size: 12px;
+    z-index: 2;
+    color: @text-color-less-light;
+    border-top: 1px solid @text-color-lightest;
+    box-shadow: 0 -1px 2px 0 rgba(0, 0, 0, 0.05);
+
+    .update-text {
+      position: relative;
+      top: 2px;
+      right: 5px;
+    }
+  }
+
   .dashboard-row {
     .make-row();
     .dashboard-menu {
@@ -139,8 +206,7 @@
       }
       .content {
         .padded {
-          padding: 1.6em;
-          padding-top: 0;
+          padding: 0 1.6em 2.5em;
         }
         &.longer {
           min-height: @dashboard-content-height + @dashboard-header-height;
@@ -217,24 +283,65 @@
     }
   }
 
-  .env-var-pair {
-    .make-row();
-    margin-bottom: 0.2em;
-    font-size: 12px;
-    .env-var-key {
-      .make-xs-column(5);
-      text-overflow: ellipsis;
-      overflow: hidden;
-      white-space: nowrap;
+  .form-env-vars {
+    label {
+      font-size: 13px;
     }
-    .env-var-value {
-      .make-xs-column(5);
-      text-overflow: ellipsis;
-      overflow: hidden;
-      white-space: nowrap;
+    input {
+      font-size: 13px;
+      padding: 5px 9px;
     }
-    .options {
-      .make-xs-column(2);
+    .env-var-pair {
+      .make-row();
+      margin-bottom: 0.2em;
+      font-size: 13px;
+      .env-var-key {
+        .make-xs-column(5);
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+      }
+      .env-var-value {
+        .make-xs-column(5);
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+      }
+      .options {
+        .make-xs-column(2);
+      }
+    }
+  }
+
+  .app-ports {
+    cursor: default;
+    min-width: 240px;
+    li {
+      padding-bottom: 7px;
+      white-space: nowrap;
+
+      .port-wrapper {
+        display: inline-block;
+        min-width: 72px;
+        font-weight: bold;
+        font-size: 13px;
+      }
+      .arrow-wrapper {
+        text-align: center;
+        display: inline-block;
+        min-width: 28px;
+        font-size: 15px;
+        color: #999;
+      }
+      .open-button-wrapper {
+        display: inline-block;
+      }
+      .host-address-wrapper {
+        font-family: Monaco, monospace;
+        font-size: 12px;
+        cursor: text;
+        .text-select();
+      }
     }
   }
 
@@ -242,10 +349,6 @@
     font-size: 12px;
   }
 
-  .disk-utilization {
-    margin-top: 2em;
-  }
-
   .progress {
     font-weight: 600;
     height: 24px;
diff --git a/meteor/client/stylesheets/intro.import.less b/meteor/client/stylesheets/intro.import.less
new file mode 100644
index 0000000000..78fa0e6bb6
--- /dev/null
+++ b/meteor/client/stylesheets/intro.import.less
@@ -0,0 +1,15 @@
+.intro {
+  -webkit-app-region: drag;
+  height: 100%;
+  background: white;
+
+  .content {
+    -webkit-app-region: no-drag;
+    margin-top: 220px;
+    text-align: center;
+    p {
+      .text-select();
+      margin-top: 40px;
+    }
+  }
+}
diff --git a/meteor/client/stylesheets/radial-progress.import.less b/meteor/client/stylesheets/radial.import.less
similarity index 58%
rename from meteor/client/stylesheets/radial-progress.import.less
rename to meteor/client/stylesheets/radial.import.less
index f522a827d0..bb1b06c598 100644
--- a/meteor/client/stylesheets/radial-progress.import.less
+++ b/meteor/client/stylesheets/radial.import.less
@@ -1,42 +1,52 @@
+@-webkit-keyframes rotating {
+  from{
+    -webkit-transform: rotate(0deg);
+  }
+  to{
+    -webkit-transform: rotate(360deg);
+  }
+}
+
 .radial-progress {
-  @circle-size: 34px;
-  @circle-background: #d6dadc;
-  @circle-color: #3FD899;
-  @inset-size: 28px;
-  @inset-color: #fbfbfb;
+
+  &.radial-spinner {
+    -webkit-animation: rotating 1.2s linear infinite;
+  }
+
+  @circle-size: 96px;
+  @circle-background: transparent;
+  @inset-size: 92px;
+  @inset-color: white;
   @transition-length: 1s;
-  @shadow: 0px 1px 3px rgba(0,0,0,0.2);
-  @percentage-color: #3FD899;
-  @percentage-font-size: 11px;
+  // @percentage-color: #3FD899;
+  @percentage-font-size: 14px;
   @percentage-text-width: 57px;
+  margin: 0 auto;
 
   width:  @circle-size;
   height: @circle-size;
 
   background-color: @circle-background;
-  border-radius: 50%;
+  border-radius: 100%;
   .circle {
     .mask, .fill, .shadow {
       width:    @circle-size;
       height:   @circle-size;
       position: absolute;
-      border-radius: 50%;
-    }
-    .shadow {
-      box-shadow: @shadow inset;
+      border-radius: 100%;
     }
     .mask, .fill {
       -webkit-backface-visibility: hidden;
       transition: -webkit-transform @transition-length;
       transition: -ms-transform @transition-length;
       transition: transform @transition-length;
-      border-radius: 50%;
+      border-radius: 100%;
     }
-    .mask {
-      clip: rect(0px, @circle-size, @circle-size, @circle-size/2);
+    .mask { 
+      clip: rect(0px, @circle-size, @circle-size, @circle-size/2.0);
       .fill {
-        clip: rect(0px, @circle-size/2, @circle-size, 0px);
-        background-color: @circle-color;
+        clip: rect(0px, @circle-size/2.0, @circle-size, 0px);
+        background-color: @brand-action;
       }
     }
   }
@@ -44,27 +54,35 @@
     width:       @inset-size;
     height:      @inset-size;
     position:    absolute;
-    margin-left: (@circle-size - @inset-size)/2;
-    margin-top:  (@circle-size - @inset-size)/2;
+    margin-left: (@circle-size - @inset-size) / 2.0;
+    margin-top:  (@circle-size - @inset-size) / 2.0;
 
     background-color: @inset-color;
-    border-radius: 50%;
-    box-shadow: @shadow;
+    border-radius: 100%;
     .percentage {
       width:       @percentage-text-width;
       position:    absolute;
-      top:         (@inset-size - @percentage-font-size) / 2;
-      left:        (@inset-size - @percentage-text-width) / 2;
+      top:         (@inset-size - @percentage-font-size) / 2.0;
+      left:        (@inset-size - @percentage-text-width) / 2.0;
 
       line-height: 1;
       text-align:  center;
 
-      color:       @percentage-color;
-      font-weight: 800;
+      // color:       @percentage-color;
+      font-weight: 500;
       font-size:   @percentage-font-size;
     }
   }
 
+
+  &.radial-negative .circle .mask .fill {
+    background-color: @brand-negative;
+  }
+
+  &.radial-positive .circle .mask .fill {
+    background-color: @brand-positive;
+  }
+
   @i: 0;
   @increment: 180deg / 100;
   .loop (@i) when (@i <= 100) {
diff --git a/meteor/client/stylesheets/setup.import.less b/meteor/client/stylesheets/setup.import.less
deleted file mode 100644
index a520c3a160..0000000000
--- a/meteor/client/stylesheets/setup.import.less
+++ /dev/null
@@ -1,71 +0,0 @@
-.setup {
-
-  -webkit-app-region: drag;
-  height: 100%;
-  background: #F8F8F8;
-
-  .content {
-    margin-top: 30px;
-  }
-
-  .steps {
-    margin-left: 180px;
-    margin-top: 60px;
-    .media-body {
-      margin-top: 5px;
-      font-size: 18px;
-      padding-left: 14px;
-    }
-  }
-
-  h2 {
-    padding-top: 30px;
-    font-weight: 500;
-    font-size: 36px;
-    color: #3E3E3E;
-  }
-
-  p {
-    margin-top: 20px;
-    font-size: 14px;
-    color: #232323;
-    font-weight: 500;
-  }
-
-  .install_logo {
-    margin-top: 60px;
-  }
-
-  .install-finish {
-    margin-top: 60px;
-  }
-
-  .install-finish {
-    -webkit-app-region: no-drag;
-    margin-top: 80px;
-    p {
-      margin-top: 0;
-      font-size: 13px;
-    }
-  }
-
-  .install-diagonistics {
-    -webkit-app-region: no-drag;
-    label {
-      text-align: left;
-    }
-    margin: 0 auto;
-    max-width: 300px;
-    margin-top: 50px;
-  }
-
-  .install-continue {
-    -webkit-app-region: no-drag;
-    margin-top: 140px;
-    p {
-      margin-top: 0;
-      font-size: 13px;
-    }
-  }
-
-}
diff --git a/meteor/client/stylesheets/theme.import.less b/meteor/client/stylesheets/theme.import.less
index 1598310cb1..98f541d847 100755
--- a/meteor/client/stylesheets/theme.import.less
+++ b/meteor/client/stylesheets/theme.import.less
@@ -118,6 +118,24 @@ button {
   }
 }
 
+.btn-action-inverse {
+  .btn-styles(@btn-action-color);
+  color: @btn-action-bg;
+  border-color: @btn-action-color;
+  &:hover,
+  &:focus  {
+    border-color: darken(@btn-action-color, 10%);
+    background: darken(@btn-action-color, 10%);
+    color: @btn-action-bg;
+  }
+  &:active,
+  &.active {
+    border-color: darken(@btn-action-color, 10%);
+    background: darken(@btn-action-color, 10%);
+    color: @btn-action-bg;
+  }
+}
+
 .btn-positive {
   .btn-styles(@btn-positive-bg);
   color: @btn-positive-color;
diff --git a/meteor/client/stylesheets/variables.import.less b/meteor/client/stylesheets/variables.import.less
index a258b44eb4..3176195cc1 100755
--- a/meteor/client/stylesheets/variables.import.less
+++ b/meteor/client/stylesheets/variables.import.less
@@ -4,6 +4,7 @@
 
 @font-size-base:        14px;
 @text-color:            #343638;
+@text-color-less-light: lighten(@text-color, 30%);
 @text-color-light:      lighten(@text-color, 40%);
 @text-color-lighter:    lighten(@text-color, 60%);
 @text-color-lightest:   lighten(@text-color, 72%);
diff --git a/meteor/client/views/application/layout.html b/meteor/client/views/application/layout.html
index 1ceeafbe14..2bc12665fc 100755
--- a/meteor/client/views/application/layout.html
+++ b/meteor/client/views/application/layout.html
@@ -1,5 +1,3 @@
 <template name="layout">
-  {{> header}}
   {{> yield}}
-  {{> footer}}
 </template>
diff --git a/meteor/client/views/dashboard/apps/dashboard-apps-logs.html b/meteor/client/views/dashboard/apps/dashboard-apps-logs.html
index 193d2db951..3d4f47645b 100644
--- a/meteor/client/views/dashboard/apps/dashboard-apps-logs.html
+++ b/meteor/client/views/dashboard/apps/dashboard-apps-logs.html
@@ -1,4 +1,4 @@
-<template name="dashboard_apps_logs">
+<template name="dashboardAppsLogs">
   <div class="logs">
     {{#each logs}}
       <h6>{{{this}}}</h6>
diff --git a/meteor/client/views/dashboard/apps/dashboard-apps-ports.html b/meteor/client/views/dashboard/apps/dashboard-apps-ports.html
new file mode 100644
index 0000000000..7797c621b9
--- /dev/null
+++ b/meteor/client/views/dashboard/apps/dashboard-apps-ports.html
@@ -0,0 +1,13 @@
+<template name="dashboardAppsPorts">
+  <div class="app-ports">
+    {{#each ports}}
+      <li role="menuitem">
+        <span class="port-wrapper">Port {{this.port}}</span>
+        <span class="arrow-wrapper">
+          <span class="typcn typcn-arrow-right"></span>
+        </span>
+        <span class="host-address-wrapper">{{this.hostIp}}:{{this.hostPort}}</span>
+      </li>
+    {{/each}}
+  </div>
+</template>
\ No newline at end of file
diff --git a/meteor/client/views/dashboard/apps/dashboard-apps-settings.html b/meteor/client/views/dashboard/apps/dashboard-apps-settings.html
index 6fc778b03c..ba35617731 100755
--- a/meteor/client/views/dashboard/apps/dashboard-apps-settings.html
+++ b/meteor/client/views/dashboard/apps/dashboard-apps-settings.html
@@ -1,41 +1,17 @@
-<template name="dashboard_apps_settings">
+<template name="dashboardAppsSettings">
   <div class="section">
     <div class="left-section">
-      <h4>Container Details</h4>
-      <p class="help-block">This section lists more information about this container.</p>
+      <h4>Ports</h4>
     </div>
     <div class="right-section">
-      <div class="row">
-        <div class="col-xs-3">
-          <label>Host URL</label>
-        </div>
-        <div class="col-xs-8">
-          {{hostUrl}}
-        </div>
-      </div>
-      {{#if ports}}
-        <div class="row">
-          <div class="col-xs-3">
-            <label>Ports</label>
-          </div>
-          <div class="col-xs-8">
-            {{ports}}
-          </div>
-        </div>
-      {{/if}}
-      <div class="row">
-        <div class="col-xs-3">
-          <label>Status</label>
-        </div>
-        <div class="col-xs-8">
-          {{status}}
-        </div>
-      </div>
+      <ul class="list-unstyled">
+        {{> dashboardAppsPorts}}
+      </ul>
     </div>
   </div>
   <div class="section">
     <div class="left-section">
-      <h4>Config Variables</h4>
+      <h4>Environment Variables</h4>
       <p class="help-block">You can update your container's environment variables here.</p>
     </div>
     <div class="right-section">
@@ -69,6 +45,19 @@
       </form>
     </div>
   </div>
+  <div class="section">
+    <div class="left-section">
+      <h4>Volumes</h4>
+      <p class="help-block">When enabled, this container's volume data will be available under ~/Kitematic/{{name}}.</p>
+    </div>
+    <div class="right-section">
+      {{#if volumesEnabled}}
+        <a onclick="trackLink('enable container volumes')" class="btn btn-negative btn-disable-volumes btn-sm">Disable Volumes</a>
+      {{else}}
+        <a onclick="trackLink('disable container volumes')" class="btn btn-positive btn-enable-volumes btn-sm">Enable Volumes</a>
+      {{/if}}
+    </div>
+  </div>
   <div class="section">
     <div class="left-section">
       <h4>Delete Container</h4>
diff --git a/meteor/client/views/dashboard/apps/dashboard-apps-settings.js b/meteor/client/views/dashboard/apps/dashboard-apps-settings.js
index 1ed9927603..8fcdca2e88 100755
--- a/meteor/client/views/dashboard/apps/dashboard-apps-settings.js
+++ b/meteor/client/views/dashboard/apps/dashboard-apps-settings.js
@@ -13,7 +13,7 @@ var getConfigVars = function ($form) {
   return configVars;
 };
 
-Template.dashboard_apps_settings.events({
+Template.dashboardAppsSettings.events({
   'click .btn-delete-var': function (e) {
     var $button = $(e.currentTarget);
     $button.attr("disabled", "disabled");
@@ -41,10 +41,11 @@ Template.dashboard_apps_settings.events({
     e.stopPropagation();
     return false;
   },
-  'click .btn-delete-app': function () {
+  'click .btn-delete-app': function (e) {
+    e.preventDefault();
     var appId = this._id;
     dialog.showMessageBox({
-      message: 'Are you sure you want to delete this app?',
+      message: 'Are you sure you want to delete this container?',
       buttons: ['Delete', 'Cancel']
     }, function (index) {
       if (index === 0) {
@@ -52,5 +53,29 @@ Template.dashboard_apps_settings.events({
         Router.go('dashboard_apps');
       }
     });
+  },
+  'click .btn-enable-volumes': function (e) {
+    e.preventDefault();
+    var appId = this._id;
+    Apps.update(appId, {
+      $set: {volumesEnabled: true}
+    });
+    AppUtil.run(Apps.findOne(appId), function (err) {
+      if (err) {
+        throw err;
+      }
+    });
+  },
+  'click .btn-disable-volumes': function (e) {
+    e.preventDefault();
+    var appId = this._id;
+    Apps.update(appId, {
+      $set: {volumesEnabled: false}
+    });
+    AppUtil.run(Apps.findOne(appId), function (err) {
+      if (err) {
+        throw err;
+      }
+    });
   }
 });
diff --git a/meteor/client/views/dashboard/apps/dashboard-apps.html b/meteor/client/views/dashboard/apps/dashboard-apps.html
index eb9675bbf0..7c02610c35 100755
--- a/meteor/client/views/dashboard/apps/dashboard-apps.html
+++ b/meteor/client/views/dashboard/apps/dashboard-apps.html
@@ -1,4 +1,4 @@
-<template name="dashboard_apps">
+<template name="dashboardApps">
   <div class="header">
     <h3>Containers</h3>
     <div class="options">
@@ -14,7 +14,7 @@
       {{#if hasItem apps}}
         <div class="apps line-item-collection">
           {{#each apps}}
-            {{> dashboard_single_app}}
+            {{> dashboardSingleApp}}
           {{/each}}
         </div>
       {{else}}
@@ -30,6 +30,6 @@
       {{/if}}
     </div>
   </div>
-  {{> modal_create_app}}
-  {{> modal_create_image}}
+  {{> modalCreateApp}}
+  {{> modalCreateImage}}
 </template>
diff --git a/meteor/client/views/dashboard/apps/dashboard-apps.js b/meteor/client/views/dashboard/apps/dashboard-apps.js
index d71c0c7520..d200e4ffce 100755
--- a/meteor/client/views/dashboard/apps/dashboard-apps.js
+++ b/meteor/client/views/dashboard/apps/dashboard-apps.js
@@ -1,4 +1,4 @@
-Template.dashboard_apps.helpers({
+Template.dashboardApps.helpers({
   apps: function () {
     return Apps.find({}, {sort: {createdAt: -1}});
   }
diff --git a/meteor/client/views/dashboard/apps/dashboard-apps.ports.js b/meteor/client/views/dashboard/apps/dashboard-apps.ports.js
new file mode 100644
index 0000000000..7c0d4ee78e
--- /dev/null
+++ b/meteor/client/views/dashboard/apps/dashboard-apps.ports.js
@@ -0,0 +1,18 @@
+Template.dashboardSingleApp.events({
+  'click .btn-view-port': function (e) {
+    try {
+      var exec = require('exec');
+      e.preventDefault();
+      e.stopPropagation();
+      var $btn = $(e.currentTarget);
+      var url = $btn.attr('href');
+      exec(['open', url]);
+    } catch (exception) {
+      console.log(exception);
+    }
+  },
+  'click .host-address-wrapper': function (e) {
+    e.preventDefault();
+    e.stopPropagation();
+  }
+});
\ No newline at end of file
diff --git a/meteor/client/views/dashboard/apps/dashboard-single-app.html b/meteor/client/views/dashboard/apps/dashboard-single-app.html
index 2b15227ec5..bf3a37568e 100755
--- a/meteor/client/views/dashboard/apps/dashboard-single-app.html
+++ b/meteor/client/views/dashboard/apps/dashboard-single-app.html
@@ -1,4 +1,4 @@
-<template name="dashboard_single_app">
+<template name="dashboardSingleApp">
   <div class="app">
     <h5>
       {{#if $eq status 'READY'}}
@@ -23,19 +23,46 @@
     </h5>
     <div class="options">
       {{#if $eq status 'READY'}}
-        {{#if url}}
-          <a href="{{url}}" onclick="trackLink('view container')" class="btn-icon btn-view" target="_blank" data-toggle="tooltip" data-placement="bottom" title="View"><span class="typcn typcn-eye-outline"></span></a>
+        {{#if ports}}
+          {{#if viewPort}}
+          <div class="ports btn-group btn-icon" title="View" data-placement="bottom">
+            <a href="{{viewPort.url}}" onclick="trackLink('view container')" class="btn btn-action btn-xs btn-view btn-globe">
+              <span class="typcn typcn-world-outline"></span>
+            </a>
+            <a href="#" class="btn btn-action btn-xs btn-caret dropdown-toggle" id="dashboardAppsPorts" data-toggle="dropdown">
+              <span class="caret"></span>
+              <span class="sr-only">Toggle Dropdown</span>
+            </a>
+            <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dashboardAppsPorts">
+              {{> dashboardAppsPorts}}
+            </ul>
+          </div>
+          {{else}}
+          <span class="ports dropdown">
+            <div class="dropdown btn-group btn-icon dropdown-toggle" id="dashboardAppsPorts" data-toggle="dropdown" data-placement="bottom" title="View">
+              <a href="#" onclick="trackLink('view container')" class="btn btn-action btn-xs btn-globe btn-ports">
+                <span class="typcn typcn-world-outline"></span>
+                <span class="caret"></span>
+              </a>
+            </div>
+            <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dashboardAppsPorts">
+              {{> dashboardAppsPorts}}
+            </ul>
+          </span>
+          {{/if}}
         {{/if}}
-        <a href="#" onclick="trackLink('terminal into container')" class="btn-icon btn-terminal" data-toggle="tooltip" data-placement="bottom" title="Terminal"><span class="typcn typcn-device-laptop"></span></a>
       {{/if}}
-      <a href="#" onclick="trackLink('open container folder')" class="btn-icon btn-folder" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Folder"><span class="typcn typcn-folder-open"></span></a>
+      <a href="#" onclick="trackLink('open container folder')" class="btn-icon btn-folder" data-toggle="tooltip" data-placement="bottom" title="Volumes"><span class="typcn typcn-folder"></span></a>
       {{#if $eq status 'READY'}}
-        <a href="#" onclick="trackLink('stop container')" class="btn-icon btn-stop" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Stop"><span class="typcn typcn-media-pause-outline"></span></a>
+        <a href="#" onclick="trackLink('terminal into container')" class="btn-icon btn-terminal" data-toggle="tooltip" data-placement="bottom" title="Terminal"><span class="typcn typcn-device-laptop"></span></a>
+        <a href="#" onclick="trackLink('stop container')" class="btn-icon btn-stop" data-toggle="tooltip" data-placement="bottom" title="Stop"><span class="typcn typcn-media-stop-outline"></span></a>
       {{/if}}
       {{#if $eq status 'STOPPED'}}
-      <a href="#" onclick="trackLink('start container')" class="btn-icon btn-start" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Start"><span class="typcn typcn-media-play-outline"></span></a>
+      <a href="#" onclick="trackLink('start container')" class="btn-icon btn-start" data-toggle="tooltip" data-placement="bottom" title="Start"><span class="typcn typcn-media-play-outline"></span></a>
       {{/if}}
-      <a href="#" onclick="trackLink('restart container')" class="btn-icon btn-restart" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Restart"><span class="typcn typcn-refresh-outline"></span></a>
+      {{#unless changingState}}
+      <a href="#" onclick="trackLink('restart container')" class="btn-icon btn-restart" data-toggle="tooltip" data-placement="bottom" title="Restart"><span class="typcn typcn-refresh-outline"></span></a>
+      {{/unless}}
       <a href="/apps/{{name}}/logs" onclick="trackLink('container logs')" class="btn-icon btn-logs" data-toggle="tooltip" data-placement="bottom" title="Logs"><span class="typcn typcn-document-text"></span></a>
       <a href="/apps/{{name}}/settings" onclick="trackLink('container settings')" class="btn-icon" data-toggle="tooltip" data-placement="bottom" title="Settings"><span class="typcn typcn-cog-outline"></span></a>
     </div>
diff --git a/meteor/client/views/dashboard/apps/dashboard-single-app.js b/meteor/client/views/dashboard/apps/dashboard-single-app.js
index 1f2a17d02b..d862ab148c 100755
--- a/meteor/client/views/dashboard/apps/dashboard-single-app.js
+++ b/meteor/client/views/dashboard/apps/dashboard-single-app.js
@@ -1,45 +1,112 @@
-Template.dashboard_single_app.rendered = function () {
+var remote = require('remote');
+var dialog = remote.require('dialog');
+var exec = require('exec');
+var path = require('path');
+
+Template.dashboardSingleApp.rendered = function () {
   Meteor.setInterval(function () {
     $('.btn-icon').tooltip();
   }, 1000);
 };
 
-Template.dashboard_single_app.events({
+Template.dashboardSingleApp.helpers({
+  viewPort: function () {
+    var ports = this.ports();
+    if (ports[0] && ports[0].web) {
+      return ports[0];
+    }
+    return null;
+  },
+  changingState: function () {
+    return this.status === 'STARTING' || this.status === 'STOPPING';
+  }
+});
+
+Template.dashboardSingleApp.events({
   'click .btn-view': function (e) {
     try {
-      var open = require('open');
       e.preventDefault();
       e.stopPropagation();
       var $btn = $(e.currentTarget);
       var url = $btn.attr('href');
-      open(url);
+      exec(['open', url], function (err) {
+        if (err) { throw err; }
+      });
     } catch (exception) {
       console.log(exception);
     }
   },
   'click .btn-terminal': function () {
-    var app = this;
-    var cmd = Boot2Docker.command() + ' ssh -t "sudo docker-enter ' + app.docker.Id + '"';
+    var cmd = [Boot2Docker.command(), 'ssh', '-t', 'sudo docker exec -i -t ' + this.docker.Id + ' bash'];
     Util.openTerminal(cmd);
   },
-  'click .btn-start': function () {
+  'click .btn-start': function (e) {
+    e.preventDefault();
     AppUtil.start(this._id);
     $('.btn-icon').tooltip('hide');
   },
-  'click .btn-stop': function () {
+  'click .btn-stop': function (e) {
+    e.preventDefault();
     AppUtil.stop(this._id);
     $('.btn-icon').tooltip('hide');
   },
-  'click .btn-restart': function () {
-    AppUtil.restart(this._id);
+  'click .btn-restart': function (e) {
+    e.preventDefault();
+    $('.btn-icon').tooltip('hide');
+    AppUtil.run(this, function (err) {});
   },
-  'click .btn-folder': function () {
-    var exec = require('child_process').exec;
-    exec('open ' + this.path, function (err) {
-      if (err) { throw err; }
+  'click .btn-folder': function (e) {
+    e.preventDefault();
+    $('.btn-icon').tooltip('hide');
+    var app = this;
+    if (!app) {
+      throw new Error('Cannot find app with id: ' + app._id);
+    }
+
+    var openDirectory = function () {
+      var appPath = path.join(Util.KITE_PATH, app.name);
+      if (app.docker.Volumes.length) {
+        if (_.find(app.docker.Volumes, function (volume) { return volume.Value.indexOf(path.join(Util.getHomePath(), 'Kitematic')) !== -1; })) {
+          exec(['open', appPath], function (stderr, stdout, code) {
+            if (code) { throw stderr; }
+          });
+          return;
+        } else {
+          var volume = _.find(app.docker.Volumes, function (volume) { return volume.Value.indexOf(Util.getHomePath()) !== -1; })
+          exec(['open', volume.Value], function (stderr, stdout, code) {
+            if (code) { throw stderr; }
+          });
+          return;
+        }
+      } else {
+        exec(['open', appPath], function (stderr, stdout, code) {
+          if (code) { throw stderr; }
+        });
+      }
+    };
+
+    if (app.volumesEnabled) {
+      openDirectory();
+      return;
+    }
+
+    dialog.showMessageBox({
+      message: 'Volumes need to be enabled to view their contents via Finder. Enable volumes for this container?',
+      buttons: ['Enable Volumes', 'Cancel']
+    }, function (index) {
+      if (index === 0) {
+        Apps.update(app._id, {
+          $set: {volumesEnabled: true}
+        });
+        AppUtil.run(Apps.findOne(app._id), function (err) {
+          if (err) { throw err; }
+          openDirectory();
+        });
+      }
     });
   },
-  'click .btn-logs': function () {
+  'click .btn-logs': function (e) {
     AppUtil.logs(this._id);
+    $('.btn-icon').tooltip('hide');
   }
 });
diff --git a/meteor/client/views/dashboard/components/dashboard-menu.html b/meteor/client/views/dashboard/components/dashboard-menu.html
index f1dc8640a6..ae4bbe3cbc 100755
--- a/meteor/client/views/dashboard/components/dashboard-menu.html
+++ b/meteor/client/views/dashboard/components/dashboard-menu.html
@@ -1,4 +1,4 @@
-<template name="dashboard_menu">
+<template name="dashboardMenu">
   <div class="dashboard-menu">
     <div class="mac-window-options">
       <div class="mac-close"><i class="fa fa-times no-display"></i></div>
diff --git a/meteor/client/views/dashboard/components/dashboard-menu.js b/meteor/client/views/dashboard/components/dashboard-menu.js
index 1c21d2a13f..a832ddb4af 100755
--- a/meteor/client/views/dashboard/components/dashboard-menu.js
+++ b/meteor/client/views/dashboard/components/dashboard-menu.js
@@ -1,6 +1,6 @@
 var remote = require('remote');
 
-Template.dashboard_menu.events({
+Template.dashboardMenu.events({
   'click .mac-close': function () {
     remote.getCurrentWindow().hide();
   },
@@ -19,7 +19,7 @@ Template.dashboard_menu.events({
   }
 });
 
-Template.dashboard_menu.rendered = function () {
+Template.dashboardMenu.rendered = function () {
   $('.nav a').attr('tabIndex', '-1');
   $('.nav a').attr('onfocus', 'this.blur()');
   $('.nav a').tooltip();
diff --git a/meteor/client/views/dashboard/components/menu-header.html b/meteor/client/views/dashboard/components/menu-header.html
index 7758802fab..682d9ba217 100644
--- a/meteor/client/views/dashboard/components/menu-header.html
+++ b/meteor/client/views/dashboard/components/menu-header.html
@@ -1,3 +1,4 @@
-<template name="menu_header">
+<template name="menuHeader">
   <div class="mac-window-header"><a href="#">Kitematic</a></div>
+  {{> updateNotification}}
 </template>
diff --git a/meteor/client/views/dashboard/components/modal-create-app.html b/meteor/client/views/dashboard/components/modal-create-app.html
index c0fdf20c90..4bb6701a54 100755
--- a/meteor/client/views/dashboard/components/modal-create-app.html
+++ b/meteor/client/views/dashboard/components/modal-create-app.html
@@ -1,4 +1,4 @@
-<template name="modal_create_app">
+<template name="modalCreateApp">
   <div class="modal fade" id="modal-create-app" tabindex="-1" role="dialog" aria-labelledby="modal-create-app" aria-hidden="true">
     <div class="modal-dialog modal-small">
       <div class="modal-content">
diff --git a/meteor/client/views/dashboard/components/modal-create-app.js b/meteor/client/views/dashboard/components/modal-create-app.js
index 6fd4f6328c..27d71fb03d 100755
--- a/meteor/client/views/dashboard/components/modal-create-app.js
+++ b/meteor/client/views/dashboard/components/modal-create-app.js
@@ -1,13 +1,13 @@
 var fs = require('fs');
 var path = require('path');
 
-Template.modal_create_app.helpers({
+Template.modalCreateApp.helpers({
   images: function () {
     return Images.find({status: 'READY', 'docker.Config.ExposedPorts': {$ne: null}}, {sort: {createdAt: -1}});
   }
 });
 
-Template.modal_create_app.events({
+Template.modalCreateApp.events({
   'submit #form-create-app': function (e) {
     var $form = $(e.currentTarget);
     var formData = $form.serializeObject();
@@ -31,20 +31,17 @@ Template.modal_create_app.events({
         imageId: cleaned.imageId,
         status: 'STARTING',
         config: {},
-        path: appPath,
         logs: [],
-        createdAt: new Date()
+        createdAt: new Date(),
+        volumesEnabled: true
       };
       var appId = Apps.insert(appObj);
       var app = Apps.findOne(appId);
       var image = Images.findOne(app.imageId);
       Util.copyVolumes(image.path, app.name, function (err) {
         if (err) { console.error(err); }
-        Docker.removeBindFolder(app.name, function (err) {
+        AppUtil.run(app, function (err) {
           if (err) { console.error(err); }
-          AppUtil.run(app, function (err) {
-            if (err) { console.error(err); }
-          });
         });
       });
       $('#modal-create-app').bind('hidden.bs.modal', function () {
diff --git a/meteor/client/views/dashboard/components/modal-create-image.html b/meteor/client/views/dashboard/components/modal-create-image.html
index a96e9b3033..9ccb1ad667 100755
--- a/meteor/client/views/dashboard/components/modal-create-image.html
+++ b/meteor/client/views/dashboard/components/modal-create-image.html
@@ -1,4 +1,4 @@
-<template name="modal_create_image">
+<template name="modalCreateImage">
   <div class="modal fade" id="modal-create-image" tabindex="-1" role="dialog" aria-labelledby="modal-create-image" aria-hidden="true">
     <div class="modal-dialog modal-small">
       <div class="modal-content">
diff --git a/meteor/client/views/dashboard/components/modal-create-image.js b/meteor/client/views/dashboard/components/modal-create-image.js
index ddfbd4b636..d9107cab69 100755
--- a/meteor/client/views/dashboard/components/modal-create-image.js
+++ b/meteor/client/views/dashboard/components/modal-create-image.js
@@ -3,13 +3,13 @@ var fs = require('fs');
 var remote = require('remote');
 var dialog = remote.require('dialog');
 
-Template.modal_create_image.rendered = function () {
+Template.modalCreateImage.rendered = function () {
   $('#modal-create-image').bind('hidden.bs.modal', function () {
     Router.go('dashboard_images');
   });
 };
 
-Template.modal_create_image.events({
+Template.modalCreateImage.events({
   'click #btn-pick-directory': function () {
     dialog.showOpenDialog({properties: ['openDirectory']}, function (filenames) {
       if (!filenames) {
@@ -40,10 +40,9 @@ Template.modal_create_image.events({
     $('#picked-directory-error').html('');
     $('#picked-directory').html('');
     $('#btn-create-image').attr('disabled', 'disabled');
-    $('#modal-create-image').modal('hide');
     var imageObj = {
       status: 'BUILDING',
-      originPath: directory,
+      path: directory,
       buildLogs: [],
       createdAt: new Date()
     };
@@ -51,27 +50,24 @@ Template.modal_create_image.events({
     imageObj.meta = imageMetaData;
     imageObj.tags = [imageMetaData.name + ':' + imageMetaData.version];
     var imageId = Images.insert(imageObj);
-    var imagePath = path.join(Util.KITE_IMAGES_PATH, imageId);
-    Images.update(imageId, {
-      $set: {
-        path: imagePath
-      }
+
+    $('#modal-create-image').modal('hide');
+    $('#modal-create-image').on('hidden.bs.modal', function () {
+      Router.go('dashboard_images_logs', {id: imageId});
     });
+
     if (imageObj.meta.logo) {
       Images.update(imageId, {
         $set: {
-          logoPath: path.join(imagePath, imageObj.meta.logo)
+          logoPath: path.join(directory, imageObj.meta.logo)
         }
       });
     }
     var image = Images.findOne(imageId);
-    ImageUtil.saveFolder(image.originPath, imageId, function (err) {
-      if (err) { console.error(err); }
-      ImageUtil.pull(fs.readFileSync(path.join(image.path, 'Dockerfile'), 'utf8'), imageId, function (err) {
-        if (err) { throw err; }
-        ImageUtil.build(image, function (err) {
-          if (err) { console.error(err); }
-        });
+    ImageUtil.pull(fs.readFileSync(path.join(image.path, 'Dockerfile'), 'utf8'), imageId, function (err) {
+      if (err) { throw err; }
+      ImageUtil.build(image, function (err) {
+        if (err) { console.error(err); }
       });
     });
   }
diff --git a/meteor/client/views/dashboard/helpers.js b/meteor/client/views/dashboard/helpers.js
index afeeec426f..a6274fe217 100755
--- a/meteor/client/views/dashboard/helpers.js
+++ b/meteor/client/views/dashboard/helpers.js
@@ -1,14 +1,14 @@
 Handlebars.registerHelper('activeDashboardMenuItem', function (page) {
-  var currentPage = Router.current(true).path.split('/')[1];
+  var currentPage = Router.current(true).url.split('/')[1];
   return page === currentPage ? 'active' : '';
 });
 
 Handlebars.registerHelper('activeDashboardSubMenuItem', function (page) {
-  var currentPage = Router.current(true).path.split('/')[3];
+  var currentPage = Router.current(true).url.split('/')[3];
   return page === currentPage ? 'active' : '';
 });
 
 Handlebars.registerHelper('currentDashboardPage', function () {
-  var currentPage = Router.current(true).path.split('/')[1];
+  var currentPage = Router.current(true).url.split('/')[1];
   return currentPage;
 });
diff --git a/meteor/client/views/dashboard/images/dashboard-images-logs.html b/meteor/client/views/dashboard/images/dashboard-images-logs.html
index fed85f3742..1252d33166 100755
--- a/meteor/client/views/dashboard/images/dashboard-images-logs.html
+++ b/meteor/client/views/dashboard/images/dashboard-images-logs.html
@@ -1,4 +1,4 @@
-<template name="dashboard_images_logs">
+<template name="dashboardImagesLogs">
   <div class="download-status">
     <div class="progress">
       <div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: {{this.downloadPercentage}};">
diff --git a/meteor/client/views/dashboard/images/dashboard-images-settings.html b/meteor/client/views/dashboard/images/dashboard-images-settings.html
index 2dc00ad36f..d715b885cc 100755
--- a/meteor/client/views/dashboard/images/dashboard-images-settings.html
+++ b/meteor/client/views/dashboard/images/dashboard-images-settings.html
@@ -1,4 +1,4 @@
-<template name="dashboard_images_settings">
+<template name="dashboardImagesSettings">
   <div class="section">
     <div class="left-section">
       <h4>Image Details</h4>
@@ -59,7 +59,7 @@
       <p class="help-block">You can change the folder of which your image will be built from.</p>
     </div>
     <div class="right-section">
-      <h5><strong>{{this.originPath}}</strong></h5>
+      <h5><strong>{{this.path}}</strong></h5>
       <h6 id="picked-directory-error" class="error"></h6>
       <a onclick="trackLink('change build directory')" href="#" id="btn-pick-directory" class="btn btn-positive btn-sm"><span class="typcn typcn-folder-open"></span> Change Directory</a>
     </div>
diff --git a/meteor/client/views/dashboard/images/dashboard-images-settings.js b/meteor/client/views/dashboard/images/dashboard-images-settings.js
index 76a40f31dc..2084cb102b 100755
--- a/meteor/client/views/dashboard/images/dashboard-images-settings.js
+++ b/meteor/client/views/dashboard/images/dashboard-images-settings.js
@@ -1,7 +1,7 @@
 var remote = require('remote');
 var dialog = remote.require('dialog');
 
-Template.dashboard_images_settings.events({
+Template.dashboardImagesSettings.events({
   'click .btn-delete-image': function () {
     var imageId = this._id;
     dialog.showMessageBox({
@@ -35,7 +35,7 @@ Template.dashboard_images_settings.events({
         } else {
           Images.update(imageId, {
             $set: {
-              originPath: directory
+              path: directory
             }
           });
         }
diff --git a/meteor/client/views/dashboard/images/dashboard-images.html b/meteor/client/views/dashboard/images/dashboard-images.html
index e4e6a489da..286f1e6638 100755
--- a/meteor/client/views/dashboard/images/dashboard-images.html
+++ b/meteor/client/views/dashboard/images/dashboard-images.html
@@ -1,4 +1,4 @@
-<template name="dashboard_images">
+<template name="dashboardImages">
   <div class="header">
     <h3>Images</h3>
     <div class="options">
@@ -14,7 +14,9 @@
       {{#if hasItem images}}
         <div class="images line-item-collection">
           {{#each images}}
-            {{> dashboard_single_image}}
+            {{#if this.tags}}
+              {{> dashboardSingleImage}}
+            {{/if}}
           {{/each}}
         </div>
       {{else}}
@@ -30,6 +32,6 @@
       {{/if}}
     </div>
   </div>
-  {{> modal_create_app}}
-  {{> modal_create_image}}
+  {{> modalCreateApp}}
+  {{> modalCreateImage}}
 </template>
diff --git a/meteor/client/views/dashboard/images/dashboard-images.js b/meteor/client/views/dashboard/images/dashboard-images.js
index 9edaddcd94..a0b759e1e8 100755
--- a/meteor/client/views/dashboard/images/dashboard-images.js
+++ b/meteor/client/views/dashboard/images/dashboard-images.js
@@ -1,4 +1,4 @@
-Template.dashboard_images.helpers({
+Template.dashboardImages.helpers({
   images: function () {
     return Images.find({}, {sort: {createdAt: -1}});
   }
diff --git a/meteor/client/views/dashboard/images/dashboard-single-image.html b/meteor/client/views/dashboard/images/dashboard-single-image.html
index 826c3fb465..742a625d8d 100755
--- a/meteor/client/views/dashboard/images/dashboard-single-image.html
+++ b/meteor/client/views/dashboard/images/dashboard-single-image.html
@@ -1,4 +1,4 @@
-<template name="dashboard_single_image">
+<template name="dashboardSingleImage">
   <div class="image">
     <h5>
       {{#if $eq status 'READY'}}
@@ -31,11 +31,11 @@
           <a onclick="trackLink('create container from image')" href="#" class="btn-icon btn-create-app" data-toggle="tooltip" data-placement="bottom" title="Create Container"><span class="typcn typcn-plus-outline"></span></a>
         {{/if}}
       {{/if}}
-      {{#if originPath}}
+      {{#if path}}
         <a onclick="trackLink('open image folder')" href="#" class="btn-icon btn-folder" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Folder"><span class="typcn typcn-folder-open"></span></a>
       {{/if}}
       {{#if $neq status 'BUILDING'}}
-        {{#if originPath}}
+        {{#if path}}
           <a onclick="trackLink('rebuild image')" href="#" class="btn-icon btn-rebuild" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Rebuild"><span class="typcn typcn-refresh-outline"></span></a>
         {{/if}}
       {{/if}}
diff --git a/meteor/client/views/dashboard/images/dashboard-single-image.js b/meteor/client/views/dashboard/images/dashboard-single-image.js
index 4e21649bc2..a16bf3368d 100755
--- a/meteor/client/views/dashboard/images/dashboard-single-image.js
+++ b/meteor/client/views/dashboard/images/dashboard-single-image.js
@@ -1,22 +1,24 @@
-Template.dashboard_single_image.rendered = function () {
+var exec = require('exec');
+
+Template.dashboardSingleImage.rendered = function () {
   Meteor.setInterval(function () {
     $('.btn-icon').tooltip();
   }, 1000);
 };
 
-Template.dashboard_single_image.events({
+Template.dashboardSingleImage.events({
   'click .btn-create-app': function () {
     $('#modal-create-app').modal('show');
     $('#form-create-app').find('input[name="imageId"]').val(this._id);
     $('#image-picker').hide();
   },
   'click .btn-folder': function () {
-    var exec = require('child_process').exec;
-    exec('open ' + this.originPath, function (err) {
+    exec(['open', this.path], function (err) {
       if (err) { throw err; }
     });
   },
-  'click .btn-rebuild': function () {
+  'click .btn-rebuild': function (e) {
+    e.preventDefault();
     $('.btn-icon').tooltip('hide');
     ImageUtil.rebuild(this._id, function (err) {
       if (err) { console.error(err); }
diff --git a/meteor/client/views/dashboard/intro/intro.html b/meteor/client/views/dashboard/intro/intro.html
new file mode 100644
index 0000000000..50a775b2cf
--- /dev/null
+++ b/meteor/client/views/dashboard/intro/intro.html
@@ -0,0 +1,20 @@
+<template name="intro">
+  {{setTitle}}
+  <div class="intro text-center">
+    <div class="container text-left">
+      <div class="content">
+        {{#if currentSetupFailedError}}
+          {{> radialProgress progress=100 class="radial-negative"}}
+          <p>Error: {{currentSetupFailedError}}</p>
+        {{else}}
+          {{#if currentSetupStepProgress}}
+            {{> radialProgress progress=currentSetupStepProgress}}
+          {{else}}
+            {{> radialSpinner }}
+          {{/if}}
+          <p>{{currentSetupStepMessage}}</p>
+        {{/if}}
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/meteor/client/views/dashboard/intro/intro.js b/meteor/client/views/dashboard/intro/intro.js
new file mode 100644
index 0000000000..6996415ef4
--- /dev/null
+++ b/meteor/client/views/dashboard/intro/intro.js
@@ -0,0 +1,23 @@
+Template.intro.helpers({
+  steps: function () {
+    return Setup.steps.map(function (step, index) {
+      step.index = index;
+      return step;
+    });
+  }
+});
+
+Template.intro.helpers({
+  currentSetupStepProgress: function () {
+    return Session.get('currentSetupStepProgress');
+  },
+  currentSetupStepMessage: function () {
+    return Session.get('currentSetupStepMessage')
+  },
+  currentSetupFailedError: function () {
+    return Session.get('currentSetupFailedError')
+  },
+  failedError: function () {
+    return Session.get('failedError');
+  }
+});
\ No newline at end of file
diff --git a/meteor/client/views/dashboard/layouts/dashboard-apps-layout.html b/meteor/client/views/dashboard/layouts/dashboard-apps-layout.html
index 092eb64822..796a5159a4 100755
--- a/meteor/client/views/dashboard/layouts/dashboard-apps-layout.html
+++ b/meteor/client/views/dashboard/layouts/dashboard-apps-layout.html
@@ -1,12 +1,12 @@
-<template name="dashboard_apps_layout">
+<template name="dashboardAppsLayout">
   {{setTitle this.name}}
   <input id="appId" type="hidden" value="{{this._id}}">
   <div class="dashboard">
     <div class="container">
       <div class="dashboard-row">
-        {{> dashboard_menu}}
+        {{> dashboardMenu}}
         <div class="dashboard-body">
-          {{> menu_header}}
+          {{> menuHeader}}
           <div class="header">
             <h3>
               <a href="/apps" onclick="trackLink('back to containers')">Containers</a> &raquo; {{this.name}}
@@ -22,7 +22,7 @@
                 {{/if}}
                 <a onclick="trackLink('open container folder')" href="#" class="btn-folder" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Folder" data-container="body"><span class="typcn typcn-folder-open"></span></a>
                 {{#if $eq status 'READY'}}
-                  <a href="#" onclick="trackLink('stop container')" class="btn-icon btn-stop" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Stop"><span class="typcn typcn-media-pause-outline"></span></a>
+                  <a href="#" onclick="trackLink('stop container')" class="btn-icon btn-stop" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Stop"><span class="typcn typcn-media-stop-outline"></span></a>
                 {{/if}}
                 {{#if $eq status 'STOPPED'}}
                 <a href="#" onclick="trackLink('start container')" class="btn-icon btn-start" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Start"><span class="typcn typcn-media-play-outline"></span></a>
diff --git a/meteor/client/views/dashboard/layouts/dashboard-apps-layout.js b/meteor/client/views/dashboard/layouts/dashboard-apps-layout.js
index 8cb8e72c8a..033e923be5 100644
--- a/meteor/client/views/dashboard/layouts/dashboard-apps-layout.js
+++ b/meteor/client/views/dashboard/layouts/dashboard-apps-layout.js
@@ -1,18 +1,22 @@
-Template.dashboard_apps_layout.rendered = function () {
+var exec = require('exec');
+var path = require('path');
+
+Template.dashboardAppsLayout.rendered = function () {
   Meteor.setInterval(function () {
     $('.header .icons a').tooltip();
   }, 1000);
 };
 
-Template.dashboard_apps_layout.events({
+Template.dashboardAppsLayout.events({
   'click .btn-view': function (e) {
     try {
-      var open = require('open');
       e.preventDefault();
       e.stopPropagation();
       var $btn = $(e.currentTarget);
       var url = $btn.attr('href');
-      open(url);
+      exec(['open', url], function (err) {
+        if (err) { throw err; }
+      });
     } catch (exception) {
       console.log(exception);
     }
@@ -24,15 +28,15 @@ Template.dashboard_apps_layout.events({
     AppUtil.logs(this._id);
   },
   'click .btn-terminal': function () {
-    var cmd = Boot2Docker.command() + ' ssh -t "sudo docker-enter ' + this.docker.Id + '"';
+    var cmd = [Boot2Docker.command(), 'ssh', '-t', 'sudo docker exec -i -t ' + this.docker.Id + ' bash'];
     Util.openTerminal(cmd);
   },
   'click .btn-restart': function () {
-    AppUtil.restart(this._id);
+    AppUtil.run(this, function (err) {});
   },
   'click .btn-folder': function () {
-    var exec = require('child_process').exec;
-    exec('open ' + this.path, function (err) {
+    var appPath = path.join(Util.KITE_PATH, this.name);
+    exec(['open', appPath], function (err) {
       if (err) { throw err; }
     });
   },
diff --git a/meteor/client/views/dashboard/layouts/dashboard-images-layout.html b/meteor/client/views/dashboard/layouts/dashboard-images-layout.html
index d7743e29cc..c264bff308 100755
--- a/meteor/client/views/dashboard/layouts/dashboard-images-layout.html
+++ b/meteor/client/views/dashboard/layouts/dashboard-images-layout.html
@@ -1,12 +1,12 @@
-<template name="dashboard_images_layout">
+<template name="dashboardImagesLayout">
   {{setTitle this.meta.name}}
   <input id="imageId" type="hidden" value="{{this._id}}">
   <div class="dashboard">
     <div class="container">
       <div class="dashboard-row">
-        {{> dashboard_menu}}
+        {{> dashboardMenu}}
         <div class="dashboard-body">
-          {{> menu_header}}
+          {{> menuHeader}}
           <div class="header">
             <h3>
               <a href="/images" onclick="trackLink('back to images')">Images</a> &raquo; {{this.meta.name}}
@@ -16,11 +16,11 @@
                     <a onclick="trackLink('create container from image')" href="#" class="btn-create-app" data-toggle="tooltip" data-placement="bottom" title="Create Container" data-container="body"><span class="typcn typcn-plus-outline"></span></a>
                   {{/if}}
                 {{/if}}
-                {{#if originPath}}
+                {{#if path}}
                   <a onclick="trackLink('open image folder')" href="#" class="btn-folder" data-toggle="tooltip" data-placement="bottom" title="Folder" data-container="body"><span class="typcn typcn-folder-open"></span></a>
                 {{/if}}
                 {{#if $neq status 'BUILDING'}}
-                  {{#if originPath}}
+                  {{#if path}}
                     <a onclick="trackLink('rebuild image')" href="#" class="btn-rebuild" data-toggle="tooltip" data-placement="bottom" title="Rebuild" data-container="body"><span class="typcn typcn-refresh-outline"></span></a>
                   {{/if}}
                 {{/if}}
@@ -37,6 +37,6 @@
         </div>
       </div>
     </div>
-    {{> modal_create_app}}
+    {{> modalCreateApp}}
   </div>
 </template>
diff --git a/meteor/client/views/dashboard/layouts/dashboard-images-layout.js b/meteor/client/views/dashboard/layouts/dashboard-images-layout.js
index 8018fff5a0..2dba982338 100755
--- a/meteor/client/views/dashboard/layouts/dashboard-images-layout.js
+++ b/meteor/client/views/dashboard/layouts/dashboard-images-layout.js
@@ -1,18 +1,18 @@
-Template.dashboard_images_layout.rendered = function () {
+Template.dashboardImagesLayout.rendered = function () {
   Meteor.setInterval(function () {
     $('.header .icons a').tooltip();
   }, 1000);
 };
 
-Template.dashboard_images_layout.events({
+Template.dashboardImagesLayout.events({
   'click .btn-create-app': function () {
     $('#modal-create-app').modal('show');
     $('#form-create-app').find('input[name="imageId"]').val(this._id);
     $('#image-picker').hide();
   },
   'click .btn-folder': function () {
-    var exec = require('child_process').exec;
-    exec('open ' + this.originPath, function (err) {
+    var exec = require('exec');
+    exec(['open', this.path], function (err) {
       if (err) { throw err; }
     });
   },
diff --git a/meteor/client/views/dashboard/layouts/dashboard-layout.html b/meteor/client/views/dashboard/layouts/dashboard-layout.html
index ad3c0f3c0f..c2c8285180 100755
--- a/meteor/client/views/dashboard/layouts/dashboard-layout.html
+++ b/meteor/client/views/dashboard/layouts/dashboard-layout.html
@@ -1,11 +1,12 @@
-<template name="dashboard_layout">
+<template name="dashboardLayout">
   <div class="dashboard">
     {{setTitle}}
     <div class="container">
       <div class="dashboard-row">
-        {{> dashboard_menu}}
+        {{> dashboardMenu}}
         <div class="dashboard-body">
           <div class="mac-window-header"><a href="#">Kitematic</a></div>
+          {{> updateNotification}}
           {{> yield}}
         </div>
       </div>
diff --git a/meteor/client/views/dashboard/settings/dashboard-settings.html b/meteor/client/views/dashboard/settings/dashboard-settings.html
index 8d7383752a..98abacbbce 100644
--- a/meteor/client/views/dashboard/settings/dashboard-settings.html
+++ b/meteor/client/views/dashboard/settings/dashboard-settings.html
@@ -1,21 +1,18 @@
-<template name="dashboard_settings">
+<template name="dashboardSettings">
   <div class="header">
     <h3>Settings</h3>
   </div>
-  <div class="section dashboard-settings">
-    <div class="left-section">
-      <h4>Boot2Docker VM</h4>
-      {{#if $.Session.equals 'boot2dockerState' 'poweroff'}}
-        <p class="help-block error">Please start Boot2Docker for Kitematic to work properly!</p>
-      {{else}}
-        <p class="help-block">All containers run in a Linux VM included with Kitematic. It needs to be turned on to run containers.</p>
-      {{/if}}
-    </div>
-    <div class="right-section">
-      {{#if $.Session.equals 'boot2dockerState' 'poweroff'}}
-        <a onclick="trackLink('start boot2docker')" class="btn btn-default btn-start-boot2docker">Start Boot2Docker VM</a>
-      {{else}}
-        <a onclick="trackLink('stop boot2docker')" class="btn btn-negative btn-stop-boot2docker">Stop Boot2Docker VM</a>
+  <div class="content">
+    <div class="section dashboard-settings">
+      <div class="left-section">
+        <h4>Boot2Docker VM</h4>
+        {{#if $.Session.equals 'boot2dockerState' 'poweroff'}}
+          <p class="help-block error">Please start Boot2Docker for Kitematic to work properly!</p>
+        {{else}}
+          <p class="help-block">All containers run in a Linux VM included with Kitematic. It needs to be turned on to run containers.</p>
+        {{/if}}
+      </div>
+      <div class="right-section">
         {{#if disk}}
           <div class="utilization disk-utilization">
             <div><strong>Disk Utilization</strong><span class="pull-right">{{disk.used_gb}}GB used of {{disk.total_gb}}GB</span></div>
@@ -36,29 +33,20 @@
             </div>
           </div>
         {{/if}}
-      {{/if}}
+      </div>
     </div>
-  </div>
-  <div class="section dashboard-settings">
-    <div class="left-section">
-      <h4>Usage Diagnostics</h4>
-      <p class="help-block">Send anonymized usage diagnostics to help us improve Kitematic.</p>
-    </div>
-    <div class="right-section">
-      {{#if settings.tracking}}
-        <a onclick="trackLink('turn off usage analytics')" class="btn btn-negative btn-usage-analytics-off">Turn Off Usage Diagnostics</a>
-      {{else}}
-        <a onclick="trackLink('turn on usage analytics')" class="btn btn-positive btn-usage-analytics-on">Turn On Usage Diagnostics</a>
-      {{/if}}
-    </div>
-  </div>
-  <div class="section dashboard-settings">
-    <div class="left-section">
-      <h4>Repair Kitematic</h4>
-      <p class="help-block">You can repair Kitematic installation if the container stops working properly.</p>
-    </div>
-    <div class="right-section">
-      <a onclick="trackLink('repair kitematic')" class="btn btn-negative btn-repair">Repair Kitematic</a>
+    <div class="section dashboard-settings">
+      <div class="left-section">
+        <h4>Usage Diagnostics</h4>
+        <p class="help-block">Send anonymized usage diagnostics to help us improve Kitematic.</p>
+      </div>
+      <div class="right-section">
+        {{#if settings.tracking}}
+          <a onclick="trackLink('turn off usage analytics')" class="btn btn-negative btn-usage-analytics-off">Turn Off Usage Diagnostics</a>
+        {{else}}
+          <a onclick="trackLink('turn on usage analytics')" class="btn btn-positive btn-usage-analytics-on">Turn On Usage Diagnostics</a>
+        {{/if}}
+      </div>
     </div>
   </div>
 </template>
diff --git a/meteor/client/views/dashboard/settings/dashboard-settings.js b/meteor/client/views/dashboard/settings/dashboard-settings.js
index beee5528e4..b9264ba0fb 100644
--- a/meteor/client/views/dashboard/settings/dashboard-settings.js
+++ b/meteor/client/views/dashboard/settings/dashboard-settings.js
@@ -1,7 +1,7 @@
 var remote = require('remote');
 var dialog = remote.require('dialog');
 
-Template.dashboard_settings.events({
+Template.dashboardSettings.events({
   'click .btn-start-boot2docker': function (e) {
     var $btn = $(e.currentTarget);
     $btn.html('Starting Boot2Docker...');
@@ -53,7 +53,7 @@ Template.dashboard_settings.events({
   }
 });
 
-Template.dashboard_settings.helpers({
+Template.dashboardSettings.helpers({
   settings: function () {
     return Settings.findOne({});
   },
diff --git a/meteor/client/views/dashboard/setup/setup-finish.html b/meteor/client/views/dashboard/setup/setup-finish.html
deleted file mode 100644
index de5f103ff0..0000000000
--- a/meteor/client/views/dashboard/setup/setup-finish.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<template name="setup_finish">
-  <h2>Installation Complete</h2>
-  <div class="container text-center">
-    <div class="install_logo">
-      <img src="/install_finished.png">
-    </div>
-    <div class="install-diagonistics">
-      <div class="checkbox">
-        <label>
-          <input type="checkbox" checked> Enable anonymous usage diagnostics to help us improve Kitematic.
-        </label>
-      </div>
-    </div>
-    <div class="install-finish">
-      <a onclick="trackLink('finish install')" class="finish-button">
-        <img src="/continue.png">
-        <p>Finish</p>
-      </a>
-    </div>
-  </div>
-</template>
diff --git a/meteor/client/views/dashboard/setup/setup-finish.js b/meteor/client/views/dashboard/setup/setup-finish.js
deleted file mode 100644
index ee0b1c0d41..0000000000
--- a/meteor/client/views/dashboard/setup/setup-finish.js
+++ /dev/null
@@ -1,22 +0,0 @@
-Template.setup_finish.events({
-  'click .finish-button': function (e) {
-    var enableDiagnostics = $('.install-diagonistics input').prop('checked');
-    var status = enableDiagnostics ? 'on' : 'off';
-    ga('send', 'event', 'link', 'click', 'turn ' + status + ' usage analytics');
-    Installs.insert({version: Installer.CURRENT_VERSION});
-    var settings = Settings.findOne();
-    if (!settings) {
-      Settings.insert({tracking: enableDiagnostics});
-    } else {
-      Settings.update(settings._id, {
-        $set: {
-          tracking: enableDiagnostics
-        }
-      });
-    }
-    Router.go('dashboard_apps');
-    e.preventDefault();
-    e.stopPropagation();
-    return false;
-  }
-});
diff --git a/meteor/client/views/dashboard/setup/setup-install.html b/meteor/client/views/dashboard/setup/setup-install.html
deleted file mode 100644
index 6f837f7c42..0000000000
--- a/meteor/client/views/dashboard/setup/setup-install.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<template name="setup_install">
-  {{#if isUpdating}}
-    <h2>Updating</h2>
-    <p>This may take a few minutes.</p>
-  {{else}}
-    <h2>Installing</h2>
-    <p>This may take a few minutes.</p>
-  {{/if}}
-  <div class="container text-left">
-    <div class="steps">
-      {{#each steps}}
-        <div class="media">
-          {{#if $gt this.index currentInstallStep}}
-            <span class="pull-left">
-              <img src="/step_pending.png">
-            </span>
-            <div class="media-body">
-              {{this.futureMessage}}
-            </div>
-          {{/if}}
-          {{#if $lt this.index currentInstallStep}}
-            <span class="pull-left">
-              <img src="/step_finished.png">
-            </span>
-            <div class="media-body">
-              {{this.pastMessage}}
-            </div>
-          {{/if}}
-          {{#if $eq this.index currentInstallStep}}
-            <span class="pull-left">
-              {{#if $eq this.index failedStep}}
-                <img src="/step_failed.png">
-              {{else}}
-                {{#if currentInstallStepProgress}}
-                  {{> radial_progress progress=currentInstallStepProgress}}
-                {{else}}
-                  {{> spinner}}
-                {{/if}}
-              {{/if}}
-            </span>
-            <div class="media-body">
-              {{this.message}}
-              {{#if $eq this.index failedStep}}
-                <p>{{failedError}}</p>
-              {{else}}
-                {{#if this.subMessage}}
-                  <p>{{this.subMessage}}</p>
-                {{/if}}
-              {{/if}}
-            </div>
-          {{/if}}
-        </div>
-      {{/each}}
-    </div>
-  </div>
-</template>
diff --git a/meteor/client/views/dashboard/setup/setup-install.js b/meteor/client/views/dashboard/setup/setup-install.js
deleted file mode 100644
index 3919a89425..0000000000
--- a/meteor/client/views/dashboard/setup/setup-install.js
+++ /dev/null
@@ -1,23 +0,0 @@
-Template.setup_install.helpers({
-  steps: function () {
-    return Installer.steps.map(function (step, index) {
-      step.index = index;
-      return step;
-    });
-  }
-});
-
-Template.setup_install.helpers({
-  currentInstallStep: function () {
-    return Session.get('currentInstallStep');
-  },
-  currentInstallStepProgress: function () {
-    return Session.get('currentInstallStepProgress');
-  },
-  failedStep: function () {
-    return Session.get('failedStep');
-  },
-  failedError: function () {
-    return Session.get('failedError');
-  }
-});
diff --git a/meteor/client/views/dashboard/setup/setup-intro.html b/meteor/client/views/dashboard/setup/setup-intro.html
deleted file mode 100644
index 2df945a90b..0000000000
--- a/meteor/client/views/dashboard/setup/setup-intro.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<template name="setup_intro">
-  {{#if isUpdating}}
-    <h2>Welcome Back</h2>
-    <p>Kitematic needs to update itself to continue.</p>
-  {{else}}
-    <h2>Welcome to Kitematic</h2>
-    <p>This will set up everything needed to run Kitematic on your Mac.</p>
-  {{/if}}
-  <div class="container text-center">
-    <div class="install_logo">
-      <img src="/install_logo.png">
-    </div>
-    <div class="install-continue">
-      <a onclick="trackLink('continue install')" class="continue-button">
-        <img src="/continue.png">
-        <p>Continue</p>
-      </a>
-    </div>
-  </div>
-</template>
diff --git a/meteor/client/views/dashboard/setup/setup-intro.js b/meteor/client/views/dashboard/setup/setup-intro.js
deleted file mode 100644
index 3b5963be1e..0000000000
--- a/meteor/client/views/dashboard/setup/setup-intro.js
+++ /dev/null
@@ -1,16 +0,0 @@
-Template.setup_intro.events({
-  'click .continue-button': function (e) {
-    Router.go('setup_install');
-    Installer.run(function (err) {
-      if (err) {
-        console.log('Setup failed.');
-        console.log(err);
-      } else {
-        Router.go('setup_finish');
-      }
-    });
-    e.preventDefault();
-    e.stopPropagation();
-    return false;
-  }
-});
diff --git a/meteor/client/views/dashboard/setup/setup-layout.html b/meteor/client/views/dashboard/setup/setup-layout.html
deleted file mode 100644
index de1596d8c9..0000000000
--- a/meteor/client/views/dashboard/setup/setup-layout.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<template name="setup_layout">
-  {{setTitle}}
-  <div class="setup content text-center">
-    {{> yield}}
-  </div>
-</template>
diff --git a/meteor/client/views/dashboard/setup/setup-layout.js b/meteor/client/views/dashboard/setup/setup-layout.js
deleted file mode 100644
index ac1dd47d2d..0000000000
--- a/meteor/client/views/dashboard/setup/setup-layout.js
+++ /dev/null
@@ -1,5 +0,0 @@
-Template.setup_layout.rendered = function () {
-  Meteor.setInterval(function () {
-    $('.header .icons a').tooltip();
-  }, 1000);
-};
diff --git a/meteor/client/views/includes/radial-progress.html b/meteor/client/views/includes/radial-progress.html
index 56295c71b0..71a1c57f51 100644
--- a/meteor/client/views/includes/radial-progress.html
+++ b/meteor/client/views/includes/radial-progress.html
@@ -1,5 +1,5 @@
-<template name="radial_progress">
-  <div class="radial-progress" data-progress="{{progress}}">
+<template name="radialProgress">
+  <div class="radial-progress {{class}}" data-progress="{{progress}}">
     <div class="circle">
       <div class="mask full">
         <div class="fill"></div>
@@ -11,7 +11,9 @@
       <div class="shadow"></div>
     </div>
     <div class="inset">
-      <div class="percentage"></div>
+      {{#if showPercentage}}
+        <div class="percentage"></div>
+      {{/if}}
     </div>
   </div>
 </template>
\ No newline at end of file
diff --git a/meteor/client/views/includes/radial-spinner.html b/meteor/client/views/includes/radial-spinner.html
new file mode 100644
index 0000000000..ce14312c78
--- /dev/null
+++ b/meteor/client/views/includes/radial-spinner.html
@@ -0,0 +1,14 @@
+<template name="radialSpinner">
+  <div class="radial-spinner radial-progress" data-progress="90">
+    <div class="circle">
+      <div class="mask full">
+        <div class="fill"></div>
+      </div>
+      <div class="mask half">
+        <div class="fill"></div>
+        <div class="fill fix"></div>
+      </div>
+    </div>
+    <div class="inset"></div>
+  </div>
+</template>
\ No newline at end of file
diff --git a/meteor/client/views/includes/update-notification.html b/meteor/client/views/includes/update-notification.html
new file mode 100644
index 0000000000..18276a33ba
--- /dev/null
+++ b/meteor/client/views/includes/update-notification.html
@@ -0,0 +1,5 @@
+<template name="updateNotification">
+  {{#if updateAvailable}}
+    <div class="update-alert" role="alert"><span class="update-text">A new version of Kitematic is available.</span> <a href="#" class="btn btn-action-inverse btn-inverse btn-xs btn-update">Update Now</a></div>
+  {{/if}}
+</template>
diff --git a/meteor/client/views/includes/update-notification.js b/meteor/client/views/includes/update-notification.js
new file mode 100644
index 0000000000..98c8f7aece
--- /dev/null
+++ b/meteor/client/views/includes/update-notification.js
@@ -0,0 +1,13 @@
+var ipc = require('ipc');
+
+Template.updateNotification.helpers({
+  updateAvailable: function () {
+    return Session.get('updateAvailable');
+  }
+});
+
+Template.updateNotification.events({
+  'click .btn-update': function (e) {
+    ipc.send('command', 'application:quit-install');
+  }
+});
diff --git a/meteor/collections/apps.js b/meteor/collections/apps.js
index 00cd62c731..135c11f254 100755
--- a/meteor/collections/apps.js
+++ b/meteor/collections/apps.js
@@ -1,13 +1,13 @@
 Apps = new Meteor.Collection('apps');
 
 Apps.COMMON_WEB_PORTS = [
-  80,
-  8000,
-  8080,
-  3000,
-  5000,
-  2368,
-  1337
+  '80',
+  '8000',
+  '8080',
+  '3000',
+  '5000',
+  '2368',
+  '443'
 ];
 
 Apps.allow({
@@ -30,58 +30,44 @@ Apps.helpers({
       return Images.findOne(this.imageId);
     }
   },
-  hostUrl: function () {
-    return this.name + '.kite';
-  },
   ports: function () {
     var app = this;
-    if (app.docker && app.docker.NetworkSettings.Ports) {
-      var ports = _.map(_.keys(app.docker.NetworkSettings.Ports), function (portObj) {
-        var port = parseInt(portObj.split('/')[0], 10);
-        return port;
-      });
-      return ports.join(', ');
-    } else {
-      return null;
+    if (!app.docker || !app.docker.NetworkSettings.Ports) {
+      return [];
     }
-  },
-  url: function () {
-    var app = this;
-    var image = Images.findOne(app.imageId);
-    if (image && image.meta.app && image.meta.app.webPort) {
-      return 'http://' + app.name + '.kite:' + image.meta.app.webPort;
-    } else if (image && image.meta.app && image.meta.app.webPort === false) {
-      return null;
-    } else {
-      // Picks the best port
-      if (app.docker && app.docker.NetworkSettings.Ports) {
-        var keys = _.keys(app.docker.NetworkSettings.Ports);
-        var pickedPort = null;
-        _.each(keys, function (key) {
-          var port = parseInt(key.split('/')[0], 10);
-          if (_.contains(Apps.COMMON_WEB_PORTS, port) && port !== 22) {
-            pickedPort = port;
-          }
-        });
-        if (pickedPort) {
-          return 'http://' + app.name + '.kite:' + pickedPort;
-        } else {
-          if (keys.length > 0) {
-            // Picks the first port that's not SSH
-            for (var i = 0; i < keys.length; i++) {
-              var port = parseInt(keys[i].split('/')[0], 10);
-              if (port !== 22) {
-                return 'http://' + app.name + '.kite:' + port;
-              }
-            }
-            return null;
-          } else {
-            return null;
-          }
-        }
+
+    var results = _.map(app.docker.NetworkSettings.Ports, function (value, key) {
+      var portProtocolPair = key.split('/');
+      var res = {
+        'port': portProtocolPair[0],
+        'protocol': portProtocolPair[1]
+      };
+      if (value && value.length) {
+        var port = value[0].HostPort;
+        res['hostIp'] = Docker.hostIp;
+        res['hostPort'] = port;
+        res['web'] = Apps.COMMON_WEB_PORTS.indexOf(res.port) !== -1;
+        res['url'] = 'http://' + Docker.hostIp + ':' + port;
       } else {
         return null;
       }
-    }
+      return res;
+    });
+
+    results = _.filter(results, function (res) { return res !== null; });
+
+    results.sort(function (a, b) {
+      // prefer lower ports
+      if (a.web && b.web) {
+        return b.port - a.port;
+      }
+
+      if (a.web) {
+        return -1;
+      } else {
+        return 1;
+      }
+    });
+    return results;
   }
 });
diff --git a/meteor/collections/installs.js b/meteor/collections/installs.js
deleted file mode 100644
index 7b1311731e..0000000000
--- a/meteor/collections/installs.js
+++ /dev/null
@@ -1,13 +0,0 @@
-Installs = new Meteor.Collection('installs');
-
-Installs.allow({
-  'update': function () {
-    return true;
-  },
-  'insert': function () {
-    return true;
-  },
-  'remove': function () {
-    return true;
-  }
-});
diff --git a/meteor/public/install_logo.png b/meteor/public/install_logo.png
deleted file mode 100644
index d457917193..0000000000
Binary files a/meteor/public/install_logo.png and /dev/null differ
diff --git a/meteor/public/install_logo@2x.png b/meteor/public/install_logo@2x.png
deleted file mode 100644
index fe5daf0184..0000000000
Binary files a/meteor/public/install_logo@2x.png and /dev/null differ
diff --git a/package.json b/package.json
index 34138a806e..757a4e3b6f 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,10 @@
 {
   "name": "Kitematic",
+  "version": "0.4.0",
   "author": "Kitematic",
   "description": "Simple Docker App management for Mac OS X.",
   "homepage": "https://kitematic.com/",
+  "main": "index.js",
   "repository": {
     "type": "git",
     "url": "git@github.com:kitematic/kitematic.git"
@@ -12,13 +14,11 @@
     "type": "GNU",
     "url": "https://raw.githubusercontent.com/kitematic/kitematic/master/LICENSE"
   }],
-  "main": "index.js",
-  "version": "0.3.0",
+  "boot2docker-version": "1.3.2",
   "dependencies": {
     "ansi-to-html": "0.2.0",
     "async": "^0.9.0",
-    "chokidar": "git+https://github.com/usekite/chokidar.git",
-    "dockerode": "2.0.3",
+    "dockerode": "2.0.4",
     "exec": "^0.1.2",
     "moment": "2.8.1",
     "ncp": "0.6.0",
diff --git a/resources/UNISON_LICENSE.txt b/resources/UNISON_LICENSE.txt
deleted file mode 100644
index 356d8987c9..0000000000
--- a/resources/UNISON_LICENSE.txt
+++ /dev/null
@@ -1,682 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-
-
-ADDITIONAL TERMS APPLICABLE TO THE Doom 3 BFG Edition GPL Source Code.
-
-  The following additional terms ("Additional Terms") supplement and modify
- the GNU General Public License, Version 3 ("GPL") applicable to the Doom 3
- BFG Edition GPL Source Code ("Doom 3 BFG Edition Source Code").  In addition
- to the terms and conditions of the GPL, the Doom 3 BFG Edition Source Code is
- subject to the further restrictions below.
-
-1. Replacement of Section 15.  Section 15 of the GPL shall be deleted in its
-entirety and replaced with the following:
-
-"15. Disclaimer of Warranty.  
-
-THE PROGRAM IS PROVIDED WITHOUT ANY WARRANTIES, WHETHER EXPRESSED OR IMPLIED,
-INCLUDING, WITHOUT LIMITATION, IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR
-PURPOSE, NON-INFRINGEMENT, TITLE AND MERCHANTABILITY.  THE PROGRAM IS BEING
-DELIVERED OR MADE AVAILABLE "AS IS", "WITH ALL FAULTS" AND WITHOUT WARRANTY OR
-REPRESENTATION.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST
-OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
-
-2. Replacement of Section 16.  Section 16 of the GPL shall be deleted in its
-entirety and replaced with the following:
-
-"16.  LIMITATION OF LIABILITY.  
-
-UNDER NO CIRCUMSTANCES SHALL ANY COPYRIGHT HOLDER OR ITS AFFILIATES, OR ANY
-OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE
-LIABLE TO YOU, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, FOR ANY
-DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, DIRECT, INDIRECT, SPECIAL,
-INCIDENTAL, CONSEQUENTIAL OR PUNITIVE DAMAGES ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE USE OR INABILITY TO USE THE PROGRAM OR OTHER DEALINGS WITH
-THE PROGRAM(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
-INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
-PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), WHETHER OR NOT ANY COPYRIGHT
-HOLDER OR SUCH OTHER PARTY RECEIVES NOTICE OF ANY SUCH DAMAGES AND WHETHER
-OR NOT SUCH DAMAGES COULD HAVE BEEN FORESEEN."
-
-3. LEGAL NOTICES; NO TRADEMARK LICENSE; ORIGIN.  You must reproduce faithfully
-all trademark, copyright and other proprietary and legal notices on any copies
-of the Program or any other required author attributions.  This license does
-not grant you rights to use any copyright holder or any other party’s name,
-logo, or trademarks.  Neither the name of the copyright holder or its
-affiliates, or any other party who modifies and/or conveys the Program may be
-used to endorse or promote products derived from this software without
-specific prior written permission.  The origin of the Program must not be
-misrepresented; you must not claim that you wrote the original Program.
-
-Altered source versions must be plainly marked as such, and must not be
-misrepresented as being the original Program.
-
-4. INDEMNIFICATION.  IF YOU CONVEY A COVERED WORK AND AGREE WITH ANY RECIPIENT
-OF THAT COVERED WORK THAT YOU WILL ASSUME ANY LIABILITY FOR THAT COVERED WORK,
-YOU HEREBY AGREE TO INDEMNIFY, DEFEND AND HOLD HARMLESS THE OTHER LICENSORS
-AND AUTHORS OF THAT COVERED WORK FOR ANY DAMAEGS, DEMANDS, CLAIMS, LOSSES,
-CAUSES OF ACTION, LAWSUITS, JUDGMENTS EXPENSES (INCLUDING WITHOUT LIMITATION
-REASONABLE ATTORNEYS' FEES AND EXPENSES) OR ANY OTHER LIABLITY ARISING FROM,
-RELATED TO OR IN CONNECTION WITH YOUR ASSUMPTIONS OF LIABILITY.
\ No newline at end of file
diff --git a/resources/cocoasudo b/resources/cocoasudo
deleted file mode 100755
index ccf0bf8aa1..0000000000
Binary files a/resources/cocoasudo and /dev/null differ
diff --git a/resources/install b/resources/install
deleted file mode 100755
index 14556a15fb..0000000000
--- a/resources/install
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-# This script must be run as root and sets up Mac OS X to route all .kite domains to the virtual box VM with the name
-# 'boot2docker-vm'. It does the following:
-# 1) Adds a file under /etc/resolver/kite
-# 2) Sets up a LaunchAgent for adding entries to the route table to route all requests to the Docker subnet (172.17.0.0/16)
-# And expects the $IFNAME variable to contain the interface on which to send traffic to the boot2docker VM.
-
-mkdir -p /etc/resolver
-echo "nameserver 172.17.42.1" > /etc/resolver/kite
-
-DIR=$(dirname "$0")
-USER=`w -h | sort -u -t' ' -k1,1 | awk '{print $1}'`
-
-/bin/rm -rf /Library/LaunchDaemons/com.kitematic.route.plist
-echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
-<plist version=\"1.0\">
-<dict>
-  <key>Label</key>
-  <string>com.kitematic.route</string>
-  <key>ProgramArguments</key>
-  <array>
-    <string>bash</string>
-    <string>-c</string>
-    <string>/usr/sbin/scutil -w State:/Network/Interface/$IFNAME/IPv4 -t 0;sudo /sbin/route -n add -net 172.17.0.0 -netmask 255.255.0.0 -gateway $GATEWAY</string>
-  </array>
-  <key>KeepAlive</key>
-  <false/>
-  <key>RunAtLoad</key>
-  <true/>
-  <key>LaunchOnlyOnce</key>
-  <true/>
-</dict>
-</plist>" > /Library/LaunchAgents/com.kitematic.route.plist
-
-# Add entries to routing table for Kitematic boot2docker-vms
-/sbin/route delete -net 172.17.0.0 -netmask 255.255.0.0 -gateway $GATEWAY > /dev/null 2>&1 || true
-/sbin/route -n add -net 172.17.0.0 -netmask 255.255.0.0 -gateway $GATEWAY
\ No newline at end of file
diff --git a/resources/kite-binaries.tar.gz b/resources/kite-binaries.tar.gz
deleted file mode 100644
index 43215c64bd..0000000000
Binary files a/resources/kite-binaries.tar.gz and /dev/null differ
diff --git a/resources/kite-dns/Dockerfile b/resources/kite-dns/Dockerfile
deleted file mode 100644
index eeb3cb87b2..0000000000
--- a/resources/kite-dns/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM ubuntu:14.04
-MAINTAINER Kite <contact@usekite.com>
-
-RUN apt-get update
-RUN apt-get install -q -y dnsmasq wget psmisc
-
-RUN mkdir /app
-WORKDIR /app
-RUN wget https://github.com/jwilder/docker-gen/releases/download/0.3.2/docker-gen-linux-amd64-0.3.2.tar.gz
-RUN tar xvzf docker-gen-linux-amd64-0.3.2.tar.gz
-RUN rm docker-gen-linux-amd64-0.3.2.tar.gz
-
-ADD . /app
-
-ENV DOCKER_HOST unix:///tmp/docker.sock
-
-EXPOSE 53/udp
-CMD ["sh", "/app/start"]
\ No newline at end of file
diff --git a/resources/kite-dns/dnsmasq.tmpl b/resources/kite-dns/dnsmasq.tmpl
deleted file mode 100644
index 0355b257cc..0000000000
--- a/resources/kite-dns/dnsmasq.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-user=root
-{{ range $index, $value := $ }}
-  {{ with $address := index $value.Addresses 0 }}
-address=/{{$value.Name}}.kite/{{$address.IP}}
-  {{ end }}
-{{ end }}
diff --git a/resources/kite-dns/restart b/resources/kite-dns/restart
deleted file mode 100644
index cfd46a988c..0000000000
--- a/resources/kite-dns/restart
+++ /dev/null
@@ -1,2 +0,0 @@
-killall dnsmasq
-dnsmasq
\ No newline at end of file
diff --git a/resources/kite-dns/start b/resources/kite-dns/start
deleted file mode 100644
index 66cbfcb602..0000000000
--- a/resources/kite-dns/start
+++ /dev/null
@@ -1 +0,0 @@
-/app/docker-gen -watch -only-exposed -notify "sh /app/restart" /app/dnsmasq.tmpl /etc/dnsmasq.conf
\ No newline at end of file
diff --git a/resources/terminal b/resources/terminal
index 5d85fe171d..592e3c9fa9 100755
--- a/resources/terminal
+++ b/resources/terminal
@@ -34,17 +34,14 @@ end tell
 EOF
 
 else
-  osascript > /dev/null <<EOF
-
-tell application "Terminal"
-  activate
-end tell
-tell application "System Events"
-  tell process "Terminal" to keystroke "t" using command down
-end
+osascript > /dev/null <<EOF
+tell application "Terminal" to activate
+delay 0.4
+tell application "System Events" to keystroke "t" using command down
 tell application "Terminal"
   do script "clear && $*" in window 1
 end tell
+
 EOF
 
 fi
diff --git a/resources/unison b/resources/unison
deleted file mode 100755
index 2716606974..0000000000
Binary files a/resources/unison and /dev/null differ
diff --git a/script/dist.sh b/script/dist.sh
index 9ee033c5a3..0a3c8c65f2 100755
--- a/script/dist.sh
+++ b/script/dist.sh
@@ -2,36 +2,32 @@
 set -e # Auto exit on error
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source $DIR/colors.sh
-
 BASE=$DIR/..
 NPM="$BASE/cache/node/bin/npm"
 NODE="$BASE/cache/node/bin/node"
 VERSION=$($NODE -pe 'JSON.parse(process.argv[1]).version' "$(cat package.json)")
 
-pushd $BASE/meteor
+source $DIR/colors.sh
 
 $BASE/script/setup.sh
-rm -rf ../bundle
+rm -rf ./bundle
 
 cecho "-----> Building bundle from Meteor app, this may take a few minutes..." $blue
+
+cd $BASE/meteor
 meteor bundle --directory ../bundle
 
-cd ../bundle
+cd $BASE/bundle
 
 cecho "-----> Installing bundle npm packages." $blue
-pushd programs/server
+cd programs/server
 $NPM install
-popd
-
 cecho "Bundle created." $green
 
-popd
+cd $BASE
 
-pushd $BASE
-
-rm -rf dist/osx
-mkdir -p dist/osx/
+rm -Rf ./dist/osx/
+mkdir -p ./dist/osx/
 
 DIST_APP=Kitematic.app
 
@@ -39,6 +35,7 @@ cecho "-----> Creating $DIST_APP..." $blue
 find cache/atom-shell -name "debug\.log" -print0 | xargs -0 rm -rf
 cp -R cache/atom-shell/Atom.app dist/osx/
 mv dist/osx/Atom.app dist/osx/$DIST_APP
+mv dist/osx/$DIST_APP/Contents/MacOS/Atom dist/osx/$DIST_APP/Contents/MacOS/Kitematic
 mkdir -p dist/osx/$DIST_APP/Contents/Resources/app
 
 cecho "-----> Copying meteor bundle into $DIST_APP..." $blue
@@ -56,28 +53,26 @@ cp -v resources/* dist/osx/$DIST_APP/Contents/Resources/app/resources/ || :
 cecho "-----> Copying icon to $DIST_APP" $blue
 cp kitematic.icns dist/osx/$DIST_APP/Contents/Resources/atom.icns
 
-chmod +x dist/osx/$DIST_APP/Contents/Resources/app/resources/install
 chmod +x dist/osx/$DIST_APP/Contents/Resources/app/resources/terminal
-chmod +x dist/osx/$DIST_APP/Contents/Resources/app/resources/unison
 chmod +x dist/osx/$DIST_APP/Contents/Resources/app/resources/node
+chmod -R u+w dist/osx/$DIST_APP/Contents/Resources/app/bundle
 
 cecho "-----> Updating Info.plist version to $VERSION" $blue
 /usr/libexec/PlistBuddy -c "Set :CFBundleVersion $VERSION" $BASE/dist/osx/$DIST_APP/Contents/Info.plist
 /usr/libexec/PlistBuddy -c "Set :CFBundleDisplayName Kitematic" $BASE/dist/osx/$DIST_APP/Contents/Info.plist
 /usr/libexec/PlistBuddy -c "Set :CFBundleName Kitematic" $BASE/dist/osx/$DIST_APP/Contents/Info.plist
+/usr/libexec/PlistBuddy -c "Set :CFBundleIdentifier com.kitematic.kitematic" $BASE/dist/osx/$DIST_APP/Contents/Info.plist
+/usr/libexec/PlistBuddy -c "Set :CFBundleExecutable Kitematic" $BASE/dist/osx/$DIST_APP/Contents/Info.plist
 
 if [ -f $DIR/sign.sh ]; then
   cecho "-----> Signing app file...." $blue
   $DIR/sign.sh $BASE/dist/osx/$DIST_APP
 fi
 
-pushd dist/osx
-  cecho "-----> Creating disributable zip file...." $blue
-  ditto -c -k --sequesterRsrc --keepParent $DIST_APP Kitematic-$VERSION.zip
-popd
+cd $BASE/dist/osx
+cecho "-----> Creating disributable zip file...." $blue
+ditto -c -k --sequesterRsrc --keepParent $DIST_APP Kitematic-$VERSION.zip
 
 cecho "Done." $green
 cecho "Kitematic app available at dist/osx/$DIST_APP" $green
 cecho "Kitematic zip distribution available at dist/osx/Kitematic.zip" $green
-
-popd
diff --git a/script/run.sh b/script/run.sh
index cecdce21f3..3bdabf7f63 100755
--- a/script/run.sh
+++ b/script/run.sh
@@ -3,14 +3,13 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 BASE=$DIR/..
 
-source $BASE/script/setup.sh
-
 export ROOT_URL=https://localhost:3000
-export DOCKER_HOST=http://192.168.59.103
-export DOCKER_PORT=2375
 export DIR=$BASE
 
 cd $BASE/meteor
 exec 3< <(meteor --settings $BASE/meteor/settings_dev.json)
 sed '/App running at/q' <&3 ; cat <&3 &
 NODE_ENV=development $BASE/cache/atom-shell/Atom.app/Contents/MacOS/Atom $BASE
+kill $(ps aux | grep '.*node.*kitematic' | awk '{print $2}')
+kill $(ps aux | grep '.*mongod.*kitematic' | awk '{print $2}')
+
diff --git a/script/setup.sh b/script/setup.sh
index 6599e4d6d1..f1f5c20297 100755
--- a/script/setup.sh
+++ b/script/setup.sh
@@ -1,22 +1,16 @@
 #!/bin/bash
-set -e # Auto exit on error
+set -e
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source $DIR/colors.sh
-
+ATOM_SHELL_VERSION=0.19.1
+ATOM_SHELL_FILE=atom-shell-v$ATOM_SHELL_VERSION-darwin-x64.zip
 BASE=$DIR/..
-pushd $BASE
+
+source $DIR/colors.sh
+cd $BASE
 
 mkdir -p cache
-
-pushd cache
-
-BOOT2DOCKER_CLI_VERSION=1.3.0
-BOOT2DOCKER_CLI_VERSION_FILE=boot2docker-$BOOT2DOCKER_CLI_VERSION
-BOOT2DOCKER_CLI_FILE=boot2docker
-
-ATOM_SHELL_VERSION=0.16.2
-ATOM_SHELL_FILE=atom-shell-v$ATOM_SHELL_VERSION-darwin-x64.zip
+cd cache
 
 if [ ! -f $ATOM_SHELL_FILE ]; then
   cecho "-----> Downloading Atom Shell..." $purple
@@ -25,12 +19,6 @@ if [ ! -f $ATOM_SHELL_FILE ]; then
   unzip -d atom-shell $ATOM_SHELL_FILE
 fi
 
-if [ ! -f kite-node-webkit.tar.gz ]; then
-  cecho "-----> Downloading node-webkit..." $purple
-  curl -L -o kite-node-webkit.tar.gz https://s3.amazonaws.com/kite-installer/kite-node-webkit.tar.gz
-  tar -zxf kite-node-webkit.tar.gz -C .
-fi
-
 if [ ! -f mongodb-osx-x86_64-2.6.3.tgz ]; then
   cecho "-----> Downloading mongodb..." $purple
   curl -L -o mongodb-osx-x86_64-2.6.3.tgz http://downloads.mongodb.org/osx/mongodb-osx-x86_64-2.6.3.tgz
@@ -48,9 +36,13 @@ if [ ! -f "node-v0.10.29-darwin-x64.tar.gz" ]; then
   cp node/LICENSE $BASE/resources/NODE_LICENSE.txt
 fi
 
-popd
+cd $BASE
 
-pushd resources
+NODE="$BASE/cache/node/bin/node"
+BOOT2DOCKER_CLI_VERSION=$($NODE -pe "JSON.parse(process.argv[1])['boot2dockerversion']" "$(cat package.json)")
+BOOT2DOCKER_CLI_VERSION_FILE=boot2docker-$BOOT2DOCKER_CLI_VERSION
+
+cd resources
 
 if [ ! -f $BOOT2DOCKER_CLI_VERSION_FILE ]; then
   cecho "-----> Downloading Boot2docker CLI..." $purple
@@ -59,13 +51,12 @@ fi
 
 chmod +x $BOOT2DOCKER_CLI_VERSION_FILE
 
-popd
+cd $BASE
 
+# Build NPM modules
 NPM="$BASE/cache/node/bin/npm"
-
 export npm_config_disturl=https://gh-contractor-zcbenz.s3.amazonaws.com/atom-shell/dist
-export npm_config_target=0.16.2
+export npm_config_target=ATOM_SHELL_VERSION
 export npm_config_arch=ia32
 HOME=~/.atom-shell-gyp $NPM install
 
-popd