diff --git a/tldr/gdm-binary b/tldr/gdm-binary
new file mode 100644
index 00000000..1aeef47e
--- /dev/null
+++ b/tldr/gdm-binary
@@ -0,0 +1,12 @@
+---
+syntax: markdown
+tags: [tldr, common]
+source: https://github.com/tldr-pages/tldr.git
+---
+# gdm-binary
+
+> This command is an alias of `gdm`.
+
+- View documentation for the original command:
+
+`tldr gdm`
diff --git a/tldr/gdm-restart b/tldr/gdm-restart
new file mode 100644
index 00000000..1dcdb1c8
--- /dev/null
+++ b/tldr/gdm-restart
@@ -0,0 +1,14 @@
+---
+syntax: markdown
+tags: [tldr, common]
+source: https://github.com/tldr-pages/tldr.git
+---
+# gdm-restart
+
+> Restart the GNOME Display Manager (GDM) daemon.
+> See also: `gdm`, `gdm-binary`, `gdmsetup`, `gdm-stop`, `gdm-safe-restart`.
+> More information: <https://manned.org/gdm>.
+
+- Restart the GNOME Display Manager application:
+
+`gdm-restart`
diff --git a/tldr/gdm-safe-restart b/tldr/gdm-safe-restart
new file mode 100644
index 00000000..6f47c200
--- /dev/null
+++ b/tldr/gdm-safe-restart
@@ -0,0 +1,14 @@
+---
+syntax: markdown
+tags: [tldr, common]
+source: https://github.com/tldr-pages/tldr.git
+---
+# gdm-safe-restart
+
+> Restart the GNOME Display Manager (GDM) only when all users have logged out.
+> See also: `gdm`, `gdm-binary`, `gdmsetup`, `gdm-stop`, `gdm-restart`.
+> More information: <https://manned.org/gdm>.
+
+- Restart the GNOME Display Manager application when all users have logged out:
+
+`gdm-safe-restart`
diff --git a/tldr/gdm-stop b/tldr/gdm-stop
new file mode 100644
index 00000000..9afb1a5c
--- /dev/null
+++ b/tldr/gdm-stop
@@ -0,0 +1,14 @@
+---
+syntax: markdown
+tags: [tldr, common]
+source: https://github.com/tldr-pages/tldr.git
+---
+# gdm-stop
+
+> Immediately stop running the GNOME Display Manager (GDM).
+> See also: `gdm`, `gdm-binary`, `gdmsetup`, `gdm-restart`, `gdm-safe-restart`.
+> More information: <https://manned.org/gdm>.
+
+- Stop the GNOME Display Manager application:
+
+`gdm-stop`
diff --git a/tldr/gdmsetup b/tldr/gdmsetup
new file mode 100644
index 00000000..9bc8995b
--- /dev/null
+++ b/tldr/gdmsetup
@@ -0,0 +1,15 @@
+---
+syntax: markdown
+tags: [tldr, common]
+source: https://github.com/tldr-pages/tldr.git
+---
+# gdmsetup
+
+> Launch a GUI for configuring the GNOME Display Manager (GDM).
+> Results in edited files in either `/etc/X11/gdm/gdm.conf` or `/etc/gdm/gdm.conf` depending on distribution and environment.
+> See also: `gdm`, `gdm-binary`, `gdm-stop`, `gdm-restart`, `gdm-safe-restart`.
+> More information: <https://manned.org/gdm>.
+
+- Run the GNOME Display Manager GUI configuration application:
+
+`gdmsetup`
diff --git a/tldr/gh-extension b/tldr/gh-extension
index db7d9814..bf1025f5 100644
--- a/tldr/gh-extension
+++ b/tldr/gh-extension
@@ -10,32 +10,32 @@ source: https://github.com/tldr-pages/tldr.git
 
 - Initialize a new GitHub CLI extension project in a directory of the same name:
 
-`gh extension create {{extension_name}}`
+`gh {{[ext|extension]}} create {{extension_name}}`
 
 - Install an extension from a GitHub repository:
 
-`gh extension install {{owner}}/{{repository}}`
+`gh {{[ext|extension]}} install {{owner}}/{{repository}}`
 
 - List installed extensions:
 
-`gh extension list`
+`gh {{[ext|extension]}} list`
 
 - Upgrade a specific extension:
 
-`gh extension upgrade {{extension_name}}`
+`gh {{[ext|extension]}} upgrade {{extension_name}}`
 
 - Upgrade all extensions:
 
-`gh extension upgrade --all`
+`gh {{[ext|extension]}} upgrade --all`
 
 - List installed extensions:
 
-`gh extension list`
+`gh {{[ext|extension]}} list`
 
 - Remove an extension:
 
