   :config)
 
 (use-package undo-tree
-  :config
-  (global-undo-tree-mode)
+  :init
+  (add-hook 'prog-mode-hook 'undo-tree-mode)
+  (add-hook 'text-mode-hook 'undo-tree-mode)
+  :config
   :general
     ("<f4> v"     #'undo-tree-visualize)
   :diminish undo-tree-mode)

(use-package ws-butler
  :init
  (setq ws-butler-convert-leading-tabs-or-spaces t)       ; convert according to indent-tabs-mode (but not when smart-tabs-mode on)
  :config
  (ws-butler-global-mode t)
  :diminish ws-butler-mode
  :defer 3)

(use-package shell-pop
  :config

              (define-key deft-mode-map (kbd "<C-backspace>") #'deft-filter-clear))))

(use-package company
  :general
    ("s-d"        #'company-complete)
  :init
  (setq company-minimum-prefix-length 1            ; just one char needed
        company-dabbrev-downcase nil)              ; never downcase
  (add-hook 'prog-mode-hook #'company-mode)
  :config
  (use-package company-quickhelp
    :demand
    :config
    (company-quickhelp-mode 1))
  :diminish company-mode "ⓒ")

(use-package counsel-gtags
  :commands ( counsel-gtags-find-definition
