diff --git a/.bashrc b/.bashrc
index f03f43f..c99c39b 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,5 +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"
+[[ -f "$HOME/.fig/shell/bashrc.pre.bash" ]] && builtin source "$HOME/.fig/shell/bashrc.pre.bash"
 #
 # ~/.bashrc
 #
@@ -201,4 +201,4 @@ export SDKMAN_DIR="/home/plague/.sdkman"
 . "$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"
+[[ -f "$HOME/.fig/shell/bashrc.post.bash" ]] && builtin source "$HOME/.fig/shell/bashrc.post.bash"
diff --git a/.profile b/.profile
index 22c63a2..c478d35 100644
--- a/.profile
+++ b/.profile
@@ -5,3 +5,4 @@ if test -d $HOME/.profile.d/; then
   done
   unset profile
 fi
+
diff --git a/.profile.d/go.sh b/.profile.d/go.sh
index 9c3d85d..209a116 100644
--- a/.profile.d/go.sh
+++ b/.profile.d/go.sh
@@ -1,9 +1,4 @@
 #!/usr/bin/env bash
 
-if [[ "$HOST" == 'nymph.localhost' ]]; then
-	export GOPATH=$HOME/Go
-elif [[ "$HOST" == 'ikaros.fritz.box' ]]; then
-	export GOPATH=$HOME/Library/Go
-fi
-
+export GOPATH=$HOME/Library/Go
 export GOBIN=$GOPATH/bin
diff --git a/.profile.d/java.sh b/.profile.d/java.sh
index 134c623..d2d3e07 100644
--- a/.profile.d/java.sh
+++ b/.profile.d/java.sh
@@ -1 +1,2 @@
-export JAVA_HOME=$(/usr/libexec/java_home -v 18)
+#export JAVA_HOME=$(/usr/libexec/java_home -v 18)
+export JAVA_HOME="$SDKMAN_CANDIDATES_DIR/java/current"
\ No newline at end of file
diff --git a/.profile.d/liquibase.sh b/.profile.d/liquibase.sh
index 6fd29bb..b1c48c5 100644
--- a/.profile.d/liquibase.sh
+++ b/.profile.d/liquibase.sh
@@ -1,7 +1,3 @@
 #!/usr/bin/env bash
 
-if [[ "$HOST" == 'nymph.localhost' ]]; then
-	export LIQUIBASE_HOME="/usr/local/opt/liquibase/libexec"
-elif [[ "$HOST" == 'ikaros.fritz.box' ]]; then
-	export LIQUIBASE_HOME="/opt/homebrew/Cellar/liquibase/4.12.0/libexec"
-fi
\ No newline at end of file
+export LIQUIBASE_HOME="/opt/homebrew/Cellar/liquibase/4.12.0/libexec"
\ No newline at end of file
diff --git a/.profile.d/zsh.sh b/.profile.d/zsh.sh
index d235efc..2e0f808 100644
--- a/.profile.d/zsh.sh
+++ b/.profile.d/zsh.sh
@@ -1,9 +1,4 @@
 #!/usr/bin/env bash
 
-if [[ "$HOST" == 'nymph.localhost' ]]; then
-	export ZSH_HIGHLIGHT_DIR=/usr/local/share/zsh-syntax-highlighting
-	export ZSH_HIGHLIGHT_HIGHLIGHTERS_DIR=/usr/local/share/zsh-syntax-highlighting/highlighters
-elif [[ "$HOST" == 'ikaros.fritz.box' ]]; then
-	export ZSH_HIGHLIGHT_DIR=/opt/homebrew/share/zsh-syntax-highlighting
-	export ZSH_HIGHLIGHT_HIGHLIGHTERS_DIR=/opt/homebrew/share/zsh-syntax-highlighting/highlighters
-fi
\ No newline at end of file
+export ZSH_HIGHLIGHT_DIR=/opt/homebrew/share/zsh-syntax-highlighting
+export ZSH_HIGHLIGHT_HIGHLIGHTERS_DIR=/opt/homebrew/share/zsh-syntax-highlighting/highlighters
\ No newline at end of file
diff --git a/.zshenv b/.zshenv
index 8c36d90..130991f 100644
--- a/.zshenv
+++ b/.zshenv
@@ -7,22 +7,10 @@ function appendpath() {
   esac
 }
 
-if [[ "$HOST" == 'nymph.localhost' ]]; then
-  appendpath $GOPATH/bin
-  appendpath $HOME/.local/bin
-  appendpath $HOME/.pyenv/bin
-  appendpath $HOME/.cargo/bin
-  appendpath /usr/local/opt/libarchive/bin
-  appendpath $HOME/.local/opt/kafka/bin
-  appendpath $HOME/.crc/bin
-  appendpath $HOME/.crc/bin/oc
-
-  source /usr/local/opt/git-extras/share/git-extras/git-extras-completion.zsh
-elif [[ "$HOST" == 'ikaros.fritz.box' ]]; then
-  appendpath /opt/homebrew/bin
-  appendpath $GOPATH/bin
-  appendpath $HOME/.local/bin
-fi
+appendpath /opt/homebrew/bin
+appendpath $GOPATH/bin
+appendpath $HOME/.local/bin
+appendpath $HOME/Library/Application\ Support/JetBrains/Toolbox/scripts 
 
 unset appendpath
 
diff --git a/.zshrc b/.zshrc
index 270165c..09d754f 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,5 +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"
+[[ -f "$HOME/.fig/shell/zshrc.pre.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.pre.zsh"
 # If you come from bash you might have to change your $PATH.
 # export PATH=$HOME/bin:/usr/local/bin:$PATH
 
@@ -151,5 +151,12 @@ eval "$(pyenv virtualenv-init -)"
 
 test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"
 
+
+# NVM configuration
+export NVM_DIR="$HOME/.nvm"
+[ -s "/opt/homebrew/opt/nvm/nvm.sh" ] && \. "/opt/homebrew/opt/nvm/nvm.sh"  # This loads nvm
+[ -s "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm" ] && \. "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm"  # This loads nvm bash_completion
+
 # Fig post block. Keep at the bottom of this file.
-[[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && . "$HOME/.fig/shell/zshrc.post.zsh"
+[[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.post.zsh"
+