diff --git a/tmux.conf b/tmux.conf
index 94109e2..cc3f971 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,3 +1,4 @@
+#tmux config
 bind r source-file /home/von/.tmux.conf\; display-message "Config reloaded."
 bind h select-pane -L
 bind j select-pane -D
@@ -20,33 +21,33 @@ set -g set-titles-string "#T"
 set -g status-left-length 20
 set -g status-right-length 40
 set -g monitor-activity on
-set-window-option -g window-status-format ' #I:#W '
+set-window-option -g window-status-format ' #I.#W '
 
-# Fancy & solarized
+# Molokai (256 colour)
 set -g pane-active-border-fg white
-set -g pane-border-fg brightgreen
-set -g status-bg black
-set -g status-fg green
-set -g status-attr bright
-set -g status-left '#[bg=brightcyan,fg=brightwhite] #H #[bg=brightyellow,fg=brightcyan]#[fg=brightwhite] #S #[bg=black,fg=brightyellow]#[default]'
-set -g status-right '#[fg=brightyellow]#[bg=brightyellow,fg=brightwhite] #(cat /proc/loadavg|cut -d" " -f1,2,3) #[fg=brightcyan]#[bg=brightcyan,fg=brightwhite] %a %e %k:%M #[default]'
-set-window-option -g window-status-current-format '#[bg=brightblack,fg=brightcyan] #I:#W #[default]'
-set-window-option -g window-status-bell-bg black
-set-window-option -g window-status-bell-fg white
-set-window-option -g window-status-bell-attr bright
-set-window-option -g window-status-activity-bg black
-set-window-option -g window-status-activity-fg blue
-set-window-option -g window-status-activity-attr bright
+set -g pane-active-border-fg brightgreen
+set -g status-bg colour233
+set -g status-fg colour59
+set -g status-left '[ #[fg=colour118]#H#[default] ][ #[fg=colour161]#S#[default] ]['
+set -g status-right '#[default]][ #[fg=colour144]#(cat /proc/loadavg|cut -d" " -f1,2,3)#[default] ][ #[fg=colour208]%a %e %k:%M#[default] ]'
+set-window-option -g window-status-current-format ' #[fg=colour252]#I.#W#[default] '
+set-window-option -g window-status-bell-bg colour233
+set-window-option -g window-status-bell-fg colour161
+set-window-option -g window-status-activity-bg colour233
+set-window-option -g window-status-activity-fg colour144
 
-# 256-colours
-#set -g pane-active-border-fg colour112
-#set -g pane-border-fg colour195
-#set -g status-bg colour233
-#set -g status-fg colour195
-#set -g status-left '[ #[fg=colour112]#H#[default]:#S ]['
-#set -g status-right '][ #[fg=colour227]#(cat /proc/loadavg|cut -d" " -f1,2,3)#[default] ][ #[fg=colour112]%a %e %k:%M#[default] ]'
-#set-window-option -g window-status-current-format '#[bg=colour25,fg=colour195] #I.#W #[default]'
-#set-window-option -g window-status-bell-bg colour196
-#set-window-option -g window-status-bell-fg colour233
-#set-window-option -g window-status-activity-bg colour111
-#set-window-option -g window-status-activity-fg colour233
+# Fancy & solarized (compatible)
+#set -g pane-active-border-fg white
+#set -g pane-border-fg brightgreen
+#set -g status-bg black
+#set -g status-fg green
+#set -g status-attr bright
+#set -g status-left '#[bg=brightcyan,fg=brightwhite] #H #[bg=brightyellow,fg=brightcyan]#[fg=brightwhite] #S #[bg=black,fg=brightyellow]#[default]'
+#set -g status-right '#[fg=brightyellow]#[bg=brightyellow,fg=brightwhite] #(cat /proc/loadavg|cut -d" " -f1,2,3) #[fg=brightcyan]#[bg=brightcyan,fg=brightwhite] %a %e %k:%M #[default]'
+#set-window-option -g window-status-current-format '#[bg=brightblack,fg=brightcyan] #I:#W #[default]'
+#set-window-option -g window-status-bell-bg black
+#set-window-option -g window-status-bell-fg white
+#set-window-option -g window-status-bell-attr bright
+#set-window-option -g window-status-activity-bg black
+#set-window-option -g window-status-activity-fg blue
+#set-window-option -g window-status-activity-attr bright
diff --git a/vimrc b/vimrc
index e8486f2..76feff0 100644
--- a/vimrc
+++ b/vimrc
@@ -52,10 +52,10 @@ if filereadable(expand("$HOME/.vim/plugins/svndiff.vim"))
 endif
 
 " set color scheme depending on the terminal capabilities
-if &t_Co < 88
-	colorscheme elflord
+if &t_Co > 255 || has("gui_running")
+	colorscheme molokai
 else
