diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 556576f..c10166d 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -32,7 +32,7 @@ folder-source() {
 	for f in "$1"/[^._]*(N); do
 		if [[ -d "$f" ]]; then
 			folder-source "$f"
-		elif [[ -n "${f##*.zwc}" ]]; then
+		elif [[ $f =~ .zsh$ ]]; then
 			comp-source "$f"
 		fi
 	done
diff --git a/.config/zsh/zshrc.d/90-external-plugins/10-powerlevel10k b/.config/zsh/zshrc.d/90-external-plugins/10-powerlevel10k.zsh
similarity index 100%
rename from .config/zsh/zshrc.d/90-external-plugins/10-powerlevel10k
rename to .config/zsh/zshrc.d/90-external-plugins/10-powerlevel10k.zsh
diff --git a/.config/zsh/zshrc.d/90-external-plugins/15-powerlevel10k.theme b/.config/zsh/zshrc.d/90-external-plugins/15-powerlevel10k.theme.zsh
similarity index 100%
rename from .config/zsh/zshrc.d/90-external-plugins/15-powerlevel10k.theme
rename to .config/zsh/zshrc.d/90-external-plugins/15-powerlevel10k.theme.zsh
diff --git a/.config/zsh/zshrc.d/90-external-plugins/20-autosuggestions-config b/.config/zsh/zshrc.d/90-external-plugins/20-autosuggestions.config.zsh
similarity index 100%
rename from .config/zsh/zshrc.d/90-external-plugins/20-autosuggestions-config
rename to .config/zsh/zshrc.d/90-external-plugins/20-autosuggestions.config.zsh
diff --git a/.config/zsh/zshrc.d/90-external-plugins/20-autosuggestions b/.config/zsh/zshrc.d/90-external-plugins/20-autosuggestions.zsh
similarity index 100%
rename from .config/zsh/zshrc.d/90-external-plugins/20-autosuggestions
rename to .config/zsh/zshrc.d/90-external-plugins/20-autosuggestions.zsh
diff --git a/.config/zsh/zshrc.d/90-external-plugins/40-fzf-tab b/.config/zsh/zshrc.d/90-external-plugins/40-fzf-tab.zsh
similarity index 100%
rename from .config/zsh/zshrc.d/90-external-plugins/40-fzf-tab
rename to .config/zsh/zshrc.d/90-external-plugins/40-fzf-tab.zsh
diff --git a/.config/zsh/zshrc.d/90-external-plugins/45-fzf-tab-config b/.config/zsh/zshrc.d/90-external-plugins/45-fzf-tab.config.zsh
similarity index 100%
rename from .config/zsh/zshrc.d/90-external-plugins/45-fzf-tab-config
rename to .config/zsh/zshrc.d/90-external-plugins/45-fzf-tab.config.zsh
diff --git a/.config/zsh/zshrc.d/90-external-plugins/50-fzf-key-bindings b/.config/zsh/zshrc.d/90-external-plugins/50-fzf.key-bindings.zsh
similarity index 100%
rename from .config/zsh/zshrc.d/90-external-plugins/50-fzf-key-bindings
rename to .config/zsh/zshrc.d/90-external-plugins/50-fzf.key-bindings.zsh
diff --git a/.config/zsh/zshrc.d/90-external-plugins/60-stderred b/.config/zsh/zshrc.d/90-external-plugins/60-stderred.zsh
similarity index 100%
rename from .config/zsh/zshrc.d/90-external-plugins/60-stderred
rename to .config/zsh/zshrc.d/90-external-plugins/60-stderred.zsh
diff --git a/.config/zsh/zshrc.d/90-external-plugins/65-stderred.theme b/.config/zsh/zshrc.d/90-external-plugins/65-stderred.theme.zsh
similarity index 100%
rename from .config/zsh/zshrc.d/90-external-plugins/65-stderred.theme
rename to .config/zsh/zshrc.d/90-external-plugins/65-stderred.theme.zsh
diff --git a/.config/zsh/zshrc.d/90-external-plugins/70-direnv b/.config/zsh/zshrc.d/90-external-plugins/70-direnv.zsh
similarity index 100%
rename from .config/zsh/zshrc.d/90-external-plugins/70-direnv
rename to .config/zsh/zshrc.d/90-external-plugins/70-direnv.zsh
diff --git a/.config/zsh/zshrc.d/90-external-plugins/90-syntax-highlighting b/.config/zsh/zshrc.d/90-external-plugins/90-syntax-highlighting.zsh
similarity index 100%
rename from .config/zsh/zshrc.d/90-external-plugins/90-syntax-highlighting
rename to .config/zsh/zshrc.d/90-external-plugins/90-syntax-highlighting.zsh
diff --git a/.config/zsh/zshrc.d/90-external-plugins/95-syntax-highlighting.theme b/.config/zsh/zshrc.d/90-external-plugins/95-syntax-highlighting.theme.zsh
similarity index 100%
rename from .config/zsh/zshrc.d/90-external-plugins/95-syntax-highlighting.theme
rename to .config/zsh/zshrc.d/90-external-plugins/95-syntax-highlighting.theme.zsh