diff --git a/plugins/npm/_npm b/plugins/npm/_npm
index f5c00ec77..d6ff2a013 100644
--- a/plugins/npm/_npm
+++ b/plugins/npm/_npm
@@ -5,52 +5,48 @@
 
 local -a _1st_arguments
 _1st_arguments=(
-  'activate:'
-  'adduser:'
-  'bn:'
-  'bundle:'
-  'c:'
-  'cache:'
-  'config:'
-  'deactivate:'
-  'deprecate:'
-  'docs:'
-  'edit:'
-  'explore:'
-  'faq:'
-  'find:'
-  'get:'
-  'help:'
-  'i:'
-  'info:'
-  'init:'
-  'install:'
-  'link:'
-  'list:'
-  'ln:'
-  'ls:'
-  'outdated:'
-  'owner:'
-  'publish:'
-  'r:'
-  'rb:'
-  'rebuild:'
-  'rm:'
-  'run-script:'
-  'search:'
-  'set:'
-  'start:'
-  'stop:'
-  'tag:'
-  'test:'
-  'un:'
-  'uninstall:'
-  'unpublish:'
-  'up:'
-  'update:'
-  'version:'
-  'view:'
-  'xmas:'
+  'activate:Activate an installed version of a package'
+  'adduser:Add a registry user account'
+  'bundle:Bundle package dependencies'
+  'bn:Bundle package dependencies'
+  'c:Mange the npm configuration file'
+  'cache:Work with npm cache'
+  'config:Manage the npm configuration file'
+  'deactivate:Deactivate the active version of a package'
+  'deprecate:Deprecate a version of a package'
+  'docs:Docs for a package in a web browser (experimental)'
+  'edit:Edit an installed package'
+  'explore:Browse an installed package'
+  'faq:Frequently Asked Questions'
+  'find:List installed packages'
+  'get:Manage the npm configuration file'
+  'help:Provides help'
+  'i:Install a package'
+  'init:Interactively create a package.json file'
+  'install:Install a package'
+  'link:Symlink a package folder'
+  'ln:Symlink a package folder'
+  'ls:List packages that are either installed or in the registry'
+  'outdated:Check for outdated packages'
+  'owner:Manage package owners'
+  'publish:Publish a package'
+  'r:Remove a package'
+  'rb:Rebuild a package'
+  'rebuild:Rebuild a package'
+  'rm:Remove a package'
+  'run-script:Run arbitrary package scripts'
+  'set:Manage the npm configuration file'
+  'start:Start a package'
+  'stop:Stop a package'
+  'tag:Tag a published version'
+  'test:Test a package'
+  'un:Remove a package'
+  'uninstall:Remove a package'
+  'unpublish:Remove a package from the registry'
+  'up:Update a package'
+  'update:Update a package'
+  'version:Bump a package version'
+  'view:View package registry info'
 )
 
 local expl