diff --git a/gulp.config.js b/gulp.config.js
index 4f3d0c1..7cc1da1 100644
--- a/gulp.config.js
+++ b/gulp.config.js
@@ -61,6 +61,7 @@ module.exports = {
                 './src/BoardZ/vendor/jquery/jquery-2.1.4.js',
                 './src/BoardZ/vendor/jquery/jquery.hammer.js',
                 './src/BoardZ/vendor/jquery/jquery.slimscroll.js',
+                './src/BoardZ/vendor/pNotify/pnotify-adapter.js',
                 './src/BoardZ/vendor/pNotify/pnotify.custom.js',
                 './src/BoardZ/vendor/signalr/signalr.js',
                 './src/BoardZ/vendor/bootstrap/js/bootstrap.js',
diff --git a/src/BoardZ/app/main.ts b/src/BoardZ/app/main.ts
index 5d7dac4..fcd4e20 100644
--- a/src/BoardZ/app/main.ts
+++ b/src/BoardZ/app/main.ts
@@ -1,3 +1,15 @@
+// require all 3rd party libs
+import 'jquery';
+import 'bootstrap/js/bootstrap';
+import 'admin-lte/js/app';
+import 'hammerjs/hammer';
+import 'jquery/jquery.hammer';
+import 'jquery/jquery.slimscroll';
+import 'pNotify/pnotify-adapter';
+import 'signalr/signalr';
+import 'leaflet/leaflet';
+import 'fastclick/fastclick';
+
 ///<reference path="../../../node_modules/angular2/typings/browser.d.ts"/>
 
 import {bootstrap} from 'angular2/platform/browser';
diff --git a/src/BoardZ/system.setup.js b/src/BoardZ/system.setup.js
index 1625992..4a47a05 100644
--- a/src/BoardZ/system.setup.js
+++ b/src/BoardZ/system.setup.js
@@ -7,47 +7,19 @@ System.config({
     },
     map: {
         'jquery': 'scripts/bundles/jquery-2.1.4.js',
-        'hammer/hammer': 'scripts/bundles/hammer.js',
-        'jquery/jquery-hammer': 'scripts/bundles/jquery.hammer.js',
-        'jquery/jquery.slimscroll': 'scripts/bundles/jquery.slimscroll.js',
         'bootstrap/js/bootstrap': 'scripts/bundles/bootstrap.js',
-        'pnotify/pnotify.custom': 'scripts/bundles/pnotify.custom.js',
         'admin-lte/js/app': 'scripts/bundles/app.js',
+        'jquery/jquery.hammer': 'scripts/bundles/jquery.hammer.js',
+        'hammerjs': 'scripts/bundles/hammer.js',
+        'hammerjs/hammer': 'scripts/bundles/hammer.js',
+        'jquery/jquery.slimscroll': 'scripts/bundles/jquery.slimscroll.js',
+        'pnotify': 'scripts/bundles/pnotify.custom.js',
+        'pNotify/pnotify-adapter': 'scripts/bundles/pnotify-adapter.js',
         'signalr/signalr': 'scripts/bundles/signalr.js',
         'leaflet/leaflet': 'scripts/bundles/leaflet-src.js',
         'fastclick/fastclick': 'scripts/bundles/fastclick.js'
     }
 });
 
-System.import('jquery')
-    .then(function () {
-        return System.import('hammer/hammer');
-    })
-    .then(function () {
-        return System.import('jquery/jquery-hammer');
-    })
-    .then(function () {
-        return System.import('jquery/jquery.slimscroll');
-    })
-    .then(function () {
-        return System.import('pnotify/pnotify.custom');
-    })
-    .then(function () {
-        return System.import('signalr/signalr');
-    })
-    .then(function () {
-        return System.import('bootstrap/js/bootstrap');
-    })
-    .then(function () {
-        return System.import('fastclick/fastclick');
-    })
-    .then(function () {
-        return System.import('admin-lte/js/app');
-    })
-    .then(function () {
-        return System.import('leaflet/leaflet');
-    })
-    .then(function () {
-        return System.import('app/main');
-    })
+System.import('app/main')
     .then(null, console.error.bind(console));
diff --git a/src/BoardZ/vendor/pNotify/pnotify-adapter.js b/src/BoardZ/vendor/pNotify/pnotify-adapter.js
new file mode 100644
index 0000000..e9fa494
--- /dev/null
+++ b/src/BoardZ/vendor/pNotify/pnotify-adapter.js
@@ -0,0 +1,5 @@
+'use strict';
+
+var pNotify = require('pnotify');
+
+window.PNotify = pNotify;
diff --git a/system.config.js b/system.config.js
index 0ca7e16..739d233 100644
--- a/system.config.js
+++ b/system.config.js
@@ -9,6 +9,9 @@ System.config({
         },
         'hammerjs': {
             build: false
+        },
+        'pnotify': {
+            build: false
         }
     }
 });