diff --git a/mutt/aethon.muttrc b/mutt/aethon.muttrc
index a5f28b9..a206fc6 100644
--- a/mutt/aethon.muttrc
+++ b/mutt/aethon.muttrc
@@ -7,7 +7,7 @@ color status brightwhite green
 set from      = "thomas@aethon.nl"
 set smtp_url  = "smtp://thomas@aethon.nl@smtp.gmail.com:587/"
 set mbox      = "+aethon/INBOX"
-set signature = "~/.aethon_signature"
+set signature = "~/documents/work/aethon/signature.txt"
 set postponed = "+aethon/drafts"
 unset record
 
diff --git a/muttrc b/muttrc
index 79484bf..841302a 100644
--- a/muttrc
+++ b/muttrc
@@ -3,7 +3,7 @@
 ###
 
 # directories and commands
-set alias_file       = ~/.mutt/alias         #alias file
+set alias_file       = ~/.mutt/alias         # alias file
 set header_cache     = ~/.mutt/cache/headers # where to store headers
 set message_cachedir = ~/.mutt/cache/bodies  # where to store bodies
 set certificate_file = ~/.mutt/certificates  # where to store certs
@@ -13,21 +13,21 @@ set editor           = "/usr/bin/vim +/^$"   # use vim and skip to first blank
                                              # line
 
 # main options
-set mbox_type  = Maildir       # mailbox type
-set folder     = ~/Mail        # mailbox location
-set spoolfile  = "+arch/INBOX" # arch is the default inbox
-set timeout    = 3             # idle time before scanning
-set mail_check = 0             # minimum time between scans
-set sort_alias = alias         # sort alias file by alias
-set reverse_alias              # show names from alias file in index
-unset move                     # gmail does that
-set delete                     # don't ask, just do
-unset confirmappend            # don't ask, just do!
-set quit                       # don't ask, just do!!
-unset mark_old                 # read/new is good enough for me
-set beep_new                   # bell on new mails
-set pipe_decode                # strip headers and eval mimes when piping
-set thorough_search            # strip headers and eval mimes before searching
+set mbox_type  = Maildir          # mailbox type
+set folder     = ~/documents/mail # mailbox location
+set spoolfile  = "+arch/INBOX"    # arch is the default inbox
+set timeout    = 3                # idle time before scanning
+set mail_check = 0                # minimum time between scans
+set sort_alias = alias            # sort alias file by alias
+set reverse_alias                 # show names from alias file in index
+unset move                        # gmail does that
+set delete                        # don't ask, just do
+unset confirmappend               # don't ask, just do!
+set quit                          # don't ask, just do!!
+unset mark_old                    # read/new is good enough for me
+set beep_new                      # bell on new mails
+set pipe_decode                   # strip headers and eval mimes when piping
+set thorough_search               # strip headers and eval mimes before searching
 set ascii_chars = yes
 
 # index options
diff --git a/offlineimaprc b/offlineimaprc
index d333440..58f4dfa 100644
--- a/offlineimaprc
+++ b/offlineimaprc
@@ -22,19 +22,19 @@ remoterepository = aethon-remote
 
 [Repository arch-local]
 type         = Maildir
-localfolders = ~/Mail/arch
+localfolders = ~/documents/mail/arch
 
 [Repository gmail-local]
 type         = Maildir
-localfolders = ~/Mail/gmail
+localfolders = ~/documents/mail/gmail
 
 [Repository iactor-local]
 type         = Maildir
-localfolders = ~/Mail/iactor
+localfolders = ~/documents/mail/iactor
 
 [Repository aethon-local]
 type         = Maildir
-localfolders = ~/Mail/aethon
+localfolders = ~/documents/mail/aethon
 
 [Repository arch-remote]
 type           = Gmail
diff --git a/xinitrc b/xinitrc
index 3196b98..8da6ca0 100644
--- a/xinitrc
+++ b/xinitrc
@@ -1,6 +1,6 @@
 # -*- mode: shell-script -*-
 
-habak -mp 0,0 ~/Pictures/wall/1680x1050 -mp -0,0 ~/Pictures/wall/1280x1024
+habak -mp 0,0 ~/pictures/wallpapers/1680x1050 -mp -0,0 ~/pictures/wallpapers/1280x1024
 xmodmap -e "pointer = 3 2 1"
 conky