diff --git a/pages/common/autojump.md b/pages/common/autojump.md
index dcb1af9a22..5d7691c7d2 100644
--- a/pages/common/autojump.md
+++ b/pages/common/autojump.md
@@ -22,4 +22,4 @@
 
 - Show the entries in the autojump database:
 
-`j -s`
+`j {{[-s|--stat]}}`
diff --git a/pages/common/bashmarks.md b/pages/common/bashmarks.md
index ca16fde0af..1817007808 100644
--- a/pages/common/bashmarks.md
+++ b/pages/common/bashmarks.md
@@ -3,6 +3,10 @@
 > Save and jump to commonly used directories using 1 character commands.
 > More information: <https://github.com/huyng/bashmarks>.
 
+- Add the bashmark aliases to your shell:
+
+`source /usr/share/bashmarks/bashmarks.sh`
+
 - List available bookmarks:
 
 `l`
diff --git a/pages/common/darkhttpd.md b/pages/common/darkhttpd.md
index ee3593f0e9..e378bcc526 100644
--- a/pages/common/darkhttpd.md
+++ b/pages/common/darkhttpd.md
@@ -1,7 +1,7 @@
 # darkhttpd
 
 > Darkhttpd web server.
-> More information: <https://unix4lyfe.org/darkhttpd>.
+> More information: <https://github.com/emikulic/darkhttpd#how-to-run-darkhttpd>.
 
 - Start server serving the specified document root:
 
diff --git a/pages/common/deluge-console.md b/pages/common/deluge-console.md
index d425beb17c..5fb8a59b5b 100644
--- a/pages/common/deluge-console.md
+++ b/pages/common/deluge-console.md
@@ -1,7 +1,7 @@
 # deluge-console
 
 > An interactive interface for the Deluge BitTorrent client.
-> More information: <https://deluge-torrent.org>.
+> More information: <https://deluge-torrent.org/userguide/thinclient/>.
 
 - Start the interactive console interface:
 
diff --git a/pages/common/dhcpwn.md b/pages/common/dhcpwn.md
index 8a42b927df..04148b700c 100644
--- a/pages/common/dhcpwn.md
+++ b/pages/common/dhcpwn.md
@@ -5,8 +5,8 @@
 
 - Flood the network with IP requests:
 
-`dhcpwn --interface {{network_interface}} flood --count {{number_of_requests}}`
+`dhcpwn {{[-i|--interface]}} {{network_interface}} flood {{[-c|--count]}} {{number_of_requests}}`
 
 - Sniff local DHCP traffic:
 
-`dhcpwn --interface {{network_interface}} sniff`
+`dhcpwn {{[-i|--interface]}} {{network_interface}} sniff`
diff --git a/pages/common/forever.md b/pages/common/forever.md
index e85d6c2ed6..afe68ff119 100644
--- a/pages/common/forever.md
+++ b/pages/common/forever.md
@@ -1,7 +1,7 @@
 # forever
 
 > Server-side JavaScript application that makes sure Node.js applications run indefinitely (restarts after exit).
-> More information: <https://github.com/foreversd/forever>.
+> More information: <https://github.com/foreversd/forever#usage>.
 
 - Start running a file forever (as a daemon):
 
diff --git a/pages/common/fossa.md b/pages/common/fossa.md
index fbb8d5962a..0aec8b5429 100644
--- a/pages/common/fossa.md
+++ b/pages/common/fossa.md
@@ -1,7 +1,7 @@
 # fossa
 
 > CLI for the Fossa service - Generate realtime license audits, vulnerability scans and reports about dependencies licenses.
-> More information: <https://github.com/fossas/fossa-cli>.
+> More information: <https://github.com/fossas/fossa-cli/blob/master/docs/README.md>.
 
 - Initialize a `.fossa.yml` configuration file:
 
diff --git a/pages/common/hn.md b/pages/common/hn.md
index ec59d86f71..cab995ab60 100644
--- a/pages/common/hn.md
+++ b/pages/common/hn.md
@@ -1,7 +1,7 @@
 # hn
 
 > Command-line interface for Hacker News.
