diff --git a/system/.config/custom/aliases b/system/.config/custom/aliases
index 6d0db3d..5160be3 100644
--- a/system/.config/custom/aliases
+++ b/system/.config/custom/aliases
@@ -38,14 +38,6 @@ alias doc="cd ~/Documents"
 # Alias for opening my code editor
 alias e="code"
 
-# Alias for some commands to use xdg directories
-alias wget='wget --hsts-file="${XDG_CACHE_HOME}/wget-hsts"'
-alias svn='svn --config-dir "${XDG_CONFIG_HOME}/subversion"'
-alias gpg2='gpg2 --homedir "${XDG_DATA_HOME}/gnupg"'
-alias sqlite3='sqlite3 -init "${XDG_CONFIG_HOME}/sqlite3/sqliterc"'
-alias mvn='mvn -gs "${XDG_CONFIG_HOME}/maven/settings.xml"'
-alias nvidia-settings='nvidia-settings --config="${XDG_CONFIG_HOME}/nvidia/settings"'
-
 alias t='task todo'
 alias ta='task add'
 alias td='task done'
\ No newline at end of file
diff --git a/system/.config/custom/env b/system/.config/custom/env
index 42e311a..60827b7 100644
--- a/system/.config/custom/env
+++ b/system/.config/custom/env
@@ -92,12 +92,12 @@ export XMODIFIERS=@im=ibus
 export QT_IM_MODULE=xim
 
 # Adding folders to the PATH variable
-export PATH="${PATH}:${HOME}/.local/bin"
 export PATH="${PATH}:${CARGO_HOME}/bin"
 export PATH="${PATH}:${XDG_DATA_HOME}/npm/bin"
 export PATH="${PATH}:${GOPATH}/bin"
 export PATH="${PATH}:${GEM_HOME}/bin"
 export PATH="${PATH}:${XDG_CONFIG_HOME}/composer/vendor/bin"
+export PATH="${HOME}/.local/bin:${PATH}"
 
 # Load version control information
 function current_branch() {
diff --git a/system/.local/bin/gpg2 b/system/.local/bin/gpg2
new file mode 100755
index 0000000..d20bc38
--- /dev/null
+++ b/system/.local/bin/gpg2
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+# 
+# SCRIPT NAME:
+# gpg2
+#
+# AUTHOR:
+# Severin Kaderli <severin@kaderli.dev>
+#
+# DESCRIPTION:
+# Wrapper script for gpg2 to use XDG directories
+#
+# USAGE:
+# ./gpg2
+"/usr/bin/gpg2" --homedir "${XDG_DATA_HOME}/gnupg" "${@}"
\ No newline at end of file
diff --git a/system/.local/bin/mvn b/system/.local/bin/mvn
new file mode 100755
index 0000000..64e4a32
--- /dev/null
+++ b/system/.local/bin/mvn
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+# 
+# SCRIPT NAME:
+# mvn
+#
+# AUTHOR:
+# Severin Kaderli <severin@kaderli.dev>
+#
+# DESCRIPTION:
+# Wrapper script for mvn to use XDG directories
+#
+# USAGE:
+# ./mvn
+"/usr/bin/mvn" -gs "${XDG_CONFIG_HOME}/maven/settings.xml" "${@}"
\ No newline at end of file
diff --git a/system/.local/bin/nvidia-settings b/system/.local/bin/nvidia-settings
new file mode 100755
index 0000000..32dfb60
--- /dev/null
+++ b/system/.local/bin/nvidia-settings
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+# 
+# SCRIPT NAME:
+# nvidia-settings
+#
+# AUTHOR:
+# Severin Kaderli <severin@kaderli.dev>
+#
+# DESCRIPTION:
+# Wrapper script for nvidia-settings to use XDG directories
+#
+# USAGE:
+# ./nvidia-settings
+"/usr/bin/nvidia-settings" --config="${XDG_CONFIG_HOME}/nvidia/settings" "${@}"
\ No newline at end of file
diff --git a/system/.local/bin/sqlite3 b/system/.local/bin/sqlite3
new file mode 100755
index 0000000..32d5c7c
--- /dev/null
+++ b/system/.local/bin/sqlite3
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+# 
+# SCRIPT NAME:
+# sqlite3
+#
+# AUTHOR:
+# Severin Kaderli <severin@kaderli.dev>
+#
+# DESCRIPTION:
+# Wrapper script for sqlite3 to use XDG directories
+#
+# USAGE:
+# ./sqlite3
+"/usr/bin/sqlite3"  -init "${XDG_CONFIG_HOME}/sqlite3/sqliterc" "${@}"
\ No newline at end of file
diff --git a/system/.local/bin/svn b/system/.local/bin/svn
new file mode 100755
index 0000000..292e3c6
--- /dev/null
+++ b/system/.local/bin/svn
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+# 
+# SCRIPT NAME:
+# svn
+#
+# AUTHOR:
+# Severin Kaderli <severin@kaderli.dev>
+#
+# DESCRIPTION:
+# Wrapper script for svn to use XDG directories
+#
+# USAGE:
+# ./svn
+"/usr/bin/svn" --config-dir "${XDG_CONFIG_HOME}/subversion" "${@}"
\ No newline at end of file
diff --git a/system/.local/bin/wget b/system/.local/bin/wget
new file mode 100755
index 0000000..1b93cba
--- /dev/null
+++ b/system/.local/bin/wget
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+# 
+# SCRIPT NAME:
+# wget
+#
+# AUTHOR:
+# Severin Kaderli <severin@kaderli.dev>
+#
+# DESCRIPTION:
+# Wrapper script for wget to use XDG directories
+#
+# USAGE:
+# ./wget
+"/usr/bin/wget" --hsts-file="${XDG_CACHE_HOME}/wget-hsts" "${@}"
\ No newline at end of file