diff --git a/emacs.el b/emacs.el
index e0f68b9..f16a95a 100644
--- a/emacs.el
+++ b/emacs.el
@@ -559,6 +559,7 @@ drill-instructor.el"
 (and (not window-system)
      (not (eq window-system 'mac))
      (getenv "DISPLAY")
+     (not (equal (getenv "DISPLAY") ""))
      (executable-find "xclip")
      ;; (< emacs-major-version 24)
      (dllib-if-unfound "http://www.emacswiki.org/emacs/download/xclip.el" t)
diff --git a/tmux.conf b/tmux.conf
index 8a5702d..1d4c436 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -19,7 +19,7 @@ set message-fg yellow
 set -g set-titles on
 
 set -g status-bg green
-if "test `hostname` = newkiwi" "set -g status-bg blue"
 set -g status-fg white
+if "test `hostname` = arch-aspireone" "set -g status-bg blue"
 
 if "test -f /opt/local/bin/reattach-to-user-namespace" "set-option -g default-command '/opt/local/bin/reattach-to-user-namespace bash'"