diff --git a/.bashrc b/.bashrc
index ac03130..f03f43f 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,3 +1,5 @@
+# Fig pre block. Keep at the top of this file.
+[[ -f "$HOME/.fig/shell/bashrc.pre.bash" ]] && . "$HOME/.fig/shell/bashrc.pre.bash"
 #
 # ~/.bashrc
 #
@@ -196,3 +198,7 @@ export NVM_DIR="$HOME/.nvm"
 #THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!!
 export SDKMAN_DIR="/home/plague/.sdkman"
 [[ -s "/home/plague/.sdkman/bin/sdkman-init.sh" ]] && source "/home/plague/.sdkman/bin/sdkman-init.sh"
+. "$HOME/.cargo/env"
+
+# Fig post block. Keep at the bottom of this file.
+[[ -f "$HOME/.fig/shell/bashrc.post.bash" ]] && . "$HOME/.fig/shell/bashrc.post.bash"
diff --git a/.profile b/.profile
index 22c63a2..56c0a4a 100644
--- a/.profile
+++ b/.profile
@@ -1,3 +1,7 @@
+# Fig pre block. Keep at the top of this file.
+[[ -f "$HOME/.fig/shell/zprofile.pre.zsh" ]] && . "$HOME/.fig/shell/zprofile.pre.zsh"
+# Fig pre block. Keep at the top of this file.
+[[ -f "$HOME/.fig/shell/profile.pre.bash" ]] && . "$HOME/.fig/shell/profile.pre.bash"
 # Load profiles from /etc/profile.d
 if test -d $HOME/.profile.d/; then
   for profile in $HOME/.profile.d/*.sh; do
@@ -5,3 +9,10 @@ if test -d $HOME/.profile.d/; then
   done
   unset profile
 fi
+. "$HOME/.cargo/env"
+
+# Fig post block. Keep at the bottom of this file.
+[[ -f "$HOME/.fig/shell/profile.post.bash" ]] && . "$HOME/.fig/shell/profile.post.bash"
+
+# Fig post block. Keep at the bottom of this file.
+[[ -f "$HOME/.fig/shell/zprofile.post.zsh" ]] && . "$HOME/.fig/shell/zprofile.post.zsh"
diff --git a/.profile.d/graalvm.sh b/.profile.d/graalvm.sh
new file mode 100644
index 0000000..d983061
--- /dev/null
+++ b/.profile.d/graalvm.sh
@@ -0,0 +1 @@
+export GRAALVM_HOME="${SDKMAN_DIR}/candidates/java/current"
diff --git a/.profile.d/java.sh b/.profile.d/java.sh
index 216c58a..134c623 100644
--- a/.profile.d/java.sh
+++ b/.profile.d/java.sh
@@ -1 +1 @@
-export JAVA_HOME=$(/usr/libexec/java_home -v 11)
+export JAVA_HOME=$(/usr/libexec/java_home -v 18)
diff --git a/.zshenv b/.zshenv
index 0ad2ec6..cf55ea1 100644
--- a/.zshenv
+++ b/.zshenv
@@ -10,9 +10,11 @@ function appendpath() {
 appendpath $GOPATH/bin
 appendpath $HOME/.local/bin
 appendpath $HOME/.pyenv/bin
-appendpath $HOME/.minishift/cache/oc/v3.11.0/darwin
+appendpath $HOME/.cargo/bin
 appendpath /usr/local/opt/libarchive/bin
-appendpath /Library/Java/JavaVirtualMachines/graalvm-ce-java11-21.1.0/Contents/Home/bin
+appendpath $HOME/.local/opt/kafka/bin
+appendpath $HOME/.crc/bin
+appendpath $HOME/.crc/bin/oc
 unset appendpath
 
 source /usr/local/opt/git-extras/share/git-extras/git-extras-completion.zsh
@@ -25,3 +27,4 @@ export PKG_CONFIG_PATH="/usr/local/opt/libarchive/lib/pkgconfig"
 #THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!!
 export SDKMAN_DIR="/Users/plague/.sdkman"
 [[ -s "/Users/plague/.sdkman/bin/sdkman-init.sh" ]] && source "/Users/plague/.sdkman/bin/sdkman-init.sh"
+. "$HOME/.cargo/env"
diff --git a/.zshrc b/.zshrc
index 7a81cce..7cd6e80 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,3 +1,5 @@
+# Fig pre block. Keep at the top of this file.
+[[ -f "$HOME/.fig/shell/zshrc.pre.zsh" ]] && . "$HOME/.fig/shell/zshrc.pre.zsh"
 # Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
 # Initialization code that may require console input (password prompts, [y/n]
 # confirmations, etc.) must go above this block; everything else may go below.
@@ -107,7 +109,7 @@ plugins=(
   web-search
   zsh-completions
   zsh-navigation-tools
-  zsh_reload
+  #zsh_reload
 )
 
 source $ZSH/oh-my-zsh.sh
@@ -157,3 +159,6 @@ eval "$(pyenv virtualenv-init -)"
 
 # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
 [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
+
+# Fig post block. Keep at the bottom of this file.
+[[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && . "$HOME/.fig/shell/zshrc.post.zsh"