diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 6c217e2..1e526cc 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -1,3 +1,7 @@
 bass 'export GEM_HOME=$HOME/gems'
-bass 'export BROWSER=w3m'
+if command -sq links
+	bass 'export BROWSER=links'
+else
+	bass 'export BROWSER=w3m'
+end
 umask 0002
diff --git a/.config/fish/functions/cat.fish b/.config/fish/functions/cat.fish
index 434044c..7422ba9 100644
--- a/.config/fish/functions/cat.fish
+++ b/.config/fish/functions/cat.fish
@@ -1,7 +1,7 @@
 function cat --wraps=ccat --description 'alias cat=ccat'
-	if which ccat > /dev/null
-		ccat  $argv;
+  if command -sq ccat
+		ccat $argv;
   else
 	  /usr/bin/cat $argv;
-	end
+  end
 end
diff --git a/.config/fish/functions/ll.fish b/.config/fish/functions/ll.fish
index 321f171..07441c3 100644
--- a/.config/fish/functions/ll.fish
+++ b/.config/fish/functions/ll.fish
@@ -1,5 +1,5 @@
 function ll
-	if which exa > /dev/null
+	if command -sq exa
 		exa -lahg --git -t modified $argv
 	else
 		ls -Al $argv
diff --git a/.config/fish/functions/rm.fish b/.config/fish/functions/rm.fish
index a0fa7bd..e06fa03 100644
--- a/.config/fish/functions/rm.fish
+++ b/.config/fish/functions/rm.fish
@@ -1,6 +1,6 @@
 function rm --wraps=trash --description 'alias rm=trash'
-  if which trash > /dev/null
-	  trash  $argv;
+  if command -sq trash
+	  trash $argv;
   else
 	  /usr/bin/rm $argv;
   end