diff --git a/man/backend-tpm2.h b/man/backend-tpm2.h
index b2d8aa5..f8e0ab0 100644
--- a/man/backend-tpm2.h
+++ b/man/backend-tpm2.h
@@ -2,7 +2,7 @@
 .
 .Sh TPM2 back-end configuration
 .Ss Environment variables
-.Bl -tag -compact -width "TSS2_LOG"
+.Bl -tag -compact -width ".Ev TSS2_LOG"
 .It Ev TSS2_LOG
 Any of:
 .Sy NONE , ERROR , WARNING , INFO , DEBUG , TRACE .
diff --git a/man/common.h b/man/common.h
index c005f38..f0c3a2e 100644
--- a/man/common.h
+++ b/man/common.h
@@ -2,7 +2,7 @@
 .
 .Sh SPECIAL THANKS
 To all who support further development, in particular:
-.Bl -bullet -offset 4n -compact -width 0
+.Bl -bullet -offset 4n -compact -width "@"
 .It
 ThePhD
 .It
diff --git a/man/passphrase.h b/man/passphrase.h
index 4cc3cd6..88c7853 100644
--- a/man/passphrase.h
+++ b/man/passphrase.h
@@ -1,7 +1,7 @@
 .\" SPDX-License-Identifier: MIT
 .
 .Sh ENVIRONMENT VARIABLES
-.Bl -tag -compact -width "TZPFMS"
+.Bl -tag -compact -width 4n
 .It Ev TZPFMS_PASSPHRASE_HELPER
 By default, passphrases are prompted for and read in on the standard output and input streams.
 If
@@ -12,7 +12,7 @@ to provide each passphrase, instead.
 .Pp
 The standard output stream of the helper is tied to an anonymous file and used in its entirety as the passphrase, except for a trailing new-line, if any.
 The arguments are:
-.Bl -tag -compact -offset "@@" -width "@@"
+.Bl -tag -compact -offset 2n -width ".Li $1"
 .It Li $1
 Pre-formatted noun phrase with all the information below, for use as a prompt
 .\" Passphrase for tarta-zoot
diff --git a/man/zfs-tpm-list.8.pp b/man/zfs-tpm-list.8.pp
index 5fdc98a..ee3a0d1 100644
--- a/man/zfs-tpm-list.8.pp
+++ b/man/zfs-tpm-list.8.pp
@@ -17,7 +17,7 @@
 .
 .Sh DESCRIPTION
 Lists the following properties on encryption roots:
-.Bl -tag -compact -offset Ds -width "keystatus"
+.Bl -tag -compact -offset 4n -width ".Li keystatus"
 .It Li name
 .It Li back-end
 the