-> More information: <https://github.com/rafaelrinaldi/hn-cli>.
+> More information: <https://github.com/rafaelrinaldi/hn-cli#usage>.
 
 - View stories on Hacker News:
 
@@ -9,11 +9,11 @@
 
 - View _number_ of stories on Hacker News:
 
-`hn --limit {{number}}`
+`hn {{[-l|--limit]}} {{number}}`
 
 - View stories on Hacker News, and keep the list open after selecting a link:
 
-`hn --keep-open`
+`hn {{[-k|--keep-open]}}`
 
 - View stories on Hacker News sorted by submission date:
 
diff --git a/pages/common/jpegoptim.md b/pages/common/jpegoptim.md
index 5673d327de..4ccc2796d0 100644
--- a/pages/common/jpegoptim.md
+++ b/pages/common/jpegoptim.md
@@ -1,20 +1,20 @@
 # jpegoptim
 
 > Optimise JPEG images.
-> More information: <https://github.com/tjko/jpegoptim>.
+> More information: <https://manned.org/jpegoptim>.
 
 - Optimise a set of JPEG images, retaining all associated data:
 
-`jpegoptim {{image1.jpeg}} {{image2.jpeg}} {{imageN.jpeg}}`
+`jpegoptim {{image1.jpeg image2.jpeg image3.jpeg ...}}`
 
 - Optimise JPEG images, stripping all non-essential data:
 
-`jpegoptim --strip-all {{image1.jpeg}} {{image2.jpeg}} {{imageN.jpeg}}`
+`jpegoptim {{[-s|--strip-all]}} {{image1.jpeg image2.jpeg image3.jpeg ...}}`
 
 - Force the output images to be progressive:
 
-`jpegoptim --all-progressive {{image1.jpeg}} {{image2.jpeg}} {{imageN.jpeg}}`
+`jpegoptim --all-progressive {{image1.jpeg image2.jpeg image3.jpeg ...}}`
 
 - Force the output images to have a fixed maximum filesize:
 
-`jpegoptim --size={{250k}} {{image1.jpeg}} {{image2.jpeg}} {{imageN.jpeg}}`
+`jpegoptim {{[-S|--size]}} {{250k}} {{image1.jpeg image2.jpeg image3.jpeg ...}}`
diff --git a/pages/common/kahlan.md b/pages/common/kahlan.md
index 237e78d32f..97b30a185f 100644
--- a/pages/common/kahlan.md
+++ b/pages/common/kahlan.md
@@ -1,7 +1,7 @@
 # kahlan
 
 > A unit and Behaviour Driven Development test framework for PHP.
-> More information: <https://kahlan.github.io>.
+> More information: <https://kahlan.github.io/docs/cli-options.html>.
 
 - Run all specifications in the "spec" directory:
 
diff --git a/pages/common/keybase.md b/pages/common/keybase.md
index e4bf4cab5f..091905a104 100644
--- a/pages/common/keybase.md
+++ b/pages/common/keybase.md
@@ -1,7 +1,7 @@
 # keybase
 
 > Key directory that maps social media identities to encryption keys in a publicly auditable manner.
-> More information: <https://keybase.io/docs/command_line>.
+> More information: <https://book.keybase.io/docs/cli>.
 
 - Follow another user:
 
@@ -13,19 +13,19 @@
 
 - Sign a file:
 
-`keybase sign --infile {{input_file}} --outfile {{output_file}}`
+`keybase sign {{[-i|--infile]}} {{input_file}} {{[-o|--outfile]}} {{output_file}}`
 
 - Verify a signed file:
 
-`keybase verify --infile {{input_file}} --outfile {{output_file}}`
+`keybase verify {{[-i|--infile]}} {{input_file}} {{[-o|--outfile]}} {{output_file}}`
 
 - Encrypt a file:
 
-`keybase encrypt --infile {{input_file}} --outfile {{output_file}} {{receiver}}`
+`keybase encrypt {{[-i|--infile]}} {{input_file}} {{[-o|--outfile]}} {{output_file}} {{receiver}}`
 
 - Decrypt a file:
 
-`keybase decrypt --infile {{input_file}} --outfile {{output_file}}`
+`keybase decrypt {{[-i|--infile]}} {{input_file}} {{[-o|--outfile]}} {{output_file}}`
 
 - Revoke current device, log out, and delete local data:
 
