diff --git a/muttrc b/muttrc
index a97c010..1e55d93 100644
--- a/muttrc
+++ b/muttrc
@@ -8,7 +8,7 @@ set realname="Paul Walker"
 
 # set folder = "imaps://imap.fastmail.com/"
 # set spoolfile="imaps://imap.fastmail.com/INBOX"
-set folder="~/Mail/"
+set folder="~/Mail/Fastmail/"
 set spoolfile=+INBOX
 set record="+Sent Items"
 set postponed="+Drafts"
@@ -28,7 +28,7 @@ set header_cache = ~/.mutt/cache/headers
 set message_cachedir =~/.mutt/cache/bodies
 
 # Mailcap (autoexecute program declarations)
-set mailcap_path = ~/.mutt/mailcap
+set mailcap_path = ~/.mailcap
 
 set index_format="%4C %Z %{%b %d} %-15.15F (%4c) %s"
 set followup_to=no
@@ -90,22 +90,28 @@ save-hook "~f .*@kickstarter\.com"            ="Filing cabinet.Kickstarter"
 save-hook "~f .*@manflowyoga\.com"            ="Filing cabinet.MFY"
 save-hook "~f .*@jonnybradley\.com"           ="Filing cabinet.FBA"
 save-hook "~f .*@medium\.com"                 ="Filing cabinet.Medium"
-
+save-hook "~f .*@edgechurch\.co"              ="Filing cabinet.Edge"
 save-hook "~f .*@abbeywoodschool\.com"        ="Filing cabinet.School.Abbeywood"
 save-hook "~f .*@olympustrust"                ="Filing cabinet.School.Abbeywood"
 save-hook "~f .*@classcharts\.com"            ="Filing cabinet.School.Abbeywood"
 save-hook "~f 8034000@sims-communications\.co\.uk" ="Filing cabinet.School.Abbeywood"
+save-hook "~f .*@ccsadoption\.org"          ="Filing cabinet.CCS"
 
 save-hook "~s .*order.*"                    ="Filing cabinet.Orders"
 save-hook "~f .*@paypal\.com"               ="Filing cabinet.Orders"
 save-hook "~f .*@paypal\.co\.uk"            ="Filing cabinet.Orders"
+save-hook "~s Your.invoice.from.Apple"      ="Filing cabinet.Orders"
 
 save-hook "~f .*@.*ajbell\.co\.uk"          ="Filing cabinet.YouInvest"
 save-hook "~f .*@.*youinvest\.co\.uk"       ="Filing cabinet.YouInvest"
 save-hook "~f .*@.*h-l\.co\.uk"             ="Filing cabinet.Hargreaves Lansdown"
 
+save-hook "~h List-Id:.*ez\.substack\.com"  ="Mailing lists.Ed Zitron"
+
 save-hook "~f damien@moneytothemasses\.com" ="Filing cabinet.80-20"
 
+save-hook "~t .*@servicesmart\.app"         ="Projects.ServiceSmart.ServiceSmart archive"
+
 # Catch-all
 save-hook "~f ."            ="Archive"