diff --git a/modules/defuns/defuns-typescript.el b/modules/defuns/defuns-typescript.el
new file mode 100644
index 000000000..8541f44d8
--- /dev/null
+++ b/modules/defuns/defuns-typescript.el
@@ -0,0 +1,73 @@
+;;; defuns-typescript.el
+
+(defvar ts-externs-vars-re
+  (concat "\\_<"
+          (regexp-opt
+           '("__dirname" "__filename"))
+          "\\_>"))
+
+(defvar ts-externs-fns-re
+  (concat "\\_<"
+          (regexp-opt
+           '("Buffer" "clearInterval" "clearTimeout" "require" "setInterval"
+             "setTimeout" "querystring" "setImmediate" "clearImmediate"))
+          "\\_>"))
+
+(defvar ts-ecma-externs-re
+  (concat "\\_<"
+          (regexp-opt '("decoreURI" "decoreURIComponent" "encodeURI"
+                        "encodeURIComponent" "escape" "eval" "isFinite"
+                        "isNaN" "parseFloat" "parseInt" "escape" "unescape"))
+          "\\_>"))
+
+(defface ts-object-property '((t (:inherit font-lock-function-name-face)))
+  "")
+
+;;;###autoload
+(defun doom|ts-fontify ()
+  (font-lock-add-keywords
+   nil `((,ts-externs-vars-re
+          . 'font-lock-builtin-face)
+         (,ts-externs-fns-re
+          . 'font-lock-keyword-face)
+         (,ts-ecma-externs-re
+          . 'font-lock-builtin-face)
+         ;; Lambda character
+         (" \\(=>\\) "
+          . 'font-lock-preprocessor-face)
+         ;; $-prefixed variables
+         ("\\_<\\$[[:alnum:]_]+\\_>"
+          . 'font-lock-keyword-face)
+         ;; object keys
+         ("\\(?:^\\|,\\|{\\)\\s-*\\([[:alpha:]_$][[:alnum:]_$]*\\)\\s-*:"
+          1 'ts-object-property)
+         ;; variable.prefixes
+         ("\\_<\\([a-z_$][[:alnum:]_$]*\\)\\."
+          1 'font-lock-variable-name-face)
+         ;; functioncalls()
+         ("\\_<\\([a-z_$][[:alnum:]_$]*\\)("
+          1 'font-lock-function-name-face)
+         ;; PascalCase ClassNames
+         ("\\_<[A-Z][a-z0-9_]+\\_>"
+          . 'font-lock-type-face)
+         ;; CONSTANTS
+         ("\\_<[A-Z0-9_]+\\_>"
+          . 'font-lock-builtin-face)
+         ;; Import froms
+         ("^\\s-*import\\s-+\\(?:{[^}]*}\\|[^ ]+\\|[^ ]+\\s-+as\\s-+[^ ]+\\)\\s-+\\(from\\)\\s-"
+          (1 'font-lock-keyword-face))
+         ("^\\s-*import\\s-+\\(?:[^ ]+\\s-+\\(as\\)\\s-+[^ ]+\\)\\s-+from\\s-"
+          (1 'font-lock-keyword-face))
+
+         ;; ES6 Lambda parameters (...) => {}
+         (,(concat
+            "\\s-(\\s-*"
+            typescript--name-start-re)
+          ,(list (concat "\\(" typescript--name-re "\\)\\(\\s-*).*\\)?\\s-*")
+                 '(backward-char)
+                 '(end-of-line)
+                 '(1 font-lock-variable-name-face)))
+         )))
+
+(provide 'defuns-typescript)
+;;; defuns-typescript.el ends here
diff --git a/modules/module-js.el b/modules/module-js.el
index c00372e1a..aada9f267 100644
--- a/modules/module-js.el
+++ b/modules/module-js.el
@@ -87,7 +87,11 @@
   :config (setq-default coffee-indent-like-python-mode t))
 
 (use-package typescript-mode
-  :mode "\\.ts$")
+  :mode (("\\.ts$" . typescript-mode)
+         ("\\.tsx$" . web-mode))
+  :init
+  (add-hook! typescript-mode
+    '(rainbow-delimiters-mode doom|ts-fontify)))
 
 (use-package tide
   :after typescript-mode
@@ -95,18 +99,22 @@
   (setq tide-format-options
         '(:insertSpaceAfterFunctionKeywordForAnonymousFunctions t
           :placeOpenBraceOnNewLineForFunctions nil))
+
   (defun doom|tide-setup ()
     (tide-setup)
     (flycheck-mode +1)
     (eldoc-mode +1))
   (add-hook 'typescript-mode-hook 'doom|tide-setup)
+
   (add-hook! web-mode
     (when (f-ext? buffer-file-name "tsx")
       (doom|tide-setup)))
 
   (map! :map typescript-mode-map
         :m "gd" 'tide-jump-to-definition
-        (:leader :n "h" 'tide-documentation-at-point)))
+        (:leader :n "h" 'tide-documentation-at-point))
+
+  (advice-add 'tide-project-root :override 'doom/project-root))
 
 ;;
 (defvar npm-conf (make-hash-table :test 'equal))