diff --git a/man/mu-add.1.org b/man/mu-add.1.org
index f2b644cb..1e099d37 100644
--- a/man/mu-add.1.org
+++ b/man/mu-add.1.org
@@ -7,7 +7,7 @@ mu-add - add one or more messages to the database
 
 * SYNOPSIS
 
-*mu [common-options] add [options] <file> [<files>]*
+*mu* [​_COMMON-OPTIONS_​] *add* [​_OPTIONS_​] _FILE_...
 
 * DESCRIPTION
 
diff --git a/man/mu-cfind.1.org b/man/mu-cfind.1.org
index 0c14dc6b..1db984bd 100644
--- a/man/mu-cfind.1.org
+++ b/man/mu-cfind.1.org
@@ -8,7 +8,7 @@ for use in other programs.
 
 * SYNOPSIS
 
-*mu [common-options] cfind [options] [<pattern>]*
+*mu* [​_COMMON-OPTIONS_​] *cfind* [​_OPTIONS_​] [​_PATTERN_​]
 
 * DESCRIPTION
 
diff --git a/man/mu-extract.1.org b/man/mu-extract.1.org
index 596a6637..c80ae535 100644
--- a/man/mu-extract.1.org
+++ b/man/mu-extract.1.org
@@ -8,9 +8,9 @@ mu-extract - display and save message parts
 
 * SYNOPSIS
 
-*mu [common-options] extract [options] [<file>]*
+*mu* [​_COMMON-OPTIONS_​] *extract* [​_OPTIONS_​] [​_FILE_​]
 
-*mu [common-options] extract [options] <file> <pattern>*
+*mu* [​_COMMON-OPTIONS_​] *extract* [​_OPTIONS_​] _FILE_ _PATTERN_
 
 * DESCRIPTION
 
diff --git a/man/mu-find.1.org b/man/mu-find.1.org
index a8fc9fee..ec171419 100644
--- a/man/mu-find.1.org
+++ b/man/mu-find.1.org
@@ -7,7 +7,7 @@ mu-find - find e-mail messages in the *mu* database.
 
 * SYNOPSIS
 
-*mu [common-options] find [options] <search expression>*
+*mu* [​_COMMON-OPTIONS_​] *find* [​_OPTIONS_​] _SEARCH_EXPRESSION_
 
 * DESCRIPTION
 
diff --git a/man/mu-help.1.org b/man/mu-help.1.org
index 2a67dc2e..0b5e7196 100644
--- a/man/mu-help.1.org
+++ b/man/mu-help.1.org
@@ -7,7 +7,7 @@ mu-help - show help information about mu commands.
 
 * SYNOPSIS
 
-*mu [common-options] help [<command>]*
+*mu* [​_COMMON-OPTIONS_​] *help* [​_COMMAND_​]
 
 * DESCRIPTION
 
diff --git a/man/mu-index.1.org b/man/mu-index.1.org
index 80452e07..026607b5 100644
--- a/man/mu-index.1.org
+++ b/man/mu-index.1.org
@@ -7,7 +7,7 @@ mu-index - index e-mail messages stored in Maildirs
 
 * SYNOPSIS
 
-*mu [common-options] index*
+*mu* [​_COMMON-OPTIONS_​] *index*
 
 * DESCRIPTION
 
diff --git a/man/mu-info.1.org b/man/mu-info.1.org
index 0d182d7c..3879f226 100644
--- a/man/mu-info.1.org
+++ b/man/mu-info.1.org
@@ -7,7 +7,7 @@ mu-info  - show information
 
 * SYNOPSIS
 
-*mu [common options] info [<topic>]*
+*mu* [​_COMMON OPTIONS_​] *info* [​_TOPIC_​]
 
 * DESCRIPTION
 
diff --git a/man/mu-init.1.org b/man/mu-init.1.org
index 6c3d4c94..2c8fefb8 100644
--- a/man/mu-init.1.org
+++ b/man/mu-init.1.org
@@ -7,7 +7,7 @@ mu-init - initialize the mu message database
 
 * SYNOPSIS
 
