diff --git a/colors/link.bash b/colors/link.bash
index 1961ebe..a364840 100755
--- a/colors/link.bash
+++ b/colors/link.bash
@@ -3,6 +3,8 @@
 DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/.." && pwd)
 source "$DIR/variables.bash"
 
+mkdir -p "$DOTFILES_PATH/editor/nvim/config/colors"
+
 rm -f ~/.Xresources.colors
 rm -f "$DOTFILES_PATH/editor/nvim/config/colors/current.vim"
 ln -s "$DOTFILES_PATH/colors/xresources" "$HOME/.Xresources.colors"
diff --git a/editor/nvim/config/.gitignore b/editor/nvim/config/.gitignore
new file mode 100644
index 0000000..4fe6d82
--- /dev/null
+++ b/editor/nvim/config/.gitignore
@@ -0,0 +1,3 @@
+autoload
+bundle
+undo
diff --git a/editor/nvim/config/colors/current.vim b/editor/nvim/config/colors/current.vim
new file mode 120000
index 0000000..286c0d2
--- /dev/null
+++ b/editor/nvim/config/colors/current.vim
@@ -0,0 +1 @@
+/home/daniel/.dotfiles/colors/vim
\ No newline at end of file
diff --git a/env/wm/bspwmrc b/env/wm/bspwmrc
index 0c67a2f..3c49727 100755
--- a/env/wm/bspwmrc
+++ b/env/wm/bspwmrc
@@ -2,7 +2,7 @@
 
 source "$DOTFILES_PATH/variables.bash"
 
-source "$DOTFILES_PATH/wm/bspwm_config"
+source "$DOTFILES_PATH/env/wm/bspwm_config"
 source "$DOTFILES_PATH/scripts/get_color.sh"
 source "$DOTFILES_PATH/scripts/get_x_fonts.sh"
 
diff --git a/link_all.bash b/link_all.bash
index 073be85..036fed4 100755
--- a/link_all.bash
+++ b/link_all.bash
@@ -24,8 +24,8 @@ else
     fi
 fi
 
-source "$DOTFILES_PATH/browser/qutebrowser/link.bash"
 source "$DOTFILES_PATH/colors/link.bash"
+source "$DOTFILES_PATH/browser/qutebrowser/link.bash"
 source "$DOTFILES_PATH/misc/irc/link.bash"
 source "$DOTFILES_PATH/misc/git/link.bash"
 source "$DOTFILES_PATH/editor/nvim/link.bash"