diff --git a/Gruntfile.js b/Gruntfile.js
index 23f0bc1..0c4ecc6 100755
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,339 +1,355 @@
 var path = require('path');
 var execFile = require('child_process').execFile;
 var packagejson = require('./package.json');
-var electron = require('electron-prebuilt');
+var electron = require('electron');
 
-module.exports = function (grunt) {
-  require('load-grunt-tasks')(grunt);
-  var target = grunt.option('target') || 'development';
-  var beta = grunt.option('beta') || false;
-  var alpha = grunt.option('alpha') || false;
-  var env = process.env;
-  env.NODE_PATH = '..:' + env.NODE_PATH;
-  env.NODE_ENV = target;
+module.exports = function(grunt) {
+    require('load-grunt-tasks')(grunt);
+    var target = grunt.option('target') || 'development';
+    var beta = grunt.option('beta') || false;
+    var alpha = grunt.option('alpha') || false;
+    var env = process.env;
+    env.NODE_PATH = '..:' + env.NODE_PATH;
+    env.NODE_ENV = target;
 
-  var version = function (str) {
-    var match = str.match(/(\d+\.\d+\.\d+)/);
-    return match ? match[1] : null;
-  };
+    var version = function(str) {
+        var match = str.match(/(\d+\.\d+\.\d+)/);
+        return match ? match[1] : null;
+    };
 
-  var BASENAME = 'VPN.ht';
-  var APPNAME = BASENAME;
+    var clear = function(str) {
+        return str.replace(/ /g, '\\ ').replace(/\(/g, '\\(').replace(/\)/g, '\\)');
+    };
 
-  if (alpha) {
-    APPNAME += ' (Alpha)';
-  } else if (beta) {
-    APPNAME += ' (Beta)';
-  }
+    var BASENAME = 'VPN.ht';
+    var APPNAME = BASENAME;
 
-  var OSX_OUT = './dist';
-  var OSX_OUT_X64 = OSX_OUT + '/' + APPNAME + '-darwin-x64';
-  var OSX_FILENAME = OSX_OUT_X64 + '/' + APPNAME + '.app';
+    if (alpha) {
+        APPNAME += ' (Alpha)';
+    } else if (beta) {
+        APPNAME += ' (Beta)';
+    }
 
-  var OSX_DIST_X64 = OSX_OUT + '/' + APPNAME + '-' + packagejson.version + '.pkg';
+    var OSX_OUT = './dist';
+    var OSX_OUT_X64 = OSX_OUT + '/' + APPNAME + '-darwin-x64';
+    var OSX_FILENAME = OSX_OUT_X64 + '/' + APPNAME + '.app';
 
-  grunt.initConfig({
-    IDENTITY: 'Developer ID Application: David Lemarier',
-    APPNAME: APPNAME,
-    APPNAME_ESCAPED: APPNAME.replace(/ /g, '\\ ').replace(/\(/g,'\\(').replace(/\)/g,'\\)'),
-    OSX_OUT: OSX_OUT,
-    OSX_OUT_ESCAPED: OSX_OUT.replace(/ /g, '\\ ').replace(/\(/g,'\\(').replace(/\)/g,'\\)'),
-    OSX_OUT_X64: OSX_OUT_X64,
-    OSX_FILENAME: OSX_FILENAME,
-    OSX_FILENAME_ESCAPED: OSX_FILENAME.replace(/ /g, '\\ ').replace(/\(/g,'\\(').replace(/\)/g,'\\)'),
-    OSX_DIST_X64: OSX_DIST_X64,
-    OSX_DIST_X64_ESCAPED: OSX_DIST_X64.replace(/ /g, '\\ ').replace(/\(/g,'\\(').replace(/\)/g,'\\)'),
-    // electron
-    electron: {
-      windows: {
-        options: {
-          name: BASENAME,
-          dir: 'build/',
-          out: 'dist',
-          version: packagejson['electron-version'],
-          platform: 'win32',
-          arch: 'ia32',
-          asar: true,
-          icon: 'util/vpnht.ico'
-        }
-      },
-      osx: {
-        options: {
-          name: APPNAME,
-          dir: 'build/',
-          out: 'dist',
-          version: packagejson['electron-version'],
-          platform: 'darwin',
-          arch: 'x64',
-          asar: true,
-          'app-bundle-id': 'ht.vpn.desktop',
-          'app-version': packagejson.version
-        }
-      }
-    },
+    var OSX_DIST_X64 = OSX_OUT + '/' + APPNAME + '-' + packagejson.version + '.pkg';
 
-    prompt: {
-      'create-windows-installer': {
-        options: {
-          questions: [
-            {
-              config: 'certificatePassword',
-              type: 'password',
-              message: 'Certificate Password: '
+    grunt.initConfig({
+        IDENTITY: 'Developer ID Application: David Lemarier',
+        APPNAME: APPNAME,
+        APPNAME_ESCAPED: clear(APPNAME),
+        OSX_OUT: OSX_OUT,
+        OSX_OUT_ESCAPED: clear(OSX_OUT),
+        OSX_OUT_X64: OSX_OUT_X64,
+        OSX_FILENAME: OSX_FILENAME,
+        OSX_FILENAME_ESCAPED: clear(OSX_FILENAME),
+        OSX_DIST_X64: OSX_DIST_X64,
+        OSX_DIST_X64_ESCAPED: clear(OSX_DIST_X64),
+        // electron
+        electron: {
+            windows: {
+                options: {
+                    name: BASENAME,
+                    dir: 'build/',
+                    out: 'dist',
+                    version: packagejson['electron-version'],
+                    platform: 'win32',
+                    arch: 'ia32',
+                    asar: true,
+                    icon: 'util/vpnht.ico'
+                }
+            },
+            osx: {
+                options: {
+                    name: APPNAME,
+                    dir: 'build/',
+                    out: 'dist',
+                    version: packagejson['electron-version'],
+                    platform: 'darwin',
+                    arch: 'x64',
+                    asar: true,
+                    'app-bundle-id': 'ht.vpn.desktop',
+                    'app-version': packagejson.version
+                }
             }
-          ]
-        }
-      }
-    },
-
-    rcedit: {
-      exes: {
-        files: [{
-          expand: true,
-          cwd: 'dist/' + BASENAME + '-win32-ia32',
-          src: [BASENAME + '.exe']
-        }],
-        options: {
-          icon: 'util/vpnht.ico',
-          'file-version': packagejson.version,
-          'product-version': packagejson.version,
-          'version-string': {
-            'CompanyName': 'VPN.ht Limited',
-            'ProductVersion': packagejson.version,
-            'ProductName': APPNAME,
-            'FileDescription': APPNAME,
-            'InternalName': BASENAME + '.exe',
-            'OriginalFilename': BASENAME + '.exe',
-            'LegalCopyright': 'Copyright 2015 VPN.ht Limited. All rights reserved.'
-          }
-        }
-      }
-    },
-
-    'create-windows-installer': {
-      config: {
-        appDirectory: path.join(__dirname, 'dist/' + BASENAME + '-win32-ia32'),
-        outputDirectory: path.join(__dirname, 'dist'),
-        authors: 'VPN.ht Limited',
-        loadingGif: 'util/loading.gif',
-        setupIcon: 'util/setup.ico',
-        iconUrl: 'https://raw.githubusercontent.com/vpnht/desktop/master/util/vpnht.ico',
-        description: APPNAME,
-        title: APPNAME,
-        exe: BASENAME + '.exe',
-        version: packagejson.version      }
-    },
+        },
 
-    // images
-    copy: {
-      dev: {
-        files: [{
-          expand: true,
-          cwd: '.',
-          src: ['package.json', 'settings.json', 'index.html'],
-          dest: 'build/'
-        }, {
-          expand: true,
-          cwd: 'images/',
-          src: ['**/*'],
-          dest: 'build/'
-        }, {
-          expand: true,
-          cwd: 'fonts/',
-          src: ['**/*'],
-          dest: 'build/'
-        }, {
-          cwd: 'node_modules/',
-          src: Object.keys(packagejson.dependencies).map(function (dep) { return dep + '/**/*';}),
-          dest: 'build/node_modules/',
-          expand: true
-        }]
-      },
-      windows: {
-        files: [{
-          expand: true,
-          cwd: 'resources/bin/win32',
-          src: ['**/*'],
-          dest: 'dist/' + BASENAME + '-win32-ia32/resources/bin'
-        }, {
-          expand: true,
-          cwd: 'resources/config',
-          src: ['**/*', '!**/*.ovpn'],
-          dest: 'dist/' + BASENAME + '-win32-ia32/resources/config'
-        }, {
-          expand: true,
-          cwd: 'resources/log',
-          src: ['**/*'],
-          dest: 'dist/' + BASENAME + '-win32-ia32/resources/log'
-        }],
-        options: {
-          mode: true
-        }
-      },
-      osx: {
-        files: [{
-          expand: true,
-          cwd: 'resources/bin/darwin',
-          src: ['**/*'],
-          dest: '<%= OSX_FILENAME %>/Contents/Resources/bin/'
-        }, {
-          expand: true,
-          cwd: 'resources/config',
-          src: ['**/*', '!**/*.ovpn'],
-          dest: '<%= OSX_FILENAME %>/Contents/Resources/config/'
-        }, {
-          expand: true,
-          cwd: 'resources/log',
-          src: ['**/*'],
-          dest: '<%= OSX_FILENAME %>/Contents/Resources/log/'
-        }, {
-          src: 'util/vpnht.icns',
-          dest: '<%= OSX_FILENAME %>/Contents/Resources/atom.icns'
-        }],
-        options: {
-          mode: true
-        }
-      }
-    },
+        prompt: {
+            'create-windows-installer': {
+                options: {
+                    questions: [{
+                        config: 'certificatePassword',
+                        type: 'password',
+                        message: 'Certificate Password: '
+                    }]
+                }
+            }
+        },
 
-    rename: {
-      installer: {
-        src: 'dist/Setup.exe',
-        dest: 'dist/' + BASENAME + 'Setup-' + packagejson.version + '-Windows-Alpha.exe'
-      }
-    },
+        rcedit: {
+            exes: {
+                files: [{
+                    expand: true,
+                    cwd: 'dist/' + BASENAME + '-win32-ia32',
+                    src: [BASENAME + '.exe']
+                }],
+                options: {
+                    icon: 'util/vpnht.ico',
+                    'file-version': packagejson.version,
+                    'product-version': packagejson.version,
+                    'version-string': {
+                        'CompanyName': 'VPN.ht Limited',
+                        'ProductVersion': packagejson.version,
+                        'ProductName': APPNAME,
+                        'FileDescription': APPNAME,
+                        'InternalName': BASENAME + '.exe',
+                        'OriginalFilename': BASENAME + '.exe',
+                        'LegalCopyright': 'Copyright 2015 VPN.ht Limited. All rights reserved.'
+                    }
+                }
+            }
+        },
 
-    // styles
-    less: {
-      options: {
-        sourceMapFileInline: true
-      },
-      dist: {
-        files: {
-          'build/main.css': 'styles/main.less'
-        }
-      }
-    },
+        'create-windows-installer': {
+            config: {
+                appDirectory: path.join(__dirname, 'dist/' + BASENAME + '-win32-ia32'),
+                outputDirectory: path.join(__dirname, 'dist'),
+                authors: 'VPN.ht Limited',
+                loadingGif: 'util/loading.gif',
+                setupIcon: 'util/setup.ico',
+                iconUrl: 'https://raw.githubusercontent.com/vpnht/desktop/master/util/vpnht.ico',
+                description: APPNAME,
+                title: APPNAME,
+                exe: BASENAME + '.exe',
+                version: packagejson.version
+            }
+        },
 
-    // javascript
-    babel: {
-      options: {
-        sourceMap: 'inline',
-        blacklist: 'regenerator'
-      },
-      dist: {
-        files: [{
-          expand: true,
-          cwd: 'src/',
-          src: ['**/*.js'],
-          dest: 'build/',
-        }]
-      }
-    },
+        // images
+        copy: {
+            dev: {
+                files: [{
+                    expand: true,
+                    cwd: '.',
+                    src: ['package.json', 'settings.json', 'index.html'],
+                    dest: 'build/'
+                }, {
+                    expand: true,
+                    cwd: 'images/',
+                    src: ['**/*'],
+                    dest: 'build/'
+                }, {
+                    expand: true,
+                    cwd: 'fonts/',
+                    src: ['**/*'],
+                    dest: 'build/'
+                }, {
+                    expand: true,
+                    cwd: 'translations/',
+                    src: ['**/*'],
+                    dest: 'build/translations'
+                }, {
+                    cwd: 'node_modules/',
+                    src: Object.keys(packagejson.dependencies).map(function (dep) { return dep + '/**/*';}),
+                    dest: 'build/node_modules/',
+                    expand: true
+                }]
+            },
+            release: {
+                files: [{
+                    cwd: 'node_modules/',
+                    src: [
+                        '**/*',
+                        '!*grunt*',
+                        '!*babel*',
+                        '!*gulp*'
+                    ],
+                    dest: 'build/node_modules/',
+                    expand: true
+                }]
+            },
+            windows: {
+                files: [{
+                    expand: true,
+                    cwd: 'resources/bin/win32',
+                    src: ['**/*'],
+                    dest: 'dist/' + BASENAME + '-win32-ia32/resources/bin'
+                }, {
+                    expand: true,
+                    cwd: 'resources/config',
+                    src: ['**/*', '!**/*.ovpn'],
+                    dest: 'dist/' + BASENAME + '-win32-ia32/resources/config'
+                }, {
+                    expand: true,
+                    cwd: 'resources/log',
+                    src: ['**/*'],
+                    dest: 'dist/' + BASENAME + '-win32-ia32/resources/log'
+                }],
+                options: {
+                    mode: true
+                }
+            },
+            osx: {
+                files: [{
+                    expand: true,
+                    cwd: 'resources/bin/darwin',
+                    src: ['**/*'],
+                    dest: '<%= OSX_FILENAME %>/Contents/Resources/bin/'
+                }, {
+                    expand: true,
+                    cwd: 'resources/config',
+                    src: ['**/*', '!**/*.ovpn'],
+                    dest: '<%= OSX_FILENAME %>/Contents/Resources/config/'
+                }, {
+                    expand: true,
+                    cwd: 'resources/log',
+                    src: ['**/*'],
+                    dest: '<%= OSX_FILENAME %>/Contents/Resources/log/'
+                }, {
+                    src: 'util/vpnht.icns',
+                    dest: '<%= OSX_FILENAME %>/Contents/Resources/atom.icns'
+                }],
+                options: {
+                    mode: true
+                }
+            }
+        },
 
-    shell: {
-      electron: {
-        command: electron + ' ' + 'build',
-        options: {
-          async: true,
-          execOptions: {
-            env: env
-          }
-        }
-      },
-      sign: {
-        options: {
-          failOnError: false,
+        // styles
+        less: {
+            options: {
+                sourceMapFileInline: true
+            },
+            dist: {
+                files: {
+                    'build/main.css': 'styles/main.less'
+                }
+            }
         },
-        command: [
-          'codesign --deep -v -f -s "<%= IDENTITY %>" <%= OSX_FILENAME_ESCAPED %>/Contents/Frameworks/*',
-          'codesign -v -f -s "<%= IDENTITY %>" <%= OSX_FILENAME_ESCAPED %>',
-          'codesign -vvv --display <%= OSX_FILENAME_ESCAPED %>',
-          'codesign -v --verify <%= OSX_FILENAME_ESCAPED %>'
-        ].join(' && '),
-      },
-      macdist: {
-        options: {
-          failOnError: false,
+
+        // javascript
+        babel: {
+            options: {
+                sourceMap: 'inline',
+                presets: ['es2015', 'react']
+            },
+            dist: {
+                files: [{
+                    expand: true,
+                    cwd: 'src/',
+                    src: ['**/*.js'],
+                    dest: 'build/',
+                }]
+            }
         },
-        command: [
-          'util/mac/mac-dist',
-          'codesign -v -f -s "<%= IDENTITY %>" <%= OSX_DIST_X64 %>',
-          'codesign -vvv --display <%= OSX_DIST_X64 %>',
-          'codesign -v --verify <%= OSX_DIST_X64 %>'
-        ].join(' && '),
-      },
-      macdistci: {
-        options: {
-          failOnError: false,
+
+        shell: {
+            electron: {
+                command: electron + ' ' + 'build',
+                options: {
+                    async: true,
+                    execOptions: {
+                        env: env
+                    }
+                }
+            },
+            sign: {
+                options: {
+                    failOnError: false,
+                },
+                command: [
+                    'codesign --deep -v -f -s "<%= IDENTITY %>" <%= OSX_FILENAME_ESCAPED %>/Contents/Frameworks/*',
+                    'codesign -v -f -s "<%= IDENTITY %>" <%= OSX_FILENAME_ESCAPED %>',
+                    'codesign -vvv --display <%= OSX_FILENAME_ESCAPED %>',
+                    'codesign -v --verify <%= OSX_FILENAME_ESCAPED %>'
+                ].join(' && '),
+            },
+            macdist: {
+                options: {
+                    failOnError: false,
+                },
+                command: [
+                    'util/mac/mac-dist',
+                    'codesign -v -f -s "<%= IDENTITY %>" <%= OSX_DIST_X64 %>',
+                    'codesign -vvv --display <%= OSX_DIST_X64 %>',
+                    'codesign -v --verify <%= OSX_DIST_X64 %>'
+                ].join(' && '),
+            },
+            macdistci: {
+                options: {
+                    failOnError: false,
+                },
+                command: [
+                    'util/mac/linux-dist'
+                ].join(' && '),
+            },
+            zip: {
+                command: 'ditto -c -k --sequesterRsrc --keepParent <%= OSX_FILENAME_ESCAPED %> dist/' + BASENAME + '-' + packagejson.version + '-Mac.zip',
+            },
+            makensis: {
+                command: 'makensis util/windows/installer.nsi',
+            }
         },
-        command: [
-          'util/mac/linux-dist'
-        ].join(' && '),
-      },
-      zip: {
-        command: 'ditto -c -k --sequesterRsrc --keepParent <%= OSX_FILENAME_ESCAPED %> dist/' + BASENAME + '-' + packagejson.version + '-Mac.zip',
-      },
-      makensis: {
-        command: 'makensis util/windows/installer.nsi',
-      }
-    },
 
-    clean: {
-      release: ['build/', 'dist/'],
-    },
+        clean: {
+            release: ['build/', 'dist/'],
+        },
 
-    compress: {
-      windows: {
-        options: {
-	        archive: './dist/' +  BASENAME + '-' + packagejson.version + '-Windows-Alpha.zip',
-          mode: 'zip'
+        compress: {
+            windows: {
+                options: {
+                    archive: './dist/' + BASENAME + '-' + packagejson.version + '-Windows-Alpha.zip',
+                    mode: 'zip'
+                },
+                files: [{
+                    expand: true,
+                    dot: true,
+                    cwd: './dist/VPN.ht-win32-ia32',
+                    src: '**/*'
+                }]
+            },
         },
-        files: [{
-          expand: true,
-          dot: true,
-          cwd: './dist/VPN.ht-win32-ia32',
-          src: '**/*'
-        }]
-	    },
-    },
 
-    // livereload
-    watchChokidar: {
-      options: {
-        spawn: true
-      },
-      livereload: {
-        options: {livereload: true},
-        files: ['build/**/*']
-      },
-      js: {
-        files: ['src/**/*.js'],
-        tasks: ['newer:babel']
-      },
-      less: {
-        files: ['styles/**/*.less'],
-        tasks: ['less']
-      },
-      copy: {
-        files: ['images/*', 'index.html', 'fonts/*'],
-        tasks: ['newer:copy:dev']
-      }
-    }
-  });
+        // livereload
+        watchChokidar: {
+            options: {
+                spawn: true
+            },
+            livereload: {
+                options: {
+                    livereload: true
+                },
+                files: ['build/**/*']
+            },
+            js: {
+                files: ['src/**/*.js'],
+                tasks: ['newer:babel']
+            },
+            less: {
+                files: ['styles/**/*.less'],
+                tasks: ['less']
+            },
+            copy: {
+                files: ['images/*', 'index.html', 'fonts/*'],
+                tasks: ['newer:copy:dev']
+            }
+        }
+    });
 
-  grunt.registerTask('default', ['newer:babel', 'less', 'newer:copy:dev', 'shell:electron', 'watchChokidar']);
+    grunt.registerTask('default', ['newer:babel', 'less', 'newer:copy:dev', 'shell:electron', 'watchChokidar']);
 
-  if (process.platform === 'win32') {
-    grunt.registerTask('release', ['clean:release', 'babel', 'less', 'copy:dev', 'electron:windows', 'copy:windows', 'rcedit:exes', 'compress']);
-  } else {
-    grunt.registerTask('release', ['clean:release', 'babel', 'less', 'copy:dev', 'electron:osx', 'copy:osx', 'shell:sign', 'shell:zip', 'shell:macdist']);
-  }
+    if (process.platform === 'win32') {
+        grunt.registerTask('release', ['clean:release', 'babel', 'less', 'copy:dev', 'copy:release', 'electron:windows', 'copy:windows', 'rcedit:exes', 'compress']);
+    } else {
+        grunt.registerTask('release', ['clean:release', 'babel', 'less', 'copy:dev', 'copy:release', 'electron:osx', 'copy:osx', 'shell:sign', 'shell:zip', 'shell:macdist']);
+    }
 
-  grunt.registerTask('ci', ['clean:release', 'babel', 'less', 'copy:dev', 'electron:osx', 'electron:windows', 'copy:osx', 'copy:windows', 'rcedit:exes', 'shell:sign', 'shell:macdistci', 'shell:makensis']);
+    grunt.registerTask('ci', ['clean:release', 'babel', 'less', 'copy:dev', 'copy:release', 'electron:osx', 'electron:windows', 'copy:osx', 'copy:windows', 'rcedit:exes', 'shell:sign', 'shell:macdistci', 'shell:makensis']);
 
-  process.on('SIGINT', function () {
-    grunt.task.run(['shell:electron:kill']);
-    process.exit(1);
-  });
-};
+    process.on('SIGINT', function() {
+        grunt.task.run(['shell:electron:kill']);
+        process.exit(1);
+    });
+};
\ No newline at end of file
diff --git a/images/monster-left.png b/images/monster-left.png
new file mode 100644
index 0000000..e59400b
Binary files /dev/null and b/images/monster-left.png differ
diff --git a/images/monster-right.png b/images/monster-right.png
new file mode 100644
index 0000000..9ddd3c1
Binary files /dev/null and b/images/monster-right.png differ
diff --git a/index.html b/index.html
index 7751988..5f19415 100755
--- a/index.html
+++ b/index.html
@@ -1,11 +1,15 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <link rel="stylesheet" href="main.css"/>
+
+<head>
+    <link rel="stylesheet" href="main.css" />
     <meta http-equiv="Content-Security-Policy" content="default-src *; script-src 'self' http://localhost:35729; style-src 'self' 'unsafe-inline';">
     <title>VPN.ht</title>
-  </head>
-  <body>
+</head>
+
+<body>
+    <div id="root"></div>
     <script src="main.js"></script>
-  </body>
-</html>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/package.json b/package.json
index e76e467..93e98fa 100644
--- a/package.json
+++ b/package.json
@@ -1,82 +1,82 @@
 {
-  "name": "VPN.ht",
-  "version": "0.0.3",
-  "author": "VPN.ht",
-  "description": "Simple VPN.ht Client.",
-  "homepage": "https://vpn.ht/",
-  "main": "browser.js",
-  "repository": {
-    "type": "git",
-    "url": "git@github.com:vpnht/desktop.git"
-  },
-  "bugs": "https://github.com/vpnht/desktop/issues",
-  "scripts": {
-    "start": "grunt",
-    "release": "grunt release"
-  },
-  "license": "GPL-3.0",
-  "electron-version": "0.33.3",
-  "dependencies": {
-    "alt": "0.17.3",
-    "autoupdater": "vpnht/autoupdater",
-    "bluebird": "2.10.1",
-    "bugsnag-js": "2.4.7",
-    "classnames": "2.1.3",
-    "exec": "0.2.0",
-    "get-port": "1.0.0",
-    "is-running": "1.0.5",
-    "jquery": "2.1.4",
-    "lodash": "3.10.1",
-    "mixpanel": "kitematic/mixpanel-node",
-    "node-cache": "3.0.0",
-    "node-openvpn": "VPNht/node-openvpn",
-    "node-uuid": "1.4.3",
-    "object-assign": "4.0.1",
-    "osx-release": "1.1.0",
-    "react": "0.13.3",
-    "react-bootstrap": "^0.20.3",
-    "react-retina-image": "1.3.3",
-    "react-router": "0.13.3",
-    "react-select": "0.6.11",
-    "request": "2.55.0",
-    "validator": "4.0.6",
-    "windows-service-manager": "vpnht/windows-service-manager",
-    "winreg": "0.0.12",
-    "xps": "^1.0.2",
-    "yargs": "^3.27.0"
-  },
-  "devDependencies": {
-    "async": "^1.4.2",
-    "babel": "^5.1.10",
-    "grunt": "^0.4.5",
-    "grunt-babel": "^5.0.1",
-    "grunt-chmod": "^1.0.3",
-    "grunt-cli": "^0.1.13",
-    "grunt-contrib-clean": "^0.6.0",
-    "grunt-contrib-compress": "^0.13.0",
-    "grunt-contrib-copy": "^0.8.0",
-    "grunt-contrib-less": "^1.0.1",
-    "grunt-contrib-watch-chokidar": "^1.0.0",
-    "grunt-curl": "^2.2.0",
-    "grunt-download-electron": "^2.1.1",
-    "grunt-electron": "^2.0.0",
-    "grunt-electron-installer": "^1.0.3",
-    "grunt-if-missing": "^1.0.0",
-    "grunt-newer": "^1.1.1",
-    "grunt-plistbuddy": "^0.1.1",
-    "grunt-prompt": "^1.3.0",
-    "grunt-rcedit": "^0.3.1",
-    "grunt-rename": "^0.1.4",
-    "grunt-shell": "^1.1.2",
-    "grunt-shell-spawn": "^0.3.8",
-    "load-grunt-tasks": "^3.2.0",
-    "minimist": "^1.1.1",
-    "react-tools": "^0.13.1",
-    "run-sequence": "^1.0.2",
-    "shell-escape": "^0.2.0",
-    "source-map-support": "^0.3.2"
-  },
-  "optionalDependencies": {
-    "electron-prebuilt": "^0.33.3"
-  }
-}
+    "name": "VPN.ht",
+    "version": "0.0.3",
+    "author": "VPN.ht",
+    "description": "Simple VPN.ht Client.",
+    "homepage": "https://vpn.ht/",
+    "main": "browser.js",
+    "repository": {
+        "type": "git",
+        "url": "git@github.com:vpnht/desktop.git"
+    },
+    "bugs": "https://github.com/vpnht/desktop/issues",
+    "scripts": {
+        "start": "grunt",
+        "release": "grunt release"
+    },
+    "engines": {
+        "node": ">=6.0.0",
+        "npm": ">=3.0.0"
+    },
+    "license": "GPL-3.0",
+    "electron-version": "1.4.4",
+    "dependencies": {
+        "alt": "0.18.6",
+        "autoupdater": "vpnht/autoupdater",
+        "bugsnag-js": "3.0.6",
+        "classnames": "2.2.5",
+        "get-port": "2.1.0",
+        "is-running": "2.1.0",
+        "jquery": "3.1.1",
+        "lodash": "4.16.4",
+        "mixpanel": "kitematic/mixpanel-node",
+        "node-openvpn": "VPNht/node-openvpn",
+        "node-uuid": "1.4.7",
+        "osx-release": "1.1.0",
+        "react": "15.x.x",
+        "react-bootstrap": "0.30.x",
+        "react-dom": "15.x.x",
+        "react-retina-image": "2.x.x",
+        "react-router": "0.13.x",
+        "react-select": "v1.0.0-rc.1",
+        "request": "2.76.0",
+        "windows-service-manager": "vpnht/windows-service-manager",
+        "winreg": "1.2.2",
+        "xps": "^1.0.2",
+        "yargs": "6.3.0"
+    },
+    "devDependencies": {
+        "async": "^2.1.2",
+        "babel-core": "^6.0.0",
+        "babel-preset-es2015": "^6.0.0",
+        "babel-preset-react": "^6.0.0",
+        "grunt": "^1.0.1",
+        "grunt-babel": "^6.0.0",
+        "grunt-chmod": "^1.1.1",
+        "grunt-cli": "^1.2.0",
+        "grunt-contrib-clean": "^1.0.0",
+        "grunt-contrib-compress": "^1.3.0",
+        "grunt-contrib-copy": "^1.0.0",
+        "grunt-contrib-less": "^1.4.0",
+        "grunt-contrib-watch-chokidar": "^1.0.0",
+        "grunt-curl": "^2.2.0",
+        "grunt-download-electron": "^2.1.4",
+        "grunt-electron": "^5.0.0",
+        "grunt-electron-installer": "^2.1.0",
+        "grunt-if-missing": "^1.0.1",
+        "grunt-newer": "^1.2.0",
+        "grunt-plistbuddy": "^0.2.0",
+        "grunt-prompt": "^1.3.3",
+        "grunt-rcedit": "^0.7.0",
+        "grunt-shell": "^2.0.0",
+        "grunt-shell-spawn": "^0.3.10",
+        "load-grunt-tasks": "^3.5.2",
+        "minimist": "^1.2.0",
+        "run-sequence": "^1.2.2",
+        "shell-escape": "^0.2.0",
+        "source-map-support": "^0.4.5"
+    },
+    "optionalDependencies": {
+        "electron": "^1.4.4"
+    }
+}
\ No newline at end of file
diff --git a/src/actions/AccountServerActions.js b/src/actions/AccountServerActions.js
index 43152a5..98d0673 100644
--- a/src/actions/AccountServerActions.js
+++ b/src/actions/AccountServerActions.js
@@ -2,13 +2,13 @@ import alt from '../alt';
 
 class AccountServerActions {
 
-  constructor () {
-    this.generateActions(
-      'loggedin',
-      'loggedout'
-    );
-  }
+    constructor() {
+        this.generateActions(
+            'loggedin',
+            'loggedout'
+        );
+    }
 
 }
 
-export default alt.createActions(AccountServerActions);
+export default alt.createActions(AccountServerActions);
\ No newline at end of file
diff --git a/src/actions/ServerActions.js b/src/actions/ServerActions.js
index 6801f88..81d884b 100644
--- a/src/actions/ServerActions.js
+++ b/src/actions/ServerActions.js
@@ -1,9 +1,9 @@
-var alt = require('../alt')
+import alt from '../alt'
 
 class ServerActions {
-  constructor() {
-    this.generateActions('receiveAll')
-  }
+    constructor() {
+        this.generateActions('receiveAll')
+    }
 }
 
-module.exports = alt.createActions(ServerActions)
+module.exports = alt.createActions(ServerActions)
\ No newline at end of file
diff --git a/src/actions/VPNActions.js b/src/actions/VPNActions.js
index 52a62ea..e7c8163 100644
--- a/src/actions/VPNActions.js
+++ b/src/actions/VPNActions.js
@@ -1,6 +1,6 @@
 var vpnUtil;
 
-import ipc from 'ipc';
+import {ipcRenderer} from 'electron';
 import alt from '../alt';
 import log from '../stores/LogStore';
 import Settings from '../utils/SettingsUtil';
@@ -8,108 +8,119 @@ import Credentials from '../utils/CredentialsUtil';
 
 class VPNActions {
 
-  constructor () {
-    this.generateActions(
-      'newIp', // called when we received a new ip
-      'bytecount',
-      'processStarted',
-      'processKilled'
-    );
-  }
-
-  connect (args) {
-
-    // set tray in connecting state
-    ipc.send('vpn.connecting');
-
-    vpnUtil = require('../utils/VPNUtil');
-    this.dispatch();
-
-    vpnUtil.connect(args)
-        .then(() => {
-            log.info('VPNAction.connect() done');
-            // update tray
-            ipc.send('vpn.connected');
-            this.actions.connected();
-        })
-        .catch((error) => {
-            console.log(error);
-            log.error('Unable to launch process');
-            this.actions.disconnected();
-
-        });
-  }
-
-  disconnect () {
-
-    vpnUtil = require('../utils/VPNUtil');
-    this.dispatch();
-    vpnUtil.disconnect()
-        .then(() => {
-
-            log.info('Waiting EXITING state');
-
-        })
-        .catch((error) => {
-
-            log.error('Unable to disconnect');
-            console.log(error);
-
-        });
-  }
-
-  checkIp () {
-    var helpers = require('../utils/VPNHelpers');
-    this.dispatch();
-    helpers.updateIp()
-        .then(() => {
-
-            log.info('IP Updated');
-
-        })
-        .catch((error) => {
-
-            log.error('Unable to update ip');
-            console.log(error);
-
-        });
-  }
-
-  invalidCredentials () {
-    this.dispatch();
-    alert("Invalid credentials")
-  }
-
-  appReady () {
-    this.dispatch();
-    if (Settings.get('connectLaunch') === 'true' && Credentials._config()) {
-        log.info('Auto-connect on launch')
-        this.actions.connect({
-            username: Credentials.get().username,
-            password: Credentials.get().password,
-            server: Settings.get('server') || 'hub.vpn.ht'
-        });
+    constructor() {
+        this.generateActions(
+            'newIp', // called when we received a new ip
+            'bytecount',
+            'processStarted',
+            'processKilled'
+        );
     }
 
-  }
+    connect(args) {
+        return function(dispatch) {
+            // set tray in connecting state
+            ipcRenderer.send('vpn.connecting');
+
+            vpnUtil = require('../utils/VPNUtil');
+            dispatch();
+
+            vpnUtil.connect(args)
+                .then(() => {
+                    log.info('VPNAction.connect() done');
+                    // update tray
+                    ipcRenderer.send('vpn.connected');
+                    this.connected();
+                })
+                .catch((error) => {
+                    console.log(error);
+                    log.error('Unable to launch process');
+                    this.disconnected();
+
+                });
+        };
+    }
+
+    disconnect() {
+        return function(dispatch) {
+            vpnUtil = require('../utils/VPNUtil');
+            dispatch();
+            vpnUtil.disconnect()
+                .then(() => {
+
+                    log.info('Waiting EXITING state');
 
-  // used by tray
-  disconnected() {
-    this.dispatch();
-    ipc.send('vpn.disconnected');
+                })
+                .catch((error) => {
 
-    // on windows we need to stop the service
-    if (process.platform == 'win32') {
-        require('../utils/Util').exec(['net', 'stop', 'openvpnservice'])
+                    log.error('Unable to disconnect');
+                    console.log(error);
+
+                });
+        };
     }
-  }
 
-  connected() {
-    this.dispatch();
-    ipc.send('vpn.connected');
-  }
+    checkIp() {
+        return function(dispatch) {
+            var helpers = require('../utils/VPNHelpers');
+            dispatch();
+            helpers.updateIp()
+                .then(() => {
+
+                    log.info('IP Updated');
+
+                })
+                .catch((error) => {
+
+                    log.error('Unable to update IP');
+                    console.log(error);
+
+                });
+        };
+    }
+
+    invalidCredentials() {
+        return function(dispatch) {
+            dispatch();
+            alert('Invalid credentials');
+        };
+    }
+
+    appReady() {
+        return function(dispatch) {
+            dispatch();
+            if (Settings.get('connectLaunch') === 'true' && Credentials._config()) {
+                log.info('Auto-connect on launch');
+                this.connect({
+                    username: Credentials.get().username,
+                    password: Credentials.get().password,
+                    server: Settings.get('server') || 'hub.vpn.ht'
+                });
+            }
+        };
+    }
+
+    // used by tray
+    disconnected() {
+        return function(dispatch) {
+            dispatch();
+            ipcRenderer.send('vpn.disconnected');
+
+            // on windows we need to stop the service
+            if (process.platform == 'win32') {
+                require('../utils/Util').exec(['net', 'stop', 'openvpnservice'])
+            }
+        };
+    }
+
+    connected() {
+        return function(dispatch) {
+            dispatch();
+            ipcRenderer.send('vpn.connected');
+        };
+    }
 
 
 }
 
-export default alt.createActions(VPNActions);
+export default alt.createActions(VPNActions);
\ No newline at end of file
diff --git a/src/alt.js b/src/alt.js
index bd2bdab..f492ae5 100755
--- a/src/alt.js
+++ b/src/alt.js
@@ -1,2 +1,2 @@
 import Alt from 'alt';
-export default new Alt();
+export default new Alt();
\ No newline at end of file
diff --git a/src/app-tray.js b/src/app-tray.js
index 62934c6..299a225 100644
--- a/src/app-tray.js
+++ b/src/app-tray.js
@@ -1,7 +1,4 @@
-import Menu from 'menu';
-import MenuItem from 'menu-item';
-import Tray from 'tray';
-import ipc from 'ipc';
+import {Menu, MenuItem, ipcMain, Tray} from 'electron';
 
 var trayMenuDisconnected = null;
 var trayMenuConnected = null;
@@ -10,103 +7,106 @@ var trayMenuConnecting = null;
 // Define a function to set up our tray icon
 exports.init = function(helper) {
 
-	// Disconnected State
-	trayMenuDisconnected = new Menu();
-	trayMenuDisconnected.append(new MenuItem({
-		label: 'Toggle VPN.ht',
-		click: helper.toggleVisibility
-	}));
-	trayMenuDisconnected.append(new MenuItem({
-		type: 'separator'
-	}));
-	trayMenuDisconnected.append(new MenuItem({
-		label: 'Connect',
-		click: helper.connect
-	}));
-	trayMenuDisconnected.append(new MenuItem({
-		label: 'Disconnect',
-		enabled: false
-	}));
-	trayMenuDisconnected.append(new MenuItem({
-		type: 'separator'
-	}));
-	trayMenuDisconnected.append(new MenuItem({
-		label: 'Quit',
-		click: helper.quit
-	}));
+    ipcMain.on('localization.ready', function localize(e, arg) {
+        let t = JSON.parse(arg);
 
-	// Connected State
-	trayMenuConnected = new Menu();
-	trayMenuConnected.append(new MenuItem({
-		label: 'Show Window',
-		click: helper.toggleVisibility
-	}));
-	trayMenuConnected.append(new MenuItem({
-		type: 'separator'
-	}));
-    trayMenuConnected.append(new MenuItem({
-		label: 'Connect',
-		enabled: false
-	}));
-	trayMenuConnected.append(new MenuItem({
-		label: 'Disconnect',
-		click: helper.disconnect
-	}));
-	trayMenuConnected.append(new MenuItem({
-		type: 'separator'
-	}));
-	trayMenuConnected.append(new MenuItem({
-		label: 'Quit',
-		click: helper.quit
-	}));
+        // Disconnected State
+        trayMenuDisconnected = new Menu();
+        trayMenuDisconnected.append(new MenuItem({
+            label: t['Toggle'] + ' VPN.ht',
+            click: helper.toggleVisibility
+        }));
+        trayMenuDisconnected.append(new MenuItem({
+            type: 'separator'
+        }));
+        trayMenuDisconnected.append(new MenuItem({
+            label: t['Connect'],
+            click: helper.connect
+        }));
+        trayMenuDisconnected.append(new MenuItem({
+            label: t['Disconnect'],
+            enabled: false
+        }));
+        trayMenuDisconnected.append(new MenuItem({
+            type: 'separator'
+        }));
+        trayMenuDisconnected.append(new MenuItem({
+            label: t['Quit'],
+            click: helper.quit
+        }));
 
-	// Connecting State
-	trayMenuConnecting = new Menu();
-	trayMenuConnecting.append(new MenuItem({
-		label: 'Show Window',
-		click: helper.toggleVisibility
-	}));
-	trayMenuConnecting.append(new MenuItem({
-		type: 'separator'
-	}));
-    trayMenuConnecting.append(new MenuItem({
-		label: 'Cancel connecting...',
-		click: helper.disconnect
-	}));
-	trayMenuConnecting.append(new MenuItem({
-		label: 'Disconnect',
-		enabled: false
-	}));
-	trayMenuConnecting.append(new MenuItem({
-		type: 'separator'
-	}));
-	trayMenuConnecting.append(new MenuItem({
-		label: 'Quit',
-		click: helper.quit
-	}));
+        // Connected State
+        trayMenuConnected = new Menu();
+        trayMenuConnected.append(new MenuItem({
+            label: t['Show Window'],
+            click: helper.toggleVisibility
+        }));
+        trayMenuConnected.append(new MenuItem({
+            type: 'separator'
+        }));
+        trayMenuConnected.append(new MenuItem({
+            label: t['Connect'],
+            enabled: false
+        }));
+        trayMenuConnected.append(new MenuItem({
+            label: t['Disconnect'],
+            click: helper.disconnect
+        }));
+        trayMenuConnected.append(new MenuItem({
+            type: 'separator'
+        }));
+        trayMenuConnected.append(new MenuItem({
+            label: t['Quit'],
+            click: helper.quit
+        }));
 
+        // Connecting State
+        trayMenuConnecting = new Menu();
+        trayMenuConnecting.append(new MenuItem({
+            label: t['Show Window'],
+            click: helper.toggleVisibility
+        }));
+        trayMenuConnecting.append(new MenuItem({
+            type: 'separator'
+        }));
+        trayMenuConnecting.append(new MenuItem({
+            label: t['Cancel connecting...'],
+            click: helper.disconnect
+        }));
+        trayMenuConnecting.append(new MenuItem({
+            label: t['Disconnect'],
+            enabled: false
+        }));
+        trayMenuConnecting.append(new MenuItem({
+            type: 'separator'
+        }));
+        trayMenuConnecting.append(new MenuItem({
+            label: t['Quit'],
+            click: helper.quit
+        }));
 
-	var tray = new Tray(__dirname + '/tray.png');
-	tray.setContextMenu(trayMenuDisconnected);
+        var tray = new Tray(__dirname + '/tray.png');
+        tray.setContextMenu(trayMenuDisconnected);
+        tray.setToolTip(t['Disconnected']);
 
-	tray.on('clicked', helper.toggleVisibility);
+        tray.on('clicked', helper.toggleVisibility);
 
-	ipc.on('vpn.connected', function handleConnected() {
-		tray.setContextMenu(trayMenuConnected);
-		tray.setImage(__dirname + '/tray_connected.png');
-    	tray.setToolTip('Connected');
-	});
+        ipcMain.on('vpn.connected', function handleConnected() {
+            tray.setContextMenu(trayMenuConnected);
+            tray.setImage(__dirname + '/tray_connected.png');
+            tray.setToolTip(t['Connected']);
+        });
 
-	ipc.on('vpn.connecting', function handleConnecting() {
-		tray.setContextMenu(trayMenuConnecting);
-		tray.setImage(__dirname + '/tray_connecting.png');
-    	tray.setToolTip('Connecting...');
-	});
+        ipcMain.on('vpn.connecting', function handleConnecting() {
+            tray.setContextMenu(trayMenuConnecting);
+            tray.setImage(__dirname + '/tray_connecting.png');
+            tray.setToolTip(t['Connecting...']);
+        });
 
-	ipc.on('vpn.disconnected', function handleDisconnected() {
-		tray.setContextMenu(trayMenuDisconnected);
-		tray.setImage(__dirname + '/tray.png');
-    	tray.setToolTip('Disconnected');
-	});
-
-};
+        ipcMain.on('vpn.disconnected', function handleDisconnected() {
+            tray.setContextMenu(trayMenuDisconnected);
+            tray.setImage(__dirname + '/tray.png');
+            tray.setToolTip(t['Disconnected']);
+        });
+    });
+};
\ No newline at end of file
diff --git a/src/app.js b/src/app.js
index 5fbca6b..93bf4ff 100755
--- a/src/app.js
+++ b/src/app.js
@@ -1,7 +1,7 @@
 require.main.paths.splice(0, 0, process.env.NODE_PATH);
-import remote from 'remote';
+import {remote, ipcRenderer} from 'electron';
 import React from 'react';
-import ipc from 'ipc';
+import ReactDOM from 'react-dom';
 import metrics from './utils/MetricsUtil';
 import VPN from './utils/VPNUtil';
 import vpnActions from './actions/VPNActions';
@@ -16,15 +16,16 @@ import log from './stores/LogStore';
 import accountStore from './stores/AccountStore';
 import utils from './utils/Util';
 import Credentials from './utils/CredentialsUtil';
-
 import Settings from './utils/SettingsUtil';
+import Localization from './utils/localizationUtil';
 
-var app = remote.require('app');
-var Menu = remote.require('menu');
+var app = remote.app;
+var Menu = remote.Menu;
 
 // Init process
 log.initLogs(app.getVersion());
 VPN.initCheck();
+Localization.init();
 webUtil.addLiveReload();
 webUtil.addBugReporting();
 webUtil.disableGlobalBackspace();
@@ -32,65 +33,68 @@ Menu.setApplicationMenu(Menu.buildFromTemplate(template()));
 metrics.track('Started App');
 metrics.track('app heartbeat');
 setInterval(function() {
-	metrics.track('app heartbeat');
+    metrics.track('app heartbeat');
 }, 14400000);
 var router = Router.create({
-	routes: routes
+    routes: routes
 });
 
-router.run(Handler => React.render( < Handler / > , document.body));
+router.run(Handler => ReactDOM.render( < Handler / > , document.getElementById('root')));
 routerContainer.set(router);
 
 // Default Route
 router.transitionTo('dashboard');
-ipc.on('application:quitting', () => {});
+ipcRenderer.on('application:quitting', () => {});
+
+// Define styles
+document.getElementById('root').classList = [process.platform];
 
 // Event fires when the app receives a vpnht:// URL
-ipc.on('application:open-url', opts => {
-	console.log('open', opts);
+ipcRenderer.on('application:open-url', opts => {
+    console.log('open', opts);
 });
 
-ipc.on('application:vpn-connect', () => {
-	if (Credentials._config()) {
-		vpnActions.connect({
-			username: Credentials.get().username,
-			password: Credentials.get().password,
-			server: Settings.get('server') || 'hub.vpn.ht'
-		});
-	} else {
-		log.error('No user/pass saved in the hash.\n\nTIPS: Try to connect manually first to save your data.')
-	}
+ipcRenderer.on('application:vpn-connect', () => {
+    if (Credentials._config()) {
+        vpnActions.connect({
+            username: Credentials.get().username,
+            password: Credentials.get().password,
+            server: Settings.get('server') || 'hub.vpn.ht'
+        });
+    } else {
+        log.error('No user/pass saved in the hash.\n\nTIPS: Try to connect manually first to save your data.')
+    }
 });
 
-ipc.on('application:vpn-check-disconnect', () => {
-	if (accountStore.getState().connecting || accountStore.getState().connected) {
-		log.info('Disconnecting before closing application');
-		vpnActions.disconnect();
-	} else {
-		vpnActions.disconnected();
-	}
+ipcRenderer.on('application:vpn-check-disconnect', () => {
+    if (accountStore.getState().connecting || accountStore.getState().connected) {
+        log.info('Disconnecting before closing application');
+        vpnActions.disconnect();
+    } else {
+        vpnActions.disconnected();
+    }
 });
 
-ipc.on('application:vpn-check-sleep', () => {
-	if (accountStore.getState().connected) {
-		log.info('Trying to reconnect after sleep');
-		if (Credentials._config()) {
-			vpnActions.connect({
-				username: Credentials.get().username,
-				password: Credentials.get().password,
-				server: Settings.get('server') || 'hub.vpn.ht'
-			});
-		} else {
-			log.info('No user/pass saved in the hash, now disconnecting.');
-			vpnActions.disconnect();
-		}
-	}
+ipcRenderer.on('application:vpn-check-sleep', () => {
+    if (accountStore.getState().connected) {
+        log.info('Trying to reconnect after sleep');
+        if (Credentials._config()) {
+            vpnActions.connect({
+                username: Credentials.get().username,
+                password: Credentials.get().password,
+                server: Settings.get('server') || 'hub.vpn.ht'
+            });
+        } else {
+            log.info('No user/pass saved in the hash. Disconnecting.');
+            vpnActions.disconnect();
+        }
+    }
 });
 
-ipc.on('application:vpn-disconnect', () => {
-	vpnActions.disconnect();
+ipcRenderer.on('application:vpn-disconnect', () => {
+    vpnActions.disconnect();
 });
 
 module.exports = {
-	router: router
-};
+    router: router
+};
\ No newline at end of file
diff --git a/src/browser.js b/src/browser.js
index 3316d78..c2b7c96 100755
--- a/src/browser.js
+++ b/src/browser.js
@@ -1,7 +1,5 @@
-import app from 'app';
-import BrowserWindow from 'browser-window';
+import {app, BrowserWindow, ipcMain, screen, dialog} from 'electron';
 import os from 'os';
-import ipc from 'ipc';
 import net from 'net';
 import fs from 'fs';
 import path from 'path';
@@ -9,6 +7,7 @@ import child_process from 'child_process';
 import trayTemplate from './app-tray'
 import Updater from 'autoupdater'
 import yargs from 'yargs';
+import util from './utils/Util';
 
 let args = yargs(process.argv.slice(1)).wrap(100).argv;
 
@@ -42,7 +41,6 @@ app.on('ready', function() {
 
     var checkingQuit = false;
     var canQuit = false;
-    var screen = require('screen');
     var size = screen.getPrimaryDisplay().workAreaSize;
     var autoUpdater = new Updater({
         currentVersion: app.getVersion()
@@ -50,12 +48,12 @@ app.on('ready', function() {
 
     var windowSize = {
         width: 800,
-        height: 870
-    }
+        height: process.platform === 'win32' ? 900 : 870
+    };
 
-    if (size.height < 870) {
-        windowSize.width = '800';
-        windowSize.height = '600';
+    if (size.height !== 870) {
+        windowSize.width = 800;
+        windowSize.height = 600;
     }
 
     var mainWindow = new BrowserWindow({
@@ -63,23 +61,30 @@ app.on('ready', function() {
         height: windowSize.height,
         'standard-window': false,
         resizable: false,
-        frame: false,
-        show: false
+        frame: process.platform === 'win32', //only on Windows
+        show: false,
+        titleBarStyle: 'hidden-inset',
+        backgroundColor: '#ededed', // to enable subpixel anti-aliasing, since electron 0.37.3
+        webPreferences: {
+            backgroundThrottling: false // disable throttling rendering when not focused
+        }
     });
 
+    //DEBUG: mainWindow.webContents.openDevTools();
+
     var preventMultipleInstances = function() {
         var socket = (process.platform === 'win32') ? '\\\\.\\pipe\\vpnht-sock' : path.join(os.tmpdir(), 'vpnht.sock');
         var client = net.connect({
             path: socket
         }, function() {
             var errorMessage = 'Another instance of VPN.ht is already running. Only one instance of the app can be open at a time.'
-            require('dialog').showMessageBox(mainWindow, {
+            dialog.showMessageBox(mainWindow, {
                 'type': 'error',
                 message: errorMessage,
                 buttons: ['OK']
             }, function() {
                 client.end();
-                app.terminate();
+                process.exit(0);
             })
         }).on('error', function(err) {
 
@@ -103,7 +108,7 @@ app.on('ready', function() {
             });
 
             server.listen(socket);
-            mainWindow.loadUrl(path.normalize('file://' + path.join(__dirname, 'index.html')));
+            mainWindow.loadURL(path.normalize('file://' + path.join(__dirname, 'index.html')));
         });
     }
 
@@ -115,7 +120,7 @@ app.on('ready', function() {
             if (!checkingQuit) {
                 checkingQuit = true;
                 mainWindow.webContents.send('application:vpn-check-disconnect');
-                ipc.on('vpn.disconnected', () => {
+                ipcMain.on('vpn.disconnected', () => {
                     canQuit = true;
                     app.quit();
                 });
@@ -123,7 +128,8 @@ app.on('ready', function() {
         }
     });
 
-    require('power-monitor').on('resume', function() {
+    // powerMonitor cannot be required before 'ready' event is fired: https://github.com/electron/electron/blob/master/docs/api/power-monitor.md
+    require('electron').powerMonitor.on('resume', function() {
         mainWindow.webContents.send('application:vpn-check-sleep');
     });
 
@@ -158,7 +164,9 @@ app.on('ready', function() {
 
     mainWindow.webContents.on('did-finish-load', function() {
 
+        console.log('ready')
         mainWindow.setTitle('VPN.ht');
+
         if (!args.hide) {
             mainWindow.show();
             mainWindow.focus();
@@ -184,7 +192,7 @@ app.on('ready', function() {
 
     autoUpdater.on("updateReady", function(updaterPath) {
         console.log("Launching " + updaterPath);
-        require('dialog').showMessageBox(mainWindow, {
+        dialog.showMessageBox(mainWindow, {
             'type': 'info',
             message: 'A new version is available, do you want to install now ?',
             buttons: ['Yes', 'No']
@@ -192,16 +200,16 @@ app.on('ready', function() {
 
             if (response === 0) {
                 if (process.platform == 'win32') {
-                    require('./utils/Util').exec('start ' + updaterPath).then(function(stdOut) {
+                    util.exec('start ' + updaterPath).then(function(stdOut) {
                         console.log(stdOut);
-                        app.terminate();
+                        process.exit(0);
                     });
                 } else {
                     child_process.spawn('open', [updaterPath], {
                         detached: true,
                         stdio: ['ignore', 'ignore', 'ignore']
                     });
-                    app.terminate();
+                    process.exit(0);
                 }
             }
 
diff --git a/src/components/About.react.js b/src/components/About.react.js
index e796292..e39e5ee 100755
--- a/src/components/About.react.js
+++ b/src/components/About.react.js
@@ -1,43 +1,59 @@
-import React from 'react/addons';
+import {shell} from 'electron';
+import React from 'react';
 import metrics from '../utils/MetricsUtil';
 import utils from '../utils/Util';
+import {t} from '../utils/localizationUtil';
 import Router from 'react-router';
 import RetinaImage from 'react-retina-image';
+import pkJson from '../package';
 var packages;
 
 try {
-  packages = utils.packagejson();
+    packages = utils.packagejson();
 } catch (err) {
-  packages = {};
+    packages = {};
 }
 
 var Preferences = React.createClass({
-  mixins: [Router.Navigation],
-  getInitialState: function () {
-    return {
-      metricsEnabled: metrics.enabled()
-    };
-  },
-  handleGoBackClick: function () {
-    this.goBack();
-    metrics.track('Went Back From About');
-  },
-  render: function () {
-    return (
-      <div className="preferences">
-        <div className="about-content">
-          <a onClick={this.handleGoBackClick}>Go Back</a>
-          <div className="items">
-            <div className="item">
-              <RetinaImage src="vpnht-logo.png"/>
-              <h4>{packages.name}</h4>
-              <p>{packages.version}</p>
+    mixins: [Router.Navigation],
+    getInitialState: function () {
+        return {
+            metricsEnabled: metrics.enabled()
+        };
+    },
+    handleGoBackClick: function () {
+        this.goBack();
+        metrics.track('Went Back From About');
+    },
+    handleExternal: function () {
+        shell.openExternal(pkJson.homepage);
+    },
+    render: function () {
+        return (
+            <div className="preferences">
+                <div className="about-content">
+                    <a className="goback ion-android-arrow-back" onClick={this.handleGoBackClick}></a>
+
+                    <div className="items">
+                        <div className="item">
+                            <RetinaImage src="monster-left.png"/>
+                            <h4>{t('Plug and play!')}</h4>
+                            <p>{t('You can start using our service, and start surfing in privacy, as soon as you create an account.')}</p>
+                        </div>
+                        <div className="item">
+                            <RetinaImage src="monster-right.png"/>
+                            <h4>{t('No logs')}</h4>
+                            <p>{t('You value your privacy. So do we. We don’t keep logs, we don’t know the sites you have visited or the applications you’ve used.')}</p>
+                        </div>
+                    </div>
+
+                    <div className="foot">
+                        {packages.name} v{packages.version} - <a onClick={this.handleExternal}>{pkJson.homepage}</a>
+                    </div>
+                </div>
             </div>
-          </div>
-        </div>
-      </div>
-    );
-  }
+        );
+    }
 });
 
 module.exports = Preferences;
diff --git a/src/components/Dashboard.react.js b/src/components/Dashboard.react.js
index 1945348..728dbbe 100644
--- a/src/components/Dashboard.react.js
+++ b/src/components/Dashboard.react.js
@@ -1,4 +1,4 @@
-import React from 'react/addons';
+import React from 'react';
 import metrics from '../utils/MetricsUtil';
 import Router from 'react-router';
 
@@ -8,46 +8,44 @@ import ConnectionDetails from './DashboardConnectionDetails.react';
 import accountStore from '../stores/AccountStore';
 
 var Preferences = React.createClass({
-  mixins: [Router.Navigation],
-
-  getInitialState: function () {
-    return {
-      connected: accountStore.getState().connected
-    };
-  },
-
-  componentDidMount: function () {
-    accountStore.listen(this.update);
-  },
-
-  componentWillUnmount: function () {
-    accountStore.unlisten(this.update);
-  },
-
-  update: function () {
-    if (this.isMounted()) {
-        this.setState({
-          connected: accountStore.getState().connected
-        });
-    }
-  },
+    mixins: [Router.Navigation],
 
-  render: function () {
+    getInitialState: function() {
+        return {
+            connected: accountStore.getState().connected
+        };
+    },
 
-    var toMount = <Connect />;
-    if (this.state.connected) {
-      toMount = <ConnectionDetails />;
-    }
+    componentDidMount: function() {
+        accountStore.listen(this.update);
+    },
+
+    componentWillUnmount: function() {
+        accountStore.unlisten(this.update);
+    },
+
+    update: function() {
+        if (this.isMounted()) {
+            this.setState({
+                connected: accountStore.getState().connected
+            });
+        }
+    },
 
-    return (
-      <div className="content-scroller" id="content">
-        {toMount}
-      </div>
-    );
+    render: function() {
 
-  }
+        var toMount = < Connect / > ;
+        if (this.state.connected) {
+            toMount = < ConnectionDetails / > ;
+        }
+
+        return ( < div className = "content-scroller"
+            id = "content" > {toMount} < /div>
+        );
+
+    }
 
 });
 
 
-module.exports = Preferences;
+module.exports = Preferences;
\ No newline at end of file
diff --git a/src/components/DashboardConnect.react.js b/src/components/DashboardConnect.react.js
index 2daddb4..1d34b54 100644
--- a/src/components/DashboardConnect.react.js
+++ b/src/components/DashboardConnect.react.js
@@ -1,4 +1,4 @@
-import React from 'react/addons';
+import React from 'react';
 import Router from 'react-router';
 import myip from '../utils/MyipUtil';
 
@@ -13,155 +13,174 @@ import ServerItem from './ServerListItem.react';
 import Logs from './DashboardLogs.react';
 import Settings from '../utils/SettingsUtil';
 import Credentials from '../utils/CredentialsUtil';
-
-import Cache from 'node-cache';
-let serversCache = new Cache();
+import {t} from '../utils/localizationUtil';
 
 var DashboardConnect = React.createClass({
 
-  mixins: [React.addons.LinkedStateMixin],
-
-  getInitialState: function () {
-    return {
-      connecting: accountStore.getState().connecting,
-      appReady: accountStore.getState().appReady,
-      username: Credentials.get().username,
-      password: Credentials.get().password,
-      saveCredentials: Settings.get('saveCredentials'),
-      server: Settings.get('server') || 'hub.vpn.ht',
-      servers: serverStore.getState().servers
-    };
-  },
-
-  componentDidMount: function () {
-    accountStore.listen(this.update);
-    serverStore.listen(this.updateServers);
-  },
-
-  componentWillUnmount: function () {
-    accountStore.unlisten(this.update);
-    serverStore.unlisten(this.updateServers);
-  },
-
-  update: function () {
-    if (this.isMounted()) {
+    getInitialState: function () {
+        return {
+            connecting: accountStore.getState().connecting,
+            appReady: accountStore.getState().appReady,
+            username: Credentials.get().username,
+            password: Credentials.get().password,
+            saveCredentials: Settings.get('saveCredentials'),
+            server: Settings.get('server') || 'hub.vpn.ht',
+            servers: serverStore.getState().servers
+        };
+    },
+
+    componentDidMount: function () {
+        accountStore.listen(this.update);
+        serverStore.listen(this.updateServers);
+    },
+
+    componentWillUnmount: function () {
+        accountStore.unlisten(this.update);
+        serverStore.unlisten(this.updateServers);
+    },
+
+    update: function () {
+        if (this.isMounted()) {
+            this.setState({
+                connecting: accountStore.getState().connecting,
+                appReady: accountStore.getState().appReady
+            });
+        }
+    },
+
+    updateServers: function () {
+        if (this.isMounted()) {
+            this.setState({
+                servers: serverStore.getState().servers
+            });
+        }
+    },
+
+    handleChange: function (key) {
+        return function (e) {
+            var state = {};
+            state[key] = e.target.value;
+            this.setState(state);
+        }.bind(this);
+    },
+
+    handleConnect: function (e) {
+        e.preventDefault();
+
+        if (this.state.connecting) {
+            VPN.disconnect();
+        } else {
+            if (!this.state.username) {
+                    alert(t('Username should not be left blank'));
+            } else if (!this.state.password) {
+                    alert(t('Password should not be left blank'));
+            } else if (!this.state.server) {
+                    alert(t('You should select a server'));
+            } else {
+
+                // should we save credentials ?
+                if (this.state.saveCredentials) {
+                    Credentials.save(this.state.username, this.state.password);
+                } else {
+                    // make sure to flush previous save
+                    Credentials.logout();
+                }
+
+                VPN.connect(this.state);
+            }
+        }
+    },
+
+    handleServer: function (val) {
         this.setState({
-          connecting: accountStore.getState().connecting,
-          appReady: accountStore.getState().appReady
+            server: val
         });
-    }
-  },
 
-  updateServers: function () {
-    if (this.isMounted()) {
+        // save for future use
+        Settings.save('server', val, val.value);
+    },
+
+    handleChangeSaveCredentials: function (e) {
+        var checked = e.target.checked;
         this.setState({
-          servers: serverStore.getState().servers
+            saveCredentials: checked
         });
-    }
-  },
-
-  handleConnect: function (e) {
-    e.preventDefault();
-
-    if (this.state.connecting) {
-        VPN.disconnect();
-    } else {
-        if (!this.state.username) {
-            alert('Username should not be left blank');
-        } else if (!this.state.password) {
-            alert('Password should not be left blank');
-        } else if (!this.state.server) {
-            alert('You should select a server');
-        } else {
 
-            // should we save credentials ?
-            if (this.state.saveCredentials) {
-                Credentials.save(this.state.username, this.state.password);
-            } else {
-                // make sure to flush previous save
-                Credentials.logout();
-            }
+        // clear username/pw
+        if (!checked) {
+            Credentials.logout();
+            this.setState({
+                username: '',
+                password: ''
+            });
+        }
+
+        // save for future use
+        Settings.save('saveCredentials', !!checked);
+    },
 
-            VPN.connect(this.state);
+    handleKeyPress: function (e) {
+        if (e.key === 'Enter') {
+            this.handleConnect(e);
         }
-    }
-  },
-
-  handleServer: function (val) {
-    this.setState({
-      server: val
-    });
-
-    // save for future use
-    Settings.save('server', val);
-  },
-
-  handleChangeSaveCredentials: function (e) {
-    var checked = e.target.checked;
-    this.setState({
-      saveCredentials: checked
-    });
-
-    // save for future use
-    Settings.save('saveCredentials', !!checked);
-  },
-
-  render: function () {
-    var currentStatus = 'Loading...';
-    if (this.state.appReady) {
-        if (this.state.connecting) {
-            currentStatus = 'Connecting...';
-        } else {
-            currentStatus = 'Disconnected';
+    },
+
+    render: function () {
+        var currentStatus = t('Loading...');
+        if (this.state.appReady) {
+            if (this.state.connecting) {
+                    currentStatus = t('Connecting...');
+            } else {
+                    currentStatus = t('Disconnected');
+            }
         }
-    }
 
     return (
-        <div>
-
-          <section>
-            <h1 className="title">VPN connection status</h1>
-            <div className="connectionstatus">
-                <i className={this.state.connecting ? 'ion-ios-loop spin' : 'ion-ios-close-empty disconnected'}></i>
-                <p>{currentStatus}</p>
+            <div>
+
+                <section>
+                    <h1 className="title">{t('VPN connection status')}</h1>
+                    <div className="connectionstatus">
+                        <i className={this.state.connecting ? 'ion-ios-loop spin' : 'ion-ios-close-empty disconnected'}></i>
+                        <p>{currentStatus}</p>
+                    </div>
+                    <button disabled={!this.state.appReady} className="right" onClick={this.handleConnect}>
+                        <p>{this.state.connecting ? t('cancel') : t('connect to vpn')}</p>
+                    </button>
+                </section>
+
+                <section>
+                    <h1 className="title">{t('Login')}</h1>
+                    <input name="username" disabled={!this.state.appReady} value={this.state.username || ''} onChange={this.handleChange('username')} placeholder={t('Username')} type="text" />
+                    <input name="password" disabled={!this.state.appReady} value={this.state.password || ''} onChange={this.handleChange('password')} onKeyPress={this.handleKeyPress} placeholder={t('Password')} type="password" />
+                    <div className="checkbox">
+                        <input type="checkbox" disabled={!this.state.appReady} checked={this.state.saveCredentials} onChange={this.handleChangeSaveCredentials} id="saveCredentials" />
+                        <label htmlFor="saveCredentials">
+                            <p>{t('Remember my username and password')}</p>
+                        </label>
+                    </div>
+                </section>
+
+                <section>
+                    <h1 className="title">{t('Servers')}</h1>
+                    <Select
+                        disabled={!this.state.appReady}
+                        name="server"
+                        value={this.state.server}
+                        options={this.state.servers}
+                        onChange={this.handleServer}
+                        placeholder={t('Select server')}
+                        optionComponent={ServerOption}
+                        valueComponent={ServerItem}
+                        searchable={false}
+                        clearable={false}
+                    />
+                </section>
+
+                <Logs />
             </div>
-            <button disabled={!this.state.appReady} className="right" onClick={this.handleConnect}>
-                <p>{this.state.connecting ? 'cancel' : 'connect to vpn'}</p>
-            </button>
-          </section>
-
-          <section>
-            <h1 className="title">Login</h1>
-            <input name="username" disabled={!this.state.appReady} valueLink={this.linkState('username')} placeholder="Username" type="text" />
-            <input name="password" disabled={!this.state.appReady} valueLink={this.linkState('password')} placeholder="Password" type="password" />
-            <div className="checkbox">
-                <input type="checkbox" disabled={!this.state.appReady} checked={this.state.saveCredentials} onChange={this.handleChangeSaveCredentials} id="saveCredentials" />
-                <label htmlFor="saveCredentials"></label>
-                <p>Remember my username and password</p>
-            </div>
-          </section>
-
-          <section>
-            <h1 className="title">Servers</h1>
-            <Select
-                    disabled={!this.state.appReady}
-                    name="server"
-                    value={this.state.server}
-					onOptionLabelClick={this.onLabelClick}
-                    options={this.state.servers}
-                    onChange={this.handleServer}
-					placeholder="Select server"
-					optionComponent={ServerOption}
-					singleValueComponent={ServerItem}
-                    searchable={false}
-                    clearable={false}
-            />
-          </section>
-
-          <Logs />
-        </div>
-    );
-  }
+        );
+    }
 
 });
 
diff --git a/src/components/DashboardConnectionDetails.react.js b/src/components/DashboardConnectionDetails.react.js
index 4ded958..1f249ae 100644
--- a/src/components/DashboardConnectionDetails.react.js
+++ b/src/components/DashboardConnectionDetails.react.js
@@ -1,7 +1,8 @@
-import React from 'react/addons';
+import React from 'react';
 import Router from 'react-router';
 import VPN from '../actions/VPNActions';
 import util from '../utils/Util';
+import {t} from '../utils/localizationUtil';
 import Logs from './DashboardLogs.react';
 
 import accountStore from '../stores/AccountStore';
@@ -43,8 +44,8 @@ var DashboardConnectionDetails = React.createClass({
     var download = util.bytesToSize(this.state.bytecount[0]);
     var upload = util.bytesToSize(this.state.bytecount[1]);
 
-    var location = 'Loading...';
-    var myip = this.state.myip.ip || 'Loading...';
+    var location = t('Loading...');
+    var myip = this.state.myip.ip || t('Loading...');
 
     if (this.state.myip.advanced) {
         var city = this.state.myip.advanced.city || false;
@@ -65,30 +66,30 @@ var DashboardConnectionDetails = React.createClass({
     return (
         <div>
             <section>
-                <h1 className="title">VPN connection status</h1>
+                <h1 className="title">{t('VPN connection status')}</h1>
                 <div className="connectionstatus">
                     <i className="ion-ios-checkmark-empty connected"></i>
-                    <p>Connected - {duration}</p>
+                    <p>{t('Connected')} - {duration}</p>
                 </div>
                 <button className="right" onClick={this.handleDisconnect}>
-                    <p>disconnect vpn</p>
+                    <p>{t('disconnect vpn')}</p>
                 </button>
             </section>
 
             <section className="ipOverview">
-                <h1 className="title">IP and Country Overview</h1>
-                <p>Your New IP Address:</p><span>{myip}</span>
+                <h1 className="title">{t('IP and Country Overview')}</h1>
+                <p>{t('Your New IP Address:')}</p><span>{myip}</span>
                 <div></div>
-                <p>Your New ISP Location:</p><i className={countryFlag}></i><span>{location}</span>
+                <p>{t('Your New ISP Location:')}</p><i className={countryFlag}></i><span>{location}</span>
             </section>
 
             <section>
-                <h1 className="title">Quick IP Address Management</h1>
+                <h1 className="title">{t('Quick IP Address Management')}</h1>
                 <button className="left">
-                    <p>Change IP Address</p>
+                    <p>{t('Change IP Address')}</p>
                 </button>
                 <button className="left">
-                    <p>Verify new IP Address</p>
+                    <p>{t('Verify new IP Address')}</p>
                 </button>
             </section>
 
diff --git a/src/components/DashboardLogs.react.js b/src/components/DashboardLogs.react.js
index 96418fd..d2a1787 100644
--- a/src/components/DashboardLogs.react.js
+++ b/src/components/DashboardLogs.react.js
@@ -1,5 +1,9 @@
-import React from 'react/addons';
+import React from 'react';
+import ReactDOM from 'react-dom';
 import Router from 'react-router';
+import {remote} from 'electron';
+import fs from 'fs';
+import {t} from '../utils/localizationUtil';
 
 import LogStore from '../stores/LogStore';
 
@@ -7,95 +11,98 @@ var _prevBottom = 0;
 
 var DashboardLogs = React.createClass({
 
-  getInitialState: function () {
-    return {
-      logs: []
-    };
-  },
-
-  componentDidMount: function() {
-    this.update();
-    this.scrollToBottom();
-    LogStore.on(LogStore.SERVER_LOGS_EVENT, this.update);
-  },
-
-  componentDidUpdate: function () {
-    this.scrollToBottom();
-  },
-
-  componentWillUnmount: function() {
-    LogStore.removeListener(LogStore.SERVER_LOGS_EVENT, this.update);
-  },
-
-  scrollToBottom: function () {
-    var textarea = React.findDOMNode(this.refs.logsTextarea);
-    textarea.scrollTop = textarea.scrollHeight;
-  },
-
-  update: function () {
-    if (this.isMounted()) {
-        this.setState({
-          logs: LogStore.logs()
-        });
-    }
-  },
-
-  handleCopyClipboard: function () {
-
-    require('remote')
-        .require('clipboard')
-        .writeText(this.state.logs.join("\n"));
-
-    require('remote')
-        .require('dialog')
-        .showMessageBox({
-            type:'info',
-            title: 'Log Copied',
-            buttons: ['OK'],
-            message: 'Your log file has been copied successfully.'
-        });
-  },
-
-  handleExportLogs: function() {
-    var args = {
-        title: 'Select path for log file',
-        filters: [{ name: 'Log files', extensions: ['log'] }]
-    };
-
-    var dialog = require('remote').require('dialog');
-    var self = this;
-
-    dialog.showSaveDialog(args,function(filename) {
-        require('fs')
-            .writeFile(filename, self.state.logs.join("\n"), function (err) {
+    getInitialState: function() {
+        return {
+            logs: []
+        };
+    },
+
+    componentDidMount: function() {
+        this.update();
+        this.scrollToBottom();
+        LogStore.on(LogStore.SERVER_LOGS_EVENT, this.update);
+    },
+
+    componentDidUpdate: function() {
+        this.scrollToBottom();
+    },
+
+    componentWillUnmount: function() {
+        LogStore.removeListener(LogStore.SERVER_LOGS_EVENT, this.update);
+    },
+
+    scrollToBottom: function() {
+        var textarea = ReactDOM.findDOMNode(this.refs.logsTextarea);
+        textarea.scrollTop = textarea.scrollHeight;
+    },
+
+    update: function() {
+        if (this.isMounted()) {
+            this.setState({
+                logs: LogStore.logs()
+            });
+        }
+    },
+
+    handleCopyClipboard: function() {
+
+        remote
+            .clipboard
+            .writeText(this.state.logs.join("\n"));
+
+        remote
+            .dialog
+            .showMessageBox({
+                type: 'info',
+                title: t('Log Copied'),
+                buttons: [t('OK')],
+                message: t('Your log file has been copied successfully.')
+            });
+    },
+
+    handleExportLogs: function() {
+        var args = {
+            title: t('Select path for log file'),
+            filters: [{
+                name: t('Log files'),
+                extensions: ['log']
+            }]
+        };
+
+        var dialog = remote.dialog;
+        var self = this;
+
+        dialog.showSaveDialog(args, function(filename) {
+            fs.writeFile(filename, self.state.logs.join("\n"), function(err) {
                 if (err) {
-                    dialog.showErrorBox('Unable to save log path', 'Looks like we can\'t save the log file. Try again with another path.')
+                    dialog.showErrorBox(t('Unable to save log path'), t("Looks like we can't save the log file. Try again with another path."))
                 } else {
                     dialog.showMessageBox({
-                        type:'info',
-                        title: 'Log saved !',
-                        buttons: ['OK'],
-                        message: 'Your log file has been saved successfully.'
+                        type: 'info',
+                        title: t('Log saved!'),
+                        buttons: [t('OK')],
+                        message: t('Your log file has been saved successfully.')
                     });
                 }
 
             });
-    })
-  },
-
-  render: function () {
-
-    var logs = this.state.logs.join("\n");
-
-    return (
-        <section>
-            <h1 className="title">Connection report</h1>
-            <textarea ref="logsTextarea" className="logs" name="description" value={logs} readOnly />
-            <button className="left" type="submit" onClick={this.handleExportLogs}><p>Export</p></button>
-            <button className="left" type="submit" onClick={this.handleCopyClipboard}><p>Copy to clipboard</p></button>
-        </section>
-    );
-  }
+        })
+    },
+
+    render: function() {
+
+        var logs = this.state.logs.join("\n");
+
+        return (
+            <section>
+                <h1 className="title">{t('Connection report')}</h1>
+                <textarea ref="logsTextarea" className="logs" name="description" value={logs} readOnly />
+                <button className="left" type="submit" onClick={this.handleExportLogs}><p>{t('Export')}</p></button>
+                <button className="left" type="submit" onClick={this.handleCopyClipboard}><p>{t('Copy to clipboard')}</p></button>
+            </section>
+        );
+
+    }
 });
 
-module.exports = DashboardLogs;
+module.exports = DashboardLogs;
\ No newline at end of file
diff --git a/src/components/Framework.react.js b/src/components/Framework.react.js
index 6d132b6..8b47fb8 100644
--- a/src/components/Framework.react.js
+++ b/src/components/Framework.react.js
@@ -6,91 +6,94 @@ import Sidebar from './Sidebar.react';
 import Header from './Header.react';
 import SubHeader from './SubHeader.react';
 import metrics from '../utils/MetricsUtil';
-import shell from 'shell';
+import {
+    shell
+}
+from 'electron';
 import RetinaImage from 'react-retina-image';
 
 var Client = React.createClass({
-  contextTypes: {
-    router: React.PropTypes.func
-  },
+    contextTypes: {
+        router: React.PropTypes.func
+    },
 
-  getInitialState: function () {
-    return {
-      sidebarOffset: 0
-    };
-  },
+    getInitialState: function() {
+        return {
+            sidebarOffset: 0
+        };
+    },
 
-  handleScroll: function (e) {
-    if (e.target.scrollTop > 0 && !this.state.sidebarOffset) {
-      this.setState({
-        sidebarOffset: e.target.scrollTop
-      });
-    } else if (e.target.scrollTop === 0 && this.state.sidebarOffset) {
-      this.setState({
-        sidebarOffset: 0
-      });
-    }
-  },
+    handleScroll: function(e) {
+        if (e.target.scrollTop > 0 && !this.state.sidebarOffset) {
+            this.setState({
+                sidebarOffset: e.target.scrollTop
+            });
+        } else if (e.target.scrollTop === 0 && this.state.sidebarOffset) {
+            this.setState({
+                sidebarOffset: 0
+            });
+        }
+    },
 
-  handleClickPreferences: function () {
-    metrics.track('Opened Preferences', {
-      from: 'app'
-    });
-    this.context.router.transitionTo('preferences');
-  },
+    handleClickPreferences: function() {
+        metrics.track('Opened Preferences', {
+            from: 'app'
+        });
+        this.context.router.transitionTo('preferences');
+    },
 
-  handleClickReportIssue: function () {
-    metrics.track('Opened Issue Reporter', {
-      from: 'app'
-    });
-    shell.openExternal('https://github.com/vpnht/desktop/issues/new');
-  },
+    handleClickReportIssue: function() {
+        metrics.track('Opened Issue Reporter', {
+            from: 'app'
+        });
+        shell.openExternal('https://github.com/vpnht/desktop/issues/new');
+    },
 
-  handleMouseEnterReportIssue: function () {
-    this.setState({
-      currentButtonLabel: 'Report an issue or suggest feedback.'
-    });
-  },
+    handleMouseEnterReportIssue: function() {
+        this.setState({
+            currentButtonLabel: 'Report an issue or suggest feedback.'
+        });
+    },
 
-  handleMouseLeaveReportIssue: function () {
-    this.setState({
-      currentButtonLabel: ''
-    });
-  },
+    handleMouseLeaveReportIssue: function() {
+        this.setState({
+            currentButtonLabel: ''
+        });
+    },
 
-  handleMouseEnterPreferences: function () {
-    this.setState({
-      currentButtonLabel: 'Change app preferences.'
-    });
-  },
+    handleMouseEnterPreferences: function() {
+        this.setState({
+            currentButtonLabel: 'Change app preferences.'
+        });
+    },
 
-  handleMouseLeavePreferences: function () {
-    this.setState({
-      currentButtonLabel: ''
-    });
-  },
+    handleMouseLeavePreferences: function() {
+        this.setState({
+            currentButtonLabel: ''
+        });
+    },
 
-  render: function () {
-    var sidebarHeaderClass = 'sidebar-header';
-    if (this.state.sidebarOffset) {
-      sidebarHeaderClass += ' sep';
-    }
+    render: function() {
+        var sidebarHeaderClass = 'sidebar-header';
+        if (this.state.sidebarOffset) {
+            sidebarHeaderClass += ' sep';
+        }
 
-    var container = this.context.router.getCurrentParams().name ? this.state.containers[this.context.router.getCurrentParams().name] : {};
-    return (
-      <div>
-        <Header />
-        <SubHeader />
-        <div className="content-container">
-          <Sidebar />
-          <Router.RouteHandler />
-        </div>
-        <footer>
-            <RetinaImage className="footerimg" src="FooterIllustration.png"/>
-        </footer>
-      </div>
-    );
-  }
+        var container = this.context.router.getCurrentParams().name ? this.state.containers[this.context.router.getCurrentParams().name] : {};
+        return (
+            <div>
+                <Header />
+                <SubHeader />
+                <div className="content-container">
+                    <Sidebar />
+                    <Router.RouteHandler />
+                </div>
+                <footer>
+                    <RetinaImage className="footerimg" src="FooterIllustration.png"/>
+                </footer>
+            </div>
+        );
+    }
 });
 
-module.exports = Client;
+module.exports = Client;
\ No newline at end of file
diff --git a/src/components/Header.react.js b/src/components/Header.react.js
index 5baeb1e..9c7f5a8 100644
--- a/src/components/Header.react.js
+++ b/src/components/Header.react.js
@@ -1,7 +1,6 @@
-import React from 'react/addons';
-import remote from 'remote';
+import React from 'react';
+import {remote, ipcRenderer} from 'electron';
 import RetinaImage from 'react-retina-image';
-import ipc from 'ipc';
 import util from '../utils/Util';
 import metrics from '../utils/MetricsUtil';
 import accountStore from '../stores/AccountStore';
@@ -9,141 +8,139 @@ import Router from 'react-router';
 import classNames from 'classnames';
 import Settings from '../utils/SettingsUtil';
 
-var autoUpdater = remote.require('auto-updater');
-var app = remote.require('app');
-var Menu = remote.require('menu');
-var MenuItem = remote.require('menu-item');
+var app = remote.app;
+var Menu = remote.menu;
+var MenuItem = remote.menuItem;
 
 var Header = React.createClass({
-  mixins: [Router.Navigation],
-  getInitialState: function () {
-    return {
-      fullscreen: false,
-      updateAvailable: false,
-      username: accountStore.getState().username,
-      connected: accountStore.getState().connected
-    };
-  },
-  componentDidMount: function () {
-    document.addEventListener('keyup', this.handleDocumentKeyUp, false);
+    mixins: [Router.Navigation],
+    getInitialState: function () {
+        return {
+            fullscreen: false,
+            updateAvailable: false,
+            username: accountStore.getState().username,
+            connected: accountStore.getState().connected
+        };
+    },
+    componentDidMount: function () {
+        document.addEventListener('keyup', this.handleDocumentKeyUp, false);
 
-    accountStore.listen(this.update);
+        accountStore.listen(this.update);
 
-    ipc.on('application:update-available', () => {
-      this.setState({
-        updateAvailable: true
-      });
-    });
-    autoUpdater.checkForUpdates();
-  },
-  componentWillUnmount: function () {
-    document.removeEventListener('keyup', this.handleDocumentKeyUp, false);
-    accountStore.unlisten(this.update);
-  },
-  update: function () {
-    let accountState = accountStore.getState();
-    if (this.isMounted()) {
-        this.setState({
-          username: accountState.username,
-          connected: accountState.connected
+        ipcRenderer.on('application:update-available', () => {
+            this.setState({
+                updateAvailable: true
+            });
         });
-    }
-  },
-  handleDocumentKeyUp: function (e) {
-    if (e.keyCode === 27 && remote.getCurrentWindow().isFullScreen()) {
-      remote.getCurrentWindow().setFullScreen(false);
-      this.forceUpdate();
-    }
-  },
-  handleClose: function () {
-
-    if (!util.isWindows()) {
-      app.dock.hide();
-    }
+    },
+    componentWillUnmount: function () {
+        document.removeEventListener('keyup', this.handleDocumentKeyUp, false);
+        accountStore.unlisten(this.update);
+    },
+    update: function () {
+        let accountState = accountStore.getState();
+        if (this.isMounted()) {
+                this.setState({
+                    username: accountState.username,
+                    connected: accountState.connected
+                });
+        }
+    },
+    handleDocumentKeyUp: function (e) {
+        if (e.keyCode === 27 && remote.getCurrentWindow().isFullScreen()) {
+            remote.getCurrentWindow().setFullScreen(false);
+            this.forceUpdate();
+        }
+    },
+    handleClose: function () {
 
-    remote.getCurrentWindow().hide();
+        if (!util.isWindows()) {
+            app.dock.hide();
+        }
 
-  },
-  handleMinimize: function () {
-    if(Settings.get('minToTaskbar'))
-      remote.getCurrentWindow().minimize();
-    else
-      remote.getCurrentWindow().hide();
-  },
-  handleFullscreen: function () {},
+        remote.getCurrentWindow().hide();
 
-  handleFullscreenHover: function () {
-    this.update();
-  },
-  handleAutoUpdateClick: function () {
-    metrics.track('Restarted to Update');
-    ipc.send('application:quit-install');
-  },
-  renderWindowButtons: function () {
-    let buttons;
-    if (util.isWindows()) {
-      buttons = (
-        <div className="windows-buttons">
-        <div className="windows-button button-minimize enabled" onClick={this.handleMinimize}><div className="icon"></div></div>
-        <div className="windows-button button-close enabled" onClick={this.handleClose}></div>
-        </div>
-      );
-    } else {
-      buttons = (
-        <div className="buttons">
-        <div className="button button-close enabled" onClick={this.handleClose}></div>
-        <div className="button button-minimize enabled" onClick={this.handleMinimize}></div>
-        <div className="button button-fullscreen disabled" onClick={this.handleFullscreen}></div>
-        </div>
-      );
-    }
-    return buttons;
-  },
-  renderDashboardHeader: function () {
-    let headerClasses = classNames({
-      bordered: !this.props.hideLogin,
-      header: true,
-      'no-drag': true
-    });
-    let updateWidget = this.state.updateAvailable && !this.props.hideLogin ? <a className="btn btn-action small no-drag" onClick={this.handleAutoUpdateClick}>UPDATE NOW</a> : null;
-    return (
-      <div className={headerClasses}>
-        <div className="left-header">
-          {util.isWindows () ? null : this.renderWindowButtons()}
-        </div>
-        <div className="right-header">
-          <div className="updates">
-            {updateWidget}
-          </div>
-          {util.isWindows () ? this.renderWindowButtons() : null}
-        </div>
-      </div>
-    );
-  },
-  renderBasicHeader: function () {
-    let headerClasses = classNames({
-      bordered: !this.props.hideLogin,
-      header: true,
-      'no-drag': true
-    });
-    return (
-      <div className={headerClasses}>
-        <div className="left-header">
-          {util.isWindows () ? null : this.renderWindowButtons()}
-        </div>
-        <div className="right-header">
-          {util.isWindows () ? this.renderWindowButtons() : null}
-        </div>
-      </div>
-    );
-  },
-  render: function () {
-    if (this.props.hideLogin) {
-      return this.renderBasicHeader();
-    } else {
-      return this.renderDashboardHeader();
+    },
+    handleMinimize: function () {
+        if(Settings.get('minToTaskbar')) {
+            remote.getCurrentWindow().minimize();
+        } else {
+            remote.getCurrentWindow().hide();
+        }
+    },
+    handleFullscreen: function () {},
+    handleFullscreenHover: function () {
+        this.update();
+    },
+    handleAutoUpdateClick: function () {
+        metrics.track('Restarted to Update');
+        ipcRenderer.send('application:quit-install');
+    },
+    renderWindowButtons: function () {
+        let buttons;
+        if (util.isWindows()) {
+            buttons = (
+                <div className="windows-buttons">
+                <div className="windows-button button-minimize enabled" onClick={this.handleMinimize}><div className="icon"></div></div>
+                <div className="windows-button button-close enabled" onClick={this.handleClose}></div>
+                </div>
+            );
+        } else {
+            buttons = (
+                <div className="buttons">
+                <div className="button button-close enabled" onClick={this.handleClose}></div>
+                <div className="button button-minimize enabled" onClick={this.handleMinimize}></div>
+                <div className="button button-fullscreen disabled" onClick={this.handleFullscreen}></div>
+                </div>
+            );
+        }
+        return buttons;
+    },
+    renderDashboardHeader: function () {
+        let headerClasses = classNames({
+            bordered: !this.props.hideLogin,
+            header: true,
+            'no-drag': true
+        });
+        let updateWidget = this.state.updateAvailable && !this.props.hideLogin ? <a className="btn btn-action small no-drag" onClick={this.handleAutoUpdateClick}>UPDATE NOW</a> : null;
+        return (
+            <div className={headerClasses}>
+                <div className="left-header">
+                    {util.isWindows () ? null : this.renderWindowButtons()}
+                </div>
+                <div className="right-header">
+                    <div className="updates">
+                        {updateWidget}
+                    </div>
+                    {util.isWindows () ? this.renderWindowButtons() : null}
+                </div>
+            </div>
+        );
+    },
+    renderBasicHeader: function () {
+        let headerClasses = classNames({
+            bordered: !this.props.hideLogin,
+            header: true,
+            'no-drag': true
+        });
+        return (
+            <div className={headerClasses}>
+                <div className="left-header">
+                    {util.isWindows () ? null : this.renderWindowButtons()}
+                </div>
+                <div className="right-header">
+                    {util.isWindows () ? this.renderWindowButtons() : null}
+                </div>
+            </div>
+        );
+    },
+    render: function () {
+        if (this.props.hideLogin) {
+            return this.renderBasicHeader();
+        } else {
+            return this.renderDashboardHeader();
+        }
     }
-  }
 });
 
 module.exports = Header;
diff --git a/src/components/Preferences.react.js b/src/components/Preferences.react.js
index 032bf6b..a353d3d 100755
--- a/src/components/Preferences.react.js
+++ b/src/components/Preferences.react.js
@@ -1,268 +1,299 @@
-import React from 'react/addons';
+import React from 'react';
 import metrics from '../utils/MetricsUtil';
 import Router from 'react-router';
 import Select from 'react-select';
 import VPN from '../utils/VPNUtil';
 import Settings from '../utils/SettingsUtil';
+import {
+    t
+}
+from '../utils/localizationUtil';
 
 var Preferences = React.createClass({
-  mixins: [Router.Navigation],
-  getInitialState: function () {
-    return {
-      metricsEnabled: metrics.enabled(),
-      launchStartup: Settings.get('launchStartup'),
-      launchStartupHidden: Settings.get('launchStartupHidden'),
-      connectLaunch: Settings.get('connectLaunch'),
-      saveCredentials: Settings.get('saveCredentials'),
-      autoPath: Settings.get('autoPath'),
-      disableSmartdns: Settings.get('disableSmartdns') ,
-      encryption: Settings.get('encryption') || 128,
-      customPort: Settings.get('customPort') || 'default',
-      minToTaskbar: Settings.get('minToTaskbar')
-  	};
-  },
-
-  handleChangeMetricsEnabled: function (e) {
-    var checked = e.target.checked;
-    this.setState({
-      metricsEnabled: checked
-    });
-    metrics.setEnabled(checked);
-    metrics.track('Toggled util/MetricsUtil', {
-      enabled: checked
-    });
-  },
-
-  handleChangeLaunchStartup: function (e) {
-
-    var checked = e.target.checked;
-    this.setState({
-      launchStartup: checked
-    });
-
-    if (checked) {
-        VPN.enableStartOnBoot(this.state.launchStartupHidden);
-    } else {
-        VPN.disableStartOnBoot();
-    }
-
-    // save for future use
-    Settings.save('launchStartup', checked);
-
-  },
-
-
-  handleChangeLaunchStartupHidden: function (e) {
-
-    var checked = e.target.checked;
-    this.setState({
-      launchStartupHidden: checked
-    });
-
-    if (checked) {
-        VPN.enableStartOnBoot(true);
-    } else {
-        VPN.disableStartOnBoot();
-    }
-
-    // save for future use
-    Settings.save('launchStartupHidden', checked);
+    mixins: [Router.Navigation],
+    getInitialState: function() {
+        return {
+            metricsEnabled: metrics.enabled(),
+            launchStartup: Settings.get('launchStartup'),
+            launchStartupHidden: Settings.get('launchStartupHidden'),
+            connectLaunch: Settings.get('connectLaunch'),
+            saveCredentials: Settings.get('saveCredentials'),
+            autoPath: Settings.get('autoPath'),
+            disableSmartdns: Settings.get('disableSmartdns'),
+            encryption: Settings.get('encryption') || 128,
+            customPort: Settings.get('customPort') || 'default',
+            minToTaskbar: Settings.get('minToTaskbar')
+        };
+    },
 
-  },
+    handleChangeMetricsEnabled: function(e) {
+        var checked = e.target.checked;
+        this.setState({
+            metricsEnabled: checked
+        });
+        metrics.setEnabled(checked);
+        metrics.track('Toggled util/MetricsUtil', {
+            enabled: checked
+        });
+    },
 
-  handleChangeDisableSmartdns: function (e) {
+    handleChangeLaunchStartup: function(e) {
 
-    var checked = e.target.checked;
-    this.setState({
-      disableSmartdns: checked
-    });
+        var checked = e.target.checked;
+        this.setState({
+            launchStartup: checked
+        });
 
-    // save for future use
-    Settings.save('disableSmartdns', checked);
+        if (checked) {
+            VPN.enableStartOnBoot(this.state.launchStartupHidden);
+        } else {
+            VPN.disableStartOnBoot();
+        }
 
-  },
+        // save for future use
+        Settings.save('launchStartup', checked);
 
-  handleChangeMinToTaskbar: function (e) {
+    },
 
-    var checked = e.target.checked;
-    this.setState({
-      minToTaskbar: checked
-    });
 
-    // save for future use
-    Settings.save('minToTaskbar', checked);
+    handleChangeLaunchStartupHidden: function(e) {
 
-  },
-
-
-  handleChangeConnectLaunch: function (e) {
-
-    var checked = e.target.checked;
-    this.setState({
-      connectLaunch: checked
-    });
-
-    // save for future use
-    Settings.save('connectLaunch', checked);
-
-  },
-
-  handleChangeAutoPath: function (e) {
-
-    var checked = e.target.checked;
-    this.setState({
-      autoPath: checked
-    });
-
-    // 64b not available with autoPath
-    if (this.state.encryption == 64) {
-        this.handleEncryptionChange(128);
-    }
+        var checked = e.target.checked;
+        this.setState({
+            launchStartupHidden: checked
+        });
 
-    // save for future use
-    Settings.save('autoPath', checked);
+        if (checked) {
+            VPN.enableStartOnBoot(true);
+        } else {
+            VPN.disableStartOnBoot();
+        }
 
-  },
+        // save for future use
+        Settings.save('launchStartupHidden', checked);
 
-  handleEncryptionChange: function (encryption) {
+    },
 
-    this.setState({encryption});
-    this.handlePortChange('default');
-    Settings.save('encryption', encryption);
+    handleChangeDisableSmartdns: function(e) {
 
-  },
+        var checked = e.target.checked;
+        this.setState({
+            disableSmartdns: checked
+        });
 
-  handlePortChange: function (customPort) {
-
-    this.setState({customPort});
-    Settings.save('customPort', customPort);
-
-  },
-
-
-
-  render: function () {
-
-
-    var encryptions;
-    var ports;
-
-    if (this.state.autoPath) {
-        encryptions = [
-            { value: 128, label: '128 BIT AES' },
-            { value: 256, label: '256 BIT AES' }
-        ];
-    } else {
-        encryptions = [
-            { value: 64, label: '64 BIT BLOWFISH' },
-            { value: 128, label: '128 BIT AES' },
-            { value: 256, label: '256 BIT AES' }
-        ];
-    }
-
-
-    if (this.state.encryption == 64) {
-        ports = [
-            { value: 'default', label: 'UDP - Default' }
-        ];
-    } else if (this.state.encryption == 128) {
-        ports = [
-            { value: 'default', label: 'UDP - Default' },
-            { value: 53, label: 'UDP - 53' },
-            { value: 443, label: 'TCP - 443' },
-            { value: 80, label: 'TCP - 80' }
-        ];
-    } else if (this.state.encryption == 256) {
-        ports = [
-            { value: 'default', label: 'UDP - Default' },
-            { value: 3389, label: 'UDP - 3389' }
-        ];
-    }
+        // save for future use
+        Settings.save('disableSmartdns', checked);
 
+    },
+
+    handleChangeMinToTaskbar: function(e) {
+
+        var checked = e.target.checked;
+        this.setState({
+            minToTaskbar: checked
+        });
+
+        // save for future use
+        Settings.save('minToTaskbar', checked);
+
+    },
+
+
+    handleChangeConnectLaunch: function(e) {
+
+        var checked = e.target.checked;
+        this.setState({
+            connectLaunch: checked
+        });
+
+        // save for future use
+        Settings.save('connectLaunch', checked);
+
+    },
+
+    handleChangeAutoPath: function(e) {
+
+        var checked = e.target.checked;
+        this.setState({
+            autoPath: checked
+        });
+
+        // 64b not available with autoPath
+        if (this.state.encryption == 64) {
+            this.handleEncryptionChange(128);
+        }
+
+        // save for future use
+        Settings.save('autoPath', checked);
+
+    },
+
+    handleEncryptionChange: function(encryption) {
+
+        this.setState({
+            encryption: encryption.value
+        });
+        this.handlePortChange({value:'default'});
+        Settings.save('encryption', encryption.value);
+
+    },
+
+    handlePortChange: function(customPort) {
+
+        this.setState({
+            customPort: customPort.value
+        });
+        Settings.save('customPort', customPort.value);
+
+    },
+
+
+
+    render: function() {
+
+
+        var encryptions;
+        var ports;
+
+        if (this.state.autoPath) {
+            encryptions = [{
+                value: 128,
+                label: '128 BIT AES'
+            }, {
+                value: 256,
+                label: '256 BIT AES'
+            }];
+        } else {
+            encryptions = [{
+                value: 64,
+                label: '64 BIT BLOWFISH'
+            }, {
+                value: 128,
+                label: '128 BIT AES'
+            }, {
+                value: 256,
+                label: '256 BIT AES'
+            }];
+        }
+
+        if (this.state.encryption == 64) {
+            ports = [{
+                value: 'default',
+                label: 'UDP - ' + t('Default')
+            }];
+        } else if (this.state.encryption == 128) {
+            ports = [{
+                value: 'default',
+                label: 'UDP - ' + t('Default')
+            }, {
+                value: 53,
+                label: 'UDP - 53'
+            }, {
+                value: 443,
+                label: 'TCP - 443'
+            }, {
+                value: 80,
+                label: 'TCP - 80'
+            }];
+        } else if (this.state.encryption == 256) {
+            ports = [{
+                value: 'default',
+                label: 'UDP - ' + t('Default')
+            }, {
+                value: 3389,
+                label: 'UDP - 3389'
+            }];
+        }
+
+
+        var customPort = "";
+        if (!this.state.autoPath) {
+            customPort = (
+                <section className="preferences">
+                    <h1 className="title">{t('Custom Port')}</h1>
+                    <div className="selectbox">
+                        <Select
+                            name="customPort"
+                            value={this.state.customPort}
+                            options={ports}
+                            onChange={this.handlePortChange}
+                            searchable={false}
+                            clearable={false}
+                        />
+                    </div>
+                </section>
+            );
+        }
+
+        return (
+            <div className="content-scroller" id="content">
+                <section>
+                        <h1 className="title">{t('General')}</h1>
+                        <div className="checkbox">
+                            <input id="reportAnon" type="checkbox" checked={this.state.metricsEnabled} onChange={this.handleChangeMetricsEnabled}/>
+                            <label htmlFor="reportAnon">
+                                <p>{t('Report anonymous usage analytics')}</p>
+                            </label>
+                        </div>
+                        <div className="checkbox">
+                            <input id="saveCredentials" disabled={!this.state.saveCredentials}  type="checkbox" checked={this.state.connectLaunch && this.state.saveCredentials} onChange={this.handleChangeConnectLaunch}/>
+                            <label htmlFor="saveCredentials">
+                                <p>{t('Auto-connect after launch (requires a saved user/pass)')}</p>
+                            </label>
+                        </div>
+                        <div className="checkbox">
+                            <input id="launchStartup" type="checkbox" checked={this.state.launchStartup} onChange={this.handleChangeLaunchStartup}/>
+                            <label htmlFor="launchStartup">
+                                <p>{t('Launch on operating system startup')}</p>
+                            </label>
+                        </div>
+                        <div className="checkbox">
+                            <input id="launchStartupHidden" type="checkbox" checked={this.state.launchStartupHidden} onChange={this.handleChangeLaunchStartupHidden}/>
+                            <label htmlFor="launchStartupHidden">
+                                <p>{t('Launch on operating system startup hidden')}</p>
+                            </label>
+                        </div>
+                        <div className="checkbox">
+                            <input id="disableSmartdns" type="checkbox" checked={this.state.disableSmartdns} onChange={this.handleChangeDisableSmartdns}/>
+                            <label htmlFor="disableSmartdns">
+                                <p>{t('Disable SmartDNS')}</p>
+                            </label>
+                        </div>
+                        <div className="checkbox">
+                            <input id="minToTaskbar" type="checkbox" checked={this.state.minToTaskbar} onChange={this.handleChangeMinToTaskbar}/>
+                            <label htmlFor="minToTaskbar">
+                                <p>{t('Minimize to taskbar')}</p>
+                            </label>
+                        </div>
+                </section>
+                <section className="preferences">
+                    <h1 className="title">{t('Encryption')}</h1>
+                    <div className="selectbox">
+                        <Select
+                            name="encryption"
+                            value={this.state.encryption}
+                            options={encryptions}
+                            onChange={this.handleEncryptionChange}
+                            searchable={false}
+                            clearable={false}
+                        />
+                    </div>
+                </section>
+                {customPort}
+                <section className="preferences">
+                    <h1 className="title">{t('Auto Path')}</h1>
+                    <div className="checkbox">
+                        <input type="checkbox" id="autopath" checked={this.state.autoPath} onChange={this.handleChangeAutoPath} />
+                        <label htmlFor="autopath">
+                            <p>{this.state.autoPath ? t('Enabled') : t('Disabled')}</p>
+                        </label>
+                        <p className="info">{t('Feature that tries alternate ports in order to resolve certain types of connections issues.')}</p>
+                    </div>
+                </section>
+            </div>
 
-    var customPort = "";
-    if (!this.state.autoPath) {
-        customPort = (
-            <section className="preferences">
-                <h1 className="title">Custom Port</h1>
-                <div className="selectbox">
-                    <Select
-                        name="customPort"
-                        value={this.state.customPort}
-                        options={ports}
-                        onChange={this.handlePortChange}
-                        searchable={false}
-                        clearable={false}
-                    />
-                </div>
-            </section>
         );
     }
-
-    return (
-      <div className="content-scroller" id="content">
-
-        <section>
-                <h1 className="title">General</h1>
-
-                <div className="checkbox">
-                    <input id="reportAnon" type="checkbox" checked={this.state.metricsEnabled} onChange={this.handleChangeMetricsEnabled}/>
-                    <label htmlFor="reportAnon"> </label>
-                    <p>Report anonymous usage analytics</p>
-                </div>
-                <div className="checkbox">
-                    <input id="saveCredentials" disabled={!this.state.saveCredentials}  type="checkbox" checked={this.state.connectLaunch && this.state.saveCredentials} onChange={this.handleChangeConnectLaunch}/>
-                    <label htmlFor="saveCredentials"> </label>
-                    <p>Auto-connect after launch (requires a saved user/pass)</p>
-                </div>
-                <div className="checkbox">
-                    <input id="launchStartup" type="checkbox" checked={this.state.launchStartup} onChange={this.handleChangeLaunchStartup}/>
-                    <label htmlFor="launchStartup"> </label>
-                    <p>Launch on operating system startup</p>
-                </div>
-                <div className="checkbox">
-                    <input id="launchStartupHidden" type="checkbox" checked={this.state.launchStartupHidden} onChange={this.handleChangeLaunchStartupHidden}/>
-                    <label htmlFor="launchStartupHidden"> </label>
-                    <p>Launch on operating system startup hidden</p>
-                </div>
-                <div className="checkbox">
-                    <input id="disableSmartdns" type="checkbox" checked={this.state.disableSmartdns} onChange={this.handleChangeDisableSmartdns}/>
-                    <label htmlFor="disableSmartdns"> </label>
-                    <p>Disable SmartDNS</p>
-                </div>
-                <div className="checkbox">
-                    <input id="minToTaskbar" type="checkbox" checked={this.state.minToTaskbar} onChange={this.handleChangeMinToTaskbar}/>
-                    <label htmlFor="minToTaskbar"> </label>
-                    <p>Minimize to taskbar</p>
-                </div>
-        </section>
-        <section className="preferences">
-            <h1 className="title">Encryption</h1>
-            <div className="selectbox">
-                <Select
-                    name="encryption"
-                    value={this.state.encryption}
-                    options={encryptions}
-                    onChange={this.handleEncryptionChange}
-                    searchable={false}
-                    clearable={false}
-                />
-            </div>
-        </section>
-        {customPort}
-        <section className="preferences">
-            <h1 className="title">Auto Path</h1>
-            <div className="checkbox">
-                <input type="checkbox" id="autopath" checked={this.state.autoPath} onChange={this.handleChangeAutoPath} />
-                <label htmlFor="autopath"> </label>
-                <p>{this.state.autoPath ? 'Enabled' : 'Disabled'}</p>
-                <p className="info">Feature that tries alternate ports in order to resolve certain types of connections issues.</p>
-            </div>
-        </section>
-      </div>
-
-    );
-  }
 });
 
-module.exports = Preferences;
+module.exports = Preferences;
\ No newline at end of file
diff --git a/src/components/ServerListItem.react.js b/src/components/ServerListItem.react.js
index 28483f8..fd6af2e 100644
--- a/src/components/ServerListItem.react.js
+++ b/src/components/ServerListItem.react.js
@@ -2,44 +2,48 @@ import React from 'react';
 import RetinaImage from 'react-retina-image';
 
 var SingleValue = React.createClass({
-	propTypes: {
-		placeholder: React.PropTypes.string,
-		value: React.PropTypes.object
-	},
-	render () {
-		var obj = this.props.value;
-		var size = 15;
-		var flagStyle = {
-			display: 'inline-block',
-			marginRight: 10,
-			position: 'relative',
-			top: -2,
-			verticalAlign: 'middle',
-		};
+    propTypes: {
+        placeholder: React.PropTypes.string,
+        value: React.PropTypes.object
+    },
+    render() {
+        var obj = this.props.value;
+        var size = 15;
+        var flagStyle = {
+            display: 'inline-block',
+            marginRight: 10,
+            position: 'relative',
+            top: -2,
+            verticalAlign: 'middle'
+        };
+        var placeHolderStyle = {
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+            whiteSpace: 'nowrap',
+        }
 
-		var flag = false;
-		if (obj.value == 'hub.vpn.ht') {
-			flag = "flag-icon";
-		} else {
-			if (obj && obj.country) {
-				flag = "flag-icon flag-icon-"+obj.country;
-			}
-		}
-		return (
+        var flag = false;
+        if (obj.value == 'hub.vpn.ht') {
+            flag = "flag-icon";
+        } else {
+            if (obj && obj.country) {
+                flag = "flag-icon flag-icon-" + obj.country;
+            }
+        }
+        return (
 			<div className="Select-placeholder">
-					{flag ? (
-						<div>
-							<i className={flag} style={flagStyle}></i>
-							{obj.label}
-						</div>
-					) : (
-						this.props.placeholder
-					)
-				}
+                {flag ? (
+                    <div style={placeHolderStyle}>
+                        <i className={flag} style={flagStyle}></i>
+                        {obj.label}
+                    </div>
+                ) : (
+                    this.props.placeholder
+                )}
 			</div>
-		);
+        );
 
-	}
+    }
 });
 
-module.exports = SingleValue;
+module.exports = SingleValue;
\ No newline at end of file
diff --git a/src/components/ServerListOption.react.js b/src/components/ServerListOption.react.js
index eb4d24e..6d28265 100644
--- a/src/components/ServerListOption.react.js
+++ b/src/components/ServerListOption.react.js
@@ -2,45 +2,56 @@ import React from 'react';
 import RetinaImage from 'react-retina-image';
 
 var Option = React.createClass({
-	propTypes: {
-		addLabelText: React.PropTypes.string,
-		className: React.PropTypes.string,
-		mouseDown: React.PropTypes.func,
-		mouseEnter: React.PropTypes.func,
-		mouseLeave: React.PropTypes.func,
-		option: React.PropTypes.object.isRequired,
-		renderFunc: React.PropTypes.func
-	},
-	render () {
-		var obj = this.props.option;
-		var size = 15;
-		var flagStyle = {
-			display: 'inline-block',
-			marginRight: 10,
-			position: 'relative',
-			top: -2,
-			verticalAlign: 'middle',
-		};
-		var flag;
-		if (obj.value == 'hub.vpn.ht') {
-			flag = "flag-icon";
-		} else {
-			if (obj && obj.country) {
-				flag = "flag-icon flag-icon-"+obj.country;
-			}
-		}
+    propTypes: {
+        className: React.PropTypes.string,
+        mouseDown: React.PropTypes.func,
+        mouseEnter: React.PropTypes.func,
+        mouseLeave: React.PropTypes.func,
+        option: React.PropTypes.object.isRequired,
+        renderFunc: React.PropTypes.func
+    },
+    handleMouseDown(event) {
+        event.preventDefault();
+        event.stopPropagation();
+        this.props.onSelect(this.props.option, event);
+    },
+    handleMouseEnter(event) {
+        this.props.onFocus(this.props.option, event);
+    },
+    handleMouseMove(event) {
+        if (this.props.isFocused) return;
+        this.props.onFocus(this.props.option, event);
+    },
+    render() {
+        var obj = this.props.option;
+        var size = 15;
+        var flagStyle = {
+            display: 'inline-block',
+            marginRight: 10,
+            position: 'relative',
+            top: -2,
+            verticalAlign: 'middle',
+        };
+        var flag;
+        if (obj.value == 'hub.vpn.ht') {
+            flag = "flag-icon";
+        } else {
+            if (obj && obj.country) {
+                flag = "flag-icon flag-icon-" + obj.country;
+            }
+        }
 
-		return (
+        return (
 			<div className={this.props.className}
-				onMouseEnter={this.props.mouseEnter}
-				onMouseLeave={this.props.mouseLeave}
-				onMouseDown={this.props.mouseDown}
-				onClick={this.props.mouseDown}>
+				onMouseEnter={this.handleMouseEnter}
+				onMouseLeave={this.handleMouseMove}
+				onMouseDown={this.handleMouseDown}
+				onClick={this.handleMouseDown}>
 				<i className={flag} style={flagStyle}></i>
 				{obj.label}
 			</div>
-		);
-	}
+        );
+    }
 });
 
-module.exports = Option;
+module.exports = Option;
\ No newline at end of file
diff --git a/src/components/Sidebar.react.js b/src/components/Sidebar.react.js
index 4773d7e..e39e6b6 100644
--- a/src/components/Sidebar.react.js
+++ b/src/components/Sidebar.react.js
@@ -1,29 +1,30 @@
-import React from 'react/addons';
+import React from 'react';
 import Router from 'react-router';
 import RetinaImage from 'react-retina-image';
+import {t} from '../utils/localizationUtil';
 
 var Sidebar = React.createClass({
-  componentWillMount: function () {
-    this.start = Date.now();
-  },
-  render: function () {
-    return (
-      <ul className="sidebar">
-        <Router.Link to="dashboard">
-          <li>
-            <RetinaImage src="icons/Dashboard%20Icon.png"/>
-            <p>dashboard</p>
-          </li>
-        </Router.Link>
-        <Router.Link to="preferences">
-          <li>
-            <RetinaImage src="icons/Country%20Selection.png"/>
-            <p>preferences</p>
-          </li>
-        </Router.Link>
-      </ul>
-    );
-  }
+    componentWillMount: function() {
+        this.start = Date.now();
+    },
+    render: function() {
+        return (
+            <ul className="sidebar">
+                <Router.Link to="dashboard">
+                    <li>
+                        <RetinaImage src="icons/Dashboard%20Icon.png"/>
+                        <p>{t('dashboard')}</p>
+                    </li>
+                </Router.Link>
+                <Router.Link to="preferences">
+                    <li>
+                        <RetinaImage src="icons/Country%20Selection.png"/>
+                        <p>{t('preferences')}</p>
+                    </li>
+                </Router.Link>
+            </ul>
+        );
+    }
 });
 
-module.exports = Sidebar;
+module.exports = Sidebar;
\ No newline at end of file
diff --git a/src/components/SubHeader.react.js b/src/components/SubHeader.react.js
index 3554dd4..49568d3 100644
--- a/src/components/SubHeader.react.js
+++ b/src/components/SubHeader.react.js
@@ -1,58 +1,59 @@
-import React from 'react/addons';
+import React from 'react';
 import RetinaImage from 'react-retina-image';
 import accountStore from '../stores/AccountStore';
+import {t} from '../utils/localizationUtil';
 
 var SubHeader = React.createClass({
 
-  getInitialState: function () {
-    return {
-      connected: accountStore.getState().connected
-    };
-  },
+    getInitialState: function() {
+        return {
+            connected: accountStore.getState().connected
+        };
+    },
 
-  componentDidMount: function () {
-    accountStore.listen(this.update);
-  },
+    componentDidMount: function() {
+        accountStore.listen(this.update);
+    },
 
-  componentWillUnmount: function () {
-    accountStore.unlisten(this.update);
-  },
+    componentWillUnmount: function() {
+        accountStore.unlisten(this.update);
+    },
 
-  update: function () {
-    if (this.isMounted()) {
-        this.setState({
-          connected: accountStore.getState().connected
-        });
-    }
-  },
+    update: function() {
+        if (this.isMounted()) {
+            this.setState({
+                connected: accountStore.getState().connected
+            });
+        }
+    },
 
-  render: function () {
-    var status;
-    var greenGuyClass = 'greenguy';
-    if (this.state.connected) {
-        status = (
-            <div className="status">
-                <p className="connected">connected!</p>
-                <span>Your internet traffic is now encrypted! and your online identity has become anonymous.</span>
-            </div>
-        );
-        greenGuyClass += ' connected';
-    } else {
-        status = (
-            <div className="status">
-                <p className="disconnected">not connected!</p>
-                <span>Your internet traffic is unencrypted and your online identity is exposed.</span>
-            </div>
+    render: function() {
+        var status;
+        var greenGuyClass = 'greenguy';
+        if (this.state.connected) {
+            status = (
+                <div className="status">
+                    <p className="connected">{t('connected!')}</p>
+                    <span>{t('Your internet traffic is now encrypted! and your online identity has become anonymous.')}</span>
+                </div>
+            );
+            greenGuyClass += ' connected';
+        } else {
+            status = (
+                <div className="status">
+                    <p className="disconnected">{t('not connected!')}</p>
+                    <span>{t('Your internet traffic is unencrypted and your online identity is exposed.')}</span>
+                </div>
+            );
+        }
+        return (
+            <header>
+                <RetinaImage className="logo" src="Logo.png"/>
+                <RetinaImage className={greenGuyClass} src="Figure.png"/>
+                {status}
+            </header>
         );
     }
-    return (
-        <header>
-            <RetinaImage className="logo" src="Logo.png"/>
-            <RetinaImage className={greenGuyClass} src="Figure.png"/>
-            {status}
-        </header>
-    );
-  }
 });
 
-module.exports = SubHeader;
+module.exports = SubHeader;
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 36c3352..c42a984 100755
--- a/src/main.js
+++ b/src/main.js
@@ -1 +1 @@
-import './app';
+import './app';
\ No newline at end of file
diff --git a/src/menutemplate.js b/src/menutemplate.js
index 444943f..b4de9a7 100755
--- a/src/menutemplate.js
+++ b/src/menutemplate.js
@@ -1,105 +1,104 @@
-import remote from 'remote';
-import shell from 'shell';
+import {remote, shell} from 'electron';
 import router from './router';
 import metrics from './utils/MetricsUtil';
 import util from './utils/Util';
+import {t} from './utils/localizationUtil';
 
-var dialog = remote.require('dialog');
-var app = remote.require('app');
+var dialog = remote.dialog;
+var app = remote.app;
 
 // main.js
-var MenuTemplate = function () {
-  return [
-    {
-      label: 'VPN.ht',
-      submenu: [
-      {
-        label: 'About VPN.ht',
-        click: function () {
-          metrics.track('Opened About', {
-            from: 'menu'
-          });
-          router.get().transitionTo('about');
-        }
-      },
-      {
-        type: 'separator'
-      },
-      {
-        label: 'Hide VPN.ht',
-        accelerator: util.CommandOrCtrl() + '+H',
-        selector: 'hide:'
-      },
-      {
-        label: 'Hide Others',
-        accelerator: util.CommandOrCtrl() + '+Shift+H',
-        selector: 'hideOtherApplications:'
-      },
-      {
-        label: 'Show All',
-        selector: 'unhideAllApplications:'
-      },
-      {
-        type: 'separator'
-      },
-      {
-        label: 'Quit',
-        accelerator: util.CommandOrCtrl() + '+Q',
-        click: function() {
-          app.quit();
-        }
-      }
-      ]
-    },
-    {
-      label: 'View',
-      submenu: [
-        {
-          label: 'Toggle DevTools',
-          accelerator: 'Alt+' + util.CommandOrCtrl() + '+I',
-          click: function() { remote.getCurrentWindow().toggleDevTools(); }
-        }
-      ]
-    },
-    {
-      label: 'Window',
-      submenu: [
-      {
-        label: 'Minimize',
-        accelerator: util.CommandOrCtrl() + '+M',
-        selector: 'performMiniaturize:'
-      },
-      {
-        label: 'Close',
-        accelerator: util.CommandOrCtrl() + '+W',
-        click: function () {
-          remote.getCurrentWindow().hide();
-        }
-      },
-      {
-        type: 'separator'
-      },
-      {
-        label: 'Bring All to Front',
-        selector: 'arrangeInFront:'
-      }
-      ]
-    },
-    {
-      label: 'Help',
-      submenu: [
-        {
-          label: 'Report Issue or Suggest Feedback',
-          click: function () {
-            metrics.track('Opened Issue Reporter', {
-              from: 'menu'
-            });
-            shell.openExternal('https://github.com/vpnht/desktop/issues/new');
-          }
-        }
-      ]
-    }
-  ];
+var MenuTemplate = function() {
+    return [{
+        label: 'VPN.ht',
+        submenu: [{
+            label: t('Manage Account'),
+            click: function() {
+                metrics.track('Opened Billing on VPN.ht', {
+                    from: 'menu'
+                });
+                shell.openExternal('https://billing.vpn.ht/clientarea.php?action=services');
+            }
+        }, {
+            type: 'separator'
+        }, {
+            label: t('Quit'),
+            accelerator: util.CommandOrCtrl() + '+Q',
+            click: function() {
+                app.quit();
+            }
+        }]
+    }, {
+        label: t('View'),
+        submenu: [{
+            label: t('Hide') + ' VPN.ht',
+            accelerator: util.CommandOrCtrl() + '+H',
+            selector: 'hide:'
+        }, {
+            label: t('Hide Others'),
+            accelerator: util.CommandOrCtrl() + '+Shift+H',
+            selector: 'hideOtherApplications:'
+        }, {
+            label: t('Show All'),
+            selector: 'unhideAllApplications:'
+        }, {
+            type: 'separator'
+        }, {
+            label: t('Toggle DevTools'),
+            accelerator: 'Alt+' + util.CommandOrCtrl() + '+I',
+            click: function() {
+                remote.getCurrentWindow().toggleDevTools();
+            }
+        }]
+    }, {
+        label: t('Window'),
+        submenu: [{
+            label: t('Minimize'),
+            accelerator: util.CommandOrCtrl() + '+M',
+            selector: 'performMiniaturize:'
+        }, {
+            label: t('Close'),
+            accelerator: util.CommandOrCtrl() + '+W',
+            click: function() {
+                remote.getCurrentWindow().hide();
+            }
+        }, {
+            type: 'separator'
+        }, {
+            label: t('Bring All to Front'),
+            selector: 'arrangeInFront:'
+        }]
+    }, {
+        label: t('Help'),
+        submenu: [{
+            label: t('Support'),
+            click: function() {
+                metrics.track('Opened Support on VPN.ht', {
+                    from: 'menu'
+                });
+                shell.openExternal('https://billing.vpn.ht/knowledgebase.php');
+            }
+        }, {
+            label: t('Report Issue or Suggest Feedback'),
+            click: function() {
+                metrics.track('Opened Issue Reporter', {
+                    from: 'menu'
+                });
+                shell.openExternal('https://github.com/vpnht/desktop/issues/new');
+            }
+        }, {
+            type: 'separator'
+        }, {
+            label: t('About'),
+            accelerator: util.CommandOrCtrl() + '+I',
+            click: function() {
+                metrics.track('Opened About', {
+                    from: 'menu'
+                });
+                router.get().transitionTo('about');
+            }
+        }]
+    }];
 };
 
-module.exports = MenuTemplate;
+module.exports = MenuTemplate;
\ No newline at end of file
diff --git a/src/router.js b/src/router.js
index ac32a86..a2d006e 100755
--- a/src/router.js
+++ b/src/router.js
@@ -1,11 +1,11 @@
 module.exports = {
-  router: null,
+    router: null,
 
-  get: function () {
-    return this.router;
-  },
+    get: function() {
+        return this.router;
+    },
 
-  set: function (router) {
-    this.router = router;
-  }
-};
+    set: function(router) {
+        this.router = router;
+    }
+};
\ No newline at end of file
diff --git a/src/routes.js b/src/routes.js
index 1a3596d..22599ab 100755
--- a/src/routes.js
+++ b/src/routes.js
@@ -1,4 +1,4 @@
-import React from 'react/addons';
+import React from 'react';
 
 import Framework from './components/Framework.react';
 import Dashboard from './components/Dashboard.react';
@@ -11,21 +11,19 @@ var Route = Router.Route;
 var RouteHandler = Router.RouteHandler;
 
 var App = React.createClass({
-  render: function () {
-    return (
-      <RouteHandler/>
-    );
-  }
+    render: function() {
+        return ( < RouteHandler / > );
+    }
 });
 
 var routes = (
-  <Route name="app" path="/" handler={App}>
-    <Route name="framework" handler={Framework}>
-      <Route name="dashboard" path="/dashboard" handler={Dashboard}/>
-      <Route name="preferences" path="/dashboard/preferences" handler={Preferences}/>
-      <Route name="about" path="/dashboard/about" handler={About}/>
+    <Route name="app" path="/" handler={App}>
+        <Route name="framework" handler={Framework}>
+            <Route name="dashboard" path="/dashboard" handler={Dashboard}/>
+            <Route name="preferences" path="/dashboard/preferences" handler={Preferences}/>
+            <Route name="about" path="/dashboard/about" handler={About}/>
+        </Route>
     </Route>
-  </Route>
 );
 
-module.exports = routes;
+module.exports = routes;
\ No newline at end of file
diff --git a/src/stores/AccountStore.js b/src/stores/AccountStore.js
index 7db1f74..2e8440f 100755
--- a/src/stores/AccountStore.js
+++ b/src/stores/AccountStore.js
@@ -3,58 +3,79 @@ import vpnActions from '../actions/VPNActions';
 var _connectionTimer = false;
 
 class AccountStore {
-  constructor () {
-    this.bindActions(vpnActions);
-
-    this.errors = {};
-
-    this.connected = false;
-    this.connecting = false;
-    this.appReady = false;
-    this.myip = false;
-    this.bytecount = [0, 0];
-    this.connectionTime = 0;
-  }
-
-  onAppReady () {
-    this.setState({appReady: true});
-  }
-
-  onBytecount (bytes) {
-    this.setState({bytecount: bytes});
-  }
-
-  onConnect () {
-    this.setState({connecting: true});
-  }
-
-  onNewIp (ip) {
-    this.setState({myip: ip});
-  }
-
-  onConnected () {
-    this.setState({connected: true, connecting: false});
-    var self = this;
-    _connectionTimer = setInterval(function(){
-        self.setState({connectionTime: self.connectionTime+1});
-    }, 1000);
-  }
-
-  onDisconnect () {
-    // should wait to be fully disconnected?
-    if (_connectionTimer) {
-        clearTimeout(_connectionTimer);
-    }
-  }
-
-  onDisconnected () {
-    this.setState({connected: false, connecting: false, connectionTime: 0});
-  }
-
-  errors ({errors}) {
-    this.setState({errors});
-  }
+    constructor() {
+        this.bindActions(vpnActions);
+
+        this.errors = {};
+
+        this.connected = false;
+        this.connecting = false;
+        this.appReady = false;
+        this.myip = false;
+        this.bytecount = [0, 0];
+        this.connectionTime = 0;
+    }
+
+    onAppReady() {
+        this.setState({
+            appReady: true
+        });
+    }
+
+    onBytecount(bytes) {
+        this.setState({
+            bytecount: bytes
+        });
+    }
+
+    onConnect() {
+        this.setState({
+            connecting: true
+        });
+    }
+
+    onNewIp(ip) {
+        this.setState({
+            myip: ip
+        });
+    }
+
+    onConnected() {
+        this.setState({
+            connected: true,
+            connecting: false
+        });
+        var self = this;
+        _connectionTimer = setInterval(function() {
+            self.setState({
+                connectionTime: self.connectionTime + 1
+            });
+        }, 1000);
+    }
+
+    onDisconnect() {
+        // should wait to be fully disconnected?
+        if (_connectionTimer) {
+            clearTimeout(_connectionTimer);
+        }
+    }
+
+    onDisconnected() {
+        this.setState({
+            connected: false,
+            connecting: false,
+            connectionTime: 0
+        });
+    }
+
+    errors({
+        errors
+    }) {
+        this.setState({
+            errors
+        });
+    }
 
 }
 
-export default alt.createStore(AccountStore);
+export default alt.createStore(AccountStore);
\ No newline at end of file
diff --git a/src/stores/LogStore.js b/src/stores/LogStore.js
index 4d33bb0..45a3fe5 100755
--- a/src/stores/LogStore.js
+++ b/src/stores/LogStore.js
@@ -1,89 +1,88 @@
 import {EventEmitter} from 'events';
-import assign from 'object-assign';
 import _ from 'lodash';
 import os from 'os';
-var _logs = [];
 
+var _logs = [];
 var MAX_LOG_SIZE = 3000;
 
-module.exports = assign(Object.create(EventEmitter.prototype), {
-  SERVER_LOGS_EVENT: 'server_logs_event',
+module.exports = Object.assign(Object.create(EventEmitter.prototype), {
+    SERVER_LOGS_EVENT: 'server_logs_event',
 
-  error: function(line, obj) {
-    var d = new Date();
-    this.push('[ERROR] ' + d.toLocaleString() + ' ' + line, obj);
-  },
+    error: function(line, obj) {
+        var d = new Date();
+        this.push('[ERROR] ' + d.toLocaleString() + ' ' + line, obj);
+    },
 
-  info: function(line, obj) {
-    var d = new Date();
-    this.push('[INFO] ' + d.toLocaleString() + ' ' + line, obj);
-  },
+    info: function(line, obj) {
+        var d = new Date();
+        this.push('[INFO] ' + d.toLocaleString() + ' ' + line, obj);
+    },
 
-  warn: function(line, obj) {
-    var d = new Date();
-    this.push('[WARNING] ' + d.toLocaleString() + ' ' + line, obj);
-  },
+    warn: function(line, obj) {
+        var d = new Date();
+        this.push('[WARNING] ' + d.toLocaleString() + ' ' + line, obj);
+    },
 
-  debug: function(line, obj) {
-    var d = new Date();
-    this.push('[DEBUG] ' + d.toLocaleString() + ' ' + line, obj);
-  },
+    debug: function(line, obj) {
+        var d = new Date();
+        this.push('[DEBUG] ' + d.toLocaleString() + ' ' + line, obj);
+    },
 
-  push: function (line, obj) {
-    var log = false;
-    if (obj) {
-        log = "\n"+line.toUpperCase();
-        _.each(obj, function(elem, key) {
-            if (typeof elem === 'object') {
-                log += "\n\t"+key.toUpperCase();
-                _.each(elem, function(subElem, subKey) {
-                    if (typeof subElem === 'object') {
-                        _.each(subElem, function(subSubElem, subSubKey) {
-                            log += "\n\t\t"+subSubKey.toUpperCase()+": "+subSubElem;
-                        });
-                    } else {
-                        if (typeof subKey === 'string') {
-                            log += "\n\t\t"+subKey.toUpperCase()+": "+subElem;
+    push: function(line, obj) {
+        var log = false;
+        if (obj) {
+            log = "\n" + line.toUpperCase();
+            _.each(obj, function(elem, key) {
+                if (typeof elem === 'object') {
+                    log += "\n\t" + key.toUpperCase();
+                    _.each(elem, function(subElem, subKey) {
+                        if (typeof subElem === 'object') {
+                            _.each(subElem, function(subSubElem, subSubKey) {
+                                log += "\n\t\t" + subSubKey.toUpperCase() + ": " + subSubElem;
+                            });
                         } else {
-                            log += "\n\t\t"+subElem;
-                        }
+                            if (typeof subKey === 'string') {
+                                log += "\n\t\t" + subKey.toUpperCase() + ": " + subElem;
+                            } else {
+                                log += "\n\t\t" + subElem;
+                            }
 
-                    }
-                });
-            } else {
-                log += "\n\t"+key.toUpperCase()+": "+elem;
-            }
-        });
-    } else {
-        log = line.toUpperCase();
-    }
+                        }
+                    });
+                } else {
+                    log += "\n\t" + key.toUpperCase() + ": " + elem;
+                }
+            });
+        } else {
+            log = line.toUpperCase();
+        }
 
-    _logs.push(log);
-    this.emit(this.SERVER_LOGS_EVENT);
-  },
+        _logs.push(log);
+        this.emit(this.SERVER_LOGS_EVENT);
+    },
 
-  logs: function () {
-    return _logs || [];
-  },
+    logs: function() {
+        return _logs || [];
+    },
 
-  empty: function () {
-    _logs = [];
-  },
+    empty: function() {
+        _logs = [];
+    },
 
-  initLogs: function(appVersion) {
-    var ifaces = os.networkInterfaces();
-    var memories = os.totalmem()/1024/1024/1024;
-    var freeMemories = os.freemem()/1024/1024/1024;
-    this.info("Launching VPN.ht Application "+ appVersion);
-    this.info("Network Interfaces", ifaces);
-    this.info("Operating System", {
-        'Release':os.release(),
-        'Type': os.type(),
-        'Arch': os.arch(),
-        'LoadAvg': os.loadavg(),
-        'Total Memory': memories + 'GB',
-        'Free Memory': freeMemories + 'GB',
-        'CPUs': os.cpus().length
-    });
-  }
-});
+    initLogs: function(appVersion) {
+        var ifaces = os.networkInterfaces();
+        var memories = os.totalmem() / 1024 / 1024 / 1024;
+        var freeMemories = os.freemem() / 1024 / 1024 / 1024;
+        this.info("Launching VPN.ht Application " + appVersion);
+        this.info("Network Interfaces", ifaces);
+        this.info("Operating System", {
+            'Release': os.release(),
+            'Type': os.type(),
+            'Arch': os.arch(),
+            'LoadAvg': os.loadavg(),
+            'Total Memory': memories + 'GB',
+            'Free Memory': freeMemories + 'GB',
+            'CPUs': os.cpus().length
+        });
+    }
+});
\ No newline at end of file
diff --git a/src/stores/ServerStore.js b/src/stores/ServerStore.js
index 1c43169..931009b 100644
--- a/src/stores/ServerStore.js
+++ b/src/stores/ServerStore.js
@@ -2,16 +2,22 @@ import alt from '../alt';
 import ServerActions from '../actions/ServerActions';
 
 class ServerStore {
-  constructor () {
+    constructor() {
 
-    this.bindActions(ServerActions);
-    this.servers = [{ value: 'hub.vpn.ht', label: 'Nearest Server (Random)', country: 'blank' }];
-  }
+        this.bindActions(ServerActions);
+        this.servers = [{
+            value: 'hub.vpn.ht',
+            label: 'Nearest Server (Random)',
+            country: 'blank'
+        }];
+    }
 
-  onReceiveAll (servers) {
-    this.setState({servers});
-  }
+    onReceiveAll(servers) {
+        this.setState({
+            servers
+        });
+    }
 
 }
 
-export default alt.createStore(ServerStore);
+export default alt.createStore(ServerStore);
\ No newline at end of file
diff --git a/src/utils/CredentialsUtil.js b/src/utils/CredentialsUtil.js
index 286d392..4b8c846 100755
--- a/src/utils/CredentialsUtil.js
+++ b/src/utils/CredentialsUtil.js
@@ -3,53 +3,56 @@ import log from '../stores/LogStore';
 
 var CredentialsUtil = {
 
-  username: function () {
-    return localStorage.getItem('auth.username') || null;
-  },
-
-  get: function () {
-    let config = CredentialsUtil._config();
-    if (!config) {
-      return {
-          username: null,
-          password: null
-      };
+    username: function() {
+        return localStorage.getItem('auth.username') || null;
+    },
+
+    get: function() {
+        let config = CredentialsUtil._config();
+        if (!config) {
+            return {
+                username: null,
+                password: null
+            };
+        }
+
+        let [username, password] = CredentialsUtil._creds(config);
+        return {username, password};
+    },
+
+    save: function(username, password) {
+        log.info('Username and password saved for future use');
+        localStorage.setItem('auth.username', username);
+        localStorage.setItem('auth.config', new Buffer(username + ':' + password).toString('base64'));
+        accountServerActions.loggedin({username});
+    },
+
+    loggedin: function() {
+        return CredentialsUtil._config();
+    },
+
+    logout: function() {
+        accountServerActions.loggedout();
+        localStorage.removeItem('auth.username');
+        localStorage.removeItem('auth.config');
+    },
+
+    _config: function() {
+        let config = localStorage.getItem('auth.config');
+        if (!config) {
+            return null;
+        }
+        return config;
+    },
+
+    _creds: function(config) {
+        return new Buffer(config, 'base64')
+            .toString()
+            .split(/:(.+)?/)
+            .slice(0, 2);
     }
 
-    let [username, password] = CredentialsUtil._creds(config);
-    return {username, password};
-  },
-
-  save: function (username, password) {
-    log.info('Username and password saved for future use');
-    localStorage.setItem('auth.username', username);
-    localStorage.setItem('auth.config', new Buffer(username + ':' + password).toString('base64'));
-    accountServerActions.loggedin({username});
-  },
-
-  loggedin: function () {
-    return CredentialsUtil._config();
-  },
-
-  logout: function () {
-    accountServerActions.loggedout();
-    localStorage.removeItem('auth.username');
-    localStorage.removeItem('auth.config');
-  },
-
-  _config: function () {
-    let config = localStorage.getItem('auth.config');
-    if (!config) {
-      return null;
-    }
-    return config;
-  },
-
-  _creds: function (config) {
-    return new Buffer(config, 'base64').toString().split(/:(.+)?/).slice(0, 2);
-  }
-
 };
 
 
-module.exports = CredentialsUtil;
+module.exports = CredentialsUtil;
\ No newline at end of file
diff --git a/src/utils/MetricsUtil.js b/src/utils/MetricsUtil.js
index be8be4e..950c440 100755
--- a/src/utils/MetricsUtil.js
+++ b/src/utils/MetricsUtil.js
@@ -1,4 +1,3 @@
-import assign from 'object-assign';
 import Mixpanel from 'mixpanel';
 import uuid from 'node-uuid';
 import fs from 'fs';
@@ -9,56 +8,56 @@ import osxRelease from 'osx-release';
 var settings;
 
 try {
-  settings = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'settings.json'), 'utf8'));
+    settings = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'settings.json'), 'utf8'));
 } catch (err) {
-  settings = {};
+    settings = {};
 }
 
 var token = process.env.NODE_ENV === 'development' ? settings['mixpanel-dev'] : settings.mixpanel;
 if (!token) {
-  token = 'none';
+    token = 'none';
 }
 
 var mixpanel = Mixpanel.init(token);
 
 if (localStorage.getItem('metrics.enabled') === null) {
-  localStorage.setItem('metrics.enabled', true);
+    localStorage.setItem('metrics.enabled', true);
 }
 
 var Metrics = {
-  enabled: function () {
-    return localStorage.getItem('metrics.enabled') === 'true';
-  },
-  setEnabled: function (enabled) {
-    localStorage.setItem('metrics.enabled', !!enabled);
-  },
-  track: function (name, data) {
-    data = data || {};
-    if (!name) {
-      return;
-    }
-
-    if (localStorage.getItem('metrics.enabled') !== 'true') {
-      return;
-    }
-
-    let id = localStorage.getItem('metrics.id');
-    if (!id) {
-      id = uuid.v4();
-      localStorage.setItem('metrics.id', id);
-    }
-
-    let osName = os.platform();
-    let osVersion = util.isWindows() ? os.release() : osxRelease(os.release()).version;
-
-    mixpanel.track(name, assign({
-      distinct_id: id,
-      version: util.packagejson().version,
-      'Operating System': osName,
-      'Operating System Version': osVersion,
-      'Operating System Architecture': os.arch()
-    }, data));
-  },
+    enabled: function() {
+        return localStorage.getItem('metrics.enabled') === 'true';
+    },
+    setEnabled: function(enabled) {
+        localStorage.setItem('metrics.enabled', !!enabled);
+    },
+    track: function(name, data) {
+        data = data || {};
+        if (!name) {
+            return;
+        }
+
+        if (localStorage.getItem('metrics.enabled') !== 'true') {
+            return;
+        }
+
+        let id = localStorage.getItem('metrics.id');
+        if (!id) {
+            id = uuid.v4();
+            localStorage.setItem('metrics.id', id);
+        }
+
+        let osName = os.platform();
+        let osVersion = util.isWindows() ? os.release() : osxRelease(os.release()).version;
+
+        mixpanel.track(name, Object.assign({
+            distinct_id: id,
+            version: util.packagejson().version,
+            'Operating System': osName,
+            'Operating System Version': osVersion,
+            'Operating System Architecture': os.arch()
+        }, data));
+    },
 
 };
-module.exports = Metrics;
+module.exports = Metrics;
\ No newline at end of file
diff --git a/src/utils/MyipUtil.js b/src/utils/MyipUtil.js
index 8ba6bd1..4e8b9d1 100644
--- a/src/utils/MyipUtil.js
+++ b/src/utils/MyipUtil.js
@@ -1,80 +1,83 @@
 import _ from 'lodash';
 import request from 'request';
 import metrics from './MetricsUtil';
-import Promise from 'bluebird';
+import {t} from './localizationUtil';
 import log from '../stores/LogStore';
 import ServerActions from '../actions/ServerActions';
 
-
 let MYIP_ENDPOINT = process.env.MYIP_ENDPOINT || 'https://myip.ht';
 
 var MyipUtil = {
-  init: function () {},
+    init: function() {},
+
+    fetch: function() {
+        return MyipUtil._getRemoteServers()
+            .then(function(servers) {
+                log.info('MyipUtil.fetch - ' + servers.length + ' servers')
+                ServerActions.receiveAll(servers);
+            });
+    },
 
-  fetch: function() {
-    return MyipUtil._getRemoteServers()
-        .then(function(servers) {
-            log.info('MyipUtil.fetch - ' + servers.length + ' servers')
-            ServerActions.receiveAll(servers);
+    status: function(callback) {
+        request.get(`${MYIP_ENDPOINT}/status`, (error, response, body) => {
+            callback(error, response, body);
         });
-  },
-
-  status: function (callback) {
-    request.get(`${MYIP_ENDPOINT}/status`, (error, response, body) => {
-      callback(error, response, body);
-    });
-  },
-
-  _servers: function (callback) {
-    return new Promise((resolve, reject) => {
-        request.get(`${MYIP_ENDPOINT}/servers-geo.json`, (error, response, body) => {
-            if (error) {
-                reject(error);
-            } else {
-                resolve(response.body);
-            }
+    },
+
+    _servers: function(callback) {
+        return new Promise((resolve, reject) => {
+            request.get(`${MYIP_ENDPOINT}/servers-geo.json`, (error, response, body) => {
+                if (error) {
+                    reject(error);
+                } else {
+                    resolve(response.body);
+                }
+            });
         });
-    });
-  },
-
-  _getRemoteServers: function() {
-
-    var options = [{ value: 'hub.vpn.ht', label: 'Nearest Server (Random)', country: 'blank' }];
-    var serverName;
-    return new Promise((resolve) => {
-        MyipUtil._servers()
-            .then(function(response) {
-                var servers = JSON.parse(response);
-
-                _.each(servers, function(server, country) {
-
-                    serverName = server.countryName + ' - ' + Math.round(server.distance) + ' KM  - LOC ' + server.host.toUpperCase().replace( /^\D+/g, '');
-
-                    if (server.regionName) {
-                        serverName = server.regionName + ", " + serverName;
-                    }
-
-                    if (server.city) {
-                        serverName = server.city + ", " + serverName;
-                    }
-
-                    options.push({
-                        value: server.ip,
-                        label: serverName,
-                        distance: Math.round(server.distance),
-                        country: server.country
+    },
+
+    _getRemoteServers: function() {
+
+        var options = [{
+            value: 'hub.vpn.ht',
+            label: t('Nearest Server (Random)'),
+            country: 'blank'
+        }];
+        var serverName;
+        return new Promise((resolve) => {
+            MyipUtil._servers()
+                .then(function(response) {
+                    var servers = JSON.parse(response);
+
+                    _.each(servers, function(server, country) {
+
+                        serverName = server.countryName + ' - ' + server.host.toUpperCase().replace(/^\D+/g, '') + ' (' + Math.round(server.distance) + ' KM)';
+
+                        if (server.regionName) {
+                            serverName = server.regionName + ", " + serverName;
+                        }
+
+                        if (server.city) {
+                            serverName = server.city + ", " + serverName;
+                        }
+
+                        options.push({
+                            value: server.ip,
+                            label: serverName,
+                            distance: Math.round(server.distance),
+                            country: server.country
+                        });
                     });
-                });
 
-                resolve(options);
-            })
-            .catch(function(err) {
-                console.log(err);
-            });
-    });
+                    resolve(options);
+                })
+                .catch(function(err) {
+                    console.log(err);
+                });
+        });
 
-  }
+    }
 
 };
 
-module.exports = MyipUtil;
+module.exports = MyipUtil;
\ No newline at end of file
diff --git a/src/utils/ResourcesUtil.js b/src/utils/ResourcesUtil.js
index d5b011e..7f92a80 100644
--- a/src/utils/ResourcesUtil.js
+++ b/src/utils/ResourcesUtil.js
@@ -2,12 +2,12 @@ import path from 'path';
 
 module.exports = {
 
-  resourceDir: function () {
-    return process.env.BIN_PATH;
-  },
+    resourceDir: function() {
+        return process.env.BIN_PATH;
+    },
 
-  macsudo: function () {
-    return path.join(this.resourceDir(), 'macsudo');
-  }
+    macsudo: function() {
+        return path.join(this.resourceDir(), 'macsudo');
+    }
 
-};
+};
\ No newline at end of file
diff --git a/src/utils/SettingsUtil.js b/src/utils/SettingsUtil.js
index 23824c3..3adc3ef 100644
--- a/src/utils/SettingsUtil.js
+++ b/src/utils/SettingsUtil.js
@@ -12,29 +12,29 @@ var defaultSettings = {
 };
 
 module.exports = {
-    get: function (item) {
-      var haveDefault = null,
-          value = localStorage.getItem('settings.'+item);
+    get: function(item) {
+        var haveDefault = null,
+            value = localStorage.getItem('settings.' + item);
 
-      // hack to parse the local storage type and fully
-      // backward compatible
-      try {
-          value = JSON.parse(value);
-      } catch(e) {
-          if (value === 'true' || 'false') {
-              value = (value === 'true') ? true : false;
-          }
-      }
+        // hack to parse the local storage type and fully
+        // backward compatible
+        try {
+            value = JSON.parse(value);
+        } catch (e) {
+            if (value === 'true' || 'false') {
+                value = (value === 'true') ? true : false;
+            }
+        }
 
-      if (defaultSettings[item] && value === null) {
-          value = defaultSettings[item];
-      }
+        if (defaultSettings[item] && value === null) {
+            value = defaultSettings[item];
+        }
 
-      return value;
+        return value;
     },
 
-    save: function (key, value) {
-      log.info('Preferences | ' + key + ' = ' + value);
-      localStorage.setItem('settings.'+key, JSON.stringify(value));
+    save: function(key, value, displayValue) {
+        log.info('Preferences | ' + key + ' = ' + (displayValue || value));
+        localStorage.setItem('settings.' + key, JSON.stringify(value));
     }
-}
+}
\ No newline at end of file
diff --git a/src/utils/Util.js b/src/utils/Util.js
index d744d81..fa9e8b4 100755
--- a/src/utils/Util.js
+++ b/src/utils/Util.js
@@ -1,6 +1,5 @@
-import exec from 'exec';
-import child_process from 'child_process';
-import Promise from 'bluebird';
+import {exec, execFile} from 'child_process';
+import {remote} from 'electron';
 import fs from 'fs';
 import path from 'path';
 import crypto from 'crypto';
@@ -18,16 +17,22 @@ module.exports = {
             }
         }
 
-        let fn = Array.isArray(args) ? exec : child_process.exec;
         return new Promise((resolve, reject) => {
-            fn(args, options, (stderr, stdout, code) => {
+            let cmd = Array.isArray(args) ? args.join(' ') : args;
+            let cb = function(stderr, stdout, code) {
                 if (code) {
-                    var cmd = Array.isArray(args) ? args.join(' ') : args;
-                    reject(new Error(cmd + ' returned non zero exit code. Stderr: ' + stderr));
+                    reject(new Error(cmd + ' returned non-zero exit code. Stderr: ' + stderr));
                 } else {
                     resolve(stdout);
                 }
-            });
+            };
+
+            if (Array.isArray(args)) {
+                let file = args.shift();
+                execFile(file, args, options, cb);
+            } else {
+                exec(args, options, cb);
+            }
         });
     },
     killTask: function(name) {
@@ -86,14 +91,14 @@ module.exports = {
         return str.replace(/ /g, '\\ ').replace(/\(/g, '\\(').replace(/\)/g, '\\)');
     },
     home: function() {
-        return require('remote').require('app').getPath('home');
+        return remote.app.getPath('home');
     },
     documents: function() {
         // TODO: fix me for windows 7
         return 'Documents';
     },
     supportDir: function() {
-        return require('remote').require('app').getPath('userData');
+        return remote.app.getPath('userData');
     },
     CommandOrCtrl: function() {
         return this.isWindows() ? 'Ctrl' : 'Command';
diff --git a/src/utils/VPNHelpers.js b/src/utils/VPNHelpers.js
index 0ee88ff..f19ec46 100644
--- a/src/utils/VPNHelpers.js
+++ b/src/utils/VPNHelpers.js
@@ -1,4 +1,3 @@
-import Promise from 'bluebird';
 import fs from 'fs';
 import log from '../stores/LogStore';
 import vpnActions from '../actions/VPNActions';
@@ -13,89 +12,75 @@ var openvpn;
 
 module.exports = {
 
-    managementPort: function () {
-      return new Promise((resolve, reject) => {
-          getPort((err, port) => {
-              if (err) {
-                  reject(err);
-              } else {
-                  fs.writeFileSync(path.join(util.supportDir(), 'openvpn.port'), port);
-                  resolve(port);
-              }
-          });
-      });
+    managementPort: function() {
+        return getPort().then(port => {
+            fs.writeFileSync(path.join(util.supportDir(), 'openvpn.port'), port);
+            return port;
+        });
     },
 
-    softKill: function (port) {
+    softKill: function(port) {
 
-      var opts = {
-          host: 'localhost',
-          port: port,
-          timeout: 1500
-      };
+        var opts = {
+            host: 'localhost',
+            port: port,
+            timeout: 1500
+        };
 
-      log.info('VPNUtil.softDisconnect - Trying to stop previous process');
+        log.info('VPNUtil.softDisconnect - Trying to stop previous process');
 
-      return new Promise((resolve, reject) => {
+        return new Promise((resolve, reject) => {
 
-          openvpn = openvpnmanager.connectAndKill(opts);
+            openvpn = openvpnmanager.connectAndKill(opts);
 
-          // we wait the connection to close
-          openvpn.on('state-change', function(state) {
+            // we wait the connection to close
+            openvpn.on('state-change', function(state) {
                 if (state && state[2] == 'exit-with-notification') {
                     openvpnmanager.destroy();
                     openvpn.removeAllListeners();
                     resolve();
                 }
-          });
+            });
 
-          openvpn.on('error', function() {
-              openvpnmanager.destroy();
-              openvpn.removeAllListeners();
-              reject();
-          });
+            openvpn.on('error', function() {
+                openvpnmanager.destroy();
+                openvpn.removeAllListeners();
+                reject();
+            });
 
-          openvpn.on('console-output', function(output) {
-              log.info(output);
-          });
+            openvpn.on('console-output', function(output) {
+                log.info(output);
+            });
 
-      });
+        });
 
     },
 
-    updateIp: function () {
-      return new Promise((resolve, reject) => {
+    updateIp: function() {
+        return new Promise((resolve, reject) => {
 
-          myip.status(function(error, response, body) {
-              vpnActions.newIp(JSON.parse(body));
-              resolve();
-          });
+            myip.status(function(error, response, body) {
+                vpnActions.newIp(JSON.parse(body));
+                resolve();
+            });
 
-      });
+        });
     },
 
-    checkRunning: function () {
-      return new Promise((resolve, reject) => {
-          var pid = false;
-          try {
-              pid = fs.readFileSync(path.join(util.supportDir(), 'openvpn.pid')) || false;
-          } catch (err) {}
-
-          if (pid) {
-              log.info('Checking previous openvpn status PID: '+pid);
-              running(Number(pid), function(err, live) {
-                  if (err) {
-                      log.error('Process error', {err})
-                      reject(err);
-                  } else {
-                      log.info('Process status : ' + live)
-                      resolve(live);
-                  }
-              });
-          } else {
-              resolve(false);
-          }
-      });
+    checkRunning: function() {
+        return new Promise((resolve, reject) => {
+            var pid = false;
+            try {
+                pid = fs.readFileSync(path.join(util.supportDir(), 'openvpn.pid')) || false;
+            } catch (err) {}
+
+            if (pid && running(Number(pid))) {
+                log.info('Previous openvpn status still running, PID: ' + pid);
+                resolve(true);
+            } else {
+                resolve(false);
+            }
+        });
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/utils/VPNUtil.js b/src/utils/VPNUtil.js
index adcc038..24eae21 100644
--- a/src/utils/VPNUtil.js
+++ b/src/utils/VPNUtil.js
@@ -1,7 +1,5 @@
 import _ from 'lodash';
 import path from 'path';
-import assign from 'object-assign';
-import Promise from 'bluebird';
 import request from 'request';
 import fs from 'fs';
 
@@ -24,200 +22,200 @@ var _args;
 switch (process.platform) {
     case 'darwin':
         currentOSLib = require('./VPNUtilMac');
-    break;
+        break;
     case 'win32':
         currentOSLib = require('./VPNUtilWindows');
-    break;
+        break;
     case 'linux':
-    break;
+        break;
 };
 
-module.exports = assign(currentOSLib, {
+module.exports = Object.assign(currentOSLib, {
 
-  generateConfig: function (managementPort) {
-    return new Promise((resolve, reject) => {
+    generateConfig: function(managementPort) {
+        return new Promise((resolve, reject) => {
 
-        let server = _args.server;
+            let server = _args.server;
 
-        let encryption = Settings.get('encryption');
-        let autoPath = Settings.get('autoPath');
-        let port = Settings.get('customPort');
-        let smartdns = true;
-        let platform = process.platform;
-        let disableSmartdns = Settings.get('disableSmartdns');
+            let encryption = Settings.get('encryption');
+            let autoPath = Settings.get('autoPath');
+            let port = Settings.get('customPort');
+            let smartdns = true;
+            let platform = process.platform;
+            let disableSmartdns = Settings.get('disableSmartdns');
 
-        if (disableSmartdns) {
-            smartdns = 'disable';
-        }
+            if (disableSmartdns) {
+                smartdns = 'disable';
+            }
 
-//        if (onlySmartdns) {
-//            smartdns = 'only';
-//        }
+            //        if (onlySmartdns) {
+            //            smartdns = 'only';
+            //        }
 
-        if (autoPath) {
-            port = 'autoPath';
-        }
+            if (autoPath) {
+                port = 'autoPath';
+            }
 
-        request.get(`${GENCONFIG_ENDPOINT}/${server}/${managementPort}/${port}/${encryption}/${smartdns}/${platform}`, (error, response, body) => {
+            request.get(`${GENCONFIG_ENDPOINT}/${server}/${managementPort}/${port}/${encryption}/${smartdns}/${platform}`, (error, response, body) => {
 
-          let configPath = path.resolve(process.env.CONFIG_PATH, 'config.ovpn');
-          fs.writeFileSync(configPath, body);
-          resolve(configPath);
+                let configPath = path.resolve(process.env.CONFIG_PATH, 'config.ovpn');
+                fs.writeFileSync(configPath, body);
+                resolve(configPath);
 
-        });
+            });
 
-    });
-  },
-
-  connectWithConsole: function () {
-    return new Promise((resolve, reject) => {
+        });
+    },
 
-        var port = fs.readFileSync(path.join(util.supportDir(), 'openvpn.port'));
+    connectWithConsole: function() {
+        return new Promise((resolve, reject) => {
 
-        var opts = {
-            host: 'localhost',
-            port: Number(port),
-            timeout: 1500
-        };
+            var port = fs.readFileSync(path.join(util.supportDir(), 'openvpn.port'));
 
-        var auth = {
-            user: _args.username,
-            pass: _args.password,
-        };
+            var opts = {
+                host: 'localhost',
+                port: Number(port),
+                timeout: 1500
+            };
 
-        openvpn = openvpnmanager.connect(opts);
+            var auth = {
+                user: _args.username,
+                pass: _args.password,
+            };
 
-        openvpn.on('connected', function() {
-            openvpnmanager.authorize(auth);
-        });
+            openvpn = openvpnmanager.connect(opts);
 
-        openvpn.on('pid', function(pid) {
-            fs.writeFileSync(path.join(util.supportDir(), 'openvpn.pid'), Number(pid));
-        });
+            openvpn.on('connected', function() {
+                openvpnmanager.authorize(auth);
+            });
 
-        openvpn.on('state-change', function(state) {
-            if (state[1] == 'CONNECTED') {
+            openvpn.on('pid', function(pid) {
+                fs.writeFileSync(path.join(util.supportDir(), 'openvpn.pid'), Number(pid));
+            });
 
+            openvpn.on('state-change', function(state) {
+                if (state[1] == 'CONNECTED') {
 
-                // update IP
-                vpnActions.checkIp();
 
-                log.info('Connection successful');
-                resolve();
+                    // update IP
+                    vpnActions.checkIp();
 
-            } else if (state[1] == 'EXITING') {
+                    log.info('Connection successful');
+                    resolve();
 
-                // auth failed
-                if (state[2] == 'auth-failure') {
-                    log.error('Invalid credentials');
-                    vpnActions.invalidCredentials();
-                    openvpn.removeAllListeners();
-                    openvpnmanager.destroy();
-                    vpnActions.disconnected();
-                }
+                } else if (state[1] == 'EXITING') {
 
-                // process killed
-                if (state[2] == 'exit-with-notification') {
-                    log.info('Disconnected');
-                    openvpn.removeAllListeners();
-                    openvpnmanager.destroy();
-                    vpnActions.disconnected();
-                    if (process.platform == 'win32') {
-                        log.info('Stopping windows service');
-                        util.exec(['net', 'stop', 'openvpnservice']);
+                    // auth failed
+                    if (state[2] == 'auth-failure') {
+                        log.error('Invalid credentials');
+                        vpnActions.invalidCredentials();
+                        openvpn.removeAllListeners();
+                        openvpnmanager.destroy();
+                        vpnActions.disconnected();
                     }
-                }
 
-            }
-        });
-
-        // error from the openvpn logs
-        openvpn.on('error', function(error) {
-            alert(error);
-            openvpnmanager.destroy();
-            openvpn.removeAllListeners();
-            vpnActions.disconnected();
-        });
-
-        // catch event from the telnet connection
-        openvpn.on('end', function(error) {
-            openvpnmanager.destroy();
-            openvpn.removeAllListeners();
-            vpnActions.disconnected();
-        });
-
-        openvpn.on('hold-waiting', function() {
-            openvpnmanager.cmd('hold release');
-        });
+                    // process killed
+                    if (state[2] == 'exit-with-notification') {
+                        log.info('Disconnected');
+                        openvpn.removeAllListeners();
+                        openvpnmanager.destroy();
+                        vpnActions.disconnected();
+                        if (process.platform == 'win32') {
+                            log.info('Stopping windows service');
+                            util.exec(['net', 'stop', 'openvpnservice']);
+                        }
+                    }
 
-        openvpn.on('console-output', function(output) {
-            log.info(output);
-        });
+                }
+            });
+
+            // error from the openvpn logs
+            openvpn.on('error', function(error) {
+                alert(error);
+                openvpnmanager.destroy();
+                openvpn.removeAllListeners();
+                vpnActions.disconnected();
+            });
+
+            // catch event from the telnet connection
+            openvpn.on('end', function(error) {
+                openvpnmanager.destroy();
+                openvpn.removeAllListeners();
+                vpnActions.disconnected();
+            });
+
+            openvpn.on('hold-waiting', function() {
+                openvpnmanager.cmd('hold release');
+            });
+
+            openvpn.on('console-output', function(output) {
+                log.info(output);
+            });
+
+            openvpn.on('bytecount', function(bytes) {
+                vpnActions.bytecount(bytes);
+            });
 
-        openvpn.on('bytecount', function(bytes) {
-            vpnActions.bytecount(bytes);
         });
-
-    });
-  },
-
-  connect: function (args) {
-
-    _args = args;
-
-    log.info("\n\n----------------------\nConnecting to "+ args.server + "\n");
-
-    return helpers.checkRunning()
-        .then(this.stopProcess)
-        .then(helpers.managementPort)
-        .then(this.generateConfig)
-        .then(this.launchProcess)
-        .then(this.connectWithConsole);
-  },
-
-  disconnect: function () {
-    return openvpnmanager.disconnect();
-  },
-
-  initCheck: function () {
-    var self = this;
-
-    log.info("\n\n----------------------\nWaiting app to be ready\n");
-
-    return helpers.checkRunning()
-        .then(this.stopProcess)
-        .then(myip.fetch)
-        .then(function() {
-
-            if (process.platform == 'win32') {
-
-                // we need to validate windows service
-                self.serviceStatus()
-                    .then(function(status) {
-
-                        if (status) {
-                            util.exec(['net', 'stop', 'openvpnservice'])
-                                .then(function() {
-                                    log.info('VPNUtil.init - App ready');
-                                    vpnActions.appReady();
-                                })
-                                .catch(function() {
-                                    log.warn('VPNUtil.init - App ready with error');
-                                    vpnActions.appReady();
-                                });
-                        } else {
-                            log.info('VPNUtil.init - App ready');
-                            vpnActions.appReady();
-                        }
-                    });
-
-            } else {
-                log.info('VPNUtil.init - App ready');
-                vpnActions.appReady();
-            }
+    },
+
+    connect: function(args) {
+
+        _args = args; // don't remove
+
+        log.info("\n\n----------------------\nConnecting to " + args.server.value + "\n");
+
+        return helpers.checkRunning()
+            .then(this.stopProcess)
+            .then(helpers.managementPort)
+            .then(this.generateConfig)
+            .then(this.launchProcess)
+            .then(this.connectWithConsole);
+    },
+
+    disconnect: function() {
+        return openvpnmanager.disconnect();
+    },
+
+    initCheck: function() {
+        var self = this;
+
+        log.info("\n\n----------------------\nWaiting app to be ready\n");
+
+        return helpers.checkRunning()
+            .then(this.stopProcess)
+            .then(myip.fetch)
+            .then(function() {
+
+                if (process.platform == 'win32') {
+
+                    // we need to validate windows service
+                    self.serviceStatus()
+                        .then(function(status) {
+
+                            if (status) {
+                                util.exec(['net', 'stop', 'openvpnservice'])
+                                    .then(function() {
+                                        log.info('VPNUtil.init - App ready');
+                                        vpnActions.appReady();
+                                    })
+                                    .catch(function() {
+                                        log.warn('VPNUtil.init - App ready with error');
+                                        vpnActions.appReady();
+                                    });
+                            } else {
+                                log.info('VPNUtil.init - App ready');
+                                vpnActions.appReady();
+                            }
+                        });
+
+                } else {
+                    log.info('VPNUtil.init - App ready');
+                    vpnActions.appReady();
+                }
 
 
-        });
-  }
+            });
+    }
 
-});
+});
\ No newline at end of file
diff --git a/src/utils/VPNUtilMac.js b/src/utils/VPNUtilMac.js
index 0c49532..6df4f68 100644
--- a/src/utils/VPNUtilMac.js
+++ b/src/utils/VPNUtilMac.js
@@ -1,7 +1,6 @@
 import resources from './ResourcesUtil';
 import util from './Util';
 import path from 'path';
-import Promise from 'bluebird';
 import log from '../stores/LogStore';
 import fs from 'fs';
 import running from 'is-running';
@@ -9,92 +8,81 @@ import helpers from './VPNHelpers';
 
 module.exports = {
 
-  launchProcess: function (config) {
-    return util.exec([
-        path.join(resources.resourceDir(), 'openvpn'),
-        '--config', config,
-        '--script-security', '2',
-        '--up', path.join(resources.resourceDir(), 'script.up.launch'),
-        '--down', path.join(resources.resourceDir(), 'script.down.launch'),
-        '--daemon'
-    ]);
-  },
+    launchProcess: function(config) {
+        return util.exec([
+            path.join(resources.resourceDir(), 'openvpn'),
+            '--config', config,
+            '--script-security', '2',
+            '--up', path.join(resources.resourceDir(), 'script.up.launch'),
+            '--down', path.join(resources.resourceDir(), 'script.down.launch'),
+            '--daemon'
+        ]);
+    },
 
-  stopProcess: function (isRunning) {
-    if (isRunning) {
+    stopProcess: function(isRunning) {
+        if (isRunning) {
 
-        var pid = fs.readFileSync(path.join(util.supportDir(), 'openvpn.pid'));
-        var port = fs.readFileSync(path.join(util.supportDir(), 'openvpn.port'));
+            var pid = fs.readFileSync(path.join(util.supportDir(), 'openvpn.pid'));
+            var port = fs.readFileSync(path.join(util.supportDir(), 'openvpn.port'));
 
-        log.info('Stopping previous openvpn service PID: ' + pid + ' PORT ' + port);
+            log.info('Stopping previous openvpn service PID: ' + pid + ' PORT ' + port);
 
-        return new Promise((resolve) => {
-            helpers.softKill(Number(port))
-                .then(function() {
+            return new Promise((resolve) => {
+                helpers.softKill(Number(port))
+                    .then(function() {
 
-                    // checking if process stopped as security
-                    running(Number(pid), function(err, live) {
-                        if (err) {
-                            // weird?
+                        // checking if process stopped as security
+                        if (running(Number(pid))) {
+                            // process running
+                            log.info('Process still running, running manual kill');
+                            util.exec(['kill', '-9', Number(pid)])
+                                .then(function() {
+                                    log.info('Process stopped successfully');
+                                    resolve();
+                                });
+                        } else {
+                            // process stopped
                             log.info('Process stopped successfully');
                             resolve();
-
-                        } else {
-                            if (live) {
-                                // process running
-                                log.info('Process still running running manual kill');
-                                util.exec(['kill', '-9', Number(pid)])
-                                    .then(function() {
-                                        log.info('Process stopped successfully');
-                                        resolve();
-                                    });
-
-                            } else {
-                                // process stopped
-                                log.info('Process stopped successfully');
-                                resolve();
-                            }
                         }
-                    });
-
-                })
-                .catch(function() {
-                    log.info('We have to kill the process manually');
-                    util.exec(['kill', '-9', Number(pid)])
-                        .then(function() {
-                            resolve();
-                        });
-                })
-        });
+                    })
+                    .catch(function() {
+                        log.info('We have to kill the process manually');
+                        util.exec(['kill', '-9', Number(pid)])
+                            .then(function() {
+                                resolve();
+                            });
+                    })
+            });
 
-    } else {
-        return Promise.resolve();
-    }
-  },
+        } else {
+            return Promise.resolve();
+        }
+    },
 
-  enableStartOnBoot: function(hidden) {
-    return util.exec([
-        'osascript',
-        path.join(resources.resourceDir(), 'scripts/LoginItemAdd.scpt'),
-        'VPN.ht'
-    ]);
-  },
+    enableStartOnBoot: function(hidden) {
+        return util.exec([
+            'osascript',
+            path.join(resources.resourceDir(), 'scripts/LoginItemAdd.scpt'),
+            'VPN.ht'
+        ]);
+    },
 
-  disableStartOnBoot: function() {
-    return util.exec([
-        'osascript',
-        path.join(resources.resourceDir(), 'scripts/LoginItemRemove.scpt'),
-        'VPN.ht'
-    ]);
-  },
+    disableStartOnBoot: function() {
+        return util.exec([
+            'osascript',
+            path.join(resources.resourceDir(), 'scripts/LoginItemRemove.scpt'),
+            'VPN.ht'
+        ]);
+    },
 
-  statusStartOnBoot: function() {
-    return util.exec([
-        'osascript',
-        path.join(resources.resourceDir(), 'scripts/LoginItemCheck.scpt')
-    ]).then(function(stdout) {
-        return stdout == 1 ? true : false;
-    });
-  }
+    statusStartOnBoot: function() {
+        return util.exec([
+            'osascript',
+            path.join(resources.resourceDir(), 'scripts/LoginItemCheck.scpt')
+        ]).then(function(stdout) {
+            return stdout == 1 ? true : false;
+        });
+    }
 
-};
+};
\ No newline at end of file
diff --git a/src/utils/VPNUtilWindows.js b/src/utils/VPNUtilWindows.js
index 5b18fcc..3b9debd 100644
--- a/src/utils/VPNUtilWindows.js
+++ b/src/utils/VPNUtilWindows.js
@@ -2,11 +2,11 @@ import resources from './ResourcesUtil';
 import util from './Util';
 import path from 'path';
 import Winreg from 'winreg';
-import Promise from 'bluebird';
 import fs from 'fs';
 import helpers from './VPNHelpers';
 import log from '../stores/LogStore';
 import ps from 'xps';
+import {remote} from 'electron';
 
 import serviceManager from 'windows-service-manager';
 
@@ -95,7 +95,7 @@ module.exports = {
     },
     enableStartOnBoot: function(hidden) {
         return new Promise((resolve) => {
-            regKey.set('VPNht', Winreg.REG_SZ, "\"" + require('remote').require('app').getPath('exe') + (hidden ? ' --hide' : '') + "\"", function() {
+            regKey.set('VPNht', Winreg.REG_SZ, "\"" + remote.app.getPath('exe') + (hidden ? ' --hide' : '') + "\"", function() {
                 resolve();
             });
         });
diff --git a/src/utils/WebUtil.js b/src/utils/WebUtil.js
index d5444ef..3e95bee 100755
--- a/src/utils/WebUtil.js
+++ b/src/utils/WebUtil.js
@@ -1,72 +1,73 @@
-import remote from 'remote';
-var app = remote.require('app');
+import {remote} from 'electron';
 import fs from 'fs';
 import util from './Util';
 import path from 'path';
 import bugsnag from 'bugsnag-js';
 import metrics from './MetricsUtil';
 
+var app = remote.app;
+
 var WebUtil = {
-  addLiveReload: function () {
-    if (process.env.NODE_ENV === 'development') {
-      var head = document.getElementsByTagName('head')[0];
-      var script = document.createElement('script');
-      script.type = 'text/javascript';
-      script.src = 'http://localhost:35729/livereload.js';
-      head.appendChild(script);
-    }
-  },
-  addBugReporting: function () {
-    var settingsjson = util.settingsjson();
+    addLiveReload: function() {
+        if (process.env.NODE_ENV === 'development') {
+            var head = document.getElementsByTagName('head')[0];
+            var script = document.createElement('script');
+            script.type = 'text/javascript';
+            script.src = 'http://localhost:35729/livereload.js';
+            head.appendChild(script);
+        }
+    },
+    addBugReporting: function() {
+        var settingsjson = util.settingsjson();
 
-    if (settingsjson.bugsnag) {
-      bugsnag.apiKey = settingsjson.bugsnag;
-      bugsnag.autoNotify = true;
-      bugsnag.releaseStage = process.env.NODE_ENV === 'development' ? 'development' : 'production';
-      bugsnag.notifyReleaseStages = ['production'];
-      bugsnag.appVersion = app.getVersion();
-      bugsnag.metaData = {
-        beta: !!settingsjson.beta
-      };
+        if (settingsjson.bugsnag) {
+            bugsnag.apiKey = settingsjson.bugsnag;
+            bugsnag.autoNotify = true;
+            bugsnag.releaseStage = process.env.NODE_ENV === 'development' ? 'development' : 'production';
+            bugsnag.notifyReleaseStages = ['production'];
+            bugsnag.appVersion = app.getVersion();
+            bugsnag.metaData = {
+                beta: !!settingsjson.beta
+            };
 
-      bugsnag.beforeNotify = function(payload) {
-        if (!metrics.enabled()) {
-          return false;
-        }
+            bugsnag.beforeNotify = function(payload) {
+                if (!metrics.enabled()) {
+                    return false;
+                }
 
-        payload.stacktrace = util.removeSensitiveData(payload.stacktrace);
-        payload.context = util.removeSensitiveData(payload.context);
-        payload.file = util.removeSensitiveData(payload.file);
-        payload.message = util.removeSensitiveData(payload.message);
-        payload.url = util.removeSensitiveData(payload.url);
-        payload.name = util.removeSensitiveData(payload.name);
-        payload.file = util.removeSensitiveData(payload.file);
+                payload.stacktrace = util.removeSensitiveData(payload.stacktrace);
+                payload.context = util.removeSensitiveData(payload.context);
+                payload.file = util.removeSensitiveData(payload.file);
+                payload.message = util.removeSensitiveData(payload.message);
+                payload.url = util.removeSensitiveData(payload.url);
+                payload.name = util.removeSensitiveData(payload.name);
+                payload.file = util.removeSensitiveData(payload.file);
 
-        for(var key in payload.metaData) {
-          payload.metaData[key] = util.removeSensitiveData(payload.metaData[key]);
-        }
-      };
-    }
-  },
-  disableGlobalBackspace: function () {
-    document.onkeydown = function (e) {
-      e = e || window.event;
-      var doPrevent;
-      if (e.keyCode === 8) {
-        var d = e.srcElement || e.target;
-        if (d.tagName.toUpperCase() === 'INPUT' || d.tagName.toUpperCase() === 'TEXTAREA') {
-          doPrevent = d.readOnly || d.disabled;
-        } else {
-          doPrevent = true;
+                for (var key in payload.metaData) {
+                    payload.metaData[key] = util.removeSensitiveData(payload.metaData[key]);
+                }
+            };
         }
-      } else {
-        doPrevent = false;
-      }
-      if (doPrevent) {
-        e.preventDefault();
-      }
-    };
-  },
+    },
+    disableGlobalBackspace: function() {
+        document.onkeydown = function(e) {
+            e = e || window.event;
+            var doPrevent;
+            if (e.keyCode === 8) {
+                var d = e.srcElement || e.target;
+                if (d.tagName.toUpperCase() === 'INPUT' || d.tagName.toUpperCase() === 'TEXTAREA') {
+                    doPrevent = d.readOnly || d.disabled;
+                } else {
+                    doPrevent = true;
+                }
+            } else {
+                doPrevent = false;
+            }
+            if (doPrevent) {
+                e.preventDefault();
+            }
+        };
+    },
 };
 
-module.exports = WebUtil;
+module.exports = WebUtil;
\ No newline at end of file
diff --git a/src/utils/localizationUtil.js b/src/utils/localizationUtil.js
new file mode 100644
index 0000000..8a252f9
--- /dev/null
+++ b/src/utils/localizationUtil.js
@@ -0,0 +1,44 @@
+import {ipcRenderer} from 'electron';
+
+const localization = {
+    init: function() {
+        let availableLocales = ['en', 'fr'],
+            detectedLocale = false,
+            pureLanguage = navigator.language.toLowerCase(),
+            baseLanguage = pureLanguage.slice(0, 2);
+
+        // autodetection
+        if (availableLocales.indexOf(pureLanguage) !== -1) {
+            detectedLocale = pureLanguage;
+        } else if (availableLocales.indexOf(baseLanguage) !== -1) {
+            detectedLocale = baseLanguage;
+        } else {
+            detectedLocale = 'en';
+        }
+
+        // load translations
+        for (let i in availableLocales) {
+            let l = availableLocales[i];
+            try {
+                sessionStorage[l] = JSON.stringify(require('../translations/' + l));
+            } catch (e) {
+                console.error('Unable to load language:', l);
+            }
+        }
+        sessionStorage.locale = detectedLocale;
+
+        // build tray
+        ipcRenderer.send('localization.ready', sessionStorage[detectedLocale]);
+    },
+    t: function translate(str) {
+        let tr = str;
+        try {
+            tr = JSON.parse(sessionStorage[sessionStorage.locale])[str] || tr;
+        } catch (e) {
+            console.error('Unable to translate "' + str + '" because', e);
+        }
+        return tr;
+    }
+}
+
+module.exports = localization;
\ No newline at end of file
diff --git a/styles/about.less b/styles/about.less
new file mode 100644
index 0000000..db0b2e8
--- /dev/null
+++ b/styles/about.less
@@ -0,0 +1,36 @@
+.about-content .items {
+    margin-top: 15vh;
+    position: relative;
+    width: 68%;
+    margin-left: 32%;
+}
+
+.about-content a {
+    cursor: pointer;
+}
+
+.about-content .goback {
+    font-size: 1.7em;
+    padding: 10px;
+}
+
+.about-content .item {
+    text-align: justify;
+    padding: 15px;
+    width: 60%;
+    margin: 5vh auto;
+}
+
+.about-content img {
+    float: left;
+    margin-right: 10px;
+    width: 25%;
+    height: 25%;
+}
+
+.about-content .foot {
+    text-align: center;
+    margin-top: 15px;
+    opacity: .75;
+    font-style: italic;
+}
\ No newline at end of file
diff --git a/styles/content.less b/styles/content.less
index ca40529..eb5066d 100644
--- a/styles/content.less
+++ b/styles/content.less
@@ -11,6 +11,11 @@
     position: relative;
 }
 
+.win32 .content-container,
+.win32 .content-scroller {
+    height: calc(~"100vh - 102px");
+}
+
 section {
     float: right;
     padding-top: 25px;
@@ -37,7 +42,7 @@ section .title {
 
 section .connectionstatus {
     float: left;
-    min-width: 30vw;
+    min-width: 29vw;
 }
 
 section .connectionstatus p {
@@ -81,7 +86,6 @@ section button {
 }
 
 section button:hover {
-    height: 41px;
     background-color: #00a3a2;
 }
 
@@ -136,6 +140,7 @@ section textarea.logs {
   background-color: #ffffff;
   padding: 15px 15px;;
   -webkit-user-select: all;
+  resize: none;
 }
 
 section .console-output p {
@@ -204,6 +209,7 @@ section label {
     position: absolute;
     width: 18px;
     height: 18px;
+    white-space: nowrap;
     background-color: white;
     border: 1px solid #ccc;
 }
@@ -226,6 +232,7 @@ section .checkbox p.info {
     border-left-style: solid;
     position: relative;
     border-left-width: 1px;
+    float: right;
 }
 
 section label:after {
@@ -236,7 +243,8 @@ section label:after {
     color: #1eb7b5;
     font-size: 38px;
     margin-left: 2px;
-    position: relative;
+    position: absolute;
+    left: 0;
     top: -9px;
     transform: rotate(-10deg);
 }
diff --git a/styles/header.less b/styles/header.less
index 7b13a59..1c421fd 100755
--- a/styles/header.less
+++ b/styles/header.less
@@ -160,3 +160,7 @@
     }
   }
 }
+
+.win32 .header {
+    display: none
+}
\ No newline at end of file
diff --git a/styles/main.less b/styles/main.less
index fdda46e..ed0f4b4 100755
--- a/styles/main.less
+++ b/styles/main.less
@@ -5,13 +5,14 @@
 @import "subheader.less";
 @import "sidebar.less";
 @import "content.less";
+@import "about.less";
 @import "footer.less";
 @import "responsive.less";
 @import "ionicons.less";
 @import "flags.less";
 @import "fonts.less";
 
-html, body {
+html, body, #root {
   margin:0px;
   font-family: 'Roboto', sans-serif;
   font-smooth: always;
@@ -24,9 +25,7 @@ html, body {
   height: 100%;
   width: 100%;
   background-color: #edeced;
-  -webkit-font-smoothing: subpixel-antialiased;
   text-rendering: optimizelegibility;
-  //-webkit-font-smoothing: antialiased;
   img {
     pointer-events: none;
   }
diff --git a/styles/responsive.less b/styles/responsive.less
index 92e6d79..9087c13 100644
--- a/styles/responsive.less
+++ b/styles/responsive.less
@@ -50,7 +50,6 @@
 
     section label:after {
         margin-left: 2px;
-        position: relative;
         top: -6px;
         font-size: 25px;
     }
@@ -64,7 +63,7 @@
         font-size: 80%;
     }
 
-    .Select-control, .Select-placeholder {
+    .Select-control, .Select-placeholder, .Select-value {
         padding: 9px 52px 9px 10px;
     }
 
@@ -75,4 +74,14 @@
     .Select-arrow {
         top: 15px;
     }
+
+    .about-content {
+        font-size: 12px;
+        font-weight: 200;
+        line-height: 16px;
+    }
+
+    .about-content .items {
+        margin-top: 0px;
+    }
 }
diff --git a/styles/sidebar.less b/styles/sidebar.less
index db43f59..707298d 100644
--- a/styles/sidebar.less
+++ b/styles/sidebar.less
@@ -9,6 +9,10 @@
     float: left;
 }
 
+.win32 .sidebar {
+    height: calc(~"100vh - 102px");
+}
+
 .sidebar a.active li {
     background-color: #02a5a3;
 }
@@ -37,4 +41,4 @@
     margin-top: 18px;
     color: #595959;
     margin-left: 9px;
-}
+}
\ No newline at end of file
diff --git a/styles/subheader.less b/styles/subheader.less
index 24c2f93..4a706eb 100644
--- a/styles/subheader.less
+++ b/styles/subheader.less
@@ -52,6 +52,10 @@ header .status {
     right: 167px;
 }
 
+.win32 header .status {
+    top: 30px;
+}
+
 header .status p {
     font-family: "Gotham Rounded";
     font-size: 14px;
diff --git a/translations/en.json b/translations/en.json
new file mode 100644
index 0000000..cf65a98
--- /dev/null
+++ b/translations/en.json
@@ -0,0 +1,100 @@
+{
+    "Toggle": "Toggle",
+    "Connect": "Connect",
+    "Disconnect": "Disconnect",
+    "Quit": "Quit",
+    "Show Window": "Show Window",
+    "Cancel connecting...": "Cancel connecting...",
+    "Connected": "Connected",
+    "Disconnected": "Disconnected",
+
+    "Another instance of VPN.ht is already running. Only one instance of the app can be open at a time": "Another instance of VPN.ht is already running. Only one instance of the app can be open at a time",
+    "OK": "OK",
+    "A new version is available, do you want to install now?": "A new version is available, do you want to install now?",
+    "Yes": "Yes",
+    "No": "No",
+
+    "About": "About",
+    "Manage Account": "Manage Account",
+    "Hide": "Hide",
+    "Hide Others": "Hide Others",
+    "Show All": "Show All",
+    "View": "View",
+    "Toggle DevTools": "Toggle DevTools",
+    "Window": "Window",
+    "Close": "Close",
+    "Minimize": "Minimize",
+    "Bring All to Front": "Bring All to Front",
+    "Help": "Help",
+    "Support": "Support",
+    "Report Issue or Suggest Feedback": "Report Issue or Suggest Feedback",
+
+    "Username should not be left blank": "Username should not be left blank",
+    "Password should not be left blank": "Password should not be left blank",
+    "You should select a server": "You should select a server",
+    "Loading...": "Loading...",
+    "Connecting...": "Connecting...",
+    "VPN connection status": "VPN connection status",
+    "cancel": "cancel",
+    "connect to vpn": "connect to vpn",
+    "Login": "Login",
+    "Username": "Username",
+    "Password": "Password",
+    "Remember my username and password": "Remember my username and password",
+    "Servers": "Servers",
+    "Select server": "Select server",
+    "disconnect vpn": "disconnect vpn",
+    "IP and Country Overview": "IP and Country Overview",
+    "Your New IP Address:": "Your New IP Address:",
+    "Your New ISP Location:": "Your New ISP Location:",
+    "Quick IP Address Management": "Quick IP Address Management",
+    "Change IP Address": "Change IP Address",
+    "Verify new IP Address": "Verify new IP Address",
+
+    "Connection report": "Connection report",
+    "Log Copied": "Log Copied",
+    "Your log file has been copied successfully.": "Your log file has been copied successfully.",
+    "Select path for log file": "Select path for log file",
+    "Log files": "Log files",
+    "Unable to save log path": "Unable to save log path",
+    "Looks like we can't save the log file. Try again with another path.": "Looks like we can't save the log file. Try again with another path.",
+    "Log saved!": "Log saved!",
+    "Your log file has been saved successfully.": "Your log file has been saved successfully.",
+    "Export": "Export",
+    "Copy to clipboard": "Copy to clipboard",
+
+    "Report an issue or suggest feedback.": "Report an issue or suggest feedback.",
+    "Change app preferences.": "Change app preferences.",
+
+    "UPDATE NOW": "UPDATE NOW",
+
+    "Default": "Default",
+    "Custom Port": "Custom Port",
+    "General": "General",
+    "Report anonymous usage analytics": "Report anonymous usage analytics",
+    "Auto-connect after launch (requires a saved user/pass)": "Auto-connect after launch (requires a saved user/pass)",
+    "Launch on operating system startup": "Launch on operating system startup",
+    "Launch on operating system startup hidden": "Launch on operating system startup hidden",
+    "Disable SmartDNS": "Disable SmartDNS",
+    "Minimize to taskbar": "Minimize to taskbar",
+    "Encryption": "Encryption",
+    "Auto Path": "Auto Path",
+    "Enabled": "Enabled",
+    "Disabled": "Disabled",
+    "Feature that tries alternate ports in order to resolve certain types of connections issues.": "Feature that tries alternate ports in order to resolve certain types of connections issues.",
+
+    "dashboard": "dashboard",
+    "preferences": "preferences",
+
+    "connected!": "connected!",
+    "Your internet traffic is now encrypted! and your online identity has become anonymous.": "Your internet traffic is now encrypted! and your online identity has become anonymous.",
+    "not connected!": "not connected!",
+    "Your internet traffic is unencrypted and your online identity is exposed.": "Your internet traffic is unencrypted and your online identity is exposed.",
+
+    "Nearest Server (Random)": "Nearest Server (Random)",
+
+    "Plug and play!": "Plug and play!",
+    "You can start using our service, and start surfing in privacy, as soon as you create an account.": "You can start using our service, and start surfing in privacy, as soon as you create an account.",
+    "No logs": "No logs",
+    "You value your privacy. So do we. We don’t keep logs, we don’t know the sites you have visited or the applications you’ve used.": "You value your privacy. So do we. We don’t keep logs, we don’t know the sites you have visited or the applications you’ve used."
+}
\ No newline at end of file
diff --git a/translations/fr.json b/translations/fr.json
new file mode 100644
index 0000000..924c49c
--- /dev/null
+++ b/translations/fr.json
@@ -0,0 +1,100 @@
+{
+    "Toggle": "Montrer/cacher",
+    "Connect": "Se connecter",
+    "Disconnect": "Se déconnecter",
+    "Quit": "Quitter",
+    "Show Window": "Montrer la fenêtre",
+    "Cancel connecting...": "Interrompre la connexion...",
+    "Connected": "Connecté",
+    "Disconnected": "Déconnecté",
+
+    "Another instance of VPN.ht is already running. Only one instance of the app can be open at a time": "VPN.ht est déjà en cours d'utilisation. L'application ne peut être ouverte qu'une seule fois",
+    "OK": "OK",
+    "A new version is available, do you want to install now?": "Une nouvelle version est disponible, l'installer maintenant ?",
+    "Yes": "Oui",
+    "No": "Non",
+
+    "About": "À propos",
+    "Manage Account": "Gestion de compte",
+    "Hide": "Cacher",
+    "Hide Others": "Cacher les autres",
+    "Show All": "Montrer tout",
+    "View": "Affichage",
+    "Toggle DevTools": "Outils de développement",
+    "Window": "Fenêtre",
+    "Close": "Fermer",
+    "Minimize": "Réduire",
+    "Bring All to Front": "Mettre à l'avant-plan",
+    "Help": "Aide",
+    "Support": "Assistance",
+    "Report Issue or Suggest Feedback": "Signaler un problème ou une suggestion",
+
+    "Username should not be left blank": "Le nom d'utilisateur ne peut pas être vide",
+    "Password should not be left blank": "Le mot de passe ne peut pas être vide",
+    "You should select a server": "Un serveur doit être sélectionné",
+    "Loading...": "Chargement...",
+    "Connecting...": "Connexion...",
+    "VPN connection status": "Statut de la connexion VPN",
+    "cancel": "annuler",
+    "connect to vpn": "se connecter au vpn",
+    "Login": "Identifiants",
+    "Username": "Nom d'utilisateur",
+    "Password": "Mot de passe",
+    "Remember my username and password": "Se souvenir de moi",
+    "Servers": "Serveurs",
+    "Select server": "Sélectionner un serveur",
+    "disconnect vpn": "déconnecter le vpn",
+    "IP and Country Overview": "Adresse IP et pays",
+    "Your New IP Address:": "Nouvelle adresse IP :",
+    "Your New ISP Location:": "Origine du fournisseur d'accès :",
+    "Quick IP Address Management": "Gestion de l'adresse IP",
+    "Change IP Address": "Changer d'adresse IP",
+    "Verify new IP Address": "Vérifier l'adresse IP",
+
+    "Connection report": "Rapport de connexion",
+    "Log Copied": "Fichier journal copié",
+    "Your log file has been copied successfully.": "Le fichier journal a bien été copié.",
+    "Select path for log file": "Sélectionner un chemin",
+    "Log files": "Fichiers journaux",
+    "Unable to save log path": "Impossible de sauvegarder sur ce chemin",
+    "Looks like we can't save the log file. Try again with another path.": "Il semblerait qu'il est impossible de sauvegarder le fichier journal à cet emplacement.",
+    "Log saved!": "Fichier journal sauvegardé !",
+    "Your log file has been saved successfully.": "Votre fichier journal a bien été sauvegardé.",
+    "Export": "Exporter",
+    "Copy to clipboard": "Copier dans le presse-papier",
+
+    "Report an issue or suggest feedback.": "Signaler un problème ou une suggestion.",
+    "Change app preferences.": "Changer les paramètres de l'application.",
+
+    "UPDATE NOW": "METTRE À JOUR",
+
+    "Default": "Par défaut",
+    "Custom Port": "Port",
+    "General": "Général",
+    "Report anonymous usage analytics": "Envoyer des données d'utilisation anonymes",
+    "Auto-connect after launch (requires a saved user/pass)": "Se connecter automatiquement au lancement",
+    "Launch on operating system startup": "Lancer au démarrage du système",
+    "Launch on operating system startup hidden": "Lancer minimisé au démarrage du système",
+    "Disable SmartDNS": "Désactiver les DNS intelligents",
+    "Minimize to taskbar": "Réduire dans la barre des tâches",
+    "Encryption": "Chiffrement",
+    "Auto Path": "Connectivité automatique",
+    "Enabled": "Activé",
+    "Disabled": "Désactivé",
+    "Feature that tries alternate ports in order to resolve certain types of connections issues.": "Permet d'essayer des ports différents pour résoudre certains problèmes de connectivité.",
+
+    "dashboard": "Tableau de bord",
+    "preferences": "Paramètres",
+
+    "connected!": "connecté !",
+    "Your internet traffic is now encrypted! and your online identity has become anonymous.": "Le trafic Internet est chiffré et anonyme ! Votre identité en ligne est protégée.",
+    "not connected!": "non connecté !",
+    "Your internet traffic is unencrypted and your online identity is exposed.": "Le trafic Internet n'est pas chiffré, votre identité en ligne est vulnérable.",
+
+    "Nearest Server (Random)": "Le plus proche (au hasard)",
+
+    "Plug and play!": "Plug & play!",
+    "You can start using our service, and start surfing in privacy, as soon as you create an account.": "Vous pouvez commencer à utiliser nos services et surfer en tout anonymat dès que votre compte est créé.",
+    "No logs": "Pas de traces",
+    "You value your privacy. So do we. We don’t keep logs, we don’t know the sites you have visited or the applications you’ve used.": "Vous tenez à votre vie privée. Nous aussi. Nous ne conservons aucunes données, nous ne connaissons donc pas les sites que vous avez consultés ou les applications que vous avez utilisées."
+}
\ No newline at end of file