diff --git a/README.md b/README.md
index 36a2d80b..100eba83 100644
--- a/README.md
+++ b/README.md
@@ -630,7 +630,7 @@ Usage: osxphotos export [OPTIONS] [PHOTOS_LIBRARY]... DEST
   modify this behavior.
 
 Options:
-  --db <Photos database path>     Specify Photos database path. Path to Photos
+  --db PHOTOS_LIBRARY_PATH        Specify Photos database path. Path to Photos
                                   library/database can be specified using either
                                   --db or directly as PHOTOS_LIBRARY positional
                                   argument. If neither --db or PHOTOS_LIBRARY
@@ -1138,8 +1138,7 @@ Options:
                                   iTerm2 (use with Terminal.app). This is faster
                                   and more reliable than the default AppleScript
                                   interface.
-  --report <path to export report>
-                                  Write a CSV formatted report of all files that
+  --report REPORT_FILE            Write a CSV formatted report of all files that
                                   were exported.
   --cleanup                       Cleanup export directory by deleting any files
                                   which were not included in this export set.
@@ -1229,8 +1228,7 @@ Options:
                                   not the system volume, osxphotos may run
                                   faster if you specify a temporary directory on
                                   the same volume as the Photos library.
-  --load-config <config file path>
-                                  Load options from file as written with --save-
+  --load-config CONFIG_FILE       Load options from file as written with --save-
                                   config. This allows you to save a complex
                                   export command to file for later reuse. For
                                   example: 'osxphotos export <lots of options
@@ -1240,8 +1238,7 @@ Options:
                                   line options are used in conjunction with
                                   --load-config, they will override the
                                   corresponding values in the config file.
-  --save-config <config file path>
-                                  Save options to file for use with --load-
+  --save-config CONFIG_FILE       Save options to file for use with --load-
                                   config. File format is TOML. See also
                                   --config-only.
   --config-only                   If specified, saves the config file but does
diff --git a/osxphotos/cli/common.py b/osxphotos/cli/common.py
index 2f4bff17..6cc59c12 100644
--- a/osxphotos/cli/common.py
+++ b/osxphotos/cli/common.py
@@ -92,7 +92,7 @@ VERSION_CHECK_OPTION = click.option("--no-version-check", required=False, is_fla
 DB_OPTION = click.option(
     "--db",
     required=False,
-    metavar="<Photos database path>",
+    metavar="PHOTOS_LIBRARY_PATH",
     default=None,
     help=(
         "Specify Photos database path. "
diff --git a/osxphotos/cli/export.py b/osxphotos/cli/export.py
index ac059ff9..eeef3c5f 100644
--- a/osxphotos/cli/export.py
+++ b/osxphotos/cli/export.py
@@ -505,7 +505,7 @@ from .verbose import get_verbose_console, time_stamp, verbose_print
 )
 @click.option(
     "--report",
-    metavar="<path to export report>",
+    metavar="REPORT_FILE",
     help="Write a CSV formatted report of all files that were exported.",
     type=click.Path(),
 )
@@ -600,7 +600,7 @@ from .verbose import get_verbose_console, time_stamp, verbose_print
 @click.option(
     "--load-config",
     required=False,
-    metavar="<config file path>",
+    metavar="CONFIG_FILE",
     default=None,
     help=(
         "Load options from file as written with --save-config. "
@@ -615,7 +615,7 @@ from .verbose import get_verbose_console, time_stamp, verbose_print
 @click.option(
     "--save-config",
     required=False,
-    metavar="<config file path>",
+    metavar="CONFIG_FILE",
     default=None,
     help="Save options to file for use with --load-config. File format is TOML. "
     "See also --config-only.",
diff --git a/osxphotos/docs/docs.zip b/osxphotos/docs/docs.zip
index 3ab5f734..36dc8fc2 100644
Binary files a/osxphotos/docs/docs.zip and b/osxphotos/docs/docs.zip differ