diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv
index c932ee1..525a921 100644
--- a/.config/zsh/.zshenv
+++ b/.config/zsh/.zshenv
@@ -4,42 +4,42 @@ FREECIV_DATA_PATH=$HOME/.config/freeciv
 setopt no_global_rcs
 
 # environment variables
-export XDG_CONFIG_HOME="$HOME"/.config
-export XDG_DATA_HOME="$HOME"/.local/share
-export XDG_CACHE_HOME="$HOME"/.cache
+#export XDG_CONFIG_HOME="$HOME"/.config
+#export XDG_DATA_HOME="$HOME"/.local/share
+#export XDG_CACHE_HOME="$HOME"/.cache
 
 # move zsh config to $XDG_CONFIG_HOME
-export ZDOTDIR="$XDG_CONFIG_HOME"/zsh
+#export ZDOTDIR="$XDG_CONFIG_HOME"/zsh
 
 # GTK
-export GTK_RC_FILES="$XDG_CONFIG_HOME"/gtk-1.0/gtkrc
-export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
+#export GTK_RC_FILES="$XDG_CONFIG_HOME"/gtk-1.0/gtkrc
+#export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
 
 # to prevent .wine in home
-export WINEPREFIX="$XDG_DATA_HOME"/wineprefixes/default
+#export WINEPREFIX="$XDG_DATA_HOME"/wineprefixes/default
 
 #for nvidia cuda, in case I should use it
-export CUDA_CACHE_PATH="$XDG_CACHE_HOME"/nv
+#export CUDA_CACHE_PATH="$XDG_CACHE_HOME"/nv
 
 #GnuPG
-export GNUPGHOME="$XDG_DATA_HOME"/gnupg
+#export GNUPGHOME="$XDG_DATA_HOME"/gnupg
 #gpg2 --homedir "$XDG_DATA_HOME"/gnupg
 
 # npm
-export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME"/npm/npmrc
+#export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME"/npm/npmrc
 
 # Java OpenJDK
-export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java
+#export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java
 
 # Gradle
-export GRADLE_USER_HOME="$XDG_DATA_HOME"/gradle
+#export GRADLE_USER_HOME="$XDG_DATA_HOME"/gradle
 
 # Pylint
-export PYLINTHOME="$XDG_CACHE_HOME"/pylint
+#export PYLINTHOME="$XDG_CACHE_HOME"/pylint
 
 # less
-export LESSKEY="$XDG_CACHE_HOME"/less
-export LESSHISTFILE="$XDG_CACHE_HOME"/less/history
+#export LESSKEY="$XDG_CACHE_HOME"/less
+#export LESSHISTFILE="$XDG_CACHE_HOME"/less/history
 
 # aliases
 # to temporary disable them in case they override defaults,
diff --git a/.pam_environment b/.pam_environment
new file mode 100644
index 0000000..9622293
--- /dev/null
+++ b/.pam_environment
@@ -0,0 +1,43 @@
+# fix whatever env variables are needed to get a reasonable
+# XDG-enable system.
+# Format:
+# KEY=VAUE _or_ KEY DEFAULT="VALUE"
+# Second one can contain whitespaces
+
+#In /etc/pam.d/login add following line if not exists:
+# session    required    pam_env.so user_readenv=1
+
+#HOME                        DEFAULT="/home/@{PAM_USER}" OVERRIDE="@HOME"
+SOME_TEST                   DEFAULT="/home/marc/.config"
+# XDG base directories
+XDG_CACHE_HOME              DEFAULT="@{HOME}/.cache"
+XDG_CONFIG_HOME             DEFAULT="@{HOME}/.config"
+XDG_DATA_HOME               DEFAULT="@{HOME}/.local/share"
+XDG_DATA_DIRS               DEFAULT="/usr/local/share:/usr/local/share" OVERRIDE="${XDG_DATA_DIRS}"
+XDG_DATA_DIRS               DEFAULT="@{HOME}/.local/share:${XDG_DATA_DIRS}"
+XDG_RUNTIME_DIR             DEFAULT="@{HOME}/.local/run"
+
+# Non-standard
+XDG_LIB_HOME                DEFAULT="@{HOME}/.local/lib"
+XDG_LOG_HOME                DEFAULT="@{HOME}/.local/log"
+
+# Fixes for various applications to respect XDG
+ZDOTDIR                     DEFAULT="${XDG_CONFIG_HOME}/zsh"
+GTK_RC_FILES                DEFAULT="${XDG_CONFIG_HOME}/gtk-1.0/gtkrc"
+GTK2_RC_FILES               DEFAULT="${XDG_CONFIG_HOME}/gtk-2.0/gtkrc"
+WINEPREFIX                  DEFAULT="${XDG_DATA_HOME}/wineprefixes/default"
+CUDA_CACHE_PATH             DEFAULT="${XDG_CACHE_HOME}/nv"
+__GL_SHAER_DISK_CACHE_PATH  DEFAULT="${XDG_CACHE_PATH}/nv"
+GNUPGHOME                   DEFAULT="${XDG_CACHE_HOME}/gnupg"
+NODE_REPL_HISTORY           DEFAULT="${XDG_DATA_HOME}/node_repl_history"
+NPM_CONFIG_USERCONFIG       DEFAULT="${XDG_CONFIG_HOME}/npm/npmrc"
+NPM_CONFIG_PREFIX           DEFAULT="${XDG_CACHE_HOME}/npm-packages"
+R_LIBS_USER                 DEFAULT="${XDG_DATA_HOME}/Rpackages"
+_JAVA_OPTIONS               DEFAULT="-Djava.util.prefs.userRoot=${XDG_CONFIG_HOME}/java"
+GRADLE_USER_HOME            DEFAULT="${XDG_DATA_HOME}/gradle"
+PYLINTHOME                  DEFAULT="${XDG_CACHE_HOME}/pylint"
+IDEA_VM_OPTIONS             DEFAULT="${XDG_CONFIG_HOME}/intellij-idea/idea.vmoptions"
+IDEA_PROPERTIES             DEFAULT="${XDG_CONFIG_HOME}/intellij-idea/idea.properties"
+#LESSKEY                     DEFAULT="${XDG_CONFIG_HOME}/less"
+LESSHISTFILE                DEFAULT="${XDG_DATA_HOME}/lesshist"
+FREECIV_DATA_PATH           DEFAULT="${XDG_CONFIG_HOME}/freeciv"