diff --git a/home/natto/config/emacs/config.org b/home/natto/config/emacs/config.org
index 45c49b6..1a6f298 100644
--- a/home/natto/config/emacs/config.org
+++ b/home/natto/config/emacs/config.org
@@ -58,8 +58,7 @@
 #+begin_src emacs-lisp
 (use-package benchmark-init
   :config
-  ;; To disable collection of benchmark data after init is done.
-  :init (benchmark-init/deactivate))
+  (add-hook 'after-init-hook 'benchmark-init/deactivate) )
 #+end_src
 
 ** Visual packages
@@ -139,6 +138,7 @@ Consult
 (use-package evil
   :init
   (setq-default evil-shift-width 2)
+  (setq evil-want-keybinding nil)
   :config
   (evil-set-initial-state 'vterm-mode 'insert)
   (evil-set-undo-system 'undo-tree)
@@ -488,6 +488,7 @@ Compilation shortcuts for standalone files
 ** gptel
 #+begin_src emacs-lisp
 (use-package gptel
+  :defer t
   :config
   (setq  gptel-model 'claude-sonnet-4-20250514
          gptel-backend (gptel-make-anthropic "Claude"
@@ -503,6 +504,7 @@ Compilation shortcuts for standalone files
 ** Aidermacs
 #+begin_src emacs-lisp
 (use-package aidermacs
+  :defer t
   :bind (("C-c a" . aidermacs-transient-menu))
   :custom
   ; See the Configuration section below