diff --git a/elisp/extras.el b/elisp/extras.el
index f2cd91d..3e7942c 100644
--- a/elisp/extras.el
+++ b/elisp/extras.el
@@ -96,8 +96,11 @@
 ;; language server
 (use-package lsp-mode)
 (use-package lsp-ui)
-(use-package lsp-treemacs)
+(use-package lsp-treemacs
+  :config
+  (global-set-key (kbd "<f3>") 'treemacs))
 (use-package lsp-ivy)
+(use-package company-lsp)
 (use-package yasnippet
   :config
   (yas-global-mode 1))
@@ -120,20 +123,35 @@
   :config
   (load "~/.emacs.d/elisp/typescript.el"))
 
-(use-package typescript-mode)
+(use-package typescript-mode
+  :ensure t
+  :init
+  (define-derived-mode typescript-tsx-mode typescript-mode "tsx")
+  :config
+  (add-hook 'typescript-mode #'subword-mode)
+  (add-to-list 'auto-mode-alist '("\\.tsx?\\'" . typescript-tsx-mode)))
 
-;; Java
-(use-package lsp-java)
+(use-package tree-sitter
+  :straight t
+  :hook ((typescript-mode . tree-sitter-hl-mode)
+	 (typescript-tsx-mode . tree-sitter-hl-mode)))
+
+(use-package tree-sitter-langs
+  :straight t
+  :after tree-sitter
+  :config
+  (tree-sitter-require 'tsx)
+  (add-to-list 'tree-sitter-major-mode-language-alist '(typescript-tsx-mode . tsx)))
 
 ;; Geiser
 (use-package geiser)
 (use-package geiser-guile)
 
 ;; Common Lisp
-(use-package slime
-  :disabled
-  :config
-  (load "~/.emacs.d/elisp/slime-setup.el"))
+;; (use-package slime
+;;   :disabled
+;;   :config
+;;   (load "~/.emacs.d/elisp/slime-setup.el"))
 
 (use-package sly)