diff --git a/gulpfile.js b/gulpfile.js
index 81220b7c..1a1af34c 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -92,7 +92,7 @@ gulp.task('release', ['clean-release','compile'], function() {
 
 var compilation = tsb.create(assign({ verbose: true }, require('./tsconfig.json').compilerOptions));
 
-var tsSources = require('./tsconfig.json').filesGlob;
+var tsSources = require('./tsconfig.json').include.concat(require('./tsconfig.json').files);
 
 function compileTask() {
 	return merge(
diff --git a/package.json b/package.json
index 5d7cbe9f..abea7601 100644
--- a/package.json
+++ b/package.json
@@ -21,15 +21,14 @@
     "event-stream": "^3.3.2",
     "gulp": "^3.9.1",
     "gulp-requirejs": "^0.1.3",
-    "gulp-tsb": "^1.10.4",
+    "gulp-tsb": "^2.0.0",
     "gulp-uglify": "^1.5.3",
     "jsdom-no-contextify": "^3.1.0",
     "merge-stream": "^1.0.0",
     "mocha": "^2.5.3",
-    "monaco-editor-core": "0.7.1",
+    "monaco-editor-core": "^0.7.0",
     "object-assign": "^4.1.0",
     "rimraf": "^2.5.2",
-    "typescript": "^1.8.10",
-    "typescript-with-globs": "^0.1.4"
+    "typescript": "2.0.3"
   }
 }
diff --git a/tsconfig.json b/tsconfig.json
index d3eaa29e..3534ffba 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,72 +4,11 @@
     "outDir": "out",
     "target": "es5"
   },
-  "filesGlob": [
+  "include": [
     "src/*.ts",
-    "test/*.ts",
-    "node_modules/monaco-editor-core/monaco.d.ts"
+    "test/*.ts"
   ],
   "files": [
-    "src/bat.ts",
-    "src/coffee.ts",
-    "src/cpp.ts",
-    "src/csharp.ts",
-    "src/css.ts",
-    "src/dockerfile.ts",
-    "src/fsharp.ts",
-    "src/go.ts",
-    "src/handlebars.ts",
-    "src/html.ts",
-    "src/ini.ts",
-    "src/jade.ts",
-    "src/java.ts",
-    "src/less.ts",
-    "src/lua.ts",
-    "src/markdown.ts",
-    "src/monaco.contribution.ts",
-    "src/objective-c.ts",
-    "src/postiats.ts",
-    "src/php.ts",
-    "src/powershell.ts",
-    "src/python.ts",
-    "src/r.ts",
-    "src/razor.ts",
-    "src/ruby.ts",
-    "src/scss.ts",
-    "src/sql.ts",
-    "src/swift.ts",
-    "src/vb.ts",
-    "src/xml.ts",
-    "test/yaml.ts",
-    "test/assert.d.ts",
-    "test/bat.test.ts",
-    "test/coffee.test.ts",
-    "test/cpp.test.ts",
-    "test/csharp.test.ts",
-    "test/dockerfile.test.ts",
-    "test/fsharp.test.ts",
-    "test/go.test.ts",
-    "test/handlebars.test.ts",
-    "test/html.test.ts",
-    "test/jade.test.ts",
-    "test/java.test.ts",
-    "test/lua.test.ts",
-    "test/markdown.test.ts",
-    "test/mocha.d.ts",
-    "test/objective-c.test.ts",
-    "test/php.test.ts",
-    "test/postiats.test.ts",
-    "test/powershell.test.ts",
-    "test/python.test.ts",
-    "test/r.test.ts",
-    "test/razor.test.ts",
-    "test/ruby.test.ts",
-    "test/sql.test.ts",
-    "test/swift.test.ts",
-    "test/testRunner.ts",
-    "test/vb.test.ts",
-    "test/xml.test.ts",
-    "test/yaml.test.ts",
     "node_modules/monaco-editor-core/monaco.d.ts"
   ]
 }