diff --git a/.emacs b/.emacs
index 50bf057..d49de1e 100644
--- a/.emacs
+++ b/.emacs
@@ -26,7 +26,7 @@
 	 ("melpa" . "https://melpa.org/packages/")))
  '(package-enable-at-startup nil)
  '(package-selected-packages
-   '(flymake-go company-go zenburn-theme langtool smart-tabs-mode typescript-mode protobuf-mode opencl-mode glsl-mode go-mode elpy markdown-mode yasnippet srefactor irony cmake-mode company magit use-package))
+   '(company-go zenburn-theme langtool smart-tabs-mode typescript-mode protobuf-mode opencl-mode glsl-mode go-mode elpy markdown-mode srefactor irony cmake-mode company magit use-package))
  '(safe-local-variable-values
    '((vc-follow-symlinks . t)
 	 (TeX-master . t)
@@ -152,12 +152,12 @@
 
 
 (use-package yasnippet
+  :config
+  (yas-global-mode)
   :after (company)
   :bind ( :map yas-minor-mode-map
 			   ("TAB" . nil)
 			   )
-  :config
- ; (add-to-list 'company-backends 'company-yasnippet)
   )
 
 (use-package yasnippet-snippets
@@ -179,6 +179,11 @@
   )
 
 (use-package lsp-mode
+  :config
+  (yas-minor-mode)
+  (global-set-key (kbd "C-c C-n") 'flymake-goto-next-error)
+  :bind ("C-c C-d" . lsp-ui-doc-show)
+
   :init
   ;; set prefix for lsp-command-keymap (few alternatives - "C-l", "C-c l")
   (setq lsp-keymap-prefix "C-c l")
@@ -191,6 +196,8 @@
 		 (lsp-mode . lsp-enable-which-key-integration))
   :commands (lsp lsp-deferred))
 
+(use-package lsp-ui)
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; C/C++
@@ -207,7 +214,6 @@
 
 (defun my-c-common-hook ()
   (smart-tabs-mode)
-  (yas-minor-mode-on)
   (if (derived-mode-p 'c-mode 'c++-mode)
       (cppcm-reload-all)
     )
@@ -304,12 +310,9 @@
 (use-package go-mode
   :config
   (setq gofmt-command "goimports")
+  (unbind-key "C-c C-d" go-mode-map)
   (add-hook 'before-save-hook 'gofmt-before-save)
   (setq compile-command "go build && go test -coverprofile=cover.out && go tool cover -html cover.out -o /tmp/cover.html")
-  :bind (
-		 ("C-c C-h" . godef-describe)
-		 ("C-c C-j" . godef-jump)
-		 )
   )
 
 (use-package glsl-mode)