diff --git a/package.json b/package.json
index 4fcde3a..2cbfff9 100644
--- a/package.json
+++ b/package.json
@@ -62,6 +62,7 @@
     "rxjs": ">=6.0.0 <7.0.0"
   },
   "devDependencies": {
+    "@angular/animations": "6.0.7",
     "@angular/common": "6.0.7",
     "@angular/compiler": "6.0.7",
     "@angular/compiler-cli": "6.0.7",
@@ -70,50 +71,49 @@
     "@angular/platform-browser": "6.0.7",
     "@angular/platform-browser-dynamic": "6.0.7",
     "@angular/platform-server": "6.0.7",
-    "@angular/animations": "6.0.7",
-    "@types/jasmine": "2.5.36",
-    "@types/node": "6.0.46",
-    "@types/codemirror": "0.0.45",
-    "@types/lodash": "4.14.110",
     "@types/backbone": "1.3.42",
+    "@types/codemirror": "0.0.45",
+    "@types/jasmine": "2.5.36",
     "@types/jquery": "3.3.4",
+    "@types/lodash": "4.14.110",
+    "@types/node": "6.0.46",
     "camelcase": "4.0.0",
-    "concurrently": "3.4.0",
+    "chalk": "2.4.1",
+    "codemirror": "5.28.0",
+    "concurrently": "4.0.1",
     "core-js": "2.5.7",
     "glob": "7.1.1",
+    "gulp": "3.9.1",
+    "gulp-inline-ng2-template": "5.0.1",
     "jasmine-core": "2.5.2",
+    "jointjs": "2.1.3",
+    "jquery": "3.1.1",
+    "jshint": "2.6.3",
     "karma": "1.5.0",
     "karma-chrome-launcher": "2.0.0",
     "karma-cli": "1.0.1",
     "karma-html-reporter": "0.2.7",
     "karma-jasmine": "1.1.0",
     "karma-jasmine-html-reporter": "0.2.2",
-    "lite-server": "2.2.2",
-    "ngx-bootstrap": "3.0.1",
+    "lite-server": "2.4.0",
+    "lodash": "3.10.1",
+    "ngx-bootstrap": "2.0.5",
+    "node-sass": "4.9.0",
     "rimraf": "2.6.1",
     "rollup": "0.62.0",
-    "rollup-plugin-sourcemaps": "0.4.2",
-    "rollup-plugin-node-resolve": "3.3.0",
     "rollup-plugin-commonjs": "9.1.3",
-    "uglify-js": "3.3.23",
-    "shelljs": "0.8.1",
+    "rollup-plugin-node-resolve": "3.3.0",
+    "rollup-plugin-sourcemaps": "0.4.2",
     "rxjs": "6.2.1",
+    "shelljs": "0.8.1",
     "standard-version": "4.0.0",
     "systemjs": "0.21.4",
+    "ts-disposables": "2.2.3",
     "tslint": "5.10.0",
     "typescript": "2.7.2",
+    "uglify-js": "3.3.23",
     "zone.js": "0.8.26",
-    "codemirror": "5.28.0",
-    "jointjs": "2.1.3",
-    "lodash": "3.10.1",
-    "jquery": "3.1.1",
-    "ts-disposables": "2.2.3",
-    "jshint": "2.6.3",
-    "systemjs-plugin-babel": "0.0.25",
-    "chalk": "2.4.1",
-    "node-sass": "4.9.0",
-    "gulp": "3.9.1",
-    "gulp-inline-ng2-template": "5.0.1"
+    "rxjs-compat": "^6.3.0"
   },
   "buildDependencies": [
     "@angular/core",
diff --git a/src/demo/systemjs.config.js b/src/demo/systemjs.config.js
index c7660e8..6c57512 100644
--- a/src/demo/systemjs.config.js
+++ b/src/demo/systemjs.config.js
@@ -4,7 +4,7 @@
  */
 (function (global) {
   System.config({
-    transpiler: 'plugin-babel',
+    transpiler: false,
     paths: {
       // paths serve as alias
       'npm:': 'node_modules/'
@@ -23,9 +23,12 @@
       '@angular/http': 'npm:@angular/http/bundles/http.umd.js',
       '@angular/router': 'npm:@angular/router/bundles/router.umd.js',
       '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
+      'ngx-bootstrap': 'npm:ngx-bootstrap/bundles/ngx-bootstrap.umd.min.js',
 
       // other libraries
       'rxjs': 'npm:rxjs',
+      // ngx-bootstrap 2.x + rxjs-compat due to https://github.com/valor-software/ngx-bootstrap/issues/4494
+      'rxjs-compat': 'npm:rxjs-compat',
       'jointjs': 'npm:jointjs',
       'jquery': 'npm:jquery',
       'backbone': 'npm:backbone',
@@ -34,12 +37,8 @@
       'dagre': 'npm:dagre',
       'codemirror': 'npm:codemirror',
       'moment': 'npm:moment/moment.js',
-      'ngx-bootstrap': 'npm:ngx-bootstrap/bundles/ngx-bootstrap.es2015.js',
       'ts-disposables': 'npm:ts-disposables',
-      'jshint': 'npm:jshint/dist/jshint.js',
-
-      'plugin-babel': 'npm:systemjs-plugin-babel/plugin-babel.js',
-      'systemjs-babel-build': 'npm:systemjs-plugin-babel/systemjs-babel-browser.js'
+      'jshint': 'npm:jshint/dist/jshint.js'
     },
     meta: {
       'lodash': {
@@ -68,6 +67,13 @@
         main: 'index.js',
         defaultExtension: 'js'
       },
+      'rxjs-compat': {
+        main: 'index.js',
+        defaultExtension: 'js'
+      },
+      'rxjs/internal-compatibility': {
+        main: './index.js'
+      },
       'rxjs/operators': {
         main: './index.js'
       },