diff --git a/.config/fish/completions/to.fish b/.config/fish/completions/to.fish
new file mode 100644
index 00000000..2578f4b9
--- /dev/null
+++ b/.config/fish/completions/to.fish
@@ -0,0 +1 @@
+__to_update_bookmark_completions
diff --git a/.config/fish/conf.d/to.fish b/.config/fish/conf.d/to.fish
new file mode 100644
index 00000000..e569196d
--- /dev/null
+++ b/.config/fish/conf.d/to.fish
@@ -0,0 +1,3 @@
+if test -z "$TO_DIR"
+  set -U TO_DIR ~/.tofish
+end
diff --git a/.config/fish/functions/tup.fish b/.config/fish/functions/tup.fish
new file mode 100644
index 00000000..7199ca56
--- /dev/null
+++ b/.config/fish/functions/tup.fish
@@ -0,0 +1,4 @@
+function tup --wraps=topgrade --description 'alias tup=topgrade'
+  topgrade $argv
+        
+end
diff --git a/.config/fish/functions/up.fish b/.config/fish/functions/up.fish
new file mode 100644
index 00000000..bde8ea59
--- /dev/null
+++ b/.config/fish/functions/up.fish
@@ -0,0 +1,3 @@
+function up --wraps='yay -Syu' --description 'alias up=yay -Syu'
+    yay -Syu $argv
+end
diff --git a/.config/fish/functions/update.fish b/.config/fish/functions/update.fish
deleted file mode 100644
index 65252cf5..00000000
--- a/.config/fish/functions/update.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-function update --wraps='yay -Syu' --description 'alias update=yay -Syu'
-  yay -Syu $argv
-        
-end
diff --git a/.config/fish/functions/yP.fish b/.config/fish/functions/yP.fish
deleted file mode 100644
index b6dbb271..00000000
--- a/.config/fish/functions/yP.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-function yP --wraps='yadm push' --description 'alias yP=yadm push'
-  yadm push $argv
-        
-end
diff --git a/.config/fish/functions/ya.fish b/.config/fish/functions/ya.fish
deleted file mode 100644
index c7747784..00000000
--- a/.config/fish/functions/ya.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-function ya --wraps='yadm add' --description 'alias ya=yadm add'
-  yadm add $argv
-        
-end
diff --git a/.config/topgrade/topgrade.toml b/.config/topgrade/topgrade.toml
index ff0b9cde..b26cdd06 100644
--- a/.config/topgrade/topgrade.toml
+++ b/.config/topgrade/topgrade.toml
@@ -18,7 +18,7 @@ pre_sudo = true
 disable = ["shell", "spicetify", "vim"]
 
 # Ignore failures for these steps
-ignore_failures = ["oh-my-zsh"]
+# ignore_failures = []
 
 # List of remote machines with Topgrade installed on them
 # remote_topgrades = ["toothless", "pi", "parnas"]