diff --git a/init.el b/init.el
index 1b85b9d..5619d88 100644
--- a/init.el
+++ b/init.el
@@ -60,6 +60,7 @@
 ;; Evil Mode
 (use-package evil
   :ensure t
+  :init (setq evil-want-C-u-scroll t)
   :config
   (evil-mode 1)
   (evil-set-undo-system 'undo-redo))
@@ -67,7 +68,7 @@
 (use-package evil-org
   :ensure t
   :after org
-  :hook (org-mode . (lambda () evil-org-mode))
+  :hook (org-mode . evil-org-mode)
   :config
   (require 'evil-org-agenda)
   (evil-org-agenda-set-keys)
@@ -197,17 +198,30 @@
 ;; lsp-mode
 (use-package lsp-mode
   :ensure t
-  :commands (lsp lsp-deferred)
-  :init (setq lsp-keymap-prefix "C-c l")
-  :hook (lsp-mode . lsp-enable-which-key-integration))
+  :init
+  ;; set prefix for lsp-command-keymap (few alternatives - "C-l", "C-c l")
+  (setq lsp-keymap-prefix "C-c l")
+  :hook (;; replace XXX-mode with concrete major-mode(e. g. python-mode)
+         (c-mode . lsp-deferred)
+         (c++-mode . lsp-deferred)
+	 (typescript-mode . lsp-deferred)
+         ;; if you want which-key integration
+         (lsp-mode . lsp-enable-which-key-integration))
+  :commands (lsp lsp-deferred))
 (use-package lsp-ui
   :ensure t
-  :hook (lsp-mode . lsp-ui-mode))
+  :commands lsp-ui-mode)
+;; if you are ivy user
+(use-package lsp-ivy
+  :ensure t
+  :commands lsp-ivy-workspace-symbol)
 (use-package lsp-treemacs
   :ensure t
-  :after lsp)
-(use-package lsp-ivy
+  :commands lsp-treemacs-errors-list)
+(use-package dap-mode
   :ensure t)
+;; (use-package dap-LANGUAGE) to load the dap adapter for your language
+
 
 ;; company (useful for showing lsp-mode popups)
 (use-package company
@@ -251,10 +265,10 @@
      "8363207a952efb78e917230f5a4d3326b2916c63237c1f61d7e5fe07def8d378"
      default))
  '(package-selected-packages
-   '(all-the-icons company-box counsel doom-modeline gruvbox-theme
-		   helpful ivy-rich lsp-ivy lsp-treemacs lsp-ui magit
-		   no-littering org-bullets org-roam org-roam-ui
-		   projectile rainbow-delimiters tree-sitter-langs
+   '(all-the-icons company-box counsel dap-mode doom-modeline evil-org
+		   gruvbox-theme helpful ivy-rich lsp-ivy lsp-treemacs
+		   lsp-ui magit org-bullets org-roam-ui projectile
+		   rainbow-delimiters tree-sitter-langs
 		   typescript-mode)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.