diff --git a/home/.local/bin/fzf/fzpacin b/home/.local/bin/fzf/fzpacin
deleted file mode 100755
index c17b3b8..0000000
--- a/home/.local/bin/fzf/fzpacin
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-yay -Slq | fzf --multi --preview 'yay -Si {1}' | xargs -ro yay -S
diff --git a/home/.local/bin/fzf/fzpacun b/home/.local/bin/fzf/fzpacun
deleted file mode 100755
index 470ada3..0000000
--- a/home/.local/bin/fzf/fzpacun
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-yay -Qq | fzf --multi --preview 'cat <(yay -Si {1}) <(yay -Fl {1} | awk "{print \$2}")' | xargs -ro yay -Rns
diff --git a/home/.local/bin/fzf/fzxbps b/home/.local/bin/fzf/fzxbps
new file mode 100755
index 0000000..7d838ea
--- /dev/null
+++ b/home/.local/bin/fzf/fzxbps
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Query installed packages. For installing one use `fuzzypkg`
+xbps-query -s "*" | awk '{print $2}' | fzf --multi --preview 'xbps-query -S {}'
diff --git a/home/.local/bin/fzf/fzyay b/home/.local/bin/fzf/fzyay
new file mode 100755
index 0000000..7b8429c
--- /dev/null
+++ b/home/.local/bin/fzf/fzyay
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+if [ -z "$1" ]
+then
+  echo "Usage:
+  -i : install a package
+  -u : uninstall a package"
+else
+  if [ "$1" = "-i" ]
+  then
+    yay -Slq | fzf --multi --preview 'yay -Si {1}' | xargs -ro yay -S
+  elif [ "$1" = "-u" ]
+  then
+    yay -Qq | fzf --multi --preview 'cat <(yay -Si {1}) <(yay -Fl {1} | awk "{print \$2}")' | xargs -ro yay -Rns
+  else
+    exit 1
+  fi
+fi