diff --git a/Gruntfile.js b/Gruntfile.js
index 588ff61..bc66235 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -209,6 +209,7 @@ module.exports = function(grunt) {
                 dest: 'test/integration/src/'
             }
         },
+
         compress: {
             chrome: {
                 options: {
@@ -219,18 +220,20 @@ module.exports = function(grunt) {
                 cwd: 'dist/',
                 src: ['**/*'],
                 dest: 'release/'
-            },
-            nodeWebkit: {
-                options: {
-                    mode: 'zip',
-                    archive: 'release/whiteout_mail_' + zipName + '.nw'
-                },
-                expand: true,
-                cwd: 'dist/',
-                src: ['**/*'],
-                dest: '/'
             }
-        }
+        },
+
+        nodewebkit: {
+            options: {
+                version: '0.9.2', // node-webkit version
+                build_dir: './release', // Where the build version of my node-webkit app is saved
+                mac: true, // We want to build it for mac
+                win: false, // We want to build it for win
+                linux32: false, // We don't need linux32
+                linux64: false, // We don't need linux64
+            },
+            src: ['./dist/**/*'] // Your node-webkit app
+        },
     });
 
     // Load the plugin(s)
@@ -245,6 +248,7 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks('grunt-contrib-watch');
     grunt.loadNpmTasks('grunt-contrib-copy');
     grunt.loadNpmTasks('grunt-contrib-compress');
+    grunt.loadNpmTasks('grunt-node-webkit-builder');
 
     // Build tasks
     grunt.registerTask('dist-npm', ['copy:npm', 'copy:npmDev', 'copy:cryptoLib']);
diff --git a/package.json b/package.json
index 04c4347..46c0b4d 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
         "grunt-autoprefixer": "~0.3.0",
         "grunt-contrib-watch": "~0.5.3",
         "grunt-contrib-copy": "~0.4.1",
-        "grunt-contrib-compress": "~0.5.2"
+        "grunt-contrib-compress": "~0.5.2",
+        "grunt-node-webkit-builder": "~0.1.17"
     }
-}
+}
\ No newline at end of file
diff --git a/src/package.json b/src/package.json
index f9f0ab1..7ce989f 100644
--- a/src/package.json
+++ b/src/package.json
@@ -1,4 +1,10 @@
 {
     "name": "Whiteout Mail",
-    "main": "chrome.html"
+    "version": "0.0.1",
+    "main": "chrome.html",
+    "window": {
+        "toolbar": false,
+        "width": 1024,
+        "height": 768
+    }
 }
\ No newline at end of file