diff --git a/package.json b/package.json
index c8f8061d..0d54662e 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "@ngrx/store-log-monitor": "3.0.2",
     "@types/core-js": "0.9.34",
     "@types/jquery": "2.0.32",
-    "@types/node": "6.0.40",
+    "@types/node": "6.0.41",
     "copy-webpack-plugin": "^3.0.1",
     "electron": "1.4.1",
     "html-loader": "0.4.4",
@@ -30,15 +30,15 @@
     "webpack-svgstore-plugin": "^2.2.2"
   },
   "dependencies": {
-    "@angular/common": "2.0.0",
-    "@angular/compiler": "2.0.0",
-    "@angular/core": "2.0.0",
-    "@angular/forms": "2.0.0",
-    "@angular/platform-browser": "2.0.0",
-    "@angular/platform-browser-dynamic": "2.0.0",
-    "@angular/router": "3.0.0",
+    "@angular/common": "2.1.0-beta.0",
+    "@angular/compiler": "2.1.0-beta.0",
+    "@angular/core": "2.1.0-beta.0",
+    "@angular/forms": "2.1.0-beta.0",
+    "@angular/platform-browser": "2.1.0-beta.0",
+    "@angular/platform-browser-dynamic": "2.1.0-beta.0",
+    "@angular/router": "3.0.1",
     "@ngrx/core": "1.2.0",
-    "@ngrx/effects": "2.0.0-beta.3",
+    "@ngrx/effects": "2.0.0",
     "@ngrx/store": "2.2.1",
     "bootstrap": "^3.3.7",
     "browser-stdout": "^1.3.0",
@@ -48,7 +48,7 @@
     "jquery": "3.1.1",
     "json-loader": "^0.5.4",
     "ng2-dragula": "1.2.1",
-    "ng2-select2": "0.4.2",
+    "ng2-select2": "0.5.1",
     "rxjs": "5.0.0-beta.12",
     "select2": "^4.0.3",
     "typescript": "2.0.3",
diff --git a/src/app.module.ts b/src/app.module.ts
index c4f6b050..afe0e168 100644
--- a/src/app.module.ts
+++ b/src/app.module.ts
@@ -5,7 +5,7 @@ import { BrowserModule } from '@angular/platform-browser';
 import { StoreModule } from '@ngrx/store';
 
 import { DragulaModule } from 'ng2-dragula/ng2-dragula';
-import { Select2Component } from 'ng2-select2/ng2-select2';
+import { Select2Module } from 'ng2-select2/ng2-select2';
 
 import { AddOnComponent } from './components/add-on';
 import { KeymapAddComponent, KeymapComponent, KeymapHeaderComponent } from './components/keymap';
@@ -74,7 +74,6 @@ const storeConfig = {
 
 @NgModule({
     declarations: [
-        Select2Component,
         MainAppComponent,
         KeymapComponent,
         KeymapHeaderComponent,
@@ -127,7 +126,8 @@ const storeConfig = {
                 position: 'right'
             })
         }),
-        StoreLogMonitorModule
+        StoreLogMonitorModule,
+        Select2Module
     ],
     providers: [
         DataProviderService,
diff --git a/src/webpack.config.js b/src/webpack.config.js
index 9dd637c2..84a42266 100644
--- a/src/webpack.config.js
+++ b/src/webpack.config.js
@@ -15,7 +15,7 @@ module.exports = {
     devtool: 'source-map',
     resolve: {
         extensions: ['', '.webpack.js', '.web.js', '.ts', '.js'],
-        modulesDirectories: ['node_modules']
+        modules: [ path.join(rootDir, "node_modules") ]
     },
     module: {
         loaders: [