-	colorscheme solarized
+	colorscheme elflord
 endif
 
 " still have to deal with old vim versions :<
diff --git a/zshrc b/zshrc
index 2ba37c1..9ea1495 100644
--- a/zshrc
+++ b/zshrc
@@ -31,7 +31,7 @@ HISTFILE="$HOME/.histfile"
 HISTSIZE=1000
 SAVEHIST=1000
 
-export LS_COLORS='no=00:fi=00:di=34:ow=34;40:ln=35:pi=30;44:so=35;44:do=35;44:bd=33;44:cd=37;44:or=05;37;41:mi=05;37;41:ex=01;31:*.cmd=01;31:*.exe=01;31:*.com=01;31:*.bat=01;31:*.reg=01;31:*.app=01;31:*.txt=32:*.org=32:*.md=32:*.mkd=32:*.h=32:*.c=32:*.C=32:*.cc=32:*.cpp=32:*.cxx=32:*.objc=32:*.sh=32:*.csh=32:*.zsh=32:*.el=32:*.vim=32:*.java=32:*.pl=32:*.pm=32:*.py=32:*.rb=32:*.hs=32:*.php=32:*.htm=32:*.html=32:*.shtml=32:*.erb=32:*.haml=32:*.xml=32:*.rdf=32:*.css=32:*.sass=32:*.scss=32:*.less=32:*.js=32:*.coffee=32:*.man=32:*.0=32:*.1=32:*.2=32:*.3=32:*.4=32:*.5=32:*.6=32:*.7=32:*.8=32:*.9=32:*.l=32:*.n=32:*.p=32:*.pod=32:*.tex=32:*.bmp=33:*.cgm=33:*.dl=33:*.dvi=33:*.emf=33:*.eps=33:*.gif=33:*.jpeg=33:*.jpg=33:*.JPG=33:*.mng=33:*.pbm=33:*.pcx=33:*.pdf=33:*.pgm=33:*.png=33:*.ppm=33:*.pps=33:*.ppsx=33:*.ps=33:*.svg=33:*.svgz=33:*.tga=33:*.tif=33:*.tiff=33:*.xbm=33:*.xcf=33:*.xpm=33:*.xwd=33:*.xwd=33:*.yuv=33:*.aac=33:*.au=33:*.flac=33:*.mid=33:*.midi=33:*.mka=33:*.mp3=33:*.mpa=33:*.mpeg=33:*.mpg=33:*.ogg=33:*.ra=33:*.wav=33:*.anx=33:*.asf=33:*.avi=33:*.axv=33:*.flc=33:*.fli=33:*.flv=33:*.gl=33:*.m2v=33:*.m4v=33:*.mkv=33:*.mov=33:*.mp4=33:*.mp4v=33:*.mpeg=33:*.mpg=33:*.nuv=33:*.ogm=33:*.ogv=33:*.ogx=33:*.qt=33:*.rm=33:*.rmvb=33:*.swf=33:*.vob=33:*.wmv=33:*.doc=31:*.docx=31:*.rtf=31:*.dot=31:*.dotx=31:*.xls=31:*.xlsx=31:*.ppt=31:*.pptx=31:*.fla=31:*.psd=31:*.7z=1;35:*.apk=1;35:*.arj=1;35:*.bin=1;35:*.bz=1;35:*.bz2=1;35:*.cab=1;35:*.deb=1;35:*.dmg=1;35:*.gem=1;35:*.gz=1;35:*.iso=1;35:*.jar=1;35:*.msi=1;35:*.rar=1;35:*.rpm=1;35:*.tar=1;35:*.tbz=1;35:*.tbz2=1;35:*.tgz=1;35:*.tx=1;35:*.war=1;35:*.xpi=1;35:*.xz=1;35:*.z=1;35:*.Z=1;35:*.zip=1;35:*.ANSI-30-black=30:*.ANSI-01;30-brblack=01;30:*.ANSI-31-red=31:*.ANSI-01;31-brred=01;31:*.ANSI-32-green=32:*.ANSI-01;32-brgreen=01;32:*.ANSI-33-yellow=33:*.ANSI-01;33-bryellow=01;33:*.ANSI-34-blue=34:*.ANSI-01;34-brblue=01;34:*.ANSI-35-magenta=35:*.ANSI-01;35-brmagenta=01;35:*.ANSI-36-cyan=36:*.ANSI-01;36-brcyan=01;36:*.ANSI-37-white=37:*.ANSI-01;37-brwhite=01;37:*.log=01;32:*~=01;32:*#=01;32:*.bak=01;33:*.BAK=01;33:*.old=01;33:*.OLD=01;33:*.org_archive=01;33:*.off=01;33:*.OFF=01;33:*.dist=01;33:*.DIST=01;33:*.orig=01;33:*.ORIG=01;33:*.swp=01;33:*.swo=01;33:*,v=01;33:*.gpg=34:*.gpg=34:*.pgp=34:*.asc=34:*.3des=34:*.aes=34:*.enc=34:'
+#export LS_COLORS='no=00:fi=00:di=34:ow=34;40:ln=35:pi=30;44:so=35;44:do=35;44:bd=33;44:cd=37;44:or=05;37;41:mi=05;37;41:ex=01;31:*.cmd=01;31:*.exe=01;31:*.com=01;31:*.bat=01;31:*.reg=01;31:*.app=01;31:*.txt=32:*.org=32:*.md=32:*.mkd=32:*.h=32:*.c=32:*.C=32:*.cc=32:*.cpp=32:*.cxx=32:*.objc=32:*.sh=32:*.csh=32:*.zsh=32:*.el=32:*.vim=32:*.java=32:*.pl=32:*.pm=32:*.py=32:*.rb=32:*.hs=32:*.php=32:*.htm=32:*.html=32:*.shtml=32:*.erb=32:*.haml=32:*.xml=32:*.rdf=32:*.css=32:*.sass=32:*.scss=32:*.less=32:*.js=32:*.coffee=32:*.man=32:*.0=32:*.1=32:*.2=32:*.3=32:*.4=32:*.5=32:*.6=32:*.7=32:*.8=32:*.9=32:*.l=32:*.n=32:*.p=32:*.pod=32:*.tex=32:*.bmp=33:*.cgm=33:*.dl=33:*.dvi=33:*.emf=33:*.eps=33:*.gif=33:*.jpeg=33:*.jpg=33:*.JPG=33:*.mng=33:*.pbm=33:*.pcx=33:*.pdf=33:*.pgm=33:*.png=33:*.ppm=33:*.pps=33:*.ppsx=33:*.ps=33:*.svg=33:*.svgz=33:*.tga=33:*.tif=33:*.tiff=33:*.xbm=33:*.xcf=33:*.xpm=33:*.xwd=33:*.xwd=33:*.yuv=33:*.aac=33:*.au=33:*.flac=33:*.mid=33:*.midi=33:*.mka=33:*.mp3=33:*.mpa=33:*.mpeg=33:*.mpg=33:*.ogg=33:*.ra=33:*.wav=33:*.anx=33:*.asf=33:*.avi=33:*.axv=33:*.flc=33:*.fli=33:*.flv=33:*.gl=33:*.m2v=33:*.m4v=33:*.mkv=33:*.mov=33:*.mp4=33:*.mp4v=33:*.mpeg=33:*.mpg=33:*.nuv=33:*.ogm=33:*.ogv=33:*.ogx=33:*.qt=33:*.rm=33:*.rmvb=33:*.swf=33:*.vob=33:*.wmv=33:*.doc=31:*.docx=31:*.rtf=31:*.dot=31:*.dotx=31:*.xls=31:*.xlsx=31:*.ppt=31:*.pptx=31:*.fla=31:*.psd=31:*.7z=1;35:*.apk=1;35:*.arj=1;35:*.bin=1;35:*.bz=1;35:*.bz2=1;35:*.cab=1;35:*.deb=1;35:*.dmg=1;35:*.gem=1;35:*.gz=1;35:*.iso=1;35:*.jar=1;35:*.msi=1;35:*.rar=1;35:*.rpm=1;35:*.tar=1;35:*.tbz=1;35:*.tbz2=1;35:*.tgz=1;35:*.tx=1;35:*.war=1;35:*.xpi=1;35:*.xz=1;35:*.z=1;35:*.Z=1;35:*.zip=1;35:*.ANSI-30-black=30:*.ANSI-01;30-brblack=01;30:*.ANSI-31-red=31:*.ANSI-01;31-brred=01;31:*.ANSI-32-green=32:*.ANSI-01;32-brgreen=01;32:*.ANSI-33-yellow=33:*.ANSI-01;33-bryellow=01;33:*.ANSI-34-blue=34:*.ANSI-01;34-brblue=01;34:*.ANSI-35-magenta=35:*.ANSI-01;35-brmagenta=01;35:*.ANSI-36-cyan=36:*.ANSI-01;36-brcyan=01;36:*.ANSI-37-white=37:*.ANSI-01;37-brwhite=01;37:*.log=01;32:*~=01;32:*#=01;32:*.bak=01;33:*.BAK=01;33:*.old=01;33:*.OLD=01;33:*.org_archive=01;33:*.off=01;33:*.OFF=01;33:*.dist=01;33:*.DIST=01;33:*.orig=01;33:*.ORIG=01;33:*.swp=01;33:*.swo=01;33:*,v=01;33:*.gpg=34:*.gpg=34:*.pgp=34:*.asc=34:*.3des=34:*.aes=34:*.enc=34:'
 export LC_ALL='en_GB.UTF-8'
 export LANG="$LC_ALL"
 export PAGER='less'