diff --git a/system/.config/custom/env b/system/.config/custom/env
index e84243e..49e3e8d 100644
--- a/system/.config/custom/env
+++ b/system/.config/custom/env
@@ -12,116 +12,31 @@
 # USAGE:
 # This script is sourced by .bashrc
 # XDG_Base_Directories
-if [ -f "${XDG_BIN_HOME}/utils" ]; then
-    . "${XDG_BIN_HOME}/utils"
-fi
-
-if [ "$(hostname)" = "loki" ]; then
-    export IS_WORK="1"
-else
-    export IS_WORK="0"
-fi
-
 # XDG Overrides for unsupported programs 
-
-export XAUTHORITY="${HOME}/.Xauthority"
 export VIMINIT=":source ${XDG_CONFIG_HOME}/vim/vimrc"
-
-
-export GTK_RC_FILES="${XDG_CONFIG_HOME}/gtk-1.0/gtkrc"
-export GTK2_RC_FILES="${XDG_CONFIG_HOME}/gtk-2.0/gtkrc"
-export NPM_CONFIG_USERCONFIG="${XDG_CONFIG_HOME}/npm/config"
-export NODE_REPL_HISTORY="${XDG_DATA_HOME}/node/repl_history"
-
-export GNUPGHOME="${XDG_DATA_HOME}/gnupg"
-export GEM_HOME="${XDG_DATA_HOME}/gem"
-export GEM_SPEC_CACHE="${XDG_CACHE_HOME}/gem/specs"
-mkdir -p "${XDG_DATA_HOME}/wine/prefixes"
-
-export SQLITE_HISTORY="${XDG_DATA_HOME}/sqlite_history"
-export TASKDATA="${HOME}/tasks"
-export TASKRC="${XDG_CONFIG_HOME}/task/taskrc"
-
-mkdir -p "${XDG_CONFIG_HOME}/pg"
-mkdir -p "${XDG_CACHE_HOME}/pg"
-export PSQLRC="${XDG_CONFIG_HOME}/pg/psqlrc"
-export PSQL_HISTORY="${XDG_CACHE_HOME}/pg/psql_history"
-export PGPASSFILE="${XDG_CONFIG_HOME}/pg/pgpass"
-export PGSERVICEFILE="${XDG_CONFIG_HOME}/pg/pg_service.conf"
-export OCTAVE_HISTFILE="${XDG_CACHE_HOME}/octave-hist"
-export OCTAVE_SITE_INITFILE="${XDG_CONFIG_HOME}/octave/octaverc"
-mkdir -p "${XDG_CONFIG_HOME}/bazaar"
-export VAGRANT_HOME="${XDG_DATA_HOME}/vagrant"
-export VAGRANT_ALIAS_FILE="${XDG_DATA_HOME}/vagrant/aliases"
-mkdir -p "${XDG_CONFIG_HOME}/mpd/playlists"
-mkdir -p "${XDG_CACHE_HOME}/less"
-export LESSKEY="${XDG_CONFIG_HOME}/less/lesskey"
-export LESSHISTFILE="${XDG_CACHE_HOME}/less/history"
-mkdir -p "${XDG_DATA_HOME}/mysql"
-export MYSQL_HISTFILE="${XDG_DATA_HOME}/mysql/history"
-export ANDROID_SDK_HOME="${XDG_CONFIG_HOME}/android"
-mkdir -p "${XDG_DATA_HOME}/nuget"
-export NUGET_PACKAGES="${XDG_CACHE_HOME}/nuget/packages"
-export GRADLE_USER_HOME="${XDG_DATA_HOME}/gradle"
-
-# XDG support for zoom
-export SSB_HOME="${XDG_DATA_HOME}/zoom"
-
-# XDG support for parallel
-export PARALLEL_HOME="${XDG_CONFIG_HOME}/parallel"
-
-# XDG support for wget
-export WGETRC="${XDG_CONFIG_HOME}/wget/wgetrc"
-
-# XDG support for Java and OpenJFX
-export _JAVA_OPTIONS="-Djava.util.prefs.userRoot=${XDG_CONFIG_HOME}/java -Djavafx.cachedir=${XDG_CACHE_HOME}/OpenJFX"
-
-# Python
-mkdir -p "${XDG_DATA_HOME}/python"
 export PYTHONSTARTUP="${XDG_CONFIG_HOME}/python/startup.py"
 
-# Java
-#export IDEA_JDK="/usr/lib/jvm/jdk-jetbrains"
-#export PHPSTORM_JDK="${IDEA_JDK}"
-#export CLION_JDK="${IDEA_JDK}"
-
 # zsh
-export ZDOTDIR="${XDG_CONFIG_HOME}/zsh"
-export HISTFILE="${XDG_DATA_HOME}/zsh/history"
 export HISTCONTROL=ignoreboth
 export HISTSIZE=10000
 export SAVEHIST="${HISTSIZE}"
 export HISTFILESIZE="${HISTSIZE}"
-mkdir -p "${XDG_DATA_HOME}/zsh/zcompdump-${ZSH_VERSION}"
-
-if [ -n "$(command -v compinit)" ]; then
-    compinit -d "${XDG_DATA_HOME}/zsh/zcompdump-${ZSH_VERSION}"
-fi
-
-# Fonts
-export FONTCONFIG_PATH="/etc/fonts"
-
-# Setting applications
-export VISUAL=vim
-export EDITOR="${VISUAL}"
-export TERMINAL="kitty"
-export BROWSER="firefox"
-export PAGER="less"
-export MANPAGER="${PAGER}"
 
 # Ibus
 export GTK_IM_MODULE=ibus
 export XMODIFIERS=@im=ibus
 export QT_IM_MODULE=ibus
 
