diff --git a/.muttrc b/.muttrc
index c2862b7..c366808 100644
--- a/.muttrc
+++ b/.muttrc
@@ -1,37 +1,57 @@
-set alias_file=~/.mutt_alias
-#set folder=~/Maildir/
-#set spoolfile="~/Maildir"
-set folder=imaps://mail.barakmich.com/
-set spoolfile=imaps://mail.barakmich.com/INBOX
-set header_cache=~/.hcache
-set imap_user=barak
-#set mbox_type=Maildir
-#set folder=~/.mail/barak
-#set spoolfile=+INBOX
-set move=no
-set mark_old=no
-set pager_stop=yes
-set postponed=+postponed
-set signature=~/.sig
-#set mbox="~/Maildir"
-#set imap_user="barak"
-#mailboxes `echo -n "+ "; find ~/.mail/barak -mindepth 1 -maxdepth 1 -type d -printf "+'%f' "`
-set sort=reverse-date-received
+set imap_user = "barak@barakmich.com"
+#set imap_pass = "secret"
 
+set smtp_url = "smtp://barak@barakmich.com@smtp.gmail.com:587/"
+#set smtp_pass = "secret"
+set from = "me@barakmich.com"
+set realname = "Barak Michener"
 
-alternative_order text/plain text/html
-auto_view text/html
+set folder = "imaps://imap.gmail.com:993"
+set spoolfile = "+INBOX"
+set postponed = "+[Gmail]/Drafts"
+set record="+[Gmail]/Sent Mail"
+set trash = "imaps://imap.gmail.com/[Gmail]/Trash"
 
-# Sending
-set record="+Sent"
-set postponed="+Drafts"
-set realname = 'Barak Michener'
-set from = 'me@barakmich.com'
-set use_from = yes
-set smtp_url=smtps://barakmich@outbound.mailhop.org
+# These two lines appear to be needed on some Linux distros, like Arch Linux
+set ssl_starttls = yes
 set ssl_force_tls = yes
 
+#set imap_force_ssl = yes
 
+set header_cache=~/.mutt/cache/headers
+set message_cachedir=~/.mutt/cache/bodies
+set certificate_file=~/.mutt/certificates
+set signature=~/.sig
+
+bind editor <space> noop
+bind  index,pager c  mail 				#Compose
+macro index,pager e  "<save-message>=[Gmail]/All Mail<enter><enter>" "Archive"
+bind  generic     x  tag-entry				#Select Conversation
+bind  index       x  tag-thread				#Select Conversation
+bind  pager       x  tag-message			#Select Conversation
+bind  index,pager s  flag-message			#Star a message
+macro index,pager +  "<save-message>=[Gmail]/Important<enter><enter>" "Mark as important"
+macro index,pager !  "<save-message>=[Gmail]/Spam<enter><enter>" "Report spam"
+bind  index,pager a  group-reply			#Reply all
+bind  index,pager \# delete-thread			#Delete
+bind  index,pager l  copy-message			#Label
+bind  index,pager v  save-message			#Move to
+macro index,pager I  "<set-flag>O"			"Mark as read"
+macro index,pager U  "<clear-flag>O"			"Mark as unread"
+macro index,pager ga "<change-folder>=[Gmail]/All Mail<enter>" "Go to all mail"
+macro index,pager gs "<change-folder>=[Gmail]/Starred<enter>"  "Go to 'Starred'"
+macro index,pager gd "<change-folder>=[Gmail]/Drafts<enter>"   "Go to 'Drafts'"
+macro index,pager gl "<change-folder>?" 		"Go to 'Label'"
+macro index,pager gi "<change-folder>=INBOX<enter>" 	"Go to inbox"
+macro index,pager gt "<change-folder>=[Gmail]/Sent Mail<enter>"	"Go to 'Sent Mail'"
+folder-hook +INBOX macro index,pager y "e" "Archive"
+folder-hook "+[Gmail]/Trash" macro index,pager y "<save-message>=INBOX<enter><enter>" "Move to inbox"
+folder-hook "+[Gmail]/Starred" bind index,pager y flag-message #"Toggle star"
+set to_chars = " +>-<L"
+
+set move = no
+set mark_old=no
+set imap_keepalive = 900
 
 # Better defaults
 set wait_key=no
@@ -46,8 +66,35 @@ unset mark_old
 set beep_new
 
 
-#set spoolfile=+michener.com
-# colors
+set sort = reverse-threads
+set sort_aux = last-date-received
+
+alternative_order text/plain text/html
+auto_view text/html
+
+#set alias_file = ~/.mutt/aliases
+set alias_file=~/.mutt_alias
+set sort_alias = alias
+set reverse_alias = yes
+
+set editor = "vi -c \"set spell spelllang=en_us\""
+set reverse_name = yes
+
+bind index gg first-entry
+bind index G last-entry
+bind index A toggle-read
+bind index n mail
+
+macro index c "<change-folder>?<toggle-mailboxes>" "open a different folder"
+macro pager c "<change-folder>?<toggle-mailboxes>" "open a different folder"
+macro index C "<copy-message>?<toggle-mailboxes>" "copy a message to a mailbox"
+macro index M "<save-message>?<toggle-mailboxes>" "move a message to a mailbox"
+macro index m "<clear-flag>N" "mark as read"
+macro compose A "<attach-message>?<toggle-mailboxes>" "attach message(s) to this message"
+macro index J "<next-new>" "next unread"
+macro index,pager "\Cf" "<next-page>" "page down"
+macro index,pager "\Cb" "<previous-page>" "page down"
+
 color normal	white default
 color attachment brightyellow black
 color hdrdefault cyan black