-*mu [common-options] init [options]*
+*mu* [​_COMMON-OPTIONS_​] *init* [​_OPTIONS_​]
 
 * DESCRIPTION
 
diff --git a/man/mu-mkdir.1.org b/man/mu-mkdir.1.org
index f10a7149..61975913 100644
--- a/man/mu-mkdir.1.org
+++ b/man/mu-mkdir.1.org
@@ -7,7 +7,7 @@ mu-mkdir - create a new Maildir
 
 * SYNOPSIS
 
-*mu [common-options] mkdir [options] <dir> [<dirs>]*
+*mu* [​_COMMON-OPTIONS_​] *mkdir* [​_OPTIONS_​] _DIR_...
 
 * DESCRIPTION
 
diff --git a/man/mu-move.1.org b/man/mu-move.1.org
index d43a3faa..f8132e70 100644
--- a/man/mu-move.1.org
+++ b/man/mu-move.1.org
@@ -7,7 +7,7 @@ mu-move - move a message file or change its flags
 
 * SYNOPSIS
 
-*mu [common-options] move [options] <src> [--flags=<flags>] [<target>]*
+*mu* [​_COMMON-OPTIONS_​] *move* [​_OPTIONS_​] _SRC_ [--flags=​_FLAGS_​] [​_TARGET_​]
 
 * DESCRIPTION
 
diff --git a/man/mu-remove.1.org b/man/mu-remove.1.org
index ff2c24c0..070e1cb0 100644
--- a/man/mu-remove.1.org
+++ b/man/mu-remove.1.org
@@ -7,7 +7,7 @@ mu-remove - remove messages from the database.
 
 * SYNOPSIS
 
-*mu [common-options] remove [options] <file> [<files>]*
+*mu* [​_COMMON-OPTIONS_​] *remove* [​_OPTIONS_​] _FILE_...
 
 * DESCRIPTION
 
diff --git a/man/mu-server.1.org b/man/mu-server.1.org
index 18148605..c0c8186f 100644
--- a/man/mu-server.1.org
+++ b/man/mu-server.1.org
@@ -7,7 +7,7 @@ mu-server - the mu backend for the mu4e e-mail client
 
 * SYNOPSIS
 
-mu [common-options] server
+*mu* [​_COMMON-OPTIONS_​] *server*
 
 * DESCRIPTION
 
diff --git a/man/mu-verify.1.org b/man/mu-verify.1.org
index 9cc0933d..c9bd0aaa 100644
--- a/man/mu-verify.1.org
+++ b/man/mu-verify.1.org
@@ -7,7 +7,7 @@ mu-verify - verify message signatures and display information about them
 
 * SYNOPSIS
 
-*mu [common-options] verify [options] [<file> ... ]*
+*mu* [​_COMMON-OPTIONS_​] *verify* [​_OPTIONS_​] [​_FILE_...]
 
 * DESCRIPTION
 
diff --git a/man/mu-view.1.org b/man/mu-view.1.org
index 17351f74..bec868b8 100644
--- a/man/mu-view.1.org
+++ b/man/mu-view.1.org
@@ -7,7 +7,7 @@ mu-view - display an e-mail message file
 
 * SYNOPSIS
 
-mu [common options] view [options] [<file> ...]
+*mu* [​_COMMON OPTIONS_​] *view* [​_OPTIONS_​] [​_FILE_...]
 
 * DESCRIPTION
 
diff --git a/man/mu.1.org b/man/mu.1.org
index d3f0335b..e1cb73d9 100644
--- a/man/mu.1.org
+++ b/man/mu.1.org
@@ -8,7 +8,7 @@ index and search e-mail messages.
 
 * SYNOPSIS
 
-~mu~ [COMMON-OPTIONS] [[COMMAND] [COMMAND-OPTIONS]]
+*mu* [​_COMMON-OPTIONS_​] [[​_COMMAND_​] [​_COMMAND-OPTIONS_​]]
 
 For information about the common options, see *COMMON OPTIONS*.