-`gh extension remove {{extension_name}}`
+`gh {{[ext|extension]}} remove {{extension_name}}`
 
 - Display help about a subcommand:
 
-`gh extension {{subcommand}} --help`
+`gh {{[ext|extension]}} {{subcommand}} --help`
diff --git a/tldr/gron b/tldr/gron
new file mode 100644
index 00000000..94703e77
--- /dev/null
+++ b/tldr/gron
@@ -0,0 +1,37 @@
+---
+syntax: markdown
+tags: [tldr, common]
+source: https://github.com/tldr-pages/tldr.git
+---
+# gron
+
+> Transform `JSON` into individual assignments for easier management.
+> More information: <https://manned.org/gron>.
+
+- Process `JSON` file into individual assignments:
+
+`gron {{path/to/file|url}}`
+
+- Don't sort output data:
+
+`gron --no-sort {{path/to/file|url}}`
+
+- Disable certificate validation:
+
+`gron {{[-k|--insecure]}} {{url}}`
+
+- Display values of `gron` assignments:
+
+`gron {{[-v|--values]}} {{path/to/file|url}}`
+
+- Turn assignments converted with `gron` back into `JSON`:
+
+`gron {{[-u|--ungron]}} {{path/to/file|url}}`
+
+- Process individual lines of input as separate `JSON` objects:
+
+`gron {{[-s|--stream]}} {{path/to/file|url}}`
+
+- Represent processed data as a `JSON` stream:
+
+`gron {{[-j|--json]}} {{path/to/file|url}}`
diff --git a/tldr/gst-discoverer-1.0 b/tldr/gst-discoverer-1.0
index 1c683dad..b6c10c69 100644
--- a/tldr/gst-discoverer-1.0
+++ b/tldr/gst-discoverer-1.0
@@ -6,7 +6,7 @@ source: https://github.com/tldr-pages/tldr.git
 # gst-discoverer-1.0
 
 > Display file metadata and stream information.
-> More information: <https://manned.org/man/gst-discoverer-1.0.1>.
+> More information: <https://manned.org/gst-discoverer-1.0.1>.
 
 - Print file metadata:
 
diff --git a/tldr/hledger b/tldr/hledger
index f36ff830..23b95dea 100644
--- a/tldr/hledger
+++ b/tldr/hledger
@@ -39,4 +39,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - Show the amount spent on food from the `assets:cash` account:
 
-`hledger print assets:cash | hledger {{-f|--file}} - {{[-I|--ignore-assertions]}} aregister expenses:food`
+`hledger print assets:cash | hledger {{[-f|--file]}} - {{[-I|--ignore-assertions]}} aregister expenses:food`
diff --git a/tldr/info b/tldr/info
index 3314c4bb..bfa7da90 100644
--- a/tldr/info
+++ b/tldr/info
@@ -6,7 +6,7 @@ source: https://github.com/tldr-pages/tldr.git
 # info
 
 > Read documentation stored in the info format.
-> More information: <https://manned.org/man/info>.
+> More information: <https://manned.org/info>.
 
 - Start reading top-level directory menu:
 
diff --git a/tldr/jj b/tldr/jj
index eef84ef4..28d48901 100644
--- a/tldr/jj
+++ b/tldr/jj
@@ -11,7 +11,7 @@ source: https://github.com/tldr-pages/tldr.git
 
 - Update description of the revisions specified by given revsets (e.g. `B::D`, `A..D`, `B|C|D`, etc.):
 
-`jj describe {{[-r|--revision]}} {{revsets}}`
+`jj {{[desc|describe]}} {{[-r|--revision]}} {{revsets}}`
 
 - Create a new commit/revision on top of a given revision :
 
diff --git a/tldr/jj-bookmark b/tldr/jj-bookmark
index d0a1bf8c..deadf4dd 100644
--- a/tldr/jj-bookmark
+++ b/tldr/jj-bookmark
@@ -11,24 +11,24 @@ source: https://github.com/tldr-pages/tldr.git
 
 - Create a new bookmark at the given revision:
 
-`jj bookmark create {{[-r|--revision]}} {{revision}} {{name}}`
+`jj {{[b|bookmark]}} {{[c|create]}} {{[-r|--revision]}} {{revision}} {{name}}`
 
 - List all existing bookmarks and their targets:
 
-`jj bookmark list`
+`jj {{[b|bookmark]}} {{[l|list]}}`
 
 - Move an existing bookmark to another revision:
 
-`jj bookmark move {{[-t|--to]}} {{revision}} {{name}}`
+`jj {{[b|bookmark]}} {{[m|move]}} {{[-t|--to]}} {{revision}} {{name}}`
 
 - Track given remote bookmarks:
 