@@ -66,48 +113,3 @@ color header	brightblue black ^Subject:
 color body	brightred black [\-\.+_a-zA-Z0-9]+@[\-\.a-zA-Z0-9]+
 color body	brightblue black (https?|ftp)://[\-\.,/%~_:?&=\#a-zA-Z0-9]+
 color index brightcyan default ~N
-
-# GnuPG configuration
-set pgp_decode_command="gpg --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f"
-set pgp_verify_command="gpg --status-fd=2 --no-verbose --quiet --batch --output - --verify %s %f"
-set pgp_decrypt_command="gpg --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f"
-set pgp_sign_command="gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --detach-sign --textmode %?a?-u %a? %f"
-set pgp_clearsign_command="gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --textmode --clearsign %?a?-u %a? %f"
-set pgp_encrypt_only_command="/usr/lib/mutt/pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
-set pgp_encrypt_sign_command="/usr/lib/mutt/pgpewrap gpg %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
-set pgp_import_command="gpg --no-verbose --import %f"
-set pgp_export_command="gpg --no-verbose --export --armor %r"
-set pgp_verify_key_command="gpg --verbose --batch --fingerprint --check-sigs %r"
-set pgp_list_pubring_command="gpg --no-verbose --batch --quiet --with-colons --list-keys %r" 
-set pgp_list_secring_command="gpg --no-verbose --batch --quiet --with-colons --list-secret-keys %r" 
-set pgp_good_sign="^\\[GNUPG:\\] GOODSIG"
-set pager_index_lines=10
-
-
-macro index c "<change-folder>?<toggle-mailboxes>" "open a different folder"
-macro pager c "<change-folder>?<toggle-mailboxes>" "open a different folder"
-macro index C "<copy-message>?<toggle-mailboxes>" "copy a message to a mailbox"
-macro index M "<save-message>?<toggle-mailboxes>" "move a message to a mailbox"
-macro index m "<clear-flag>N" "mark as read"
-macro compose A "<attach-message>?<toggle-mailboxes>" "attach message(s) to this message"
-macro index J "<next-new>" "next unread"
-macro index,pager "\Cf" "<next-page>" "page down"
-macro index,pager "\Cb" "<previous-page>" "page down"
-
-bind index gg first-entry
-bind index G last-entry
-bind index A toggle-read
-bind index n mail
-
-# Neomutt
-#set sidebar_delim   = "  │"
-set sidebar_visible = no
-set sidebar_width   = 30
-macro index,pager <up> "<sidebar-prev>" "previous folder in sidebar"
-macro index,pager <down> "<sidebar-next>" "next folder in sidebar"
-macro index,pager <right> "<sidebar-open>" "open folder in sidebar"
-macro index gb '<enter-command>toggle sidebar_visible<enter>'
-macro pager gb '<enter-command>toggle sidebar_visible<enter>'
-#color sidebar_new color221 color233
-set status_chars  = " *%A"
-set status_format = "───────────────────[%r%m messages%?n? (%n new)?%?d? (%d to delete)?%?t? (%t tagged)? ]───%>─%?p?( %p postponed )?───"
diff --git a/.vimrc b/.vimrc
index 9ea5193..e4e575e 100644
--- a/.vimrc
+++ b/.vimrc
@@ -129,6 +129,9 @@ Plug 'let-def/vimbufsync'
 "Plug 'lucas8/coquille', {'branch': 'error_on_coq_error', 'for': 'coq'}
 Plug 'whonore/coquille', {'branch': 'pathogen-bundle', 'for': 'coq'}
 
+Plug 'HerringtonDarkholme/yats.vim'
+Plug 'mhartington/nvim-typescript'
+
 call plug#end()
 
 
@@ -520,7 +523,7 @@ endfunction
 
 " I don't know how I came up with gt for opening the tree, but it stuck.
 "nmap gt :NERDTreeToggle<CR>
-nmap gt :VimFilerExplorer -winwidth=40 -toggle -direction=rightbelow -parent -status<CR>
+nmap gt :VimFilerExplorer -winwidth=40 -toggle -direction=rightbelow -parent -status -force-hide<CR>
 " The same for the TagList, useful for large C files.
 "nmap gb :TlistToggle<CR>
 nmap gb :TagbarToggle<CR>
diff --git a/.xinitrc b/.xinitrc
index 8de13fe..1b9ed90 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -10,6 +10,8 @@ fi
 eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
 export SSH_AUTH_SOCK
 
+xinput-toggle -r yubikey -d
+
 xfsettingsd &
 xrdb -merge .Xdefaults &
 
@@ -34,7 +36,6 @@ if [ -f ~/.xrandrrc ]; then
     ~/.xrandrrc
 fi
 
-./xinput-toggle -r yubikey -d
 
 ~/.fehbg &
 if command -v compton &>/dev/null; then