@@ -55,7 +55,7 @@ If no datasets are specified, all matching encryption roots are listed \(em by d
 .Nm tzpfms .
 .
 .Sh OPTIONS
-.Bl -tag -compact -width "-b back-end"
+.Bl -tag -compact -width ".Fl b Ar back-end"
 .It Fl H
 Scripting mode \(em remove headers and separate fields by a single tab instead of columnating them with spaces.
 .Pp
diff --git a/man/zfs-tpm1x-change-key.8.pp b/man/zfs-tpm1x-change-key.8.pp
index ff0070f..fdab0c2 100644
--- a/man/zfs-tpm1x-change-key.8.pp
+++ b/man/zfs-tpm1x-change-key.8.pp
@@ -89,7 +89,7 @@ and you are hereby asked to report a bug, please.
 can be used to clear the properties and go back to using a passphrase.
 .
 .Sh OPTIONS
-.Bl -tag -compact -width "-b backup-file"
+.Bl -tag -compact -width ".Fl b Ar backup-file"
 .It Fl b Ar backup-file
 Save a back-up of the key to
 .Ar backup-file ,
diff --git a/man/zfs-tpm1x-clear-key.8.pp b/man/zfs-tpm1x-clear-key.8.pp
index 55a6540..1edfce4 100644
--- a/man/zfs-tpm1x-clear-key.8.pp
+++ b/man/zfs-tpm1x-clear-key.8.pp
@@ -18,7 +18,7 @@ was encrypted with
 .Nm tzpfms
 backend
 .Sy TPM1.X :
-.Bl -enum -compact -offset 4n -width ""
+.Bl -enum -compact -offset 2n -width 2n
 .It
 performs the equivalent of
 .Nm zfs Cm change-key Fl o Li keylocation=prompt Fl o Li keyformat=passphrase Ar dataset ,
diff --git a/man/zfs-tpm1x-load-key.8.pp b/man/zfs-tpm1x-load-key.8.pp
index 57402a1..77b0d8e 100644
--- a/man/zfs-tpm1x-load-key.8.pp
+++ b/man/zfs-tpm1x-load-key.8.pp
@@ -30,7 +30,7 @@ See
 for a detailed description.
 .
 .Sh OPTIONS
-.Bl -tag -compact -width "-n"
+.Bl -tag -compact -width ".Fl n"
 .It Fl n
 Do a no-op/dry run, can be used even if the key is already loaded.
 Equivalent to
diff --git a/man/zfs-tpm2-change-key.8.pp b/man/zfs-tpm2-change-key.8.pp
index eb2a205..cce9662 100644
--- a/man/zfs-tpm2-change-key.8.pp
+++ b/man/zfs-tpm2-change-key.8.pp
@@ -11,7 +11,7 @@
 .Nm
 .Op Fl b Ar backup-file
 .Oo
-.Fl P Ar algorithm Ns Cm \&: Ns Ar PCR Ns Oo Ns Cm \&, Ns Ar PCR Oc Ns … Ns Oo Cm + Ns Ar algorithm Ns Cm \&: Ns Ar PCR Ns Oo Ns Cm \&, Ns Ar PCR Oc Ns … Oc Ns …
+.Fl P Ar algorithm Ns Cm \&: Ns Ar PCR Ns Oo Ns Cm \&, Ns Ar PCR Oc Ns … Ns \: Ns Oo Cm + Ns Ar algorithm Ns Cm \&: Ns Ar PCR Ns Oo Ns Cm \&, Ns Ar PCR Oc Ns … Oc Ns …
 .Op Fl A
 .Oc
 .Ar dataset
@@ -53,7 +53,7 @@ The following properties are set on
 .It
 .Li xyz.nabijaczleweli:tzpfms.backend Ns = Ns Sy TPM2
 .It
-.Li xyz.nabijaczleweli:tzpfms.key Ns = Ns Ar persistent-object-ID Ns Op Cm ;\& Ar algorithm Ns Cm \&: Ns Ar PCR Ns Oo Ns Cm \&, Ns Ar PCR Oc Ns … Ns Oo Cm + Ns Ar algorithm Ns Cm \&: Ns Ar PCR Ns Oo Ns Cm \&, Ns Ar PCR Oc Ns … Oc Ns …
+.Li xyz.nabijaczleweli:tzpfms.key Ns = Ns Ar persistent-object-ID Ns \: Ns Op Cm ;\& Ns Ar algorithm Ns Cm \&: Ns Ar PCR Ns Oo Ns Cm \&, Ns Ar PCR Oc Ns … Ns Oo Cm + Ns Ar algorithm Ns Cm \&: Ns Ar PCR Ns Oo Ns Cm \&, Ns Ar PCR Oc Ns … Oc Ns …
 .El
 .Pp
 .Li tzpfms.backend
@@ -96,7 +96,7 @@ and you are hereby asked to report a bug, please.
 can be used to free the TPM persistent object and go back to using a passphrase.
 .
 .Sh OPTIONS
-.Bl -tag -compact -width "-b backup-file"
+.Bl -tag -compact -width ".Fl b Ar backup-file"
 .It Fl b Ar backup-file
 Save a back-up of the key to
 .Ar backup-file ,
diff --git a/man/zfs-tpm2-clear-key.8.pp b/man/zfs-tpm2-clear-key.8.pp
index 5eb4105..39d497f 100644
--- a/man/zfs-tpm2-clear-key.8.pp
+++ b/man/zfs-tpm2-clear-key.8.pp
@@ -18,7 +18,7 @@ was encrypted with
 .Nm tzpfms
 backend
 .Sy TPM2 :
-.Bl -enum -compact -offset 4n -width ""
+.Bl -enum -compact -offset 2n -width 2n
 .It
 performs the equivalent of
 .Nm zfs Cm change-key Fl o Li keylocation=prompt Fl o Li keyformat=passphrase Ar dataset ,
diff --git a/man/zfs-tpm2-load-key.8.pp b/man/zfs-tpm2-load-key.8.pp
index 25bf346..80c5e0e 100644
--- a/man/zfs-tpm2-load-key.8.pp
+++ b/man/zfs-tpm2-load-key.8.pp
@@ -29,7 +29,7 @@ See
 for a detailed description.
 .
 .Sh OPTIONS
-.Bl -tag -compact -width "-n"
+.Bl -tag -compact -width ".Fl n"
 .It Fl n
 Do a no-op/dry run, can be used even if the key is already loaded.
 Equivalent to