diff --git a/package.json b/package.json
index bfba4966..d4420000 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "jsdom-no-contextify": "^3.1.0",
     "merge-stream": "^1.0.0",
     "mocha": "^2.5.3",
-    "monaco-editor-core": "0.3.1",
+    "monaco-editor-core": "^0.4.0",
     "object-assign": "^4.1.0",
     "rimraf": "^2.5.2",
     "typescript": "^1.8.10",
diff --git a/src/bat.ts b/src/bat.ts
index 4f094401..12d8f2ac 100644
--- a/src/bat.ts
+++ b/src/bat.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import IRichLanguageConfiguration = monaco.languages.IRichLanguageConfiguration;
+import IRichLanguageConfiguration = monaco.languages.LanguageConfiguration;
 import ILanguage = monaco.languages.IMonarchLanguage;
 
 export var conf:IRichLanguageConfiguration = {
diff --git a/src/coffee.ts b/src/coffee.ts
index 08c489a0..23006820 100644
--- a/src/coffee.ts
+++ b/src/coffee.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import IRichLanguageConfiguration = monaco.languages.IRichLanguageConfiguration;
+import IRichLanguageConfiguration = monaco.languages.LanguageConfiguration;
 import ILanguage = monaco.languages.IMonarchLanguage;
 
 export var conf:IRichLanguageConfiguration = {
diff --git a/src/cpp.ts b/src/cpp.ts
index bfd44ff1..fc013a54 100644
--- a/src/cpp.ts
+++ b/src/cpp.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import IRichLanguageConfiguration = monaco.languages.IRichLanguageConfiguration;
+import IRichLanguageConfiguration = monaco.languages.LanguageConfiguration;
 import ILanguage = monaco.languages.IMonarchLanguage;
 
 export var conf:IRichLanguageConfiguration = {
diff --git a/src/csharp.ts b/src/csharp.ts
index 038d88c4..40ec84be 100644
--- a/src/csharp.ts
+++ b/src/csharp.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import IRichLanguageConfiguration = monaco.languages.IRichLanguageConfiguration;
+import IRichLanguageConfiguration = monaco.languages.LanguageConfiguration;
 import ILanguage = monaco.languages.IMonarchLanguage;
 
 export var conf:IRichLanguageConfiguration = {
diff --git a/src/dockerfile.ts b/src/dockerfile.ts
index df722774..1c3b3ec7 100644
--- a/src/dockerfile.ts
+++ b/src/dockerfile.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import IRichLanguageConfiguration = monaco.languages.IRichLanguageConfiguration;
+import IRichLanguageConfiguration = monaco.languages.LanguageConfiguration;
 import ILanguage = monaco.languages.IMonarchLanguage;
 
 export var conf:IRichLanguageConfiguration = {
diff --git a/src/fsharp.ts b/src/fsharp.ts
index d8b0ee03..2b9d3652 100644
--- a/src/fsharp.ts
+++ b/src/fsharp.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import IRichLanguageConfiguration = monaco.languages.IRichLanguageConfiguration;
+import IRichLanguageConfiguration = monaco.languages.LanguageConfiguration;
 import ILanguage = monaco.languages.IMonarchLanguage;
 
 export var conf:IRichLanguageConfiguration = {
diff --git a/src/go.ts b/src/go.ts
index ea9138fc..3ec564b5 100644
--- a/src/go.ts
+++ b/src/go.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import IRichLanguageConfiguration = monaco.languages.IRichLanguageConfiguration;
+import IRichLanguageConfiguration = monaco.languages.LanguageConfiguration;
 import ILanguage = monaco.languages.IMonarchLanguage;
 
 export var conf:IRichLanguageConfiguration = {
diff --git a/src/ini.ts b/src/ini.ts
index 30f1fbb1..0c59e607 100644
--- a/src/ini.ts
+++ b/src/ini.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import IRichLanguageConfiguration = monaco.languages.IRichLanguageConfiguration;
+import IRichLanguageConfiguration = monaco.languages.LanguageConfiguration;
 import ILanguage = monaco.languages.IMonarchLanguage;
 
 export var conf:IRichLanguageConfiguration = {
diff --git a/src/jade.ts b/src/jade.ts
index 2ba856a3..f98ddb90 100644
--- a/src/jade.ts
+++ b/src/jade.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import IRichLanguageConfiguration = monaco.languages.IRichLanguageConfiguration;
+import IRichLanguageConfiguration = monaco.languages.LanguageConfiguration;
 import ILanguage = monaco.languages.IMonarchLanguage;
 
 export var conf:IRichLanguageConfiguration = {
diff --git a/src/java.ts b/src/java.ts
index 2bbdbd34..2f810553 100644
--- a/src/java.ts
+++ b/src/java.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import IRichLanguageConfiguration = monaco.languages.IRichLanguageConfiguration;
+import IRichLanguageConfiguration = monaco.languages.LanguageConfiguration;
 import ILanguage = monaco.languages.IMonarchLanguage;
 
 export var conf:IRichLanguageConfiguration = {
diff --git a/src/lua.ts b/src/lua.ts
index 5d1fe809..6fd5cab9 100644
--- a/src/lua.ts
+++ b/src/lua.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import IRichLanguageConfiguration = monaco.languages.IRichLanguageConfiguration;
+import IRichLanguageConfiguration = monaco.languages.LanguageConfiguration;
 import ILanguage = monaco.languages.IMonarchLanguage;
 
 export var conf:IRichLanguageConfiguration = {
diff --git a/src/monaco.contribution.ts b/src/monaco.contribution.ts
index a0fcb799..4a2a5471 100644
--- a/src/monaco.contribution.ts
+++ b/src/monaco.contribution.ts
@@ -14,7 +14,7 @@ interface ILang extends monaco.languages.ILanguageExtensionPoint {
 }
 
 interface ILangImpl {
-	conf: monaco.languages.IRichLanguageConfiguration;
+	conf: monaco.languages.LanguageConfiguration;
 	language: monaco.languages.IMonarchLanguage;
 }
 
diff --git a/src/objective-c.ts b/src/objective-c.ts
index 9324932c..13ab2ef8 100644
--- a/src/objective-c.ts
+++ b/src/objective-c.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import IRichLanguageConfiguration = monaco.languages.IRichLanguageConfiguration;
+import IRichLanguageConfiguration = monaco.languages.LanguageConfiguration;
 import ILanguage = monaco.languages.IMonarchLanguage;
 
 export var conf:IRichLanguageConfiguration = {
diff --git a/src/powershell.ts b/src/powershell.ts
index c9ecfa1e..14c5d490 100644
--- a/src/powershell.ts
+++ b/src/powershell.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import IRichLanguageConfiguration = monaco.languages.IRichLanguageConfiguration;
+import IRichLanguageConfiguration = monaco.languages.LanguageConfiguration;
 import ILanguage = monaco.languages.IMonarchLanguage;
 
 export var conf:IRichLanguageConfiguration = {
diff --git a/src/python.ts b/src/python.ts
index cc3abc44..8b29d2fb 100644
--- a/src/python.ts
+++ b/src/python.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import IRichLanguageConfiguration = monaco.languages.IRichLanguageConfiguration;
+import IRichLanguageConfiguration = monaco.languages.LanguageConfiguration;
 import ILanguage = monaco.languages.IMonarchLanguage;
 
 export var conf:IRichLanguageConfiguration = {
diff --git a/src/r.ts b/src/r.ts
index b4cdc2b2..77953f51 100644
--- a/src/r.ts
+++ b/src/r.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import IRichLanguageConfiguration = monaco.languages.IRichLanguageConfiguration;
+import IRichLanguageConfiguration = monaco.languages.LanguageConfiguration;
 import ILanguage = monaco.languages.IMonarchLanguage;
 
 export var conf:IRichLanguageConfiguration = {
diff --git a/src/ruby.ts b/src/ruby.ts
index 56ae45ea..0a243d12 100644
--- a/src/ruby.ts
+++ b/src/ruby.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import IRichLanguageConfiguration = monaco.languages.IRichLanguageConfiguration;
+import IRichLanguageConfiguration = monaco.languages.LanguageConfiguration;
 import ILanguage = monaco.languages.IMonarchLanguage;
 
 export var conf:IRichLanguageConfiguration = {
diff --git a/src/sql.ts b/src/sql.ts
index 2930e8ad..064c0c90 100644
--- a/src/sql.ts
+++ b/src/sql.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import IRichLanguageConfiguration = monaco.languages.IRichLanguageConfiguration;
+import IRichLanguageConfiguration = monaco.languages.LanguageConfiguration;
 import ILanguage = monaco.languages.IMonarchLanguage;
 
 export var conf:IRichLanguageConfiguration = {
diff --git a/src/swift.ts b/src/swift.ts
index fc8b8074..76e34483 100644
--- a/src/swift.ts
+++ b/src/swift.ts
@@ -4,7 +4,7 @@
 
 'use strict';
 
-import IRichLanguageConfiguration = monaco.languages.IRichLanguageConfiguration;
+import IRichLanguageConfiguration = monaco.languages.LanguageConfiguration;
 import ILanguage = monaco.languages.IMonarchLanguage;
 
 export var conf:IRichLanguageConfiguration = {
diff --git a/src/vb.ts b/src/vb.ts
index c101202f..18449f4d 100644
--- a/src/vb.ts
+++ b/src/vb.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import IRichLanguageConfiguration = monaco.languages.IRichLanguageConfiguration;
+import IRichLanguageConfiguration = monaco.languages.LanguageConfiguration;
 import ILanguage = monaco.languages.IMonarchLanguage;
 
 export var conf:IRichLanguageConfiguration = {
diff --git a/src/xml.ts b/src/xml.ts
index b45a1b92..d876c2f7 100644
--- a/src/xml.ts
+++ b/src/xml.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import IRichLanguageConfiguration = monaco.languages.IRichLanguageConfiguration;
+import IRichLanguageConfiguration = monaco.languages.LanguageConfiguration;
 import ILanguage = monaco.languages.IMonarchLanguage;
 
 export var conf:IRichLanguageConfiguration = {