diff --git a/mail/.config/mutt/hooks b/mail/.config/mutt/hooks
deleted file mode 100644
index b4124df..0000000
--- a/mail/.config/mutt/hooks
+++ /dev/null
@@ -1,5 +0,0 @@
-# folder hooks for different accounts
-folder-hook rawlinson/*   source ~/.config/mutt/accounts/rawlinson
-folder-hook nullpointer/* source ~/.config/mutt/accounts/nullpointer
-
-source ~/.config/mutt/accounts/rawlinson # default account
diff --git a/mail/.config/mutt/accounts/nullpointer b/mail/.config/neomutt/accounts/nullpointer
similarity index 100%
rename from mail/.config/mutt/accounts/nullpointer
rename to mail/.config/neomutt/accounts/nullpointer
diff --git a/mail/.config/mutt/accounts/rawlinson b/mail/.config/neomutt/accounts/rawlinson
similarity index 100%
rename from mail/.config/mutt/accounts/rawlinson
rename to mail/.config/neomutt/accounts/rawlinson
diff --git a/mail/.config/mutt/bindings b/mail/.config/neomutt/bindings
similarity index 100%
rename from mail/.config/mutt/bindings
rename to mail/.config/neomutt/bindings
diff --git a/mail/.config/mutt/colours b/mail/.config/neomutt/colours
similarity index 100%
rename from mail/.config/mutt/colours
rename to mail/.config/neomutt/colours
diff --git a/mail/.config/mutt/gpg b/mail/.config/neomutt/gpg
similarity index 100%
rename from mail/.config/mutt/gpg
rename to mail/.config/neomutt/gpg
diff --git a/mail/.config/neomutt/hooks b/mail/.config/neomutt/hooks
new file mode 100644
index 0000000..701db83
--- /dev/null
+++ b/mail/.config/neomutt/hooks
@@ -0,0 +1,5 @@
+# folder hooks for different accounts
+folder-hook rawlinson/*   source ~/.config/neomutt/accounts/rawlinson
+folder-hook nullpointer/* source ~/.config/neomutt/accounts/nullpointer
+
+source ~/.config/neomutt/accounts/rawlinson # default account
diff --git a/mail/.config/mutt/layout b/mail/.config/neomutt/layout
similarity index 100%
rename from mail/.config/mutt/layout
rename to mail/.config/neomutt/layout
diff --git a/mail/.config/mutt/macros b/mail/.config/neomutt/macros
similarity index 100%
rename from mail/.config/mutt/macros
rename to mail/.config/neomutt/macros
diff --git a/mail/.config/mutt/mailboxes b/mail/.config/neomutt/mailboxes
similarity index 100%
rename from mail/.config/mutt/mailboxes
rename to mail/.config/neomutt/mailboxes
diff --git a/mail/.config/mutt/mailcap b/mail/.config/neomutt/mailcap
similarity index 100%
rename from mail/.config/mutt/mailcap
rename to mail/.config/neomutt/mailcap
diff --git a/mail/.config/mutt/muttrc b/mail/.config/neomutt/muttrc
similarity index 69%
rename from mail/.config/mutt/muttrc
rename to mail/.config/neomutt/muttrc
index 7596735..fe4a0e8 100644
--- a/mail/.config/mutt/muttrc
+++ b/mail/.config/neomutt/muttrc
@@ -1,10 +1,10 @@
 # conform to XDG base directory specification
-set header_cache = $XDG_CACHE_HOME/mutt/headers
-set message_cachedir = $XDG_DATA_HOME/mutt/messages
-set mailcap_path = $XDG_CONFIG_HOME/mutt/mailcap
-set record = $XDG_DATA_HOME/mutt/record/sent
+set header_cache = $XDG_CACHE_HOME/neomutt/headers
+set message_cachedir = $XDG_DATA_HOME/neomutt/messages
+set mailcap_path = $XDG_CONFIG_HOME/neomutt/mailcap
+set record = $XDG_DATA_HOME/neomutt/record/sent
 set tmpdir = $XDG_RUNTIME_DIR
-set certificate_file = $XDG_DATA_HOME/mutt/certificates
+set certificate_file = $XDG_DATA_HOME/neomutt/certificates
 # i like having a clean uncluttered $HOME, sue me
 
 # general
@@ -31,14 +31,14 @@ set send_charset = "utf-8"           # charset to use when sending
 unset user_agent                     # remove UA header
 
 # grab rest of the config
-source ~/.config/mutt/colours
-source ~/.config/mutt/mailboxes
-source ~/.config/mutt/gpg
-source ~/.config/mutt/layout
-source ~/.config/mutt/bindings
-source ~/.config/mutt/macros
-source ~/.config/mutt/hooks
-source ~/.config/mutt/notmuch
+source ~/.config/neomutt/colours
+source ~/.config/neomutt/mailboxes
+source ~/.config/neomutt/gpg
+source ~/.config/neomutt/layout
+source ~/.config/neomutt/bindings
+source ~/.config/neomutt/macros
+source ~/.config/neomutt/hooks
+source ~/.config/neomutt/notmuch
 
 #set read_only # set read-only when messing around with settings
 # vim: syntax=muttrc
diff --git a/mail/.config/mutt/notmuch b/mail/.config/neomutt/notmuch
similarity index 100%
rename from mail/.config/mutt/notmuch
rename to mail/.config/neomutt/notmuch