-`jj bookmark track {{name}}@{{remote}}`
+`jj {{[b|bookmark]}} {{[t|track]}} {{name}}@{{remote}}`
 
 - Delete a bookmark, and propagate the deletion to remotes on the next push:
 
-`jj bookmark delete {{name}}`
+`jj {{[b|bookmark]}} {{[d|delete]}} {{name}}`
 
 - Forget a bookmark locally, without marking its deletion to be pushed:
 
-`jj bookmark forget {{name}}`
+`jj {{[b|bookmark]}} {{[f|forget]}} {{name}}`
diff --git a/tldr/jj-parallelize b/tldr/jj-parallelize
new file mode 100644
index 00000000..5996a38d
--- /dev/null
+++ b/tldr/jj-parallelize
@@ -0,0 +1,13 @@
+---
+syntax: markdown
+tags: [tldr, common]
+source: https://github.com/tldr-pages/tldr.git
+---
+# jj parallelize
+
+> Parallelize revisions by making them siblings.
+> More information: <https://jj-vcs.github.io/jj/latest/cli-reference/#jj-parallelize>.
+
+- Parallelize given revisions:
+
+`jj parallelize {{revsets}}`
diff --git a/tldr/jj-rebase b/tldr/jj-rebase
new file mode 100644
index 00000000..7f8cba21
--- /dev/null
+++ b/tldr/jj-rebase
@@ -0,0 +1,25 @@
+---
+syntax: markdown
+tags: [tldr, common]
+source: https://github.com/tldr-pages/tldr.git
+---
+# jj rebase
+
+> Move revisions to different parent(s).
+> More information: <https://jj-vcs.github.io/jj/latest/cli-reference/#jj-rebase>.
+
+- Move given revisions to a different parent(s):
+
+`jj rebase {{[-r|--revisions]}} {{revset}} {{[-d|--destination]}} {{revset}}`
+
+- Move given revisions and all their descendants:
+
+`jj rebase {{[-s|--source]}} {{revset}} {{[-d|--destination]}} {{revset}}`
+
+- Move all revisions in the branch containing given revisions:
+
+`jj rebase {{[-b|--branch]}} {{revset}} {{[-d|--destination]}} {{revset}}`
+
+- Move revisions to before and/or after other revisions:
+
+`jj rebase {{[-r|--revisions]}} {{revset}} {{[-B|--insert-before]}} {{revset}} {{[-A|--insert-after]}} {{revset}}`
diff --git a/tldr/jj-resolve b/tldr/jj-resolve
new file mode 100644
index 00000000..8d70e2ed
--- /dev/null
+++ b/tldr/jj-resolve
@@ -0,0 +1,33 @@
+---
+syntax: markdown
+tags: [tldr, common]
+source: https://github.com/tldr-pages/tldr.git
+---
+# jj resolve
+
+> Resolve conflicted files with an external merge tool.
+> More information: <https://jj-vcs.github.io/jj/latest/cli-reference/#jj-resolve>.
+
+- Resolve all conflicts:
+
+`jj resolve`
+
+- List all conflicts:
+
+`jj resolve {{[-l|--list]}}`
+
+- Resolve conflicts in a given revision:
+
+`jj resolve {{[-r|--revision]}} {{revset}}`
+
+- Resolve conflicts in given files:
+
+`jj resolve {{file1 file2 ...}}`
+
+- Resolve accepting the incoming versions:
+
+`jj resolve --tool :theirs`
+
+- Resolve accepting the outgoing versions:
+
+`jj resolve --tool :ours`
diff --git a/tldr/jj-split b/tldr/jj-split
new file mode 100644
index 00000000..55050acf
--- /dev/null
+++ b/tldr/jj-split
@@ -0,0 +1,29 @@
+---
+syntax: markdown
+tags: [tldr, common]
+source: https://github.com/tldr-pages/tldr.git
+---
+# jj split
+
+> Split a revision in two.
+> More information: <https://jj-vcs.github.io/jj/latest/cli-reference/#jj-split>.
+
+- Split the given revision into two interactively, putting the second revision on top of it:
+
+`jj split {{[-r|--revision]}} {{revision}}`
+
+- Split out matching files from the given revision:
+
+`jj split {{[-r|--revision]}} {{revision}} {{fileset}}`
+
+- Split the given revision, putting the second revision on top of given destination(s):
+
+`jj split {{[-r|--revision]}} {{revision}} {{[-d|--destination]}} {{revset}}`
+
+- Split the given revision, putting the second revision before and/or after other revision(s):
+
+`jj split {{[-r|--revision]}} {{revision}} {{[-B|--insert-before]}} {{revset}} {{[-A|--insert-after]}} {{revset}}`
+
+- Split the given revision into two parallel revisions:
+
+`jj split {{[-r|--revision]}} {{revision}} {{[-p|--parallel]}}`
diff --git a/tldr/jj-status b/tldr/jj-status
index ddaf1ed3..67191583 100644
--- a/tldr/jj-status
+++ b/tldr/jj-status
@@ -11,4 +11,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - Show high-level status of the repository:
 
