diff --git a/dotfiles/zsh_custom/plugins/jekyll/_jekyll b/dotfiles/zprezto_custom/jekyll/functions/_jekyll
similarity index 100%
rename from dotfiles/zsh_custom/plugins/jekyll/_jekyll
rename to dotfiles/zprezto_custom/jekyll/functions/_jekyll
diff --git a/dotfiles/zsh_custom/plugins/jekyll/jekyll.plugin.zsh b/dotfiles/zprezto_custom/jekyll/init.zsh
similarity index 98%
rename from dotfiles/zsh_custom/plugins/jekyll/jekyll.plugin.zsh
rename to dotfiles/zprezto_custom/jekyll/init.zsh
index 3565326..5cc1887 100644
--- a/dotfiles/zsh_custom/plugins/jekyll/jekyll.plugin.zsh
+++ b/dotfiles/zprezto_custom/jekyll/init.zsh
@@ -79,7 +79,7 @@ function jekyll {
   case "${1:-help}" in
     help|--help)
       command jekyll help
-      echo "Added by oh-my-zsh plugin:"
+      echo "Added by zsh plugin:"
       echo "  draft                 Create a new draft post."
       echo "  post                  Create a new post to publish immediately."
       echo "  publish               Publish a draft post by name."
diff --git a/dotfiles/zsh_custom/plugins/metasploit/_msfconsole b/dotfiles/zprezto_custom/xtra_completions/functions/_msfconsole
similarity index 100%
rename from dotfiles/zsh_custom/plugins/metasploit/_msfconsole
rename to dotfiles/zprezto_custom/xtra_completions/functions/_msfconsole
diff --git a/dotfiles/zsh_custom/plugins/metasploit/_msfvenom b/dotfiles/zprezto_custom/xtra_completions/functions/_msfvenom
similarity index 100%
rename from dotfiles/zsh_custom/plugins/metasploit/_msfvenom
rename to dotfiles/zprezto_custom/xtra_completions/functions/_msfvenom
diff --git a/dotfiles/zsh_custom/plugins/virsh/_virsh b/dotfiles/zprezto_custom/xtra_completions/functions/_virsh
similarity index 100%
rename from dotfiles/zsh_custom/plugins/virsh/_virsh
rename to dotfiles/zprezto_custom/xtra_completions/functions/_virsh
diff --git a/dotfiles/zpreztorc b/dotfiles/zpreztorc
index b60af77..83fbfde 100644
--- a/dotfiles/zpreztorc
+++ b/dotfiles/zpreztorc
@@ -36,13 +36,15 @@ zstyle ':prezto:load' pmodule \
   'utility' \
   'completion' \
   'matir' \
-  'prompt' \
   'tmux' \
   'git' \
   'gpg' \
   'python' \
   'ruby' \
-  'history-substring-search'
+  'history-substring-search' \
+  'jekyll' \
+  'prompt' \
+  'xtra_completions'
 
 #
 # Autosuggestions
@@ -225,4 +227,4 @@ zstyle ':prezto:module:tmux:auto-start' remote 'yes'
 # Enabled safe options. This aliases cp, ln, mv and rm so that they prompt
 # before deleting or overwriting files. Set to 'no' to disable this safer
 # behavior.
