diff --git a/config.toml b/config.toml
index 84ed7adc98..5925ccfcd7 100644
--- a/config.toml
+++ b/config.toml
@@ -1,3 +1,9 @@
+# This is an example configuration for Hermes. It is meant to be
+# used as a reference, _NOT_ for configuring a production relayer. 
+# If you're looking to configure a production relayer for some chains, 
+# try using the `hermes config auto` command to generate a config 
+# file that serves as the starting point for configuring Hermes.
+
 # The global section has parameters that apply globally to the relayer operation.
 [global]
 
diff --git a/crates/relayer-cli/src/chain_registry.rs b/crates/relayer-cli/src/chain_registry.rs
index d23af80cb5..c4c4161cfa 100644
--- a/crates/relayer-cli/src/chain_registry.rs
+++ b/crates/relayer-cli/src/chain_registry.rs
@@ -1,32 +1,30 @@
 //! Contains functions to generate a relayer config for a given chain
 
-use futures::future::join_all;
-use http::Uri;
 use std::collections::HashMap;
 use std::fmt::Display;
 use std::marker::Send;
+
+use futures::future::join_all;
+use http::Uri;
 use tokio::task::{JoinError, JoinHandle};
 use tracing::trace;
 
-use tendermint_light_client_verifier::types::TrustThreshold;
-use tendermint_rpc::Url;
-
 use ibc_chain_registry::asset_list::AssetList;
 use ibc_chain_registry::chain::ChainData;
 use ibc_chain_registry::error::RegistryError;
 use ibc_chain_registry::fetchable::Fetchable;
 use ibc_chain_registry::formatter::{SimpleGrpcFormatter, UriFormatter};
 use ibc_chain_registry::paths::IBCPath;
-use ibc_chain_registry::querier::GrpcHealthCheckQuerier;
-use ibc_chain_registry::querier::HermesConfigData;
-use ibc_chain_registry::querier::QueryContext;
-use ibc_chain_registry::querier::SimpleHermesRpcQuerier;
+use ibc_chain_registry::querier::*;
 use ibc_relayer::config::filter::{FilterPattern, PacketFilter};
 use ibc_relayer::config::gas_multiplier::GasMultiplier;
 use ibc_relayer::config::types::{MaxMsgNum, MaxTxSize, Memo};
 use ibc_relayer::config::{default, AddressType, ChainConfig, GasPrice};
 use ibc_relayer::keyring::Store;
 
+use tendermint_light_client_verifier::types::TrustThreshold;
+use tendermint_rpc::Url;
+
 const MAX_HEALTHY_QUERY_RETRIES: u8 = 5;
 
 /// Generate packet filters from Vec<IBCPath> and load them in a Map(chain_name -> filter).
@@ -215,7 +213,7 @@ async fn get_data_from_handles<T>(
     data_array
 }
 
-/// Generates a `Vec<ChainConfig>` for a slice of chains names by fetching data from
+/// Generates a `Vec<ChainConfig>` for a slice of chain names by fetching data from
 /// <https://github.com/cosmos/chain-registry>. Gas settings are set to default values.
 ///
 /// # Arguments
