diff --git a/.zshenv b/.zshenv
index 52841a0..199b1d7 100644
--- a/.zshenv
+++ b/.zshenv
@@ -23,7 +23,7 @@ alias network="watch -n 1 \"netstat -p tcp\""
 ### Games ###
 alias tetris=bastet
 alias spaceinvader=ninvaders
-alias tshark="/Applications/Wireshark.app/Contents/MacOS/tshark"
+# alias tshark="/Applications/Wireshark.app/Contents/MacOS/tshark"
 
 # Git shortcuts
 alias gi="git init"
@@ -88,16 +88,6 @@ function desktopicon {
 	killall Finder
 }
 
-# python shortcuts
-alias pip=pip3
-alias py=python
-alias activate="source venv/bin/activate"
-alias py20='cd ~/programs/python/repository-2020'
-alias pygames='cd ~/programs/python/repository-games'
-alias pyml='cd ~/programs/python/machine-learning'
-alias pyhome='cd ~/programs/python'
-alias pypackages='cd /library/frameworks/python.framework/versions/3.8/lib/python3.8/site-packages/'
-alias pypi='cd ~/programs/python/pypi'
 
 # python programs
 alias webpfix='py /users/marcpartensky/programs/python/repository-2020/webpfix.py'
diff --git a/aliases.sh b/aliases.sh
index ebbc229..a911de7 100644
--- a/aliases.sh
+++ b/aliases.sh
@@ -19,3 +19,10 @@ alias mampstop='~/Library/Applications/MAMP/bin/stop.sh'
 alias jsonbeautify="chrome https://jsonformatter.curiousconcept.com/"
 alias github="chrome https://github.com/MarcPartensky/"
 alias finder="open ."
+alias py=python
+alias activate="source venv/bin/activate"
+alias py20='cd ~/programs/python/repository-2020'
+alias pygames='cd ~/programs/python/repository-games'
+alias pyml='cd ~/programs/python/machine-learning'
+alias pyhome='cd ~/programs/python'
+alias pypackages='cd /library/frameworks/python.framework/versions/3.8/lib/python3.8/site-packages/'
diff --git a/exports.sh b/exports.sh
index a3b36c7..dc6a55e 100644
--- a/exports.sh
+++ b/exports.sh
@@ -1,13 +1,19 @@
-export PATH=$PATH:/Library/Java/JavaVirtualMachines/jdk-9.0.1.jdk/Contents/Home/bin
-export PATH="/usr/local/opt/grep/libexec/gnubin:$PATH"
-export PATH="/opt/local/bin:$PATH"
-export PATH="/Users/marcpartensky/flutter/bin:$PATH"
-export PATH="/Library/Frameworks/Python.framework/Versions/3.8/bin:${PATH}"
-export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
+# Path variables
+export PATH="$PATH:/Library/Java/JavaVirtualMachines/jdk-9.0.1.jdk/Contents/Home/bin"
+export PATH="/Library/Frameworks/Python.framework/Versions/3.6/bin:$PATH"
+export PATH="/Library/Frameworks/Python.framework/Versions/3.7/bin:$PATH"
+export PATH="/Library/Frameworks/Python.framework/Versions/3.8/bin:$PATH"
 export PYENV_ROOT="$HOME/.pyenv"
 export PATH="$PYENV_ROOT/bin:$PATH"
+export PATH="/usr/local/opt/grep/libexec/gnubin:$PATH"
+export PATH="/Users/marcpartensky/flutter/bin:$PATH"
+export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
+export PATH="/opt/local/bin:$PATH"
+export PATH="/opt/local/bin:/opt/local/sbin:$PATH"
+export PATH="$HOME/.cargo/bin:$PATH"
 
 export CLICOLOR=1
+export PYENV_VIRTUALENV_DISABLE_PROMPT=1
 export TEST="This is a test"
 export PRODUCTION=false
 export DEBUG_VALUE="True"
@@ -55,8 +61,8 @@ export DISCORD_PREFIX="?"
 export DISCORD_DEPLOYMENT="DEVELOPMENT"
 export YTOPTS="-ciw -x --audio-format 'mp3' --audio-quality 0 -f bestaudio --embed-thumbnail -o '%(title    )s.%(ext)s' --rm-cache-dir"
 export PP_PASSWORD="yaM-yauolG44"
-# export JAVA_HOME=$(/usr/libexec/java_home)
 
+# export JAVA_HOME=$(/usr/libexec/java_home)
 # For Pyenv
 # export PYENV_ROOT="$HOME/.pyenv"
 # export PATH="$PYENV_ROOT/bin:$PATH"
@@ -64,4 +70,3 @@ export PP_PASSWORD="yaM-yauolG44"
 # if command -v pyenv 1>/dev/null 2>&1; then
 #  eval "$(pyenv init -)"
 # fi
-# Java
diff --git a/main.sh b/main.sh
index 939296d..2aa0221 100755
--- a/main.sh
+++ b/main.sh
@@ -60,9 +60,11 @@ bindkey '\t' autosuggest-accept
 # ZSH_THEME="powerlevel10k/powerlevel10k"
 # ZSH_THEME="eastwood"
 
+# Deprecated
 # export GREP_OPTIONS="--color=always"
 # export GREP_COLORS="ms=01;31:mc=01;31:sl=:cx=:fn=35:ln=32:bn=32:se=36"
 
+# pyenv setup
 eval "$(pyenv init -)"
 
 source ${0:a:h}/exports.sh