diff --git a/mutt/.mailcap b/mutt/.mailcap
deleted file mode 100644
index 49eb343..0000000
--- a/mutt/.mailcap
+++ /dev/null
@@ -1,6 +0,0 @@
-text/html; firefox %s && sleep 5; test=test -n "$DISPLAY";
-text/html; links -html-numbered-links 1 -dump %s; nametemplate=%s.html; copiousoutput
-#text/html; w3m -I %{charset} -T text/html; copiousoutput;
-text/plain; vim %s;
-
-
diff --git a/mutt/.muttrc b/mutt/.muttrc
deleted file mode 100644
index 0227ffd..0000000
--- a/mutt/.muttrc
+++ /dev/null
@@ -1,172 +0,0 @@
-# Paths ---------------------
-set folder = ~/.maildir
-set alias_file = ~/.mutt/alias
-set header_cache = ~/.mutt/cache/headers
-set message_cachedir = ~/.mutt/cache/bodies
-set certificate_file = ~/.mutt/certificates
-set mailcap_path = ~/.mailcap
-set tmpdir = ~/.mutt/temp
-set signature = ~/.sig
-
-# Options -------------------
-set wait_key = no
-set mbox_type = Maildir
-set timeout = 3
-set mail_check = 0
-unset move
-set delete
-unset confirmappend
-set quit
-unset mark_old
-set pipe_decode
-set thorough_search
-set charset = utf-8
-set send_charset = utf-8
-
-# Sidebar -------------------
-set sidebar_visible = yes
-set sidebar_width = 20
-set sidebar_short_path = yes
-set sidebar_format = "%B%?F? [%F]?%* %?N?%N/?%S"
-color sidebar_new color221 color233
-
-# Header Options ------------
-ignore *
-unignore from: reply-to: to: cc: bcc: date: subject: x-Spam-score: list-id:
-unhdr_order *
-hdr_order from: reply-to: to: cc: bcc: date: subject: x-Spam-score: list-id:
-
-# Setup IMAP -------------------
-set my_pass=`~/bin/pw.sh IMAP_PASSWORD`
-set my_user=`~/bin/pw.sh IMAP_USERNAME`
-set folder = "imaps://$my_user:$my_pass@imap.fastmail.com:993"
-set spoolfile= "+INBOX"
-set record = +Sent
-set postponed = +Drafts
-set trash = +Trash
-set imap_check_subscribed = yes
-bind index G imap-fetch-mail
-
-# Setup SMTP -------------------
-set smtp_url=smtp://$my_user:$my_pass@smtp.fastmail.com:587
-set ssl_force_tls=yes
-#set ssl_starttls=yes
-
-
-# Mailboxes -----------------
-# source ~/.mutt/mailboxes
-
-# Index ---------------------
-set date_format = "%m/%d"
-set index_format = "[%Z] %D %-20.20F %s"
-set sort = threads
-set sort_aux = reverse-last-date-received
-set uncollapse_jump
-set sort_re
-set reply_regexp = "^(([Rr][Ee]?(\[[0-9]+\])?: *)?(\[[^]]+\] *)?)*"
-
-bind index R group-reply
-bind index <tab> sync-mailbox
-bind index <space> collapse-thread
-
-macro index / "<enter-command>unset wait_key<enter><shell-escape>mutt-notmuch-py<enter><change-folder-readonly>~/.cache/mutt_results<enter>" \
-          "search mail (using notmuch)"
-
-macro index \Cr "T~U<enter><tag-prefix><clear-flag>N<untag-pattern>.<enter>" "mark all messages as read"
-
-macro index,pager o "<shell-escape>$HOME/bin/fastmail.sh<enter>" "run offlineimap to sync fastmail"
-
-macro index,pager C "<copy-message>?<toggle-mailboxes>" "copy a message to a mailbox"
-macro index,pager s "<save-message>?<toggle-mailboxes>" "move a message to a mailbox"
-
-bind index D purge-message
-
-bind index,pager <down>   sidebar-next
-bind index,pager <up>     sidebar-prev
-bind index,pager <right>  sidebar-open
-
-
-# Pager View -----------------
-set pager_index_lines = 10 # number of index lines to show
-set pager_context = 3      # number of context lines to show
-set pager_stop             # don't go to next message automatically
-set menu_scroll            # scroll in menus
-set tilde                  # show tildes like in vim
-unset markers              # no ugly plus signs
-
-set quote_regexp = "^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+"
-alternative_order text/plain text/enriched text/html
-
-
-# Pager Bindings -------------
-bind pager k  previous-line
-bind pager j  next-line
-bind pager R  group-reply
-
-# View attachments properly.
-bind attach <return> view-mailcap
-auto_view text/html
-
-macro pager \Cu "|urlview<enter>" "call urlview to open links"
-
-# Setup Identity
-set realname="Andrew Davidson"
-set from="andrew@amdavidson.com"
-
-
-
-# Setup VIM for editing headers
-set edit_headers
-set editor="nvim +':set textwidth=0' +':set wrapmargin=0' +':set wrap' +':set linebreak' +':set nolist' +/^$ ++1"
-
-# Contacts shortcuts
-set query_command = "khard email --parsable --search-in-source-files '%s'"
-bind editor <Tab> complete-query
-bind editor ^T    complete
-macro index,pager A "<pipe-message>khard add-email<return>" "add the sender email address to khard"
-
-# Some neat stuff.
-set fcc_attach=yes          # Forward attachments.
-unset reply_self            # Don't include myself when replying to all
-set smart_wrap              # wrap text smartly and don't clip words.
-set forward_format='Fwd: %s' # make the forwarding subject line look more like other clients.
-set forward_decode
-set reply_to
-set reverse_name
-set include
-set forward_quote
-
-# Crypto stuff
-set pgp_decode_command="gpg --pinentry-mode loopback %?p?--passphrase-fd 0? --no-verbose --batch --output - %f"
-set pgp_verify_command="gpg --pinentry-mode loopback --no-verbose --batch --output - --verify %s %f"
-set pgp_decrypt_command="gpg --pinentry-mode loopback --passphrase-fd 0 --no-verbose --batch --output - %f"
-set pgp_sign_command="gpg --pinentry-mode loopback --no-verbose --batch --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
-set pgp_clearsign_command="gpg --pinentry-mode loopback --no-verbose --batch --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
-set pgp_encrypt_only_command="/usr/lib/neomutt/pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust --encrypt-to 0x49CF25C6  -- -r %r -- %f"
-set pgp_encrypt_sign_command="/usr/lib/neomutt/pgpewrap gpg --passphrase-fd 0 --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust --encrypt-to 0x49CF25C6  -- -r %r -- %f"
-set pgp_import_command="gpg --no-verbose --import -v %f"
-set pgp_export_command="gpg --no-verbose --export --armor %r"
-set pgp_verify_key_command="gpg --no-verbose --batch --fingerprint --check-sigs %r"
-set pgp_list_pubring_command="gpg --no-verbose --batch --with-colons --list-keys %r"
-set pgp_list_secring_command="gpg --no-verbose --batch --with-colons --list-secret-keys %r"
-
-# Sign emails as me.
-set pgp_sign_as=0x49CF25C6
-
-# Automatically sign emails.
-#set crypt_autosign
-
-# Reply to signed emails with a signed email.
-set crypt_replysign
-
-# Encrypt and sign replies to signed emails.
-# set crypt_replyencrypt=yes
-
-# Encrypt and sign replies to encrypted emails.
-set crypt_replysignencrypted=yes
-
-# Time out of GPG after xx seconds.
-set pgp_timeout=28800
-
-# Automatically verify signatures.
-set crypt_verify_sig=yes
diff --git a/neomutt/.config/neomutt/neomuttrc b/neomutt/.config/neomutt/neomuttrc
new file mode 100644
index 0000000..9f4605e
--- /dev/null
+++ b/neomutt/.config/neomutt/neomuttrc
@@ -0,0 +1,77 @@
+### Me
+set from = "andrew@amd.im"
+set realname = "Andrew Davidson"
+
+
+### Connectivity
+set imap_user = "andrew@bigfootstoybox.com"
+set imap_pass = "asdf"
+set folder = "imaps://mail.amd.im"
+set smtp_url = "smtps://$imap_user:$imap_pass@mail.amd.im:465"
+set ssl_starttls = no
+set ssl_force_tls = yes
+set imap_check_subscribed           # automatically check subscribed folders
+mailboxes +INBOX
+
+
+### Mailbox Locations
+set spoolfile = "+INBOX"
+set record = "=Sent"
+set postponed = "=Drafts"
+set trash = "=Trash"
+
+
+### Local Folders
+set header_cache = "~/.cache/mutt/headers"
+set message_cachedir = "~/.cache/mutt/messages"
+
+### Local Settings
+set mail_check = 60                 # check for mail every XX seconds
+set imap_keepalive = 900            # does what it says on the tin, in seconds
+set edit_headers                    # include headers when editing a message
+set fast_reply                      # dont ask too many questions when replying
+set pager_stop                      # stop scrolling pager at end of message
+set pager_context                   # add 3 lines of context to message pager
+set forward_quote                   # include message when forwarding
+set forward_decode                  # decode message when forwarding
+set reply_to                        # follow Reply to: header
+set reverse_name                    # reply as the recipient address
+set include                         # include message in replies as default
+set text_flowed=yes                 # correct indentation
+unset sig_dashes                    # no dashes before signature
+set charset = "utf-8"               # prefer utf-8
+set send_charset = "utf-8:iso-8859-1:us-ascii" # send in utf-8
+set editor = "nvim"                 # we know we want to edit in nvim
+set confirmappend = no              # don't double check when moving messages
+
+### Message threading
+set sort_re                         # changes method by which threads are sorted
+set sort = reverse-threads          # sort by threads
+set sort_aux = last-date-received   # secondarily sory by most recent message received in thread
+
+### Sidebar
+set sidebar_visible                 # show the sidebar
+set sidebar_short_path              # simplify paths in sidebar
+unset sidebar_folder_indent           # indent mailboxes in sidebar
+set sidebar_format = "%B %* [%?N?%N/?%S]" # what should the sidebar display
+set mail_check_stats                # check mailbox statistics for sidebar view
+
+
+
+### Keybindings
+bind index j next-entry
+bind index k previous-entry
+bind pager j next-line
+bind pager k previous-line
+
+bind attach,index,pager \CD next-page
+bind attach,index,pager \CU previous-page
+bind pager g top
+bind pager G bottom
+bind attach,index g first-entry
+bind attach,index G last-entry
+
+bind index,pager \CJ sidebar-next
+bind index,pager \CK sidebar-prev
+bind index,pager \CE sidebar-open
+bind index,pager B sidebar-toggle-visible