-# Nintendo Wii Remote Pro Controller
-SDL_GAMECONTROLLERCONFIG="050000007e0500003003000001000000,Nintendo Wii Remote Pro Controller,platform:Linux,a:b0,b:b1,x:b3,y:b2,back:b8,guide:b10,start:b9,leftstick:b11,rightstick:b12,leftshoulder:b4,rightshoulder:b5,dpup:b13,dpdown:b14,dpleft:b15,dpright:b16,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7,"
-export SDL_GAMECONTROLLERCONFIG="${SDL_GAMECONTROLLERCONFIG}\n030000004c050000e60c000000016800,PS5 Controller,platform:Linux,a:b0,b:b1,x:b2,y:b3,back:b4,guide:b5,start:b6,leftstick:b7,rightstick:b8,leftshoulder:b9,rightshoulder:b10,dpup:b11,dpdown:b12,dpleft:b13,dpright:b14,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a4,righttrigger:a5,"
-
 # NVIDIA
 export __GL_SHADER_DISK_CACHE="1"
 export __GL_SHADER_DISK_CACHE_SKIP_CLEANUP="1"
-export __GL_SHADER_DISK_CACHE_PATH="${XDG_CACHE_HOME}/nvidia/shaders"
+
 mkdir -p "${__GL_SHADER_DISK_CACHE_PATH}"
+mkdir -p "${XDG_DATA_HOME}/wine/prefixes"
+mkdir -p "${XDG_CONFIG_HOME}/bazaar"
+mkdir -p "${XDG_DATA_HOME}/zsh/zcompdump-${ZSH_VERSION}"
+if [ -n "$(command -v compinit)" ]; then
+    compinit -d "${XDG_DATA_HOME}/zsh/zcompdump-${ZSH_VERSION}"
+fi
 
 eval "$(starship init zsh)"
diff --git a/system/.config/environment.d/10_xdg.conf b/system/.config/environment.d/10_xdg.conf
index 0d0bdde..4bc1df5 100644
--- a/system/.config/environment.d/10_xdg.conf
+++ b/system/.config/environment.d/10_xdg.conf
@@ -14,12 +14,39 @@ DOTFILES="${HOME}/dotfiles"
 STARSHIP_CONFIG="${XDG_CONFIG_HOME}/starship/config.toml"
 KDEHOME="${XDG_CONFIG_HOME}/kde"
 DOCKER_CONFIG="${XDG_CONFIG_HOME}/docker"
+TEXMFCONFIG="${XDG_CONFIG_HOME/}texlive/texmf-config"
+PARALLEL_HOME="${XDG_CONFIG_HOME}/parallel"
+GTK_RC_FILES="${XDG_CONFIG_HOME}/gtk-1.0/gtkrc"
+GTK2_RC_FILES="${XDG_CONFIG_HOME}/gtk-2.0/gtkrc"
+WGETRC="${XDG_CONFIG_HOME}/wget/wgetrc"
+ZDOTDIR="${XDG_CONFIG_HOME}/zsh"
+_JAVA_OPTIONS="-Djava.util.prefs.userRoot=${XDG_CONFIG_HOME}/java -Djavafx.cachedir=${XDG_CACHE_HOME}/OpenJFX"
+NPM_CONFIG_USERCONFIG="${XDG_CONFIG_HOME}/npm/config"
 
 # XDG Cache
 CUDA_CACHE_PATH="${XDG_CACHE_HOME}/nv"
+TEXMFVAR="${XDG_CACHE_HOME}/texlive/texmf-var"
+NUGET_PACKAGES="${XDG_CACHE_HOME}/nuget/packages"
+__GL_SHADER_DISK_CACHE_PATH="${XDG_CACHE_HOME}/nvidia/shaders"
+PYTHONPYCACHEPREFIX="${XDG_CACHE_HOME}/python"
 
 # XDG Data
 CARGO_HOME="${XDG_DATA_HOME}/cargo"
 RUSTUP_HOME="${XDG_DATA_HOME}/rustup"
 GOPATH="${XDG_DATA_HOME}/go"
 WINEPREFIX="${XDG_DATA_HOME}/wine/prefixes/default"
+TEXMFHOME="${XDG_DATA_HOME}/texmf"
+GNUPGHOME="${XDG_DATA_HOME}/gnupg"
+VAGRANT_HOME="${XDG_DATA_HOME}/vagrant"
+VAGRANT_ALIAS_FILE="${XDG_DATA_HOME}/vagrant/aliases"
+NODE_REPL_HISTORY="${XDG_DATA_HOME}/node/node_repl_history"
+MYSQL_HISTFILE="${XDG_DATA_HOME}/mysql/history"
+GRADLE_USER_HOME="${XDG_DATA_HOME}/gradle"
+SQLITE_HISTORY="${XDG_DATA_HOME}/sqlite_history"
+PYTHONUSERBASE="${XDG_DATA_HOME}/python"
+
+# XDG State
+HISTFILE="${XDG_STATE_HOME}/zsh/history"
+
+# XDG Runtime
+XAUTHORITY="${XDG_RUNTIME_DIR}/Xauthority"
diff --git a/system/.config/environment.d/70_applications.conf b/system/.config/environment.d/70_applications.conf
new file mode 100644
index 0000000..b71e51c
--- /dev/null
+++ b/system/.config/environment.d/70_applications.conf
@@ -0,0 +1,6 @@
+VISUAL="vim"
+EDITOR="${VISUAL}"
+TERMINAL="kitty"
+BROWSER="firefox"
+PAGER="less"
+MANPAGER="${PAGER}"