diff --git a/modules/home-manager/emacs/default.nix b/modules/home-manager/emacs/default.nix
index 3726d6b..3659e97 100644
--- a/modules/home-manager/emacs/default.nix
+++ b/modules/home-manager/emacs/default.nix
@@ -13,7 +13,7 @@
     typescript-language-server
     typescript
     nodejs
-    mathpix-snipping-tool
+    # mathpix-snipping-tool
   ];
 
   programs.emacs = {
diff --git a/modules/home-manager/emacs/emacs/init.el b/modules/home-manager/emacs/emacs/init.el
index 603fd79..0696c90 100644
--- a/modules/home-manager/emacs/emacs/init.el
+++ b/modules/home-manager/emacs/emacs/init.el
@@ -123,6 +123,7 @@
 
   (start/leader-keys
     "o" '(:ignore t :wk "Org")
+    "o c" '(org-capture :wk "Capture note")
     "o e" '(find-file "~/RoamNotes/everything.org" :wk "Open notes")))
 
 (use-package emacs
@@ -230,12 +231,12 @@
   :config
   (add-to-list 'eglot-server-programs
 			   `(vue-mode . ("vue-language-server" "--stdio" :initializationOptions
-								(:typescript (:tsdk "/Users/mthomson/dev/work/westjet/profile-app-spa/node_modules/typescript/lib")
-								:vue (:hybridMode :json-false)))))
+							 (:typescript (:tsdk "/Users/mthomson/dev/work/westjet/profile-app-spa/node_modules/typescript/lib")
+										  :vue (:hybridMode :json-false)))))
   (add-to-list 'eglot-server-programs
 			   `(typescript-ts-mode . ("vue-language-server" "--stdio" :initializationOptions
-								(:typescript (:tsdk "/Users/mthomson/dev/work/westjet/profile-app-spa/node_modules/typescript/lib")
-								:vue (:hybridMode :json-false)))))
+									   (:typescript (:tsdk "/Users/mthomson/dev/work/westjet/profile-app-spa/node_modules/typescript/lib")
+													:vue (:hybridMode :json-false)))))
   )
 
 (use-package eldoc-box
@@ -292,29 +293,41 @@
 (add-to-list 'auto-mode-alist '("\\.vue\\'" . vue-mode))
 
 (use-package nix-mode
- :mode "\\.nix\\'")
+  :mode "\\.nix\\'")
 
 (use-package org
   :ensure nil
   :custom
   (org-edit-src-content-indentation 4) ;; Set src block automatic indent to 4 instead of 2.
-  (org-todo-keywords '((sequence "TODO(t!)" "IN-PROGRESS(p)" "CODE-REVIEW(r)" "BLOCKED(b)" "|" "DONE(d!)" "CANCELED(c!)")))
+  (org-todo-keywords '((sequence "TODO(t!)" "IN-PROGRESS(p!)" "CODE-REVIEW(r@/!)" "BLOCKED(b@/!)" "|" "DONE(d!)" "CANCELED(c@/!)")))
   (org-todo-keyword-faces
-		'(("IN-PROGRESS" . "yellow") ("BLOCKED" . "magenta") ("CODE-REVIEW" . "blue") ("CANCELED" . "grey") ("DONE" . "green")))
+   '(("IN-PROGRESS" . "yellow") ("BLOCKED" . "magenta") ("CODE-REVIEW" . "blue") ("CANCELED" . "grey") ("DONE" . "green")))
   (org-treat-insert-todo-heading-as-state-change t)
   (org-log-into-drawer t)
-  :config
-  (add-to-list 'org-modules 'org-habit t)
-  (add-to-list 'org-agenda-files "~/RoamNotes/everything.org")
-  :hook
-  (org-mode . org-indent-mode) ;; Indent text
-  ;; The following prevents <> from auto-pairing when electric-pair-mode is on.
-  ;; Otherwise, org-tempo is broken when you try to <s TAB...
-  (org-mode . (lambda ()
-                (setq-local electric-pair-inhibit-predicate
-                            `(lambda (c)
-                               (if (char-equal c ?<) t (,electric-pair-inhibit-predicate c))))))
-  )
+  (org-directory "~/RoamNotes")
+  
+  ;; capture config
+  (org-capture-templates
+   `(("i" "Inbox" entry  (file "inbox.org")
+	  ,(concat "* TODO %?\n"
+			   "/Entered on/ %U"))
+	 ("@" "Inbox [mu4e]" entry (file "inbox.org")
+	  ,(concat "* TODO Process \"%a\" %?\n"
+			   "/Entered on/ %U"))))
+
+  ;; agenda config
+  (org-agenda-files (list "everything.org" "inbox.org" "agenda.org" "notes.org"))
+:config
+(add-to-list 'org-modules 'org-habit t)
+:hook
+(org-mode . org-indent-mode) ;; Indent text
+;; The following prevents <> from auto-pairing when electric-pair-mode is on.
+;; Otherwise, org-tempo is broken when you try to <s TAB...
+(org-mode . (lambda ()
+			  (setq-local electric-pair-inhibit-predicate
+						  `(lambda (c)
+							 (if (char-equal c ?<) t (,electric-pair-inhibit-predicate c))))))
+)
 
 (use-package toc-org
   :commands toc-org-enable
@@ -356,6 +369,7 @@
   (setq mu4e-get-mail-command (concat (executable-find "mbsync") " -a"))
   (setq mu4e--get-mail-password-regexp "^Master Password: $")
   (setq mu4e-update-interval 300)
+  (setq mu4e-change-filenames-when-moving t)
 
   ;; msmtp
   (setq send-mail-function 'sendmail-send-it)