diff --git a/app/package.json b/app/package.json
index 820cee69..9942fd34 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "rambox",
+	"name": "Rambox",
 	"productName": "Rambox",
 	"version": "0.4.2",
 	"description": "Free, Open Source and Cross Platform messaging and emailing app that combines common web applications into one.",
diff --git a/build/winstaller.js b/build/winstaller.js
deleted file mode 100644
index d70e27d3..00000000
--- a/build/winstaller.js
+++ /dev/null
@@ -1,30 +0,0 @@
-'use strict';
-var electronInstaller = require('electron-winstaller');
-
-var arch = process.argv.slice(2)[0];
-
-if ( !arch ) {
-    console.error('No Architecture paramenter specified. [ia32 or x64]');
-    return;
-}
-
-//var appData = require('../app/package.json');
-
-var resultPromise = electronInstaller.createWindowsInstaller({
-     appDirectory: './dist/Rambox-win32-'+arch
-    ,outputDirectory: './dist/setup-'+arch
-    ,title: 'Rambox'
-    ,loadingGif: './resources/installer/loading.gif'
-    ,authors: 'Rambox'
-    ,owners: 'Rambox'
-    ,exe: 'Rambox.exe'
-    ,setupExe: 'RamboxSetup.exe'
-    ,noMsi: true
-    ,iconUrl: 'https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/installer/icons/64x64.png'
-    ,setupIcon: './resources/Icon.ico'
-    //,remoteReleases: 'https://getrambox.herokuapp.com/update/'+process.platform+'/'+process.arch+'/'+appData.version
-});
-
-console.log('Creating installer... Please wait...')
-
-resultPromise.then(() => console.log("Done!"), (e) => console.log(`Ups!: ${e.message}`));
diff --git a/package.json b/package.json
index 6bcdd47f..93c6f4fa 100644
--- a/package.json
+++ b/package.json
@@ -23,9 +23,8 @@
 		"build:linux": "npm run build:linux32 && npm run build:linux64",
 		"build:linux32": "build --linux --ia32",
 		"build:linux64": "build --linux --x64",
-		"build:win": "node ./build/winstaller.js ia32 && node ./build/winstaller.js x64",
-		"build:win32": "build --win --ia32",
-		"build:win64": "build --win --x64",
+		"build:win32": "build --win --ia32 --em.description=Rambox",
+		"build:win64": "build --win --x64 --em.description=Rambox",
 		"setup:osx": "npm run sencha:clean && npm run sencha:compile && npm run clean:osx && npm run pack:osx && npm run build:osx",
 		"setup:win": "npm run sencha:clean && npm run sencha:compile && npm run clean:win && npm run pack:win && npm run build:win",
 		"zip:win32": "bestzip \"dist/Rambox-win32-ia32-portable.zip\" \"dist/Rambox-win32-ia32/*\"",
@@ -35,25 +34,11 @@
 		"all:win": "npm run sencha:clean && npm run sencha:compile && npm run clean:win && npm run pack:win && npm run zip:win32 && npm run zip:win64 && npm run build:win",
 		"all:linux": "npm run sencha:clean && npm run sencha:compile && npm run build:linux"
 	},
-	"name": "Rambox",
-	"productName": "Rambox",
-	"authors": [
-		"Ramiro Saenz"
-	],
-	"copyright": "",
-	"homepage": "http://www.rambox.pro",
 	"build": {
-		"name": "Rambox",
 		"productName": "Rambox",
 		"appId": "com.saenzramiro.rambox",
-		"app-category-type": "public.app-category.productivity",
+		"category": "public.app-category.productivity",
 		"asar": true,
-		"protocols": [
-			{
-				"name": "Rambox",
-				"schemes": ["rambox"]
-			}
-		],
 		"mac": {
 			"target": [
 				"default"
@@ -78,11 +63,6 @@
 				}
 			]
 		},
-		"win32metadata": {
-			"CompanyName": "Rambox",
-			"ProductName": "Rambox",
-			"InternalName": "Rambox"
-		},
 		"win": {
 			"title": "Rambox",
 
@@ -114,20 +94,10 @@
 	"devDependencies": {
 		"asar": "^0.12.1",
 		"bestzip": "^1.1.3",
-		"electron-builder": "5.19.1",
+		"electron-builder": "6.3.1",
 		"electron-prebuilt": "1.3.4",
 		"electron-squirrel-startup": "^1.0.0"
 	},
-	"config": {
-		"pre-git": {
-			"commit-msg": "",
-			"pre-commit": [],
-			"post-commit": "",
-			"pre-push": [],
-			"post-checkout": "",
-			"post-merge": ""
-		}
-	},
 	"dependencies": {
 		"auto-launch": "4.0.0",
 		"firebase": "^3.0.5",