diff --git a/.zshrc b/.zshrc
index e8c9de5..62ab7cf 100644
--- a/.zshrc
+++ b/.zshrc
@@ -11,7 +11,7 @@ zmodload zsh/complist
 compinit
 comp_options+=(globdots)
 zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}'
-source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh && fpath=(/usr/share/zsh/stie-functions $fpath) && source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+source /usr/share/zsh/site-functions/zsh-autosuggestions.zsh && fpath=(/usr/share/zsh/site-functions $fpath) && source /usr/share/zsh/site-functions/zsh-syntax-highlighting.zsh
 #colors & prompt
 autoload -U colors && colors && setopt prompt_subst
 ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=5"
@@ -24,7 +24,7 @@ alias nf="clear && fastfetch"
 alias ascdis="fastfetch --logo $1"
 alias forge="su forgejo"
 alias emoji="cat ~/.local/share/emoji | grep $1"
-alias cst="swallow emacsd ~/.config/st/config.h"
+alias cst="emacsd ~/.config/st/config.h"
 alias ls="ls --color=auto"
 alias lasal="ls -al"
 alias ahl="ls -ahl"
@@ -50,12 +50,11 @@ alias fnl="fennel"
 alias "push"="git push"
 alias irc="irssi"
 alias hsw="home-manager switch --flake ~/.config/home-manager"
-alias hsc="swallow emacsd ~/.config/home-manager/home.nix"
+alias hsc="emacsd ~/.config/home-manager/home.nix"
 alias yell="echo"
 alias chm="ecop cat ~/.config/home-manager/home.nix"
 alias weather="curl wttr.in/masjedsoleyman"
-alias emacs="swallow emacsd $1"
-alias emacsd="swallow emacsd $1"
+alias emacs="emacsd $1"
 alias las="ls"
 alias lasa="ls -a"
 alias c="clear"
diff --git a/config/user-dirs.dirs b/config/user-dirs.dirs
index 3b4f5a1..e734b9f 100644
--- a/config/user-dirs.dirs
+++ b/config/user-dirs.dirs
@@ -8,8 +8,8 @@
 XDG_DESKTOP_DIR="$HOME/files/desktop"
 XDG_DOWNLOAD_DIR="$HOME/dl"
 XDG_DOCUMENTS_DIR="$HOME/files/docs"
-XDG_MUSIC_DIR="$HOME/"
+XDG_MUSIC_DIR="$HOME/files/music"
 XDG_PICTURES_DIR="$HOME/files/pics"
 XDG_VIDEOS_DIR="$HOME/files/vids"
-XDG_TEMPLATES_DIR="$HOME/"
-XDG_PUBLICSHARE_DIR="$HOME/"
+XDG_TEMPLATES_DIR="$HOME/files/templates"
+XDG_PUBLICSHARE_DIR="$HOME/files/public"