diff --git a/pages/common/kubectx.md b/pages/common/kubectx.md
index 7bcaf29a79..1a77f3adb9 100644
--- a/pages/common/kubectx.md
+++ b/pages/common/kubectx.md
@@ -1,7 +1,7 @@
 # kubectx
 
 > Utility to manage and switch between `kubectl` contexts.
-> More information: <https://github.com/ahmetb/kubectx>.
+> More information: <https://manned.org/kubectx>.
 
 - List the contexts:
 
diff --git a/pages/common/kubens.md b/pages/common/kubens.md
index 057a07b847..cefd7d74db 100644
--- a/pages/common/kubens.md
+++ b/pages/common/kubens.md
@@ -1,7 +1,7 @@
 # kubens
 
 > Utility to switch between Kubernetes namespaces.
-> More information: <https://github.com/ahmetb/kubectx>.
+> More information: <https://manned.org/kubens>.
 
 - List the namespaces:
 
diff --git a/pages/common/lua.md b/pages/common/lua.md
index 2975dd2651..cad39898d1 100644
--- a/pages/common/lua.md
+++ b/pages/common/lua.md
@@ -1,7 +1,7 @@
 # lua
 
 > A powerful, light-weight embeddable programming language.
-> More information: <https://www.lua.org>.
+> More information: <https://www.lua.org/manual/5.4/lua.html>.
 
 - Start an interactive Lua shell:
 
diff --git a/pages/common/luac.md b/pages/common/luac.md
index 7772262f3c..14d5623841 100644
--- a/pages/common/luac.md
+++ b/pages/common/luac.md
@@ -1,7 +1,7 @@
 # luac
 
 > Lua bytecode compiler.
-> More information: <https://www.lua.org>.
+> More information: <https://www.lua.org/manual/5.4/luac.html>.
 
 - Compile a Lua source file to Lua bytecode:
 
diff --git a/pages/common/ngrep.md b/pages/common/ngrep.md
index 71f73828a8..79f3730389 100644
--- a/pages/common/ngrep.md
+++ b/pages/common/ngrep.md
@@ -1,7 +1,7 @@
 # ngrep
 
 > Filter network traffic packets using regular expressions.
-> More information: <https://github.com/jpr5/ngrep>.
+> More information: <https://github.com/jpr5/ngrep/blob/master/EXAMPLES.md>.
 
 - Capture traffic of all interfaces:
 
diff --git a/pages/common/peerflix.md b/pages/common/peerflix.md
index a3732c0945..0ed13baba0 100644
--- a/pages/common/peerflix.md
+++ b/pages/common/peerflix.md
@@ -9,16 +9,16 @@
 
 - List all streamable files contained in a torrent (given as a magnet link):
 
-`peerflix "{{magnet:?xt=urn:btih:0123456789abcdef0123456789abcdef01234567}}" --list`
+`peerflix "{{magnet:?xt=urn:btih:0123456789abcdef0123456789abcdef01234567}}" {{[-l|--list]}}`
 
 - Stream the largest file in a torrent, given as a torrent URL, to VLC:
 
-`peerflix "{{http://example.net/music.torrent}}" --vlc`
+`peerflix "{{http://example.net/music.torrent}}" {{[-v|--vlc]}}`
 
 - Stream the largest file in a torrent to MPlayer, with subtitles:
 
-`peerflix "{{torrent_url|magnet_link}}" --mplayer --subtitles {{subtitle-file.srt}}`
+`peerflix "{{torrent_url|magnet_link}}" {{[-m|--mplayer]}} {{[-t|--subtitles]}} {{subtitle-file.srt}}`
 
 - Stream all files from a torrent to Airplay:
 
-`peerflix "{{torrent_url|magnet_link}}" --all --airplay`
+`peerflix "{{torrent_url|magnet_link}}" {{[-a|--all]}} {{[-s|--airplay]}}`
diff --git a/pages/common/phive.md b/pages/common/phive.md
index d7b06bc36c..3e5cb9dd41 100644
--- a/pages/common/phive.md
+++ b/pages/common/phive.md
@@ -1,7 +1,7 @@
 # phive
 
 > The Phar Installation and Verification Environment for secure PHP application deployment.
