diff --git a/init.el b/init.el
index 1a8c867..da0501b 100644
--- a/init.el
+++ b/init.el
@@ -24,7 +24,13 @@
 (setq column-number-mode t)
 (setq ido-use-filename-at-point nil)
 
-(use-package undo-fu)
+(use-package undo-tree
+  :ensure t
+  :after evil
+  :diminish
+  :config
+  (evil-set-undo-system 'undo-tree)
+  (global-undo-tree-mode 1))
 (use-package evil
   :ensure t ;; install the evil package if not installed
   :init ;; tweak evil's configuration before loading it
@@ -34,10 +40,9 @@
   (setq evil-split-window-below t)
   (setq evil-shift-round nil)
   (setq evil-want-C-u-scroll t)
-  (setq evil-undo-system 'undo-fu)
-  :config ;; tweak evil after loading it
+  (setq evil-want-C-i-jump nil) ;; so that TAB is operational in org
+  :config
   (evil-mode)
-  ;; example how to map a command in normal mode (called 'normal state' in evil)
   (define-key evil-normal-state-map (kbd ", w") 'evil-window-vsplit))
 
 (use-package rg