diff --git a/.bin/.e b/.bin/.e
index 22e5611..036f325 100755
--- a/.bin/.e
+++ b/.bin/.e
@@ -5,7 +5,7 @@ declare -A mapper=(
 	[".t"]="$HOME/.bin/.t"
 	["alacritty"]="$HOME/.config/alacritty/alacritty.toml"
 	["astronvim"]="$HOME/.config/astronvim/lua/user/init.lua"
-	["autostart"]="$HOME/.bin/autostart-manage"
+	["autoinstall.toml"]="$HOME/.config/autoinstall.toml"
 	["autostart.toml"]="$HOME/.config/autostart.toml"
 	["bash"]="$HOME/.bashrc"
 	["bspwm"]="$HOME/.config/bspwm/bspwmrc"
diff --git a/.config/autoinstall.toml b/.config/autoinstall.toml
index 33b0eeb..960b1eb 100644
--- a/.config/autoinstall.toml
+++ b/.config/autoinstall.toml
@@ -38,6 +38,48 @@ target = "eza"
 pipe = "tar xzO"
 group = "base"
 
+[[autoinstall]]
+type = "exe"
+source = "https://git.serguzim.me/serguzim/tools/releases/download/latest/autostart-manage"
+target = "autostart-manage"
+group = "base"
+completions = "completions"
+
+[[autoinstall]]
+type = "exe"
+source = "https://git.serguzim.me/serguzim/tools/releases/download/latest/autoinstall"
+target = "autoinstall"
+group = "base"
+completions = "completions"
+
+
+
+[[autoinstall]]
+type = "git"
+source = "https://github.com/zsh-users/zsh-syntax-highlighting.git"
+target = "${plugin_path:?}/zsh-syntax-highlighting"
+group = "oh-my-zsh"
+
+[[autoinstall]]
+type = "git"
+source = "https://github.com/spwhitt/nix-zsh-completions.git"
+target = "${plugin_path:?}/nix-zsh-completions"
+group = "oh-my-zsh"
+
+[[autoinstall]]
+type = "git"
+source = "https://github.com/chisui/zsh-nix-shell.git"
+target = "${plugin_path:?}/nix-shell"
+group = "oh-my-zsh"
+
+[[autoinstall]]
+type = "file"
+source = "https://gist.githubusercontent.com/oshybystyi/475ee7768efc03727f21/raw/4bfd57ef277f5166f3070f11800548b95a501a19/git-auto-status.plugin.zsh"
+target = "${plugin_path:?}/git-auto-status/git-auto-status.plugin.zsh"
+group = "oh-my-zsh"
+
+
+
 [[autoinstall]]
 type = "file"
 source = "https://raw.githubusercontent.com/dracula/alacritty/master/dracula.toml"
@@ -76,6 +118,8 @@ target = "jetbrains-toolbox"
 pipe = "tar xzO"
 group = "graphical"
 
+
+
 [[autoinstall]]
 type = "text"
 source = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCkmWZmum4cVeDy5+9N1HdUzfnjEHSJ900ucD8F0wAy4MV1cdPYnZ4u5PFv5XMfmvA9SJ+VFsr0lhYlr+GQBG9aCCAdMJVVmEz3SccT6dp6ZYywT158RNshzfCe9ylWKK80+W7XnDXhdkec7aK+BQn5wOER3A3mUqRR0JDXWga9jyakH1K6OwXmQOO419bJWs2uCT1ZEgndHxKJEt2pEvoSz7z8p1SS2zyro+R3YtvL9WiDo3+0yPFYficNDr7s39yF5IJE+KTqAlCn5R2+kJ54lRmzB8oNS2jGwK2Q6wtph4AmfnlJTMODG2U2RjUltH2MIDXIYe2epATWL8qhkI4LTr38C7QR3DeJQsel/yTWdYqGakvU6Ge/xkbsaWOrSDTV3bPgKHzlL+dIKaGpV+5usZN4fpOLOb/nmYy3ekLpobzxza7rBRT2CxXS72DoPFaRE1ye7SxhcsLBNwre9YQFE4VvUZwJYkWz2V7eqGrk8VYnmQmT/bnUnMnVwMpeDc7pFKAFndIUxifoOj77c98Tdy3ncdS7SOd7+zRbLG+7k0UU1k89o1+tfREAddUJYR4RvB6g0kCyjpwOf1Pt4zhJR3y/zpsCCc5UnzK9X2kEo/8TSyvTr+GBiFVp5yLYgwCPJSNna33YX7+c3oLRM1QGgtqZk9qnGX9hgP8qpF8Akw== openpgp:0xAB920993"
diff --git a/.config/completionsrc b/.config/completionsrc
index 3f3e44e..20b380e 100644
--- a/.config/completionsrc
+++ b/.config/completionsrc
@@ -30,21 +30,12 @@ _dott_completions()
 }
 complete -F _dott_completions ".t"
 
-#_autostart_manage_completions()
-#{
-#	if [ "${#COMP_WORDS[@]}" == "2" ]; then
-#		return
-#	fi
-#
-#	COMPREPLY=()
-#	while IFS='' read -r line
-#	do
-#		COMPREPLY+=("$line")
-#	done < <(compgen -W "$(autostart-manage list)" "${COMP_WORDS[1]}")
-#}
-#complete -F _autostart_manage_completions "autostart-manage"
-
-for additional_completions in "$XDG_CONFIG_HOME/completionsrc.d/"*; do
-	# shellcheck disable=1090
-	. "$additional_completions"
-done
+completions_dir="$XDG_CONFIG_HOME/completionsrc.d/"
+if [ -n "$(ls "$completions_dir" 2>/dev/null)" ]
+then
+	for additional_completions in "$completions_dir"*
+	do
+		# shellcheck disable=1090
+		. "$additional_completions"
+	done
+fi
diff --git a/.config/yadm/hooks/post_pull b/.config/yadm/hooks/post_pull
index 832a719..7c8972f 100755
--- a/.config/yadm/hooks/post_pull
+++ b/.config/yadm/hooks/post_pull
@@ -2,4 +2,4 @@
 
 echo "Running post pull script..."
 
-autoinstall base
+autoinstall run base
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index f2c6bd7..07d9474 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -62,19 +62,8 @@ HIST_STAMPS="yyyy-mm-dd"
 # Would you like to use another custom folder than $ZSH/custom?
 ZSH_CUSTOM=$ZDOTDIR/custom
 
-plugin_path="$ZSH_CUSTOM/plugins"
-autoinstall git \
-	"https://github.com/zsh-users/zsh-syntax-highlighting.git" \
-	"$plugin_path/zsh-syntax-highlighting"
-autoinstall git \
-	"https://github.com/spwhitt/nix-zsh-completions.git" \
-	"$plugin_path/nix-zsh-completions"
-autoinstall git \
-	"https://github.com/chisui/zsh-nix-shell.git" \
-	"$plugin_path/nix-shell"
-autoinstall file \
-	"https://gist.githubusercontent.com/oshybystyi/475ee7768efc03727f21/raw/4bfd57ef277f5166f3070f11800548b95a501a19/git-auto-status.plugin.zsh" \
-	"$plugin_path/git-auto-status/git-auto-status.plugin.zsh"
+export plugin_path="$ZSH_CUSTOM/plugins"
+autoinstall run oh-my-zsh
 
 
 # Which plugins would you like to load?
diff --git a/.local/share/yadm/archive b/.local/share/yadm/archive
index 3be9f8f..b545bad 100644
Binary files a/.local/share/yadm/archive and b/.local/share/yadm/archive differ