diff --git a/home/dot_zshenv b/home/dot_zshenv
index 8ab87f3..f5d13e7 100644
--- a/home/dot_zshenv
+++ b/home/dot_zshenv
@@ -7,6 +7,8 @@
 : ${ZIM_HOME=${ZDOTDIR:-${HOME}}/.zim}
 # }}} End configuration added by Zim install
 
+# Start personal configuration directives {{{
+
 # >>> define PATH variable as an array
 typeset -U path
 # <<< define PATH variable as an array
@@ -18,25 +20,73 @@ path=(~/bin ~/.local/bin $path[@])
 # >>> environment variables >>>
 export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u)/bus
 
+export XDG_CONFIG_HOME=$HOME/.config
+
+# update path
 export PATH="${ASDF_DATA_DIR:-$HOME/.asdf}/shims:$PATH"
 export GEM_HOME="$(${HOME}/.asdf/shims/gem env user_gemhome)"
 export PATH="$PATH:$GEM_HOME/bin"
 export PATH="$PATH:$(go env GOBIN):$(go env GOPATH)/bin"
 
+# set default browser, editor and terminal
 export BROWSER=qutebrowser
-export EDITOR=$([[ $(command -v lvim) ]] && echo lvim || [[ $(command -v nvim) ]] && echo nvim || echo vim)
+export EDITOR=$([[ $(command -v nvim) ]] && echo nvim || echo vim)
 export TERMINAL=kitty
-[[ ( $(command -v code) && $(command -v trash) ) ]] && export ELECTRON_TRASH="trash"
-# export FZF_DEFAULT_COMMAND='rg --files --no-ignore --hidden --follow --glob "!.git/*"'
+
+# set fuzzy finder command to rg if installed
+[[ $(command -v rg) ]] && export FZF_DEFAULT_COMMAND='rg --files --no-ignore --hidden --follow --glob "!.git/*"'
 
 export PASSWORD_STORE_DIR="${HOME}/.password-store"
 export PASSWORD_STORE_ENABLE_EXTENSIONS=True
 export ZK_NOTEBOOK_DIR="${HOME}/Notes"
 export OPENAI_API_KEY="$(pass _api_keys/openai_perso-2 2>/dev/null || echo ERROR)"
 export IPINFO_API_KEY="$(pass _api_keys/ipinfo_perso-0 2>/dev/null || echo ERROR)"
+
+# Most pure GTK3 apps use wayland by default, but some,
+# such as Firefox, require the backend to be explicitly selected.
+export MOZ_ENABLE_WAYLAND=1
+export MOZ_DBUS_REMOTE=1
+export GTK_CSD=0
+
+# qt wayland
+export QT_QPA_PLATFORM="wayland"
+export QT_QPA_PLATFORMTHEME=qt5ct
+export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
+
+#Java XWayland blank screens fix
+export _JAVA_AWT_WM_NONREPARENTING=1
+
+# set default shell and terminal
+export SHELL=/usr/bin/zsh
+export TERMINAL_COMMAND=xdg-terminal-exec
+
+# set ozone platform to wayland
+export ELECTRON_OZONE_PLATFORM_HINT=wayland
+
+# set electron trash implementation if trash-cli installed
+[[ ( $(command -v code) && $(command -v trash) ) ]] && export ELECTRON_TRASH="trash"
+
+# Disable hardware cursors. This might fix issues with
+# disappearing cursors
+if systemd-detect-virt -q; then
+    # if the system is running inside a virtual machine, disable hardware cursors
+    export WLR_NO_HARDWARE_CURSORS=1
+fi
+
+# Disable warnings by OpenCV
+export OPENCV_LOG_LEVEL=ERROR
 # <<< environment variables <<<
 
-# }}} End personnal configuration directives
-
 # load profile
-[[ -f ~/.profile ]] && . ~/.profile
+set -a
+. "$HOME/.config/user-dirs.dirs"
+set +a
+
+if [ -n "$(ls "$HOME"/.config/profile.d 2>/dev/null)" ]; then
+    for f in "$HOME"/.config/profile.d/*; do
+        # shellcheck source=/dev/null
+        . "$f"
+    done
+fi
+
+# }}} End personnal configuration directives