-> More information: <https://phar.io>.
+> More information: <https://phar.io/#Usage>.
 
 - Display a list of available aliased Phars:
 
@@ -13,11 +13,11 @@
 
 - Install a specified Phar globally:
 
-`phive install {{alias|url}} --global`
+`phive install {{alias|url}} {{[-g|--global]}}`
 
 - Install a specified Phar to a target directory:
 
-`phive install {{alias|url}} --target {{path/to/directory}}`
+`phive install {{alias|url}} {{[-t|--target]}} {{path/to/directory}}`
 
 - Update all Phar files to the latest version:
 
diff --git a/pages/common/phpstorm.md b/pages/common/phpstorm.md
index fb5967ce55..c63afffeef 100644
--- a/pages/common/phpstorm.md
+++ b/pages/common/phpstorm.md
@@ -1,7 +1,7 @@
 # phpstorm
 
 > A cross-platform IDE for PHP based on the JetBrains IntelliJ platform.
-> More information: <https://jetbrains.com/phpstorm>.
+> More information: <https://www.jetbrains.com/help/phpstorm/working-with-the-ide-features-from-command-line.html#arguments>.
 
 - Open a specific directory:
 
diff --git a/pages/common/picard.md b/pages/common/picard.md
index fa310221da..da46202240 100644
--- a/pages/common/picard.md
+++ b/pages/common/picard.md
@@ -1,7 +1,7 @@
 # picard
 
 > Next generation MusicBrainz tagging application.
-> More information: <https://picard.musicbrainz.org/>.
+> More information: <https://picard-docs.musicbrainz.org/en/getting_started/starting.html>.
 
 - Start Picard:
 
@@ -13,4 +13,4 @@
 
 - Display the version of Picard installed:
 
-`picard --long-version`
+`picard {{[-V|--long-version]}}`
diff --git a/pages/common/pickle.md b/pages/common/pickle.md
index 5785a6abe0..f25658507c 100644
--- a/pages/common/pickle.md
+++ b/pages/common/pickle.md
@@ -1,7 +1,7 @@
 # pickle
 
 > A PHP extension installer based on Composer.
-> More information: <https://github.com/FriendsOfPHP/pickle>.
+> More information: <https://github.com/FriendsOfPHP/pickle#usage>.
 
 - Install a specific PHP extension:
 
diff --git a/pages/common/rdfind.md b/pages/common/rdfind.md
index 1588b757cf..c742948bf2 100644
--- a/pages/common/rdfind.md
+++ b/pages/common/rdfind.md
@@ -1,7 +1,7 @@
 # rdfind
 
 > Find files with duplicate content and get rid of them.
-> More information: <https://rdfind.pauldreik.se>.
+> More information: <https://rdfind.pauldreik.se/rdfind.1.html>.
 
 - Identify all duplicates in a given directory and output a summary:
 
diff --git a/pages/common/skicka.md b/pages/common/skicka.md
index 8c36633eca..8346af1f9c 100644
--- a/pages/common/skicka.md
+++ b/pages/common/skicka.md
@@ -1,7 +1,7 @@
 # skicka
 
 > Manage your Google Drive.
-> More information: <https://github.com/google/skicka>.
+> More information: <https://github.com/google/skicka#usage>.
 
 - Upload a file/folder to Google Drive:
 
diff --git a/pages/common/slackcat.md b/pages/common/slackcat.md
index 7c11491328..832f23df01 100644
--- a/pages/common/slackcat.md
+++ b/pages/common/slackcat.md
@@ -1,20 +1,20 @@
 # slackcat
 
 > Utility for passing files and command output to Slack.
-> More information: <https://github.com/bcicen/slackcat>.
+> More information: <https://github.com/bcicen/slackcat#usage>.
 
 - Post a file to Slack:
 
-`slackcat --channel {{channel_name}} {{path/to/file}}`
+`slackcat {{[-c|--channel]}} {{channel_name}} {{path/to/file}}`
 
 - Post a file to Slack with a custom filename:
 
