diff --git a/zsh/env b/zsh/env
index 2015382..1c2fd3f 100644
--- a/zsh/env
+++ b/zsh/env
@@ -13,10 +13,10 @@ export EDITOR="nano"
 
 # set `ll` command - b(etter)ls per default
 alias ll=bls
-if [[ -x `which /usr/local/bin/exa` || -x `which /opt/homebrew/bin/exa` ]]; then
+if test -f "$homebrew_path/exa"; then
     alias ll=exa
 fi
-if [[ -x `which /usr/local/bin/lsd` || -x `which /opt/homebrew/bin/lsd` ]]; then
+if test -f "$homebrew_path/lsd"; then
 	alias ll=lsd
 fi
 
@@ -60,17 +60,12 @@ if [[ $platform == 'macOS' ]]; then
     fi
 fi
 
-if test -d "/opt/homebrew/opt/openjdk/bin"; then
-        export PATH="/opt/homebrew/opt/openjdk/bin:$PATH"
-fi
-if test -d "/usr/local/opt/java/bin/"; then
-        export PATH="/usr/local/opt/java/bin/:$PATH"
+if test -d "$homebrew_opt/openjdk/bin/"; then
+    export PATH="$homebrew_opt/openjdk/bin:$PATH"
 fi
 
-/usr/local/opt/java/bin/
-
-if test -d "/usr/local/opt/ruby"; then
-	export PATH="/usr/local/opt/ruby/bin:$PATH"
+if test -d "$homebrew_opt/ruby"; then
+	export PATH="$homebrew_opt/ruby/bin:$PATH"
 fi
 
 if test -d "/usr/local/sbin"; then
diff --git a/zshrc b/zshrc
index a8bea39..55ca4ab 100644
--- a/zshrc
+++ b/zshrc
@@ -30,6 +30,16 @@ elif [[ $(uname -p) == 'x86_64' ]]; then
     arch="x86_64"
 fi
 
+# Homebrew
+homebrew_path=""
+if test -f "/opt/homebrew/bin/brew"; then
+    homebrew_path="/opt/homebrew/bin"
+    homebrew_opt="/opt/homebrew/opt"
+elif test -f "/usr/local/bin/brew"; then
+     homebrew_path="/usr/local/bin"
+     homebrew_path="/usr/local/opt"
+fi
+
 # Load additional settings
 source $HOME/.dotfiles/zsh/env
 source $HOME/.dotfiles/zsh/alias