-`jj status`
+`jj {{[st|status]}}`
diff --git a/tldr/linux/alsamixer b/tldr/linux/alsamixer
index e2b7669d..f9e0ab76 100644
--- a/tldr/linux/alsamixer
+++ b/tldr/linux/alsamixer
@@ -6,7 +6,7 @@ source: https://github.com/tldr-pages/tldr.git
 # alsamixer
 
 > Graphical mixer for ALSA soundcard driver.
-> More information: <https://manned.org/man/alsamixer>.
+> More information: <https://manned.org/alsamixer>.
 
 - Select the soundcard to use:
 
diff --git a/tldr/linux/cpuid b/tldr/linux/cpuid
index 889d4ac2..cb9c16a1 100644
--- a/tldr/linux/cpuid
+++ b/tldr/linux/cpuid
@@ -6,7 +6,7 @@ source: https://github.com/tldr-pages/tldr.git
 # cpuid
 
 > Display detailed information about all CPUs.
-> More information: <https://manned.org/man/cpuid.1>.
+> More information: <https://manned.org/cpuid.1>.
 
 - Display information for all CPUs:
 
diff --git a/tldr/linux/dnf b/tldr/linux/dnf
index 7f8d8fdc..9ad3cc3d 100644
--- a/tldr/linux/dnf
+++ b/tldr/linux/dnf
@@ -12,32 +12,32 @@ source: https://github.com/tldr-pages/tldr.git
 
 - Upgrade installed packages to the newest available versions:
 
-`sudo dnf upgrade`
+`sudo dnf {{[up|upgrade]}}`
 
 - Search packages via keywords:
 
-`dnf search {{keyword1 keyword2 ...}}`
+`dnf {{[se|search]}} {{keyword1 keyword2 ...}}`
 
 - Display details about a package:
 
-`dnf info {{package}}`
+`dnf {{[if|info]}} {{package}}`
 
-- Install a new package (use `-y` to confirm all prompts automatically):
+- Install a new package (use `--assumeyes` to confirm all prompts automatically):
 
-`sudo dnf install {{package1 package2 ...}}`
+`sudo dnf {{[in|install]}} {{package1 package2 ...}}`
 
 - Remove a package:
 
-`sudo dnf remove {{package1 package2 ...}}`
+`sudo dnf {{[rm|remove]}} {{package1 package2 ...}}`
 
 - List installed packages:
 
-`dnf list --installed`
+`dnf {{[ls|list]}} --installed`
 
 - Find which packages provide a given command:
 
-`dnf provides {{command}}`
+`dnf {{[wp|provides]}} {{command}}`
 
 - View all past operations:
 
-`dnf history`
+`dnf {{[hist|history]}}`
diff --git a/tldr/linux/dnf-config-manager b/tldr/linux/dnf-config-manager
index f289bc30..e14d96b8 100644
--- a/tldr/linux/dnf-config-manager
+++ b/tldr/linux/dnf-config-manager
@@ -6,7 +6,7 @@ source: https://github.com/tldr-pages/tldr.git
 # dnf config-manager
 
 > Manage DNF configuration options and repositories on Fedora-based systems.
-> More information: <https://manned.org/dnf-config-manager>.
+> More information: <https://dnf-plugins-core.readthedocs.io/en/latest/config_manager.html>.
 
 - Add (and enable) a repository from a URL:
 
diff --git a/tldr/linux/dnf-deplist b/tldr/linux/dnf-deplist
new file mode 100644
index 00000000..b1c15695
--- /dev/null
+++ b/tldr/linux/dnf-deplist
@@ -0,0 +1,12 @@
+---
+syntax: markdown
+tags: [tldr, linux]
+source: https://github.com/tldr-pages/tldr.git
+---
+# dnf deplist
+
+> This command is an alias of `dnf repoquery --deplist`.
+
+- View documentation for the original command:
+
+`tldr dnf repoquery`
diff --git a/tldr/linux/dnf-group b/tldr/linux/dnf-group
index 983b6bab..01c8328f 100644
--- a/tldr/linux/dnf-group
+++ b/tldr/linux/dnf-group
@@ -6,24 +6,24 @@ source: https://github.com/tldr-pages/tldr.git
 # dnf group
 
 > Manage virtual collections of packages on Fedora-based systems.