diff --git a/crates/relayer-cli/src/commands.rs b/crates/relayer-cli/src/commands.rs
index 92b61ac1f7..fd1b9fb1b5 100644
--- a/crates/relayer-cli/src/commands.rs
+++ b/crates/relayer-cli/src/commands.rs
@@ -41,7 +41,7 @@ pub fn default_config_file() -> Option<PathBuf> {
 /// Cli Subcommands
 #[derive(Command, Parser, Debug, Runnable)]
 pub enum CliCmd {
-    /// Validate Hermes configuration file
+    /// Generate a new Hermes configuration file or validate an existing one
     #[clap(subcommand)]
     Config(ConfigCmd),
 
diff --git a/crates/relayer-cli/src/commands/config.rs b/crates/relayer-cli/src/commands/config.rs
index 9ca3629dc5..cbe73c9403 100644
--- a/crates/relayer-cli/src/commands/config.rs
+++ b/crates/relayer-cli/src/commands/config.rs
@@ -12,6 +12,6 @@ pub enum ConfigCmd {
     /// Validate the relayer configuration
     Validate(validate::ValidateCmd),
 
-    ///Automatically generate a configuration file by fetching data from the chain-registry. If a pair of chains exists in the _IBC folder of the chain-registry then a corresponding packet filter is added to the configuration
+    /// Automatically generate a config.toml for the specified chain(s)
     Auto(auto::AutoCmd),
 }
diff --git a/crates/relayer-cli/src/commands/config/auto.rs b/crates/relayer-cli/src/commands/config/auto.rs
index d8dd0c6c2c..25aa651826 100644
--- a/crates/relayer-cli/src/commands/config/auto.rs
+++ b/crates/relayer-cli/src/commands/config/auto.rs
@@ -1,15 +1,11 @@
 use crate::chain_registry::get_configs;
-use abscissa_core::{
-    clap::Parser,
-    {Command, Runnable},
-};
+use abscissa_core::clap::Parser;
+use abscissa_core::{Command, Runnable};
 
 use crate::conclude::Output;
 
-use ibc_relayer::{
-    config::{store, ChainConfig, Config},
-    keyring::list_keys,
-};
+use ibc_relayer::config::{store, ChainConfig, Config};
+use ibc_relayer::keyring::list_keys;
 
 use std::path::PathBuf;
 use tracing::{info, warn};
diff --git a/guide/README.md b/guide/README.md
index 0d6f4ae3bc..6f3e7224b5 100644
--- a/guide/README.md
+++ b/guide/README.md
@@ -10,7 +10,7 @@ mdBook is a utility to create modern online books from Markdown files.
 This guide should be permanently deployed at its latest stable version at
 [hermes.informal.systems](https://hermes.informal.systems).
 
-Current version: `v1.0.0`.
+Current version: `v1.4.1`.
 
 The version of this guide is aligned with the [versioning of the ibc crates](../README.md).
 
diff --git a/guide/src/SUMMARY.md b/guide/src/SUMMARY.md
index a184b9ae8c..d296ba66f8 100644
--- a/guide/src/SUMMARY.md
+++ b/guide/src/SUMMARY.md
@@ -48,7 +48,7 @@
     - [Commands Reference](./documentation/commands/index.md)
       - [Global options and JSON output](./documentation/commands/global.md)
       - [Keys](./documentation/commands/keys/index.md)
-      - [Config](./documentation/commands/config.md)
+      - [Genearting and Validating Config Files](./documentation/commands/config.md)
       - [Path setup](./documentation/commands/path-setup/index.md)
         - [Clients](./documentation/commands/path-setup/clients.md)
         - [Connections](./documentation/commands/path-setup/connections.md)
diff --git a/guide/src/documentation/commands/config.md b/guide/src/documentation/commands/config.md
index b30c97a6cd..c7c9a1528c 100644
--- a/guide/src/documentation/commands/config.md
+++ b/guide/src/documentation/commands/config.md
@@ -1,4 +1,4 @@
-# Config
+# Generating and Validating Config Files
 
 #### Show usage
 
@@ -14,7 +14,7 @@ The available sub-commands are the following:
 {{#include ../../templates/help_templates/config.md}}
 ```
 
-### Automatically generate configuration
+### Automatically generate configuration files for specified chains 
 Use `config auto` to automatically generate a configuration file from the [chain-registry](https://github.com/cosmos/chain-registry).
 
 > __WARNING__: Currently, gas parameters are set to default value and require to be set manually.
@@ -25,7 +25,7 @@ Use `config auto` to automatically generate a configuration file from the [chain
 
 __Example__
 
-Use `config auto` to generate a configuration file able to relay between `cosmoshub` and `osmosis`. This command assumes the existence of a key file for `cosmoshub-4` and `osmosis-1` in `$HOME/.hermes/keys`.
+Use `config auto` to generate a configuration file that is able to relay between `cosmoshub` and `osmosis`. This command assumes the existence of a key file for `cosmoshub-4` and `osmosis-1` in `$HOME/.hermes/keys`.
 ```
 {{#template ../../templates/commands/hermes/config/auto_1.md PATH=~/example_config.toml CHAIN_NAME:OPTIONAL_KEY_NAME=cosmoshub osmosis}}
 
@@ -49,7 +49,7 @@ SUCCESS "Config file written successfully : ~/example_config.toml."
 
 __WARNING__ : Do not forget to modify the gas settings before relaying !
 
-### Validate configuration
+### Validate an existing configuration file
 
 Use `config validate` to perform a quick syntactic validation of
 your configuration file.
diff --git a/guide/src/documentation/commands/global.md b/guide/src/documentation/commands/global.md
index 23f1ded910..8272283ccc 100644
--- a/guide/src/documentation/commands/global.md
+++ b/guide/src/documentation/commands/global.md
@@ -3,7 +3,7 @@
 Hermes accepts _global_ options which affect all commands.
 
 ```shell
-hermes {{#include ../../templates/version.md}}
+hermes {{#include ../../templates/hermes-version.md}}
 Informal Systems <hello@informal.systems>
 Implementation of `hermes`, an IBC Relayer developed in Rust.
 
diff --git a/guide/src/documentation/configuration/configure-hermes.md b/guide/src/documentation/configuration/configure-hermes.md
index 078214986d..28bca9bb20 100644
--- a/guide/src/documentation/configuration/configure-hermes.md
+++ b/guide/src/documentation/configuration/configure-hermes.md
@@ -22,10 +22,24 @@ hermes [--config CONFIG_FILE] COMMAND
 
 ## Configuration
 
+### Automatically Generating A Config File 
+
+The simplest way to configure Hermes for a given chain is by running the command
+
+```shell 
+{{#template ../../templates/commands/hermes/config/auto_1.md PATH=~/<OUTPUT_PATH>/config.toml CHAIN_NAME:OPTIONAL_KEY_NAME=<CHAIN_1> <CHAIN_2>}}
+```
+
+This will generate a `config.toml` file for some specified chains. Note, however, that the configuration is generated by pulling the chain data from the Cosmos [chain registry][chain-registry]. The specified chain(s) must exist in the registry for the command to work. Check out [this][config-auto-reference] section of the Hermes commands reference to find more information on the `config auto` command.
+
+### Tips for Manually Configuring Hermes
+
+For relaying use-cases that require some more bespoke configuration, you'll have to manually edit the `config.toml` file. The following are some rules of thumb to follow when manually configuring Hermes.
+
 The configuration file must have one `global` section, and one `chains` section for each chain.
 <!-- markdown-link-check-disable -->
 > **Note:** As of 0.6.0, the Hermes configuration file is self-documented.
-> Please read the configuration file [`config.toml`](https://github.com/informalsystems/hermes/blob/{{#include ../../templates/version.md}}/config.toml)
+> Please read the configuration file [`config.toml`](https://github.com/informalsystems/hermes/blob/{{#include ../../templates/hermes-version.md}}/config.toml)
 > itself for the most up-to-date documentation of parameters.
 
 
@@ -37,10 +51,12 @@ For example, if there are only two chains configured, then Hermes will only rela
 i.e. the two chains will serve as a source for each other, and likewise as a destination for each other's relevant events.
 Hermes will ignore all events that pertain to chains which are unknown (i.e. not present in config.toml).
 
-To restrict relaying on specific channels, or uni-directionally, you can use [packet filtering policies](https://github.com/informalsystems/hermes/blob/{{#include ../../templates/version.md}}/config.toml#L209-L231).
+To restrict relaying on specific channels, or uni-directionally, you can use [packet filtering policies](https://github.com/informalsystems/hermes/blob/{{#include ../../templates/hermes-version.md}}/config.toml#L209-L231).
+
+Check out the example [config.toml][hermes-config] file in the Hermes repo to see how the different parameters can be configured.
 <!-- markdown-link-check-enabled -->
 
-## Adding private keys
+## Adding Private Keys
 
 For each chain configured you need to add a private key for that chain in order to submit [transactions](../commands/tx/index.md),
 please refer to the [Keys](../commands/keys/index.md) sections in order to learn how to add the private keys that are used by Hermes.
@@ -58,7 +74,7 @@ grpc_addr = 'https://domain.com:443'
 websocket_addr = 'wss://domain.com:443/websocket'
 ```
 
-## Support for Interchain Accounts
+## Configuring Support for Interchain Accounts
 
 As of version 0.13.0, Hermes supports relaying on [Interchain Accounts][ica] channels.
 
@@ -126,3 +142,6 @@ websocket_addr = 'wss://hello:world@mydomain.com:26657/websocket'
 
 [http-basic-auth]: https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication
 [ica]: https://github.com/cosmos/ibc/blob/master/spec/app/ics-027-interchain-accounts/README.md
+[chain-registry]: https://github.com/cosmos/chain-registry
+[config-auto-reference]: ../commands/config.md#automatically-generate-configuration-files-for-specified-chains
+[hermes-config]: https://github.com/informalsystems/hermes/blob/master/config.toml
\ No newline at end of file
diff --git a/guide/src/documentation/rest-api.md b/guide/src/documentation/rest-api.md
index 3a301eaa1c..aa36bd3005 100644
--- a/guide/src/documentation/rest-api.md
+++ b/guide/src/documentation/rest-api.md
@@ -37,7 +37,7 @@ as the version of the REST server itself (under the `ibc-relayer-rest` key).
 [
   {
     "name": "ibc-relayer",
-    "version": "{{#include ../templates/version.md}}"
+    "version": "{{#include ../templates/hermes-version.md}}"
   },
   {
     "name": "ibc-relayer-rest",
diff --git a/guide/src/index.md b/guide/src/index.md
index 034fd8c116..feffa617af 100644
--- a/guide/src/index.md
+++ b/guide/src/index.md
@@ -1,4 +1,4 @@
-# Hermes Guide ({{#include templates/version.md}})
+# Hermes Guide ({{#include templates/hermes-version.md}})
 
 ## Overview 
 
@@ -27,7 +27,7 @@ Hermes is actively developed and maintained by [Informal Systems](https://inform
 
 * **[Quick start](./quick-start/index.md)**
 
-  - This section can help you install Hermes.
+  - This section helps you install Hermes.
 
 * **[Tutorials](./tutorials/index.md)**
 
diff --git a/guide/src/quick-start/installation.md b/guide/src/quick-start/installation.md
index 2b0fe6270f..c567480f96 100644
--- a/guide/src/quick-start/installation.md
+++ b/guide/src/quick-start/installation.md
@@ -14,8 +14,8 @@ There are two main approaches for obtaining Hermes:
 
 Simply head to the GitHub [Releases][releases] page and download the latest
 version of Hermes binary matching your platform:
-- macOS: `hermes-{{#include ../templates/version.md}}-x86_64-apple-darwin.tar.gz` (or .zip),
-- Linux: `hermes-{{#include ../templates/version.md}}-x86_64-unknown-linux-gnu.tar.gz` (or .zip).
+- macOS: `hermes-{{#include ../templates/hermes-version.md}}-x86_64-apple-darwin.tar.gz` (or .zip),
+- Linux: `hermes-{{#include ../templates/hermes-version.md}}-x86_64-unknown-linux-gnu.tar.gz` (or .zip).
 
 The step-by-step instruction below should carry you through the whole process:
 
@@ -49,7 +49,7 @@ You should now be able to run Hermes by invoking the `hermes` executable.
 Which should be:
 
 ```
-hermes {{#include ../templates/version.md}}
+hermes {{#include ../templates/hermes-version.md}}
 ```
 
 ## Install via Cargo
@@ -85,7 +85,7 @@ You should now be able to run Hermes by invoking the `hermes` executable.
 Which should be:
 
 ```
-hermes {{#include ../templates/version.md}}
+hermes {{#include ../templates/hermes-version.md}}
 ```
 
 ## Build from source
@@ -100,17 +100,17 @@ Open a terminal and clone the `ibc-rs` repository:
 
 Change to the repository directory
 ```shell
-cd ibc-rs
+cd hermes
 ```
 
 ### Checkout the latest release
 
-Go to the [ibc-rs releases](https://github.com/informalsystems/hermes/releases) page to see what is the most recent release.
+Go to the [hermes releases](https://github.com/informalsystems/hermes/releases) page to see what is the most recent release.
 
-Then checkout the release, for example if the most recent release is `{{#template ../templates/version.md}}` then execute the command:
+Then checkout the release, for example if the most recent release is `{{#template ../templates/hermes-version.md}}` then execute the command:
 
 ```shell
-git checkout {{#include ../templates/version.md}}
+git checkout {{#include ../templates/hermes-version.md}}
 ```
 
 ### Building with `cargo build`
diff --git a/guide/src/templates/commands/hermes/clear/packets_1.md b/guide/src/templates/commands/hermes/clear/packets_1.md
index 4efdb9b81d..2799fe42d1 100644
--- a/guide/src/templates/commands/hermes/clear/packets_1.md
+++ b/guide/src/templates/commands/hermes/clear/packets_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] clear packets[[#OPTIONS]] --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] clear packets[[#OPTIONS]] --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
diff --git a/guide/src/templates/commands/hermes/clear_1.md b/guide/src/templates/commands/hermes/clear_1.md
index 5df52fc125..7b516a5a57 100644
--- a/guide/src/templates/commands/hermes/clear_1.md
+++ b/guide/src/templates/commands/hermes/clear_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] clear [[#SUBCOMMAND]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] clear [[#SUBCOMMAND]]
diff --git a/guide/src/templates/commands/hermes/completions_1.md b/guide/src/templates/commands/hermes/completions_1.md
index a06d20d797..0e8ee9cd41 100644
--- a/guide/src/templates/commands/hermes/completions_1.md
+++ b/guide/src/templates/commands/hermes/completions_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] completions --shell [[#SHELL]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] completions --shell [[#SHELL]]
diff --git a/guide/src/templates/commands/hermes/config/auto_1.md b/guide/src/templates/commands/hermes/config/auto_1.md
index 6886505229..c7c4e932b0 100644
--- a/guide/src/templates/commands/hermes/config/auto_1.md
+++ b/guide/src/templates/commands/hermes/config/auto_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] config auto[[#OPTIONS]] --output [[#PATH]] --chains [[#CHAIN_NAME:OPTIONAL_KEY_NAME]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] config auto[[#OPTIONS]] --output [[#PATH]] --chains [[#CHAIN_NAME:OPTIONAL_KEY_NAME]]
diff --git a/guide/src/templates/commands/hermes/config/validate_1.md b/guide/src/templates/commands/hermes/config/validate_1.md
index f7ca4895e6..2c10ddddee 100644
--- a/guide/src/templates/commands/hermes/config/validate_1.md
+++ b/guide/src/templates/commands/hermes/config/validate_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] config validate
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] config validate
diff --git a/guide/src/templates/commands/hermes/config_1.md b/guide/src/templates/commands/hermes/config_1.md
index c9bf9b3a06..c0df196bd0 100644
--- a/guide/src/templates/commands/hermes/config_1.md
+++ b/guide/src/templates/commands/hermes/config_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] config [[#SUBCOMMAND]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] config [[#SUBCOMMAND]]
diff --git a/guide/src/templates/commands/hermes/create/channel_1.md b/guide/src/templates/commands/hermes/create/channel_1.md
index 91966e911e..f3c0134625 100644
--- a/guide/src/templates/commands/hermes/create/channel_1.md
+++ b/guide/src/templates/commands/hermes/create/channel_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] create channel[[#OPTIONS]] --a-chain [[#A_CHAIN_ID]] --a-connection [[#A_CONNECTION_ID]] --a-port [[#A_PORT_ID]] --b-port [[#B_PORT_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] create channel[[#OPTIONS]] --a-chain [[#A_CHAIN_ID]] --a-connection [[#A_CONNECTION_ID]] --a-port [[#A_PORT_ID]] --b-port [[#B_PORT_ID]]
diff --git a/guide/src/templates/commands/hermes/create/channel_2.md b/guide/src/templates/commands/hermes/create/channel_2.md
index 57ac622e56..51384fe2d7 100644
--- a/guide/src/templates/commands/hermes/create/channel_2.md
+++ b/guide/src/templates/commands/hermes/create/channel_2.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] create channel[[#OPTIONS]] --a-chain [[#A_CHAIN_ID]] --b-chain [[#B_CHAIN_ID]] --a-port [[#A_PORT_ID]] --b-port [[#B_PORT_ID]] --new-client-connection
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] create channel[[#OPTIONS]] --a-chain [[#A_CHAIN_ID]] --b-chain [[#B_CHAIN_ID]] --a-port [[#A_PORT_ID]] --b-port [[#B_PORT_ID]] --new-client-connection
diff --git a/guide/src/templates/commands/hermes/create/client_1.md b/guide/src/templates/commands/hermes/create/client_1.md
index b52b9d7cff..0a9015c42d 100644
--- a/guide/src/templates/commands/hermes/create/client_1.md
+++ b/guide/src/templates/commands/hermes/create/client_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] create client[[#OPTIONS]] --host-chain [[#HOST_CHAIN_ID]] --reference-chain [[#REFERENCE_CHAIN_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] create client[[#OPTIONS]] --host-chain [[#HOST_CHAIN_ID]] --reference-chain [[#REFERENCE_CHAIN_ID]]
diff --git a/guide/src/templates/commands/hermes/create/connection_1.md b/guide/src/templates/commands/hermes/create/connection_1.md
index 019f5e2485..51c0d41fa7 100644
--- a/guide/src/templates/commands/hermes/create/connection_1.md
+++ b/guide/src/templates/commands/hermes/create/connection_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] create connection[[#OPTIONS]] --a-chain [[#A_CHAIN_ID]] --b-chain [[#B_CHAIN_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] create connection[[#OPTIONS]] --a-chain [[#A_CHAIN_ID]] --b-chain [[#B_CHAIN_ID]]
diff --git a/guide/src/templates/commands/hermes/create/connection_2.md b/guide/src/templates/commands/hermes/create/connection_2.md
index 40d4f5ebc5..3035a7ec2b 100644
--- a/guide/src/templates/commands/hermes/create/connection_2.md
+++ b/guide/src/templates/commands/hermes/create/connection_2.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] create connection[[#OPTIONS]] --a-chain [[#A_CHAIN_ID]] --a-client [[#A_CLIENT_ID]] --b-client [[#B_CLIENT_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] create connection[[#OPTIONS]] --a-chain [[#A_CHAIN_ID]] --a-client [[#A_CLIENT_ID]] --b-client [[#B_CLIENT_ID]]
diff --git a/guide/src/templates/commands/hermes/create_1.md b/guide/src/templates/commands/hermes/create_1.md
index 3fe37680fb..24f9bef0f4 100644
--- a/guide/src/templates/commands/hermes/create_1.md
+++ b/guide/src/templates/commands/hermes/create_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] create [[#SUBCOMMAND]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] create [[#SUBCOMMAND]]
diff --git a/guide/src/templates/commands/hermes/fee/register-counterparty-payee_1.md b/guide/src/templates/commands/hermes/fee/register-counterparty-payee_1.md
index 16ba2d7833..efe09b308e 100644
--- a/guide/src/templates/commands/hermes/fee/register-counterparty-payee_1.md
+++ b/guide/src/templates/commands/hermes/fee/register-counterparty-payee_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] fee register-counterparty-payee --chain [[#CHAIN_ID]] --channel [[#CHANNEL_ID]] --port [[#PORT_ID]] --counterparty-payee [[#COUNTERPARTY_PAYEE_ADDRESS]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] fee register-counterparty-payee --chain [[#CHAIN_ID]] --channel [[#CHANNEL_ID]] --port [[#PORT_ID]] --counterparty-payee [[#COUNTERPARTY_PAYEE_ADDRESS]]
diff --git a/guide/src/templates/commands/hermes/fee/register-payee_1.md b/guide/src/templates/commands/hermes/fee/register-payee_1.md
index aa6093733f..115f865185 100644
--- a/guide/src/templates/commands/hermes/fee/register-payee_1.md
+++ b/guide/src/templates/commands/hermes/fee/register-payee_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] fee register-payee --chain [[#CHAIN_ID]] --channel [[#CHANNEL_ID]] --port [[#PORT_ID]] --payee [[#PAYEE_ADDRESS]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] fee register-payee --chain [[#CHAIN_ID]] --channel [[#CHANNEL_ID]] --port [[#PORT_ID]] --payee [[#PAYEE_ADDRESS]]
diff --git a/guide/src/templates/commands/hermes/fee/transfer_1.md b/guide/src/templates/commands/hermes/fee/transfer_1.md
index ebd0e125c2..b45b830f42 100644
--- a/guide/src/templates/commands/hermes/fee/transfer_1.md
+++ b/guide/src/templates/commands/hermes/fee/transfer_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] fee transfer[[#OPTIONS]] --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --src-port [[#SRC_PORT_ID]] --src-channel [[#SRC_CHANNEL_ID]] --amount [[#AMOUNT]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] fee transfer[[#OPTIONS]] --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --src-port [[#SRC_PORT_ID]] --src-channel [[#SRC_CHANNEL_ID]] --amount [[#AMOUNT]]
diff --git a/guide/src/templates/commands/hermes/fee_1.md b/guide/src/templates/commands/hermes/fee_1.md
index 0020a68d1c..c1d759e6ca 100644
--- a/guide/src/templates/commands/hermes/fee_1.md
+++ b/guide/src/templates/commands/hermes/fee_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] fee [[#SUBCOMMAND]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] fee [[#SUBCOMMAND]]
diff --git a/guide/src/templates/commands/hermes/health-check_1.md b/guide/src/templates/commands/hermes/health-check_1.md
index 3d9d581618..7db1cbe8d6 100644
--- a/guide/src/templates/commands/hermes/health-check_1.md
+++ b/guide/src/templates/commands/hermes/health-check_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] health-check
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] health-check
diff --git a/guide/src/templates/commands/hermes/help_1.md b/guide/src/templates/commands/hermes/help_1.md
index 9753c06c15..6a007e56db 100644
--- a/guide/src/templates/commands/hermes/help_1.md
+++ b/guide/src/templates/commands/hermes/help_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]][[#OPTIONS]][[#SUBCOMMAND]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]][[#OPTIONS]][[#SUBCOMMAND]]
diff --git a/guide/src/templates/commands/hermes/keys/add_1.md b/guide/src/templates/commands/hermes/keys/add_1.md
index 8cec138867..9a4899358b 100644
--- a/guide/src/templates/commands/hermes/keys/add_1.md
+++ b/guide/src/templates/commands/hermes/keys/add_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] keys add[[#OPTIONS]] --chain [[#CHAIN_ID]] --key-file [[#KEY_FILE]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] keys add[[#OPTIONS]] --chain [[#CHAIN_ID]] --key-file [[#KEY_FILE]]
diff --git a/guide/src/templates/commands/hermes/keys/add_2.md b/guide/src/templates/commands/hermes/keys/add_2.md
index 75c51f8afb..fbb33ef2b7 100644
--- a/guide/src/templates/commands/hermes/keys/add_2.md
+++ b/guide/src/templates/commands/hermes/keys/add_2.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] keys add[[#OPTIONS]] --chain [[#CHAIN_ID]] --mnemonic-file [[#MNEMONIC_FILE]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] keys add[[#OPTIONS]] --chain [[#CHAIN_ID]] --mnemonic-file [[#MNEMONIC_FILE]]
diff --git a/guide/src/templates/commands/hermes/keys/balance_1.md b/guide/src/templates/commands/hermes/keys/balance_1.md
index c946f3c227..60c9ab52f7 100644
--- a/guide/src/templates/commands/hermes/keys/balance_1.md
+++ b/guide/src/templates/commands/hermes/keys/balance_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] keys balance[[#OPTIONS]] --chain [[#CHAIN_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] keys balance[[#OPTIONS]] --chain [[#CHAIN_ID]]
diff --git a/guide/src/templates/commands/hermes/keys/delete_1.md b/guide/src/templates/commands/hermes/keys/delete_1.md
index 235209dbf6..d3023a493c 100644
--- a/guide/src/templates/commands/hermes/keys/delete_1.md
+++ b/guide/src/templates/commands/hermes/keys/delete_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] keys delete --chain [[#CHAIN_ID]] --key-name [[#KEY_NAME]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] keys delete --chain [[#CHAIN_ID]] --key-name [[#KEY_NAME]]
diff --git a/guide/src/templates/commands/hermes/keys/delete_2.md b/guide/src/templates/commands/hermes/keys/delete_2.md
index e32669c4f3..7c3dba6638 100644
--- a/guide/src/templates/commands/hermes/keys/delete_2.md
+++ b/guide/src/templates/commands/hermes/keys/delete_2.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] keys delete --chain [[#CHAIN_ID]] --all
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] keys delete --chain [[#CHAIN_ID]] --all
diff --git a/guide/src/templates/commands/hermes/keys/list_1.md b/guide/src/templates/commands/hermes/keys/list_1.md
index a1887c6b3e..52a6aa7c6a 100644
--- a/guide/src/templates/commands/hermes/keys/list_1.md
+++ b/guide/src/templates/commands/hermes/keys/list_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] keys list --chain [[#CHAIN_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] keys list --chain [[#CHAIN_ID]]
diff --git a/guide/src/templates/commands/hermes/keys_1.md b/guide/src/templates/commands/hermes/keys_1.md
index 2fa18be15c..d5f2d2416c 100644
--- a/guide/src/templates/commands/hermes/keys_1.md
+++ b/guide/src/templates/commands/hermes/keys_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] keys [[#SUBCOMMAND]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] keys [[#SUBCOMMAND]]
diff --git a/guide/src/templates/commands/hermes/listen_1.md b/guide/src/templates/commands/hermes/listen_1.md
index b596520871..7c040d78a1 100644
--- a/guide/src/templates/commands/hermes/listen_1.md
+++ b/guide/src/templates/commands/hermes/listen_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] listen[[#OPTIONS]] --chain [[#CHAIN_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] listen[[#OPTIONS]] --chain [[#CHAIN_ID]]
diff --git a/guide/src/templates/commands/hermes/misbehaviour_1.md b/guide/src/templates/commands/hermes/misbehaviour_1.md
index 93118a0269..96a77cba42 100644
--- a/guide/src/templates/commands/hermes/misbehaviour_1.md
+++ b/guide/src/templates/commands/hermes/misbehaviour_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] misbehaviour --chain [[#CHAIN_ID]] --client [[#CLIENT_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] misbehaviour --chain [[#CHAIN_ID]] --client [[#CLIENT_ID]]
diff --git a/guide/src/templates/commands/hermes/query/channel/client_1.md b/guide/src/templates/commands/hermes/query/channel/client_1.md
index 775d1a558c..eb85e91db8 100644
--- a/guide/src/templates/commands/hermes/query/channel/client_1.md
+++ b/guide/src/templates/commands/hermes/query/channel/client_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query channel client --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query channel client --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
diff --git a/guide/src/templates/commands/hermes/query/channel/end_1.md b/guide/src/templates/commands/hermes/query/channel/end_1.md
index 4ae001d634..e6e07b133d 100644
--- a/guide/src/templates/commands/hermes/query/channel/end_1.md
+++ b/guide/src/templates/commands/hermes/query/channel/end_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query channel end[[#OPTIONS]] --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query channel end[[#OPTIONS]] --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
diff --git a/guide/src/templates/commands/hermes/query/channel/ends_1.md b/guide/src/templates/commands/hermes/query/channel/ends_1.md
index fa0bdd8cdc..241db662e6 100644
--- a/guide/src/templates/commands/hermes/query/channel/ends_1.md
+++ b/guide/src/templates/commands/hermes/query/channel/ends_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query channel ends[[#OPTIONS]] --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query channel ends[[#OPTIONS]] --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
diff --git a/guide/src/templates/commands/hermes/query/channel_1.md b/guide/src/templates/commands/hermes/query/channel_1.md
index 56adaeab53..330cf87fee 100644
--- a/guide/src/templates/commands/hermes/query/channel_1.md
+++ b/guide/src/templates/commands/hermes/query/channel_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query channel [[#SUBCOMMAND]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query channel [[#SUBCOMMAND]]
diff --git a/guide/src/templates/commands/hermes/query/channels_1.md b/guide/src/templates/commands/hermes/query/channels_1.md
index ca716b9afd..245229e3a7 100644
--- a/guide/src/templates/commands/hermes/query/channels_1.md
+++ b/guide/src/templates/commands/hermes/query/channels_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query channels[[#OPTIONS]] --chain [[#CHAIN_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query channels[[#OPTIONS]] --chain [[#CHAIN_ID]]
diff --git a/guide/src/templates/commands/hermes/query/client/connections_1.md b/guide/src/templates/commands/hermes/query/client/connections_1.md
index c424906882..c106c18560 100644
--- a/guide/src/templates/commands/hermes/query/client/connections_1.md
+++ b/guide/src/templates/commands/hermes/query/client/connections_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query client connections[[#OPTIONS]] --chain [[#CHAIN_ID]] --client [[#CLIENT_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query client connections[[#OPTIONS]] --chain [[#CHAIN_ID]] --client [[#CLIENT_ID]]
diff --git a/guide/src/templates/commands/hermes/query/client/consensus_1.md b/guide/src/templates/commands/hermes/query/client/consensus_1.md
index 330ee1b64e..66b04bde7c 100644
--- a/guide/src/templates/commands/hermes/query/client/consensus_1.md
+++ b/guide/src/templates/commands/hermes/query/client/consensus_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query client consensus[[#OPTIONS]] --chain [[#CHAIN_ID]] --client [[#CLIENT_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query client consensus[[#OPTIONS]] --chain [[#CHAIN_ID]] --client [[#CLIENT_ID]]
diff --git a/guide/src/templates/commands/hermes/query/client/header_1.md b/guide/src/templates/commands/hermes/query/client/header_1.md
index b0738bd191..ab1ba2afbf 100644
--- a/guide/src/templates/commands/hermes/query/client/header_1.md
+++ b/guide/src/templates/commands/hermes/query/client/header_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query client header[[#OPTIONS]] --chain [[#CHAIN_ID]] --client [[#CLIENT_ID]] --consensus-height [[#CONSENSUS_HEIGHT]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query client header[[#OPTIONS]] --chain [[#CHAIN_ID]] --client [[#CLIENT_ID]] --consensus-height [[#CONSENSUS_HEIGHT]]
diff --git a/guide/src/templates/commands/hermes/query/client/state_1.md b/guide/src/templates/commands/hermes/query/client/state_1.md
index df51c517ac..372d2d04ec 100644
--- a/guide/src/templates/commands/hermes/query/client/state_1.md
+++ b/guide/src/templates/commands/hermes/query/client/state_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query client state[[#OPTIONS]] --chain [[#CHAIN_ID]] --client [[#CLIENT_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query client state[[#OPTIONS]] --chain [[#CHAIN_ID]] --client [[#CLIENT_ID]]
diff --git a/guide/src/templates/commands/hermes/query/client/status_1.md b/guide/src/templates/commands/hermes/query/client/status_1.md
index 7d1ff654ed..b4f56996ed 100644
--- a/guide/src/templates/commands/hermes/query/client/status_1.md
+++ b/guide/src/templates/commands/hermes/query/client/status_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query client status --chain [[#CHAIN_ID]] --client [[#CLIENT_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query client status --chain [[#CHAIN_ID]] --client [[#CLIENT_ID]]
diff --git a/guide/src/templates/commands/hermes/query/client_1.md b/guide/src/templates/commands/hermes/query/client_1.md
index 4bab05d621..d2621fa192 100644
--- a/guide/src/templates/commands/hermes/query/client_1.md
+++ b/guide/src/templates/commands/hermes/query/client_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query client [[#SUBCOMMAND]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query client [[#SUBCOMMAND]]
diff --git a/guide/src/templates/commands/hermes/query/clients_1.md b/guide/src/templates/commands/hermes/query/clients_1.md
index e8d7359e6a..3daedb2a1e 100644
--- a/guide/src/templates/commands/hermes/query/clients_1.md
+++ b/guide/src/templates/commands/hermes/query/clients_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query clients[[#OPTIONS]] --host-chain [[#HOST_CHAIN_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query clients[[#OPTIONS]] --host-chain [[#HOST_CHAIN_ID]]
diff --git a/guide/src/templates/commands/hermes/query/connection/channels_1.md b/guide/src/templates/commands/hermes/query/connection/channels_1.md
index bd25265ff4..6125e9e967 100644
--- a/guide/src/templates/commands/hermes/query/connection/channels_1.md
+++ b/guide/src/templates/commands/hermes/query/connection/channels_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query connection channels --chain [[#CHAIN_ID]] --connection [[#CONNECTION_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query connection channels --chain [[#CHAIN_ID]] --connection [[#CONNECTION_ID]]
diff --git a/guide/src/templates/commands/hermes/query/connection/end_1.md b/guide/src/templates/commands/hermes/query/connection/end_1.md
index 950e792e2a..0c5400ae39 100644
--- a/guide/src/templates/commands/hermes/query/connection/end_1.md
+++ b/guide/src/templates/commands/hermes/query/connection/end_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query connection end[[#OPTIONS]] --chain [[#CHAIN_ID]] --connection [[#CONNECTION_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query connection end[[#OPTIONS]] --chain [[#CHAIN_ID]] --connection [[#CONNECTION_ID]]
diff --git a/guide/src/templates/commands/hermes/query/connection_1.md b/guide/src/templates/commands/hermes/query/connection_1.md
index cf99893668..d1bc7e1515 100644
--- a/guide/src/templates/commands/hermes/query/connection_1.md
+++ b/guide/src/templates/commands/hermes/query/connection_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query connection [[#SUBCOMMAND]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query connection [[#SUBCOMMAND]]
diff --git a/guide/src/templates/commands/hermes/query/connections_1.md b/guide/src/templates/commands/hermes/query/connections_1.md
index 56be68f377..0319641ecd 100644
--- a/guide/src/templates/commands/hermes/query/connections_1.md
+++ b/guide/src/templates/commands/hermes/query/connections_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query connections[[#OPTIONS]] --chain [[#CHAIN_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query connections[[#OPTIONS]] --chain [[#CHAIN_ID]]
diff --git a/guide/src/templates/commands/hermes/query/packet/ack_1.md b/guide/src/templates/commands/hermes/query/packet/ack_1.md
index e264dc1b7a..f719128c22 100644
--- a/guide/src/templates/commands/hermes/query/packet/ack_1.md
+++ b/guide/src/templates/commands/hermes/query/packet/ack_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet ack[[#OPTIONS]] --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]] --sequence [[#SEQUENCE]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet ack[[#OPTIONS]] --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]] --sequence [[#SEQUENCE]]
diff --git a/guide/src/templates/commands/hermes/query/packet/acks_1.md b/guide/src/templates/commands/hermes/query/packet/acks_1.md
index 7463c22a19..3b0d5143ec 100644
--- a/guide/src/templates/commands/hermes/query/packet/acks_1.md
+++ b/guide/src/templates/commands/hermes/query/packet/acks_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet acks --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet acks --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
diff --git a/guide/src/templates/commands/hermes/query/packet/commitment_1.md b/guide/src/templates/commands/hermes/query/packet/commitment_1.md
index 51f7b4ab0f..fdf68791ce 100644
--- a/guide/src/templates/commands/hermes/query/packet/commitment_1.md
+++ b/guide/src/templates/commands/hermes/query/packet/commitment_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet commitment[[#OPTIONS]] --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]] --sequence [[#SEQUENCE]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet commitment[[#OPTIONS]] --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]] --sequence [[#SEQUENCE]]
diff --git a/guide/src/templates/commands/hermes/query/packet/commitments_1.md b/guide/src/templates/commands/hermes/query/packet/commitments_1.md
index c76599c8b6..57b807de52 100644
--- a/guide/src/templates/commands/hermes/query/packet/commitments_1.md
+++ b/guide/src/templates/commands/hermes/query/packet/commitments_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet commitments --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet commitments --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
diff --git a/guide/src/templates/commands/hermes/query/packet/pending-acks_1.md b/guide/src/templates/commands/hermes/query/packet/pending-acks_1.md
index 4295fb7a63..28abad7ab1 100644
--- a/guide/src/templates/commands/hermes/query/packet/pending-acks_1.md
+++ b/guide/src/templates/commands/hermes/query/packet/pending-acks_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet pending-acks --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet pending-acks --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
diff --git a/guide/src/templates/commands/hermes/query/packet/pending-sends_1.md b/guide/src/templates/commands/hermes/query/packet/pending-sends_1.md
index ba812f7f55..db32ee3c67 100644
--- a/guide/src/templates/commands/hermes/query/packet/pending-sends_1.md
+++ b/guide/src/templates/commands/hermes/query/packet/pending-sends_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet pending-sends --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet pending-sends --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
diff --git a/guide/src/templates/commands/hermes/query/packet/pending_1.md b/guide/src/templates/commands/hermes/query/packet/pending_1.md
index 8c5ffdac8e..d44ecfd5d0 100644
--- a/guide/src/templates/commands/hermes/query/packet/pending_1.md
+++ b/guide/src/templates/commands/hermes/query/packet/pending_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet pending --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet pending --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
diff --git a/guide/src/templates/commands/hermes/query/packet_1.md b/guide/src/templates/commands/hermes/query/packet_1.md
index e01562e4ec..90d389b6a6 100644
--- a/guide/src/templates/commands/hermes/query/packet_1.md
+++ b/guide/src/templates/commands/hermes/query/packet_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet [[#SUBCOMMAND]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet [[#SUBCOMMAND]]
diff --git a/guide/src/templates/commands/hermes/query/transfer/denom-trace_1.md b/guide/src/templates/commands/hermes/query/transfer/denom-trace_1.md
index 892ff84086..030469df6d 100644
--- a/guide/src/templates/commands/hermes/query/transfer/denom-trace_1.md
+++ b/guide/src/templates/commands/hermes/query/transfer/denom-trace_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query transfer denom-trace --chain [[#CHAIN_ID]] --hash [[#HASH]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query transfer denom-trace --chain [[#CHAIN_ID]] --hash [[#HASH]]
diff --git a/guide/src/templates/commands/hermes/query/transfer_1.md b/guide/src/templates/commands/hermes/query/transfer_1.md
index 75329ad655..373bdebdcc 100644
--- a/guide/src/templates/commands/hermes/query/transfer_1.md
+++ b/guide/src/templates/commands/hermes/query/transfer_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query transfer [[#SUBCOMMAND]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query transfer [[#SUBCOMMAND]]
diff --git a/guide/src/templates/commands/hermes/query/tx/events_1.md b/guide/src/templates/commands/hermes/query/tx/events_1.md
index 75fad32a46..7f732710c5 100644
--- a/guide/src/templates/commands/hermes/query/tx/events_1.md
+++ b/guide/src/templates/commands/hermes/query/tx/events_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query tx events --chain [[#CHAIN_ID]] --hash [[#HASH]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query tx events --chain [[#CHAIN_ID]] --hash [[#HASH]]
diff --git a/guide/src/templates/commands/hermes/query/tx_1.md b/guide/src/templates/commands/hermes/query/tx_1.md
index fa8e272808..c1ceebdd7c 100644
--- a/guide/src/templates/commands/hermes/query/tx_1.md
+++ b/guide/src/templates/commands/hermes/query/tx_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query tx [[#SUBCOMMAND]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query tx [[#SUBCOMMAND]]
diff --git a/guide/src/templates/commands/hermes/query_1.md b/guide/src/templates/commands/hermes/query_1.md
index 642eb68ddb..02b47178b8 100644
--- a/guide/src/templates/commands/hermes/query_1.md
+++ b/guide/src/templates/commands/hermes/query_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query [[#SUBCOMMAND]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query [[#SUBCOMMAND]]
diff --git a/guide/src/templates/commands/hermes/start_1.md b/guide/src/templates/commands/hermes/start_1.md
index 7ca2807b18..ea42387c81 100644
--- a/guide/src/templates/commands/hermes/start_1.md
+++ b/guide/src/templates/commands/hermes/start_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] start[[#OPTIONS]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] start[[#OPTIONS]]
diff --git a/guide/src/templates/commands/hermes/tx/chan-close-confirm_1.md b/guide/src/templates/commands/hermes/tx/chan-close-confirm_1.md
index a709e4ca61..7946270032 100644
--- a/guide/src/templates/commands/hermes/tx/chan-close-confirm_1.md
+++ b/guide/src/templates/commands/hermes/tx/chan-close-confirm_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] tx chan-close-confirm --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --dst-connection [[#DST_CONNECTION_ID]] --dst-port [[#DST_PORT_ID]] --src-port [[#SRC_PORT_ID]] --dst-channel [[#DST_CHANNEL_ID]] --src-channel [[#SRC_CHANNEL_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] tx chan-close-confirm --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --dst-connection [[#DST_CONNECTION_ID]] --dst-port [[#DST_PORT_ID]] --src-port [[#SRC_PORT_ID]] --dst-channel [[#DST_CHANNEL_ID]] --src-channel [[#SRC_CHANNEL_ID]]
diff --git a/guide/src/templates/commands/hermes/tx/chan-close-init_1.md b/guide/src/templates/commands/hermes/tx/chan-close-init_1.md
index e056033eeb..3e3385a0d7 100644
--- a/guide/src/templates/commands/hermes/tx/chan-close-init_1.md
+++ b/guide/src/templates/commands/hermes/tx/chan-close-init_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] tx chan-close-init --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --dst-connection [[#DST_CONNECTION_ID]] --dst-port [[#DST_PORT_ID]] --src-port [[#SRC_PORT_ID]] --dst-channel [[#DST_CHANNEL_ID]] --src-channel [[#SRC_CHANNEL_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] tx chan-close-init --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --dst-connection [[#DST_CONNECTION_ID]] --dst-port [[#DST_PORT_ID]] --src-port [[#SRC_PORT_ID]] --dst-channel [[#DST_CHANNEL_ID]] --src-channel [[#SRC_CHANNEL_ID]]
diff --git a/guide/src/templates/commands/hermes/tx/chan-open-ack_1.md b/guide/src/templates/commands/hermes/tx/chan-open-ack_1.md
index c9ad37a8c6..4f4ad5367d 100644
--- a/guide/src/templates/commands/hermes/tx/chan-open-ack_1.md
+++ b/guide/src/templates/commands/hermes/tx/chan-open-ack_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] tx chan-open-ack --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --dst-connection [[#DST_CONNECTION_ID]] --dst-port [[#DST_PORT_ID]] --src-port [[#SRC_PORT_ID]] --dst-channel [[#DST_CHANNEL_ID]] --src-channel [[#SRC_CHANNEL_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] tx chan-open-ack --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --dst-connection [[#DST_CONNECTION_ID]] --dst-port [[#DST_PORT_ID]] --src-port [[#SRC_PORT_ID]] --dst-channel [[#DST_CHANNEL_ID]] --src-channel [[#SRC_CHANNEL_ID]]
diff --git a/guide/src/templates/commands/hermes/tx/chan-open-confirm_1.md b/guide/src/templates/commands/hermes/tx/chan-open-confirm_1.md
index 0016c1871a..a415d2f369 100644
--- a/guide/src/templates/commands/hermes/tx/chan-open-confirm_1.md
+++ b/guide/src/templates/commands/hermes/tx/chan-open-confirm_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] tx chan-open-confirm --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --dst-connection [[#DST_CONNECTION_ID]] --dst-port [[#DST_PORT_ID]] --src-port [[#SRC_PORT_ID]] --dst-channel [[#DST_CHANNEL_ID]] --src-channel [[#SRC_CHANNEL_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] tx chan-open-confirm --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --dst-connection [[#DST_CONNECTION_ID]] --dst-port [[#DST_PORT_ID]] --src-port [[#SRC_PORT_ID]] --dst-channel [[#DST_CHANNEL_ID]] --src-channel [[#SRC_CHANNEL_ID]]
diff --git a/guide/src/templates/commands/hermes/tx/chan-open-init_1.md b/guide/src/templates/commands/hermes/tx/chan-open-init_1.md
index 6b6d67c4e1..ff22d6c62a 100644
--- a/guide/src/templates/commands/hermes/tx/chan-open-init_1.md
+++ b/guide/src/templates/commands/hermes/tx/chan-open-init_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] tx chan-open-init[[#OPTIONS]] --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --dst-connection [[#DST_CONNECTION_ID]] --dst-port [[#DST_PORT_ID]] --src-port [[#SRC_PORT_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] tx chan-open-init[[#OPTIONS]] --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --dst-connection [[#DST_CONNECTION_ID]] --dst-port [[#DST_PORT_ID]] --src-port [[#SRC_PORT_ID]]
diff --git a/guide/src/templates/commands/hermes/tx/chan-open-try_1.md b/guide/src/templates/commands/hermes/tx/chan-open-try_1.md
index eb4df9cd61..8d8c6dfe55 100644
--- a/guide/src/templates/commands/hermes/tx/chan-open-try_1.md
+++ b/guide/src/templates/commands/hermes/tx/chan-open-try_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] tx chan-open-try[[#OPTIONS]] --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --dst-connection [[#DST_CONNECTION_ID]] --dst-port [[#DST_PORT_ID]] --src-port [[#SRC_PORT_ID]] --src-channel [[#SRC_CHANNEL_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] tx chan-open-try[[#OPTIONS]] --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --dst-connection [[#DST_CONNECTION_ID]] --dst-port [[#DST_PORT_ID]] --src-port [[#SRC_PORT_ID]] --src-channel [[#SRC_CHANNEL_ID]]
diff --git a/guide/src/templates/commands/hermes/tx/conn-ack_1.md b/guide/src/templates/commands/hermes/tx/conn-ack_1.md
index 94528b9445..95382a52c0 100644
--- a/guide/src/templates/commands/hermes/tx/conn-ack_1.md
+++ b/guide/src/templates/commands/hermes/tx/conn-ack_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] tx conn-ack --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --dst-client [[#DST_CLIENT_ID]] --src-client [[#SRC_CLIENT_ID]] --dst-connection [[#DST_CONNECTION_ID]] --src-connection [[#SRC_CONNECTION_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] tx conn-ack --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --dst-client [[#DST_CLIENT_ID]] --src-client [[#SRC_CLIENT_ID]] --dst-connection [[#DST_CONNECTION_ID]] --src-connection [[#SRC_CONNECTION_ID]]
diff --git a/guide/src/templates/commands/hermes/tx/conn-confirm_1.md b/guide/src/templates/commands/hermes/tx/conn-confirm_1.md
index f356aa953e..e7b7c6ae54 100644
--- a/guide/src/templates/commands/hermes/tx/conn-confirm_1.md
+++ b/guide/src/templates/commands/hermes/tx/conn-confirm_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] tx conn-confirm --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --dst-client [[#DST_CLIENT_ID]] --src-client [[#SRC_CLIENT_ID]] --dst-connection [[#DST_CONNECTION_ID]] --src-connection [[#SRC_CONNECTION_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] tx conn-confirm --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --dst-client [[#DST_CLIENT_ID]] --src-client [[#SRC_CLIENT_ID]] --dst-connection [[#DST_CONNECTION_ID]] --src-connection [[#SRC_CONNECTION_ID]]
diff --git a/guide/src/templates/commands/hermes/tx/conn-init_1.md b/guide/src/templates/commands/hermes/tx/conn-init_1.md
index 12add1670d..b8cf68ee2c 100644
--- a/guide/src/templates/commands/hermes/tx/conn-init_1.md
+++ b/guide/src/templates/commands/hermes/tx/conn-init_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] tx conn-init --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --dst-client [[#DST_CLIENT_ID]] --src-client [[#SRC_CLIENT_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] tx conn-init --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --dst-client [[#DST_CLIENT_ID]] --src-client [[#SRC_CLIENT_ID]]
diff --git a/guide/src/templates/commands/hermes/tx/conn-try_1.md b/guide/src/templates/commands/hermes/tx/conn-try_1.md
index 3cd0532eeb..772d25d5af 100644
--- a/guide/src/templates/commands/hermes/tx/conn-try_1.md
+++ b/guide/src/templates/commands/hermes/tx/conn-try_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] tx conn-try[[#OPTIONS]] --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --dst-client [[#DST_CLIENT_ID]] --src-client [[#SRC_CLIENT_ID]] --src-connection [[#SRC_CONNECTION_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] tx conn-try[[#OPTIONS]] --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --dst-client [[#DST_CLIENT_ID]] --src-client [[#SRC_CLIENT_ID]] --src-connection [[#SRC_CONNECTION_ID]]
diff --git a/guide/src/templates/commands/hermes/tx/ft-transfer_1.md b/guide/src/templates/commands/hermes/tx/ft-transfer_1.md
index 4cb657344a..0f75e26c48 100644
--- a/guide/src/templates/commands/hermes/tx/ft-transfer_1.md
+++ b/guide/src/templates/commands/hermes/tx/ft-transfer_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] tx ft-transfer[[#OPTIONS]] --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --src-port [[#SRC_PORT_ID]] --src-channel [[#SRC_CHANNEL_ID]] --amount [[#AMOUNT]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] tx ft-transfer[[#OPTIONS]] --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --src-port [[#SRC_PORT_ID]] --src-channel [[#SRC_CHANNEL_ID]] --amount [[#AMOUNT]]
diff --git a/guide/src/templates/commands/hermes/tx/packet-ack_1.md b/guide/src/templates/commands/hermes/tx/packet-ack_1.md
index 8002a26bf9..0ae1302cd4 100644
--- a/guide/src/templates/commands/hermes/tx/packet-ack_1.md
+++ b/guide/src/templates/commands/hermes/tx/packet-ack_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] tx packet-ack[[#OPTIONS]] --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --src-port [[#SRC_PORT_ID]] --src-channel [[#SRC_CHANNEL_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] tx packet-ack[[#OPTIONS]] --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --src-port [[#SRC_PORT_ID]] --src-channel [[#SRC_CHANNEL_ID]]
diff --git a/guide/src/templates/commands/hermes/tx/packet-recv_1.md b/guide/src/templates/commands/hermes/tx/packet-recv_1.md
index 7e7242f6db..391607bf19 100644
--- a/guide/src/templates/commands/hermes/tx/packet-recv_1.md
+++ b/guide/src/templates/commands/hermes/tx/packet-recv_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] tx packet-recv[[#OPTIONS]] --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --src-port [[#SRC_PORT_ID]] --src-channel [[#SRC_CHANNEL_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] tx packet-recv[[#OPTIONS]] --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --src-port [[#SRC_PORT_ID]] --src-channel [[#SRC_CHANNEL_ID]]
diff --git a/guide/src/templates/commands/hermes/tx/upgrade-chain_1.md b/guide/src/templates/commands/hermes/tx/upgrade-chain_1.md
index aceb9f48c1..8151701a16 100644
--- a/guide/src/templates/commands/hermes/tx/upgrade-chain_1.md
+++ b/guide/src/templates/commands/hermes/tx/upgrade-chain_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] tx upgrade-chain[[#OPTIONS]] --reference-chain [[#REFERENCE_CHAIN_ID]] --host-chain [[#HOST_CHAIN_ID]] --host-client [[#HOST_CLIENT_ID]] --amount [[#AMOUNT]] --height-offset [[#HEIGHT_OFFSET]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] tx upgrade-chain[[#OPTIONS]] --reference-chain [[#REFERENCE_CHAIN_ID]] --host-chain [[#HOST_CHAIN_ID]] --host-client [[#HOST_CLIENT_ID]] --amount [[#AMOUNT]] --height-offset [[#HEIGHT_OFFSET]]
diff --git a/guide/src/templates/commands/hermes/tx_1.md b/guide/src/templates/commands/hermes/tx_1.md
index eca9bc54c0..2619d479d0 100644
--- a/guide/src/templates/commands/hermes/tx_1.md
+++ b/guide/src/templates/commands/hermes/tx_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] tx [[#SUBCOMMAND]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] tx [[#SUBCOMMAND]]
diff --git a/guide/src/templates/commands/hermes/update/client_1.md b/guide/src/templates/commands/hermes/update/client_1.md
index 242df424bd..7cfb119475 100644
--- a/guide/src/templates/commands/hermes/update/client_1.md
+++ b/guide/src/templates/commands/hermes/update/client_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] update client[[#OPTIONS]] --host-chain [[#HOST_CHAIN_ID]] --client [[#CLIENT_ID]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] update client[[#OPTIONS]] --host-chain [[#HOST_CHAIN_ID]] --client [[#CLIENT_ID]]
diff --git a/guide/src/templates/commands/hermes/update_1.md b/guide/src/templates/commands/hermes/update_1.md
index f2a78315ec..7b0b60456b 100644
--- a/guide/src/templates/commands/hermes/update_1.md
+++ b/guide/src/templates/commands/hermes/update_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] update [[#SUBCOMMAND]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] update [[#SUBCOMMAND]]
diff --git a/guide/src/templates/commands/hermes/upgrade/client_1.md b/guide/src/templates/commands/hermes/upgrade/client_1.md
index 9952a4147b..2577c7c284 100644
--- a/guide/src/templates/commands/hermes/upgrade/client_1.md
+++ b/guide/src/templates/commands/hermes/upgrade/client_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] upgrade client --host-chain [[#HOST_CHAIN_ID]] --client [[#CLIENT_ID]] --upgrade-height [[#REFERENCE_UPGRADE_HEIGHT]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] upgrade client --host-chain [[#HOST_CHAIN_ID]] --client [[#CLIENT_ID]] --upgrade-height [[#REFERENCE_UPGRADE_HEIGHT]]
diff --git a/guide/src/templates/commands/hermes/upgrade/clients_1.md b/guide/src/templates/commands/hermes/upgrade/clients_1.md
index 0d9cd56554..d9853d84e4 100644
--- a/guide/src/templates/commands/hermes/upgrade/clients_1.md
+++ b/guide/src/templates/commands/hermes/upgrade/clients_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] upgrade clients[[#OPTIONS]] --reference-chain [[#REFERENCE_CHAIN_ID]] --upgrade-height [[#REFERENCE_UPGRADE_HEIGHT]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] upgrade clients[[#OPTIONS]] --reference-chain [[#REFERENCE_CHAIN_ID]] --upgrade-height [[#REFERENCE_UPGRADE_HEIGHT]]
diff --git a/guide/src/templates/commands/hermes/upgrade_1.md b/guide/src/templates/commands/hermes/upgrade_1.md
index 0fc1bac6f8..35da035cf5 100644
--- a/guide/src/templates/commands/hermes/upgrade_1.md
+++ b/guide/src/templates/commands/hermes/upgrade_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] upgrade [[#SUBCOMMAND]]
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] upgrade [[#SUBCOMMAND]]
diff --git a/guide/src/templates/commands/hermes/version_1.md b/guide/src/templates/commands/hermes/version_1.md
index ad6c83dabf..1623e03d4c 100644
--- a/guide/src/templates/commands/hermes/version_1.md
+++ b/guide/src/templates/commands/hermes/version_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] version
\ No newline at end of file
+[[#BINARY hermes]][[#GLOBALOPTIONS]] version
diff --git a/guide/src/templates/gaia-version.md b/guide/src/templates/gaia-version.md
new file mode 100644
index 0000000000..839d911964
--- /dev/null
+++ b/guide/src/templates/gaia-version.md
@@ -0,0 +1 @@
+v9.0.3
\ No newline at end of file
diff --git a/guide/src/templates/help_templates/config.md b/guide/src/templates/help_templates/config.md
index ef64232473..ea00969401 100644
--- a/guide/src/templates/help_templates/config.md
+++ b/guide/src/templates/help_templates/config.md
@@ -1,5 +1,5 @@
 DESCRIPTION:
-Validate Hermes configuration file
+Generate a new Hermes configuration file or validate an existing one
 
 USAGE:
     hermes config <SUBCOMMAND>
@@ -8,8 +8,6 @@ OPTIONS:
     -h, --help    Print help information
 
 SUBCOMMANDS:
-    auto        Automatically generate a configuration file by fetching data from the
-                    chain-registry. If a pair of chains exists in the _IBC folder of the
-                    chain-registry then a corresponding packet filter is added to the configuration
+    auto        Automatically generate a config.toml for the specified chain(s)
     help        Print this message or the help of the given subcommand(s)
     validate    Validate the relayer configuration
diff --git a/guide/src/templates/help_templates/config/auto.md b/guide/src/templates/help_templates/config/auto.md
index fe3327e516..b1b9e1773e 100644
--- a/guide/src/templates/help_templates/config/auto.md
+++ b/guide/src/templates/help_templates/config/auto.md
@@ -1,7 +1,5 @@
 DESCRIPTION:
-Automatically generate a configuration file by fetching data from the chain-registry. If a pair of
-chains exists in the _IBC folder of the chain-registry then a corresponding packet filter is added
-to the configuration
+Automatically generate a config.toml for the specified chain(s)
 
 USAGE:
     hermes config auto [OPTIONS] --output <PATH> --chains <CHAIN_NAME:OPTIONAL_KEY_NAME>
diff --git a/guide/src/templates/help_templates/help.md b/guide/src/templates/help_templates/help.md
index 6c56d6d60d..72007c51ed 100644
--- a/guide/src/templates/help_templates/help.md
+++ b/guide/src/templates/help_templates/help.md
@@ -13,7 +13,7 @@ OPTIONS:
 
 SUBCOMMANDS:
     clear           Clear objects, such as outstanding packets on a channel
-    config          Validate Hermes configuration file
+    config          Generate a new Hermes configuration file or validate an existing one
     create          Create objects (client, connection, or channel) on chains
     fee             Interact with the fee middleware
     health-check    Performs a health check of all chains in the the config
diff --git a/guide/src/templates/version.md b/guide/src/templates/hermes-version.md
similarity index 100%
rename from guide/src/templates/version.md
rename to guide/src/templates/hermes-version.md
diff --git a/guide/src/tutorials/pre-requisites/gaia.md b/guide/src/tutorials/pre-requisites/gaia.md
index 6947a63dc4..7c390fa5ad 100644
--- a/guide/src/tutorials/pre-requisites/gaia.md
+++ b/guide/src/tutorials/pre-requisites/gaia.md
@@ -24,7 +24,7 @@ Run the `make` command to build and install `gaiad`
 
 ```shell
 cd ~/go/src/github.com/cosmos/gaia
-git checkout v4.2.1 
+git checkout {{#template ../../templates/gaia-version.md}}
 make install
 ```
 
@@ -41,8 +41,7 @@ Output:
 ```shell
 name: gaia
 server_name: gaiad
-version: v4.2.1
-commit: dbd8a6fb522c571debf958837f9113c56d418f6b
+version: {{#template ../../templates/gaia-version.md}}
 ```
 
 ---