diff --git a/.gitignore b/.gitignore
index 952879b..fc2e338 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-neomutt/accounts
-neomutt/current_host
+neomutt/hosts/*/accounts
diff --git a/neomutt/hosts/TDKVXYVKV7/mailboxes b/neomutt/hosts/TDKVXYVKV7/mailboxes
new file mode 100644
index 0000000..4fc4cf3
--- /dev/null
+++ b/neomutt/hosts/TDKVXYVKV7/mailboxes
@@ -0,0 +1,25 @@
+# -*- muttrc -*-
+#
+# Mailboxes for mutt
+#
+
+# Where are mailboxes stored
+set folder="imaps://imap.gmail.com/"
+
+# Where archived mail goes
+set mbox="+[Gmail]/All Mail"
+#set mbox="imaps://imap.misfit.rodeo/[Gmail]/All Mail"
+
+# Where postponed messaged die
+set postponed="+[Gmail]/Drafts"
+
+# ... and it gets saved in =outbox.
+# Gmail does this automatically, let's not duplicate...
+#set record="+[Gmail]/Sent Mail"
+
+# Look me up
+set spoolfile="+INBOX"
+
+mailboxes $spoolfile
+
+set imap_check_subscribed = yes
diff --git a/neomutt/hosts/TDKVXYVKV7/main b/neomutt/hosts/TDKVXYVKV7/main
new file mode 100644
index 0000000..f3fd2d4
--- /dev/null
+++ b/neomutt/hosts/TDKVXYVKV7/main
@@ -0,0 +1,2 @@
+set from="orien.vandenbergh@guidepointsecurity.com"
+set hostname=felurian.guidepointsecurity.com        # Name of the localhost
diff --git a/neomutt/mailboxes b/neomutt/hosts/utage/mailboxes
similarity index 100%
rename from neomutt/mailboxes
rename to neomutt/hosts/utage/mailboxes
diff --git a/neomutt/hosts/utage/main b/neomutt/hosts/utage/main
new file mode 100644
index 0000000..7b51835
--- /dev/null
+++ b/neomutt/hosts/utage/main
@@ -0,0 +1,3 @@
+set from="orien@misfit.rodeo"
+set hostname=utage.i.misfit.rodeo        # Name of the localhost
+
diff --git a/neomutt/neomuttrc b/neomutt/neomuttrc
index 396b662..85cf789 100644
--- a/neomutt/neomuttrc
+++ b/neomutt/neomuttrc
@@ -1,10 +1,9 @@
 set realname="Orien Vandenbergh"
 set signature="~/.signature.txt"
-set from="orien@misfit.rodeo"
 set use_from = yes
 set envelope_from = yes
 
-set hostname=home.icebergh.us                       # Name of the localhost
+
 set hidden_host                                     # Hide host details
 set alias_file=~/.config/neomutt/aliases            # Personal mail aliases
 #set query_command="~/bin/mutt-ldap '%s'"           # How to query the company contacts
@@ -64,7 +63,7 @@ set header_cache="~/.cache/neomutt/headers"         # Where to cache imap header
 set message_cachedir="~/.cache/neomutt/bodies"      # "" bodies
 
 #source /usr/share/doc/mutt/samples/gpg.rc           # Use GPG
-source ~/.config/neomutt/accounts                             # Account details
+source ~/.config/neomutt/`hostname`/accounts                  # Account details
 source ~/.config/neomutt/aliases                              # Load in my aliases.
 source ~/.config/neomutt/auto_views                           # Define auto_views.
 source ~/.config/neomutt/bindings                             # Define key bindings.
@@ -75,13 +74,14 @@ source ~/.config/neomutt/fcc-hooks                            # Define fcc-hooks
 source ~/.config/neomutt/folder-hooks                         # Define folder-hooks.
 source ~/.config/neomutt/headers                              # Configure header display.
 source ~/.config/neomutt/macros                               # Define macros.
-source ~/.config/neomutt/mailboxes                            # Define the list of folders that receive mail.
+source ~/.config/neomutt/hosts/`hostname`/mailboxes           # Host specific settings
 source ~/.config/neomutt/message-hooks                        # Define message hooks.
 source ~/.config/neomutt/non-standard                         # Support for mutt patches.
 source ~/.config/neomutt/save-hooks                           # Define save-hooks.
 source ~/.config/neomutt/subscriptions                        # Define the list of subscribed mailing lists.
 
 color index_subject brightred default '~ihubspotemail.net'
+color index_subject brightred default '~imarketo.org'
 
 # Play with the sidebar?
 #set sidebar_divider_char = '|'