-> More information: <https://manned.org/dnf-group>.
+> More information: <https://dnf.readthedocs.io/en/latest/command_ref.html#group-command>.
 
 - List DNF groups, showing installed and uninstalled status in a table:
 
-`dnf group list`
+`dnf {{[grp|group]}} list`
 
 - Show DNF group info, including repository and optional packages:
 
-`dnf group info {{group_name}}`
+`dnf {{[grp|group]}} info {{group_name}}`
 
 - Install DNF group:
 
-`dnf group install {{group_name}}`
+`dnf {{[grp|group]}} install {{group_name}}`
 
 - Remove DNF group:
 
-`dnf group remove {{group_name}}`
+`dnf {{[grp|group]}} remove {{group_name}}`
 
 - Upgrade DNF group:
 
-`dnf group upgrade {{group_name}}`
+`dnf {{[grp|group]}} upgrade {{group_name}}`
diff --git a/tldr/linux/dnf-repoquery b/tldr/linux/dnf-repoquery
new file mode 100644
index 00000000..b174752f
--- /dev/null
+++ b/tldr/linux/dnf-repoquery
@@ -0,0 +1,13 @@
+---
+syntax: markdown
+tags: [tldr, linux]
+source: https://github.com/tldr-pages/tldr.git
+---
+# dnf install
+
+> Query packages for information.
+> More information: <https://dnf.readthedocs.io/en/latest/command_ref.html#repoquery-command>.
+
+- Query a package for its dependencies:
+
+`dnf {{[rq|repoquery]}} --deplist {{package}}`
diff --git a/tldr/linux/id3v2 b/tldr/linux/id3v2
index 9c780feb..432c8501 100644
--- a/tldr/linux/id3v2
+++ b/tldr/linux/id3v2
@@ -10,7 +10,7 @@ source: https://github.com/tldr-pages/tldr.git
 
 - List all genres:
 
-`id3v2 {{-L|--list-genres}}`
+`id3v2 {{[-L|--list-genres]}}`
 
 - List all tags of specific files:
 
diff --git a/tldr/linux/ntpq b/tldr/linux/ntpq
index 84693afe..c11baea5 100644
--- a/tldr/linux/ntpq
+++ b/tldr/linux/ntpq
@@ -6,7 +6,7 @@ source: https://github.com/tldr-pages/tldr.git
 # ntpq
 
 > Query the Network Time Protocol (NTP) daemon.
-> More information: <https://manned.org/man/ntpq.1>.
+> More information: <https://manned.org/ntpq.1>.
 
 - Start `ntpq` in interactive mode:
 
diff --git a/tldr/linux/pokego b/tldr/linux/pokego
index a7b0f724..8c23dcef 100644
--- a/tldr/linux/pokego
+++ b/tldr/linux/pokego
@@ -5,7 +5,7 @@ source: https://github.com/tldr-pages/tldr.git
 ---
 # pokego
 
-> Displays Pokémon sprites in color directly in your terminal.
+> Display Pokémon sprites in color directly in your terminal.
 > Inspired by Phoney badger's `pokemon-colorscripts` but offers enhanced speed and efficiency.
 > More information: <https://github.com/rubiin/pokego>.
 
diff --git a/tldr/linux/proctl b/tldr/linux/proctl
index bc581d9e..02daef17 100644
--- a/tldr/linux/proctl
+++ b/tldr/linux/proctl
@@ -10,32 +10,32 @@ source: https://github.com/tldr-pages/tldr.git
 
 - List available licenses:
 
-`proctl {{-ll|-list-licenses}}`
+`proctl {{[-ll|-list-licenses]}}`
 
 - List available languages:
 
-`proctl {{-lL|-list-languages}}`
+`proctl {{[-lL|-list-languages]}}`
 
 - Pick a license in a FZF menu:
 
-`proctl {{-pl|-pick-license}}`
+`proctl {{[-pl|-pick-license]}}`
 
 - Pick a language in a FZF menu:
 
-`proctl {{-pL|-pick-language}}`
+`proctl {{[-pL|-pick-language]}}`
 
 - Remove all licenses from the current project:
 
-`proctl {{-r|-remove-license}}`
+`proctl {{[-r|-remove-license]}}`
 
 - Create a new license template:
 
-`proctl {{-t|-new-template}}`
+`proctl {{[-t|-new-template]}}`
 
 - Delete a license from templates:
 
-`proctl {{-R|-delete-license}} {{@license_name1 @license_name2 ...}}`
+`proctl {{[-R|-delete-license]}} {{@license_name1 @license_name2 ...}}`
 
 - Display help:
 
