diff --git a/.gitmodules b/.gitmodules
index cb8f419e..4e13eaf1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,15 +4,12 @@
 [submodule "modules/syntax-highlighting/external"]
 	path = modules/syntax-highlighting/external
 	url = https://github.com/zsh-users/zsh-syntax-highlighting.git
-[submodule "modules/completion/external"]
-	path = modules/completion/external
-	url = https://github.com/zsh-users/zsh-completions.git
 [submodule "modules/prompt/external/powerline"]
 	path = modules/prompt/external/powerline
 	url = https://github.com/davidjrice/prezto_powerline.git
 [submodule "modules/prompt/external/agnoster"]
 	path = modules/prompt/external/agnoster
-	url = https://gist.github.com/3712874.git
+	url = https://github.com/agnoster/agnoster-zsh-theme.git
 [submodule "modules/prompt/functions/pure"]
 	path = modules/prompt/external/pure
 	url = https://github.com/sindresorhus/pure.git
diff --git a/modules/archive/functions/unarchive b/modules/archive/functions/unarchive
index f1b4224a..72dfbd1f 100644
--- a/modules/archive/functions/unarchive
+++ b/modules/archive/functions/unarchive
@@ -8,6 +8,7 @@
 local remove_archive
 local success
 local file_name
+local file_path
 local extract_dir
 
 if (( $# == 0 )); then
@@ -36,6 +37,7 @@ while (( $# > 0 )); do
 
   success=0
   file_name="${1:t}"
+  file_path="${1:A}"
   extract_dir="${file_name:r}"
   case "$1:l" in
     (*.tar.gz|*.tgz) tar xvzf "$1" ;;
@@ -60,10 +62,10 @@ while (( $# > 0 )); do
     (*.deb)
       mkdir -p "$extract_dir/control"
       mkdir -p "$extract_dir/data"
-      cd "$extract_dir"; ar vx "../${1}" > /dev/null
-      cd control; tar xzvf ../control.tar.gz
-      cd ../data; tar xzvf ../data.tar.gz
-      cd ..; rm *.tar.gz debian-binary
+      cd "$extract_dir"; ar vx "${file_path}" > /dev/null
+      cd control; tar xvf ../control.tar.*
+      cd ../data; tar xvf ../data.tar.*
+      cd ..; rm control.tar.* data.tar.* debian-binary
       cd ..
     ;;
     (*)
diff --git a/modules/completion/external b/modules/completion/external
deleted file mode 160000
index fb1bf123..00000000
--- a/modules/completion/external
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fb1bf123198bef4710aafc7d59cce4e2e0a3dd20
diff --git a/modules/dnf/README.md b/modules/dnf/README.md
index 06439544..bbf1c923 100644
--- a/modules/dnf/README.md
+++ b/modules/dnf/README.md
@@ -15,7 +15,7 @@ Aliases
   - `dnfr` removes package(s).
   - `dnfs` searches for a package.
   - `dnfu` updates packages.
-  - `dnfU` upgrates packages.
+  - `dnfU` upgrades packages.
 
 Authors
 -------
diff --git a/modules/gpg/init.zsh b/modules/gpg/init.zsh
index a7c6cf76..b969c7a5 100644
--- a/modules/gpg/init.zsh
+++ b/modules/gpg/init.zsh
@@ -30,6 +30,9 @@ export GPG_TTY="$(tty)"
 
 # Integrate with the SSH module.
 if grep 'enable-ssh-support' "$_gpg_agent_conf" &> /dev/null; then
+  # Load required functions.
+  autoload -Uz add-zsh-hook
+
   # Override the ssh-agent environment file default path.
   _ssh_agent_env="$_gpg_agent_env"
 
diff --git a/modules/history-substring-search/external b/modules/history-substring-search/external
index c4a83561..2c295432 160000
--- a/modules/history-substring-search/external
+++ b/modules/history-substring-search/external
@@ -1 +1 @@
-Subproject commit c4a83561a12b898ff7145856d0e6ae50757e28ba
+Subproject commit 2c295432175990c1bb4e90bc13f609daa67a25d6
diff --git a/modules/prompt/external/pure b/modules/prompt/external/pure
index 04212522..95e7fd7d 160000
--- a/modules/prompt/external/pure
+++ b/modules/prompt/external/pure
@@ -1 +1 @@
-Subproject commit 04212522f39f43998d001b4a94b05856f010a54b
+Subproject commit 95e7fd7de7af9cf68678c31cac22b79816b44c90
diff --git a/modules/syntax-highlighting/external b/modules/syntax-highlighting/external
index 3dc57419..44e5323b 160000
--- a/modules/syntax-highlighting/external
+++ b/modules/syntax-highlighting/external
@@ -1 +1 @@
-Subproject commit 3dc574190071ef59054f6d693132410b37aa3ae4
+Subproject commit 44e5323b53edd221a79a585869cf4833d555ba58
diff --git a/modules/yum/README.md b/modules/yum/README.md
index 10383c56..fa944da8 100644
--- a/modules/yum/README.md
+++ b/modules/yum/README.md
@@ -15,7 +15,7 @@ Aliases
   - `yumr` removes package(s).
   - `yums` searches for a package.
   - `yumu` updates packages.
-  - `yumU` upgrates packages.
+  - `yumU` upgrades packages.
 
 Authors
 -------