-# zstyle ':prezto:module:utility' safe-ops 'yes'
+zstyle ':prezto:module:utility' safe-ops 'no'
diff --git a/dotfiles/zsh_custom/plugins/gpg-agent/gpg-agent.plugin.zsh b/dotfiles/zsh_custom/plugins/gpg-agent/gpg-agent.plugin.zsh
deleted file mode 100644
index eeac10c..0000000
--- a/dotfiles/zsh_custom/plugins/gpg-agent/gpg-agent.plugin.zsh
+++ /dev/null
@@ -1,59 +0,0 @@
-# Custom plugin to handle gpg-agent 2.1
-
-local GPG_ENV=$HOME/.gnupg/gpg-agent.env
-
-function start_agent_nossh {
-    eval $(/usr/bin/env gpg-agent --quiet --daemon --write-env-file ${GPG_ENV} 2> /dev/null)
-    test -f ${GPG_ENV} && chmod 600 ${GPG_ENV}
-    export GPG_AGENT_INFO
-}
-
-function start_agent_withssh {
-    eval $(/usr/bin/env gpg-agent --quiet --daemon --enable-ssh-support --write-env-file ${GPG_ENV} 2> /dev/null)
-    test -f ${GPG_ENV} && chmod 600 ${GPG_ENV}
-    export GPG_AGENT_INFO
-    export SSH_AUTH_SOCK
-    export SSH_AGENT_PID
-}
-
-if [ -z "${GPG_AGENT_INFO}" ] ; then
-  if which gpgconf >/dev/null 2>&1 ; then
-    GPG_AGENT_INFO=$(gpgconf --list-dirs agent-socket)
-    export GPG_AGENT_INFO
-    if [ -z "${SSH_AUTH_SOCK}" ] ; then
-      SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
-      export SSH_AUTH_SOCK
-    fi
-  fi
-fi
-
-# check if another agent is running
-if ! gpg-connect-agent --agent-program /dev/null --quiet /bye > /dev/null 2> /dev/null; then
-    # source settings of old agent, if applicable
-    if [ -f "${GPG_ENV}" ]; then
-        # This can be clobbered by the file
-        local OLD_SSH_AUTH_SOCK=${SSH_AUTH_SOCK}
-        . ${GPG_ENV} > /dev/null
-        export GPG_AGENT_INFO
-        export SSH_AUTH_SOCK
-        export SSH_AGENT_PID
-    fi
-
-    # check again if another agent is running using the newly sourced settings
-    if ! gpg-connect-agent --agent-program /dev/null --quiet /bye > /dev/null 2> /dev/null; then
-        # check for existing ssh-agent
-        if [ -n "${OLD_SSH_AUTH_SOCK}" ] ; then
-          SSH_AUTH_SOCK=${OLD_SSH_AUTH_SOCK};export SSH_AUTH_SOCK
-        fi
-        if ssh-add -l > /dev/null 2> /dev/null; then
-            # ssh-agent running, start gpg-agent without ssh support
-            start_agent_nossh;
-        else
-            # otherwise start gpg-agent with ssh support
-            start_agent_withssh;
-        fi
-    fi
-fi
-
-GPG_TTY=$(tty)
-export GPG_TTY
diff --git a/dotfiles/zsh_custom/plugins/metasploit/metasploit.plugin.zsh b/dotfiles/zsh_custom/plugins/metasploit/metasploit.plugin.zsh
deleted file mode 100644
index e69de29..0000000
diff --git a/dotfiles/zsh_custom/themes/matir.zsh-theme b/dotfiles/zsh_custom/themes/matir.zsh-theme
deleted file mode 100644
index 684c5ea..0000000
--- a/dotfiles/zsh_custom/themes/matir.zsh-theme
+++ /dev/null
@@ -1,7 +0,0 @@
-PROMPT='%{$fg[black]%}[%{$fg[yellow]%}%h%{$fg[black]%}] %{%(!.$fg[red].$fg[green])%}%8>..>%n%>>%{$fg[white]%}@%{$fg[blue]%}%12>..>%m%>>%{$fg[white]%}:%{$fg[green]%}%32<...<%~%<<%{$fg[magenta]%}$(virtualenv_prompt_info)%{$fg[blue]%}$(git_prompt_info)%{$fg[white]%}%#%{$reset_color%} '
-ZSH_THEME_GIT_PROMPT_PREFIX=" ("
-ZSH_THEME_GIT_PROMPT_SUFFIX=")"
-ZSH_THEME_VIRTUALENV_PREFIX=" (py:"
-ZSH_THEME_VIRTUALENV_SUFFIX=")"
-
-# vim: set textwidth=0 wrapmargin=0:
diff --git a/dotfiles/zsh_custom/plugins/gcloud/gcloud.plugin.zsh b/dotfiles/zshrc.d/gcloud.zsh
similarity index 100%
rename from dotfiles/zsh_custom/plugins/gcloud/gcloud.plugin.zsh
rename to dotfiles/zshrc.d/gcloud.zsh