-`proctl {{-h|-help}}`
+`proctl {{[-h|-help]}}`
diff --git a/tldr/linux/semanage b/tldr/linux/semanage
index 01c65620..b542fc8a 100644
--- a/tldr/linux/semanage
+++ b/tldr/linux/semanage
@@ -11,7 +11,7 @@ source: https://github.com/tldr-pages/tldr.git
 
 - Set or unset a SELinux boolean. Booleans allow the administrator to customize how policy rules affect confined process types (a.k.a domains):
 
-`sudo semanage boolean {{[-m|--modify]}} {{-1|--on|-0|--off}} {{haproxy_connect_any}}`
+`sudo semanage boolean {{[-m|--modify]}} {{--on|--off}} {{haproxy_connect_any}}`
 
 - Add a user-defined file context labeling rule. File contexts define what files confined domains are allowed to access:
 
@@ -23,7 +23,7 @@ source: https://github.com/tldr-pages/tldr.git
 
 - Set or unset permissive mode for a confined domain. Per-domain permissive mode allows more granular control compared to `setenforce`:
 
-`sudo semanage permissive {{-a|--add|-d|--delete}} {{httpd_t}}`
+`sudo semanage permissive {{--add|--delete}} {{httpd_t}}`
 
 - Output local customizations in the default store:
 
diff --git a/tldr/linux/steamos-factory-reset-config b/tldr/linux/steamos-factory-reset-config
index 86acd171..9213259a 100644
--- a/tldr/linux/steamos-factory-reset-config
+++ b/tldr/linux/steamos-factory-reset-config
@@ -5,7 +5,7 @@ source: https://github.com/tldr-pages/tldr.git
 ---
 # steamos-factory-reset-config
 
-> Generates configuration files required by `steamos-factory-reset`.
+> Generate configuration files required by `steamos-factory-reset`.
 > This command is typically called internally and not meant to be run manually.
 > More information: <https://gitlab.com/users/evlaV/projects>.
 
diff --git a/tldr/lsar b/tldr/lsar
index cf589a39..a8c902a8 100644
--- a/tldr/lsar
+++ b/tldr/lsar
@@ -31,4 +31,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - Display help:
 
-`lsar {{-h|--help}}`
+`lsar {{[-h|--help]}}`
diff --git a/tldr/modutil b/tldr/modutil
new file mode 100644
index 00000000..ef7fe658
--- /dev/null
+++ b/tldr/modutil
@@ -0,0 +1,17 @@
+---
+syntax: markdown
+tags: [tldr, common]
+source: https://github.com/tldr-pages/tldr.git
+---
+# modutil
+
+> Manage PKCS #11 module information within the NSS security module database.
+> More information: <https://manned.org/modutil>.
+
+- Add a PKCS #11 module to a NSS database (e.g. a Firefox profile: `$HOME/.mozilla/firefox/default-release`):
+
+`modutil -dbdir sql:{{path/to/nss/db/dir}} -add "{{module_label}}" -libfile {{path/to/pkcs11_mod.so}}`
+
+- List PKCS #11 modules in a NSS database:
+
+`modutil -dbdir sql:{{path/to/nss/db/dir}} -list`
diff --git a/tldr/netstat b/tldr/netstat
index 618e1017..f3d122fc 100644
--- a/tldr/netstat
+++ b/tldr/netstat
@@ -15,11 +15,11 @@ source: https://github.com/tldr-pages/tldr.git
 
 - List all listening ports:
 
-`netstat {{-l|--listening]}}`
+`netstat {{[-l|--listening]]}}`
 
 - List listening TCP ports:
 
-`netstat {{-t|--tcp]}}`
+`netstat {{[-t|--tcp]]}}`
 
 - Display PID and program names:
 
diff --git a/tldr/nix-channel b/tldr/nix-channel
new file mode 100644
index 00000000..62bda939
--- /dev/null
+++ b/tldr/nix-channel
@@ -0,0 +1,21 @@
+---
+syntax: markdown
+tags: [tldr, common]
+source: https://github.com/tldr-pages/tldr.git
+---
+# nix-channel
+
+> Manage `nix` update channels.
+> More information: <https://nixos.wiki/wiki/Nix_channels>.
+
+- List current channels:
+
+`nix-channel --list`
+
+- Add a channel:
+
+`nix-channel --add {{https://nixos.org/channels/nixpkgs-unstable}}`
+
+- Update package list of all channels:
+
+`nix-channel --update`
diff --git a/tldr/opt b/tldr/opt
index a293fe80..ff7abba4 100644
--- a/tldr/opt
+++ b/tldr/opt
@@ -5,7 +5,7 @@ source: https://github.com/tldr-pages/tldr.git
 ---
 # opt
 
