diff --git a/.tmux.conf b/.tmux.conf
index 67bf472..8eb1f2f 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -5,7 +5,7 @@ set-option -g status-keys emacs
 set-window-option -g mode-keys vi
 set-window-option -g xterm-keys on
 bind-key _ split-window -v
-source-file %%HOMEDIR%%/.tmux.screen.conf
+source-file $TMUX_CONF_DIR/.tmux.screen.conf
 
 #####################
 # Terminal Properties
@@ -19,7 +19,7 @@ set-option -g set-titles on
 set-option -g set-titles-string "#S - #W (#I.#P) #T"
 set-option -g status on
 set-option -g status-justify left
-set-option -g status-left "#h#(%%HOMEDIR%%/.tmux.status.sh)"
+set-option -g status-left "#h#($TMUX_CONF_DIR/.tmux.status.sh)"
 set-option -g status-left-length 25
 set-option -g status-right "%a %b %d %l:%M%p #[bg=colour21]#S:#I.#P"
 set-option -g status-interval 5