diff --git a/emacs/init.el b/emacs/init.el
index 4c76851..95b4734 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -69,11 +69,11 @@
  '(treemacs-collapse-dirs 3)
  '(treemacs-filewatch-mode t)
  '(treemacs-follow-mode t)
- '(treemacs-fringe-indicator-mode t)
- '(treemacs-git-mode 'deferred)
+ '(treemacs-fringe-indicator-mode nil)
  '(treemacs-is-never-other-window t)
  '(treemacs-move-forward-on-expand t)
  '(treemacs-no-png-images t)
+ '(treemacs-show-hidden-file t)
  '(treemacs-tag-follow-mode t)
  '(undo-tree-auto-save-history t)
  '(undo-tree-history-directory-alist '(("." . "~/.undohist-emacs")))
@@ -312,9 +312,9 @@
   :init (global-flycheck-mode))
 
 (use-package treemacs
+  :after (evil)
   :config
-  (setq treemacs-show-hidden-files t)
-  (treemacs-follow-mode t)
+  (treemacs-git-mode 'deferred)
   (evil-define-key 'normal 'global (kbd "<leader> i") 'treemacs))
 
 (use-package treemacs-evil