diff --git a/.gitmodules b/.gitmodules
index 2a72f0d..e816a0c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "vscode-html-languageserver"]
-	path = vscode-html-languageserver
+	path = vendor/vscode-html-languageserver
 	url = https://github.com/vscode-langservers/vscode-html-languageserver.git
 	ignore = dirty
diff --git a/build.js b/build.js
index 01743a0..857a29a 100644
--- a/build.js
+++ b/build.js
@@ -10,18 +10,15 @@ const throwIfError = res => {
 }
 
 console.log(green(`Installing ${cyan('vscode-html-languageserver')} dependencies`));
-throwIfError(spawnSync('npm', ['install'], {
-	cwd: join(__dirname, 'vscode-html-languageserver'),
+throwIfError(spawnSync('yarn', ['install'], {
+	cwd: join(__dirname, 'vendor/vscode-html-languageserver'),
 	stdio: 'inherit'
 }));
 
 console.log(green(`Compiling ${cyan('vscode-html-languageserver')}`));
-const tsconfig = require('./vscode-html-languageserver/tsconfig.json')
 throwIfError(spawnSync('tsc', [
-	'-p', 'vscode-html-languageserver',
+	'-p', 'vendor/vscode-html-languageserver',
 	'--outDir', 'dist',
-	'--lib', tsconfig.compilerOptions.lib.concat(['dom']).join(','),
-	'--target', tsconfig.compilerOptions.target,
 	'--listEmittedFiles'
 ], {
 	cwd: __dirname,
@@ -39,7 +36,7 @@ writeFileSync(file, lines.join('\n'), 'utf8')
 
 console.log(green(`Merging package.json files`));
 const currentPackage = require('./package.json');
-const HTMLLSPackage = require('./vscode-html-languageserver/package.json');
+const HTMLLSPackage = require('./vendor/vscode-html-languageserver/package.json');
 
 writeFileSync(join(__dirname, 'dist', 'package.json'), JSON.stringify(Object.assign(HTMLLSPackage, currentPackage, {
 	scripts: {},
diff --git a/package-lock.json b/package-lock.json
index a8de52a..538ef44 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -61,9 +61,9 @@
       }
     },
     "typescript": {
-      "version": "2.9.1",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.1.tgz",
-      "integrity": "sha512-h6pM2f/GDchCFlldnriOhs1QHuwbnmj6/v7499eMHqPeW4V2G0elua2eIc2nu8v2NdHV0Gm+tzX83Hr6nUFjQA=="
+      "version": "3.7.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.3.tgz",
+      "integrity": "sha512-Mcr/Qk7hXqFBXMN7p7Lusj1ktCBydylfQM/FZCk5glCNQJrCUKPkMHdo9R0MTFWsC/4kPFvDS0fDPvukfCkFsw=="
     }
   }
 }
diff --git a/package.json b/package.json
index e5747c3..5230181 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,6 @@
     "chalk": "^2.3.0"
   },
   "dependencies": {
-    "typescript": "^2.9.1"
+    "typescript": "^3.7.3"
   }
 }
diff --git a/shared.tsconfig.json b/shared.tsconfig.json
new file mode 100644
index 0000000..338deb8
--- /dev/null
+++ b/shared.tsconfig.json
@@ -0,0 +1,12 @@
+{
+	"compilerOptions": {
+		"target": "es2018",
+		"module": "commonjs",
+		"strict": true,
+		"alwaysStrict": true,
+		"noImplicitAny": true,
+		"noImplicitReturns": true,
+		"noUnusedLocals": true,
+		"noUnusedParameters": true
+	}
+}
diff --git a/vendor/vscode-html-languageserver b/vendor/vscode-html-languageserver
new file mode 160000
index 0000000..8637f10
--- /dev/null
+++ b/vendor/vscode-html-languageserver
@@ -0,0 +1 @@
+Subproject commit 8637f10dd31c677acfe4c3a0e5f91c457aa7a00a
diff --git a/vscode-html-languageserver b/vscode-html-languageserver
deleted file mode 160000
index 18bed63..0000000
--- a/vscode-html-languageserver
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 18bed63e90d661407306d3b66a856e951036567d