diff --git a/bashrc b/bashrc
index c13d78a..63214dd 100644
--- a/bashrc
+++ b/bashrc
@@ -16,7 +16,6 @@ COMP_ENABLE=true
 
 # Other useful vars
 #export LC_CTYPE= <- for system messages locale
-[[ $TERM == screen || $TERM == xterm ]] && export TERM=$TERM-256color
 export LC_ALL='en_GB.UTF-8'
 export LANG=$LC_ALL
 export PAGER='less -R'
diff --git a/tmux.conf b/tmux.conf
index 7ce8757..5c2ce4a 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,5 +1,4 @@
-# This tmux statusbar config was created by tmuxline.vim
-# on Mon, 13 Oct 2014
+# tmux.conf
 bind r source-file /home/von/.tmux.conf\; display-message "Config reloaded."
 bind h select-pane -L
 bind j select-pane -D
@@ -17,13 +16,13 @@ bind -n M-q select-window -p
 bind -n S-Pageup copy-mode -u
 set -g base-index 1
 set -g history-limit 10000
-set -g set-titles on
+set -g set-titles off
 set -g set-titles-string "#T"
 set -g status-left-length 20
 set -g status-right-length 40
 set -g monitor-activity on
-set -g set-titles off
-set -g terminal-overrides 'rxvt-unicode*:sitm@,ritm@'
+set -g terminal-overrides "rxvt-unicode*:sitm@,ritm@"
+set -g default-terminal "screen-256color"
 
 set -g status-bg "colour0"
 set -g message-command-fg "colour7"
diff --git a/vimrc b/vimrc
index 618f467..67f39a5 100644
--- a/vimrc
+++ b/vimrc
@@ -83,7 +83,9 @@ if v:version >= 703
 		call vundle#end()
 
 		" airline options
-		let g:airline_powerline_fonts = 1
+		if &t_Co > 88 || has("gui_running")
+			let g:airline_powerline_fonts = 1
+		endif
 		let g:airline_symbols = {}
 		let g:airline_symbols.whitespace = '!'
 
diff --git a/xresources b/xresources
index 458b138..900adf1 100644
--- a/xresources
+++ b/xresources
@@ -17,6 +17,7 @@ URxvt.iso14755:		false
 URxvt.visualBell:	true
 URxvt.urgentOnBell:	true
 URxvt.cursorUnderline:	true
+URxvt.termName:		rxvt-unicode-256color
 
 ! icon (needs pixbuf support compiled)
 URxvt.iconFile:		/usr/share/icons/Faenza/apps/scalable/utilities-terminal.svg
diff --git a/zshrc b/zshrc
index e856c33..9a33d7a 100644
--- a/zshrc
+++ b/zshrc
@@ -37,11 +37,6 @@ export LANG="$LC_ALL"
 export PAGER='less'
 export EDITOR='vim'
 
-# ---> colors
-if [[ $OSTYPE == linux-gnu ]] && [[ $TERM == screen || $TERM == xterm || $TERM == rxvt-unicode ]]; then
-	export TERM="$TERM-256color"
-fi
-
 # ---> prompt
 PROMPT="%B%(!..%(1000#..%F{red}%n%f@))%F{blue}%m%f %F{white}%~%f %(1j.+%F{red}%j%f.)%(!.%F{red}.%F{green})%#%f%b "