diff --git a/emacs.d/custom.el b/emacs.d/custom.el
index 4114e3f..50cff22 100644
--- a/emacs.d/custom.el
+++ b/emacs.d/custom.el
@@ -4,7 +4,7 @@
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(package-selected-packages
-   '(github-review forge magit clojure-mode py-isort flycheck lsp-python-ms helm-lsp go-mode company projectile helm adoc-mode csv-mode php-mode python-black cython-mode scss-mode vue-mode tide rust-mode company-auctex tex-site auctex sphinx-doc company-lsp lsp-ui lsp-mode ws-butler use-package smartparens pip-requirements osx-clipboard monokai-theme markdown-mode helm-projectile helm-ag godoctor go-guru go-eldoc go-autocomplete flycheck-gometalinter doom-modeline dockerfile-mode docker-compose-mode diminish company-go company-anaconda))
+   '(lsp-pyright github-review forge magit clojure-mode py-isort flycheck lsp-python-ms helm-lsp go-mode company projectile helm adoc-mode csv-mode php-mode python-black cython-mode scss-mode vue-mode tide rust-mode company-auctex tex-site auctex sphinx-doc company-lsp lsp-ui lsp-mode ws-butler use-package smartparens pip-requirements osx-clipboard monokai-theme markdown-mode helm-projectile helm-ag godoctor go-guru go-eldoc go-autocomplete flycheck-gometalinter doom-modeline dockerfile-mode docker-compose-mode diminish company-go company-anaconda))
  '(safe-local-variable-values '((encoding . utf-8))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
diff --git a/emacs.d/init.el b/emacs.d/init.el
index 3516ccb..cd742b5 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -52,7 +52,7 @@
   (require 'package)
 
   (add-to-list 'package-archives
-	             '("melpa-stable" . "https://stable.melpa.org/packages/") t)
+	             '("melpa" . "https://melpa.org/packages/") t)
 
   (package-initialize)
 
@@ -246,7 +246,32 @@
 
   ;; Forge
   (use-package forge
-    :after magit))
+    :after magit)
+
+(use-package lsp-mode
+  :hook ((
+          python-mode     ; pyright
+        ) . lsp-deferred)
+  :commands lsp
+  :config
+  (setq lsp-auto-guess-root t)
+  (setq lsp-log-io nil)
+  (setq lsp-restart 'auto-restart)
+  (setq lsp-enable-symbol-highlighting nil)
+  (setq lsp-enable-on-type-formatting nil)
+  (setq lsp-signature-auto-activate nil)
+  (setq lsp-signature-render-documentation nil)
+  (setq lsp-eldoc-hook nil)
+  (setq lsp-modeline-code-actions-enable nil)
+  (setq lsp-modeline-diagnostics-enable nil)
+  (setq lsp-headerline-breadcrumb-enable nil)
+  (setq lsp-semantic-tokens-enable nil)
+  (setq lsp-enable-folding nil)
+  (setq lsp-enable-imenu nil)
+  (setq lsp-enable-snippet nil)
+  (setq read-process-output-max (* 1024 1024)) ;; 1MB
+  (setq lsp-idle-delay 0.5))
+  )
 
 ;; -- Load layers --
 (mapc 'load (file-expand-wildcards (expand-file-name "layers/*/*.el" current-dir)))
diff --git a/emacs.d/layers/csv/init.el b/emacs.d/layers/csv/init.el
deleted file mode 100644
index 31c14fd..0000000
--- a/emacs.d/layers/csv/init.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(use-package csv-mode
-  :diminish csv-mode
-  :ensure t
-  :mode (("\\.csv\\'" . csv-mode)))
diff --git a/emacs.d/layers/javascript/init.el b/emacs.d/layers/javascript/init.el
deleted file mode 100644
index 15d27f7..0000000
--- a/emacs.d/layers/javascript/init.el
+++ /dev/null
@@ -1,16 +0,0 @@
-(add-to-list 'auto-mode-alist '("\\.mjs\\'" . javascript-mode))
-(setq js-indent-level 2
-      typescript-indent-level 2
-      mmm-js-mode-enter-hook (lambda () (setq syntax-ppss-table nil))
-      mmm-typescript-mode-enter-hook (lambda () (setq syntax-ppss-table nil)))
-(use-package tide
-  :ensure t
-  :after (typescript-mode company flycheck)
-  :hook ((typescript-mode . tide-setup)
-         (typescript-mode . tide-hl-identifier-mode)
-         (before-save . tide-format-before-save)))
-
-(use-package vue-mode
-  :ensure t)
-(use-package vue-html-mode
-  :ensure t)
diff --git a/emacs.d/layers/js/init.el b/emacs.d/layers/js/init.el
deleted file mode 100644
index a839915..0000000
--- a/emacs.d/layers/js/init.el
+++ /dev/null
@@ -1 +0,0 @@
-(setq js-indent-level 2)
diff --git a/emacs.d/layers/python/init.el b/emacs.d/layers/python/init.el
index c0db282..b5ff6da 100644
--- a/emacs.d/layers/python/init.el
+++ b/emacs.d/layers/python/init.el
@@ -1,5 +1,4 @@
 ;; lsp-mode
-(setq lsp-enable-snippet nil)
 (use-package lsp-pyright
   :ensure t
   :init (setq lsp-pyright-auto-import-completions t)
@@ -7,7 +6,14 @@
                           (require 'lsp-pyright)
                           (lsp))))  ; or lsp-deferred
 (use-package lsp-ui
-  :commands lsp-ui-mode)
+  :commands lsp-ui-mode
+  :config
+  (setq lsp-ui-doc-enable nil)
+  (setq lsp-ui-doc-header t)
+  (setq lsp-ui-doc-include-signature t)
+  (setq lsp-ui-doc-border (face-foreground 'default))
+  (setq lsp-ui-sideline-show-code-actions t)
+  (setq lsp-ui-sideline-delay 0.05))
 
 (use-package helm-lsp
   :commands helm-lsp-workspace-symbol)