diff --git a/links b/links
index 1c4fbaa..f0a8cff 100644
--- a/links
+++ b/links
@@ -1,4 +1,5 @@
 .vimrc=vimrc
 .zshrc=zshrc
-.zsh=zsh-server
+.zsh=zsh
+.zsh-plugins=zsh-plugins-server
 .zlogout=zlogout
diff --git a/zsh-plugins b/zsh-plugins
new file mode 100644
index 0000000..def3104
--- /dev/null
+++ b/zsh-plugins
@@ -0,0 +1,21 @@
+archive_functions
+custom_rm
+custom_su
+filetypes_aliases
+hash_common
+hash_desktop
+highlighting
+pacman_common
+pacman_test
+pkgfile
+prompt
+prompt_server
+sprunge
+ssh-agent
+sudo_aliases_common
+sudo_aliases_pc
+urltools
+vimpager
+websearch
+xrandr_e530
+xrandr_t440
diff --git a/zsh-plugins-server b/zsh-plugins-server
new file mode 100644
index 0000000..cb1b0df
--- /dev/null
+++ b/zsh-plugins-server
@@ -0,0 +1,9 @@
+archive_functions
+custom_rm
+highlighting
+prompt_server
+sprunge
+sudo_aliases_common
+urltools
+vimpager
+websearch
diff --git a/zsh-server/archive_functions b/zsh-server/archive_functions
deleted file mode 120000
index 056faa3..0000000
--- a/zsh-server/archive_functions
+++ /dev/null
@@ -1 +0,0 @@
-../zsh/archive_functions
\ No newline at end of file
diff --git a/zsh-server/bin b/zsh-server/bin
deleted file mode 120000
index 5f216bd..0000000
--- a/zsh-server/bin
+++ /dev/null
@@ -1 +0,0 @@
-../zsh/bin
\ No newline at end of file
diff --git a/zsh-server/custom_rm b/zsh-server/custom_rm
deleted file mode 120000
index fd442c1..0000000
--- a/zsh-server/custom_rm
+++ /dev/null
@@ -1 +0,0 @@
-../zsh/custom_rm
\ No newline at end of file
diff --git a/zsh-server/highlighting b/zsh-server/highlighting
deleted file mode 120000
index 41190d9..0000000
--- a/zsh-server/highlighting
+++ /dev/null
@@ -1 +0,0 @@
-../zsh/highlighting
\ No newline at end of file
diff --git a/zsh-server/sudo_aliases_common b/zsh-server/sudo_aliases_common
deleted file mode 120000
index bf7ac5a..0000000
--- a/zsh-server/sudo_aliases_common
+++ /dev/null
@@ -1 +0,0 @@
-../zsh/sudo_aliases_common
\ No newline at end of file
diff --git a/zsh-server/vimpager b/zsh-server/vimpager
deleted file mode 120000
index ffe2ba2..0000000
--- a/zsh-server/vimpager
+++ /dev/null
@@ -1 +0,0 @@
-../zsh/vimpager
\ No newline at end of file
diff --git a/zsh-server/zsh-syntax-highlighting b/zsh-server/zsh-syntax-highlighting
deleted file mode 120000
index 8512173..0000000
--- a/zsh-server/zsh-syntax-highlighting
+++ /dev/null
@@ -1 +0,0 @@
-../zsh/zsh-syntax-highlighting
\ No newline at end of file
diff --git a/zsh-server/prompt_server b/zsh/prompt_server
similarity index 100%
rename from zsh-server/prompt_server
rename to zsh/prompt_server
diff --git a/zshrc b/zshrc
index 1fc7841..6e6bb41 100644
--- a/zshrc
+++ b/zshrc
@@ -107,4 +107,6 @@ if [[ ${TERM} =~ "rxvt-unicode-*" ]] export TERM="xterm"
 find "${HOME}/.ssh/conf.d" -type f -name '*.conf' -exec cat {} > "${HOME}/.ssh/config" \; 2> /dev/null
 
 # load custom settings from $HOME/.zsh
-for _SCR in $(find "${HOME}/.zsh/" -type 'f' -or -type 'l' -maxdepth 1 2> /dev/null); do source "${_SCR}"; done
+if [[ -a ${HOME}/.zsh/zsh-plugins ]]; then
+    for _SRC in $(cat "${HOME}/.zsh-plugins"); do source "${HOME}/.zsh/${_SRC}"; done
+fi