diff --git a/croc/lure.sh b/croc/lure.sh
index 30bb473..e6caf0d 100644
--- a/croc/lure.sh
+++ b/croc/lure.sh
@@ -14,7 +14,7 @@ sources=()
 checksums=()
 
 version() {
-    printf "$(curl -sL "https://api.github.com/repos/${git_repo}/releases/latest" | jq -r '.tag_name')"
+	printf "$(curl -sL "https://api.github.com/repos/${git_repo}/releases/latest" | jq -r '.tag_name')"
 }
 
 package() {
@@ -25,9 +25,8 @@ package() {
 	echo Creating the package
 	tar -xzf "${name}.tar.gz" -C .
 	# Binary
-	install -Dm755 "./${name}" "${pkgdir}/usr/bin/${name}"
+	install-binary "./${name}"
 	# Autocomplete
-	command -v zsh &> /dev/null && install -Dm644 "./zsh_autocomplete" "${pkgdir}/usr/share/zsh/site-functions/_${name}"
-	command -v bash &> /dev/null && install -Dm644 "./bash_autocomplete" "${pkgdir}/usr/share/bash-completion/completions/${name}"
+	install-completion zsh "${name}" <"./zsh_autocomplete"
+	install-completion bash "${name}" <"./bash_autocomplete"
 }
- 
diff --git a/fzf/lure.sh b/fzf/lure.sh
index 2fa4963..8fe3af5 100644
--- a/fzf/lure.sh
+++ b/fzf/lure.sh
@@ -33,14 +33,14 @@ package() {
 	echo "Creating the package"
 	tar -xzf "${name}.tar.gz" -C .
 	# Binaries
-	install -Dm755 "./${name}" "${pkgdir}/usr/bin/${name}"
-	install -Dm755 "./${name}-tmux" "${pkgdir}/usr/bin/${name}-tmux"
+	install-binary "./${name}"
+	install-binary "./${name}-tmux"
 	# Manpages
-	install -Dm644 "./${name}.1" "${pkgdir}/usr/share/man/man1/${name}.1"
-	install -Dm644 "./${name}-tmux.1" "${pkgdir}/usr/share/man/man1/${name}-tmux.1"
+	install-manual "./${name}.1"
+	install-manual "./${name}-tmux.1"
 	# Autocomplete
-	command -v zsh &>/dev/null && install -Dm644 "./${name}.zsh" "${pkgdir}/usr/share/zsh/site-functions/_${name}"
-	command -v bash &>/dev/null && install -Dm644 "./${name}.bash" "${pkgdir}/usr/share/bash-completion/completions/${name}"
+	install-completion zsh "${name}" <"./${name}.zsh"
+	install-completion bash "${name}" <"./${name}.bash"
 	# Key-bindings
 	command -v fish &>/dev/null && install -Dm644 key-bindings.fish "${pkgdir}/usr/share/fish/vendor_functions.d/${name}_key_bindings.fish"
 	command -v bash &>/dev/null && install -Dm644 key-bindings.bash "${pkgdir}/usr/share/${name}/key-bindings.bash"
diff --git a/gocryptfs/lure.sh b/gocryptfs/lure.sh
index 25c8f16..7115c40 100644
--- a/gocryptfs/lure.sh
+++ b/gocryptfs/lure.sh
@@ -14,7 +14,7 @@ sources=()
 checksums=()
 
 version() {
-    printf "$(curl -sL "https://api.github.com/repos/${git_repo}/releases/latest" | jq -r '.tag_name')"
+	printf "$(curl -sL "https://api.github.com/repos/${git_repo}/releases/latest" | jq -r '.tag_name')"
 }
 
 package() {
@@ -25,10 +25,9 @@ package() {
 	echo "Creating the package"
 	tar -xzf "${name}.tar.gz" -C .
 	# Binaries
-	install -Dm755 "./${name}" "${pkgdir}/usr/bin/${name}"
-	install -Dm755 "./${name}-xray" "${pkgdir}/usr/bin/${name}-xray"
+	install-binary "./${name}"
+	install-binary "./${name}-xray"
 	# Manpages
-	install -Dm644 "./${name}.1" "${pkgdir}/usr/share/man/man1/${name}.1"
-	install -Dm644 "./${name}-xray.1" "${pkgdir}/usr/share/man/man1/${name}-xray.1"
+	install-manual "./${name}.1"
+	install-manual "./${name}-xray.1"
 }
- 
diff --git a/htmlq/lure.sh b/htmlq/lure.sh
index 629717d..4f86d59 100644
--- a/htmlq/lure.sh
+++ b/htmlq/lure.sh
@@ -24,6 +24,6 @@ package() {
     # Build package
     echo "Creating the package"
     tar -xzf "${name}.tar.gz" -C .
-    # Binaries
-    install -Dm755 "./${name}" "${pkgdir}/usr/bin/${name}"
+    # Binary
+    install-binary "./${name}"
 }
diff --git a/lf/lure.sh b/lf/lure.sh
index 2d21695..041de6c 100644
--- a/lf/lure.sh
+++ b/lf/lure.sh
@@ -22,19 +22,18 @@ package() {
 	echo "Pulling ${name} ${version}"
 	curl -L "https://github.com/${git_repo}/releases/latest/download/${name}-linux-${ARCH}.tar.gz" -o ${name}.tar.gz
 	curl -L "https://raw.githubusercontent.com/${git_repo}/master/${name}.1" -o ${name}.1
-	command -v fish &> /dev/null && curl -L "https://raw.githubusercontent.com/${git_repo}/master/etc/${name}.fish" -o ${name}.fish
-	command -v zsh &> /dev/null && curl -L "https://raw.githubusercontent.com/${git_repo}/master/etc/${name}.zsh" -o ${name}.zsh
-	command -v bash &> /dev/null && curl -L "https://raw.githubusercontent.com/${git_repo}/master/etc/${name}.bash" -o ${name}.bash
+	command -v fish &>/dev/null && curl -L "https://raw.githubusercontent.com/${git_repo}/master/etc/${name}.fish" -o ${name}.fish
+	command -v zsh &>/dev/null && curl -L "https://raw.githubusercontent.com/${git_repo}/master/etc/${name}.zsh" -o ${name}.zsh
+	command -v bash &>/dev/null && curl -L "https://raw.githubusercontent.com/${git_repo}/master/etc/${name}.bash" -o ${name}.bash
 	# Build package
 	echo "Creating the package"
 	tar -xzf "${name}.tar.gz" -C .
 	# Binary
-	install -Dm755 "./${name}" "${pkgdir}/usr/bin/${name}"
+	install-binary "./${name}"
 	# Manpage
-	install -Dm644 "./${name}.1" "${pkgdir}/usr/share/man/man1/${name}.1"
+	install-manual "./${name}.1"
 	# Autocomplete
-	command -v fish &> /dev/null && install -Dm644 "./${name}.fish" "${pkgdir}/usr/share/fish/completions/${name}.fish"
-	command -v zsh &> /dev/null && install -Dm644 "./${name}.zsh" "${pkgdir}/usr/share/zsh/site-functions/_${name}"
-	command -v bash &> /dev/null && install -Dm644 "./${name}.bash" "${pkgdir}/usr/share/bash-completion/completions/${name}"
+	install-completion fish "${name}" <"./${name}.fish"
+	install-completion zsh "${name}" <"./${name}.zsh"
+	install-completion bash "${name}" <"./${name}.bash"
 }
- 
diff --git a/lsd/lure.sh b/lsd/lure.sh
index 77287b6..abbf3aa 100644
--- a/lsd/lure.sh
+++ b/lsd/lure.sh
@@ -14,7 +14,7 @@ sources=()
 checksums=()
 
 version() {
-    printf "$(curl -sL "https://api.github.com/repos/${git_repo}/releases/latest" | jq -r '.tag_name')"
+	printf "$(curl -sL "https://api.github.com/repos/${git_repo}/releases/latest" | jq -r '.tag_name')"
 }
 
 package() {
@@ -26,12 +26,11 @@ package() {
 	tar -xzf "${name}.tar.gz" -C .
 	cd "./${name}-${version}-x86_64-unknown-linux-musl"
 	# Binary
-	install -Dm755 "./${name}" "${pkgdir}/usr/bin/${name}"
+	install-binary "./${name}"
 	# Manpage
-	install -Dm644 "./${name}.1" "${pkgdir}/usr/share/man/man1/${name}.1"
+	install-manual "./${name}.1"
 	# Autocomplete
-	command -v fish &> /dev/null && install -Dm644 "./autocomplete/${name}.fish" "${pkgdir}/usr/share/fish/completions/${name}.fish"
-	command -v zsh &> /dev/null && install -Dm644 "./autocomplete/_${name}" "${pkgdir}/usr/share/zsh/site-functions/_${name}"
-	command -v bash &> /dev/null && install -Dm644 "./autocomplete/${name}.bash-completion" "${pkgdir}/usr/share/bash-completion/completions/${name}"
+	install-completion fish "${name}" <"./autocomplete/${name}.fish"
+	install-completion zsh "${name}" <"./autocomplete/_${name}"
+	install-completion bash "${name}" <"./autocomplete/${name}.bash-completion"
 }
- 
diff --git a/movie-rename/lure.sh b/movie-rename/lure.sh
index d7ad2ce..62ddfbe 100644
--- a/movie-rename/lure.sh
+++ b/movie-rename/lure.sh
@@ -11,7 +11,7 @@ sources_amd64=("${homepage}/releases/download/${version}/${name}.tar.gz")
 checksums_amd64=('6f93c6e442afe6a64e8cf6c641e1a20174f6aebd9a557f39ae13d1c41e4a6f6a')
 package() {
 	# Binary
-	install -Dm755 ./${name} "${pkgdir}/usr/bin/${name}"
+	install-binary "./${name}"
 	# Manpage
-	install -Dm644 ./${name}.1 "${pkgdir}/usr/share/man/man1/${name}.1"
+	install-manual "./${name}.1"
 }
diff --git a/topgrade/lure.sh b/topgrade/lure.sh
index 7d104cb..1e9625a 100644
--- a/topgrade/lure.sh
+++ b/topgrade/lure.sh
@@ -1,6 +1,6 @@
 name="topgrade"
 version=12.0.2
-release=2
+release=3
 desc="Invoke the upgrade procedure of multiple package managers"
 architectures=('amd64' 'aarch64' 'armv7')
 maintainer='SinTan1729'
@@ -16,22 +16,16 @@ checksums_aarch64=('683805723bcce9c0a7cc1ecf06edf49a6becaf24ea59a0e6d1bfc697b54a
 checksums_armv7=('5f4ceb90fe374d1c03bef0b9b3cdc995c5ea5e7d0cb5feb5c893a6cd50c13623')
 package() {
 	# install binary
-	install -Dm755 ./topgrade "$pkgdir/usr/bin/topgrade"
+	install-binary "./${name}"
 	# manpage
-	./topgrade --gen-manpage | sed 's/.TH Topgrade 1/.TH Topgrade 8/' >topgrade.8
-	install -Dm644 ./topgrade.8 "$pkgdir/usr/share/man/man8/topgrade.8"
+	"./${name}" --gen-manpage | sed 's/.TH Topgrade 1/.TH Topgrade 8/' >"${name}.8"
+	install-manual "./${name}.8"
 	# completions
-	if $(command -v fish &>/dev/null) && [ $(echo $(fish --version | awk '{print $3}')$'\n'3.4.0 | sort -V | head -n1) != '3.4.0' ]; then
-		./topgrade --gen-completion fish >topgrade.fish
-		install -Dm644 ./topgrade.fish "${pkgdir}/usr/share/fish/completions/topgrade.fish"
-	fi
-	if $(command -v bash &>/dev/null); then
-		./topgrade --gen-completion bash >topgrade.bash
-		install -Dm644 ./topgrade.bash "${pkgdir}/usr/share/bash-completion/completions/topgrade"
-	fi
-	if $(command -v zsh &>/dev/null); then
-		./topgrade --gen-completion zsh >topgrade.zsh
-		install -Dm644 ./topgrade.zsh "${pkgdir}/usr/share/zsh/site-functions/_topgrade"
+	if [ $(echo $(fish --version | awk '{print $3}')$'\n'3.4.0 | sort -V | head -n1) != '3.4.0' ]; then
+		install-completion fish "${name}" | "${name}" --gen-completion fish
 	fi
+	install-completion zsh "${name}" | "${name}" --gen-completion zsh
+	install-completion bash "${name}" | "${name}" --gen-completion bash
+
 	echo "Please add 'no_self_update = true' to your 'topgrade.toml' file to disable self updates, as it won't work with this installation"
 }