diff --git a/emacs/.config/doom/config.el b/emacs/.config/doom/config.el
index d05ce07..f337335 100644
--- a/emacs/.config/doom/config.el
+++ b/emacs/.config/doom/config.el
@@ -6,29 +6,54 @@
       doom-theme 'doom-molokai)
 
 ;; projectile
-(setq projectile-project-search-path '("~/devel/personal/" "~/devel/andthensome/" "~/Documents/" "~"))
+(use-package! projectile
+  :config
+  (setq projectile-project-search-path '("~/devel/personal/" "~/devel/andthensome/" "~/Documents/")))
 
 ;; irc
-(add-hook 'circe-channel-mode-hook 'enable-lui-autopaste)
-(setq circe-network-options
-      `(
-        ("znc-freenode"
-         :host "irc.higherlearning.eu"
-         :port "5000"
-         :tls t
-         :user "l0rd/freenode"
-         :server-buffer-name "⇄ Freenode (ZNC)"
-         :pass (lambda (&rest _) (+pass-get-secret "controlpanel/irc.higherlearning.eu"))
-         :channels ("#emacs"))
-        ("znc-snoonet"
-         :host "irc.higherlearning.eu"
-         :port "5000"
-         :tls t
-         :user "l0rd/snoonet"
-         :server-buffer-name "⇄ Snoonet (ZNC)"
-         :pass (lambda (&rest _) (+pass-get-secret "controlpanel/irc.higherlearning.eu"))
-         :channels ("#islam"))
-        ))
+(use-package! circe
+  :config
+  (setq circe-network-options
+        `(
+          ("znc-freenode"
+           :host "irc.higherlearning.eu"
+           :port "5000"
+           :tls t
+           :user "l0rd/freenode"
+           :server-buffer-name "⇄ Freenode (ZNC)"
+           :pass (lambda (&rest _) (+pass-get-secret "controlpanel/irc.higherlearning.eu"))
+           :channels ("#emacs"))
+          ("znc-snoonet"
+           :host "irc.higherlearning.eu"
+           :port "5000"
+           :tls t
+           :user "l0rd/snoonet"
+           :server-buffer-name "⇄ Snoonet (ZNC)"
+           :pass (lambda (&rest _) (+pass-get-secret "controlpanel/irc.higherlearning.eu"))
+           :channels ("#islam"))
+          ))
+  :hook (circe-channel-mode . enable-lui-autopaste)
+  )
+
+;; notmuch
+(use-package! notmuch
+  :config
+  (setq +notmuch-sync-backend 'mbsync
+        +notmuch-sync-command "mailsync"
+        sendmail-program "/usr/bin/msmtp"
+        message-sendmail-f-is-evil t
+        message-sendmail-extra-arguments '("--read-envelope-from")
+        message-send-mail-function 'message-send-mail-with-sendmail)
+  )
+
+;; org
+(after! org
+  (map! :map org-mode-map
+        :n "M-j" #'org-metadown
+        :n "M-k" #'org-metaup)
+  )
+(setq org-directory "~/Documents/org/"
+      org-log-done 'note)
 
 ;; temporarily fix bug
-(fset 'battery-update #'ignore)
+;; (fset 'battery-update #'ignore)
diff --git a/emacs/.config/doom/init.el b/emacs/.config/doom/init.el
index e239d10..079dfb9 100644
--- a/emacs/.config/doom/init.el
+++ b/emacs/.config/doom/init.el
@@ -67,7 +67,7 @@
        ;;eshell            ; a consistent, cross-platform shell (WIP)
        ;;shell             ; a terminal REPL for Emacs
        ;;term              ; terminals in Emacs
-       ;;vterm             ; another terminals in Emacs
+       vterm             ; another terminals in Emacs
 
        :tools
        ;;ansible
diff --git a/mutt/.local/bin/mailsync b/mutt/.local/bin/mailsync
index 12f8f62..219ebbb 100755
--- a/mutt/.local/bin/mailsync
+++ b/mutt/.local/bin/mailsync
@@ -47,6 +47,16 @@ done
 wait
 
 notmuch new 2>/dev/null
+notmuch tag +spam -inbox --- folder:"gmail/Spam" OR folder:"andthensome/Spam" OR folder:"ryankes/Spam"
+notmuch tag +trash -inbox --- folder:"gmail/Trash" OR folder:"andthensome/Trash" OR folder:"ryankes/Trash"
+notmuch tag +archive -inbox --- folder:"gmail/Archive" OR folder:"andthensome/Archive" OR folder:"ryankes/Archive"
+notmuch tag +sent -inbox --- folder:"gmail/Sent" OR folder:"andthensome/Sent" OR folder:"ryankes/Sent"
+notmuch tag +eudora -inbox --- folder:"/ryankes/Archive.Eudora/"
+notmuch tag +hotmail -inbox --- folder:"/ryankes/Archive.hotmail/"
+notmuch tag +inbox --- folder:"gmail/INBOX" OR folder:"andthensome/INBOX" OR folder:"ryankes/INBOX"
+notmuch tag +gmail --- folder:"/gmail/"
+notmuch tag +andthensome --- folder:"/andthensome/"
+notmuch tag +ryankes --- folder:"/ryankes/"
 
 mu index --muhome=~/.cache/mu --maildir=~/.local/share/mail 2>/dev/null
 
diff --git a/mutt/.notmuch-config b/mutt/.notmuch-config
index 049355a..7637d0c 100644
--- a/mutt/.notmuch-config
+++ b/mutt/.notmuch-config
@@ -48,8 +48,8 @@ other_email=alrayyes@gmail.com;ryan@andthensome.nl;
 #		in the mail store.
 #
 [new]
-tags=unread;inbox;
-ignore=Trash;Spam;
+#tags=new;
+#ignore=Trash;Spam;
 
 # Search configuration
 #
@@ -61,7 +61,7 @@ ignore=Trash;Spam;
 #		query will override that exclusion.
 #
 [search]
-exclude_tags=Trash;Spam;
+exclude_tags=trash;spam;
 
 # Maildir compatibility configuration
 #
diff --git a/zsh/.zshenv b/zsh/.zshenv
index 1c87804..f98266b 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -78,5 +78,14 @@ export PASSWORD_STORE_ENABLE_EXTENSIONS="true"
 # Save history file in proper place
 HISTFILE=~/.cache/zsh/history
 
-# Use alternative muhome
+-# Use alternative muhome
 export MU_HOME="/home/alrayyes/.cache/mu"
+
+# Needed to get zsh to play nice with emacs vterm
+if [[ "$INSIDE_EMACS" = 'vterm' ]]; then
+    alias clear='printf "\e]51;Evterm-clear-scrollback\e\\";tput clear'
+fi
+vterm_prompt_end() {
+    printf "\e]51;A$(whoami)@$(hostname):$(pwd)\e\\";
+}
+PROMPT=$PROMPT'%{$(vterm_prompt_end)%}'