-> Runs optimizations and analyse LLVM source files.
+> Run optimizations and analyse LLVM source files.
 > More information: <https://llvm.org/docs/CommandGuide/opt.html>.
 
 - Run an optimization or analysis on a bitcode file:
diff --git a/tldr/pico b/tldr/pico
index f9c8b13a..502eb9d3 100644
--- a/tldr/pico
+++ b/tldr/pico
@@ -36,6 +36,6 @@ source: https://github.com/tldr-pages/tldr.git
 
 `pico -v {{path/to/file}}`
 
-- Displays all files including those beginning with a period:
+- Display all files including those beginning with a period:
 
 `pico -a`
diff --git a/tldr/pkcs11-tool b/tldr/pkcs11-tool
new file mode 100644
index 00000000..3e56d085
--- /dev/null
+++ b/tldr/pkcs11-tool
@@ -0,0 +1,25 @@
+---
+syntax: markdown
+tags: [tldr, common]
+source: https://github.com/tldr-pages/tldr.git
+---
+# pkcs11-tool
+
+> Utility for managing and using PKCS #11 security tokens.
+> More information: <https://github.com/OpenSC/OpenSC/wiki/Using-pkcs11-tool-and-OpenSSL>.
+
+- List slots and their potential token, using a specific module (e.g. `/usr/lib/softhsm/libsofthsm2.so`):
+
+`pkcs11-tool --module {{path/to/module.so}} {{[-L|--list-slots]}} {{[-T|--list-token-slots]}}`
+
+- List objects in a specific slot. (Note: `slot_id` is not the slot index shown as "Slot X"):
+
+`pkcs11-tool {{[-O|--list-objects]}} {{[-p|--pin]}} {{auth_pin}} --slot {{slot_id}}`
+
+- Create a new object with a specific label and type:
+
+`pkcs11-tool --slot {{slot_id}} {{[-p|--pin]}} {{auth_pin}} {{[-y|--type]}} {{cert|privkey|pubkey|secrkey|data|...}} {{[-a|--label]}} "{{label}}" {{[-d|--id]}} {{01}} {{[-w|--write-object]}} {{path/to/cert.crt}}`
+
+- Delete an object by its label and type:
+
+`pkcs11-tool --slot {{slot_id}} {{[-p|--pin]}} {{auth_pin}} {{[-y|--type]}} {{cert|privkey|pubkey|secrkey|data|...}} {{[-a|--label]}} "{{label}}" {{[-b|--delete-object]}}`
diff --git a/tldr/ps b/tldr/ps
index 52aaabd7..5ca2c0f4 100644
--- a/tldr/ps
+++ b/tldr/ps
@@ -34,4 +34,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - Sort processes by memory consumption:
 
