diff --git a/README.md b/README.md
index 7aa831a..6c5e63e 100644
--- a/README.md
+++ b/README.md
@@ -71,14 +71,19 @@ This folder contains my [Streamlink](https://streamlink.github.io/) configuratio
 This folder contains my configuration for my terminal emulator
 [Termite](https://github.com/thestinger/termite).
 
+### `.config/vim`
+This folder contains my [Vim](https://www.vim.org/) configuration.
+
 ### `.config/vue`
-This file contains my configuration for [vue-cli](https://github.com/vuejs/vue-cli).
+This folder contains my configuration for
+[vue-cli](https://github.com/vuejs/vue-cli).
+
+### `.config/wget`
+This folder contains my configuration for [wget](https://www.gnu.org/software/wget/).
 
 ### `.config/Trolltech.conf`
 This file contains my QT4 configuration.
 
-
-
 ### `bin`
 This folder contains a bunch of scripts that I use. Some of them are used by
 Polybar or i3 and others are used directly and some like `utils.sh` contain
@@ -115,9 +120,6 @@ This file is used for my custom GTK 2 configuration. This file gets included in
 ### `.keyleds`
 This file contains the configuration for my keyboard backlight.
 
-### `.vimrc`
-This file contains my [Vim](https://www.vim.org/) configuration.
-
 ### `.xinitrc`
 This file is called when a new x-server is started manually. It loads the contents of `.xsetup` and then starts i3.
 
diff --git a/install.sh b/install.sh
index 27188b5..d39e136 100755
--- a/install.sh
+++ b/install.sh
@@ -50,13 +50,14 @@ LINKED_FILES_HOME=(
     ".config/streamlink"
     ".config/termite"
     ".config/Trolltech.conf"
+    ".config/vim"
     ".config/vue"
+    ".config/wget"
     ".dircolors"
     ".env"
     ".gtkrc-2.0.mine"
     ".gtkrc-2.0"
     ".keyleds"
-    ".vimrc"
     ".xinitrc"
     ".xprofile"
     ".Xresources"
diff --git a/system/.aliases b/system/.aliases
index 1540fb0..40d8706 100644
--- a/system/.aliases
+++ b/system/.aliases
@@ -28,4 +28,7 @@ alias cat="bat"
 alias pj="cd ~/Projects"
 
 # Alias for opening my code editor
-alias e="code"
\ No newline at end of file
+alias e="code"
+
+# Alias for wget to use XDG directories
+alias wget="wget --hsts-file=\"$XDG_CACHE_HOME/wget-hsts\""
\ No newline at end of file
diff --git a/system/.vimrc b/system/.config/vim/vimrc
similarity index 51%
rename from system/.vimrc
rename to system/.config/vim/vimrc
index e812482..19a2c7c 100644
--- a/system/.vimrc
+++ b/system/.config/vim/vimrc
@@ -9,6 +9,14 @@
 "
 " USAGE:
 " This file is automatically used by Vim.
+
+" Directory configurations
+set undodir=$XDG_CACHE_HOME/vim/undo
+set directory=$XDG_CACHE_HOME/vim/swap
+set backupdir=$XDG_CACHE_HOME/vim/backup
+set viminfo+='1000,n$XDG_CACHE_HOME/vim/viminfo
+set runtimepath=$XDG_CONFIG_HOME/vim,$VIMRUNTIME,$XDG_CONFIG_HOME/vim/after
+
 syntax on
 set encoding=utf-8
 set virtualedit=onemore
@@ -18,4 +26,5 @@ filetype on
 filetype indent on
 filetype plugin on
 
-:imap jk <Esc>
\ No newline at end of file
+:imap jk <Esc>
+
diff --git a/system/.config/wget/wgetrc b/system/.config/wget/wgetrc
new file mode 100644
index 0000000..e69de29
diff --git a/system/.env b/system/.env
index 4fc8ab8..6839c1d 100644
--- a/system/.env
+++ b/system/.env
@@ -20,6 +20,9 @@ export XDG_DATA_HOME="${HOME}/.local/share"
 
 # XDG Overrides for unsupported programs 
 export HTTPIE_CONFIG_DIR="${XDG_CONFIG_HOME}/httpie"
+export XAUTHORITY="${XDG_RUNTIME_DIR}/Xauthority"
+export WGETRC="${XDG_CONFIG_HOME}/wget/wgetrc"
+export VIMINIT=":source ${XDG_CONFIG_HOME}/vim/vimrc"
 
 # Bash
 export HISTCONTROL=ignoreboth