diff --git a/scripts/cheat-autocompletion.fish b/scripts/cheat-autocompletion.fish
index 10d7293..84faa6d 100755
--- a/scripts/cheat-autocompletion.fish
+++ b/scripts/cheat-autocompletion.fish
@@ -7,5 +7,7 @@ complete -c cheat -s l -l list -d "List cheatsheets"
 complete -c cheat -s p -l path -x -a "(cheat -d | cut -d ':' -f 1)" -d "Return only sheets found on given path"
 complete -c cheat -s r -l regex -d "Treat search phrase as a regex"
 complete -c cheat -s s -l search -x -d "Search cheatsheets for given phrase"
-complete -c cheat -s t -l tag -x -a "(cheat -l | tail -n +2 | rev | cut -d ' ' -f 1 | rev | sed 's/,/\n/g;/^\$/d' | sort -u)" -d "Return only sheets matching the given tag"
+complete -c cheat -s t -l tag -x -a "(cheat -T)" -d "Return only sheets matching the given tag"
+complete -c cheat -s T -l tags -d "List all tags in use"
 complete -c cheat -s v -l version -d "Print the version number"
+complete -c cheat -l rm -x -a "(cheat -l | tail -n +2 | cut -d ' ' -f 1)" -d "Remove (delete) cheatsheet"