diff --git a/55-agents.zsh b/55-agents.zsh
index 5fcc24a..7acd1ee 100644
--- a/55-agents.zsh
+++ b/55-agents.zsh
@@ -19,4 +19,4 @@
 # zstyle :omz:plugins:keychain identities id_rsa 01234567
 # zstyle :omz:plugins:keychain options --quiet --inherit local-once --noask --nocolor --quick
 # zstyle :omz:plugins:keychain agents gpg,ssh
-# zcomet load ohmyzsh plugins/keychain
+# zsh-defer zcomet load ohmyzsh plugins/keychain
diff --git a/85-completion.zsh b/85-completion.zsh
index 60302e7..4e51ed9 100644
--- a/85-completion.zsh
+++ b/85-completion.zsh
@@ -26,24 +26,7 @@ zstyle ':completion:*:(ssh|scp|rsync):*:hosts-ipaddr' ignored-patterns '^<->.<->
 zcomet load zsh-users/zsh-completions
 
 # Вызов в этом месте и в таком порядке
-#if [ -z "${ZSH_MC_WORKAROUND}" ]; then
-#	zcomet load zsh-users/zsh-autosuggestions
-#fi
-#zcomet load zsh-users/zsh-syntax-highlighting
-#zcomet load zsh-users/zsh-history-substring-search
-
-# Отложенная загрузка
-mkdir -p ${ZCOMET_DIR}/repos/zsh-users
-if [[ ! -f "${ZCOMET_DIR}/repos/zsh-users/zsh-autosuggestions/zsh-autosuggestions.zsh" ]]; then
-	command git clone --depth=1 https://github.com/zsh-users/zsh-autosuggestions "${ZCOMET_DIR}/repos/zsh-users/zsh-autosuggestions"
-fi
-if [[ ! -f "${ZCOMET_DIR}/repos/zsh-users/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" ]]; then
-	command git clone --depth=1 https://github.com/zsh-users/zsh-syntax-highlighting "${ZCOMET_DIR}/repos/zsh-users/zsh-syntax-highlighting"
-fi
-if [[ ! -f "${ZCOMET_DIR}/repos/zsh-users/zsh-history-substring-search/zsh-history-substring-search.zsh" ]]; then
-	command git clone --depth=1 https://github.com/zsh-users/zsh-history-substring-search "${ZCOMET_DIR}/repos/zsh-users/zsh-history-substring-search"
-fi
-zsh-defer source "${ZCOMET_DIR}/repos/zsh-users/zsh-autosuggestions/zsh-autosuggestions.zsh" \
-                 "${ZCOMET_DIR}/repos/zsh-users/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" \
-                 "${ZCOMET_DIR}/repos/zsh-users/zsh-history-substring-search/zsh-history-substring-search.zsh"
+zsh-defer zcomet load zsh-users/zsh-autosuggestions
+zsh-defer zcomet load zsh-users/zsh-syntax-highlighting
+zsh-defer zcomet load zsh-users/zsh-history-substring-search