diff --git a/.gitignore b/.gitignore
index a37c858..86be9b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,4 @@ e2e/**/*.js.map
 **/.DS_Store
 *.iml
 .idea/
-#!/src/lib/@types/codemirror-minified/index.d.ts
+!/src/lib/@types/codemirror-minified/index.d.ts
diff --git a/package-lock.json b/package-lock.json
index 8367fb0..152b661 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1760,10 +1760,10 @@
       "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
       "dev": true
     },
-    "codemirror": {
+    "codemirror-minified": {
       "version": "5.49.2",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.49.2.tgz",
-      "integrity": "sha512-dwJ2HRPHm8w51WB5YTF9J7m6Z5dtkqbU9ntMZ1dqXyFB9IpjoUFDj80ahRVEoVanfIp6pfASJbOlbWdEf8FOzQ=="
+      "resolved": "https://registry.npmjs.org/codemirror-minified/-/codemirror-minified-5.49.2.tgz",
+      "integrity": "sha512-lupv41S3poZy76M+MQHkr1hG3bSkpbdzKOn2rD7eO9VzJfDF0pY7R0lUcU3gJz1mqXiGPGu3qthkAfBgQLFckw=="
     },
     "collection-visit": {
       "version": "1.0.0",
diff --git a/package.json b/package.json
index 67e3672..32aacba 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "prepare": "npm run build"
   },
   "dependencies": {
-    "codemirror": "5.49.2",
+    "codemirror-minified": "5.49.2",
     "jointjs": "3.1.0",
     "ts-disposables": "2.2.3"
   },
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/app/app.component.ts b/src/demo/app/app.component.ts
index 61f8069..dcbfb3b 100644
--- a/src/demo/app/app.component.ts
+++ b/src/demo/app/app.component.ts
@@ -7,10 +7,10 @@ const { Renderer } = require('./renderer');
 const { Editor } = require('./editor');
 
 // Code editor used from Flo requires the follwoing CM extensions
-import 'codemirror/mode/javascript/javascript';
-import 'codemirror/mode/ruby/ruby';
-import 'codemirror/mode/clike/clike';
-import 'codemirror/addon/lint/javascript-lint';
+import 'codemirror-minified/mode/javascript/javascript';
+import 'codemirror-minified/mode/ruby/ruby';
+import 'codemirror-minified/mode/clike/clike';
+import 'codemirror-minified/addon/lint/javascript-lint';
 
 @Component({
   selector: 'demo-app',
diff --git a/src/demo/systemjs.config.js b/src/demo/systemjs.config.js
index 0a4fb39..aaaec7d 100644
--- a/src/demo/systemjs.config.js
+++ b/src/demo/systemjs.config.js
@@ -59,7 +59,8 @@
       'lodash': 'npm:lodash',
       'underscore': 'npm:lodash',
       'dagre': 'npm:dagre',
-      'codemirror': 'npm:codemirror',
+      'codemirror': 'npm:codemirror-minified',
+      'codemirror-minified': '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 b52d8d9..5df0477 100644
--- a/src/lib/code-editor/code-editor.component.ts
+++ b/src/lib/code-editor/code-editor.component.ts
@@ -1,35 +1,35 @@
 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/json-lint';
-// import 'codemirror/addon/lint/yaml-lint';
+// import 'codemirror-minified/addon/lint/javascript-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-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';
 
 @Component({
   selector: 'code-editor',
diff --git a/src/lib/dsl-editor/dsl-editor.component.ts b/src/lib/dsl-editor/dsl-editor.component.ts
index 60a9c6d..21c66eb 100644
--- a/src/lib/dsl-editor/dsl-editor.component.ts
+++ b/src/lib/dsl-editor/dsl-editor.component.ts
@@ -1,14 +1,14 @@
 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',
diff --git a/src/lib/styles.scss b/src/lib/styles.scss
index 94e0d6b..0636111 100644
--- a/src/lib/styles.scss
+++ b/src/lib/styles.scss
@@ -1,5 +1,5 @@
 @import "./../../node_modules/jointjs/dist/joint.core.css";
-@import "./../../node_modules/codemirror/lib/codemirror.css";
-@import "./../../node_modules/codemirror/addon/hint/show-hint.css";
-@import "./../../node_modules/codemirror/addon/lint/lint.css";
-@import "./../../node_modules/codemirror/addon/scroll/simplescrollbars.css";
+@import "./../../node_modules/codemirror-minified/lib/codemirror.css";
+@import "./../../node_modules/codemirror-minified/addon/hint/show-hint.css";
+@import "./../../node_modules/codemirror-minified/addon/lint/lint.css";
+@import "./../../node_modules/codemirror-minified/addon/scroll/simplescrollbars.css";