diff --git a/aliases/copilot.zsh b/aliases/copilot.zsh
index 471c396..1ab8265 100644
--- a/aliases/copilot.zsh
+++ b/aliases/copilot.zsh
@@ -1,3 +1,5 @@
 if exists /usr/bin/node && exists github-copilot-cli; then
     eval "$(github-copilot-cli alias -- "$0")"
+elif exists gh && gh extension list | grep copilot -q; then
+	eval "$(gh copilot alias -- zsh)"
 fi
diff --git a/aliases/functions b/aliases/functions
index 9b27019..51b8259 100644
--- a/aliases/functions
+++ b/aliases/functions
@@ -384,3 +384,7 @@ alias Cgit="gh-copilot-cli git"
 alias Cgh="gh-copilot-cli gh"
 
 alias e="nvim -c 'lua require(\"telescope.builtin\").fd { cwd = require(\"findroot\")(require(\"telescope.utils\").buffer_dir()) } '"
+
+if [[ -e ${XDG_CONFIG_HOME}/broot/launcher/bash/br ]]; then
+	source ${XDG_CONFIG_HOME}/broot/launcher/bash/br
+fi
diff --git a/env/01_xdg-fixes.zsh b/env/01_xdg-fixes.zsh
index 595e5ea..70632da 100644
--- a/env/01_xdg-fixes.zsh
+++ b/env/01_xdg-fixes.zsh
@@ -16,4 +16,3 @@ export TEXMFCONFIG=$XDG_CONFIG_HOME/texlive/texmf-config
 export TEXMFHOME=$XDG_DATA_HOME/texmf
 export TEXMFVAR=$XDG_CACHE_HOME/texlive/texmf-var
 export XINITRC="$XDG_CONFIG_HOME"/X11/xinitrc
-export _JAVA_OPTIONS="-Djava.util.prefs.userRoot=$XDG_CONFIG_HOME/java"
diff --git a/env/50_scala.zsh b/env/50_scala.zsh
index 33e3636..5fbf3e5 100644
--- a/env/50_scala.zsh
+++ b/env/50_scala.zsh
@@ -1 +1 @@
-export SBT_OPTS="-XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=10G -Xmx10G"
+export SBT_OPTS="-Xmx10G"
diff --git a/plugins/highlight-config/highlight-config.plugin.zsh b/plugins/highlight-config/highlight-config.plugin.zsh
index dec3ff9..021229c 100644
--- a/plugins/highlight-config/highlight-config.plugin.zsh
+++ b/plugins/highlight-config/highlight-config.plugin.zsh
@@ -1,6 +1,7 @@
 typeset -gA ZSH_HIGHLIGHT_STYLES
 
 ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern)
+ZSH_HIGHLIGHT_DIRS_BLACKLIST+=(/mnt/)
 
 if [[ "`tput colors`" == "256" ]] || [[ "`tput colors`" == "88" ]] ; then
 
diff --git a/zshenv b/zshenv
index d7b5b4b..372ae2d 100755
--- a/zshenv
+++ b/zshenv
@@ -1,3 +1,6 @@
+if [ -z "$ZDOTDIR" ]; then
+	export ZDOTDIR=$HOME/.config/zsh
+fi
 exists() { command -v "$@" >/dev/null }
 function(){
 	local i
diff --git a/zshrc b/zshrc
index ce22276..166796c 100644
--- a/zshrc
+++ b/zshrc
@@ -29,13 +29,16 @@ fpath=($ZDOTDIR/functions $fpath)
 
 function exists { command -v "$@" >/dev/null }
 
-# get a file from ZDOTDIR, return file in /etc/zsh if it does not exist
+# get a file from ZDOTDIR, return file in /etc/zsh if it does not exist. If both
+# don't exist, return the first of them.
 zdotfile() {
-	if [[ -e $ZDOTDIR/$1 ]]; then
-		echo $ZDOTDIR/$1
-	else
-		echo /etc/zsh/$1
-	fi
+    if [[ -e $ZDOTDIR/$1 ]]; then
+	echo $ZDOTDIR/$1
+    elif [[ -e /etc/zsh/$1 ]]; then
+	echo /etc/zsh/$1
+    else
+	echo $ZDOTDIR/$1
+    fi
 }
 try-source() {
     local i=0
@@ -109,6 +112,7 @@ if [[ -e $HOME/.calendars ]]; then
 fi
 
 if exists mail; then
+    MAILCHECK=0
     _prompt_cron_mails() {
 	[[ ! -e $MAIL ]] && return
 	local newmails=$(mail -Hf $MAIL | grep -c '^.N')