diff --git a/custom.el b/custom.el
index edab978..fd2188d 100644
--- a/custom.el
+++ b/custom.el
@@ -7,7 +7,7 @@
  '(magit-commit-arguments (quote ("-S")))
  '(package-selected-packages
    (quote
-    (zoom-window yasnippet-snippets yari yaml-mode which-key web-mode use-package typescript-mode toggle-quotes tide thrift string-inflection sqlformat smex smartparens smart-mode-line slim-mode seeing-is-believing scss-mode sass-mode rust-playground ruby-tools ruby-refactor ruby-compilation rubocopfmt rubocop rspec-mode robe rjsx-mode restart-emacs resize-window realgud-byebug rainbow-mode racer prettier-js plantuml-mode php-mode phi-search neotree nav multiple-cursors move-dup magit-gh-pulls lua-mode lsp-mode linum-relative json-mode imenu-anywhere ido-vertical-mode ido-completing-read+ hlinum highlight-symbol highlight-indentation highlight-indent-guides helpful helm-swoop helm-projectile helm-open-github helm-gtags helm-describe-modes helm-descbinds helm-ag go-projectile go-playground go-dlv gitignore-mode github-browse-file gitconfig-mode git-timemachine git-link full-ack flycheck-rust flycheck-gometalinter fill-column-indicator feature-mode expand-region exec-path-from-shell evil eslintd-fix editorconfig dumb-jump doom-themes dockerfile-mode direx diminish diff-hl dash-at-point company-lsp company-go coffee-mode cargo buffer-move browse-kill-ring anzu ace-window))))
+    (zoom-window yasnippet-snippets yari yaml-mode which-key web-mode use-package typescript-mode toggle-quotes tide thrift string-inflection sqlformat smex smartparens smart-mode-line slim-mode seeing-is-believing scss-mode sass-mode rust-playground ruby-tools ruby-refactor ruby-compilation rubocopfmt rubocop rspec-mode robe rjsx-mode restart-emacs resize-window realgud-byebug rainbow-mode racer prettier-js plantuml-mode php-mode phi-search neotree nav multiple-cursors move-dup magit-gh-pulls lua-mode lsp-ui lsp-mode linum-relative json-mode imenu-anywhere ido-vertical-mode ido-completing-read+ hlinum highlight-symbol highlight-indentation highlight-indent-guides helpful helm-swoop helm-projectile helm-open-github helm-gtags helm-describe-modes helm-descbinds helm-ag go-projectile go-playground go-dlv gitignore-mode github-browse-file gitconfig-mode git-timemachine git-link full-ack flycheck-rust flycheck-gometalinter fill-column-indicator feature-mode expand-region exec-path-from-shell evil eslintd-fix editorconfig dumb-jump doom-themes dockerfile-mode direx diminish diff-hl dash-at-point company-lsp company-go coffee-mode cargo buffer-move browse-kill-ring anzu ace-window))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/modules/completion/siren-lsp.el b/modules/completion/siren-lsp.el
index 1db8cf7..35dae01 100644
--- a/modules/completion/siren-lsp.el
+++ b/modules/completion/siren-lsp.el
@@ -10,9 +10,16 @@
 
 (use-package lsp-mode
   :config
-  (require 'lsp-clients))
+  (require 'lsp-clients)
+  (setq lsp-eldoc-render-all nil))
 
 (use-package company-lsp)
 
+(use-package lsp-ui
+  :hook (lsp-mode . lsp-ui-mode)
+  :config
+  (setq  lsp-ui-doc-enable nil
+         lsp-ui-sideline-enable nil))
+
 (provide 'siren-lsp)
 ;;; siren-lsp.el ends here
diff --git a/modules/languages/siren-css.el b/modules/languages/siren-css.el
index 99bc355..2bd767f 100644
--- a/modules/languages/siren-css.el
+++ b/modules/languages/siren-css.el
@@ -19,6 +19,8 @@
   (defun siren-css-mode-setup ()
     (setq tab-width 2)
 
+    (company-mode +1)
+    (lsp)
     (highlight-indentation-current-column-mode +1)
     (rainbow-mode +1)))
 
diff --git a/modules/languages/siren-js.el b/modules/languages/siren-js.el
index 1d7770c..7492205 100644
--- a/modules/languages/siren-js.el
+++ b/modules/languages/siren-js.el
@@ -29,6 +29,7 @@
 
     (prettier-js-mode)
     (company-mode +1)
+    (lsp)
     (subword-mode +1)
     (hs-minor-mode 1)
     (highlight-indentation-current-column-mode)
diff --git a/modules/languages/siren-typescript.el b/modules/languages/siren-typescript.el
index bdf9eef..f1c0c90 100644
--- a/modules/languages/siren-typescript.el
+++ b/modules/languages/siren-typescript.el
@@ -26,6 +26,7 @@
             tab-width width))
 
     (company-mode +1)
+    (lsp)
     (subword-mode +1)
     (hs-minor-mode 1)
     (highlight-indentation-current-column-mode)