diff --git a/package.json b/package.json
index 53c124a..44fed37 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "postinstall": "postinstall-build --only-as-dependency dist \"npm run build && node postinstall.js\""
   },
   "dependencies": {
-    "codemirror": "5.40.2",
+    "codemirror-minified": "5.37.0",
     "jointjs": "2.1.4",
     "postinstall-build": "5.0.3",
     "ts-disposables": "2.2.3"
@@ -73,7 +73,7 @@
     "@types/node": "6.0.46",
     "camelcase": "4.0.0",
     "chalk": "2.4.1",
-    "codemirror": "5.40.2",
+    "codemirror-minified": "5.37.0",
     "concurrently": "4.0.1",
     "core-js": "2.5.7",
     "glob": "7.1.1",
diff --git a/rollup.config.js b/rollup.config.js
index 601eba1..f6dbcf6 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -41,37 +41,38 @@ const globals = {
   'rxjs/operators': 'rxjs.operators',
   'lodash': 'lodash',
   'ts-disposables': 'ts-disposables',
-  'codemirror': 'codemirror',
+  'codemirror-minified': 'codemirror-minified',
+  'codemirror': 'codemirror-minified',
   'jointjs': 'jointjs',
   'jquery': 'jquery',
 
   // CodeMirror extensions
-  'codemirror/mode/meta': 'codemirror/mode/meta',
-  'codemirror/addon/lint/lint': 'codemirror/addon/lint/lint',
-  'codemirror/addon/hint/show-hint': 'codemirror/addon/hint/show-hint',
-  'codemirror/addon/mode/loadmode': 'codemirror/addon/mode/loadmode',
-  'codemirror/addon/edit/matchbrackets': 'codemirror/addon/edit/matchbrackets',
-  'codemirror/addon/edit/closebrackets': 'codemirror/addon/edit/closebrackets',
-  'codemirror/addon/display/placeholder': 'codemirror/addon/edit/closebrackets',
-  'codemirror/addon/scroll/annotatescrollbar': 'codemirror/addon/scroll/annotatescrollbar',
-  'codemirror/addon/scroll/simplescrollbars': 'codemirror/addon/scroll/simplescrollbars',
+  'codemirror-minified/mode/meta': 'codemirror-minified/mode/meta',
+  'codemirror-minified/addon/lint/lint': 'codemirror-minified/addon/lint/lint',
+  'codemirror-minified/addon/hint/show-hint': 'codemirror-minified/addon/hint/show-hint',
+  'codemirror-minified/addon/mode/loadmode': 'codemirror-minified/addon/mode/loadmode',
+  'codemirror-minified/addon/edit/matchbrackets': 'codemirror-minified/addon/edit/matchbrackets',
+  'codemirror-minified/addon/edit/closebrackets': 'codemirror-minified/addon/edit/closebrackets',
+  'codemirror-minified/addon/display/placeholder': 'codemirror-minified/addon/edit/closebrackets',
+  'codemirror-minified/addon/scroll/annotatescrollbar': 'codemirror-minified/addon/scroll/annotatescrollbar',
+  'codemirror-minified/addon/scroll/simplescrollbars': 'codemirror-minified/addon/scroll/simplescrollbars',
 
   // Lint support
   // Unclear how to import this dynamically...
-  'codemirror/addon/lint/javascript-lint': 'codemirror/addon/lint/javascript-lint',
-  'codemirror/addon/lint/coffeescript-lint': 'codemirror/addon/lint/coffeescript-lint',
-  'codemirror/addon/lint/json-lint': 'codemirror/addon/lint/json-lint',
-  'codemirror/addon/lint/yaml-lint': 'codemirror/addon/lint/yaml-lint',
+  'codemirror-minified/addon/lint/javascript-lint': 'codemirror-minified/addon/lint/javascript-lint',
+  'codemirror-minified/addon/lint/coffeescript-lint': 'codemirror-minified/addon/lint/coffeescript-lint',
+  'codemirror-minified/addon/lint/json-lint': 'codemirror-minified/addon/lint/json-lint',
+  'codemirror-minified/addon/lint/yaml-lint': 'codemirror-minified/addon/lint/yaml-lint',
 
   // TODO: use dynamic import with JS7 in the future. CM autoLoad cannot load it properly - thinks its AMD
   // Supported languages until dynamic loading
-  'codemirror/mode/groovy/groovy': 'codemirror/mode/groovy/groovy',
-  'codemirror/mode/javascript/javascript': 'codemirror/mode/javascript/javascript',
-  'codemirror/mode/python/python': 'codemirror/mode/python/python',
-  'codemirror/mode/ruby/ruby': 'codemirror/mode/ruby/ruby',
-  'codemirror/mode/clike/clike': 'codemirror/mode/clike/clike',
-  'codemirror/mode/yaml/yaml': 'codemirror/mode/yaml/yaml',
-  'codemirror/mode/coffeescript/coffeescript': 'codemirror/mode/coffeescript/coffeescript'
+  'codemirror-minified/mode/groovy/groovy': 'codemirror-minified/mode/groovy/groovy',
+  'codemirror-minified/mode/javascript/javascript': 'codemirror-minified/mode/javascript/javascript',
+  'codemirror-minified/mode/python/python': 'codemirror-minified/mode/python/python',
+  'codemirror-minified/mode/ruby/ruby': 'codemirror-minified/mode/ruby/ruby',
+  'codemirror-minified/mode/clike/clike': 'codemirror-minified/mode/clike/clike',
+  'codemirror-minified/mode/yaml/yaml': 'codemirror-minified/mode/yaml/yaml',
+  'codemirror-minified/mode/coffeescript/coffeescript': 'codemirror-minified/mode/coffeescript/coffeescript'
 
 };
 
diff --git a/src/demo/systemjs.config.js b/src/demo/systemjs.config.js
index 6c57512..7b7fc8a 100644
--- a/src/demo/systemjs.config.js
+++ b/src/demo/systemjs.config.js
@@ -35,7 +35,7 @@
       'lodash': 'npm:lodash',
       'underscore': 'npm:lodash',
       'dagre': 'npm:dagre',
-      'codemirror': 'npm:codemirror',
+      'codemirror': 'npm:codemirror-minified',
       'moment': 'npm:moment/moment.js',
       'ts-disposables': 'npm:ts-disposables',
       'jshint': 'npm:jshint/dist/jshint.js'
diff --git a/src/lib/@types/codemirror-minified/index.d.ts b/src/lib/@types/codemirror-minified/index.d.ts
new file mode 100644
index 0000000..15a0379
--- /dev/null
+++ b/src/lib/@types/codemirror-minified/index.d.ts
@@ -0,0 +1,8 @@
+declare module 'codemirror-minified' {
+
+  import * as CodeMirror from '@types/codemirror'
+
+  export = CodeMirror;
+  export as namespace CodeMirror;
+
+}
diff --git a/src/lib/code-editor/code-editor.component.ts b/src/lib/code-editor/code-editor.component.ts
index 32aad76..88fc09c 100644
--- a/src/lib/code-editor/code-editor.component.ts
+++ b/src/lib/code-editor/code-editor.component.ts
@@ -1,46 +1,46 @@
 import { Component, Input, Output, ElementRef, EventEmitter, OnInit, OnDestroy, ViewEncapsulation, forwardRef } from '@angular/core';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
-import * as CodeMirror from 'codemirror';
+import * as CodeMirror from 'codemirror-minified';
 
 import * as _$ from 'jquery';
 const $: any = _$;
 
 // CodeMirror extensions
-import 'codemirror/mode/meta';
-import 'codemirror/addon/lint/lint';
-import 'codemirror/addon/hint/show-hint';
-// import 'codemirror/addon/mode/loadmode';
-import 'codemirror/addon/edit/matchbrackets';
-import 'codemirror/addon/edit/closebrackets';
-import 'codemirror/addon/display/placeholder';
-import 'codemirror/addon/scroll/annotatescrollbar';
-import 'codemirror/addon/scroll/simplescrollbars';
+import 'codemirror-minified/mode/meta';
+import 'codemirror-minified/addon/lint/lint';
+import 'codemirror-minified/addon/hint/show-hint';
+// import 'codemirror-minified/addon/mode/loadmode';
+import 'codemirror-minified/addon/edit/matchbrackets';
+import 'codemirror-minified/addon/edit/closebrackets';
+import 'codemirror-minified/addon/display/placeholder';
+import 'codemirror-minified/addon/scroll/annotatescrollbar';
+import 'codemirror-minified/addon/scroll/simplescrollbars';
 
 // Lint support
 // Unclear how to import this dynamically...
-import 'codemirror/addon/lint/javascript-lint';
-import 'codemirror/addon/lint/coffeescript-lint';
-import 'codemirror/addon/lint/json-lint';
-import 'codemirror/addon/lint/yaml-lint';
+import 'codemirror-minified/addon/lint/javascript-lint';
+import 'codemirror-minified/addon/lint/coffeescript-lint';
+import 'codemirror-minified/addon/lint/json-lint';
+import 'codemirror-minified/addon/lint/yaml-lint';
 
 // TODO: use dynamic import with JS7 in the future. CM autoLoad cannot load it properly - thinks its AMD
 // Supported languages until dynamic loading
-import 'codemirror/mode/groovy/groovy';
-import 'codemirror/mode/javascript/javascript';
-import 'codemirror/mode/python/python';
-import 'codemirror/mode/ruby/ruby';
-import 'codemirror/mode/clike/clike';
-import 'codemirror/mode/yaml/yaml';
-import 'codemirror/mode/coffeescript/coffeescript';
+import 'codemirror-minified/mode/groovy/groovy';
+import 'codemirror-minified/mode/javascript/javascript';
+import 'codemirror-minified/mode/python/python';
+import 'codemirror-minified/mode/ruby/ruby';
+import 'codemirror-minified/mode/clike/clike';
+import 'codemirror-minified/mode/yaml/yaml';
+import 'codemirror-minified/mode/coffeescript/coffeescript';
 
 @Component({
   selector: 'code-editor',
   templateUrl: './code-editor.component.html',
   styleUrls: [
-    './../../../node_modules/codemirror/lib/codemirror.css',
-    './../../../node_modules/codemirror/addon/hint/show-hint.css',
-    './../../../node_modules/codemirror/addon/lint/lint.css',
-    './../../../node_modules/codemirror/addon/scroll/simplescrollbars.css',
+    './../../../node_modules/codemirror-minified/lib/codemirror.css',
+    './../../../node_modules/codemirror-minified/addon/hint/show-hint.css',
+    './../../../node_modules/codemirror-minified/addon/lint/lint.css',
+    './../../../node_modules/codemirror-minified/addon/scroll/simplescrollbars.css',
     './code-editor.component.scss', ],
   encapsulation: ViewEncapsulation.None,
   providers: [
diff --git a/src/lib/dsl-editor/dsl-editor.component.ts b/src/lib/dsl-editor/dsl-editor.component.ts
index 0bfc40f..a0ae43e 100644
--- a/src/lib/dsl-editor/dsl-editor.component.ts
+++ b/src/lib/dsl-editor/dsl-editor.component.ts
@@ -1,23 +1,23 @@
 import { Component, Input, Output, ElementRef, EventEmitter, OnInit, OnDestroy, ViewEncapsulation } from '@angular/core';
 import * as _ from 'lodash';
-import * as CodeMirror from 'codemirror';
+import * as CodeMirror from 'codemirror-minified';
 import * as _$ from 'jquery';
 const $: any = _$;
 
-import 'codemirror/addon/lint/lint';
-import 'codemirror/addon/hint/show-hint';
-import 'codemirror/addon/display/placeholder';
-import 'codemirror/addon/scroll/annotatescrollbar';
-import 'codemirror/addon/scroll/simplescrollbars';
+import 'codemirror-minified/addon/lint/lint';
+import 'codemirror-minified/addon/hint/show-hint';
+import 'codemirror-minified/addon/display/placeholder';
+import 'codemirror-minified/addon/scroll/annotatescrollbar';
+import 'codemirror-minified/addon/scroll/simplescrollbars';
 
 
 @Component({
   selector: 'dsl-editor',
   templateUrl: './dsl-editor.component.html',
   styleUrls: [
-    './../../../node_modules/codemirror/lib/codemirror.css',
-    './../../../node_modules/codemirror/addon/hint/show-hint.css',
-    './../../../node_modules/codemirror/addon/lint/lint.css',
+    './../../../node_modules/codemirror-minified/lib/codemirror.css',
+    './../../../node_modules/codemirror-minified/addon/hint/show-hint.css',
+    './../../../node_modules/codemirror-minified/addon/lint/lint.css',
     './dsl-editor.component.scss', ],
   encapsulation: ViewEncapsulation.None
 })
diff --git a/tsconfig-build.json b/tsconfig-build.json
index 3832b69..696eb92 100644
--- a/tsconfig-build.json
+++ b/tsconfig-build.json
@@ -22,6 +22,10 @@
       "dom"
     ],
     "skipLibCheck": true,
+    "typeRoots": [
+      "node_modules/@types",
+      "src/lib/@types"
+    ],
     "types": [],
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
diff --git a/tsconfig.json b/tsconfig.json
index 9798eba..6ad134b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -15,6 +15,10 @@
       "es2015",
       "dom"
     ],
+    "typeRoots": [
+      "node_modules/@types",
+      "src/lib/@types"
+    ],
     "strictNullChecks":false
   }
 }