diff --git a/.xinitrc b/.config/X11/xinitrc
similarity index 74%
rename from .xinitrc
rename to .config/X11/xinitrc
index 547146c..6347fd3 100644
--- a/.xinitrc
+++ b/.config/X11/xinitrc
@@ -22,7 +22,11 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
  unset f
 fi
 
-[ -f $HOME/.xprofile ] && . $HOME/.xprofile
+if [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/X11/xprofile" ]; then
+	. "${XDG_CONFIG_HOME:-$HOME/.config}/X11/xprofile"
+else
+	. "$HOME/.xprofile"
+fi
 
 # starts the WM
 exec dwm
diff --git a/.config/X11/xprofile b/.config/X11/xprofile
new file mode 100644
index 0000000..e9295a8
--- /dev/null
+++ b/.config/X11/xprofile
@@ -0,0 +1,24 @@
+#!/usr/bin/env sh
+
+# This file is sourced when launching a DM from startx/xinit
+
+# session launch
+
+xss-lock -- slock &
+redshift &
+dunst -follow mouse &> /dev/null & #temp fix
+# MPD daemon start (if no other user instance exists)
+[ ! -s ~/.config/mpd/pid ] && mpd
+pulsemixer --set-volume 50
+sbacklight set 3 &
+bat_notify &
+AC_notify &
+setbg &
+dwmblocks &
+
+xinput set-prop 'Synaptics TM3072-003' 'libinput Tapping Enabled' 1 &
+xinput set-prop 'Synaptics TM3072-003' 'libinput Natural Scrolling Enabled' 1 &
+xinput set-prop 'Synaptics TM3072-003' 'libinput Accel Speed' 0.4 &
+setxkbmap 'fr(oss)'
+remaps &
+sxhkd &
diff --git a/.pam_environment b/.pam_environment
index 4888c58..7764bcb 100644
--- a/.pam_environment
+++ b/.pam_environment
@@ -1,2 +1,2 @@
+# GPG-agent
 GNUPGHOME DEFAULT=@{HOME}/.config/gnupg
-XDG_CONFIG_HOME DEFAULT=@{HOME}/.config
diff --git a/.xprofile b/.xprofile
index 08f3959..f4c89aa 100644
--- a/.xprofile
+++ b/.xprofile
@@ -1,25 +1 @@
-#!/usr/bin/env sh
-
-# This file is sourced when launching a DM from startx/xinit
-
-# session launch
-
-xss-lock -- slock &
-redshift &
-dunst -follow mouse &> /dev/null & #temp fix
-# MPD daemon start (if no other user instance exists)
-[ ! -s ~/.config/mpd/pid ] && mpd
-pulsemixer --set-volume 50
-sbacklight set 3 &
-bat_notify &
-AC_notify &
-setbg &
-dwmblocks &
-
-xinput set-prop 'Synaptics TM3072-003' 'libinput Tapping Enabled' 1 &
-xinput set-prop 'Synaptics TM3072-003' 'libinput Natural Scrolling Enabled' 1 &
-xinput set-prop 'Synaptics TM3072-003' 'libinput Accel Speed' 0.4 &
-setxkbmap 'fr(oss)'
-remaps &
-sxhkd &
-xbanish&
+.config/X11/xprofile
diff --git a/.zprofile b/.zprofile
deleted file mode 100644
index 91d4528..0000000
--- a/.zprofile
+++ /dev/null
@@ -1 +0,0 @@
-source .profile
diff --git a/.profile b/.zshenv
similarity index 64%
rename from .profile
rename to .zshenv
index 595c5e8..ab9145e 100644
--- a/.profile
+++ b/.zshenv
@@ -1,49 +1,20 @@
-#!/usr/bin/env sh
+#!/bin/zsh
 
-# This file is sourced when launching a DM from startx/xinit
-
-# environment variables
-## XDG_USER_DIRECTORIES
-export XDG_CONFIG_HOME="$HOME/.config"
+# XDG_BASE_DIRECTORY
 export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_CONFIG_HOME="$HOME/.config"
 export XDG_DATA_HOME="$HOME/.local/share"
 
-## XDG_BASE_DIRECTORIES
-export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
-export GNUPGHOME="$XDG_CONFIG_HOME/gnupg"
-export PASSWORD_STORE_DIR="$XDG_DATA_HOME/pass"
-export LESSHISTFILE="-"
-export MBSYNCRC="$XDG_CONFIG_HOME/mbsync/config"
-export NOTMUCH_CONFIG="$XDG_CONFIG_HOME/notmuch/notmuchrc"
-export NMBGIT="$XDG_DATA_HOME/notmuch/nmbug"
-export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc-2.0"
-export TEXMFHOME="$XDG_DATA_HOME/texmf"
-export ANDROID_PREFS_ROOT="$XDG_CONFIG_HOME/android"
-export ADB_KEYS_PATH="$ANDROID_PREFS_ROOT"
-export ANDROID_EMULATOR_HOME="$XDG_DATA_HOME/android/emulator"
-export CARGO_HOME="$XDG_DATA_HOME/cargo"
+export ZDOTDIR="$HOME/.config/zsh"
 
 ## paths
 export PATH="$(find $HOME/.local/bin -type d | tr '\n' ':' | sed 's/:$//'):$PATH"
 
-## default programs
-export SUDO_ASKPASS="$HOME/.local/bin/dmenupass"
-export GPG_ASKPASS="/usr/bin/pinentry-curses"
-export SUDO_EDITOR="nvim"
-export EDITOR="nvim"
-export TERMINAL="st"
-export READER="zathura"
-export BROWSER="firefox"
-
-## program settings
+## misc
 export LESS_TERMCAP_md="$(printf '%b' '\e[01;32m')"
 export LESS_TERMCAP_me="$(printf '%b' '\e[0m')"
 export LESS_TERMCAP_se="$(printf '%b' '\e[0m')"
 export LESS_TERMCAP_so="$(printf '%b' '\e[01;44;33em')"
 export LESS_TERMCAP_ue="$(printf '%b' '\e[0m')"
 export LESS_TERMCAP_us="$(printf '%b' '\e[01;35m')"
-
 export LS_COLORS='rs=0:di=01;34:ln=01;35:mh=00:pi=40;35:so=01;33:do=01;33:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=00;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.zst=01;31:*.tzst=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.wim=01;31:*.swm=01;31:*.dwm=01;31:*.esd=01;31:*.jpg=01;33:*.jpeg=01;33:*.mjpg=01;33:*.mjpeg=01;33:*.gif=01;33:*.bmp=01;33:*.pbm=01;33:*.pgm=01;33:*.ppm=01;33:*.tga=01;33:*.xbm=01;33:*.xpm=01;33:*.tif=01;33:*.tiff=01;33:*.png=01;33:*.svg=01;33:*.svgz=01;33:*.mng=01;33:*.pcx=01;33:*.mov=01;33:*.mpg=01;33:*.mpeg=01;33:*.m2v=01;33:*.mkv=01;33:*.webm=01;33:*.ogm=01;33:*.mp4=01;33:*.m4v=01;33:*.mp4v=01;33:*.vob=01;33:*.qt=01;33:*.nuv=01;33:*.wmv=01;33:*.asf=01;33:*.rm=01;33:*.rmvb=01;33:*.flc=01;33:*.avi=01;33:*.fli=01;33:*.flv=01;33:*.gl=01;33:*.dl=01;33:*.xcf=01;33:*.xwd=01;33:*.yuv=01;33:*.cgm=01;33:*.emf=01;33:*.ogv=01;33:*.ogx=01;33:*.aac=01;33:*.au=01;33:*.flac=01;33:*.m4a=01;33:*.mid=01;33:*.midi=01;33:*.mka=01;33:*.mp3=01;33:*.mpc=01;33:*.ogg=01;33:*.ra=01;33:*.wav=01;33:*.oga=01;33:*.opus=01;33:*.spx=01;33:*.xspf=01;33:';
-
-# startx at session login
-[ "$(tty)" = "/dev/tty1" ] && ! pgrep -x Xorg >/dev/null && exec startx