diff --git a/pkgbuilds/omarchy-fish/PKGBUILD b/pkgbuilds/omarchy-fish/PKGBUILD
index ddae265..14dbfdf 100644
--- a/pkgbuilds/omarchy-fish/PKGBUILD
+++ b/pkgbuilds/omarchy-fish/PKGBUILD
@@ -17,28 +17,21 @@ sha256sums=('85e417fe0035698c1e0ca472369cb68847ecdf2d19f475f75cc1d0f364607361'
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # Install omarchy-fish conf.d files to vendor_conf.d
+  # Install fzf.fish to vendor directories
   install -dm755 "${pkgdir}/usr/share/fish/vendor_conf.d"
-  install -Dm644 conf.d/envs.fish "${pkgdir}/usr/share/fish/vendor_conf.d/omarchy-fish-envs.fish"
-  install -Dm644 conf.d/init.fish "${pkgdir}/usr/share/fish/vendor_conf.d/omarchy-fish-init.fish"
-
-  # Install fzf.fish functions first
   install -dm755 "${pkgdir}/usr/share/fish/vendor_functions.d"
-  install -Dm644 "${srcdir}/fzf.fish-10.3/functions/"*.fish "${pkgdir}/usr/share/fish/vendor_functions.d/"
-  install -Dm644 "${srcdir}/fzf.fish-10.3/conf.d/fzf.fish" "${pkgdir}/usr/share/fish/vendor_conf.d/fzf.fish"
-
-  # Install omarchy-fish functions (overrides fzf.fish customizations)
-  # Use find to include hidden files (....fish and .....fish)
-  find functions -name "*.fish" -exec install -Dm644 {} "${pkgdir}/usr/share/fish/vendor_functions.d/" \;
-
   install -dm755 "${pkgdir}/usr/share/fish/vendor_completions.d"
-  install -Dm644 "${srcdir}/fzf.fish-10.3/completions/"*.fish "${pkgdir}/usr/share/fish/vendor_completions.d/"
+  cp "${srcdir}/fzf.fish-10.3/conf.d/"*.fish "${pkgdir}/usr/share/fish/vendor_conf.d/"
+  cp "${srcdir}/fzf.fish-10.3/functions/"*.fish "${pkgdir}/usr/share/fish/vendor_functions.d/"
+  cp "${srcdir}/fzf.fish-10.3/completions/"*.fish "${pkgdir}/usr/share/fish/vendor_completions.d/"
 
-  # Install templates and documentation to /usr/share/omarchy-fish
+  # Install omarchy-fish conf.d and functions
+  cp conf.d/*.fish "${pkgdir}/usr/share/fish/vendor_conf.d/"
+  cp functions/*.fish "${pkgdir}/usr/share/fish/vendor_functions.d/"
+
+  # Install templates and documentation
   install -dm755 "${pkgdir}/usr/share/${pkgname}"
-  cp templates/bashrc "${pkgdir}/usr/share/${pkgname}/bashrc"
-  cp LICENSE "${pkgdir}/usr/share/${pkgname}/LICENSE"
-  cp README.md "${pkgdir}/usr/share/${pkgname}/README.md"
+  cp -r templates LICENSE README.md "${pkgdir}/usr/share/${pkgname}/"
   cp "${srcdir}/fzf.fish-10.3/LICENSE.md" "${pkgdir}/usr/share/${pkgname}/LICENSE.fzf.fish"
   cp "${srcdir}/fzf.fish-10.3/README.md" "${pkgdir}/usr/share/${pkgname}/README.fzf.fish.md"
 
diff --git a/pkgbuilds/omarchy-zsh/PKGBUILD b/pkgbuilds/omarchy-zsh/PKGBUILD
index 1faaf88..3b7717c 100644
--- a/pkgbuilds/omarchy-zsh/PKGBUILD
+++ b/pkgbuilds/omarchy-zsh/PKGBUILD
@@ -15,27 +15,9 @@ sha256sums=('b88ebc4e067a42eb01e0740ddab832fec8968efe36577cfd82c2d9d2ff6cd2ad')
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # Install omarchy-zsh config files to /usr/share/omarchy-zsh
-  install -dm755 "${pkgdir}/usr/share/${pkgname}/conf.d"
-  install -dm755 "${pkgdir}/usr/share/${pkgname}/functions"
-
-  # Install config snippets
-  install -Dm644 conf.d/envs.zsh "${pkgdir}/usr/share/${pkgname}/conf.d/"
-  install -Dm644 conf.d/init.zsh "${pkgdir}/usr/share/${pkgname}/conf.d/"
-  install -Dm644 conf.d/options.zsh "${pkgdir}/usr/share/${pkgname}/conf.d/"
-
-  # Install function definitions
-  install -Dm644 functions/aliases.zsh "${pkgdir}/usr/share/${pkgname}/functions/"
-  install -Dm644 functions/functions.zsh "${pkgdir}/usr/share/${pkgname}/functions/"
-
-  # Install zshrc and bashrc templates
-  cp templates/zshrc "${pkgdir}/usr/share/${pkgname}/zshrc"
-  cp templates/bashrc "${pkgdir}/usr/share/${pkgname}/bashrc"
-
-  # Install documentation
+  # Install config files, functions, templates, and documentation
   install -dm755 "${pkgdir}/usr/share/${pkgname}"
-  cp LICENSE "${pkgdir}/usr/share/${pkgname}/LICENSE"
-  cp README.md "${pkgdir}/usr/share/${pkgname}/README.md"
+  cp -r conf.d functions templates LICENSE README.md "${pkgdir}/usr/share/${pkgname}/"
 
   # Install setup script
   install -Dm755 bin/omarchy-setup-zsh "${pkgdir}/usr/bin/omarchy-setup-zsh"