-`slackcat --channel {{channel_name}} --filename={{filename}} {{path/to/file}}`
+`slackcat {{[-c|--channel]}} {{channel_name}} {{[-n|--filename]}} {{filename}} {{path/to/file}}`
 
 - Pipe command output to Slack as a text snippet:
 
-`{{command}} | slackcat --channel {{channel_name}} --filename={{snippet_name}}`
+`{{command}} | slackcat {{[-c|--channel]}} {{channel_name}} {{[-n|--filename]}} {{snippet_name}}`
 
 - Stream command output to Slack continuously:
 
-`{{command}} | slackcat --channel {{channel_name}} --stream`
+`{{command}} | slackcat {{[-c|--channel]}} {{channel_name}} {{[-s|--stream]}}`
diff --git a/pages/common/spike.md b/pages/common/spike.md
index 13ddfe0802..7c7176bb10 100644
--- a/pages/common/spike.md
+++ b/pages/common/spike.md
@@ -1,7 +1,7 @@
 # spike
 
 > A fully featured static website generator written in JavaScript.
-> More information: <https://spike.js.org>.
+> More information: <https://spike.readme.io/docs/command-line-interface>.
 
 - Create a new project using the default template:
 
diff --git a/pages/common/sqlite3.md b/pages/common/sqlite3.md
index 60fcd6c973..bfda5a6cb3 100644
--- a/pages/common/sqlite3.md
+++ b/pages/common/sqlite3.md
@@ -1,7 +1,7 @@
 # sqlite3
 
 > The command-line interface to SQLite 3, which is a self-contained file-based embedded SQL engine.
-> More information: <https://sqlite.org>.
+> More information: <https://sqlite.org/cli.html>.
 
 - Start an interactive shell with a new database:
 
diff --git a/pages/common/st-flash.md b/pages/common/st-flash.md
index a1b0039726..8410e55950 100644
--- a/pages/common/st-flash.md
+++ b/pages/common/st-flash.md
@@ -1,7 +1,7 @@
 # st-flash
 
 > Flash binary files to STM32 ARM Cortex microcontrollers.
-> More information: <https://github.com/texane/stlink>.
+> More information: <https://manned.org/st-flash>.
 
 - Read 4096 bytes from the device starting from 0x8000000:
 
diff --git a/pages/common/velero.md b/pages/common/velero.md
index 8df1ba98d9..77902cf4d6 100644
--- a/pages/common/velero.md
+++ b/pages/common/velero.md
@@ -1,7 +1,7 @@
 # velero
 
 > Backup and migrate Kubernetes applications and their persistent volumes.
-> More information: <https://github.com/heptio/velero>.
+> More information: <https://velero.io/docs/main/>.
 
 - Create a backup containing all resources:
 
diff --git a/pages/common/virtualenv.md b/pages/common/virtualenv.md
index 0b43a3d6b6..6c46c08d59 100644
--- a/pages/common/virtualenv.md
+++ b/pages/common/virtualenv.md
@@ -1,7 +1,7 @@
 # virtualenv
 
 > Create virtual isolated Python environments.
-> More information: <https://virtualenv.pypa.io/>.
+> More information: <https://virtualenv.pypa.io/en/latest/cli_interface.html>.
 
 - Create a new environment:
 
@@ -9,11 +9,11 @@
 
 - Customize the prompt prefix:
 
-`virtualenv --prompt={{prompt_prefix}} {{path/to/venv}}`
+`virtualenv --prompt {{prompt_prefix}} {{path/to/venv}}`
 
 - Use a different version of Python with virtualenv:
 
-`virtualenv --python={{path/to/pythonbin}} {{path/to/venv}}`
+`virtualenv {{[-p|--python]}} {{path/to/pythonbin}} {{path/to/venv}}`
 
 - Start (select) the environment:
 
diff --git a/pages/common/yarn.md b/pages/common/yarn.md
index f48b6cdb54..043239f544 100644
--- a/pages/common/yarn.md
+++ b/pages/common/yarn.md
@@ -1,7 +1,7 @@
 # yarn
 
 > JavaScript and Node.js package manager alternative.
-> More information: <https://yarnpkg.com>.
+> More information: <https://yarnpkg.com/cli>.
 
 - Install a module globally: