diff --git a/.bash_aliases b/.bash_aliases
index 9cbcd71..8d6a613 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -1,4 +1,4 @@
-source ~/.lcaol/share/shell/functions
+source ~/.local/share/shell/functions
 
 # ls aliases
 
diff --git a/.config/shell/functions b/.config/shell/functions
index 063cebf..c17ea0f 100644
--- a/.config/shell/functions
+++ b/.config/shell/functions
@@ -1,12 +1,17 @@
 # Shell configuration for Zsh, works almost completely for Bash as well
+
 export LESS=-R
 export LC_MESSAGES=C
 
 export DIST=$(lsb_release --id | cut -d'	' -f2)
 
+#export PASSWORD_STORE_DIR=~/.local/share/pass
+
+# Some aliases
 alias println='printf "\n"'
 
-alias editgrub='sudo nvim /etc/default/grub && sudo update-grub'
+alias editgrub='sudoedit /etc/default/grub && sudo update-grub'
+alias editenv='sudoedit /etc/environment'
 
 alias startMinecraftServer='curl https://ipinfo.io/ip | xclip -sel clip && cd ~/daten/games/sharedgames/minecraft/server && java -jar forge-1.12.2-14.23.5.2768-universal.jar -mx 8G'
 
@@ -335,7 +340,7 @@ if test "$BASH_VERSION"
 then _clean_map=([m]=~/.mozilla [c]=~/.cache)
 else _clean_map=(m ~/.mozilla c ~/.cache)
 fi
-_clean_folders=(~/.oracle_jre_usage ~/.gradle-kotlin-dsl ~/.thumbnails ~/.zcompdump*)
+_clean_folders=(~/.oracle_jre_usage ~/.gradle-kotlin-dsl ~/.thumbnails $ZDOTDIR/.zcompdump*)
 clean() {
 	
 	for f in $_clean_folders
diff --git a/.zshrc b/.config/zsh/.zshrc
similarity index 100%
rename from .zshrc
rename to .config/zsh/.zshrc
diff --git a/.xsessionrc b/.xsessionrc
new file mode 100644
index 0000000..22126eb
--- /dev/null
+++ b/.xsessionrc
@@ -0,0 +1,6 @@
+export XDG_DATA_DIRS="$HOME/.local/xdg:$XDG_DATA_DIRS"
+export KDEHOME="$HOME/.local/share/kdehome"
+export PASSWORD_STORE_DIR="$HOME/.local/share/pass"
+export ZDOTDIR="$HOME/.config/zsh"
+export _Z_DATA="$HOME/.config/zsh/z"
+export EDITOR=/usr/bin/nvim