diff --git a/pkg/omf/completions/omf.fish b/pkg/omf/completions/omf.fish
index cddde19..cd3b5d9 100644
--- a/pkg/omf/completions/omf.fish
+++ b/pkg/omf/completions/omf.fish
@@ -3,13 +3,12 @@
 
 complete -c omf -f -d "Oh My Fish"
 
-complete -c omf -f -n "__fish_seen_subcommand_from q query"         -a (printf "%s " (set | awk '{ printf $1"\n"; }'))
 complete -c omf -f -n "__fish_seen_subcommand_from r rm remove"     -a (printf "%s " (omf.list_local_packages) (omf.list_installed_themes))
 complete -c omf -f -n "__fish_seen_subcommand_from d desc describe" -a (printf "%s " (omf.list_db_packages))
 complete -c omf -f -n "__fish_seen_subcommand_from c cd"            -a (printf "%s " (omf.list_db_packages))
 complete -c omf -f -n "__fish_seen_subcommand_from i install"       -a (printf "%s " (omf.list_db_packages "skip installed packages"))
 complete -c omf -f -n "__fish_seen_subcommand_from t theme"         -a (printf "%s " (omf.list_themes))
-complete -c omf -f -n "__fish_seen_subcommand_from help"            -a "install theme remove update list describe cd new submit query destroy"
+complete -c omf -f -n "__fish_seen_subcommand_from help"            -a "install theme remove update list describe cd new submit destroy doctor"
 
 complete -c omf -f -a list     -n "__fish_use_subcommand" -d "List local packages"
 complete -c omf -f -a describe -n "__fish_use_subcommand" -d "Get information about what packages do"
@@ -20,7 +19,6 @@ complete -c omf -f -a update   -n "__fish_use_subcommand" -d "Update Oh My Fish"
 complete -c omf -f -a cd       -n "__fish_use_subcommand" -d "Change directory to plugin/theme directory"
 complete -c omf -f -a new      -n "__fish_use_subcommand" -d "Create a new package from a template"
 complete -c omf -f -a submit   -n "__fish_use_subcommand" -d "Submit a package to the registry"
-complete -c omf -f -a query    -n "__fish_use_subcommand" -d "Query environment variables"
 complete -c omf -f -a help     -n "__fish_use_subcommand" -d "Display this help"
-complete -c omf -f -a version  -n "__fish_use_subcommand" -d "Display version"
 complete -c omf -f -a destroy  -n "__fish_use_subcommand" -d "Remove Oh My Fish"
+complete -c omf -f -a doctor   -n "__fish_use_subcommand" -d "Troubleshoot Oh My Fish"