diff --git a/modules/base/emacs/base-init.el b/modules/base/emacs/base-init.el
index 585a7300..12b8aa99 100644
--- a/modules/base/emacs/base-init.el
+++ b/modules/base/emacs/base-init.el
@@ -250,14 +250,14 @@
   (defun set-creation-date-heading-property () (org-set-property "CREATED" (format-time-string (org-time-stamp-format t t))))
   :general
   (lmap
-    :keymap 'org-mode-map
+    :keymaps 'org-mode-map
     "SPC i" '(org-insert-heading :which-key "Insert heading")
     "SPC <" '(org-promote-subtree :which-key "Decrease level")
     "SPC >" '(org-demote-subtree :which-key "Increase level")
     "SPC c" '(orc-clone-subtree-with-time-shift :which-key "Repeat subtree")
     )
   (lmap
-    "o a" '(org-agenda :which-key "Agenda")
+    "o a" '(org-agenda-list :which-key "Agenda")
     "o t" '(org-todo-list :which-key "Todo list")
     "o o" '(find-file-in-org-directory :which-key "Find org file")
     )
diff --git a/modules/base/emacs/default.nix b/modules/base/emacs/default.nix
index 24accac9..306857c4 100644
--- a/modules/base/emacs/default.nix
+++ b/modules/base/emacs/default.nix
@@ -16,7 +16,6 @@
       readOnly = true;
       default = pkgs.emacsWithPackagesFromUsePackage {
         config = config.chvp.base.emacs.fullConfig;
-        package = pkgs.emacsPgtk;
         alwaysEnsure = true;
         # mu4e is included in the mu package and should be used from there
         extraEmacsPackages = epkgs: lib.optional config.chvp.graphical.mail.enable pkgs.mu;
diff --git a/modules/development/default.nix b/modules/development/default.nix
index 89296223..2e509956 100644
--- a/modules/development/default.nix
+++ b/modules/development/default.nix
@@ -58,17 +58,6 @@
 
           ;; Snippets
           (use-package yasnippet
-            :init
-            ;; See https://orgmode.org/org.html#index-yasnippet_002eel
-            (defun yas/org-very-safe-expand () (let ((yas/fallback-behavior 'return-nil)) (yas/expand)))
-            (defun chvp/yas-org-fix () (
-              (make-variable-buffer-local 'yas/trigger-key)
-              (setq yas/trigger-key [tab])
-              (add-to-list 'org-tab-first-hook 'yas/org-very-safe-expand)
-              (define-key yas/keymap [tab] 'yas/next-field)
-            ))
-            :hook
-            (org-mode . chvp/yas-org-fix)
             ;; This is not very nice, but let's just assume that development machines have my nixos-config checked out
             :custom (yas-snippet-dirs '("/home/charlotte/repos/nixos-config/modules/development/snippets/"))
             :diminish (yas-minor-mode)
diff --git a/modules/graphical/mail/default.nix b/modules/graphical/mail/default.nix
index b732ccdd..a0b10c12 100644
--- a/modules/graphical/mail/default.nix
+++ b/modules/graphical/mail/default.nix
@@ -113,7 +113,7 @@ in
               (use-package mu4e
                 ;; Use mu4e included in the mu package, see emacs/default.nix
                 :ensure nil
-                :commands (mu4e mu4e-update-index)
+                :demand t
                 :after (vertico)
                 :init
                 (defun mu4e--main-action-str (title cmd) "")
@@ -208,6 +208,7 @@ in
                     (when (and msg (mu4e-message-contact-field-matches msg :to "dodona@ugent.be")) (mail/dodona-cc-reply-to))
                     )
                   )
+                (mu4e 'background)
                 :general
                 (lmap "m" '(mu4e :which-key "mail"))
                 ;; Unmap SPC in the mail view so we can still use the leader.