diff --git a/.config/fish/functions/i.fish b/.config/fish/functions/i.fish
index ea8402ad..11b8050b 100644
--- a/.config/fish/functions/i.fish
+++ b/.config/fish/functions/i.fish
@@ -1,3 +1,7 @@
 function i --wraps='yay -S ' --description 'alias i=yay -S '
-    yay -S $argv
+    if type -f yay &>/dev/null
+        yay -Sy $argv
+    else
+        pacman -Sy $argv
+    end
 end
diff --git a/.config/fish/functions/u.fish b/.config/fish/functions/u.fish
index f4287ec6..d6cc841d 100644
--- a/.config/fish/functions/u.fish
+++ b/.config/fish/functions/u.fish
@@ -1,3 +1,7 @@
 function u --wraps='yay -R ' --description 'alias u=yay -R '
-    yay -R $argv
+    if type -f yay &>/dev/null
+        yay -R $argv
+    else
+        pacman -R $argv
+    end
 end
diff --git a/.config/fish/functions/up.fish b/.config/fish/functions/up.fish
index bde8ea59..bdf7f220 100644
--- a/.config/fish/functions/up.fish
+++ b/.config/fish/functions/up.fish
@@ -1,3 +1,9 @@
 function up --wraps='yay -Syu' --description 'alias up=yay -Syu'
-    yay -Syu $argv
+    if type -f topgrade &>/dev/null
+        topgrade -k --only system
+    else if type -f yay &>/dev/null
+        yay -Syu $argv
+    else
+        pacman -Syu $argv
+    end
 end
diff --git a/.config/fish/functions/upall.fish b/.config/fish/functions/upall.fish
index 24297b03..5011adfa 100644
--- a/.config/fish/functions/upall.fish
+++ b/.config/fish/functions/upall.fish
@@ -1,3 +1,7 @@
 function upall --wraps=topgrade --description 'alias upall=topgrade'
-    topgrade $argv
+    if type -f topgrade
+        topgrade $argv
+    else
+        echo "topgrade not found"
+    end
 end