-`ps {{[k|--sort]}} size`
+`ps --sort size`
diff --git a/tldr/sg_raw b/tldr/sg_raw
new file mode 100644
index 00000000..ce69adcb
--- /dev/null
+++ b/tldr/sg_raw
@@ -0,0 +1,41 @@
+---
+syntax: markdown
+tags: [tldr, common]
+source: https://github.com/tldr-pages/tldr.git
+---
+# sg_raw
+
+> Send arbitrary SCSI command to a connected device.
+> More information: <https://manned.org/sg_raw>.
+
+- Send a command to an optical SCSI device assigned to `sr0` to load the media in its tray:
+
+`sg_raw /dev/sr0 EA 00 00 00 00 01`
+
+- Read data from `IFILE` instead of `stdin`:
+
+`sg_raw {{[-i|--infile]}} {{path/to/IFILE}} {{/dev/sgX}} {{SCSI_command}}`
+
+- Skip the first `LEN` bytes of input data:
+
+`sg_raw {{[-k|--skip]}} {{LEN}} {{/dev/sgX}} {{SCSI_command}}`
+
+- Read `SLEN` bytes of data and send to the device:
+
+`sg_raw {{[-s|--send]}} {{SLEN}} {{/dev/sgX}} {{SCSI_command}}`
+
+- Wait up to `SEC` seconds for `sg_raw` to finish processing:
+
+`sg_raw {{[-t|--timeout]}} {{SEC}} {{/dev/sgX}} {{SCSI_command}}`
+
+- Increase verbosity level by 1:
+
+`sg_raw {{[-v|--verbose]}} {{/dev/sgX}} {{SCSI_command}}`
+
+- Dump returned data in binary form:
+
+`sg_raw {{[-b|--binary]}} {{/dev/sgX}} {{SCSI_command}}`
+
+- Write data received from the specified device to an `OFILE`:
+
+`sg_raw {{[-o|--outfile]}} {{path/to/OFILE}} {{/dev/sgX}} {{SCSI_command}}`
diff --git a/tldr/spf b/tldr/spf
new file mode 100644
index 00000000..8cc56340
--- /dev/null
+++ b/tldr/spf
@@ -0,0 +1,37 @@
+---
+syntax: markdown
+tags: [tldr, common]
+source: https://github.com/tldr-pages/tldr.git
+---
+# spf
+
+> The superfile – Modern terminal file manager.
+> More information: <https://github.com/yorukot/superfile>.
+
+- Launch `spf` with a specific path:
+
+`spf {{path/to/directory}}`
+
+- Launch `spf` with multiple paths:
+
+`spf {{path/to/directory1 path/to/directory2 ...}}`
+
+- Fix hotkey settings by appending missing keys:
+
+`spf {{[--fh|--fix-hotkeys]}}`
+
+- Fix the configuration file by appending missing entries:
+
+`spf {{[--fch|--fix-config-file]}}`
+
+- Use specific configuration and hotkey files:
+
+`spf {{[-c|--config-file]}} {{path/to/config.toml}} {{[--hf|--hotkey-file]}} {{path/to/hotkey.toml}}`
+
+- Write the path of the first selected file to this file and exit:
+
+`spf {{[--cf|--chooser-file]}} {{tmp/chooser-result}}`
+
+- Show internal configuration and data directory paths:
+
+`spf {{[pl|path-list]}}`
diff --git a/tldr/steamcmd b/tldr/steamcmd
index 2ac3be88..eacb70d5 100644
--- a/tldr/steamcmd
+++ b/tldr/steamcmd
@@ -19,3 +19,7 @@ source: https://github.com/tldr-pages/tldr.git
 - Install an application for a specific platform:
 
 `steamcmd +@sSteamCmdForcePlatformType {{windows}} +login {{anonymous}} +app_update {{appid}} validate +quit`
+
+- Clear cached login credentials for a user:
+
+`steamcmd +login {{username}} +logout +quit`
diff --git a/tldr/windows/winget b/tldr/windows/winget
index c782faab..09370fae 100644
--- a/tldr/windows/winget
+++ b/tldr/windows/winget
@@ -10,11 +10,11 @@ source: https://github.com/tldr-pages/tldr.git
 
 - Install a package:
 
-`winget install {{package}}`
+`winget {{[add|install]}} {{package}}`
 
 - Remove a package (Note: `remove` can also be used instead of `uninstall`):
 
-`winget uninstall {{package}}`
+`winget {{[rm|uninstall]}} {{package}}`
 
 - Display information about a package:
 
@@ -26,11 +26,11 @@ source: https://github.com/tldr-pages/tldr.git
 
 - Upgrade all packages to the latest versions:
 
-`winget upgrade --all`
+`winget upgrade {{[-r|--all]}}`
 
 - List all packages installed that can be managed with `winget`:
 
-`winget list --source winget`
+`winget {{[ls|list]}} {{[-s|--source]}} winget`
 
 - Import packages from a file, or export installed packages to a file:
 
diff --git a/tldr/xlsclients b/tldr/xlsclients
new file mode 100644
index 00000000..d0381b9e
--- /dev/null
+++ b/tldr/xlsclients
@@ -0,0 +1,37 @@
+---
+syntax: markdown
+tags: [tldr, common]
+source: https://github.com/tldr-pages/tldr.git
+---
+# xlsclients
+
+> List client applications running on an X11 display.
+> More information: <https://manned.org/xlsclients>.
+
+- List clients on the default display:
+
+`xlsclients`
+
+- List clients on all screens:
+
+`xlsclients -a`
+
+- List clients with detailed information:
+
+`xlsclients -l`
+
+- Limit the command output length per client to a specific number of characters:
+
+`xlsclients -m {{max_command_length}}`
+
+- Specify a particular display to inspect:
+
+`xlsclients -display :{{display_number}}`
+
+- List clients on remote host's display:
+
+`xlsclients -display {{remote_host}}:0`
+
+- Display version:
+
+`xlsclients -version`
diff --git a/tldr/zapier-analytics b/tldr/zapier-analytics
index 26edc7c9..bde8cbb4 100644
--- a/tldr/zapier-analytics
+++ b/tldr/zapier-analytics
@@ -18,4 +18,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - Show extra debugging output:
 
-`zapier analytics {{[-m|--mode]}} {{enabled|anonymous|disabled}} {{-d|--debug}}`
+`zapier analytics {{[-m|--mode]}} {{enabled|anonymous|disabled}} {{[-d|--debug]}}`