diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv
index 9038d98..661f7d7 100644
--- a/.config/zsh/.zshenv
+++ b/.config/zsh/.zshenv
@@ -4,11 +4,31 @@ TRAPUSR1() {
         exec "${SHELL}"
     fi
 }
+
+
+# Add exports
 if [[ $(uname) == "Darwin" ]]; then
+    #ONLY MACOS
     export JAVA_HOME="/opt/homebrew/opt/openjdk@17/libexec/openjdk.jdk/Contents/Home"
+    export PATH="/opt/homebrew/bin:$PATH"
+    export PATH="/opt/homebrew/opt/openjdk@17/bin:$PATH"
+    export PATH="/opt/homebrew/opt/texlive/bin:$PATH"
 else
+    #ONLY LINUX
     export LIBVA_DRIVER_NAME=nvidia
 fi
+
+
+#BOTH
+export PATH="/usr/sbin:/sbin:$PATH"
+export PATH="$HOME/.local/share/nvim/mason/bin:$PATH"
+export PATH="$HOME/.local/bin:$PATH"
+export PATH="$HOME/go/bin:$PATH"
+export PATH="$HOME/.cargo/bin:$PATH"
+export PATH="$HOME/.ghcup/bin:$PATH"
+export PATH="$HOME/.miniforge3/bin:$PATH"
+export PATH="$HOME/.cabal/bin:$PATH"
+
 export XDG_CONFIG_HOME="${HOME}/.config"
 export XDG_CACHE_HOME="${HOME}/.cache"
 export XDG_DATA_HOME="${HOME}/.local/share"
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index cf6436f..7957890 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -1,19 +1,3 @@
-# Add paths
-export PATH="/usr/sbin:/sbin:$PATH"
-export PATH="$HOME/.local/share/nvim/mason/bin:$PATH"
-export PATH="$HOME/.local/bin:$PATH"
-export PATH="$HOME/go/bin:$PATH"
-export PATH="$HOME/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin:$PATH"
-export PATH="$HOME/.cargo/bin:$PATH"
-export PATH="$HOME/.ghcup/bin:$PATH"
-export PATH="$HOME/.miniforge3/bin:$PATH"
-export PATH="$HOME/.cabal/bin:$PATH"
-export GOPATH=$HOME/.go
-export PATH=$PATH:$GOPATH/bin
-export PATH="/opt/homebrew/bin:$PATH"
-export PATH="/opt/homebrew/opt/openjdk@17/bin:$PATH"
-export PATH="/opt/homebrew/opt/texlive/bin:$PATH"
-
 # Setup History
 HISTFILE=${ZDOTDIR:-$HOME}/.zsh_history
 HISTSIZE=100000000
diff --git a/.config/zsh/plugins.zsh b/.config/zsh/plugins.zsh
index de8fad3..b1dd9b2 100644
--- a/.config/zsh/plugins.zsh
+++ b/.config/zsh/plugins.zsh
@@ -5,10 +5,8 @@ source $ZDOTDIR/plugins/zsh-history-substring-search/zsh-history-substring-searc
 
 source $ZDOTDIR/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.plugin.zsh
 
-zvm_after_init_commands+=('[ -f $HOME/.fzf.zsh ] && source $HOME/.fzf.zsh')
+zvm_after_init_commands+=('source <(fzf --zsh) && enable-fzf-tab')
 source $ZDOTDIR/plugins/fzf-tab/fzf-tab.plugin.zsh
-zstyle ':fzf-tab:complete:cd:*' fzf-preview 'eza -1 --color=always $realpath'
-enable-fzf-tab
 
 source $ZDOTDIR/plugins/zsh-vi-mode/zsh-vi-mode.plugin.zsh
 
diff --git a/.xinitrc b/.xinitrc
index 63f2ca5..915aaf2 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -36,11 +36,6 @@ setxkbmap -option grp:alt_space_toggle
 setxkbmap -option caps:escape
 xset r rate 300 40
 
-#gpu_mode=$(/usr/bin/envycontrol -q)
-#if [ "$gpu_mode" = "nvidia" ]; then
-    #xrandr --setprovideroutputsource modesetting NVIDIA-0
-    #xrandr --auto
-#fi
-
+. $ZDOTDIR/.zshenv
 
 exec /home/afonso/.local/bin/xmonad