diff --git a/zsh/50-aliases.zsh b/zsh/50-aliases.zsh
index 87a9e71..2a4aac3 100644
--- a/zsh/50-aliases.zsh
+++ b/zsh/50-aliases.zsh
@@ -6,3 +6,13 @@ alias screen="TERM=xterm screen"
 # Other
 alias clocksync="sudo ntpdate 0.pool.ntp.org"
 alias got="git"
+
+for item in `ls ${CONFIG_PATH}/zsh/aliases`; do
+    source ${CONFIG_PATH}/zsh/aliases/${item}
+done
+
+if [ -d "${HOME}/.zsh-config.d/aliases" ]; then
+    for item in `ls ${HOME}/.zsh-config.d/aliases`; do
+        source ${HOME}/.zsh-config.d/aliases/${item}
+    done
+fi
diff --git a/zsh/aliases/10-arch.conf b/zsh/aliases/10-arch.conf
new file mode 100644
index 0000000..a03b99a
--- /dev/null
+++ b/zsh/aliases/10-arch.conf
@@ -0,0 +1,8 @@
+# Some good default aliases for Arch Linux.
+
+if [ "${OS_RELEASE/ARCH}" != "${OS_RELEASE}" ]; then
+    alias yasearch="yaourt -Ss"
+    alias yadel="yaourt -Rddd"
+    alias yainstall="yaourt -S"
+    alias sysupdate="yaourt -Syua"
+fi
diff --git a/zsh/defaults/aliases/.gitkeep b/zsh/defaults/aliases/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/zsh/exports/10-editor.zsh b/zsh/exports/10-editor.zsh
index 7edb340..4a8a940 100644
--- a/zsh/exports/10-editor.zsh
+++ b/zsh/exports/10-editor.zsh
@@ -1,2 +1,2 @@
 # This file is used to override EDITOR variable.
-EDITOR="nano"
\ No newline at end of file
+export EDITOR="nano"
diff --git a/zsh/prompts/pztrn.zsh b/zsh/prompts/pztrn.zsh
index bc24384..b587fce 100644
--- a/zsh/prompts/pztrn.zsh
+++ b/zsh/prompts/pztrn.zsh
@@ -65,4 +65,4 @@ $vars['console']$p_path $p_end"
 
 }
 
-prompt_pztrn_setup "$@"
+prompt_pztrn_setup