diff --git a/.gitmodules b/.gitmodules
index 47cf934f..429acb57 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -169,9 +169,6 @@
 [submodule "vendor/grammars/sublime-idris"]
 	path = vendor/grammars/sublime-idris
 	url = https://github.com/laughedelic/sublime-idris
-[submodule "vendor/grammars/sublime-better-typescript"]
-	path = vendor/grammars/sublime-better-typescript
-	url = https://github.com/lavrton/sublime-better-typescript
 [submodule "vendor/grammars/moonscript-tmbundle"]
 	path = vendor/grammars/moonscript-tmbundle
 	url = https://github.com/leafo/moonscript-tmbundle
@@ -674,3 +671,6 @@
 [submodule "vendor/grammars/sublime-aspectj"]
 	path = vendor/grammars/sublime-aspectj
 	url = https://github.com/pchaigno/sublime-aspectj
+[submodule "vendor/grammars/sublime-typescript"]
+	path = vendor/grammars/sublime-typescript
+	url = https://github.com/Microsoft/TypeScript-Sublime-Plugin
diff --git a/grammars.yml b/grammars.yml
index 88d21d39..df137f86 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -484,8 +484,6 @@ vendor/grammars/sublime-aspectj/:
 - source.aspectj
 vendor/grammars/sublime-befunge:
 - source.befunge
-vendor/grammars/sublime-better-typescript:
-- source.ts
 vendor/grammars/sublime-bsv:
 - source.bsv
 vendor/grammars/sublime-cirru:
@@ -524,6 +522,9 @@ vendor/grammars/sublime-text-ox/:
 - source.ox
 vendor/grammars/sublime-text-pig-latin/:
 - source.pig_latin
+vendor/grammars/sublime-typescript/:
+- source.ts
+- source.tsx
 vendor/grammars/sublime-varnish:
 - source.varnish.vcl
 vendor/grammars/sublime_cobol:
diff --git a/vendor/grammars/sublime-better-typescript b/vendor/grammars/sublime-better-typescript
deleted file mode 160000
index 8266c06a..00000000
--- a/vendor/grammars/sublime-better-typescript
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8266c06aabe5e473766bd9bb62dfeb106fe296a2
diff --git a/vendor/grammars/sublime-typescript b/vendor/grammars/sublime-typescript
new file mode 160000
index 00000000..0d519e5a
--- /dev/null
+++ b/vendor/grammars/sublime-typescript
@@ -0,0 +1 @@
+Subproject commit 0d519e5a5592bd4152523fe359d1a0ebbe9cc493