diff --git a/config.org b/config.org
index ebdd9b1..c66277c 100644
--- a/config.org
+++ b/config.org
@@ -312,31 +312,6 @@ Configuration :
     :init
     (company-quickhelp-mode))
 #+END_SRC
-**** Company + Yasnippet
-+BEGIN_SRC emacs-lisp
-  (use-package yasnippet
-    :ensure t
-    :config
-    (use-package yasnippet-snippets
-      :ensure t)
-    (yas-reload-all))
-  (add-hook 'prog-mode-hook 'yas-minor-mode)
-  (add-to-list 'company-backends 'company-yasnippet)
-+END_SRC
-**** Company-Jedi Python
-#+BEGIN_SRC emacs-lisp
-  (use-package company-jedi
-    :ensure t)
-#+END_SRC
-
-Set Company-Jedi to run on Python buffers. :
-
-#+BEGIN_SRC emacs-lisp
-  (require 'company-jedi)
-  (autoload 'jedi:setup "jedi" nil t)
-  (add-hook 'python-mode-hook 'jedi:setup)
-  (add-to-list 'company-backends 'company-jedi)
-#+END_SRC
 *** Which Key
 #+BEGIN_SRC emacs-lisp
   (use-package which-key
@@ -344,14 +319,47 @@ Set Company-Jedi to run on Python buffers. :
     :init
     (which-key-mode))
 #+END_SRC
+** LSP Mode
+#+BEGIN_SRC emacs-lisp
+
+  ;; set prefix for lsp-command-keymap (few alternatives - "C-l", "C-c l")
+  (setq lsp-keymap-prefix "s-l")
+
+  (use-package lsp-mode
+    :ensure t
+    :hook (;; replace XXX-mode with concrete major-mode(e. g. python-mode)
+           (prog-mode . lsp)
+           ;; if you want which-key integration
+           (lsp-mode . lsp-enable-which-key-integration))
+    :commands lsp)
+
+  ;; optionally
+  (use-package lsp-ui :commands lsp-ui-mode
+    :ensure t)
+  (use-package company-lsp :commands company-lsp
+    :ensure t)
+  ;; if you are helm user
+  ;;(use-package helm-lsp :commands helm-lsp-workspace-symbol)
+  ;; if you are ivy user
+  (use-package lsp-ivy :commands lsp-ivy-workspace-symbol
+    :ensure t)
+  (use-package lsp-treemacs :commands lsp-treemacs-errors-list
+    :ensure t)
+
+  ;; optionally if you want to use debugger
+  (use-package dap-mode
+    :ensure t)
+  ;; (use-package dap-LANGUAGE) to load the dap adapter for your language
+#+END_SRC
 ** Spell Correction
 *** Flyspell Correct Ivy
 #+BEGIN_SRC emacs-lisp
   (use-package flyspell-correct-ivy
     :ensure t
-    :bind ("C-M-;" . flyspell-correct-wrapper)
+    :bind ("C-;" . flyspell-correct-wrapper)
     :init
-    (setq flyspell-correct-interface #'flyspell-correct-ivy))
+    (setq flyspell-correct-interface #'flyspell-correct-ivy)
+    (add-hook 'org-mode-hook 'flyspell-mode))
 #+END_SRC
 ** Multiple Cursors
 #+BEGIN_SRC emacs-lisp