diff --git a/cfg/zsh/cfg.d/export.zsh b/cfg/zsh/cfg.d/export.zsh
index f62eccb..ae00bb2 100644
--- a/cfg/zsh/cfg.d/export.zsh
+++ b/cfg/zsh/cfg.d/export.zsh
@@ -5,12 +5,19 @@ dotcfg="${dotfls}/cfg"
 lbrew="/home/linuxbrew/.linuxbrew"
 
 # Paths
+path=(${lbrew}/bin)
+path+=(${lbrew}/sbin)
+path+=(/usr/local/sbin)
+path+=(/usr/local/bin)
+path+=(/usr/sbin)
+path+=(/usr/bin)
+path+=(/sbin)
+path+=(/bin)
+path+=(/usr/lib/jvm/default/bin)
 path+=(${dotfls}/bin)
 path+=(${HOME}/.gem/ruby/2.4.0/bin)
 path+=(${HOME}/basher/bin)
 path+=(/opt/android-sdk/build-tools/26.0.1)
-path+=(${lbrew}/bin)
-path+=(${lbrew}/sbin)
 manpath+=(${lbrew}/share/man)
 infopath+=(${lbrew}/share/info)
 
diff --git a/cfg/zsh/cfg.d/source.d/function-fzf.zsh b/cfg/zsh/cfg.d/source.d/function-fzf.zsh
index 0e8cda1..4212c17 100644
--- a/cfg/zsh/cfg.d/source.d/function-fzf.zsh
+++ b/cfg/zsh/cfg.d/source.d/function-fzf.zsh
@@ -1,2 +1,4 @@
-[[ $- == *i* ]] && source "/home/linuxbrew/.linuxbrew/opt/fzf/shell/completion.zsh" 2> /dev/null
-source "/home/linuxbrew/.linuxbrew/opt/fzf/shell/key-bindings.zsh"
+[[ $- == *i* && -f "/usr/share/fzf/completion.zsh" ]] && source "/usr/share/fzf/completion.zsh" 2> /dev/null
+[[ -f "/usr/share/fzf/key-bindings.zsh" ]] && source "/usr/share/fzf/key-bindings.zsh"
+[[ $- == *i* && -f "/home/linuxbrew/.linuxbrew/opt/fzf/shell/completion.zsh" ]] && source "/home/linuxbrew/.linuxbrew/opt/fzf/shell/completion.zsh" 2> /dev/null
+[[ -f "/home/linuxbrew/.linuxbrew/opt/fzf/shell/key-bindings.zsh" ]] && source "/home/linuxbrew/.linuxbrew/opt/fzf/shell/key-bindings.zsh"
diff --git a/cfg/zsh/cfg.d/source.d/function-tmux.zsh b/cfg/zsh/cfg.d/source.d/function-tmux.zsh
index afd3469..1a1c55e 100644
--- a/cfg/zsh/cfg.d/source.d/function-tmux.zsh
+++ b/cfg/zsh/cfg.d/source.d/function-tmux.zsh
@@ -20,9 +20,9 @@ then
 
 	if [[ `tput colors` == "256" ]]
 	then
-		ZSH_TMUX_TERM=$ZSH_TMUX_FIXTERM_WITH_256COLOR
+		export ZSH_TMUX_TERM=$ZSH_TMUX_FIXTERM_WITH_256COLOR
 	else
-		ZSH_TMUX_TERM=$ZSH_TMUX_FIXTERM_WITHOUT_256COLOR
+		export ZSH_TMUX_TERM=$ZSH_TMUX_FIXTERM_WITHOUT_256COLOR
 	fi
 
 	if [[ "$ZSH_TMUX_ITERM2" == "false" ]] && [[ -f $HOME/.tmux.conf || -h $HOME/.tmux.conf ]]