diff --git a/_data/versions.yaml b/_data/versions.yaml
index 83bdb3c4..152b161a 100644
--- a/_data/versions.yaml
+++ b/_data/versions.yaml
@@ -1,16 +1,21 @@
 cryostat:
-  version: 2.3.0
-  release-branch: cryostat-v2.3
+  version: '2.4.0'
+  release-branch: 'cryostat-v2.4'
+agent:
+  version: '0.3.0'
 openshift:
   version: '4.10'
 kubernetes:
   version: '1.19'
 operator-sdk:
-  version: '1.28.0'
+  version: '1.31.0'
 operator-lifecycle-manager:
-  version: '0.24.0'
+  version: '0.25.0'
+cert-manager:
+  version: '1.11.5'
 documentation:
   - 'latest'
+  - 2.3.0
   - 2.2.0
   - 2.1.0
   - 2.0.0
diff --git a/demo/index.md b/demo/index.md
index 34100109..a27ea4c0 100644
--- a/demo/index.md
+++ b/demo/index.md
@@ -16,7 +16,7 @@ Core JFR functionality is not available in this stubbed out demo, but you can us
   <iframe
     id="demo-frame"
     class="demo-iframe"
-    src="https://cryostatio-cryostat-web-cryostat-v23.surge.sh"
+    src="https://cryostatio-cryostat-web-{{ site.data.versions.cryostat.release-branch | remove: '.' }}.surge.sh"
   ></iframe>
 </div>
 <script>
diff --git a/get-started/index.md b/get-started/index.md
index d6659c27..034f468f 100644
--- a/get-started/index.md
+++ b/get-started/index.md
@@ -12,24 +12,25 @@ Cryostat {{ site.data.versions.cryostat.version }}
 {:toc}
 
 ## [Installing Cryostat Operator](#installing-cryostat-operator)
-Follow the steps below to install the Cryostat Operator via [OperatorHub](https://operatorhub.io/operator/cryostat-operator).
+Follow the steps below to install the **Cryostat Operator** via [**OperatorHub**](https://operatorhub.io/operator/cryostat-operator).
 
 ### [Install cert-manager](#install-cert-manager)
-The Cryostat Operator requires [cert-manager](https://cert-manager.io/) to run.
-If not already installed in your cluster, please 
+
+The **Cryostat Operator** requires [**cert-manager**](https://cert-manager.io/) v{{ site.data.versions.cert-manager.version }}+ to run.
+If not already installed in your cluster, please
 [install](https://cert-manager.io/docs/installation/) it using your preferred method.
-Once installed, proceed with the Operator installation steps below.
+Once installed, proceed with the **Operator** installation steps below.
 
-**Warning**: Although it is possible to [disable cert-manager integration](https://github.com/cryostatio/cryostat-operator/blob/{{site.data.versions.cryostat.release-branch}}/docs/config.md#disabling-cert-manager-integration), it is NOT recommended to
-do so unless cert-manager is unavailable AND one of the following applies to you:
+<span style="color:red">**Warning**:</span> Although it is possible to [disable **cert-manager** integration](https://github.com/cryostatio/cryostat-operator/blob/{{site.data.versions.cryostat.release-branch}}/docs/config.md#disabling-cert-manager-integration), it is NOT recommended to
+do so unless **cert-manager** is unavailable AND one of the following applies to you:
 - You have another solution for encrypting traffic
-- You trust everything running in the same cluster where the Cryostat Operator is deployed
+- You trust everything running in the same cluster where the **Cryostat Operator** is deployed
 
 ### [Install via OperatorHub](#install-via-operatorhub)
-See below for a summary of the installation steps from the Cryostat Operator page on [OperatorHub](https://operatorhub.io/cryostat-operator). For more details, visit [Installing the Cryostat Operator from OperatorHub](https://developers.redhat.com/articles/2022/01/20/install-cryostat-operator-kubernetes-operatorhubio#). 
+See below for a summary of the installation steps from the **Cryostat Operator** page on [**OperatorHub**](https://operatorhub.io/cryostat-operator). For more details, visit [Installing the **Cryostat Operator** from OperatorHub](https://developers.redhat.com/articles/2022/01/20/install-cryostat-operator-kubernetes-operatorhubio#).
 
-1. Install the Operator Lifecycle Manager:
-    Check if OLM is already installed:
+1. Install the Operator Lifecycle Manager **(OLM)**:
+    Check if **OLM** is already installed:
     ```bash
     $ operator-sdk olm status
     $ # or without the operator-sdk binary,
@@ -39,7 +40,7 @@ See below for a summary of the installation steps from the Cryostat Operator pag
 
     **If Operator Lifecycle Manager (OLM) and OperatorHub are already installed and available on your cluster, skip to Step 3:**
 
-    Install Operator Lifecycle Manager:
+    Install **OLM**:
 
     ```bash
     $ operator-sdk olm install
@@ -58,7 +59,7 @@ packageserver-8cccc99dd-dv8rp       1/1     Running   0          3m3s
 packageserver-8cccc99dd-g7lkh       1/1     Running   0          3m3s
 ```
 
-3. Install Cryostat from OperatorHub:
+3. Install **Cryostat** from **OperatorHub**:
 {% include howto_step.html
   details-attributes="open"
   summary="Cryostat on OperatorHub"
@@ -69,23 +70,22 @@ Use the search bar to find the **Red Hat build of Cryostat** catalog item.
   summary="Select the Cryostat Operator and click the Install button"
   image-name="cryostat-operatorhub-install.png"
 %}
-Choose your Operator installation mode:
-1. In **All Namespaces** installation mode, the Cryostat Operator instance will watch for `Cryostat` or
-`ClusterCryostat` Custom Resources (`CR`s) created in any Namespace and create corresponding Cryostat instances.
-2. In the **A specific namespace** installation mode, you must also select an installation Namespace, and the Cryostat
-Operator instance will only watch for `Cryostat` or `ClusterCryostat` instances created in that same Namespace.
+Choose your **Operator** installation mode:
+1. In `All Namespaces` installation mode, the **Cryostat Operator** instance will watch for **Cryostat** or
+**ClusterCryostat** Custom Resources (**CR**s) created in any `Namespace` and create corresponding **Cryostat** instances.
+2. In the `A specific namespace` installation mode, you must also select an installation `Namespace`, and the **Cryostat Operator** instance will only watch for **Cryostat** or **ClusterCryostat** instances created in that same `Namespace`.
 {% include howto_step.html
   summary="Install the Operator"
   image-name="cryostat-operatorhub-install-in-progress.png"
 %}
-Click "Install" and wait for the installation to complete. In this example we will proceed with **All Namespaces**.
+Click "*Install*" and wait for the installation to complete. In this example we will proceed with **All Namespaces**.
 
 Continue to [Setup](#setup).
 
 ## [Setup](#setup)
 
-**Note:** An alternative setup using the multi-namespace `ClusterCryostat` `CR` is described in
-[Alternate Setup](#alternate-setup). For simplicity we will continue with the single-namespace `Cryostat` `CR`.
+**Note:** An alternative setup using the multi-namespace **ClusterCryostat CR** is described in
+[Alternate Setup](#alternate-setup). For simplicity we will continue with the single-namespace **Cryostat CR**.
 
 ### [Deploying Cryostat](#deploying-cryostat)
 
@@ -93,16 +93,16 @@ Continue to [Setup](#setup).
   summary="Create a Cryostat instance"
   image-name="cryostat-operatorhub-install-complete.png"
 %}
-Once the installation is complete, click **Create Cryostat** to create a `Cryostat` `CR` instance in an OpenShift
-Project (Kubernetes `Namespace`) of your choice. This provides configuration information for the Operator to know the
-specifics of how to deploy your Cryostat instance. For full details on how to configure the Cryostat deployment, see
-[Configuring Cryostat](https://github.com/cryostatio/cryostat-operator/blob/{{site.data.versions.cryostat.release-branch}}/docs/config.md).
+Once the installation is complete, click *Create Cryostat* to create a **Cryostat CR** instance in an **OpenShift
+Project** (**Kubernetes Namespace**) of your choice. This provides configuration information for the **Operator** to know the
+specifics of how to deploy your **Cryostat** instance. For full details on how to configure the **Cryostat** deployment, see
+[Configuring **Cryostat**](https://github.com/cryostatio/cryostat-operator/blob/{{site.data.versions.cryostat.release-branch}}/docs/config.md).
 
-If running Cryostat on Kubernetes and not OpenShift, you will also need to add Ingress configurations to your Cryostat
-custom resource (`CR`).
-See the [Network Options](https://github.com/cryostatio/cryostat-operator/blob/{{site.data.versions.cryostat.release-branch}}/docs/config.md#network-options) section of Configuring Cryostat for examples.
+If running **Cryostat** on **Kubernetes** and not **OpenShift**, you will also need to add **Ingress** configurations to your **Cryostat**
+custom resource (**CR**).
+See the [Network Options](https://github.com/cryostatio/cryostat-operator/blob/{{site.data.versions.cryostat.release-branch}}/docs/config.md#network-options) section of Configuring **Cryostat** for examples.
 
-You can create the `CR` graphically in the OperatorHub UI after following [Install via OperatorHub](#install-via-operatorhub):
+You can create the **CR** graphically in the **OperatorHub** UI after following [Install via OperatorHub](#install-via-operatorhub):
 
 {% include howto_step.html
   details-attributes="open"
@@ -122,7 +122,7 @@ You can create the `CR` graphically in the OperatorHub UI after following [Insta
   image-name="cryostat-resources-after.png"
 %}
 
-You can also create the `CR` manually using a YAML definition like the following:
+You can also create the **CR** manually using a **YAML** definition like the following:
 
 ```yaml
 apiVersion: operator.cryostat.io/v1beta1
@@ -151,9 +151,9 @@ $ kubectl apply -f cryostat.yaml
 ```
 
 ### [Open the Cryostat Web UI](#open-the-cryostat-web-ui)
-Let's visit the Cryostat web dashboard UI.
+Let's visit the **Cryostat** web dashboard UI.
 
-We can get there from the `Cryostat` `CR`'s status fields:
+We can get there from the **Cryostat** **CR**'s status fields:
 
 {% include howto_step.html
   details-attributes="open"
@@ -161,7 +161,7 @@ We can get there from the `Cryostat` `CR`'s status fields:
   image-name="cryostat-resource-status.png"
 %}
 
-Or, we can open the application link from the OpenShift Console Topology view:
+Or, we can open the application link from the **OpenShift** Console *Topology* view:
 
 {% include howto_step.html
   details-attributes="open"
@@ -169,7 +169,7 @@ Or, we can open the application link from the OpenShift Console Topology view:
   image-name="topology-view.png"
 %}
 
-We can also find the URL using `oc`:
+We can also find the **URL** using `oc`:
 ```bash
 $ oc get cryostat -o jsonpath='{$.items[0].status.applicationUrl}'
 ```
@@ -177,9 +177,9 @@ $ oc get cryostat -o jsonpath='{$.items[0].status.applicationUrl}'
 #### [Authenticate through Cryostat](#authenticate-through-cryostat)
 
 ##### [OpenShift Authentication](#openshift-authentication)
-When deployed in OpenShift, Cryostat will use the existing internal cluster
+When deployed in **OpenShift**, **Cryostat** will use the existing internal cluster
 authentication system to ensure all requests come from users with correct
-access to the Cryostat instance and the namespace that it is deployed within.
+access to the **Cryostat** instance and the namespace that it is deployed within.
 
 {% include howto_step.html
   details-attributes="open"
@@ -191,19 +191,19 @@ access to the Cryostat instance and the namespace that it is deployed within.
   summary="OpenShift Service Account Permissions"
   image-name="permissions-auth-page.png"
 %}
-Once you have authenticated through the cluster's SSO login you will be
-redirected back to the Cryostat web application. The redirect URL contains
-an access token for Cryostat's service account with the permissions you have
-granted to it. The Cryostat web application passes this OpenShift token back
-to the Cryostat server on each request using `Bearer` authorization headers.
-The Cryostat server forwards this token back to the OpenShift auth server on
+Once you have authenticated through the cluster's **SSO** login you will be
+redirected back to the **Cryostat web** application. The redirect URL contains
+an access token for **Cryostat's** service account with the permissions you have
+granted to it. The **Cryostat web** application passes this **OpenShift** token back
+to the **Cryostat** server on each request using `Bearer` authorization headers.
+The **Cryostat** server forwards this token back to the **OpenShift** auth server on
 each client request to check the token authorization for the current request.
 This access token will eventually expire and you will be required to log back
-in on the cluster SSO login page.
+in on the cluster **SSO** login page.
 
-For direct access to the Cryostat HTTP API you may follow the same pattern.
-Using a client such as `curl`, an OpenShift auth token can be passed with
-requests using the `Authorization: Bearer` header. The token must be base64
+For direct access to the **Cryostat HTTP API** you may follow the same pattern.
+Using a client such as `curl`, an **OpenShift** auth token can be passed with
+requests using the `Authorization: Bearer` header. The token <span style="color:red">must</span> be `base64`
 encoded. For example,
 ```bash
 $ curl -v -H "Authorization: Bearer $(oc whoami -t | base64)" https://cryostat.example.com:8181/api/v1/targets
@@ -211,18 +211,18 @@ $ curl -v -H "Authorization: Bearer $(oc whoami -t | base64)" https://cryostat.e
 
 ##### [Other Platforms Authentication](#other-platforms-authentication)
 
-In non-OpenShift environments, Cryostat will default to no authentication.
+In non-OpenShift environments, **Cryostat** will default to no authentication.
 Access to the web application and the HTTP API will be unsecured. You should
-either configure Cryostat's built-in `Basic` authentication system, or better,
-place an authenticating reverse proxy server in front of Cryostat so that
-accesses to the Cryostat application must first pass through the reverse
+either configure **Cryostat's** built-in `Basic` authentication system, or better,
+place an authenticating reverse proxy server in front of **Cryostat** so that
+accesses to the **Cryostat** application must first pass through the reverse
 proxy. The configuration of a reverse proxy is out of scope of this guide.
 
 ###### [Basic Auth](#basic-auth)
 
-Cryostat includes a very rudimentary HTTP `Basic` authentication implementation.
+**Cryostat** includes a very rudimentary HTTP `Basic` authentication implementation.
 This can be configured by creating a `cryostat-users.properties` file in the
-Cryostat server `conf` directory, defined by the environment variable
+**Cryostat** server `conf` directory, defined by the environment variable
 `CRYOSTAT_CONFIG_PATH` and defaulting to `/opt/cryostat.d/conf.d`.
 The credentials stored in the Java properties file are the user name and a
 SHA-256 sum hex of the user's password. The property file contents should look
@@ -239,7 +239,7 @@ would therefore be entered as
 `user:d74ff0ee8da3b9806b18c877dbf29bbde50b5bd8e4dad7a3a725000feb82e8f1`.
 
 This mechanism only supports fully-privileged user definitions, authorized to
-perform any action within the Cryostat API.
+perform any action within the **Cryostat** API.
 
 Once the `cryostat-users.properties` file defining the user credentials is
 created, the environment variable `CRYOSTAT_AUTH_MANAGER` should be set
@@ -248,38 +248,37 @@ auth implementation.
 
 ### [Deploy an Application](#deploy-an-application)
 For demo purposes, let's go ahead and deploy a sample application to our
-OpenShift cluster in the same namespace as our Cryostat instance. If you have
-deployed Cryostat into a namespace where you are already running other
-applications, feel free to [continue to the next step](#open-the-cryostat-web-ui).
+**OpenShift** cluster in the same `namespace` as our **Cryostat** instance. If you have
+deployed **Cryostat** into a `namespace` where you are already running other
+applications, feel free to [continue to the next step](#configuring-applications).
 
 ```bash
 $ oc new-app --docker-image=quay.io/andrewazores/quarkus-test:0.0.10
 $ oc patch svc/quarkus-test -p '{"spec":{"$setElementOrder/ports":[{"port":9097},{"port":8080}],"ports":[{"name":"jfr-jmx","port":9097}]}}'
 ```
 
-This is a Quarkus container in JVM mode with JMX enabled and pre-configured to
-listen on port 9097.  After deploying the container we patch its service to
-name the 9097 service port `jfr-jmx`. Cryostat will detect and use this port
+This is a **Quarkus** container in **JVM** mode with **JMX** enabled and pre-configured to
+listen on `port 9097`.  After deploying the container we patch its service to
+name the `9097` service port `jfr-jmx`. **Cryostat** will detect and use this port
 to determine that this is a compatible Java application that it should monitor.
 
 #### [Configuring Applications](#configuring-applications)
-There are three methods of configuring your Java applications so that Cryostat is able to discover and monitor them:
+There are two methods of configuring your Java applications so that **Cryostat** is able to discover and monitor them:
 
-1. [using the Cryostat Agent for discovery and connectivity](#using-the-cryostat-agent)
-2. [using platform mechanisms for discovery and Java Management Extensions (JMX) for connectivity](#using-jmx)
-3. [using the Cryostat Agent for discovery and JMX for connectivity](#using-the-cryostat-agent-with-jmx)
+1. [using the **Cryostat Agent** for discovery and connectivity](#using-the-cryostat-agent)
+2. [using platform mechanisms for discovery and Java Management Extensions (**JMX**) for connectivity](#using-jmx)
 
 The following sections will briefly explain how to accomplish each of these approaches by example. For simplicity the examples will assume your application
-is built with Maven, packaged into an image with a `Dockerfile`, and running in Kubernetes, but the instructions will be similar for other toolchains and platforms as well.
+is built with **Maven**, packaged into an image with a `Dockerfile`, and running in **Kubernetes**, but the procedure will be similar for other toolchains and platforms as well.
 
 ##### [Using the Cryostat Agent](#using-the-cryostat-agent)
 
-[The Cryostat Agent](/guides/#using-the-cryostat-agent)
-is compatible with Cryostat versions 2.3.0 and newer, and application JDKs 11 and newer. If you are using an older version of Cryostat, we recommend upgrading to ensure compatibility.
-If your application uses a recent version of JDK8 with JFR support, please either upgrade to JDK11+ or [continue to the next section](#using-jmx)
-to learn how to configure your application without the Cryostat Agent.
+[The **Cryostat Agent**](/guides/#using-the-cryostat-agent)
+is compatible with **Cryostat** versions 2.3.0 and newer, and application **JDKs 11** and newer. If you are using an older version of **Cryostat**, we recommend upgrading to ensure compatibility.
+If your application uses a recent version of **JDK8** with **JFR** support, please either upgrade to **JDK11+** or [continue to the next section](#using-jmx)
+to learn how to configure your application without the **Cryostat Agent**.
 
-The Cryostat Agent JAR must be available to your application JVM. The JAR asset can be downloaded [directly from upstream](https://github.com/cryostatio/cryostat-agent/releases),
+The **Cryostat Agent** **JAR** must be available to your application **JVM**. The **JAR** asset can be downloaded [directly from upstream](https://github.com/cryostatio/cryostat-agent/releases),
 or you may use the following snippet in your `pom.xml` to streamline this.
 
 ```xml
@@ -308,7 +307,8 @@ or you may use the following snippet in your `pom.xml` to streamline this.
                 <artifactItem>
                   <groupId>io.cryostat</groupId>
                   <artifactId>cryostat-agent</artifactId>
-                  <version>0.2.1</version>
+                  <version>{{ site.data.versions.agent.version }}</version>
+                  <classifier>shaded</classifier>
                 </artifactItem>
               </artifactItems>
               <stripVersion>true</stripVersion>
@@ -323,21 +323,21 @@ or you may use the following snippet in your `pom.xml` to streamline this.
 </project>
 ```
 
-**Note**: You may be required to [authenticate to the GitHub Maven Packages registry](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-apache-maven-registry#installing-a-package) in order to pull this JAR.
+<span style="color:red">**Note**:</span> You may be required to [authenticate to the GitHub Maven Packages registry](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-apache-maven-registry#installing-a-package) in order to pull this **JAR**.
 
-The next time we build our application, the Cryostat Agent JAR will be located at `target/dependency/cryostat-agent.jar`. Then we can update our Dockerfile:
+The next time we build our application, the **Cryostat Agent** **JAR** will be located at `target/dependency/cryostat-agent-shaded.jar`. Then we can update our **Dockerfile**:
 
 ```Dockerfile
 ...
-COPY target/dependency/cryostat-agent.jar /deployments/app/
+COPY target/dependency/cryostat-agent-shaded.jar /deployments/app/
 ...
-# We are using a framework where the JAVA_OPTS environment variable can be used to pass JVM flags
-ENV JAVA_OPTS="-javaagent:/deployments/app/cryostat-agent.jar"
+# Assume we are using an application framework where the JAVA_OPTS environment variable can be used to pass JVM flags
+ENV JAVA_OPTS="-javaagent:/deployments/app/cryostat-agent-shaded.jar"
 ```
 
 Next we must rebuild our container image. This is specific to your application but will likely look something like `docker build -t docker.io/myorg/myapp:latest -f src/main/docker/Dockerfile .`.
-Push that updated image or otherwise get it updated in your Kubernetes registry, then modify your application `Deployment` to supply JVM system properties or environment variables configuring
-the Cryostat Agent:
+Push that updated image or otherwise get it updated in your Kubernetes registry, then modify your application `Deployment` to supply **JVM** system properties or environment variables configuring
+the **Cryostat Agent**:
 
 ```yaml
 apiVersion: apps/v1
@@ -366,7 +366,14 @@ spec:
               # choose to configure the Agent to communicate with a Cryostat in
               # a different Namespace, too.
               # (https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/)
-              value: https://cryostat.$(NAMESPACE).svc:8181
+              value: https://cryostat.$(NAMESPACE).svc.cluster.local:8181
+            - name: CRYOSTAT_AGENT_API_WRITES_ENABLED
+              # Set this to 'true' to turn on the "write" or "mutation" capabilities of the
+              # Agent's HTTP API. This defaults to 'false', so the Agent HTTP API only exposes
+              # readonly access to certain low-sensitivity calls. If this is 'true' then the
+              # Agent will allow Cryostat to dynamically request JFR recordings to be started,
+              # stopped, deleted, etc. as well as listed and retrieved.
+              value: true
             - name: POD_IP
               valueFrom:
                 fieldRef:
@@ -390,12 +397,12 @@ spec:
 status: {}
 ```
 
-Port number `9977` is the default HTTP port that the Agent exposes for its internal webserver that services Cryostat requests. The `CRYOSTAT_AGENT_AUTHORIZATION` value is particularly
-noteworthy: these are the credentials that the Agent will include in API requests it makes to Cryostat to advertise its own presence. You should create a Kubernetes `Service Account` for
-this purpose and replace `abcd1234` with the base64-encoded authentication token associated with the service account. For testing purposes you may use your own user account's
+Port number `9977` is the default HTTP port that the **Agent** exposes for its internal webserver that services **Cryostat** requests. The `CRYOSTAT_AGENT_AUTHORIZATION` value is particularly
+noteworthy: these are the credentials that the **Agent** will include in API requests it makes to **Cryostat** to advertise its own presence. You should create a **Kubernetes** `Service Account` for
+this purpose and replace `abcd1234` with the `base64-encoded` authentication token associated with the service account. For testing purposes you may use your own user account's
 authentication token, for example with `oc whoami --show-token`.
 
-Finally, create a `Service` to enable Cryostat to make requests to this Agent:
+Finally, create a `Service` to enable **Cryostat** to make requests to this **Agent**:
 
 ```yaml
 apiVersion: v1
@@ -409,10 +416,17 @@ spec:
 ...
 ```
 
-More details about the configuration options for the Cryostat Agent [are available here](https://github.com/cryostatio/cryostat-agent/blob/{{site.data.versions.cryostat.release-branch}}/README.md#configuration).
+More details about the configuration options for the **Cryostat Agent** [are available here](https://github.com/cryostatio/cryostat-agent/blob/{{site.data.versions.cryostat.release-branch}}/README.md#configuration).
+
+You may also be interested in using the **Cryostat Agent** for application discovery, but using **JMX** for remote management and data
+access rather than the **Cryostat Agent** HTTP API. In that case, simply set `CRYOSTAT_AGENT_API_WRITES_ENABLED=false` to turn off as much
+of the **Cryostat Agent** HTTP API as possible, then continue to [the next section](#using-jmx) to additionally configure your application
+to enable and expose **JMX** for remote management and data access. If the **Cryostat Agent** detects that the application it is attached
+to has **JMX** enabled then it will publish itself to the **Cryostat** server with both an **Agent** HTTP URL and a **JMX** URL. If **JMX**
+is not detected then it will only publish the HTTP URL.
 
 ##### [Using JMX](#using-jmx)
-Cryostat is also able to use Java Management Extensions (JMX) to communicate with target applications. This is a standard JDK feature that can be enabled by passing JVM
+**Cryostat** is also able to use Java Management Extensions (**JMX**) to communicate with target applications. This is a standard JDK feature that can be enabled by passing **JVM**
 flags to your application at startup. A basic and insecure setup suitable for testing requires only the following three flags:
 
 ```
@@ -423,12 +437,12 @@ flags to your application at startup. A basic and insecure setup suitable for te
 
 [comment]: # TODO explain how to configure SSL and auth for JMX, or link to external docs
 
-It is recommended that you enable both SSL and authentication on your application. You can then [trust the certificate](/guides/#add-a-trusted-certificate)
+It is recommended that you enable both `SSL` and authentication on your application. You can then [trust the certificate](/guides/#add-a-trusted-certificate)
 and [store the credentials](/guides/#store-credentials).
 
 Depending on your application or its framework, you may set these flags directly in a `Dockerfile` entrypoint, an environment variable, or similar. This may or
 may not require a container image rebuild, and it will require the container to be restarted. Once this is done the application container will be listening for
-incoming JMX connections on port `9091`. Let's assume it can be done by setting an environment variable, so we only need to modify our `Deployment`:
+incoming **JMX** connections on port `9091`. Let's assume it can be done by setting an environment variable, so we only need to modify our `Deployment`:
 
 ```yaml
 apiVersion: apps/v1
@@ -451,8 +465,8 @@ spec:
             ...
 ```
 
-Next, we need to configure a Kubernetes `Service` to expose this port for cluster-internal traffic, so that Cryostat can see
-and connect to this application JMX port.
+Next, we need to configure a **Kubernetes** `Service` to expose this port for cluster-internal traffic, so that **Cryostat** can see
+and connect to this application **JMX** port.
 
 ```yaml
 apiVersion: v1
@@ -466,168 +480,34 @@ spec:
 ...
 ```
 
-Cryostat queries the Kubernetes API server and looks for `Service`s with a port either named `jfr-jmx` or with the number `9091`. One or both of these conditions
-must be met or else Cryostat will not automatically detect your application. In this case you may wish to use the [Cryostat Agent](#using-the-cryostat-agent-with-jmx)
-to enable discovery, while keeping communications over JMX rather than HTTP.
-
-##### [Using the Cryostat Agent with JMX](#using-the-cryostat-agent-with-jmx)
-The two prior sections have discussed:
-  - How to use the Cryostat Agent to do application discovery and expose data over HTTP.
-  - How to use Kubernetes `Service` configurations for discovery and JMX to expose data.
-
-There is a third, hybrid approach: **using the Cryostat Agent to do application discovery, and JMX to expose data**. This may be
-useful since the Agent HTTP data model is readonly, whereas JMX is read-write. This means that using JMX to communicate between Cryostat and your applications
-allows for more dynamic flexibility, for example, the ability to start and stop Flight Recordings on demand. Using the Cryostat Agent for application discovery
-is also more flexible than depending on `Service`s with specially-named or specially-numbered ports. 
-
-For more context about these concepts, please review
-the previous two sections on [using the Cryostat Agent](#using-the-cryostat-agent) and [using JMX](#using-jmx).
-
-Add dependency configurations to `pom.xml`:
-```xml
-<project>
-  ...
-  <repositories>
-    <repository>
-      <id>github</id>
-      <url>https://maven.pkg.github.com/cryostatio/cryostat-agent</url>
-    </repository>
-  </repositories>
-  ...
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.3.0</version>
-        <executions>
-          <execution>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>io.cryostat</groupId>
-                  <artifactId>cryostat-agent</artifactId>
-                  <version>0.2.1</version>
-                </artifactItem>
-              </artifactItems>
-              <stripVersion>true</stripVersion>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-    ...
-  </build>
-  ...
-</project>
-```
-
-Modify the application `Deployment`:
-```yaml
-apiVersion: apps/v1
-kind: Deployment
-...
-spec:
-  ...
-  template:
-    ...
-    spec:
-      containers:
-        - name: sample-app
-          image: docker.io/myorg/myapp:latest
-          env:
-            - name: CRYOSTAT_AGENT_APP_NAME
-              # Replace this with any value you like to use to identify your application.
-              value: "myapp"
-            - name: NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-            - name: CRYOSTAT_AGENT_BASEURI
-              # Update this to correspond to the name of your Cryostat instance
-              # if it is not 'cryostat'. This assumes that the target application
-              # and the Cryostat instance are in the same Namespace, but you may
-              # choose to configure the Agent to communicate with a Cryostat in
-              # a different Namespace, too.
-              # (https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/)
-              value: https://cryostat.$(NAMESPACE).svc:8181
-            - name: POD_IP
-              valueFrom:
-                fieldRef:
-                  fieldPath: status.podIP
-            - name: CRYOSTAT_AGENT_HOSTNAME
-              value: $(POD_IP)
-            - name: CRYOSTAT_AGENT_CALLBACK
-              # This infers the Agent Callback directly from the Pod's IP address using the
-              # Kubernetes Downward API. Use this value directly as provided. The port number
-              # 9977 can be changed but must match the containerPort below.
-              value: "http://$(POD_IP):9977"
-              # Replace "abcd1234" with a base64-encoded authentication token. For example,
-              # in your terminal, do 'oc whoami -t | base64' to use your user account's
-              # token as the token that the Agent will pass to authorize itself with
-              # the Cryostat server.
-            - name: CRYOSTAT_AGENT_AUTHORIZATION
-              value: "Bearer abcd1234"
-              # This environment variable is key to the "hybrid" setup.
-              # This instructs the Agent to register itself with Cryostat
-              # as reachable via JMX, rather than reachable via HTTP.
-            - name: CRYOSTAT_AGENT_REGISTRATION_PREFER_JMX
-              value: "true"
-              # Here we configure the application to load the Agent JAR as
-              # well as to enable JMX, since we want the Agent to register
-              # itself as reachable via JMX.
-            - name: JAVA_OPTS
-              value: >-
-                -javaagent:/deployments/app/cryostat-agent.jar
-                -Dcom.sun.management.jmxremote.port=9091
-                -Dcom.sun.management.jmxremote.ssl=false
-                -Dcom.sun.management.jmxremote.authenticate=false
-          ports:
-            - containerPort: 9977
-              protocol: TCP
-          resources: {}
-      restartPolicy: Always
-status: {}
-```
-
-Create an application `Service`:
-```yaml
-apiVersion: v1
-kind: Service
-...
-spec:
-  ports:
-    - name: "cryostat-agent"
-      port: 9977
-      targetPort: 9977
-...
-```
+**Cryostat** queries the **Kubernetes** API server and looks for `Service`s with a port either named `jfr-jmx` or with the number `9091`.
+One or both of these conditions <span style="color:red">must</span> be met or else **Cryostat** will not automatically detect your
+application. In this case you may wish to use the [**Cryostat Agent**](#using-the-cryostat-agent) to enable discovery, while keeping
+communications over **JMX** rather than HTTP. If you do use the **Cryostat Agent** for discovery and **JMX** for remote management,
+you may combine both of the `Service` definitions into a single `Service` with two exposed `ports`.
 
 ### [Alternate Setup](#alternate-setup)
 
 #### [Using ClusterCryostats](#using-clustercryostats)
-In [Deploying Cryostat](#deploying-cryostat), you created a single-namespace `Cryostat` Custom Resource
-(`CR`) instance.
-
-Single-namespace `Cryostat` `CR`s instruct the Operator to deploy restricted Cryostat instances which are only able
-to see target applications deployed in the same namespace as the Cryostat instance, which is the same Namespace that
-the `CR` is created within.
-
-If you chose to install the Operator in **All Namespaces** mode as assumed in this guide, you may also be interested in
-creating `CluterCryostat` `CR`s. In this configuration, the Operator is able to see `Cryostat` and `ClusterCryostat`
-`CR`s in any project (`Namespace`) and create Cryostat deployments corresponding to either `CR` kind in each of their
-respective `Namespaces`. Both of these `CRs` are `Namespace`-specific, and the `Namespace` is used to determine which
-OpenShift users are able to access the Cryostat instance. For more information, please see the following documents:
+In [Deploying **Cryostat**](#deploying-cryostat), you created a single-namespace **Cryostat** Custom Resource
+(**CR**) instance.
+
+Single-namespace **Cryostat CRs** instruct the **Operator** to deploy restricted **Cryostat** instances which are only able
+to see target applications deployed in the same namespace as the **Cryostat** instance, which is the same `Namespace` that
+the **CR** is created within.
+
+If you chose to install the **Operator** in **All Namespaces** mode as assumed in this guide, you may also be interested in
+creating **CluterCryostat CRs**. In this configuration, the **Operator** is able to see **Cryostat** and **ClusterCryostat
+CRs** in any project (`Namespace`) and create **Cryostat** deployments corresponding to either **CR** kind in each of their
+respective **Namespaces**. Both of these **CRs** are **Namespace**-specific, and the **Namespace** is used to determine which
+**OpenShift** users are able to access the **Cryostat** instance. For more information, please see the following documents:
 - [Multi-namespace](https://github.com/cryostatio/cryostat-operator/blob/{{site.data.versions.cryostat.release-branch}}/docs/multi-namespace.md).
 - [Authorization Properties](https://github.com/cryostatio/cryostat-operator/blob/{{site.data.versions.cryostat.release-branch}}/docs/config.md#authorization-properties)
 
-`ClusterCryostat` `CR`s instruct the Operator to deploy cross-namespace Cryostat instances. A `ClusterCryostat` has
-an `installNamespace`, which is the namespace where the Cryostat `Deployment` will reside, and a list of
-`targetNamespaces`, which are all of the namespaces that the Cryostat server will watch for target applications.
-The `targetNamespaces` list does not necessarily need to contain the `installNamespace`, if you do not want Cryostat
+**ClusterCryostat CRs** instruct the **Operator** to deploy cross-namespace **Cryostat** instances. A **ClusterCryostat** has
+an `installNamespace`, which is the namespace where the **Cryostat Deployment** will reside, and a list of
+`targetNamespaces`, which are all of the namespaces that the **Cryostat** server will watch for target applications.
+The `targetNamespaces` list does not necessarily need to contain the `installNamespace`, if you do not want **Cryostat**
 to see itself in the target applications that it watches.
 
 ```yaml
@@ -652,15 +532,15 @@ spec:
 ```
 
 ## [Next Steps](#next-steps)
-Now that you have installed and deployed Cryostat and know how to access its
-web client, continue on to [Guides]({% link guides/index.md %}) for
+Now that you have installed and deployed **Cryostat** and know how to access its
+**web client**, continue on to [Guides]({% link guides/index.md %}) for
 guides through various common actions and workflows.
 
 ## [Uninstalling Cryostat Operator](#uninstalling-cryostat-operator)
-Reference [Operator Lifecycle Manager's](https://olm.operatorframework.io/docs/tasks/uninstall-operator/#combine-steps-2-and-3)
-guide on uninstalling Operators. Please be sure to delete all `Cryostat` and `ClusterCryostat` Custom Resources before
-uninstalling the Cryostat Operator.
-- If your Cryostat Operator was installed in **All Namespaces** mode, then its `ClusterServiceVersion` and
-`Subscription` can be found in the `Namespace` `openshift-operators`.
-- If your Cryostat Operator was installed in **A specific Namespace**, then the `ClusterServiceVersion` and
-`Subscription` will be in that same `Namespace.`
+Reference [**OLM**](https://olm.operatorframework.io/docs/tasks/uninstall-operator/#combine-steps-2-and-3)
+guide on uninstalling **Operators**. Please be sure to delete all **Cryostat** and **ClusterCryostat** Custom Resources before
+uninstalling the **Cryostat Operator**.
+- If your **Cryostat Operator** was installed in **All Namespaces** mode, then its **ClusterServiceVersion** and
+`Subscription` can be found in the **Namespace** **openshift-operators**.
+- If your **Cryostat Operator** was installed in **A specific Namespace**, then the **ClusterServiceVersion** and
+`Subscription` will be in that same **Namespace**.
diff --git a/guides/_subsections/add-a-trusted-certificate.md b/guides/_subsections/add-a-trusted-certificate.md
index dd7ec201..16987175 100644
--- a/guides/_subsections/add-a-trusted-certificate.md
+++ b/guides/_subsections/add-a-trusted-certificate.md
@@ -1,38 +1,38 @@
 ## [Add a Trusted Certificate](#add-a-trusted-certificate)
-If you have Java Management Extensions (JMX) over SSL enabled on your containerized JVMs, you must configure Cryostat to trust the SSL certificate presented by the containerized JVM when Cryostat attempts to open a JMX connection. If you do not complete this configuration, Cryostat cannot open a JMX connection for the purposes of performing JFR management tasks.
+If you have Java Management Extensions **(JMX)** over `SSL` enabled on your containerized **JVMs**, you must configure **Cryostat** to trust the `SSL` certificate presented by the containerized **JVM** when **Cryostat** attempts to open a **JMX** connection. If you do not complete this configuration, **Cryostat** cannot open a **JMX** connection for the purposes of performing **JFR** management tasks.
 
-Here's how to add a trusted SSL certificate with the Cryostat web UI.
+Here's how to add a trusted `SSL` certificate with the **Cryostat Web** UI.
 
 <ol>
     <li>
         {% include howto_step.html
-          summary="Navigate to the Security tab"
-          image-name="2.3.0/navigate-to-security.png"
+          summary="Navigate to the <i>Security</i> Tab"
+          image-name="2.4.0/navigate-to-security.png"
           text="Click the <i>Security</i> tab."
         %}
     </li>
     <li>
         {% include howto_step.html
           summary="Upload the Certificate"
-          image-name="2.3.0/add-a-trusted-certificate-upload.png"
+          image-name="2.4.0/add-a-trusted-certificate-upload.png"
           text="
-              Click the <i>Upload</i> button on the <i>Import SSL Certificates</i> card. This action opens a file-upload dialog, where you can choose the certificate that you want to upload to Cryostat. You can repeat this process multiple times to add multiple trusted certificates.
+              Click the <i>Upload</i> button on the <i>Import SSL Certificates</i> card. This action opens a file-upload dialog, where you can choose the certificate that you want to upload to <b>Cryostat</b>. You can repeat this process multiple times to add multiple trusted certificates.
           "
         %}
     </li>
     <li>
-        Restart Cryostat to apply the changes. If you do not restart your Cryostat instance, the added certificates are not reloaded. This causes connections to fail because the Cryostat JMX client cannot trust the certificates. Depending on your deployment platform and configuration, restarting Cryostat might require any of the following:
+        Restart <b>Cryostat</b> to apply the changes. If you do not restart your <b>Cryostat</b> instance, the added certificates are not reloaded. This causes connections to fail because the <b>Cryostat JMX</b> client cannot trust the certificates. Depending on your deployment platform and configuration, restarting <b>Cryostat</b> might require any of the following:
         <ul>
             <li>
-                On OpenShift/Kubernetes with Cryostat Operator:
+                On <b>OpenShift/Kubernetes</b> with <b>Cryostat Operator</b>:
                 <pre>oc delete cryostat/&lt;my-cryostat-cr-name&gt;<br>oc create -f &lt;my-cryostat-cr-name&gt;.yaml</pre>
             </li>
             <li>
-                On OpenShift/Kubernetes without Cryostat Operator:
+                On <b>OpenShift/Kubernetes</b> without <b>Cryostat Operator</b>:
                 <pre>oc rollout retry dc/&lt;my-cryostat-dc-name&gt;</pre>
             </li>
             <li>
-                On Podman:
+                On <b>Podman</b>:
                 <pre>podman restart &lt;my-cryostat-container-id&gt;</pre>
             </li>
         </ul>
diff --git a/guides/_subsections/add-and-edit-recording-metadata-labels.md b/guides/_subsections/add-and-edit-recording-metadata-labels.md
index 3673f5fd..dd94ae99 100644
--- a/guides/_subsections/add-and-edit-recording-metadata-labels.md
+++ b/guides/_subsections/add-and-edit-recording-metadata-labels.md
@@ -1,5 +1,5 @@
 ## [Add and Edit Recording Metadata Labels](#add-and-edit-recording-metadata-labels)
-Users can attach metadata or custom labels to JDK flight recordings managed by Cryostat. Recording labels can be used to identify recordings during queries or perform actions on multiple recordings containing the same labels. Here’s how to add and edit metadata labels on your JDK flight recordings.
+Users can attach `Metadata` or `Custom Labels` to **JDK** `Flight Recordings` managed by **Cryostat**. `Recording Labels` can be used to identify `Recordings` during queries or perform actions on multiple `Recordings` containing the same `Labels`. Here’s how to *Add* and *Edit* `Metadata Labels` on your **JDK** `Flight Recordings`.
 
 <ol>
   <li>
@@ -10,73 +10,73 @@ Users can attach metadata or custom labels to JDK flight recordings managed by C
   </li>
   <li>
     {% include howto_step.html
-      summary="Add metadata labels to the Create Recording form"
-      image-name="2.3.0/add-and-edit-recording-metadata-labels-1.png"
+      summary="Add <code>Metadata Labels</code> to the <i>Create Recording</i> form"
+      image-name="2.4.0/add-and-edit-recording-metadata-labels-1.png"
       text="
-        When creating a custom flight recording with Cryostat, expand the form section <i>Show metadata options</i>. Click <i>Add Label</i> and add key-value label pairs to the form. Finally, click <i>Create</i> to attach the labels and create the recording.
+        When creating a custom <code>Flight Recording</code> with <b>Cryostat</b>, expand the form section <i>Show metadata options</i>. Click <i>Add Label</i> and add <i>key-Value</i> <code>Label</code> pairs to the form. Finally, click <i>Create</i> to attach the <code>Labels</code> and create the <code>Recording</code>.
       "
     %}
   </li>
   <li>
     {% include howto_step.html
-      summary="View your labels on the Active Recordings Table"
-      image-name="2.3.0/add-and-edit-recording-metadata-labels-2.png"
+      summary="View your <code>Labels</code> on the <i>Active Recordings</i> Table"
+      image-name="2.4.0/add-and-edit-recording-metadata-labels-2.png"
       text="
-        The new recording will appear in the Recordings tab with your custom label as well as default labels containing information about the selected recording template.
+        The new <code>Recording</code> will appear in the <i>Recordings Tab</i> with your <code>Custom Label</code> as well as default <code>Labels</code> containing information about the selected <code>Recording</code> template.
       "
     %}
   </li>
   <li>
     {% capture edit-an-existing-label-text %}
     <p>
-      Recording labels can also be edited after recordings have been created or re-uploaded to archives. It looks like the custom label in our example contains a typo - we can fix the typo by editing the label. First select a recording from the table with the 🗹 checkbox. Then, click the <i>Edit Labels</i> button to bring up the label drawer. Finally, click the <i>Edit</i> button that appears from the drawer.
+      <code>Recording Labels</code> can also be edited after <code>Recordings</code> have been created or re-uploaded to archives. It looks like the <code>Custom Label</code> in our example contains a typo - we can fix the typo by editing the <code>Label</code>. First select a <code>Recording</code> from the table with the 🗹 checkbox. Then, click the <i>Edit Labels</i> button to bring up the label drawer. Finally, click the <i>Edit</i> button that appears from the drawer.
       <br><br>
-      <a href="{{ site.url }}/images/2.3.0/add-and-edit-recording-metadata-labels-4.png" target="_blank">
-        <img src="{{ site.url }}/images/2.3.0/add-and-edit-recording-metadata-labels-4.png">
+      <a href="{{ site.url }}/images/2.4.0/add-and-edit-recording-metadata-labels-4.png" target="_blank">
+        <img src="{{ site.url }}/images/2.4.0/add-and-edit-recording-metadata-labels-4.png">
       </a>
       <br><br>
-      The labels section will appear as a form where you can add, edit, or delete existing labels, just like before when we created the recording. Fix the typo, and click <i>Save</i> to save your edited labels.
+      The <code>Labels</code> section will appear as a form where you can <i>Add</i>, <i>Edit</i>, or <i>Delete</i> existing <code>Labels</code>, just like before when we created the <code>Recording</code>. Fix the typo, and click <i>Save</i> to save your edited <code>Labels</code>.
     </p>
     {% endcapture %}
     {% include howto_step.html
-      summary="Edit an existing label"
-      image-name="2.3.0/add-and-edit-recording-metadata-labels-3.png"
+      summary="Edit an Existing <code>Label</code>"
+      image-name="2.4.0/add-and-edit-recording-metadata-labels-3.png"
       text=edit-an-existing-label-text
     %}
   </li>
   <li>
     {% include howto_step.html
-      summary="View your edited labels"
-      image-name="2.3.0/add-and-edit-recording-metadata-labels-5.png"
+      summary="View your edited <code>Labels</code>"
+      image-name="2.4.0/add-and-edit-recording-metadata-labels-5.png"
       text="
-        The recording labels should be updated in the Active Recordings table. 
+        The <code>Recording Labels</code> should be updated in the <i>Active Recordings</i> table.
       "
     %}
   </li>
   <li>
     {% include howto_step.html
-      summary="<i>(Optional)</i> Archive your recording to view labels copied onto the archived recording"
-      image-name="2.3.0/add-and-edit-recording-metadata-labels-6.png"
+      summary="<i>(Optional)</i> Archive your <code>Recording</code> to view <code>Labels</code> copied onto the <code>Archived Recording</code>"
+      image-name="2.4.0/add-and-edit-recording-metadata-labels-6.png"
       text="
-        On the Active Recordings table, click the checkbox next to the recording, then click <i>Archive</i> to archive your recording. Notice that the archived recording also copies the labels from the active recording. You can also add labels to any recording uploaded to Cryostat’s archives.
+        On the <i>Active Recordings</i> table, click the <i>Checkbox</i> next to the <code>Recording</code>, then click <i>Archive</i> to archive your <code>Recording</code>. Notice that the <code>Archived Recording</code> also copies the <code>Labels</code> from the <code>Active Recording</code>. You can also add <code>Labels</code> to any <code>Recording</code> uploaded to <b>Cryostat’s</b> archives.
       "
     %}
   </li>
   <li>
     {% capture bulk-edit-recording-labels-text %}
     <p>
-      Create another recording on the same target. Then select both recordings on the Recordings Table and click <i>Edit Labels</i> and <i>Edit</i>.This time, only labels that are present on both recordings will be shown in the form. Let's delete the two common template-related labels, and add a new label to both recordings. Then finally, click <i>Save</i>.
+      Create another <code>Recording</code> on the same target. Then select both <code>Recordings</code> on the <i>Recordings Table</i> and click <i>Edit Labels</i> and start editing. This time, only <code>Labels</code> that are present on both <code>Recordings</code> will be shown in the form. Let's <i>Delete</i> the two common template-related <code>Labels</code>, and <i>Add</i> a new <code>Label</code> to both <code>Recordings</code>. Then finally, click <i>Save</i>.
       <br><br>
-      <a href="{{ site.url }}/images/2.3.0/add-and-edit-recording-metadata-labels-8.png" target="_blank">
-        <img src="{{ site.url }}/images/2.3.0/add-and-edit-recording-metadata-labels-8.png">
+      <a href="{{ site.url }}/images/2.4.0/add-and-edit-recording-metadata-labels-8.png" target="_blank">
+        <img src="{{ site.url }}/images/2.4.0/add-and-edit-recording-metadata-labels-8.png">
       </a>
       <br><br>
-      Congratulations, you have successfully bulk-edited labels across multiple recordings!
+      Congratulations, you have successfully bulk-edited <code>Labels</code> across multiple <code>Recordings</code>!
     </p>
     {% endcapture %}
     {% include howto_step.html
-      summary="<i>(Optional)</i> Bulk-edit recording labels across multiple recordings"
-      image-name="2.3.0/add-and-edit-recording-metadata-labels-7.png"
+      summary="<i>(Optional)</i> Bulk-edit <code>Recording Labels</code> across multiple <code>Recordings</code>"
+      image-name="2.4.0/add-and-edit-recording-metadata-labels-7.png"
       text=bulk-edit-recording-labels-text
     %}
   </li>
diff --git a/guides/_subsections/archive-a-recording.md b/guides/_subsections/archive-a-recording.md
index 43b19af8..7d41dfc9 100644
--- a/guides/_subsections/archive-a-recording.md
+++ b/guides/_subsections/archive-a-recording.md
@@ -1,15 +1,15 @@
 ## [Archive a Recording](#archive-a-recording)
-In contrast to <i>Active Recordings</i>, which reside within the container
-of the target application, <i>Archived Recordings</i> reside within persistent
-storage attached to a Cryostat instance. In OpenShift, for example, the
+In contrast to `Active Recordings`, which reside within the container
+of the `target` application, `Archived Recordings` reside within persistent
+storage attached to a **Cryostat** instance. In **OpenShift**, for example, the
 archives are stored in a `PersistentVolumeClaim`.
 
-Archived recordings are created by performing archival upon active recordings.
-When this is requested, Cryostat connects to the target application and copies
-the Flight Recorder data from the selected active recording into an archived
-recording file in storage. The active source recording may be continuous or
-fixed-duration, may be using any event template, may be in
-any state (`RUNNING`, `STOPPED`, etc.), and may even be a snapshot.
+`Archived Recordings` are created by performing archival upon `Active Recordings`.
+When this is requested, **Cryostat** connects to the `target` application and copies
+the `Flight Recorder` data from the selected `Active Recording` into an `Archived
+Recording` file in storage. The `Active Source Recording` may be `Continuous` or
+`Fixed-duration`, using any *Event Template*, in
+any state (`RUNNING`, `STOPPED`, etc.), and may even be a `snapshot`.
 
 <ol>
   <li>
@@ -21,15 +21,15 @@ any state (`RUNNING`, `STOPPED`, etc.), and may even be a snapshot.
   <li>
     {% capture select-recording-additional-content %}
       <p>
-        If you do not have any recordings present in the Active Recordings
+        If you do not have any <code>Recordings</code> present in the <i>Active Recordings</i>
         view, follow
         <a href="{{ page.url }}#startstop-a-recording">Start/Stop a Recording</a>
-        to create one, or select a different target application.
+        to create one, or select a different <code>target</code> application.
       </p>
     {% endcapture %}
     {% include howto_step.html
-      summary="Select an Active Recording"
-      image-name="2.3.0/archive-a-recording-1.png"
+      summary="Select an <i>Active Recording</i>"
+      image-name="2.4.0/archive-a-recording-1.png"
       caption=select-recording-additional-content
     %}
   </li>
@@ -39,16 +39,16 @@ any state (`RUNNING`, `STOPPED`, etc.), and may even be a snapshot.
   <li>
     {% include howto_step.html
       summary="Navigate to the <i>Archived Recordings</i> tab"
-      image-name="2.3.0/archive-a-recording-2.png"
+      image-name="2.4.0/archive-a-recording-2.png"
       caption="
-        Once the recording has been archived, a new entry will appear in the
-        target JVM's <i>Archived Recordings</i> table. All recordings that were
-        saved from the current target will be listed here in their own table.
-        Switching to a different target from the dropdown will list only the 
-        recordings archived from that source target. The name of the archived 
-        recording reflects the address of the target application, the original 
-        name of the active recording that it was retrieved from, and includes a 
-        timestamp indicating when the archived recording was created.
+        Once the <code>Recording</code> has been archived, a new entry will appear in the
+        <code>target</code> <b>JVM's</b> <i>Archived Recordings</i> table. All <code>Recordings</code> that were
+        saved from the current <code>target</code> will be listed here in their own table.
+        Switching to a different <code>target</code> from the dropdown will list only the
+        <code>Recordings</code> archived from that source <code>target</code>. The name of the <code>Archived
+        Recording</code> reflects the address of the <code>target</code> application, the original
+        name of the <code>Active Recording</code> that it was retrieved from, and includes a
+        <code>timestamp</code> indicating when the <code>Archived Recording</code> was created.
       "
     %}
   </li>
diff --git a/guides/_subsections/automated-analysis.md b/guides/_subsections/automated-analysis.md
index b6a8dac2..b7756652 100644
--- a/guides/_subsections/automated-analysis.md
+++ b/guides/_subsections/automated-analysis.md
@@ -1,16 +1,15 @@
-## [View and Download Automated Analysis for a Recording](#view-and-download-automated-analysis-for-a-recording)
-Cryostat integrates the same automated analysis reports that you would
-find in [JDK Mission Control](https://github.com/openjdk/jmc). The
-JMC rules engine analyzes your recording and looks for common problems
-and assigns a severity score from 0 (no problem) to 100 (potentially
-severe problem). Results with score 0 are hidden from the report unless
-you select the _Show OK Results_ checkbox. More details on each
-result can be found by clicking on the _+_ symbol to the right of
-the rule name. These details often include suggestions on how to fix
-the problem. Cryostat also allows you to download the report HTML file
-for offline use.
+## [View Automated Analysis for a Recording](#view-automated-analysis-for-a-recording)
+**Cryostat** integrates the same `Automated Analysis` reports that you would
+find in [JDK Mission Control ("JMC")](https://github.com/openjdk/jmc). The
+**JMC** rules engine analyzes your `Recording` and looks for common problems,
+assigning a severity score from 0 (no problem) to 100 (potentially
+severe problem) to each potential problem type.
 
-Cryostat also provides an *Automated Analysis Card* that is able to display the same information in a more user-friendly format, with more tools and control over the data you see. The card is available for use in the *Dashboard*. Read the section on the [Automated Analysis Card](#automated-analysis-card) for more information.
+**Cryostat** also provides an `Automated Analysis Card` that is able to display
+the same information in a more flexible format, with more tools and control
+over the data you see and the ability to resize the view. The `Card` is available
+for use in the *Dashboard*. Read the section on the
+[`Automated Analysis Card`](#automated-analysis-card) for more information.
 
 <ol>
   <li>
@@ -22,69 +21,33 @@ Cryostat also provides an *Automated Analysis Card* that is able to display the
   <li>
     {% include_relative _subsections/common/select-a-recording.md
       select-a-recording-caption="
-        If you do not have any recordings present in the Active Recordings
+        If you do not have any <code>Recordings</code> present in the <i>Active Recordings</i>
         view, follow
         <a href='#startstop-a-recording'>Start/Stop a Recording</a>
-        to create one, or select a different target application.
-        You may also select an archived recording for automated analysis.
+        to create one, or select a different <code>target</code> application.
+        You may also select an <code>Archived Recording</code> for <code>Automated Analysis</code>.
       "
     %}
   </li>
   <li>
     {% include howto_step.html
-      summary="Expand the recording"
-      image-name="2.3.0/automated-analysis-1.png"
+      summary="Expand the <code>Recording</code>"
+      image-name="2.4.0/automated-analysis-1.png"
       caption="
-        Expand the recording with the chevron to the left of the recording
-        name. The automated analysis report will appear below the recording.
+        Expand the <code>Recording</code> with the <i>Chevron</i> to the left of the <code>Recording</code>
+        name. The <code>Automated Analysis</code> report will appear below the <code>Recording</code>.
       "
     %}
   </li>
   <li>
     {% include howto_step.html
-      summary="View details and suggestions for results"
-      image-name="2.3.0/automated-analysis-2.png"
+      summary="View Details and Suggestions for Results"
+      image-name="2.4.0/automated-analysis-2.png"
       caption="
-        Click the <i>+</i> button on the right side of each result to view
+        Click on each result to view
         specifics on what the result means and possible suggestions to fix
         the potential problem.
       "
     %}
   </li>
-  <li>
-    {% capture download-report-text %}
-    <p>
-      <figure>
-        <a href="{{ site.url }}/images/2.3.0/automated-analysis-4.png" target="_blank">
-          <img src="{{ site.url }}/images/2.3.0/automated-analysis-4.png">
-        </a>
-        <figcaption>
-          View the report on its own without connecting to Cryostat.
-          Check <i>Show OK Results</i> to include results where the rules
-          engine found no issues in the recording.
-        </figcaption>
-      </figure>
-      <figure>
-        <a href="{{ site.url }}/images/2.3.0/automated-analysis-5.png" target="_blank">
-          <img src="{{ site.url }}/images/2.3.0/automated-analysis-5.png">
-        </a>
-        <figcaption>
-          To download the HTML <i>Automated Analysis</i> report to local disk, right click 
-          the page and select <i>Save Page As...</i>. Alternatively, press <kbd>Ctrl</kbd>+<kbd>S</kbd> 
-          on Windows/Linux, or <kbd>⌘</kbd>+<kbd>S</kbd> on macOS.
-        </figcaption>
-      </figure>
-    </p>
-    {% endcapture %}
-    {% include howto_step.html
-      summary="Download the report"
-      image-name="2.3.0/automated-analysis-3.png"
-      caption="
-        To download the automated analysis report for offline viewing,
-        select <i>View Report ...</i> from the recording's overflow
-        menu.
-      "
-      text=download-report-text
-    %}
-  </li>
 </ol>
diff --git a/guides/_subsections/common/card-catalog.md b/guides/_subsections/common/card-catalog.md
index 8e36330e..fe50d43d 100644
--- a/guides/_subsections/common/card-catalog.md
+++ b/guides/_subsections/common/card-catalog.md
@@ -1,9 +1,9 @@
 {% capture card-catalog-include-text %}
- The <i>Dashboard Card Catalog</i> contains a list of available cards that can be added to the dashboard. Clicking on a card will open a panel containing a preview.
+ The <i>Dashboard Card Catalog</i> contains a list of available <code>cards</code> that can be added to the <i>Dashboard</i>. Clicking on a <code>card</code> will open a panel containing a preview.
 {% endcapture %}
 {% include howto_step.html
-  summary="Open the Card Catalog"
-  image-name="2.3.0/dashboard/card-catalog.png"
-  caption="Open the card catalog by clicking the Catalog icon on the Dashboard toolbar."
+  summary="Open the <i>Card Catalog</i>"
+  image-name="2.4.0/dashboard/card-catalog.png"
+  caption="Open the <i>Card Catalog</i> by clicking the <i>Catalog icon</i> on the <i>Dashboard</i> toolbar."
   text=card-catalog-include-text
 %}
diff --git a/guides/_subsections/common/click-create.md b/guides/_subsections/common/click-create.md
index cda1f924..9a72f5b6 100644
--- a/guides/_subsections/common/click-create.md
+++ b/guides/_subsections/common/click-create.md
@@ -1,4 +1,4 @@
 {% include howto_step.html
   summary="Click <i>Create</i>"
-  image-name="2.3.0/click-create.png"
+  image-name="2.4.0/click-create.png"
 %}
diff --git a/guides/_subsections/common/layout-selector.md b/guides/_subsections/common/layout-selector.md
index 018e13e2..3bd7a333 100644
--- a/guides/_subsections/common/layout-selector.md
+++ b/guides/_subsections/common/layout-selector.md
@@ -1,9 +1,9 @@
 {% capture layout-selector-text %}
-The layout selector contains a list of all available layouts. The currently selected layout is indicated with a check mark "✓".
+The <i>Layout Selector</i> contains a list of all available layouts. The currently selected layout is indicated with a check mark "✓".
 {% endcapture %}
 {% include howto_step.html
-summary="Open the layout selector dropdown"
-image-name="2.3.0/dashboard/dashboard-layoutselector.png"
-caption="Click the layout selector dropdown to view the available layouts."
+summary="Open the <i>Layout Selector Dropdown</i>"
+image-name="2.4.0/dashboard/dashboard-layoutselector.png"
+caption="Click the <i>layout selector dropdown</i> to view the available layouts."
 text=layout-selector-text
 %}
diff --git a/guides/_subsections/common/navigate-to-dashboard.md b/guides/_subsections/common/navigate-to-dashboard.md
index 815adbc3..adf412d4 100644
--- a/guides/_subsections/common/navigate-to-dashboard.md
+++ b/guides/_subsections/common/navigate-to-dashboard.md
@@ -1,9 +1,9 @@
 {% capture navigate-to-dashboard-include-text %}
- The <i>Cryostat Dashboard</i> provides a high-level overview of the state of your Cryostat instance and the target JVM applications it is monitoring.
+ The <b>Cryostat</b> <i>Dashboard</i> provides a high-level overview of the state of your <b>Cryostat</b> instance and the target <b>JVM</b> applications it is monitoring.
 {% endcapture %}
 {% include howto_step.html
   summary="Navigate to <i>Dashboard</i>"
-  image-name="2.3.0/navigate-to-dashboard.png"
-  caption="Add dashboard cards, switch between dashboard layouts, and modify the layout configuration to suit your needs."
+  image-name="2.4.0/navigate-to-dashboard.png"
+  caption="Add <code>dashboard cards</code>, switch between <code>dashboard layouts</code>, and modify the <code>layout configuration</code> to suit your needs."
   text=navigate-to-dashboard-include-text
 %}
diff --git a/guides/_subsections/common/navigate-to-recordings.md b/guides/_subsections/common/navigate-to-recordings.md
index 9f49e1d3..91aad7d9 100644
--- a/guides/_subsections/common/navigate-to-recordings.md
+++ b/guides/_subsections/common/navigate-to-recordings.md
@@ -1,19 +1,19 @@
 {% capture navigate-to-recordings-include-text %}
-  If the target JVM has SSL/TLS enabled on JMX connections then it may be
-  necessary to add the target's certificate to Cryostat's trust store. Go
+  If the <code>target</code> <b>JVM</b> has <code>SSL/TLS</code> enabled on <b>JMX</b> connections, it may be
+  necessary to add the <code>target's</code> certificate to <b>Cryostat's</b> trust store. Go
   to <a href="{{ site.url }}/guides/#add-a-trusted-certificate">Add a Trusted Certificate</a>
   and return to this section after completing that guide.
-  <a href="{{ site.url }}/images/2.3.0/navigate-to-recordings-2.png" target="_blank">
-    <img src="{{ site.url }}/images/2.3.0/navigate-to-recordings-2.png">
+  <a href="{{ site.url }}/images/2.4.0/navigate-to-recordings-2.png" target="_blank">
+    <img src="{{ site.url }}/images/2.4.0/navigate-to-recordings-2.png">
   </a>
   {{ include.additional-content }}
 {% endcapture %}
 {% include howto_step.html
-  summary="Navigate to Recordings"
-  image-name="2.3.0/navigate-to-recordings-1.png"
+  summary="Navigate to <i>Recordings</i>"
+  image-name="2.4.0/navigate-to-recordings-1.png"
   caption="
-    Supply JMX credentials to authenticate to the target, if necessary. If
-    the target is not configured with JMX authentication then the
+    Supply <b>JMX</b> credentials to authenticate to the <code>target</code>, if necessary. If
+    the <code>target</code> is not configured with <b>JMX</b> authentication then the
     connection attempt will continue without prompting for credentials.
   "
   text=navigate-to-recordings-include-text
diff --git a/guides/_subsections/common/navigate-to-settings.md b/guides/_subsections/common/navigate-to-settings.md
index b9583a1a..b9db00fc 100644
--- a/guides/_subsections/common/navigate-to-settings.md
+++ b/guides/_subsections/common/navigate-to-settings.md
@@ -1,14 +1,14 @@
 {% capture navigate-to-settings-include-text %}
-  The Settings view contains web-client instance configuration settings. These
-  affect the appearance or behaviour of the web-client frontend only, not the
-  behaviour of the Cryostat backend server. These frontend settings are persisted
+  The <i>Settings</i> view contains <b>web-client</b> instance configuration settings. These
+  affect the appearance or behaviour of the <b>web-client</b> frontend only, not the
+  behaviour of the <b>Cryostat</b> backend server. These frontend settings are persisted
   to web browser local storage only.
 {% endcapture %}
 {% include howto_step.html
-  summary="Navigate to Settings"
-  image-name="2.3.0/navigate-to-settings.png"
+  summary="Navigate to <i>Settings</i>"
+  image-name="2.4.0/navigate-to-settings.png"
   caption="
-    Click the cog or gear icon in the application masthead to access the Settings view.
+    Click the <i>cog</i> or <i>gear</i> icon in the application masthead to access the <i>Settings</i> view.
   "
   text=navigate-to-settings-include-text
 %}
diff --git a/guides/_subsections/common/navigate-to-topology.md b/guides/_subsections/common/navigate-to-topology.md
index c09fef7e..eb13b46d 100644
--- a/guides/_subsections/common/navigate-to-topology.md
+++ b/guides/_subsections/common/navigate-to-topology.md
@@ -1,9 +1,9 @@
 {% capture navigate-to-topology-include-text %}
-  When you need to view or perform actions on multiple target JVMs at the same time, <b>Topology View</b> is the way.
+  When you need to view or perform actions on multiple <code>target</code> <b>JVMs</b> at the same time, <i>Topology View</i> is the way.
 {% endcapture %}
 {% include howto_step.html
-  summary="Navigate to Topology"
-  image-name="2.3.0/navigate-to-topology.png"
-  caption="Use the bottom control bar to adjust the graph view as needed."
+  summary="Navigate to <i>Topology</i>"
+  image-name="2.4.0/navigate-to-topology.png"
+  caption="Use the bottom <i>Control Bar</i> to adjust the <i>Graph View</i> as needed."
   text=navigate-to-topology-include-text
 %}
diff --git a/guides/_subsections/common/select-a-recording.md b/guides/_subsections/common/select-a-recording.md
index 31681af9..7821d64d 100644
--- a/guides/_subsections/common/select-a-recording.md
+++ b/guides/_subsections/common/select-a-recording.md
@@ -5,8 +5,8 @@
   {{ include.select-a-recording-additional-content }}
 {% endcapture %}
 {% include howto_step.html
-  summary="Select a recording"
-  image-name="2.3.0/select-a-recording.png"
+  summary="Select a <code>Recording</code>"
+  image-name="2.4.0/select-a-recording.png"
   caption=caption-content
   text=text-content
 %}
diff --git a/guides/_subsections/common/select-target-application.md b/guides/_subsections/common/select-target-application.md
index 08361484..3d6180a6 100644
--- a/guides/_subsections/common/select-target-application.md
+++ b/guides/_subsections/common/select-target-application.md
@@ -2,11 +2,12 @@
   {{ include.select-target-application-caption }}
 {% endcapture %}
 {% capture text-content %}
-  {{ include.select-target-application-additional-content }}
+  If you wish to create a <code>Custom Target</code> from here, click <i>Create Target</i> displayed at the bottom. Go to <a href='#create-a-custom-target'> Create a Custom Target</a> and proceed from step 3.
+  Also, see <a href='#using-the-cryostat-agent'> Using the Cryostat Agent</a> section to help discover other <code>targets</code>.
 {% endcapture %}
 {% include howto_step.html
-  summary="Select the target application"
-  image-name="2.3.0/select-target-application.png"
-  caption=caption-content
+  summary="Select the <i>Target Application</i>"
+  image-name="2.4.0/select-target-application.png"
+  caption="Clik the <i>Dropdown arrow</i> on the right side of <i>Target</i> prompt to select or create a <code>target</code>."
   text=text-content
 %}
diff --git a/guides/_subsections/configure-credentials-storage.md b/guides/_subsections/configure-credentials-storage.md
index 0ef2ede1..9432358d 100644
--- a/guides/_subsections/configure-credentials-storage.md
+++ b/guides/_subsections/configure-credentials-storage.md
@@ -1,29 +1,45 @@
 ## [Configure Credentials Storage](#configure-credentials-storage)
 
-Target JVM applications may require Cryostat to pass an authentication challenge before being able to communicate over JMX or HTTP
-and manage JFR. Cryostat has two supported mechanisms for these credentials:
+Target **JVM** applications may require **Cryostat** to pass an authentication
+challenge before being able to communicate over **JMX** or `HTTP` and manage **JFR**.
+
+**Cryostat** has two supported mechanisms for these <code>Credentials</code>:
+
 <ol>
   <li>
-    <b>Credentials Keyring</b>: see <a href="#store-credentials">Store Credentials</a> for more detail.
-    This mechanism entails uploading a Credentials definition to the Cryostat backend keyring storage. Cryostat
-    automatically checks the keyring for credentials matching a target application when a request to that application
-    is opened. If no credentials are found, Cryostat responds to the requesting client (e.g. the Cryostat Web UI) with
-    a response indicating the authentication failure.
+    <code>Credentials Keyring</code>: see <a href="#store-credentials">Store Credentials</a>
+    for more detail. This mechanism entails uploading a <code>Credentials</code> definition
+    to the <b>Cryostat</b> backend's encrypted <code>Keyring</code> storage. <b>Cryostat</b> automatically
+    checks the <code>Keyring</code> for <code>Credentials</code> matching a target application when a
+    request to that application is opened. If no <code>Credentials</code> are found,
+    <b>Cryostat</b> responds to the requesting client with a response indicating the
+    authentication failure. The <b>Cryostat Web</b> UI then prompts the user for
+    <code>Credentials</code>. If <code>Credentials</code> are entered on the prompt, they will also be
+    stored in this same encrypted <code>Keyring</code>.
+
+    <code>Credentials</code> entered in the <a href="#store-credentials">Store Credentials</a>
+    table are <code>always</code> stored in the server's encrypted <code>Keyring</code>.
+    Additionally, <b>Cryostat Agent</b> <code>HTTP</code> <code>Credentials</code> are always stored in the
+    same encrypted <code>Keyring</code>.
   </li>
   <li>
-    <b>X-JMX-Authorization</b> header passthrough: when the Cryostat Web UI receives a JMX authentication failure response
-    from the Cryostat server, it displays a prompt asking for JMX credentials. Depending on the configuration set in this
-    section, those credentials may either be held locally in your browser session, or they may be uploaded to the Cryostat
-    credentials keyring. If the credentials are held locally in your browser session, then the Cryostat Web UI will
-    automatically attach a custom header with API requests containing the JMX credentials you specify. The Cryostat
-    server sees this header and uses the credentials when opening the JMX connection to the target, but <i>does not
-    persist these credentials</i>. When the JMX credentials passthrough header is present, they supersede credentials
-    stored in the Cryostat server's keyring.
+    <code>Web Session</code>: This mechanism entails holding <code>Credentials</code> only in the
+    <b>Cryostat Web</b> UI's currently active session memory. Whenever the <b>Cryostat
+    Web</b> UI makes a request to the <b>Cryostat</b> server, it includes the relevant <b>JMX</b>
+    <code>Credential</code> in an <b>X-JMX-Authorization</b> header, which the server reads
+    and passes through to the target application. In this scheme, the <b>Cryostat</b>
+    server does not store nor persist the <b>Credentials</b> in any way - they are only
+    held in server memory long enough to complete the current request, then
+    are dropped. If the server sees this header on a request it will <span style="color:red;">not</span>
+    check its encrypted <code>Credentials Keyring</code> for any other <code>Credentials</code> matching
+    the target application, so this mechanism and header can also be used to
+    override the <code>Keyring</code> stored <code>Credentials</code>.
   </li>
 </ol>
 
-Now that you understand the difference, let's continue to see how you can configure the Cryostat Web UI to use one
-or the other when you complete a Authentication prompt.
+Now that you understand the difference, let's continue to see how you can
+configure the **Cryostat Web** UI to use one or the other when you complete an
+<code>Authentication</code> prompt.
 
 <ol>
   <li>
@@ -31,13 +47,15 @@ or the other when you complete a Authentication prompt.
   </li>
   <li>
     {% include howto_step.html
-      summary="Locate the Credentials Storage setting"
-      image-name="2.3.0/credentials-setting.png"
+      summary="Locate the <i>Credentials Storage</i> Setting"
+      image-name="2.4.0/credentials-setting.png"
       text="
-        This setting contains a brief explanation of its purpose and a simple dropdown menu with selections for where any
-        Credentials entered into a <i>Authentication Required</i> challenge modal will be stored.
-        Choose <i>Session (Browser Memory)</i> to use the header passthrough mechanism described above, or choose
-        <i>Backend</i> to automatically store the credentials in the Cryostat server keyring.
+        This setting contains a brief explanation of its purpose and a simple
+        dropdown menu with selections for where any <code>Credentials</code> entered into an
+        <i>Authentication Required</i> challenge modal will be stored. Choose
+        <i>Session (Browser Memory)</i> to use the header passthrough mechanism
+        described above, or choose <i>Backend</i> to automatically store the
+        <code>Credentials</code> in the <b>Cryostat</b> server <code>Keyring</code>.
       "
     %}
   </li>
diff --git a/guides/_subsections/configure-graphical-notifications.md b/guides/_subsections/configure-graphical-notifications.md
index 848c9b97..6937a52a 100644
--- a/guides/_subsections/configure-graphical-notifications.md
+++ b/guides/_subsections/configure-graphical-notifications.md
@@ -1,9 +1,9 @@
 ## [Configure Graphical Notifications](#configure-graphical-notifications)
-Actions such as starting/stopping/archiving recordings and state changes such as recordings stopping after a fixed duration
+Actions such as starting/stopping/archiving `Recordings` and state changes such as `Recordings` stopping after a fixed duration
 produce graphical notifications. These notifications appear both when an interactive user performs the action via the
-web-client, as well as when an [Automated Rule](#create-an-automated-rule) performs the action, or when any other API
-client performs the action. If many Automated Rules or other API clients are active then the notification stream within
-the web-client graphical console can become quite noisy.
+**web-client**, as well as when an [`Automated Rule`](#create-an-automated-rule) performs the action, or when any other API
+client performs the action. If many `Automated Rules` or other API clients are active, the notification stream within
+the **web-client** graphical console can become quite noisy.
 
 <ol>
   <li>
@@ -11,15 +11,15 @@ the web-client graphical console can become quite noisy.
   </li>
   <li>
     {% include howto_step.html
-      summary="Locate the Notifications setting"
-      image-name="2.3.0/notifications-setting.png"
+      summary="Locate the <i>Notifications</i> Setting"
+      image-name="2.4.0/notifications-setting.png"
       text="
-        The Notifications setting within this view is used to control the graphical display of notifications that
-        correspond to WebSocket messages sent by the Cryostat backend when actions and state changes occur. The setting
-        contains a toggle switch for each category of notification, as well as a global switch to enable/disable all
+        The <i>Notifications</i> setting within this view is used to control the graphical display of notifications that
+        correspond to <code>WebSocket</code> messages sent by the <b>Cryostat</b> backend when actions and state changes occur. The setting
+        contains a toggle switch for each category of notification, as well as a global switch <i>All Notifications </i>, to enable/disable all
         categories at once. Disabling a notification category only prevents it from appearing as a pop-up notification
-        toast in the current web-client instance. The notification will still appear in the notification drawer, accessed
-        by clicking the bell icon in the application masthead, and other web-client instances or API clients will still
+        toast in the current <b>web-client</b> instance. The notification will still appear in the notification drawer, accessed
+        by clicking the <i>bell icon</i> in the application masthead, and other <b>web-client</b> instances or API clients will still
         receive the notification to process as they will.
       "
     %}
diff --git a/guides/_subsections/create-a-custom-target.md b/guides/_subsections/create-a-custom-target.md
index b98ba408..5e348d22 100644
--- a/guides/_subsections/create-a-custom-target.md
+++ b/guides/_subsections/create-a-custom-target.md
@@ -1,6 +1,11 @@
 ## [Create a Custom Target](#create-a-custom-target)
 
-By default, Cryostat automatically discovers target JVMs over remote Java Management Extensions (JMX), using various mechanisms (e.g. Kubernetes API, JDP). However, in some cases (e.g. for Kubernetes API, JMX port is not `9091` and port name is not `jfr-jmx`), Cryostat might not see your applications. Fortunately, you can tell Cryostat about them by filling out the *Custom Target* form to specify *Custom Targets*.
+**Cryostat** automatically discovers `target` **JVMs** using various mechanisms (e.g.
+**Kubernetes API**, **JDP**, [Cryostat Agent plugin](#using-the-cryostat-agent)).
+However, in some cases (e.g. for **Kubernetes API**, **JMX** port is not `9091` and
+port name is not `jfr-jmx`), **Cryostat** might not see your applications. In these
+scenarios you can tell **Cryostat** about them by filling out the *Custom Target*
+form to specify *Custom Targets*.
 
 <ol>
   <li>
@@ -9,75 +14,85 @@ By default, Cryostat automatically discovers target JVMs over remote Java Manage
   <li>
     {% capture open-custom-target-form-text %}
     <p>
-      Search for <i>Custom Target</i> tab and click <i>Create</i> to open the <i>Custom Target</i> form.
+      Search for <i>Custom Target</i> tab and click <i>Create</i> to open the
+      <i>Custom Target</i> form.
       <figure>
-        <a href="{{ site.url }}/images/2.3.0/custom-target-1.png" target="_blank">
-          <img src="{{ site.url }}/images/2.3.0/custom-target-1.png">
+        <a href="{{ site.url }}/images/2.4.0/custom-target-1.png" target="_blank">
+          <img src="{{ site.url }}/images/2.4.0/custom-target-1.png">
         </a>
         <figcaption>
-          Use the <i>Custom Target</i> form to tell Cryostat about a JVM application that are not automatically discovered.
+          Use the <i>Custom Target</i> form to tell <b>Cryostat</b> about <b>JVM</b>
+          applications that are not automatically discovered.
         </figcaption>
       </figure>
     </p>
     {% endcapture %}
     {% include howto_step.html
-      summary="Open the <i>Custom Target</i> form"
-      image-name="2.3.0/topology-7.png"
-      caption="Click on Catalog Icon to open the Topology Entity Catalog."
+      summary="Open the <i>Custom Target</i> Form"
+      image-name="2.4.0/topology-7.png"
+      caption="Click on <i>Catalog Icon</i> to open the <i>Topology Entity Catalog</i>."
       text=open-custom-target-form-text
     %}
   </li>
   <li>
     {% include howto_step.html
-      summary="Enter <i>Custom Target</i> definition"
-      image-name="2.3.0/custom-target-2.png"
+      summary="Enter <i>Custom Target</i> Definition"
+      image-name="2.4.0/custom-target-2.png"
       caption="Use the form to enter the <i>Custom Target</i> definition."
       text="
-      The <code>Connection URL</code> is required for Cryostat to attempt to find the target. You can optionally provide an  <code>Alias</code> or <code>JMX credentials</code> if the target has JMX authentication enabled.
+      The <i>Connection URL</i> is required for <b>Cryostat</b> to attempt to
+      find the <code>target</code>. You can optionally provide an  <i>Alias</i> or
+      <i><b>JMX</b> credentials</i> if the <code>target</code> has <b>JMX</b> authentication enabled.
       "
     %}
   </li>
   <li>
     {% capture test-custom-target-text %}
       <p>
-        Once you enter a valid connection URL, click on the sample node to test the target connection.
+        Once you enter a valid <i>Connection URL</i>, click on the sample <code>node</code> to test
+        the <code>target</code> connection.
         <figure>
-          <a href="{{ site.url }}/images/2.3.0/custom-target-4.png" target="_blank">
-            <img src="{{ site.url }}/images/2.3.0/custom-target-4.png">
+          <a href="{{ site.url }}/images/2.4.0/custom-target-4.png" target="_blank">
+            <img src="{{ site.url }}/images/2.4.0/custom-target-4.png">
           </a>
           <figcaption>
-            An exclamation mark and an alert banner will show if an error occurs while connecting to the target.
+            An exclamation mark and an alert banner will show if an error
+            occurs while connecting to the <code>target</code>.
           </figcaption>
         </figure>
       </p>
     {% endcapture %}
     {% include howto_step.html
-      summary="Test the <i>Custom Target</i> definition"
-      image-name="2.3.0/custom-target-3.png"
-      caption="A checkmark will show if Cryostat can connect to the sample app."
+      summary="Test the <i>Custom Target</i> Definition"
+      image-name="2.4.0/custom-target-3.png"
+      caption="A &#9989; checkmark will show if <b>Cryostat</b> can connect to the sample app."
       text=test-custom-target-text
     %}
   </li>
   <li>
-    <summary>Click <i>Create</i> button to generate a new <i>Custom Target</i> definition once the test is successful.</summary>
+    <summary>Click <i>Create</i> Button to Generate a New <i>Custom Target</i>
+    definition once the test is successful.</summary>
   </li>
   <li>
     {% include howto_step.html
       summary="View the <i>Custom Targets</i>"
-      image-name="2.3.0/custom-target-5.png"
+      image-name="2.4.0/custom-target-5.png"
       caption="The <i>Custom Target</i> will be available under <i>Custom Targets</i> realm."
       text="
-      Once the <i>Custom Target</i> form is successfully submitted, you will be redirected to the Topology View. Here, you can view your target under <i>Custom Targets</i> realm.
+          Once the <i>Custom Target</i> form is successfully submitted, you
+          will be redirected to the <i>Topology View</i>. Here, you can view your
+          <code>target</code> under <i>Custom Targets</i> realm.
       "
     %}
   </li>
   <li>
     {% include howto_step.html
       summary="<i>(Optional)</i> Delete <i>Custom Targets</i>"
-      image-name="2.3.0/custom-target-6.png"
-      caption="<i>Custom Targets</i> can be cleaned up with Actions menu."
+      image-name="2.4.0/custom-target-6.png"
+      caption="<i>Custom Targets</i> can be cleaned up with <i>Actions</i> menu."
       text="
-      If the <i>Custom Targets</i> is no longer needed, in the target detail panel, click the <i>Actions</i> menu and select <b>Delete Target</b>.
+      If the <i>Custom Targets</i> is no longer needed, in the target detail
+      panel, click the <i>Actions</i> menu and select <i>Delete Target</i>.
       "
     %}
   </li>
diff --git a/guides/_subsections/create-an-automated-rule.md b/guides/_subsections/create-an-automated-rule.md
index ebb2895b..f5df7765 100644
--- a/guides/_subsections/create-an-automated-rule.md
+++ b/guides/_subsections/create-an-automated-rule.md
@@ -1,64 +1,64 @@
 ## [Create an Automated Rule](#create-an-automated-rule)
 
-Automated Rules are configurations that instruct Cryostat to create JDK Flight Recordings on matching
-target JVM applications. Each Automated Rule specifies parameters for which Event Template to use, how
-much data should be kept in the application recording buffer, and how frequently Cryostat should copy the
-application recording buffer into Cryostat's own archived storage.
+`Automated Rules` are configurations that instruct **Cryostat** to create **JDK** `Flight Recordings` on matching
+`target` **JVM** applications. Each `Automated Rule` specifies parameters for which *Event Template* to use, how
+much data should be kept in the application recording buffer, and how frequently **Cryostat** should copy the
+application recording buffer into **Cryostat's** own archived storage.
 
-Once you've created a rule, Cryostat immediately matches it against all existing discovered targets and starts your flight recording. Cryostat will also apply the rule to newly discovered targets that match its definition. You can create multiple rules to match different subsets of targets or to layer different recording options for your needs.
+Once you've created a rule, **Cryostat** immediately matches it against all existing discovered `targets` and starts your `Flight Recording`. **Cryostat** will also apply the rule to newly discovered `targets` that match its definition. You can create multiple rules to match different subsets of `targets` or to layer different recording options for your needs.
 
-We'll walk through two use cases: continuous monitoring in a containerized JVM, and custom monitoring with Kubernetes labels or annotations.
+We'll walk through two use cases: `Continuous` monitoring in a containerized **JVM**, and `Custom` monitoring with **Kubernetes** labels or annotations.
 
-### [Continuous monitoring in a containerized JVM](#continuous-monitoring-in-a-containerized-jvm)
+### [Continuous Monitoring in a Containerized JVM](#continuous-monitoring-in-a-containerized-jvm)
 
-Previously, if we wanted to enable always-on continuous monitoring using JDK Flight Recorder (JFR) in a containerized Java virtual machine (JVM), we would set JVM flags on the target application, then restart the application to start monitoring. With Cryostat's automated rules, we can enable JDK Flight Recorder at runtime to continuously monitor an already-running target application, with no restart, no redeploy, and no downtime.
+Previously, if we wanted to enable always-on `Continuous` monitoring using **JDK** Flight Recorder **(JFR)** in a containerized Java virtual machine **(JVM)**, we would set **JVM** flags on the `target` application, then restart the application to start monitoring. With **Cryostat's** `Automated Rules`, we can enable **JDK** Flight Recorder  **(JFR)** at runtime to continuously monitor an already-running `target` application, with no restart, no redeploy, and no downtime.
 
 <ol>
   <li>
       {% include howto_step.html
-      summary="Navigate to the <i>Automated Rules</i> tab"
-      image-name="2.3.0/create-an-automated-rule-1.png"
+      summary="Navigate to the <i>Automated Rules</i> Tab"
+      image-name="2.4.0/create-an-automated-rule-1.png"
       caption="Switch to the <i>Automated Rules</i> tab."
     %}
   </li>
   <li>
-    <summary>Click the <i>Create</i> button</summary>
+    <summary>Click the <i>Create</i> Button</summary>
   </li>
   <li>
       {% include howto_step.html
-        summary="Configure the new automated rule"
-        image-name="2.3.0/create-an-automated-rule-2.png"
+        summary="Configure the new <code>Automated Rule</code>"
+        image-name="2.4.0/create-an-automated-rule-2.png"
         text="
       <p>
-        <b>Name:</b> Enter a name for the new rule. The form will alert you if the name
+        <i>Name:</i> Enter a name for the new rule. The form will alert you if the name
         entered has an invalid format. If the name is already in use then the
         creation will fail and you will need to try again.
       </p>
       <p>
-        <b>Description:</b> Enter an optional description for your rule.
+        <i>Description:</i> Enter an optional description for your rule.
       </p>
       <p>
-        <b>Match Expression:</b> We will fill this field in the next step.
+        <i>Match Expression:</i> We will fill this field in the next step.
       </p>
       <p>
-        <b>Enabled:</b> Enable or disable the rule. If disabled, the rule will not be applied to any targets.
+        <i>Enabled:</i> Enable or disable the rule. If disabled, the rule will not be applied to any <code>targets</code>.
       </p>
       <p>
-        <b>Template:</b> Select an event template or enter a custom event definition. If you are
+        <i>Template:</i> Select an <code>Event Template</code> or enter a custom event definition. If you are
         unsure which to choose, the <i>Continuous</i> template is useful for
-        always-on production monitoring with the <i>continuous</i> recording
+        always-on production monitoring with the <i>Continuous</i> recording
         duration setting, and the <i>Profiling</i> template is useful for
         collecting extra information for troubleshooting a specifically
         identified problem with a fixed recording duration.
       </p>
       "
-      %}  
+      %}
   </li>
   <li>
     <details>
-        <summary>Create your match expression</summary>
+        <summary>Create your <code>Match Expression</code></summary>
         <p>
-            The match expression in a rule definition is a Java-like snippet of code that Cryostat interprets and uses to determine if a rule should be applied to any given target. Match expressions should thus evaluate to a boolean value. The simplest match expressions would be the booleans true or false; if we use true, the rule will apply to every target. The expression has a target object in global scope, with the following form in JSON notation:
+            The <code>Match Expression</code> in a rule definition is a Java-like snippet of code that <b>Cryostat</b> interprets and uses to determine if a rule should be applied to any given <code>target</code>. <code>Match Expressions</code> should thus evaluate to a <code>boolean</code> value. The simplest <code>Match Expressions</code> would be the <code>booleans</code> true or false; if we use true, the rule will apply to every <code>target</code>. The <code>Expression</code> has a <code>target</code> object in global scope, with the following form in <code>JSON</code> notation:
         </p>
         <figure>
 {% highlight json %}
@@ -82,9 +82,9 @@ Previously, if we wanted to enable always-on continuous monitoring using JDK Fli
 {% endhighlight %}
         </figure>
         <p>
-          The <i>alias, connectUrl, labels, annotations.platform,</i> and <i>annotations.cryostat</i> properties are all guaranteed to be present on the target object. <i>alias</i> and <i>connectUrl</i> will be non-empty strings. The <i>labels</i> and <i>platform annotations</i> may be empty—in OpenShift or Kubernetes, these are populated from the labels and annotations applied to the target’s pod, if any. The Cryostat annotations map will vary per platform, but on OpenShift or Kubernetes you can expect the <i>HOST, PORT, NAMESPACE,</i> and <i>POD_NAME</i> keys to be present and non-empty.
+          The <i>Alias, connectUrl, labels, annotations.platform,</i> and <i>annotations.cryostat</i> properties are all guaranteed to be present on the <code>target</code> object. <i>alias</i> and <i>connectUrl</i> will be non-empty strings. The <i>labels</i> and <i>platform annotations</i> may be empty—in <b>OpenShift</b> or <b>Kubernetes</b>, these are populated from the labels and annotations applied to the <code>target’s</code> pod, if any. The <b>Cryostat</b> annotations map will vary per platform, but on <b>OpenShift</b> or <b>Kubernetes</b> you can expect the <i>HOST, PORT, NAMESPACE,</i> and <i>POD_NAME</i> keys to be present and non-empty.
 
-          Here are some examples of match expressions:
+          Here are some examples of <code>Match Expressions</code>:
         </p>
         <figure>
 
@@ -112,64 +112,64 @@ target.annotations.cryostat.PORT > 3000 && target.annotations.platform[‘io.kub
   </li>
   <li>
       {% include howto_step.html
-        summary="Check your match expression"
-        image-name="2.3.0/create-an-automated-rule-3.png"
-        caption="You can select a target JVM to view its properties and use them to build your Match Expression."
+        summary="Check your <code>Match Expression</code>"
+        image-name="2.4.0/create-an-automated-rule-3.png"
+        caption="You can select a <code>target</code> <b>JVM</b> to view its properties and use them to build your <code>Match Expression</code>."
         text="
           <p>
-          When you enter a match expression in the <i>Match Expression</i> field, the <i>Match Expression Visualizer</i> will highlight which targets are matched.
+          When you enter a <code>Match Expression</code> in the <i>Match Expression</i> field, the <i>Match Expression Visualizer</i> will highlight which <code>targets</code> are matched.
           </p>
           "
       %}
   </li>
   <li>
       {% include howto_step.html
-        summary="<i>(Optional)</i> Adjust rule parameters"
-        image-name="2.3.0/create-an-automated-rule-4.png"
+        summary="<i>(Optional)</i> Adjust <i>Rule Parameters</i>"
+        image-name="2.4.0/create-an-automated-rule-4.png"
         caption="
-          Optionally set the recording options and rule parameters."
+          Optionally set the <code>Recording</code> Options and <i>Rule Parameters.</i>"
         text="
-        <p><b>Maximum Size:</b> The maximum size of recording data retained in the target application's recording buffer. Values less than 1 indicate no limit.</p>
-        <p><b>Maximum Age:</b> The maximum age of recording data retained in the target application's recording buffer. Values less than 1 indicate no limit.</p>
-        <p><b>Archival Period:</b> Time between copies of active recording data being pulled into Cryostat archive storage.
-        Values less than 1 prevent data from being copied into archives - recordings will be started and remain only in target JVM memory.</p>
-        <p><b>Initial Delay:</b> Time between rule creation and when the first archived copy should be transferred. Values less than 1 are treated as being equal to the <b>Archival Period</b> above.</p>
-        <p><b>Preserved Archives:</b> The number of recording copies to preserve in archives for each target application affected by this rule. Values less than 1 prevent data from being copied into archives - recordings will be started and remain only in target JVM memory.</p>
-
-        <p>In the example image, the maximum recording age was set to 300 seconds and the archival period was set to a slightly shorter time period of 285 seconds. This overlap ensures that all of your flight recorder data is preserved in Cryostat's archives. The initial delay is set to 60 seconds however, so the first archive copy will be made 1 minute after the rule is created. The next copy will be made 5 minutes after that, the next another 5 minute later, etc.</p>
+        <p><i>Maximum Size:</i> The maximum size of <code>Recording</code> data retained in the <code>target</code> application's recording buffer. Values less than 1 indicate no limit.</p>
+        <p><i>Maximum Age:</i> The maximum age of <code>Recording</code> data retained in the <code>target</code> application's recording buffer. Values less than 1 indicate no limit.</p>
+        <p><i>Archival Period:</i> Time between copies of <code>Active recording</code> data being pulled into <b>Cryostat</b> archive storage.
+        Values less than 1 prevent data from being copied into archives - <code>Recordings</code> will be started and remain only in <code>target</code> <b>JVM</b> memory.</p>
+        <p><i>Initial Delay:</i> Time between rule creation and when the first archived copy should be transferred. Values less than 1 are treated as being equal to the <i>Archival Period</i> above.</p>
+        <p><i>Preserved Archives:</i> The number of <code>Recording</code> copies to preserve in archives for each <code>target</code> application affected by this rule. Values less than 1 prevent data from being copied into archives - <code>Recordings</code> will be started and remain only in <code>target</code> <b>JVM</b> memory.</p>
+
+        <p>In the example image, the <i>Maximum Recording</i> age was set to 300 seconds and the <i>Archival Period</i> was set to a slightly shorter time period of 285 seconds. This overlap ensures that all of your <code>Flight Recorder</code> data is preserved in <b>Cryostat's</b> archives. The initial delay is set to 60 seconds however, so the first archive copy will be made 1 minute after the rule is created. The next copy will be made 5 minutes after that, the next another 5 minute later, etc.</p>
         "
       %}
 
   </li>
   <li>
-    <summary>Click the <i>Create</i> button</summary>
+    <summary>Click the <i>Create</i> Button</summary>
   </li>
   <li>
       {% include howto_step.html
-        summary="Observe the new rule in the <i>Automated Rules</i> table"
-        image-name="2.3.0/create-an-automated-rule-5.png"
+        summary="Observe the new Rule in the <i>Automated Rules</i> Table"
+        image-name="2.4.0/create-an-automated-rule-5.png"
         caption="
           The new rule will appear in the <i>Automated Rules</i> table."
-      %}  
+      %}
   </li>
   <li>
       {% include_relative _subsections/common/navigate-to-recordings.md %}
   </li>
   <li>
       {% include howto_step.html
-        summary="Observe the automatically generated recording in the <i>Active Recordings</i> table"
-        image-name="2.3.0/create-an-automated-rule-6.png"
+        summary="Observe the automatically generated <code>Recording</code> in the <i>Active Recordings</i> Table"
+        image-name="2.4.0/create-an-automated-rule-6.png"
         caption="
-          Switch to the <i>Recordings</i> tab and view the new recording in the <i>Active Recordings</i>
+          Switch to the <i>Recordings</i> tab and view the new <code>Recording</code> in the <i>Active Recordings</i>
           table."
-        text="Once you've set up your automated rules, Cryostat will continuously monitor applications that meet the criteria defined in those rules, with no need to restart or redeploy those applications."
-      %}  
+        text="Once you've set up your <code>Automated Rules</code>, <b>Cryostat</b> will continuously monitor applications that meet the criteria defined in those rules, with no need to restart or redeploy those applications."
+      %}
   </li>
 </ol>
 
-### [Custom monitoring with Kubernetes labels or annotations](#custom-monitoring-with-kubernetes-labels-or-annotations)
+### [Custom Monitoring with Kubernetes Labels or Annotations](#custom-monitoring-with-kubernetes-labels-or-annotations)
 
-We can define a rule that applies to any target application that has platform-specific attributes, such as Kubernetes labels or annotations. Here's an example in JSON notation:
+We can define a rule that applies to any `target` application that has platform-specific attributes, such as **Kubernetes** labels or annotations. Here's an example in `JSON` notation:
 
 <figure>
 {% highlight json %}
@@ -186,14 +186,14 @@ We can define a rule that applies to any target application that has platform-sp
 {% endhighlight %}
 
   <figcaption>
-    To create this rule with the Cryostat UI, follow the guide in <a href="{{ page.url }}#continuous-monitoring-in-a-containerized-jvm">Continuous monitoring in a containerized JVM</a>.
+    To create this rule with the <b>Cryostat</b> UI, follow the guide in <a href="{{ page.url }}#continuous-monitoring-in-a-containerized-jvm">Continuous Monitoring in a Containerized JVM</a>.
   </figcaption>
 </figure>
 
-Once we've created this rule definition, Cryostat will check all of the existing target applications and watch for new targets that appear with the <i>jfrMonitoring=enabled</i> annotation. Any matching targets found will have a recording started automatically using the custom <i>Demo</i> template from our first use case. It will take an archived snapshot every five minutes and maintain an hour’s worth of these archives in storage.
+Once we've created this rule definition, **Cryostat** will check all of the existing `target` applications and watch for new `targets` that appear with the `jfrMonitoring=enabled` annotation. Any matching `targets` found will have a `Recording` started automatically using the *Custom Demo* template from our first use case. It will take an `Archived snapshot` every five minutes and maintain an hour’s worth of these archives in storage.
 
-With this rule definition in place, Kubernetes or Red Hat OpenShift users can use familiar tools like <i>kubectl/oc</i> or the OpenShift console to mark target applications for monitoring, without needing to interact directly with the Cryostat API or UI. This opens the door to further automating your workflow.
+With this rule definition in place, **Kubernetes** or **Red Hat OpenShift** users can use familiar tools like `kubectl/oc` or the `OpenShift console` to mark `target` applications for monitoring, without needing to interact directly with the **Cryostat** API or UI. This opens the door to further automating your workflow.
 
-As an example, you might use or implement an Operator that monitors traffic flow or pod restarts and enables monitoring on pods after some criterion threshold is met, then disables it again if the target application's behavior returns to normal. As a Kubernetes administrator, you could receive a notification when this occurs and check the Cryostat archives to retrieve JDK Flight Recorder data from the target application recorded during the problematic period, or you could view these archived recordings in Cryostat’s Grafana dashboard.
+As an example, you might use or implement an `Operator` that monitors traffic flow or pod restarts and enables monitoring on pods after some criterion threshold is met, then disables it again if the `target` application's behavior returns to normal. As a **Kubernetes** administrator, you could receive a notification when this occurs and check the **Cryostat** archives to retrieve <code><b>JDK</b> Flight Recorder</code> data from the `target` application recorded during the problematic period, or you could view these `Archived Recordings` in **Cryostat’s Grafana** dashboard.
 
-**Note**: An important caveat is that Cryostat does not watch for changes in the Kubernetes annotations or labels; it only watches to see if target applications appear or disappear. To apply the annotation to a target application, we must apply the annotation or label to the application <i>pod</i> (which will cause Kubernetes to roll out a new replica), and not to the <i>deployment</i>.
+<span style="color:red">**Note**</span>: An important caveat is that **Cryostat** does not watch for changes in the **Kubernetes** annotations or labels; it only watches to see if `target` applications appear or disappear. To apply the annotation to a `target` application, we must apply the annotation or label to the application *pod* (which will cause **Kubernetes** to roll out a new replica), and not to the deployment.
diff --git a/guides/_subsections/download-an-active-or-archived-recording.md b/guides/_subsections/download-an-active-or-archived-recording.md
index b0f85498..3d5546d3 100644
--- a/guides/_subsections/download-an-active-or-archived-recording.md
+++ b/guides/_subsections/download-an-active-or-archived-recording.md
@@ -1,8 +1,8 @@
 ## [Download an Active or Archived Recording](#download-an-active-or-archived-recording)
-Cryostat provides some basic capabilities for analysis of Flight Recording data
-in-cluster. However, the core analysis workflow is to collect JFR files from
-target applications and copy them to local developer or admin workstations, then
-use [JDK Mission Control](https://github.com/openjdk/jmc) for the heavy lifting.
+**Cryostat** provides some basic capabilities for analysis of **Flight Recording** data
+in-cluster. However, the core analysis workflow is to collect **JFR** files from
+`target` applications and copy them to local developer or admin workstations, then
+use [`JDK Mission Control`](https://github.com/openjdk/jmc) for the heavy lifting.
 
 <ol>
   <li>
@@ -14,33 +14,33 @@ use [JDK Mission Control](https://github.com/openjdk/jmc) for the heavy lifting.
   <li>
     {% include_relative _subsections/common/select-a-recording.md
         select-a-recording-caption="
-        Determine the recording you wish to download to your local workstation.
-        This may be either an <i>Active</i> or <i>Archived</i> recording.
-        Select the appropriate tab in the Recordings view. No actual action
+        Determine the <code>Recording</code> you wish to download to your local workstation.
+        This may be either an <code>Active</code> or <code>Archived Recording</code>.
+        Select the appropriate tab in the <i>Recordings</i> view. No actual action
         needs to be taken at this step.
       "
     %}
   </li>
   <li>
     {% include howto_step.html
-      summary="Download the recording"
-      image-name="2.3.0/download-an-active-or-archived-recording-1.png"
+      summary="Download the <code>Recording</code>"
+      image-name="2.4.0/download-an-active-or-archived-recording-1.png"
       caption="
-        Click the action overflow three-dot menu on the right side of the
+        Click the action overflow \"&#65049;\" <i>three-dot</i> menu on the right side of the
         recording entry in the table, then click <i>Download Recording</i>.
       "
     %}
   </li>
   <li>
     {% include howto_step.html
-      summary="Choose what to do with the recording file"
-      image-name="2.3.0/download-an-active-or-archived-recording-2.png"
+      summary="Choose what to do with the <code>Recording</code> File"
+      image-name="2.4.0/download-an-active-or-archived-recording-2.png"
       caption="
-        Your browser will present you with its standard file-save dialog for both 
-        the <i>Archived Recording</i>, and a <code>.json</code> file containing any
-        metadata labels that were attached. It may take some time for these dialogs 
-        to appear. Once it does, you can choose to open the recording file directly 
-        in <i>JDK Mission Control</i>, or (recommended) to save the recording to disk.
+        Your browser will present you with its standard file-save dialog for both
+        the <code>Archived Recording</code>, and a <code>.json</code> file containing any
+        <code>Metadata Labels</code> that were attached. It may take some time for these dialogs
+        to appear. Once it does, you can choose to open the <code>Recording</code> file directly
+        in <code>JDK Mission Control</code>, or (recommended) to save the <code>Recording</code> to disk.
       "
     %}
   </li>
diff --git a/guides/_subsections/download-an-automated-rule.md b/guides/_subsections/download-an-automated-rule.md
index f9cbf13e..eb29611b 100644
--- a/guides/_subsections/download-an-automated-rule.md
+++ b/guides/_subsections/download-an-automated-rule.md
@@ -1,17 +1,17 @@
 ## [Download an Automated Rule](#download-an-automated-rule)
 
-Automated Rules can easily be downloaded for viewing and editing.
+`Automated Rules` can easily be downloaded for viewing and editing.
 
 
 <ol>
   <li>
       {% include howto_step.html
-        summary="Open action menu for a selected rule"
-        image-name="2.3.0/download-an-automated-rule-1.png"
-        caption="Click the action overflow three-dot menu on the right side of selected rule entry in the table."
-      %}  
+        summary="Open Action Menu for a selected Rule"
+        image-name="2.4.0/download-an-automated-rule-1.png"
+        caption="Click the action overflow \"&#65049;\" <i>three-dot</i> menu on the right side of selected rule entry in the table."
+      %}
   </li>
   <li>
-    <summary>Click <i>Download</i> button to download.</summary>
+    <summary>Click <i>Download</i> Button to Download.</summary>
   </li>
 </ol>
diff --git a/guides/_subsections/download-edit-and-upload-a-customized-event-template.md b/guides/_subsections/download-edit-and-upload-a-customized-event-template.md
index 82d3fbca..9938ffce 100644
--- a/guides/_subsections/download-edit-and-upload-a-customized-event-template.md
+++ b/guides/_subsections/download-edit-and-upload-a-customized-event-template.md
@@ -1,13 +1,13 @@
 ## [Download, Edit, and Upload a Customized Event Template](#download-edit-and-upload-a-customized-event-template)
-Most JVMs will come with at least two JFR event template definitions included:
-the *Continuous* and *Profiling* templates.
+Most **JVMs** will come with at least two **JFR** *Event Templates* definitions included:
+the `Continuous` and `Profiling` templates.
 
-The *Continuous* template:
+The `Continuous` template:
 - has very low runtime overhead
 - collects basic data
 - is intended to be left on at all times, even in production
 
-The *Profiling* template:
+The `Profiling` template:
 - may have some detectable runtime overhead
 - collects more in-depth data
 - should be used for a fixed duration when a specific problem is discovered at runtime
@@ -17,20 +17,20 @@ all. It may be useful to use either of these as a starting point and tailor it
 to meet your specific monitoring/profiling needs by including/excluding events,
 increasing/decreasing sample rates, raising/lowering thresholds, etc.
 
-Of special note, JFR allows for the definition of application-specific custom
+Of special note, **JFR** allows for the definition of application-specific custom
 events, which would not be captured in either of the default templates above.
 
-Cryostat also provides the <code>ALL</code> meta-template, which enables all
-event types in the selected target application, with default values for each
-event option. This is not a true event template and does not have an XML
+**Cryostat** also provides the <code>ALL</code> meta-template, which enables all
+event types in the selected `target` application, with default values for each
+event option. This is not a true *Event Template* and does not have an `XML`
 definition to download.
 
 <ol>
   <li>
     {% include_relative _subsections/common/select-target-application.md
       select-target-application-additional-content="
-        The target selected will provide the base <i>Continuous</i> and
-        <i>Profiling</i> template definitions to start from. Most target
+        The <i>Target</i> selected will provide the base <code>Continuous</code> and
+        <code>Profiling</code> template definitions to start from. Most target
         applications will be interchangeable here.
       "
     %}
@@ -38,21 +38,21 @@ definition to download.
   <li>
     {% capture navigate-to-events-include-text %}
     <p>
-      If the target JVM has SSL/TLS enabled on JMX connections then it may be
-      necessary to add the target's certificate to Cryostat's trust store. Go
+      If the <i>Target</i> <b>JVM</b> has <code>SSL/TLS</code> enabled on <b>JMX</b> connections then it may be
+      necessary to add the <i>Target's</i> certificate to <b>Cryostat's</b> trust store. Go
       to <a href="{{ page.url }}#add-a-trusted-certificate">Add a Trusted Certificate</a>
       and return to this section after completing that guide.
-      <a href="{{ site.url }}/images/2.3.0/navigate-to-events-2.png" target="_blank">
-        <img src="{{ site.url }}/images/2.3.0/navigate-to-events-2.png">
+      <a href="{{ site.url }}/images/2.4.0/navigate-to-events-2.png" target="_blank">
+        <img src="{{ site.url }}/images/2.4.0/navigate-to-events-2.png">
       </a>
     </p>
     {% endcapture %}
     {% include howto_step.html
       summary="Navigate to Events"
-      image-name="2.3.0/navigate-to-events-1.png"
+      image-name="2.4.0/navigate-to-events-1.png"
       caption="
-        Supply JMX credentials to authenticate to the target, if necessary. If
-        the target is not configured with JMX authentication then the
+        Supply <b>JMX</b> credentials to authenticate to the target, if necessary. If
+        the target is not configured with <b>JMX</b> authentication then the
         connection attempt will continue without prompting for credentials.
       "
       text=navigate-to-events-include-text
@@ -60,70 +60,70 @@ definition to download.
   </li>
   <li>
     {% include howto_step.html
-      summary="Download the Template"
-      image-name="2.3.0/download-edit-and-upload-a-customized-event-template-1.png"
+      summary="Download the <i>Template</i>"
+      image-name="2.4.0/download-edit-and-upload-a-customized-event-template-1.png"
       caption="
-        Click the action overflow three-dot menu on the right side of the
+        Click the action overflow \"&#65049;\" <i>three-dot</i> menu on the right side of the
         template entry in the table, then click <i>Download</i>.
       "
     %}
   </li>
   <li>
     {% capture edit-template-additional-content %}
-      The template definition is an XML file, so you may open and edit it
-      with your favourite text editor or XML document editor. The JMC
-      Template Manager can also be used for this purpose, as described
+      The <i>Template</i> definition is an <code>XML</code> file, so you may open and edit it
+      with your favourite text editor or <code>XML</code> document editor. The <b>JMC
+      Template Manager</b> can also be used for this purpose, as described in
       <a href="{{ page.url }}#edit-template-with-jmc">
-        in this section
+        Edit Template With JMC
       </a>.
     {% endcapture %}
     {% include howto_step.html
-      summary="Edit the Template"
-      image-name="2.3.0/download-edit-and-upload-a-customized-event-template-2.png"
+      summary="Edit the <i>Template</i>"
+      image-name="2.4.0/download-edit-and-upload-a-customized-event-template-2.png"
       caption=edit-template-additional-content
       text="
-        Edit the template definition to suit your requirements. When you are
-        satisfied with the new configuration, give your new template a
+        Edit the <i>Template</i> definition to suit your requirements. When you are
+        satisfied with the new configuration, give your new <i>Template</i> a
         meaningful and recognizable tag by editing the
         <code>&lt;configuration&gt;</code> element at the top of the file and
         setting the <code>label=</code> attribute to the desired name. You
         should also save the file according to this new name, but this is not
         strictly necessary. The <code>description</code> and
         <code>provider</code> attributes can also be used to help identify this
-        template later and to explain its goals and purpose.
+        <i>Template</i> later and to explain its goals and purpose.
       "
     %}
   </li>
   <li>
     {% include howto_step.html
-      summary="Open the Template upload dialog"
-      image-name="2.3.0/download-edit-and-upload-a-customized-event-template-3.png"
+      summary="Open the <i>Template</i> Upload Dialog"
+      image-name="2.4.0/download-edit-and-upload-a-customized-event-template-3.png"
       caption="
-        Back on the Cryostat Events view, click the plus (<code>+</code>) icon
+        Back on the <i>Cryostat Events View</i>, click the <i>Upload Icon</i>
         in the table toolbar. A dialog will appear.
       "
     %}
   </li>
   <li>
     {% include howto_step.html
-      summary="Upload the Template"
-      image-name="2.3.0/download-edit-and-upload-a-customized-event-template-4.png"
+      summary="Upload the <i>Template</i>"
+      image-name="2.4.0/download-edit-and-upload-a-customized-event-template-4.png"
       caption="
-        Click the <code>Browse</code> button. Your browser will present its
+        Click the <i>Browse</i> button. Your browser will present its
         native file chooser dialog to select the file to upload. Browse and
-        select the template file, then click
-        <code>OK/Select/Continue/Open</code>. Click <code>Submit</code> on the
-        Cryostat dialog.
+        select the <i>Template</i> file, then click
+        <i>OK/Select/Continue/Open</i>. Click <i>Submit</i> on the
+        <b>Cryostat</b> dialog.
       "
     %}
   </li>
   <li>
     {% include howto_step.html
-      summary="Observe the new Template"
-      image-name="2.3.0/download-edit-and-upload-a-customized-event-template-5.png"
+      summary="Observe the new <i>Template</i>"
+      image-name="2.4.0/download-edit-and-upload-a-customized-event-template-5.png"
       caption="
-        Once the template has been uploaded you will be returned to the
-        <code>Events</code> view, and your template will be present in the
+        Once the <i>Template</i> has been uploaded you will be returned to the
+        <i>Events View</i>, and your template will be present in the
         table.
       "
     %}
diff --git a/guides/_subsections/edit-template-with-jmc.md b/guides/_subsections/edit-template-with-jmc.md
index 96d242f6..628f819c 100644
--- a/guides/_subsections/edit-template-with-jmc.md
+++ b/guides/_subsections/edit-template-with-jmc.md
@@ -1,83 +1,83 @@
 ## [Edit Template With JMC](#edit-template-with-jmc)
 [JDK Mission Control](https://github.com/openjdk/jmc) has a *Template Manager*
-functionality which also contains a graphical wizard for editing *.jfc* event
-template files. This may be preferred to editing the templates directly as XML
-plaintext or using XML document editors, which do not have .jfc-specific XSD
+functionality which also contains a graphical wizard for editing `.jfc` *Event
+Template* files. This may be preferred to editing the templates directly as `XML`
+plaintext or using `XML` document editors, which do not have `.jfc-specific XSD`
 validation or any hinting for event types and options.
 
 <ol>
   <li>
     {% capture acquire-template-additional-context %}
-      If you do not have an event template definition then you can visit
+      If you do not have an <code>event template definition</code> then you can visit
       <a href="{{ page.url }}#download-edit-and-upload-a-customized-event-template">
         Download, Edit, and Upload a Customized Event Template
       </a>
       and follow the first few steps to retrieve one from a remote target
-      application accessible by Cryostat. Otherwise, if you have the JDK
+      application accessible by <b>Cryostat</b>. Otherwise, if you have the <b>JDK</b>
       installed locally, you can find templates at
       <code>$JAVA_HOME/lib/jfr</code>.
     {% endcapture %}
     {% include howto_step.html
-      summary="Acquire an Event Template"
-      image-name="2.3.0/edit-template-with-jmc-1.png"
+      summary="Acquire an <i>Event Template</i>"
+      image-name="2.4.0/edit-template-with-jmc-1.png"
       caption="
-        Ensure that you have an event template definition <i>.jfc</i> file
-        somewhere on your local workstation, with read/write permissions.
+        Ensure that you have an <code>event template definition</code> <code>.jfc</code> file
+        somewhere on your local workstation, with <code>read/write</code> permissions.
       "
       text=acquire-template-additional-context
     %}
   </li>
   <li>
     {% include howto_step.html
-      summary="Launch JDK Mission Control"
-      image-name="2.3.0/edit-template-with-jmc-2.png"
-      caption="The main JMC window after launch"
+      summary="Launch <code>JDK Mission Control</code>"
+      image-name="2.4.0/edit-template-with-jmc-2.png"
+      caption="The main <b>JMC</b> window after launch"
     %}
   </li>
   <li>
     {% include howto_step.html
-      summary="Open the Template Manager"
-      image-name="2.3.0/edit-template-with-jmc-3.png"
-      caption="Select Window > Flight Recording Template Manager"
+      summary="Open the <i>Template Manager</i>"
+      image-name="2.4.0/edit-template-with-jmc-3.png"
+      caption="Select <i>Window</i> > <i>Flight Recording Template Manager</i>"
     %}
   </li>
   <li>
     {% include howto_step.html
-      summary="Import the Base Template"
-      image-name="2.3.0/edit-template-with-jmc-4.png"
+      summary="Import the Base <i>Template</i>"
+      image-name="2.4.0/edit-template-with-jmc-4.png"
       caption="
         Click <i>Import Files...</i>, then browse to and select the
-        template from Step 1.
+        <i>Template</i> from Step 1.
       "
     %}
   </li>
   <li>
     {% include howto_step.html
-      summary="Edit the Template"
-      image-name="2.3.0/edit-template-with-jmc-5.png"
+      summary="Edit the <i>Template</i>"
+      image-name="2.4.0/edit-template-with-jmc-5.png"
       caption="
-        Select the imported template, then click <i>Edit</i> and make your
+        Select the imported <i>Template</i>, then click <i>Edit</i> and make your
         desired changes. Before making changes you may also click
-        <i>Duplicate</i> to create an identical copy of the template as a base
+        <i>Duplicate</i> to create an identical copy of the <i>Template</i> as a base
         to iterate upon.
       "
     %}
   </li>
   <li>
     {% capture use-edited-template-additional-content %}
-      Once your edited template is saved to to a file on your local workstation
-      it can be used when starting new Flight Recordings. To do this using
-      Cryostat, see
+      Once your edited <i>Template</i> is saved to a file on your local workstation
+      it can be used when starting new <code>Flight Recordings</code>. To do this using
+      <b>Cryostat</b>, see
       <a href="{{ page.url }}#download-edit-and-upload-a-customized-event-template">Download, Edit, and Upload a Customized Event Template</a>
-      for instructions on how to upload the new template to Cryostat and 
+      for instructions on how to upload the new template to <b>Cryostat</b> and
       <a href="{{ page.url }}#startstop-a-recording">Start/Stop a Recording</a>
-      for instructions on how to create a new recording using this template.
+      for instructions on how to create a new <code>Recording</code> using this <i>Template</i>.
     {% endcapture %}
     {% include howto_step.html
-      summary="Export the Template"
-      image-name="2.3.0/edit-template-with-jmc-6.png"
+      summary="Export the <i>Template</i>"
+      image-name="2.4.0/edit-template-with-jmc-6.png"
       caption="
-        Click <i>Export File...</i> to save the event template to a <i>.jfc</i>
+        Click <i>Export File...</i> to save the event template to a <code>.jfc</code>
         file on your local workstation.
       "
       text=use-edited-template-additional-content
diff --git a/guides/_subsections/getting-help.md b/guides/_subsections/getting-help.md
new file mode 100644
index 00000000..af8033d6
--- /dev/null
+++ b/guides/_subsections/getting-help.md
@@ -0,0 +1,60 @@
+## [Getting Help](#getting-help)
+
+The **Cryostat** web application contains online help resources that you can use to learn more about
+how to use **Cryostat** directly within its interface.
+
+### [Welcome Tour](#welcome-tour)
+
+The *Welcome Tour* is a first-run introduction to **Cryostat** that you will see the first time you log in.
+If you clear your browser's local storage, use a private browsing window, or use a different browser, you will see the *Tour* again.
+
+{% include howto_step.html
+  summary="Welcome Tour"
+  image-name="2.4.0/welcome-tour.png"
+  caption="Click through the <i>Welcome Tour</i> to learn how to use **Cryostat**."
+  text="The <i>Welcome Tour</i> provides an introduction to **Cryostat**'s layout and indicates where further tutorials and help can be found."
+%}
+
+If you have completed the tour previously, feel free to click <i>Skip Tour</i> and dive right in to **Cryostat**.
+If you have not completed the tour previously and are unsure what **Cryostat** can do or how to use it, click <i>Get Started</i>
+to begin the guided walkthrough of the **Cryostat Web** application.
+
+{% include howto_step.html
+  summary="Tour Begins"
+  image-name="2.4.0/guided-tour.png"
+  caption="Click <i>Next</i> through the <i>Welcome Tour</i> to learn how to use **Cryostat**."
+  text="Continue through the tour to learn how the UI is organized and where you can find additional help."
+%}
+
+#### [Return to the Tour](#return-to-the-tour)
+
+You can return to the tour and revisit its contents at any time.
+
+Whenever you feel the need to return to the tour and revisit its contents, simply click the `?` <i>Help</i> icon in the
+application masthead, then click <i>Guided tour</i> in the dropdown menu that appears.
+
+{% include howto_step.html
+  summary="Open Help Menu"
+  image-name="2.4.0/masthead-help.png"
+  caption="The <b>?</b> <i>Help</i> menu on the application masthead contains additional resources."
+  text="Click <i>Guided tour</i> to relaunch the same tour."
+%}
+
+### [Quick Starts](#quickstarts)
+
+**Cryostat** also includes some *Quick Start* online tutorials to guide you through some common tasks. These are more in-depth
+and will directly guide you through the UI as you complete them by operating on your own real applications.
+
+{% include howto_step.html
+  summary="Open Help Menu"
+  image-name="2.4.0/masthead-help.png"
+  caption="The <b>?</b> <i>Help</i> menu on the application masthead contains additional resources."
+  text="Click <i>Quick Starts</i> to view the tutorial catalog."
+%}
+
+{% include howto_step.html
+  summary="View the Quick Start Catalog"
+  image-name="2.4.0/quick-start-catalog.png"
+  caption="The <i>Quick Start</i> catalog contains a series of tutorials you can follow to learn how to accomplish specific tasks."
+  text="Select and complete the tutorials which interest you. You can revisit this catalog at any time and re-do tutorials as many times as you like."
+%}
diff --git a/guides/_subsections/navigate-the-dashboard.md b/guides/_subsections/navigate-the-dashboard.md
index 92facc72..93630554 100644
--- a/guides/_subsections/navigate-the-dashboard.md
+++ b/guides/_subsections/navigate-the-dashboard.md
@@ -1,11 +1,11 @@
 ## [Navigate the Dashboard](#navigate-the-dashboard)
-The *Dashboard* is the first view you will see when you log into Cryostat. It provides a high-level overview of the state of your Cryostat instance and the target JVM applications it is monitoring.
+The *Dashboard* is the first view you will see when you log into **Cryostat**. It provides a high-level overview of the state of your **Cryostat** instance and the `target` **JVM** applications it is monitoring.
 
 {% include_relative _subsections/common/navigate-to-dashboard.md %}
 
 ### [Dashboard Cards](#dashboard-cards)
 
-Dashboard cards are widgets that display information about your Cryostat instance and the target JVM applications it is monitoring. Let's walk through the available cards and how to add them to your dashboard.
+`Dashboard cards` are widgets that display information about your **Cryostat** instance and the `target` **JVM** applications it is monitoring. Let's walk through the available `cards` and how to add them to your *Dashboard*.
 
 {% include_relative _subsections/common/card-catalog.md %}
 
@@ -14,67 +14,67 @@ Dashboard cards are widgets that display information about your Cryostat instanc
 <ol>
   <li>
     {% capture target-jvm-details-text %}
-    The <i>Target JVM Details</i> card displays information about the target JVM application that is currently selected. There are two tabs that display different information:
+    The <i>Target JVM Details</i> <code>card</code> displays information about the <code>target</code> <b>JVM</b> application that is currently selected. There are two tabs that display different information:
     <ul>
         <li>
-            <b>Details tab</b> - Displays information about the target JVM application, including:
+            <i>Details Tab</i> - Displays information about the <code>target</code> <b>JVM</b> application, including:
             <ol>
                 <li>
-                    <code>Connection URL</code> - The JMX connection URL of the target JVM application.
+                    <code>Connection URL</code> - The <b>JMX</b> connection URL of the <code>target</code> <b>JVM</b> application.
                 </li>
                 <li>
-                    <code>Alias</code> - The alias of the target JVM application.
+                    <code>Alias</code> - The alias of the <code>target</code> <b>JVM</b> application.
                 </li>
                 <li>
-                    <code>JVM ID</code> - The JVM ID of the target JVM application.
+                    <code>JVM ID</code> - The JVM ID of the <code>target</code> <b>JVM</b> application.
                 </li>
                 <li>
-                    <code>Labels</code> - The labels of the target JVM application.
+                    <code>Labels</code> - The labels of the <code>target</code> <b>JVM</b> application.
                 </li>
                 <li>
-                    <code>Annotations</code> - The annotations of the target JVM application.
+                    <code>Annotations</code> - The annotations of the <code>target</code> <b>JVM</b> application.
                 </li>
                 and more...
             </ol>
         </li>
         <li>
-            <b>Resources tab</b> - Displays the resources associated with the target JVM application. There are two tables:
+            <i>Resources Tab</i> - Displays the resources associated with the <code>target</code> <b>JVM</b> application. There are two tables:
             <ul>
                 <li>
-                    <b>Owned Resources:</b> Resources that the JVM owns (i.e. <a href="#startstop-a-recording">Active Recordings</a>, <a href="#viewing-archived-recordings">Archived Recordings</a>, <a href="#download-edit-and-upload-a-customized-event-template">Event Templates</a> and <a href="#download-edit-and-upload-a-customized-event-template">Event Types</a>).
+                    <code>Owned Resources:</code> Resources that the <b>JVM</b> owns (i.e. <a href="#startstop-a-recording">Active Recordings</a>, <a href="#viewing-archived-recordings">Archived Recordings</a>, <a href="#download-edit-and-upload-a-customized-event-template">Event Templates</a> and <a href="#download-edit-and-upload-a-customized-event-template">Event Types</a>).
                 </li>
                 <li>
-                    <b>Related Resources:</b> Resources that are tied to the JVM by <i>Match Expression</i> (i.e. <a href="#create-an-automated-rule">Automated Rules</a> and <a href="#store-credentials">Credentials</a>).
+                    <code>Related Resources:</code> Resources that are tied to the <b>JVM</b> by <i><code>Match Expression</code></i> (i.e. <a href="#create-an-automated-rule">Automated Rules</a> and <a href="#store-credentials"><Credentials</a>).
                 </li>
             </ul>
         </li>
     </ul>
     {% endcapture %}
     {% include howto_step.html
-      summary="Add the <i>Target JVM Details</i> card"
-      image-name="2.3.0/dashboard/targetjvmdetails-preview.png"
+      summary="Add the <i>Target JVM Details</i> <code>Card</code>"
+      image-name="2.4.0/dashboard/targetjvmdetails-preview.png"
       caption="
-        Click on the <i>Target JVM Details</i> card for a preview.
+        Click on the <i>Target JVM Details</i> <code>card</code> for a preview.
       "
       text=target-jvm-details-text
     %}
   </li>
   <li>
     <details>
-        <summary>Finish card creation</summary>
-              There are no extra steps in the creation wizard for this card. Click <code>Finish</code> to add the card to your dashboard.
+        <summary>Finish <code>Card</code> Creation</summary>
+              There are no extra steps in the creation wizard for this <code>card</code>. Click <code>Finish</code> to add the <code>card</code> to your dashboard.
         <div class="multi-image">
             <figure>
-                <a href="{{ site.url }}/images/2.3.0/dashboard/targetjvmdetails-details.png" target="_blank">
-                <img src="{{ site.url }}/images/2.3.0/dashboard/targetjvmdetails-details.png" alt="Details tab">
+                <a href="{{ site.url }}/images/2.4.0/dashboard/targetjvmdetails-details.png" target="_blank">
+                <img src="{{ site.url }}/images/2.4.0/dashboard/targetjvmdetails-details.png" alt="Details tab">
                 </a>
-                <figcaption><i>Details tab</i></figcaption>
+                <figcaption><i>Details Tab</i></figcaption>
             </figure>
             <figure>
-                <a href="{{ site.url }}/images/2.3.0/dashboard/targetjvmdetails-resources.png" target="_blank">
-                <img src="{{ site.url }}/images/2.3.0/dashboard/targetjvmdetails-resources.png" alt="Resources tab">
+                <a href="{{ site.url }}/images/2.4.0/dashboard/targetjvmdetails-resources.png" target="_blank">
+                <img src="{{ site.url }}/images/2.4.0/dashboard/targetjvmdetails-resources.png" alt="Resources tab">
                 </a>
-                <figcaption><i>Resources tab</i></figcaption>
+                <figcaption><i>Resources Tab</i></figcaption>
             </figure>
         </div>
     </details>
@@ -87,24 +87,24 @@ Dashboard cards are widgets that display information about your Cryostat instanc
   <li>
     {% capture automated-analysis-text %}
     <p>
-    The <i>Automated Analysis</i> card allows users to view JMC <i>Automated Analysis</i> reports in a nicely formatted dashboard card. The card allows the user to create a special recording, and then automatically generates a <i>Automated Analysis</i> report. The report displays potential problems with your JVM, and provides suggestions on how to improve the performance and security of your selected JVM application. The card also contains a toolbar that allows you to refresh the report, delete the report, filter results, and change the view.
+    The <i>Automated Analysis</i> <code>card</code> allows users to view <b>JMC</b> <i>Automated Analysis</i> reports in a nicely formatted dashboard <code>card</code>. The <code>card</code> allows the user to create a special <code>Recording</code>, and then automatically generates an <i>Automated Analysis</i> report. The report displays potential problems with your <b>JVM</b>, and provides suggestions on how to improve the performance and security of your selected <b>JVM</b> application. The <code>card</code> also contains a toolbar that allows you to refresh the report, delete the report, filter results, and change the view.
     </p>
     <h4>Gallery view</h4>
         <figure>
-            <a href="{{ site.url }}/images/2.3.0/dashboard/automatedanalysis-gallery.png" target="_blank">
-                <img src="{{ site.url }}/images/2.3.0/dashboard/automatedanalysis-gallery.png" alt="Gallery view">
+            <a href="{{ site.url }}/images/2.4.0/dashboard/automatedanalysis-gallery.png" target="_blank">
+                <img src="{{ site.url }}/images/2.4.0/dashboard/automatedanalysis-gallery.png" alt="Gallery view">
             </a>
         </figure>
         <p>
-            The Gallery view of the Automated Analysis Card displays a <i>Result</i>, a report summary, for each <i>Rule</i> that was triggered in the selected recording. In this view, each rule is listed in categories based on the event type. For example, the <code>Thrown Errors</code> rule and the <code>Thrown Exceptions</code> rule are part of the <code>exceptions</code> category, as seen in the figure above. By clicking on each rule, you can view more details about the rule and the <i>Result</i> that was generated.
+            The <i>Gallery</i> view of the <i>Automated Analysis</i> <code>Card</code> displays a <i>Result</i>, a report summary, for each <code>Rule</code> that was triggered in the selected <code>Recording</code>. In this view, each <code>Rule</code> is listed in categories based on the event type. For example, the <code>Thrown Errors</code> and the <code>Thrown Exceptions</code> <code>Rules</code> are part of the <i>exceptions</i> category, as seen in the figure above. By clicking on each <code>Rule</code>, you can view more details about the <code>Rule</code> and the <i>Result</i> that was generated.
         </p>
         <figure>
-            <a href="{{ site.url }}/images/2.3.0/dashboard/automatedanalysis-result.png" target="_blank">
-                <img src="{{ site.url }}/images/2.3.0/dashboard/automatedanalysis-result.png" alt="Automated Analysis Result">
+            <a href="{{ site.url }}/images/2.4.0/dashboard/automatedanalysis-result.png" target="_blank">
+                <img src="{{ site.url }}/images/2.4.0/dashboard/automatedanalysis-result.png" alt="Automated Analysis Result">
             </a>
             <figcaption>
-                The <code>Discouraged Management Agent Settings</code> rule result with a severity score of 25.0.
-                A <i>Summary</i>, <i>Explanation</i>, and <i>Solution</i> can be seen in the <i>Result</i>.   
+                The <code>Discouraged Management Agent Settings</code> <code>Rule</code> result with a severity score of 25.0.
+                A <i>Summary</i>, <i>Explanation</i>, and <i>Solution</i> can be seen in the <i>Result</i>.
             </figcaption>
         </figure>
         <p>
@@ -114,43 +114,43 @@ Dashboard cards are widgets that display information about your Cryostat instanc
             The <i>Result</i> will also show three text details, if applicable:
             <ul>
                 <li>
-                    <b>Summary:</b> A short summary of the problem.
+                    <i>Summary:</i> A short summary of the problem.
                 </li>
                 <li>
-                    <b>Explanation:</b> A detailed explanation of the problem.
+                    <i>Explanation:</i> A detailed explanation of the problem.
                 </li>
                 <li>
-                    <b>Solution:</b> A suggested solution to the problem.
+                    <i>Solution:</i> A suggested solution to the problem.
                 </li>
             </ul>
         </p>
-    <h4>List view</h4>
+    <h4>List View</h4>
         <figure>
-            <a href="{{ site.url }}/images/2.3.0/dashboard/automatedanalysis-list.png" target="_blank">
-                <img src="{{ site.url }}/images/2.3.0/dashboard/automatedanalysis-list.png" alt="List view">
+            <a href="{{ site.url }}/images/2.4.0/dashboard/automatedanalysis-list.png" target="_blank">
+                <img src="{{ site.url }}/images/2.4.0/dashboard/automatedanalysis-list.png" alt="List view">
             </a>
         </figure>
         <p>
-            The List view of the Automated Analysis Card displays each <i>Result</i> in a listed table. The table can be sorted by clicking on the column headers. The <i>Result</i> will also show the Summary, Explanation, and Solution in the Description column.
+            The <i>List view</i> of the <i>Automated Analysis</i> <code>Card</code> displays each <i>Result</i> in a listed table. The table can be sorted by clicking on the <i>column headers</i>. The <i>Result</i> will also show the <i>Summary</i>, <i>Explanation</i>, and <i>Solution</i> in the <i>Description</i> column.
         </p>
     <h4>Toolbar</h4>
-        The toolbar allows you to filter results, change the view, refresh the report, and delete the report.
+        The <i>Toolbar</i> allows you to <i>filter</i> results, <i>change</i> the view, <i>refresh</i> the report, and <i>delete</i> the report.
 
-        You are able to filter:
+        You are able to <i>filter</i>:
          <ol>
             <li>
-                <b>By severity:</b> You can filter by severity score by dragging the score slider or typing a score in the score input. The <i>Result</i> table will only show results with the score greater or equal to the selected filter score. Additionally, if there are <i>Critical</i> or <i>Warning</i> results, click the corresponding labels in the card header to only show those <i>Results</i>. Reset the filter by clicking on the buttons next to the <code>Reset</code> text.
+                <code>By severity:</code> You can filter by severity score by dragging the <i>score slider</i> or typing a score in the <i>score input</i>. The <i>Result</i> table will only show results with the score greater or equal to the selected filter score. Additionally, if there are <i>Critical</i> or <i>Warning</i> results, click the corresponding labels in the <code>card</code> header to only show those <i>Results</i>. <i>Reset</i> the filter by clicking on the buttons next to the <i>Reset</i> text (i.e the <code>`0`</code>).
             </li>
             <li>
-                <b>By category:</b> You can filter by rule <i>Name</i> or <i>Topic</i> by clicking on the <i>Name</i> filter dropdown. Then select a filtered item by clicking the dropdown next to it. You may also type in this dropdown to search for a specific item. The <i>Result</i> table will only show results that match the selected filter.
+                <code>By category:</code> You can filter by <code>Rule</code> <i>Name</i> or <i>Topic</i> by clicking on the <i>Name</i> filter dropdown. Then select a filtered item by clicking the <i>Dropdown</i> next to it. You may also type in this <i>Dropdown</i> to search for a specific item. The <i>Result</i> table will only show results that match the selected filter.
             </li>
         </ol>
     {% endcapture %}
     {% include howto_step.html
-      summary="Add the <i>Automated Analysis</i> card"
-      image-name="2.3.0/dashboard/automatedanalysis-preview.png"
+      summary="Add the <i>Automated Analysis</i> <code>Card</code>"
+      image-name="2.4.0/dashboard/automatedanalysis-preview.png"
       caption="
-        Click on the <i>Automated Analysis</i> card for a preview.
+        Click on the <i>Automated Analysis</i> <code>card</code> for a preview.
       "
       text=automated-analysis-text
     %}
@@ -158,33 +158,33 @@ Dashboard cards are widgets that display information about your Cryostat instanc
   <li>
     {% capture configure-automated-analysis %}
     <p>
-      In the next steps of the card creation, you can optionally provide advanced configuration. You can configure the settings of the special recording that is used to generate the report. The <i>Current Configuration</i> will be shown and can be edited by clicking the Pencil icon. By default, the recording uses a <code>Continuous</code> template, a <code>Maximum size</code> of <code>10MB</code>, and a <code>0</code> second <code>Maximum age</code> (meaning an unlimited recording duration).
+      In the next steps of the <code>card</code> creation, you can optionally provide <i>Advanced Configuration</i>. You can configure the settings of the special <code>Recording</code> that is used to generate the report. The <i>Current Configuration</i> will be shown and can be edited by clicking the <i>Pencil icon</i>. By default, the <code>Recording</code> uses a <code>Continuous template</code>, a <code>Maximum size</code> of <code>10MB</code>, and a <code>0</code> second <code>Maximum age</code> (meaning an unlimited recording duration).
     </p>
     <p>
-        <b>Note:</b> It is possible that setting both an infinite maximum size and age will result in an <code>Out Of Memory</code> error during report generation.
+        <b style="color:red;">Note:</b> It is possible that setting both an infinite <code>maximum size</code> and <code>age</code> will result in an <code>Out Of Memory</code> error during report generation.
     </p>
     {% endcapture %}
     {% include howto_step.html
-      summary="Configure the <i>Automated Analysis</i> card"
-      image-name="2.3.0/dashboard/automatedanalysis-configuration.png"
-      caption="Click <i>Next</i> to optionally provide advanced configuration."
+      summary="Configure the <i>Automated Analysis</i> <code>Card</code>"
+      image-name="2.4.0/dashboard/automatedanalysis-configuration.png"
+      caption="Click <i>Next</i> to optionally provide <i>Advanced Configuration</i>."
       text=configure-automated-analysis
     %}
   </li>
   <li>
     {% include howto_step.html
-      summary="Finish card creation"
-      image-name="2.3.0/dashboard/automatedanalysis-errorview.png"
-      caption="The card will be added to the dashboard with an error view."
-      text="After clicking <i>Finish</i>, the card will be added to the dashboard with an error view. This is because the card has not yet detected a special <i>Automated Analysis</i> recording to source reports from."
+      summary="Finish <code>Card</code> Creation"
+      image-name="2.4.0/dashboard/automatedanalysis-errorview.png"
+      caption="The <code>card</code> will be added to the dashboard with an error view."
+      text="After clicking <i>Finish</i>, the <code>card</code> will be added to the dashboard with an error view. This is because the <code>card</code> has not yet detected a special <i>Automated Analysis</i> <code>Recording</code> to source reports from."
     %}
   </li>
   <li>
       {% include howto_step.html
       summary="Click <i>Create Recording</i>"
-      image-name="2.3.0/dashboard/automatedanalysis-success.png"
-      caption="The <i>Automated Analysis</i> card displayed with a successful report."
-      text="After clicking <i>Create Recording</i>, the card should be populated with report data containing the results of the <i>Automated Analysis</i> report."
+      image-name="2.4.0/dashboard/automatedanalysis-success.png"
+      caption="The <i>Automated Analysis</i> <code>card</code> displayed with a successful report."
+      text="After clicking <i>Create Recording</i>, the <code>card</code> should be populated with report data containing the <i>Results</i> of the <i>Automated Analysis</i> report."
     %}
     </li>
 </ol>
@@ -195,129 +195,129 @@ Dashboard cards are widgets that display information about your Cryostat instanc
   <li>
     {% capture mbean-metrics-chart-text %}
     <p>
-        The <i>MBean Metrics Chart</i> card displays performance metrics about the target JVM through remote access to supported Java MXBeans interfaces of the JVM, including Thread, Runtime, OperatingSystem, and Memory MXBeans.
+        The <i>MBean Metrics Chart</i> <code>card</code> displays performance metrics about the <code>target</code> <b>JVM</b> through remote access to supported <b>Java MXBeans</b> interfaces of the <b>JVM</b>, including <i>Thread, Runtime, OperatingSystem</i>, and <i>Memory MXBeans</i>.
     </p>
     <p>
-        Cryostat gathers this data and displays them in various charts. You can customize each card by going through the card creation wizard. The wizard will guide you through the process of selecting the metrics you want to display, how you want to display them, and other various configuration options. Some examples of Performance Metrics that can be displayed are:
+        <b>Cryostat</b> gathers this data and displays them in various charts. You can customize each <code>card</code> by going through the card creation wizard. The wizard will guide you through the process of selecting the metrics you want to display, how you want to display them, and other various configuration options. Some examples of <code>Performance Metrics</code> that can be displayed are:
     </p>
     <ul>
-        <li>Process CPU Load</li>
-        <li>System Load Average</li>
-        <li>Heap Memory Usage</li>
+        <li><i>Process CPU Load</i></li>
+        <li><i>System Load Average</i></li>
+        <li><i>Heap Memory Usage</i></li>
         <li>...</li>
     </ul>
     {% endcapture %}
     {% include howto_step.html
-      summary="Add the <i>MBean Metrics Chart</i> card"
-      image-name="2.3.0/dashboard/mbeanmetrics-preview.png"
-      caption="Click on the <i>MBean Metrics Chart</i> card for a preview."
+      summary="Add the <i>MBean Metrics Chart</i> <code>Card</code>"
+      image-name="2.4.0/dashboard/mbeanmetrics-preview.png"
+      caption="Click on the <i>MBean Metrics Chart</i> <code>card</code> for a preview."
       text=mbean-metrics-chart-text
     %}
   </li>
     <li>
     {% capture configure-mbean-metrics-chart %}
     <p>
-      In the next steps of the card creation, you can configure the details of the chart card. 
+      In the next steps of the card creation, you can configure the details of the chart card.
     </p>
     <p>
       Configure the metric data by clicking the <i>Performance Metric</i> dropdown and selecting a metric. You can also configure the <i>Data Window</i> to display a specific time range of data, the <i>Refresh Period</i> to control how often the chart is updated, and the <i>Color Theme</i> to change the chart metric color.
     </p>
     {% endcapture %}
     {% include howto_step.html
-      summary="Configure the <i>MBean Metrics Chart</i> card"
-      image-name="2.3.0/dashboard/mbeanmetrics-configuration.png"
-      caption="Click <i>Next</i> to provide card configuration."
+      summary="Configure the <i>MBean Metrics Chart</i> <code>Card</code>"
+      image-name="2.4.0/dashboard/mbeanmetrics-configuration.png"
+      caption="Click <i>Next</i> to provide <code>card</code> configuration."
       text=configure-mbean-metrics-chart
     %}
   </li>
   <li>
     {% capture mbean-metrics-chart-finish %}
     <p>
-        After clicking <i>Finish</i>, the card will be added to the dashboard. You can click the refresh button "↻" on the top right of the card at any time to reload the metrics.
+        After clicking <i>Finish</i>, the <code>card</code> will be added to the dashboard. You can click the <i>refresh button</i> "↻" on the top right of the <code>card</code> at any time to reload the metrics.
     </p>
     {% endcapture %}
     {% include howto_step.html
-      summary="Finish card creation"
-      image-name="2.3.0/dashboard/mbeanmetrics.png"
-      caption="The <i>MBean Metrics Chart</i> card displayed with the <i>Process CPU Load</i> metric."
+      summary="Finish <code>Card</code> Creation"
+      image-name="2.4.0/dashboard/mbeanmetrics.png"
+      caption="The <i>MBean Metrics Chart</i> <code>card</code> displayed with the <i>Process CPU Load</i> metric."
       text=mbean-metrics-chart-finish
     %}
   </li>
 </ol>
 
 ### [Configuring the Dashboard](#configuring-the-dashboard)
-The <i>Dashboard</i> is highly customizable and can be configured to display the cards you want to see. You can customize the layout of the cards on the dashboard by moving, resizing, and removing cards.
+The <i>Dashboard</i> is highly customizable and can be configured to display the <code>cards</code> you want to see. You can customize the layout of the <code>cards</code> on the dashboard by <i>Moving, Resizing</i>, and <i>Removing</i> <code>cards</code>.
 
-#### [Moving, resizing, and removing cards](#moving-and-resizing-cards)
+#### [Moving, Resizing, and Removing cards](#moving-and-resizing-cards)
 <ol>
     <li>
         {% include howto_step.html
-        summary="Add a card to the <i>Dashboard</i>"
-        image-name="2.3.0/dashboard/targetjvmdetails-preview.png"
-        caption="Open the card catalog by clicking the Catalog icon on the Dashboard toolbar."
-        text="Let's add the <i>Target JVM Details</i> card."
+        summary="Add a <code>Card</code> to the <i>Dashboard</i>"
+        image-name="2.4.0/dashboard/targetjvmdetails-preview.png"
+        caption="Open the <code>card</code> catalog by clicking the <i>Catalog icon</i> on the Dashboard toolbar."
+        text="Let's add the <i>Target JVM Details</i> <code>card</code>."
         %}
     </li>
     <li>
         {% include howto_step.html
-        summary="Resize the card"
-        image-name="2.3.0/dashboard/dashboard-resize.png"
-        caption="Click and drag the right edge of the card to resize it."
+        summary="Resize the <code>Card</code>"
+        image-name="2.4.0/dashboard/dashboard-resize.png"
+        caption="Click and drag the right edge of the <code>card</code> to resize it."
         %}
     </li>
     <li>
         {% include howto_step.html
-        summary="Add another card to the <i>Dashboard</i>"
-        image-name="2.3.0/dashboard/mbeanmetrics-preview.png"
-        caption="Open the card catalog by clicking the Catalog icon on the Dashboard toolbar."
-        text="Let's add the <i>MBean Metrics Chart</i> card this time."
+        summary="Add another <code>Card</code> to the <i>Dashboard</i>"
+        image-name="2.4.0/dashboard/mbeanmetrics-preview.png"
+        caption="Open the <code>card</code> catalog by clicking the <i>Catalog icon</i> on the Dashboard toolbar."
+        text="Let's add the <i>MBean Metrics Chart</i> <code>card</code> this time."
         %}
     </li>
     <li>
         {% include howto_step.html
-        summary="Rearrange cards"
-        image-name="2.3.0/dashboard/dashboard-rearrange.png"
-        caption="Click and drag the <i>Target JVM Details</i> card's header on top or to the right of the <i>MBeans Metrics Chart</i> card to swap their positions."
+        summary="Rearrange <code>Cards</code>"
+        image-name="2.4.0/dashboard/dashboard-rearrange.png"
+        caption="Click and drag the <i>Target JVM Details</i> <code>card's</code> header on top or to the right of the <i>MBeans Metrics Chart</i> <code>card</code> to swap their positions."
         %}
     </li>
     <li>
         {% capture remove-card-text %}
             <p>
-                Each card header contains a kebab icon that opens a menu of card actions. The actions menu contains the following options:
+                Each card header contains a <i>kebab</i> icon that opens a menu of card actions. The actions menu contains the following options:
                 <ul>
                     <li>
-                        <b>View</b> - Opens the card in fullscreen mode.
+                        <i>View</i> - Opens the <code>card</code> in fullscreen mode.
                     </li>
                     <li>
-                        <b>Remove</b> - Removes the card from the dashboard.
+                        <i>Remove</i> - Removes the <code>card</code> from the dashboard.
                     </li>
                     <li>
-                        <b>Reset Size</b> - Resets the card to its default size.
+                        <i>Reset Size</i> - Resets the <code>card</code> to its default size.
                     </li>
                 </ul>
             </p>
             <figure>
-                <a href="{{ site.url }}/images/2.3.0/dashboard/dashboard-cardremoved.png" target="_blank">
-                    <img src="{{ site.url }}/images/2.3.0/dashboard/dashboard-cardremoved.png" alt="{{ Removed card }}">
+                <a href="{{ site.url }}/images/2.4.0/dashboard/dashboard-cardremoved.png" target="_blank">
+                    <img src="{{ site.url }}/images/2.4.0/dashboard/dashboard-cardremoved.png" alt="{{ Removed card }}">
                 </a>
-                <figcaption>Click <i>Remove</i> to remove the card.</figcaption>
+                <figcaption>Click <i>Remove</i> to remove the <code>card</code>.</figcaption>
             </figure>
         {% endcapture %}
         {% include howto_step.html
-        summary="Remove cards"
-        image-name="2.3.0/dashboard/dashboard-cardkebab.png"
-        caption="Click the Kebab icon on the card header to open the card actions menu."
+        summary="Remove <code>Cards</code>"
+        image-name="2.4.0/dashboard/dashboard-cardkebab.png"
+        caption="Click the <i>Kebab</i> icon on the <code>card</code> header to open the card actions menu."
         text=remove-card-text
         %}
     </li>
 </ol>
 
 ### [Dashboard Layouts and Templates](#dashboard-layouts-and-templates)
-*Dashboard Layouts* are a way to organize your dashboard cards into different views. You can create multiple layouts and switch between them to view different cards. Favorite, rename, and delete layouts to customize your dashboard.
+*Dashboard Layouts* are a way to organize your dashboard `cards` into different views. You can create multiple layouts and switch between them to view different `cards`. <i>Favorite, Rename</i>, and <i>Delete</i> layouts to customize your dashboard.
 
-By default, the `Default` layout is created for you. This layout contains the cards three *MBean Metrics Chart* cards. You can modify this layout's card configuration, but you cannot rename or delete it.
+By default, the `Default` layout is created for you. This layout contains the cards three *MBean Metrics Chart* `cards`. You can modify this layout's `card` configuration, but you cannot *Rename* or *Delete* it.
 
-*Layout Templates* save your layouts for later use. You can create a template from a layout, and then use that template to create a new layout with the same cards. You can also import and export templates to share them with other Cryostat users.
+*Layout Templates* save your layouts for later use. You can *Create* a template from a layout, and then use that template to *Create* a new layout with the same `cards`. You can also *Import* and *Export* templates to share them with other **Cryostat** users.
 
 #### [Create a new Dashboard Layout](#create-a-new-dashboard-layout)
 <ol>
@@ -327,41 +327,41 @@ By default, the `Default` layout is created for you. This layout contains the ca
     <li>
         {% include howto_step.html
         summary="Click <i>New Layout</i>"
-        image-name="2.3.0/dashboard/dashboard-blanklayout.png"
+        image-name="2.4.0/dashboard/dashboard-blanklayout.png"
         text="Clicking <i>New Layout</i> will create a new blank layout and switch the dashboard view to the new layout. The layout should be called something like <code>Custom1</code>."
         %}
     </li>
     <li>
         {% include howto_step.html
-        summary="<i>(Optional)</i> Rename layouts"
-        image-name="2.3.0/dashboard/dashboard-renamelayout.png"
-        caption="Click the pencil button to rename the currently selected layout."
-        text="You are able to rename layouts by clicking the pencil button next to the layout selector. This will rename the currently selected layout. You can also rename layouts within the layout selector dropdown itself."
+        summary="<i>(Optional)</i> Rename Layouts"
+        image-name="2.4.0/dashboard/dashboard-renamelayout.png"
+        caption="Click the <i>Pencil</i> button to rename the currently selected layout."
+        text="You are able to rename layouts by clicking the <i>Pencil</i> button next to the layout selector. This will rename the currently selected layout. You can also rename layouts within the layout selector dropdown itself."
         %}
     </li>
     <li>
         {% include howto_step.html
-        summary="<i>(Optional)</i> Delete layouts"
-        image-name="2.3.0/dashboard/dashboard-deletelayout.png"
+        summary="<i>(Optional)</i> Delete Layouts"
+        image-name="2.4.0/dashboard/dashboard-deletelayout.png"
         caption="Click 🗑️ <i>Delete</i> to delete the currently selected layout."
         text="Deletion is similar to renaming. Click the trash can icon with the text <i>Delete</i> next to the layout selector to delete the currently selected layout. You can also delete layouts within the layout selector dropdown itself."
         %}
     </li>
 </ol>
 
-#### [Set a layout as a template](#set-a-layout-as-a-template)
+#### [Set a Layout as a Template](#set-a-layout-as-a-template)
 <ol>
     <li>
         {% include howto_step.html
         summary="Save a layout as a template"
-        image-name="2.3.0/dashboard/dashboard-layout-setastemplate.png"
+        image-name="2.4.0/dashboard/dashboard-layout-setastemplate.png"
         caption='Click more options "⋮" on the dashboard toolbar, then click <i>Set as template</i> to set the desired layout as a template.'
         text="The layout template will be saved as a <i>User-submitted</i> template in the template picker."
         %}
     </li>
 </ol>
 
-#### [Create a new Dashboard Layout from a template](#create-a-new-dashboard-layout-from-a-template)
+#### [Create a new Dashboard Layout from a Template](#create-a-new-dashboard-layout-from-a-template)
 
 <ol>
     <li>
@@ -370,7 +370,7 @@ By default, the `Default` layout is created for you. This layout contains the ca
     <li>
         {% include howto_step.html
         summary="Select <i>Choose Template</i>"
-        image-name="2.3.0/dashboard/dashboard-layoutselector-options.png"
+        image-name="2.4.0/dashboard/dashboard-layoutselector-options.png"
         text="Click the expandable menu on <i>New Layout</i> button and select <i>Choose Template</i>. This will open the template picker."
         %}
     </li>
@@ -380,17 +380,17 @@ By default, the `Default` layout is created for you. This layout contains the ca
             The template picker displays all the available templates. Templates are categorized into 3 groups.
             <ol>
                 <li>
-                    <b>Suggested:</b> Templates that are suggested for you based on recent activity.
+                    <i>Suggested:</i> Templates that are suggested for you based on recent activity.
                 </li>
                 <li>
-                    <b>Cryostat:</b> Templates that come with Cryostat.
+                    <i>Cryostat:</i> Templates that come with <b>Cryostat</b>.
                 </li>
                 <li>
-                    <b>User-submitted</b>: Templates that you have created or imported.
+                    <i>User-submitted</i>: Templates that you have created or imported.
                 </li>
             </ol>
-            <p>     
-            Additionally, you can search for templates by typing in the search bar or filter templates by category. You can also upload templates directly here by clicking <i>Upload</i>.
+            <p>
+            Additionally, you can search for templates by typing in the <i>Search</i> bar or <i>Filter</i> templates by category. You can also upload templates directly here by clicking <i>Upload</i>.
             </p>
             <p>
             Select a template by clicking on it.
@@ -398,23 +398,23 @@ By default, the `Default` layout is created for you. This layout contains the ca
         </p>
         {% endcapture %}
         {% include howto_step.html
-        summary="Choose a template"
-        image-name="2.3.0/dashboard/dashboard-templatepicker.png"
-        caption="Clicking a template will open a preview where you can view the template's cards."
+        summary="Choose a Template"
+        image-name="2.4.0/dashboard/dashboard-templatepicker.png"
+        caption="Clicking a template will open a preview where you can view the template's <code>cards</code>."
         text=template-picker-guide-text
         %}
     </li>
     <li>
         {% include howto_step.html
-        summary="Enter a name for the new layout"
-        image-name="2.3.0/dashboard/dashboard-templatepicker-name.png"
-        text="A layout name must be entered before the <i>Create</i> button is enabled. The name must be alphanumeric, can only contain underscores, dashes, and periods, and must be 20 characters or less."
+        summary="Enter a Name for the New Layout"
+        image-name="2.4.0/dashboard/dashboard-templatepicker-name.png"
+        text="A layout name must be entered before the <i>Create</i> button is enabled. The name must be <code>alphanumeric</code>, can only contain <code>underscores</code>, <code>dashes</code>, and <code>periods</code>, and must be <code>20</code> characters or less."
         %}
     </li>
     <li>
         {% include howto_step.html
         summary="Click <i>Create</i>"
-        image-name="2.3.0/dashboard/dashboard-layouttemplate.png"
+        image-name="2.4.0/dashboard/dashboard-layouttemplate.png"
         caption="The new layout will be created and the dashboard view will switch to the new layout with the template applied."
         %}
     </li>
diff --git a/guides/_subsections/re-upload-a-recording-to-archives.md b/guides/_subsections/re-upload-a-recording-to-archives.md
index c4407545..76b0e850 100644
--- a/guides/_subsections/re-upload-a-recording-to-archives.md
+++ b/guides/_subsections/re-upload-a-recording-to-archives.md
@@ -1,51 +1,51 @@
 ## [Re-Upload a Recording to Archives](#re-upload-a-recording-to-archives)
-After downloading an archived recording from Cryostat, it can be re-uploaded
-into Cryostat's archives later. This is useful if, for example, your Cryostat
+After downloading an `Archived Recording` from **Cryostat**, it can be re-uploaded
+into **Cryostat's** archives later. This is useful if, for example, your **Cryostat**
 instance has been scaled down or undeployed for some time and the attached
-storage lost, and you then want to use Cryostat's analysis tools with a
-previously retrieved recording in a new Cryostat instance.
+storage is lost, and you then want to use **Cryostat's** analysis tools with a
+previously retrieved <code>Recording</code> in a new **Cryostat** instance.
 
 <ol>
   <li>
     {% include howto_step.html
-      summary="Navigate to the <i>Archives</i> tab"
-      image-name="2.3.0/re-upload-a-recording-to-archives-1.png"
-      caption="Select the Uploads tab."
-      text="The entire Archives view contains several tabs related to performing operations
-      on archived recordings. See <a href='#view-archived-recordings'>Viewing Archived Recordings</a>.
+      summary="Navigate to the <i>Archives</i> Tab"
+      image-name="2.4.0/re-upload-a-recording-to-archives-1.png"
+      caption="Select the <i>Uploads</i> tab."
+      text="The entire <i>Archives</i> view contains several tabs related to performing operations
+      on <code>Archived Recordings</code>. See <a href='#view-archived-recordings'>Viewing Archived Recordings</a>.
       "
     %}
   </li>
   <li>
     {% include howto_step.html
       summary="Select the Recording to Upload"
-      image-name="2.3.0/re-upload-a-recording-to-archives-2.png"
+      image-name="2.4.0/re-upload-a-recording-to-archives-2.png"
       caption="
-        Click the '+' button to bring up the upload prompt. Then click <i>Browse...</i> and select the
-        <code>.jfr</code> file to upload. Note that the file must follow the Cryostat archive recording
+        Click the <i>Upload Icon</i> to bring up the upload prompt. Then click <i>Upload</i> and select the
+        <code>.jfr</code> file to upload. Note that the file must follow the <b>Cryostat</b> <code>Archive Recording</code>
         naming convention. Mouse over the <sup>[?]</sup> tooltip on the prompt for more information.
       "
     %}
   </li>
   <li>
     {% include howto_step.html
-      summary="<i>(Optional)</i> Add metadata labels"
-      image-name="2.3.0/re-upload-a-recording-to-archives-3.png"
+      summary="(Optional) Add <code>Metadata Labels</code>"
+      image-name="2.4.0/re-upload-a-recording-to-archives-3.png"
       caption="
-        Click <i>Show metadata options</i> to add optional metadata labels to recording.
-        You can either add labels by clicking the <i>Add Label</i> button, or by uploading
-        a custom <code>.json</code> labels file from your local storage. A custom labels file 
-        can be downloaded alongside downloading a recording. To learn how to download a recording
-        and any associated labels, see <a href='#download-an-active-or-archived-recording'>Download and Active or Archived Recording</a>. 
-        and for more on Cryostat metadata labels, see <a href='#add-and-edit-recording-metadata-labels'>Add and Edit Recording Metadata Labels</a>.
+        Click <i>Show metadata options</i> to add optional <code>Metadata Labels</code> to a <code>Recording</code>.
+        You can either add <code>Labels</code> by clicking the <i>Add Label</i> button, or by uploading
+        a custom <code>.json</code> <code>Labels</code> file from your local storage. A custom <code>Labels</code> file
+        can be downloaded alongside downloading a <code>Recording</code>. To learn how to download a <code>Recording</code>
+        and any associated <code>Labels</code>, see <a href='#download-an-active-or-archived-recording'>Download an Active or Archived Recording</a>.
+        and for more on <b>Cryostat</b> <code>Metadata Labels</code>, see <a href='#add-and-edit-recording-metadata-labels'>Add and Edit Recording Metadata Labels</a>.
       "
     %}
   </li>
   <li>
     {% include howto_step.html
-      summary="Upload the Recording"
-      image-name="2.3.0/re-upload-a-recording-to-archives-4.png"
-      caption="Click <i>Upload</i> and observe that the recording is now present in
+      summary="Upload the <code>Recording</code>"
+      image-name="2.4.0/re-upload-a-recording-to-archives-4.png"
+      caption="Click <i>Upload</i> and observe that the <code>Recording</code> is now present in
       the <i>Uploads</i> tab of the <i>Archives</i> view."
     %}
   </li>
diff --git a/guides/_subsections/snapshot-a-recording.md b/guides/_subsections/snapshot-a-recording.md
index 06632ace..7fb87d64 100644
--- a/guides/_subsections/snapshot-a-recording.md
+++ b/guides/_subsections/snapshot-a-recording.md
@@ -1,15 +1,17 @@
 ## [Snapshot a Recording](#snapshot-a-recording)
-Snapshotting an active recording produces a new recording in the target JVM
-named `snapshot-n`, where `n` is a natural number. This snapshot contains all of
-the JFR data that was present in the target JVM at the time that the snapshot
-was taken and is in the `STOPPED` state as soon as it is created (that is, the
-snapshot will never record any further information and is fixed in size).
-This is useful when you have an ongoing, continuous recording active in a
-target application and want to preserve the specific information at a given
-point in time. If the continuous source recording is configured with a maximum
-event age or maximum recording size then the need for snapshots is more
-apparent, since without snapshotting some older data will eventually be dropped
-from the source recording and lost.
+Snapshotting an application produces a new `Flight Recording` named `snapshot-n`,
+where `n` is a natural number. This `snapshot` contains all of the **JFR** data that
+was present in the <code>target</code> **JVM** at the time that the `snapshot` was taken and is in
+the `STOPPED` state as soon as it is created (that is, the` snapshot` will never
+record any further information and is fixed in size). This is useful when you
+have an ongoing, `Continuous Recording` active in a <code>target</code> application and want
+to preserve the specific information at a given point in time. If the
+`Continuous` source `Recording` is configured with a maximum event age or maximum
+recording size then the need for `snapshots` is more apparent, since without
+snapshotting, some older data will eventually be dropped and lost from the
+source `Recording`. It is also useful when you have multiple concurrent source
+`Recordings` running and want an easy way to capture the sum of all of their data
+at a given point in time.
 
 <ol>
   <li>
@@ -18,7 +20,7 @@ from the source recording and lost.
   <li>
     {% capture navigate-recordings-additional-content %}
       <p>
-        If you do not have any recordings present in the Active Recordings
+        If you do not have any <code>Recordings</code> present in the <i>Active Recordings</i>
         view, follow
         <a href="{{ page.url }}#startstop-a-recording">Start/Stop a Recording</a>
         to create one, or select a different target application.
@@ -32,22 +34,22 @@ from the source recording and lost.
   <li>
     {% include howto_step.html
       summary="Switch to the <i>Snapshot Recording</i> tab"
-      image-name="2.3.0/snapshot-a-recording-1.png"
+      image-name="2.4.0/snapshot-a-recording-1.png"
       caption="
-        Switch to the <i>Snapshot Recording</i> tab and click the <i>Create</i>
+        Switch to the <i>Snapshot Recording</i> Tab and Click the <i>Create</i>
         button.
       "
     %}
   </li>
   <li>
     {% include howto_step.html
-      summary="Observe the new snapshot"
-      image-name="2.3.0/snapshot-a-recording-2.png"
+      summary="Observe the New <code>snapshot</code>"
+      image-name="2.4.0/snapshot-a-recording-2.png"
       caption="
         After clicking the <i>Create</i> button you will be returned to the
-        Active Recordings view and the new snapshot recording will be present
-        in the table. The snapshot recording can then be treated as any other
-        active recording in the target application's JVM memory.
+        <i>Active Recordings</i> view and the new <code>snapshot</code> recording will be present
+        in the table. The <code>snapshot</code> recording can then be treated as any other
+        <code>Active Recording</code> in the <code>target</code> application's <b>JVM</b> memory.
       "
     %}
   </li>
diff --git a/guides/_subsections/startstop-a-recording.md b/guides/_subsections/startstop-a-recording.md
index 93aac92c..fa4c3332 100644
--- a/guides/_subsections/startstop-a-recording.md
+++ b/guides/_subsections/startstop-a-recording.md
@@ -1,6 +1,6 @@
 ## [Start/Stop a Recording](#startstop-a-recording)
-The first and most basic workflow is to start a Flight Recording in a target
-JVM.
+The first and most basic workflow is to start a `Flight Recording` in a `target`
+**JVM**.
 
 <ol>
   <li>
@@ -14,38 +14,38 @@ JVM.
   </li>
   <li>
     {% include howto_step.html
-      summary="Configure the new recording"
-      image-name="2.3.0/startstop-a-recording-1.png"
+      summary="Configure the new <code>Recording</code>"
+      image-name="2.4.0/startstop-a-recording-1.png"
       text="
       <p>
-        Enter a name for the new recording. The form will alert you if the name
+        Enter a <i>Name</i> for the new <code>Recording</code>. The form will alert you if the name
         entered has an invalid format. If the name is already in use then the
         creation will fail and you will need to try again.
       </p>
       <p>
-        Select the duration of the recording. The duration can be specified in
-        seconds, minutes, or hours. If you want to record indefinitely, select the
-        <i>Continuous</i> option. You may also want to save the recording to Cryostat archive
-        storage when the recording stops with the <i>Archive on Stop</i> option.
+        Select the <i>Duration</i> of the <code>Recording</code>. The duration can be specified in
+        <code>seconds</code>, <code>minutes</code>, or <code>hours</code>. If you want to record indefinitely, select the
+        <i>Continuous</i> option. You may also want to save the <code>Recording</code> to <b>Cryostat</b> archive
+        storage when the <code>Recording</code> stops with the <i>Archive on Stop</i> option.
       </p>
       <p>
-        Select an event template or enter a custom event definition. If you are
-        unsure which to choose, the <code>Continuous</code> template is useful for
+        Select an event <i>Template</i> or enter a custom event definition. If you are
+        unsure which to choose, the <i>Continuous</i> template is useful for
         always-on production monitoring with the <i>Continuous</i> recording
-        duration setting, and the <code>Profiling</code> template is useful for
+        duration setting, and the <i>Profiling</i> template is useful for
         collecting extra information for troubleshooting a specifically
-        identified problem with a fixed recording duration.
+        identified problem with a fixed <code>Recording</code> duration.
       </p>
       <p>
-        To learn about <i>Metadata Options</i>, see <a href='#add-and-edit-recording-metadata-labels'>Add and Edit Recording Metadata Labels</a>.
+        To learn about <code>Metadata Options</code>, see <a href='#add-and-edit-recording-metadata-labels'>Add and Edit Recording Metadata Labels</a>.
       </p>
       "
     %}
   </li>
   <li>
     {% include howto_step.html
-      summary="<i>(Optional)</i> Adjust any <i>Advanced Options</i> for the recording"
-      image-name="2.3.0/startstop-a-recording-2.png"
+      summary="<i>(Optional)</i> Adjust any <i>Advanced Options</i> for the <code>Recording</code>"
+      image-name="2.4.0/startstop-a-recording-2.png"
       text="
       <p>
         In many cases, the <i>Advanced Options</i> can be left with their
@@ -55,20 +55,20 @@ JVM.
       </p>
       <p>
         <i>To Disk</i>: Use this parameter to specify whether to write data to
-        your JVM container's disk while recording. By default, this parameter
+        your <b>JVM</b> container's disk while recording. By default, this parameter
         is true.
       </p>
       <p>
         <i>Maximum Size</i>: Use this parameter to specify the maximum size of
-        disk data to keep for the recording. This parameter is valid only when
+        disk data to keep for the <code>Recording</code>. This parameter is valid only when
         the disk parameter is set to true. By default, the maximum size of disk
         data isn’t limited, and this parameter is set to 0.
       </p>
       <p>
         <i>Maximum Age</i>: Use this parameter to specify the maximum number of
-        seconds, minutes, or hours that events should be kept in the recording
+        <code>seconds</code>, <code>minutes</code>, or <code>hours</code> that events should be kept in the <code>Recording</code>
         before being discarded. This parameter is valid only when the disk
-        parameter is set to true, and the recording duration is not <i>Continuous</i>.
+        parameter is set to true, and the <code>Recording</code> duration is not <i>Continuous</i>.
         By default, this parameter is set to 0, which means there is no limit set.
       </p>
       "
@@ -80,31 +80,31 @@ JVM.
   <li>
     {% capture stop-the-recording-additional-content %}
       <p>
-        When you no longer desire for the Flight Recording to be active and
-        collecting data in your target application, select the recording from
-        the list by clicking the checkbox to the left of the recording name.
+        When you no longer desire for the <code>Flight Recording</code> to be <code>Active</code> and
+        collecting data in your target application, select the <code>Recording</code> from
+        the list by clicking the checkbox to the left of the <code>Recording</code> name.
         This will enable the <i>Stop</i> button in the toolbar. Click the
-        <i>Stop</i> button to end the data collection. 
+        <i>Stop</i> button to end the data collection.
       </p>
       <p>
-        If the recording has a fixed duration then it will automatically stop
-        after the target JVM measures that the duration has elapsed. If the
-        recording was created with a continuous duration then it will collect
+        If the <code>Recording</code> has a <code>Fixed Duration</code> then it will automatically stop
+        after the <code>target</code> <b>JVM</b> measures that the duration has elapsed. If the
+        <code>Recording</code> was created with a <code>Continuous Duration</code> then it will collect
         data until explicitly stopped.
       </p>
       <p>
-        After stopping a recording it remains in the <i>Active</i> section of
-        the Recordings view. This signifies that the recording data is still
-        present in the target JVM, and not within Cryostat's storage. If the
-        target JVM crashes, is killed, or the process otherwise restarts, then
-        the recording data will be lost. To learn how to persist the Flight
-        Recording data, continue on to
+        After <code>Stopping</code> a <code>Recording</code> it remains in the <i>Active</i> section of
+        the <i>Recordings</i> view. This signifies that the <code>Recording</code> data is still
+        present in the <code>target</code> <b>JVM</b>, and not within <b>Cryostat's</b> storage. If the
+        <code>target</code> <b>JVM</b> crashes, is killed, or the process otherwise restarts, then
+        the <code>Recording</code> data will be lost. To learn how to persist the <code>Flight
+        Recording</code> data, continue on to
         <a href="{{ page.url }}#archive-a-recording">Archive a Recording</a>.
       </p>
     {% endcapture %}
     {% include howto_step.html
-      summary="Stop the recording"
-      image-name="2.3.0/startstop-a-recording-3.png"
+      summary="<i>Stop</i> the <code>Recording</code>"
+      image-name="2.4.0/startstop-a-recording-3.png"
       text=stop-the-recording-additional-content
     %}
   </li>
diff --git a/guides/_subsections/store-credentials.md b/guides/_subsections/store-credentials.md
index af9818b4..6edb7490 100644
--- a/guides/_subsections/store-credentials.md
+++ b/guides/_subsections/store-credentials.md
@@ -1,70 +1,100 @@
 ## [Store Credentials](#store-credentials)
-If you have Java Management Extensions (JMX) or HTTP authentication enabled on your containerized JVMs, Cryostat will prompt you to enter your credentials before it can access the JDK flight recordings on your target JVMs. You can <a href="#configure-credentials-storage">Configure Credentials Storage</a> and choose whether these credentials are held in browser memory for the current session only, or if they are uploaded to Cryostat's credentials keyring.
+If you have Java Management Extensions **(JMX)** or `HTTP` authentication enabled on
+your containerized **JVMs**, **Cryostat** will prompt you to enter your credentials
+before it can access the **JDK** `Flight Recordings` on your `target` **JVMs**. You can
+<a href="#configure-credentials-storage">Configure Credentials Storage</a> and
+choose whether these credentials are held in browser memory for the current
+session only, or if they are uploaded to **Cryostat's** `Credentials Keyring`. The
+following instructions are only applicable to `Credentials Keyring` storage.
 
-If you intend to use Cryostat <a href="#create-an-automated-rule">Automated Rules</a>, then you should store target application credentials in Cryostat's credentials keyring, which is outlined below. Even if you do not use Automated Rules, you may find it more convenient to store credentials in the keyring. This way, the Cryostat web UI does not need to prompt you for credentials when you manually access JFR information about target applications.
+**Note**: for the best experience, it is recommended that you should use the
+`Backend` **JMX** `Credentials Keyring` and choose a strong `Keyring` password when
+deploying the server.
 
 <ol>
   <li>
     {% include howto_step.html
-      summary="Navigate to the Security tab"
-      image-name="2.3.0/navigate-to-security.png"
+      summary="Navigate to the <i>Security</i> tab"
+      image-name="2.4.0/navigate-to-security.png"
       text="
-        First, navigate to the <i>Security</i> tab. The Store Credentials table lists all credentials in Cryostat's keyring. Click <i>Add</i> to define a new credential.
+        First, navigate to the <i>Security</i> tab. The <i>Store Credentials</i> table
+        lists all credentials in <b>Cryostat's</b> <code>Keyring</code>. Click <i>Add</i> to define
+        a new credential.
       "
     %}
   </li>
   <li>
     {% include howto_step.html
-      summary="Enter your credentials"
-      image-name="2.3.0/store-credentials-1.png"
+      summary="Enter your Credentials"
+      image-name="2.4.0/store-credentials-1.png"
       text="
-          A modal will appear. You can select a target JVM to view its properties.
-          These properties can be used to define a <i>matchExpression</i> that tests whether this credential should apply to the selected target JVM.
-          This is the same kind of <i>matchExpression</i> as those used by <a href='#create-an-automated-rule'>Automated Rules</a>, so you may find it useful to reuse the same
-          <i>matchExpressions</i> from your rule definitions for your credential definitions.
-          The <i>matchExpression</i>, username, and password fields are all required.
+          A modal will appear. You can select a <code>target</code> <b>JVM</b> to view its
+          properties.
+          These properties can be used to define a <i>matchExpression</i> that
+          tests whether this credential should apply to the selected <code>target</code> <b>JVM</b>.
+          This is the same kind of <i>matchExpression</i> as those used by
+          <a href='#create-an-automated-rule'>Automated Rules</a>, so you may
+          find it useful to reuse the same <i>matchExpressions</i> from your
+          rule definitions for your credential definitions. The
+          <i>matchExpression</i>, username, and password fields are all required.
       "
     %}
   </li>
   <li>
     {% include howto_step.html
-      summary="Test your credentials"
-      image-name="2.3.0/store-credentials-3.png"
+      summary="Test your Credentials"
+      image-name="2.4.0/store-credentials-3.png"
       text="
-      Navigate to the <b>Test</b> tab to use the <b>Credential Test Table</b> to check if the entered credential is valid for the matched targets.
+      Navigate to the <i>Test</i> tab to use the <i>Credential Test</i> table
+      to check if the entered credential is valid for the matched <code>targets</code>.
       <br><br>
 
-      You can individually test each target or bulk test all targets at the same time. The <b>Status</b> column will report the following test status:
+      You can individually test each <code>target</code> or bulk test all <code>targets</code> at the
+      same time. The <i>Status</i> column will report the following test
+      status:
 
       <ol>
         <li>
-            <b>Valid:</b> valid credential for the target JVM.
+            <code>Valid:</code> valid credential for the <code>target</code> <b>JVM</b>.
         </li>
         <li>
-            <b>Invalid:</b> invalid credential for the target JVM.
+            <code>Invalid:</code> invalid credential for the <code>target</code> <b>JVM</b>.
         </li>
         <li>
-            <b>Not applicable:</b> JMX authentication is not enabled on the target JVM.
+            <b>Not applicable:</b> JMX authentication is not enabled on the
+            <code>target</code> JVM.
         </li>
-      </ol>  
+      </ol>
       "
     %}
   </li>
   <li>
     {% include howto_step.html
-      summary="(Alternative to Steps 1 and 2) Store Credentials when connecting to a target JVM"
-      image-name="2.3.0/navigate-to-recordings-1.png"
+      summary="
+          (Alternative to Steps 1 and 2) Store Credentials when Connecting to a
+          <code>Target</code> <b>JVM</b>
+          "
+      image-name="2.4.0/navigate-to-recordings-1.png"
       text="
-        Alternatively, credentials may also be stored if you navigate to either the <i>Recordings</i> tab or the <i>Events</i> tab and select a target JVM with authentication enabled. The authentication form will appear, prompting you to enter your credentials. If you have <a href='#configure-credentials-storage'>configured Backend Credentials Storage</a>, then a new credential definition with the provided username and password will be stored for this specific target application in the Cryostat keyring. If you have configured credentials with the <i>Session</i> option then these entered credentials will <i>not</i> be stored in the Cryostat keyring.
+        Alternatively, credentials may also be stored if you navigate to either
+        the <i>Recordings</i> tab or the <i>Events</i> tab and select a <code>target</code>
+        <b>JVM</b> with authentication enabled. The authentication form will appear,
+        prompting you to enter your credentials. If you have
+        <a href='#configure-credentials-storage'>configured Backend Credentials Storage</a>,
+        then a new credential definition with the provided username and
+        password will be stored for this specific <code>target</code> application in the
+        <b>Cryostat</b> <code>Keyring</code>. If you have configured credentials with the
+        <i>Session</i> option then these entered credentials will <i>not</i> be
+        stored in the <b>Cryostat</b> <code>keyring</code>.
       "
     %}
   </li>
   <li>
     {% include howto_step.html
-      summary="View your stored credentials"
-      image-name="2.3.0/store-credentials-2.png"
+      summary="View your Stored Credentials"
+      image-name="2.4.0/store-credentials-2.png"
       text="
-        The <i>Store Credentials</i> table will update with a row for each of the credentials you have stored in the keyring. The <i>matchExpression</i> is visible along with a count of the number of known target applications that these credentials will apply to. You can expand the row to display a list of those matched target applications. For security reasons it is not possible to view the stored username and password associated with a credential definition in the keyring.
+        The <i>Store Credentials</i> table will update with a row for each of the credentials you have stored in the <code>Keyring</code>. The <i>matchExpression</i> is visible along with a count of the number of known <code>target</code> applications that these credentials will apply to. You can expand the row to display a list of those matched <code>target</code> applications. For security reasons it is not possible to view the stored <code>username</code> and <code>password</code> associated with a credential definition in the <code>Keyring</code>.
       "
     %}
   </li>
diff --git a/guides/_subsections/upload-an-automated-rule.md b/guides/_subsections/upload-an-automated-rule.md
index e507b879..c8a1d46b 100644
--- a/guides/_subsections/upload-an-automated-rule.md
+++ b/guides/_subsections/upload-an-automated-rule.md
@@ -1,6 +1,6 @@
 ## [Upload an Automated Rule](#upload-an-automated-rule)
 
-Instead of stepping through the form every time, you can also edit your Automated Rule definition files (JSON format) locally and quickly upload them.
+Instead of stepping through the form every time, you can also edit your `Automated Rule` definition files (`JSON` format) locally and quickly upload them.
 
 Below is an example of a rule file content:
 
@@ -22,27 +22,27 @@ Below is an example of a rule file content:
 <ol>
   <li>
       {% include howto_step.html
-        summary="Open <i>Automated Rules</i> upload prompt"
-        image-name="2.3.0/upload-an-automated-rule-1.png"
-        caption="Click on upload icon button to open upload prompt."
-      %}  
+        summary="Open <i>Automated Rules</i> upload Prompt"
+        image-name="2.4.0/upload-an-automated-rule-1.png"
+        caption="Click on <i>Upload Icon</i> button to open upload prompt."
+      %}
   </li>
   <li>
       {% include howto_step.html
-        summary="Attach a rule file by dragging & dropping or clicking <i>Browse...</i>."
-        image-name="2.3.0/upload-an-automated-rule-2.png"
+        summary="Attach a Rule File by Dragging & Dropping or clicking <i>Browse...</i>."
+        image-name="2.4.0/upload-an-automated-rule-2.png"
         caption="Select a rule file to upload."
-      %}  
+      %}
   </li>
   <li>
-    <summary>Click <i>Submit</i> button to upload.</summary>
+    <summary>Click <i>Submit</i> Button to Upload.</summary>
   </li>
   <li>
       {% include howto_step.html
         summary="Observe the new rule in the <i>Automated Rules</i> table"
-        image-name="2.3.0/create-an-automated-rule-5.png"
+        image-name="2.4.0/create-an-automated-rule-5.png"
         caption="
           The new rule will appear in the <i>Automated Rules</i> table."
-      %}  
+      %}
   </li>
 </ol>
diff --git a/guides/_subsections/use-topology-view.md b/guides/_subsections/use-topology-view.md
index 1d0c2529..02180705 100644
--- a/guides/_subsections/use-topology-view.md
+++ b/guides/_subsections/use-topology-view.md
@@ -1,85 +1,85 @@
 ## [Use Topology View](#use-topology-view)
 
-The *Topology View* provides a visual presentation of all the discovered JVM applications, and all their associated resources. It also allows users to perform actions on one or multiple targets.
+The *Topology View* provides a visual presentation of all the discovered **JVM** applications, and all their associated resources. It also allows users to perform actions on one or multiple `targets`.
 
 {% include_relative _subsections/common/navigate-to-topology.md %}
 
-### [View all target JVMs](#view-all-target-jvms)
+### [View all Target JVMs](#view-all-target-jvms)
 
 <ol>
     {% capture topology-graphview-guide-text %}
-    By default, an interactive <b>Graph View</b> of target JVMs (<i>nodes</i>) are shown nested within their associated groups (<i>surrounding lines</i>), for example, Pods, or Realms (i.e. discovery mechanisms to discover Java Applications, such as Kubernetes API, JDP or <a href="#using-the-cryostat-agent">Cryostat Agent</a>). 
+    By default, an interactive <i>Graph View</i> of <code>target</code> <b>JVMs</b> (<code>nodes</code>) are shown nested within their associated groups (<i>surrounding lines</i>), for example, <b>Pods</b>, or <b>Realms</b> (i.e. discovery mechanisms to discover <b>Java Applications</b>, such as <b>Kubernetes API, JDP</b> or <a href="#using-the-cryostat-agent">Cryostat Agent</a>).
     <br><br>
 
-    You can drag target nodes/groups or use the bottom control bar to adjust the graph. For example, zoom out or fit all nodes into view. A toolbar is also available to allow further customization:
+    You can drag <code>target</code> <code>nodes/groups</code> or use the bottom control bar to adjust the graph. For example, zoom out or fit all <code>nodes</code> into view. A <i>toolbar</i> is also available to allow further customization:
 
     <ol>
         <li>
-            <b>Display Options:</b> adjust how the nodes and groups are displayed, for example, whether to show connection URL.
+            <i>Display Options:</i> adjust how the <code>nodes</code> and <code>groups</code> are displayed, for example, whether to show connection URL.
         </li>
         <li>
-            <b>Filters:</b> determine which targets or groups to show.
+            <i>Filters:</i> determine which <code>targets</code> or <code>groups</code> to show.
         </li>
         <li>
-            <b>Search bar:</b> find a target using <b>Match Expression</b>. The matched targets will be highlighted.
+            <i>Search bar:</i> find a <code>target</code> using <code>Match Expression</code>. The matched <code>targets</code> will be highlighted.
         </li>
     </ol>
     {% endcapture %}
     {% capture topology-listview-guide-text %}
-    <i>Topology View</i> also supports <b>List View</b> mode, where your JVM targets and their groups are shown as expandable rows. 
+    <i>Topology View</i> also supports <i>List View</i> mode, where your <b>JVM</b> <code>targets</code> and their <code>groups</code> are shown as expandable rows.
     <br><br>
-    Click the List icon on the toolbar to switch to <b>List View</b>. Expand each row to see nested groups or targets. All the above features of the toolbar can also be used to customize your view.
+    Click the <i>List</i> icon on the toolbar to switch to <b>List View</b>. Expand each row to see nested <code>groups</code> or <code>targets</code>. All the above features of the toolbar can also be used to customize your view.
     {% endcapture %}
 
     {% include howto_step.html
-      summary="View JVM applications with Graph View"
-      image-name="2.3.0/topology-1.png"
-      caption="View JVM applications with topology Graph view."
+      summary="View <b>JVM</b> Applications with <i>Graph View</i>"
+      image-name="2.4.0/topology-1.png"
+      caption="View <b>JVM</b> applications with <i>Topology Graph view</i>."
       text=topology-graphview-guide-text
     %}
     {% include howto_step.html
-      summary="View JVM applications with List View"
-      image-name="2.3.0/topology-2.png"
-      caption="View JVM applications with Topology List view."
+      summary="View <b>JVM</b> Applications with <i>List View</i>"
+      image-name="2.4.0/topology-2.png"
+      caption="View <b>JVM</b> applications with <i>Topology List</i> view."
       text=topology-listview-guide-text
     %}
 </ol>
 
-### [View JVM details and resources](#view-jvm-details-and-resources)
+### [View JVM Details and Resources](#view-jvm-details-and-resources)
 <ol>
 
     {% capture sidebar-detail-guide-text %}
-    In <b>Graph View</b>, select a target JVM node to open the drawer panel that shows its details, for example, <code>Connection URL</code>, <code>Labels</code> and <code>Annotations</code>.
+    In <i>Graph View</i>, select a <code>target</code> <b>JVM</b> <code>node</code> to open the drawer panel that shows its details, for example, <i>Connection URL</i>, <i>Labels</i> and <i>Annotations</i>.
     <br><br>
-    In <b>List View</b>, expand each row to open nested groups until you find the target. Expand the target to see its details and associated resources.
+    In <i>List View</i>, expand each row to open nested <code>groups</code> until you find the <code>target</code>. Expand the <code>target</code> to see its details and associated resources.
 
     {% endcapture %}
 
     {% capture sidebar-resource-guide-text %}
-        Navigate to the <b>Resources</b> tab to see the target’s associated resources. There are 2 tables:
+        Navigate to the <i>Resources</i> tab to see the <code>target’s</code> associated resources. There are 2 tables:
     <ol>
         <li>
         
-        <b>Owned Resources:</b> Resources that the JVM owns (i.e. <a href="#startstop-a-recording">Active Recordings</a>, <a href="#viewing-archived-recordings">Archived Recordings</a>, <a href="#download-edit-and-upload-a-customized-event-template">Event Templates</a> and <a href="#download-edit-and-upload-a-customized-event-template">Event Types</a>).</li>
+        <i>Owned Resources:</i> Resources that the <b>JVM</b> owns (i.e. <a href="#startstop-a-recording">Active Recordings</a>, <a href="#viewing-archived-recordings">Archived Recordings</a>, <a href="#download-edit-and-upload-a-customized-event-template">Event Templates</a> and <a href="#download-edit-and-upload-a-customized-event-template">Event Types</a>).</li>
         <li>
-        <b>Related Resources:</b> Resources that are tied to the JVM by <b>Match Expression</b> (i.e. <a href="#create-an-automated-rule">Automated Rules</a> and <a href="#store-credentials">Credentials</a>).
+        <i>Related Resources:</i> Resources that are tied to the <b>JVM</b> by <code>Match Expression</code> (i.e. <a href="#create-an-automated-rule">Automated Rules</a> and <a href="#store-credentials">Credentials</a>).
         </li>
     </ol>
 
-    In the <b>Graph View</b>, each target node also has an indicator that tells whether the target has any running <b>Active Recordings</b>. The same information can be seen within the <b>Owned Resources</b> table by expanding the <b>Active Recordings</b> row.
+    In the <i>Graph View</i>, each <code>target node</code> also has an indicator that tells whether the <code>target</code> has any running <code>Active Recordings</code>. The same information can be seen within the <i>Owned Resources</i> table by expanding the <code>Active Recordings</code> row.
 
     {% endcapture %}
 
     {% include howto_step.html
-      summary="View JVM details"
-      image-name="2.3.0/topology-3.png"
-      caption="View target JVM’s details with drawer panel."
+      summary="View <b>JVM</b> Details"
+      image-name="2.4.0/topology-3.png"
+      caption="View <code>target</code> <b>JVM’s</b> details with drawer panel."
       text=sidebar-detail-guide-text
     %}
     {% include howto_step.html
-      summary="View JVM's associated resources"
-      image-name="2.3.0/topology-4.png"
-      caption="View JVM's associated resources with drawer panel."
+      summary="View <b>JVM's</b> Associated Resources"
+      image-name="2.4.0/topology-4.png"
+      caption="View <b>JVM's</b> associated resources with drawer panel."
       text=sidebar-resource-guide-text
     %}
 </ol>
@@ -88,26 +88,26 @@ The *Topology View* provides a visual presentation of all the discovered JVM app
 
 <ol>
     {% capture single-action-guide-text %}
-    The details panel for each target JVM supports performing simple actions on the JVM. Click the <b>Actions</b> menu to show available options.
+    The details panel for each <code>target</code> <b>JVM</b> supports performing simple actions on the <b>JVM</b>. Click the <i>Actions</i> menu to show available options.
     <br><br>
-    For example, select <b>View Recordings</b> to be redirected to the <i>Recordings</i> view for the target JVM, where you can view and manage <a href="#startstop-a-recording">Active Recordings</a>.
+    For example, select <i>View Recordings</i> to be redirected to the <i>Recordings View</i> for the <code>target</code> <b>JVM</b>, where you can view and manage <a href="#startstop-a-recording">Active Recordings</a>.
     {% endcapture %}
     {% capture bulk-action-guide-text %}
-    The details panel also supports performing actions on multiple target JVMs. Select a group of targets, for example, a Pod. A drawer panel will appear to show the group details. Select <b>Actions</b> menu to show available options.
+    The <i>Details</i> panel also supports performing actions on multiple <code>target</code> <b>JVMs</b>. Select a group of <code>targets</code>, for example, a <b>Pod</b>. A drawer panel will appear to show the group details. Select <b>Actions</b> menu to show available options.
     <br><br>
-    For example, select <b>Start recording</b> to start a recording on all target JVMs under this group. <b>Caution:</b> repeatedly selecting this option will cause the recording to be restarted and may result in recording data loss.
+    For example, select <i>Start recording</i> to start a <code>Recording</code> on all <code>targets</code> <b>JVMs</b> under this group. <b style="color:red">Caution:</b> repeatedly selecting this option will cause the <code>Recording</code> to be restarted and may result in <code>Recording</code> data loss.
     {% endcapture %}
     
     {% include howto_step.html
-      summary="Perform actions for a single JVM"
-      image-name="2.3.0/topology-5.png"
-      caption="Perform actions on an individual JVM."
+      summary="Perform Actions for a Single <b>JVM</b>"
+      image-name="2.4.0/topology-5.png"
+      caption="Perform actions on an individual <b>JVM</b>."
       text=single-action-guide-text
     %}
     {% include howto_step.html
-      summary="Perform actions for a group of JVMs"
-      image-name="2.3.0/topology-6.png"
-      caption="Perform actions on a group of JVMs."
+      summary="Perform Actions for a Group of <b>JVMs</b>"
+      image-name="2.4.0/topology-6.png"
+      caption="Perform actions on a group of <b>JVMs</b>."
       text=bulk-action-guide-text
     %}
 </ol>
diff --git a/guides/_subsections/using-smart-triggers.md b/guides/_subsections/using-smart-triggers.md
new file mode 100644
index 00000000..49488400
--- /dev/null
+++ b/guides/_subsections/using-smart-triggers.md
@@ -0,0 +1,92 @@
+## [Using Smart Triggers](#using-smart-triggers)
+**Cryostat Agent** supports custom triggers that are based on MBean metric values. You can configure **Cryostat Agent** to start **JFR** `Recordings` dynamically when these custom trigger conditions are met.
+
+You can set up a custom trigger condition in **Cryostat** to initiate Java Flight Recorder **(JFR)** `Recordings` dynamically. This trigger condition is based on MBean counters, covering various runtime, memory, thread, and OS metrics. The condition includes MBean counter types and allows specifying a duration for the trigger to activate only if the specified values persist for that duration. **Cryostat's Agent** supports smart triggers, which continuously monitor MBean counter values. When the current values match the configured conditions for the specified duration, the trigger initiates a **JFR** `Recording` dynamically through the **Cryostat Agent**.
+
+<span style="color:red">**Note**</span>: A **JFR** `Recording` will not start dynamically if the custom trigger condition associated with this `Recording` is not met.
+
+#### [Configure Custom Trigger for Dynamic Recording](#configure-custom-trigger-for-dynamic-recording)
+When you configure your `target` application to load the **Cryostat Agent**, you can define one or more custom triggers that are then passed as arguments to the **Agent**.
+For more information, learn how to [use the Cryostat Agent](#using-the-cryostat-agent).
+
+#### [Options for Defining a Custom Trigger](#options-for-defining-a-custom-trigger)
+You can define a custom trigger in any of the following ways:
+
+<ol>
+  <li>
+    <details>
+      <summary>Appending a Custom Trigger to the <b>Cryostat Agent’s</b> JAR File Path</summary>
+      <p>
+The following example shows how to append a simple custom trigger to the <b>Cryostat Agent’s</b> JAR file path:
+      </p>
+      <pre>
+  JAVA_OPTS="-javaagent:/deployments/app/cryostat-agent-shaded.jar=[ProcessCpuLoad > 0.2 ; TargetDuration > duration("30s")]~profile"
+      </pre>
+      <p>
+      The preceding example trigger instructs the <b>Agent</b> to start a <b>JFR</b> <code>Recording</code> if the <i>ProcessCpuLoad</i> metric has a value greater than 0.2 for a duration of more than 30 seconds: This example also instructs the <b>Agent</b> to use the <i>Profile</i> event template for the <b>JFR</b> <code>Recording</code>.
+      </p>
+    </details>
+  </li>
+  <li>
+    <details>
+      <summary>Using a <b>JVM</b> System Property Flag</summary>
+      <p>
+The following example shows how to specify a simple custom trigger by using a <b>JVM</b> system property flag:
+      </p>
+      <pre>
+  -Dcryostat.agent.smart-trigger.definitions="[ProcessCpuLoad > 0.2 ; TargetDuration > duration(\"30s\")]~profile"
+      </pre>
+      <p>
+      This example uses the same custom trigger criteria as the preceding example.
+      </p>
+    </details>
+  </li>
+  <li>
+    <details>
+      <summary>Using an Environment Variable</summary>
+      <p>
+The following example shows how to specify a simple custom trigger by using an environment variable:
+      </p>
+      <pre>
+  - name: CRYOSTAT_AGENT_SMART_TRIGGER_DEFINITIONS
+    value: "[ProcessCpuLoad > 0.2 ; TargetDuration > duration(\"30s\")]~profile"
+      </pre>
+      <p>
+This example uses the same custom trigger criteria as the preceding examples.
+      </p>
+    </details>
+  </li>
+</ol>
+
+#### [General Syntax Rules for Custom Triggers](#general-syntax-rules-for-custom-triggers)
+Consider the following syntax guidelines for defining custom triggers:
+<ol>
+    <li>A custom trigger definition must consist of both an expression that defines the overall trigger condition and the name of an event template that is used for the <b>JFR</b> <code>Recording</code>.</li>
+    <li>The entire trigger expression must be enclosed in square brackets. For example: <pre>[ProcessCpuLoad > 0.2 ; TargetDuration < duration("30s")]</pre></li>
+    <li>The name of the event template must be defined after the trigger expression and preceded by a tilde <code>(~)</code> character. For example: <pre>~profile</pre></li>
+    <li>A trigger expression can consist of one or more constraints and a <code>target</code> duration. The set of constraints and <code>target</code> duration must be separated by a semicolon <code>(;)</code> character.</li>
+    <li>Each constraint must include: the name of an MBean counter; a relational operator such as <code>></code> (greater than), <code>=</code> (equal to), <code><</code>(less than), and so on; and a specified value. The type of relational operator and value that you can specify depends on the associated MBean counter type. For example: <pre>ProcessCpuLoad > 0.2</pre></li>
+    <li>Constraints can be grouped together by using logical operators such as <code>&&</code> (AND), <code>||</code> (OR), or <code>!</code> (NOT) logic. For readability and clarity around the order of operations and operator precedence, grouped constraints may be enclosed in round brackets, but this is not a requirement. For example:
+    <pre>
+  [(MetricA > value1 && MetricB < value2) || MetricC == 'stringvalue' ; TargetDuration > duration("30s")]
+    </pre>
+    </li>
+    <li>
+    The name of each MBean counter that is specified as part of a custom trigger must follow precise syntax rules in terms of spelling and capitalization.
+    </li>
+    <li>
+    Only one <code>target</code> duration can be defined for a custom trigger. The <code>target</code> duration is applied to the entire trigger expression that is enclosed within the square brackets
+    </li>
+    <li>
+    A <code>target</code> duration can be expressed in terms of seconds, minutes, or hours. For example, <code>30s</code> means 30 seconds, <code>5m</code> means five minutes, <code>2h</code> means two hours, and so on.
+    </li>
+    <li>
+    A <code>target</code> duration is optional. If a <code>target</code> duration is not specified, triggering will occur immediately once the trigger conditions are met.
+    </li>
+    <li>
+    Multiple custom trigger definitions can be specified together, each of which relates to a separate <b>JFR</b> <code>Recording</code>. Different custom trigger definitions must be separated by a comma <code>(,)</code> character. For example:
+    <pre>
+  [ProcessCpuLoad>0.2]~profile,[ThreadCount>30]~Continuous
+    </pre>
+    </li>
+</ol>
diff --git a/guides/_subsections/using-the-cryostat-agent.md b/guides/_subsections/using-the-cryostat-agent.md
index ea29f931..0abb3b50 100644
--- a/guides/_subsections/using-the-cryostat-agent.md
+++ b/guides/_subsections/using-the-cryostat-agent.md
@@ -1,19 +1,21 @@
 ## [Using the Cryostat Agent](#using-the-cryostat-agent)
 
-The Cryostat Agent is a new component of Cryostat, implemented as a Java Instrumentation Agent, which acts as a plugin for applications running on the JVM. Prior to the Agent, Cryostat extracted data from the JVM by initiating a connection over JMX. It then fetches the data from JFR and pulls it over the network back toward the Cryostat to be accessible to end users.
+The **Cryostat Agent** is an optional component of **Cryostat**, implemented as a **Java Instrumentation Agent**, which acts as a plugin for applications running on the **JVM**. Prior to the **Agent**, **Cryostat** always extracted data from the **JVM** by initiating a connection over **JMX**. It then fetched the **JFR** data from an **MBean** and pulled it over the network back toward the **Cryostat** server to make it accessible to end users.
 
-The Agent works differently. It is responsible for fetching data from the JVM and sending it back to Cryostat over HTTP. The Agent works by looking for data within itself and the application it is plugged into. The Cryostat Agent locates Cryostat applications running on the network and it is able to initiate a connection with those applications. It is also able to communicate back to Cryostat about the Cryostat Agent and how to reach it. The Cryostat Agent also pushes its own Java Flight Recorder (JFR) data back to Cryostat by first initiating a network connection with Cryostat, which then analyzes and saves the data to makes it accessible to end users.
+The **Agent** works differently. It is responsible for fetching data from the **JVM** and sending it back to **Cryostat** over `HTTP`. The **Agent** works by looking for **MBean** and **JFR** data within itself and the application it is plugged into. It is also able to communicate back to **Cryostat** about the application instance the **Cryostat Agent** is attached to and how to reach it. The **Cryostat Agent** also pushes its own Java Flight Recorder **(JFR)** data back to **Cryostat** by initiating network connections with **Cryostat**, which may then analyze and save the data to make it accessible to end users.
 
-The programming interfaces for Cryostat and its Agent are designed to implement Cryostat's specific feature set, rather than being generalized and flexible like JMX. The benefit of this is that the security considerations are easier to understand and model, but choosing to use the Cryostat Agent over JMX may also forego the ability to interoperate with other JMX tooling such as JDK Mission Control, visualvm, jconsole, hawtio, etc.
+The **Agent** may also be configured, using the property `cryostat.agent.api.writes-enabled` or the corresponding environment variable `CRYOSTAT_AGENT_API_WRITES_ENABLED`, to allow bi-directional read-write access over `HTTP`. This enables dynamic *Start/Stop/Delete* of `Flight Recordings` as well as on-demand **JFR** pulls much like what **Cryostat** does over **JMX**.
+
+The programming interfaces for **Cryostat** and its **Agent** are designed to implement **Cryostat's** specific feature set, rather than being generalized and flexible like **JMX**. The benefit of this is that the security considerations are easier to understand and model, but choosing to use the **Cryostat Agent** over **JMX** may also forego the ability to interoperate with other **JMX** tooling such as `JDK Mission Control`, `visualvm`, `jconsole`, `hawtio`, etc.
 
 <ol>
-    <li>The Cryostat Agent retrieves a wide range of information from those Cryostat applications such as memory usage, CPU utilization, etc. </li>
-    <li>The Cryostat analyzes these collected data to identify problems that might be affecting the application’s performance.</li>
-    <li>The Agent is a third-party Java Instrumentation Agent for developers which can be installed on the target JVM program through the command-line arguments or directly attaching to the running JVM instance.</li>
-    <li>The Agent is foreign code for developers to audit and inspect before including it in their application builds. It is a small amount of code to inspect and likely easier to trust than JMX.</li>
-    <li>Unlike JMX, JVM doesn’t come with the Agent, so developers are required to add the Cryostat Agent to their application builds, then rebuild and deploy the application.</li>
-    <li>Developers need to specify the JFR configuration in advance before the attached application starts. The configuration tells the Agent what kind of JFR data to collect and how often to send that data to Cryostat. This is necessary for Cryostat to save the data in storage for the user to analyze. At this point in time, the Agent does not allow for dynamically turning on and off JFR, and the data it collects will always be sent to Cryostat on a fixed consistent schedule.</li>
-    <li>Once the Agent has been installed or attached to the running JVM instance, it can begin collecting data and sending it to Cryostat for analysis.</li>
+    <li>The <b>Cryostat Agent</b> retrieves a wide range of information from those <b>Cryostat</b> applications such as <code>memory usage</code>, <code>CPU utilization</code>, etc. </li>
+    <li>The <b>Cryostat</b> analyzes these collected data to identify problems that might be affecting the application’s performance.</li>
+    <li>The <b>Agent</b> is a third-party <b>Java Instrumentation Agent</b> for developers which can be installed on the target <b>JVM</b> program through the command-line arguments or directly attaching to the running <b>JVM</b> instance.</li>
+    <li>The <b>Agent</b> is foreign code for developers to audit and inspect before including it in their application builds. It is a small amount of code to inspect and likely easier to trust than <b>JMX</b>.</li>
+    <li>Unlike <b>JMX</b>, the <b>JVM</b> doesn’t come with the <b>Agent</b> included, so developers are required to add the <b>Cryostat Agent</b> to their application builds, then rebuild and deploy the application.</li>
+    <li>Once the <b>Agent</b> has been installed or attached to the running <b>JVM</b> instance, it can begin collecting data and sending it to <b>Cryostat</b> for analysis. If enabled, the <b>Cryostat</b> server that the <b>Cryostat Agent</b> is registered with may also begin to send remote management requests to dynamically <i>Start</i>, <i>Stop</i>, or <i>Delete</i> <code>Flight Recordings</code> as well as to retrieve <b>JFR</b> and <b>MBean</b> data.</li>
 </ol>
 
-For instructions on how to install the Cryostat Agent into your applications, [check the Setup section in Getting Started](/get-started/#using-the-cryostat-agent).
+For instructions on how to install the **Cryostat Agent** into your applications, [check the Setup section in Getting Started](/get-started/#using-the-cryostat-agent).
+
diff --git a/guides/_subsections/view-archived-recordings.md b/guides/_subsections/view-archived-recordings.md
index 7398f202..fe34b644 100644
--- a/guides/_subsections/view-archived-recordings.md
+++ b/guides/_subsections/view-archived-recordings.md
@@ -1,22 +1,22 @@
 ## [Viewing Archived Recordings](#viewing-archived-recordings)
-There are several ways to view <i>Archived Recordings</i>. The first method is to navigate to the Archived Recordings tab. See <a href="#archive-a-recording">Archive a Recording</a>.
+There are several ways to view <code>Archived Recordings</code>. The first method is to navigate to the <i>Archived Recordings</i> tab. See <a href="#archive-a-recording">Archive a Recording</a>.
 
 ### [All-Targets Archived Recordings View](#all-targets-archived-recordings-view)
 
-The second method is to navigate to the <i>All-Targets</i> archived recording view within the <i>Archives</i> tab on Cryostat console sidebar.
+The second method is to navigate to the <i>All-Targets</i> archived recording view within the <i>Archives</i> tab on <b>Cryostat</b> console sidebar.
 
-The All-Targets view gathers all of Cryostat's discovered target JVM applications into one section for ease of access. Here, we are able to interact with any archived recordings that have been saved from a source target by opening a target's nested recordings table. 
+The <i>All-Targets</i> view gathers all of <b>Cryostat's</b> discovered <code>target</code> <b>JVM</b> applications into one section for ease of access. Here, we are able to interact with any <code>Archived Recordings</code> that have been saved from a source <code>target</code> by opening a target's nested recordings table.
 
 <ol>
   <li>
     {% capture navigate-to-all-targets-include-text %}
     <p>
-        The option to automatically hide all targets with zero archived recordings is on by default and can be toggled. Targets can also be filtered in the search bar.
+        The option to automatically hide all <code>targets</code> with zero <code>Archived Recordings</code> is on by default and can be toggled. <code>Targets</code> can also be filtered in the search bar.
     </p>
     {% endcapture %}
     {% include howto_step.html
-        summary="Navigate to the All-Targets Archived Recordings view"
-        image-name="2.3.0/navigate-to-all-targets.png"
+        summary="Navigate to the <i>All-Targets</i> Archived Recordings view"
+        image-name="2.4.0/navigate-to-all-targets.png"
         caption="Click on the <i>Archives</i> tab on the sidebar, and the first tab should automatically be selected as the <i>All Targets</i> Archives view."
         text=navigate-to-all-targets-include-text
     %}
@@ -26,9 +26,9 @@ The All-Targets view gathers all of Cryostat's discovered target JVM application
     {% capture click-on-source-target-include-text %}
     {% endcapture %}
     {% include howto_step.html
-        summary="Select a source target application"
-        image-name="2.3.0/view-archives-recordings-1.png"
-        caption="Clicking the dropdown arrow next to a target name will list any archived recordings originating from that source target."
+        summary="Select a Source Target Application"
+        image-name="2.4.0/view-archives-recordings-1.png"
+        caption="Clicking the <i>dropdown arrow</i> next to a <code>target</code> name will list any <code>Archived Recordings</code> originating from that source <code>target</code>."
         text=click-on-source-target-include-text
     %}
   </li>
@@ -36,11 +36,11 @@ The All-Targets view gathers all of Cryostat's discovered target JVM application
 
 ### [All-Archives Archived Recordings View](#all-archives-archived-recordings-view)
 
-The third method is to navigate to the <i>All-Archives</i> archived recording view within the <i>Archives</i> tab on Cryostat console sidebar. 
+The third method is to navigate to the <i>All-Archives</i> <code>Archived Recording</code> view within the <i>Archives</i> tab on **Cryostat** console sidebar.
 
-The All-Archives view is a view which queries Cryostat's internal storage for any created archived recordings and the directories that contain them. Here, we are able to interact with any archived recordings that have been saved into storage by opening a nested recordings table within each directory.
+The *All-Archives* view is a view which queries **Cryostat's** internal storage for any created `Archived Recordings` and the directories that contain them. Here, we are able to interact with any `Archived Recordings` that have been saved into storage by opening a nested recordings table within each directory.
 
-This view is used to save any lost archived recordings in case any target JVM restarts or exits. It will be empty if no recordings are currently saved to storage.
+This view is used to save any lost `Archived Recordings` in case any `target` **JVM** restarts or exits. It will be empty if no <code>Recordings</code> are currently saved to storage.
 
 <ol>
   <li>
@@ -50,8 +50,8 @@ This view is used to save any lost archived recordings in case any target JVM re
     </p>
     {% endcapture %}
     {% include howto_step.html
-        summary="Navigate to the All-Archives Archived Recordings view"
-        image-name="2.3.0/navigate-to-all-archives.png"
+        summary="Navigate to the <i>All-Archives</i> <code>Archived Recordings</code> View"
+        image-name="2.4.0/navigate-to-all-archives.png"
         caption="Click on the <i>Archives</i> tab on the sidebar, and select the second tab titled <i>All Archives</i>."
         text=navigate-to-all-archives-include-text
     %}
@@ -60,13 +60,13 @@ This view is used to save any lost archived recordings in case any target JVM re
   <li>
       {% capture click-on-directory-include-text %}
     <p>
-      A directory name is related to its corresponding source target's serviceUrl. Mousing over the tooltip, we can also see a Cryostat generated hash ID for that target.
+      A directory name is related to its corresponding source <code>target's serviceUrl</code>. Mousing over the tooltip, we can also see a <b>Cryostat</b> generated <code>hash ID</code> for that <code>target</code>.
     </p>
     {% endcapture %}
     {% include howto_step.html
-        summary="Select an archives directory"
-        image-name="2.3.0/view-archives-recordings-2.png"
-        caption="Clicking the dropdown arrow next to a directory name will list any archived recordings within that directory in the Cryostat storage. Again, we can interact with any archived recordings in a similar fashion as before."
+        summary="Select an <i>Archives</i> directory"
+        image-name="2.4.0/view-archives-recordings-2.png"
+        caption="Clicking the <i>dropdown</i> arrow next to a directory name will list any <code>Archived Recordings</code> within that directory in the <b>Cryostat</b> storage. Again, we can interact with any <code>Archived Recordings</code> in a similar fashion as before."
         text=click-on-directory-include-text
     %}
   </li>
diff --git a/guides/_subsections/view-in-grafana.md b/guides/_subsections/view-in-grafana.md
index 128af5b8..67698691 100644
--- a/guides/_subsections/view-in-grafana.md
+++ b/guides/_subsections/view-in-grafana.md
@@ -1,18 +1,18 @@
 ## [View a Recording in Grafana](#view-a-recording-in-grafana)
-Cryostat provides integration with Grafana to plot curated time series
-metrics from a recording. By selecting _View in Grafana_ on either an
-_Active_ or _Archived Recording_, Cryostat uploads your recording to
-a custom Grafana Data Source, and launches Grafana in a new browser
-tab. If Cryostat was installed to a Kubernetes/OpenShift cluster using the
-Cryostat Operator, you must retrieve the credentials generated
-by the operator in order to log into Grafana. These credentials are stored
-in a Kubernetes Secret. Once logged in, navigate to the dashboard titled
-_Dashboard_. You will see a variety of metrics plotted from your recording.
+**Cryostat** provides integration with **Grafana** to plot curated time series
+metrics from a `Recording`. By selecting _View in Grafana_ on either an
+`Active` or `Archived Recording`, **Cryostat** uploads your `Recording` to
+a custom **Grafana Data Source**, and launches **Grafana** in a new browser
+tab. If **Cryostat** was installed to a **Kubernetes/OpenShift** cluster using the
+**Cryostat Operator,** you must retrieve the credentials generated
+by the **Operator** in order to log into **Grafana**. These credentials are stored
+in a `Kubernetes Secret`. Once logged in, navigate to the dashboard titled
+_Dashboard_. You will see a variety of metrics plotted from your `Recording`.
 
 <ol>
   <li>
     <details>
-      <summary>Retrieve the Grafana credentials</summary>
+      <summary>Retrieve the <b>Grafana</b> credentials</summary>
       <figure>
         {% highlight bash %}
 CRYOSTAT_NAME=$(kubectl get cryostat -o jsonpath='{$.items[0].metadata.name}')
@@ -22,9 +22,9 @@ kubectl get secret ${CRYOSTAT_NAME}-grafana-basic -o jsonpath='{$.data.GF_SECURI
 kubectl get secret ${CRYOSTAT_NAME}-grafana-basic -o jsonpath='{$.data.GF_SECURITY_ADMIN_PASSWORD}' | base64 -d
         {% endhighlight %}
         <figcaption>
-          If you installed Cryostat into Kubernetes or OpenShift using the
-          Cryostat Operator, use <i>kubectl</i> or <i>oc</i> to get the
-          generated username and password for Grafana and save them for later.
+          If you installed <b>Cryostat</b> into <b>Kubernetes</b> or <b>OpenShift</b> using the
+          <b>Cryostat Operator</b>, use <code>kubectl</code> or <code>oc</code> to get the
+          generated username and password for <b>Grafana</b> and save them for later.
         </figcaption>
       </figure>
     </details>
@@ -38,41 +38,41 @@ kubectl get secret ${CRYOSTAT_NAME}-grafana-basic -o jsonpath='{$.data.GF_SECURI
   <li>
     {% include_relative _subsections/common/select-a-recording.md
       select-a-recording-caption="
-        If you do not have any recordings present in the Active Recordings
+        If you do not have any <b>Recordings</b> present in the <i>Active Recordings</i>
         view, follow
         <a href='#startstop-a-recording'>Start/Stop a Recording</a>
-        to create one, or select a different target application. 
-        You may also select an archived recording to view in Grafana.
+        to create one, or select a different <i>Target</i> application.
+        You may also select an <code>Archived Recording</code> to view in <b>Grafana</b>.
       "
     %}
   </li>
   <li>
     {% include howto_step.html
       summary="Select <i>View in Grafana...</i>"
-      image-name="2.3.0/view-in-grafana-1.png"
+      image-name="2.4.0/view-in-grafana-1.png"
       caption="
-        Select <i>View in Grafana...</i> from the recording's overflow
+        Select <i>View in Grafana...</i> from the <code>Recording's</code> overflow
         menu.
       "
     %}
   </li>
   <li>
     {% include howto_step.html
-      summary="Log into Grafana"
-      image-name="2.3.0/view-in-grafana-2.png"
+      summary="Log into <b>Grafana</b>"
+      image-name="2.4.0/view-in-grafana-2.png"
       caption="
-        Use the credentials retrieved in step 1 to log into the Grafana
+        Use the credentials retrieved in step 1 to log into the <b>Grafana</b>
         web client.
       "
     %}
   </li>
   <li>
     {% include howto_step.html
-      summary="View and interact with data from your recording"
-      image-name="2.3.0/view-in-grafana-4.png"
+      summary="View and Interact With Data From Your <code>Recording</code>"
+      image-name="2.4.0/view-in-grafana-4.png"
       caption="
         Observe the plotted time series data from curated metrics in your
-        recording. Select time ranges to zoom into the data.
+        <code>Recording</code>. Select time ranges to zoom into the data.
       "
     %}
   </li>
diff --git a/guides/index.md b/guides/index.md
index 0677e302..ebbe6834 100644
--- a/guides/index.md
+++ b/guides/index.md
@@ -3,12 +3,14 @@ layout: guides
 title: Guides on Using Cryostat
 ---
 
-This section explains some common Cryostat features by example, illustrating
+This section explains some common **Cryostat** features by example, illustrating
 common actions and workflows of interest and why they are useful.
 
 * auto-gen TOC:
 {:toc}
 
+{% include_relative _subsections/getting-help.md %}
+
 {% include_relative _subsections/navigate-the-dashboard.md %}
 
 {% include_relative _subsections/use-topology-view.md %}
@@ -53,5 +55,7 @@ common actions and workflows of interest and why they are useful.
 
 {% include_relative _subsections/configure-graphical-notifications.md %}
 
+{% include_relative _subsections/using-smart-triggers.md %}
+
 [comment]: # ## [Analyze Recordings Online](#analyze-recordings-online)
 [comment]: # TODO
diff --git a/images/2.4.0/add-a-trusted-certificate-upload.png b/images/2.4.0/add-a-trusted-certificate-upload.png
new file mode 100644
index 00000000..af99f861
Binary files /dev/null and b/images/2.4.0/add-a-trusted-certificate-upload.png differ
diff --git a/images/2.4.0/add-and-edit-recording-metadata-labels-1.png b/images/2.4.0/add-and-edit-recording-metadata-labels-1.png
new file mode 100644
index 00000000..d45933e9
Binary files /dev/null and b/images/2.4.0/add-and-edit-recording-metadata-labels-1.png differ
diff --git a/images/2.4.0/add-and-edit-recording-metadata-labels-2.png b/images/2.4.0/add-and-edit-recording-metadata-labels-2.png
new file mode 100644
index 00000000..cf3d0457
Binary files /dev/null and b/images/2.4.0/add-and-edit-recording-metadata-labels-2.png differ
diff --git a/images/2.4.0/add-and-edit-recording-metadata-labels-3.png b/images/2.4.0/add-and-edit-recording-metadata-labels-3.png
new file mode 100644
index 00000000..5379edd0
Binary files /dev/null and b/images/2.4.0/add-and-edit-recording-metadata-labels-3.png differ
diff --git a/images/2.4.0/add-and-edit-recording-metadata-labels-4.png b/images/2.4.0/add-and-edit-recording-metadata-labels-4.png
new file mode 100644
index 00000000..853bf22e
Binary files /dev/null and b/images/2.4.0/add-and-edit-recording-metadata-labels-4.png differ
diff --git a/images/2.4.0/add-and-edit-recording-metadata-labels-5.png b/images/2.4.0/add-and-edit-recording-metadata-labels-5.png
new file mode 100644
index 00000000..7a110946
Binary files /dev/null and b/images/2.4.0/add-and-edit-recording-metadata-labels-5.png differ
diff --git a/images/2.4.0/add-and-edit-recording-metadata-labels-6.png b/images/2.4.0/add-and-edit-recording-metadata-labels-6.png
new file mode 100644
index 00000000..7a89d1ba
Binary files /dev/null and b/images/2.4.0/add-and-edit-recording-metadata-labels-6.png differ
diff --git a/images/2.4.0/add-and-edit-recording-metadata-labels-7.png b/images/2.4.0/add-and-edit-recording-metadata-labels-7.png
new file mode 100644
index 00000000..aa1f501c
Binary files /dev/null and b/images/2.4.0/add-and-edit-recording-metadata-labels-7.png differ
diff --git a/images/2.4.0/add-and-edit-recording-metadata-labels-8.png b/images/2.4.0/add-and-edit-recording-metadata-labels-8.png
new file mode 100644
index 00000000..41ea5239
Binary files /dev/null and b/images/2.4.0/add-and-edit-recording-metadata-labels-8.png differ
diff --git a/images/2.4.0/archive-a-recording-1.png b/images/2.4.0/archive-a-recording-1.png
new file mode 100644
index 00000000..aaa75dc1
Binary files /dev/null and b/images/2.4.0/archive-a-recording-1.png differ
diff --git a/images/2.4.0/archive-a-recording-2.png b/images/2.4.0/archive-a-recording-2.png
new file mode 100644
index 00000000..401c54bc
Binary files /dev/null and b/images/2.4.0/archive-a-recording-2.png differ
diff --git a/images/2.4.0/automated-analysis-1.png b/images/2.4.0/automated-analysis-1.png
new file mode 100644
index 00000000..0b69064b
Binary files /dev/null and b/images/2.4.0/automated-analysis-1.png differ
diff --git a/images/2.4.0/automated-analysis-2.png b/images/2.4.0/automated-analysis-2.png
new file mode 100644
index 00000000..c2e1ef87
Binary files /dev/null and b/images/2.4.0/automated-analysis-2.png differ
diff --git a/images/2.4.0/automated-analysis-3.png b/images/2.4.0/automated-analysis-3.png
new file mode 100644
index 00000000..54abeb36
Binary files /dev/null and b/images/2.4.0/automated-analysis-3.png differ
diff --git a/images/2.4.0/click-create.png b/images/2.4.0/click-create.png
new file mode 100644
index 00000000..929dcf75
Binary files /dev/null and b/images/2.4.0/click-create.png differ
diff --git a/images/2.4.0/create-an-automated-rule-1.png b/images/2.4.0/create-an-automated-rule-1.png
new file mode 100644
index 00000000..7592a246
Binary files /dev/null and b/images/2.4.0/create-an-automated-rule-1.png differ
diff --git a/images/2.4.0/create-an-automated-rule-2.png b/images/2.4.0/create-an-automated-rule-2.png
new file mode 100644
index 00000000..0e74ba32
Binary files /dev/null and b/images/2.4.0/create-an-automated-rule-2.png differ
diff --git a/images/2.4.0/create-an-automated-rule-3.png b/images/2.4.0/create-an-automated-rule-3.png
new file mode 100644
index 00000000..7b3975ae
Binary files /dev/null and b/images/2.4.0/create-an-automated-rule-3.png differ
diff --git a/images/2.4.0/create-an-automated-rule-4.png b/images/2.4.0/create-an-automated-rule-4.png
new file mode 100644
index 00000000..0dce8658
Binary files /dev/null and b/images/2.4.0/create-an-automated-rule-4.png differ
diff --git a/images/2.4.0/create-an-automated-rule-5.png b/images/2.4.0/create-an-automated-rule-5.png
new file mode 100644
index 00000000..41f285d1
Binary files /dev/null and b/images/2.4.0/create-an-automated-rule-5.png differ
diff --git a/images/2.4.0/create-an-automated-rule-6.png b/images/2.4.0/create-an-automated-rule-6.png
new file mode 100644
index 00000000..a12167e0
Binary files /dev/null and b/images/2.4.0/create-an-automated-rule-6.png differ
diff --git a/images/2.4.0/credentials-setting.png b/images/2.4.0/credentials-setting.png
new file mode 100644
index 00000000..3d7fd3d8
Binary files /dev/null and b/images/2.4.0/credentials-setting.png differ
diff --git a/images/2.4.0/custom-target-1.png b/images/2.4.0/custom-target-1.png
new file mode 100644
index 00000000..b6b4fefd
Binary files /dev/null and b/images/2.4.0/custom-target-1.png differ
diff --git a/images/2.4.0/custom-target-2.png b/images/2.4.0/custom-target-2.png
new file mode 100644
index 00000000..f720ef96
Binary files /dev/null and b/images/2.4.0/custom-target-2.png differ
diff --git a/images/2.4.0/custom-target-3.png b/images/2.4.0/custom-target-3.png
new file mode 100644
index 00000000..91b0348d
Binary files /dev/null and b/images/2.4.0/custom-target-3.png differ
diff --git a/images/2.4.0/custom-target-4.png b/images/2.4.0/custom-target-4.png
new file mode 100644
index 00000000..fd9e516b
Binary files /dev/null and b/images/2.4.0/custom-target-4.png differ
diff --git a/images/2.4.0/custom-target-5.png b/images/2.4.0/custom-target-5.png
new file mode 100644
index 00000000..76204763
Binary files /dev/null and b/images/2.4.0/custom-target-5.png differ
diff --git a/images/2.4.0/custom-target-6.png b/images/2.4.0/custom-target-6.png
new file mode 100644
index 00000000..2a7485df
Binary files /dev/null and b/images/2.4.0/custom-target-6.png differ
diff --git a/images/2.4.0/dashboard/automatedanalysis-configuration.png b/images/2.4.0/dashboard/automatedanalysis-configuration.png
new file mode 100644
index 00000000..05d56d55
Binary files /dev/null and b/images/2.4.0/dashboard/automatedanalysis-configuration.png differ
diff --git a/images/2.4.0/dashboard/automatedanalysis-errorview.png b/images/2.4.0/dashboard/automatedanalysis-errorview.png
new file mode 100644
index 00000000..651344e2
Binary files /dev/null and b/images/2.4.0/dashboard/automatedanalysis-errorview.png differ
diff --git a/images/2.4.0/dashboard/automatedanalysis-gallery.png b/images/2.4.0/dashboard/automatedanalysis-gallery.png
new file mode 100644
index 00000000..5620ebf7
Binary files /dev/null and b/images/2.4.0/dashboard/automatedanalysis-gallery.png differ
diff --git a/images/2.4.0/dashboard/automatedanalysis-list.png b/images/2.4.0/dashboard/automatedanalysis-list.png
new file mode 100644
index 00000000..1bb98b09
Binary files /dev/null and b/images/2.4.0/dashboard/automatedanalysis-list.png differ
diff --git a/images/2.4.0/dashboard/automatedanalysis-preview.png b/images/2.4.0/dashboard/automatedanalysis-preview.png
new file mode 100644
index 00000000..489a6e80
Binary files /dev/null and b/images/2.4.0/dashboard/automatedanalysis-preview.png differ
diff --git a/images/2.4.0/dashboard/automatedanalysis-result.png b/images/2.4.0/dashboard/automatedanalysis-result.png
new file mode 100644
index 00000000..cf30f293
Binary files /dev/null and b/images/2.4.0/dashboard/automatedanalysis-result.png differ
diff --git a/images/2.4.0/dashboard/automatedanalysis-success.png b/images/2.4.0/dashboard/automatedanalysis-success.png
new file mode 100644
index 00000000..3a34f8dd
Binary files /dev/null and b/images/2.4.0/dashboard/automatedanalysis-success.png differ
diff --git a/images/2.4.0/dashboard/card-catalog.png b/images/2.4.0/dashboard/card-catalog.png
new file mode 100644
index 00000000..129df67d
Binary files /dev/null and b/images/2.4.0/dashboard/card-catalog.png differ
diff --git a/images/2.4.0/dashboard/dashboard-blanklayout.png b/images/2.4.0/dashboard/dashboard-blanklayout.png
new file mode 100644
index 00000000..e44477fa
Binary files /dev/null and b/images/2.4.0/dashboard/dashboard-blanklayout.png differ
diff --git a/images/2.4.0/dashboard/dashboard-cardkebab.png b/images/2.4.0/dashboard/dashboard-cardkebab.png
new file mode 100644
index 00000000..b60c5f33
Binary files /dev/null and b/images/2.4.0/dashboard/dashboard-cardkebab.png differ
diff --git a/images/2.4.0/dashboard/dashboard-cardremoved.png b/images/2.4.0/dashboard/dashboard-cardremoved.png
new file mode 100644
index 00000000..d9876985
Binary files /dev/null and b/images/2.4.0/dashboard/dashboard-cardremoved.png differ
diff --git a/images/2.4.0/dashboard/dashboard-deletelayout.png b/images/2.4.0/dashboard/dashboard-deletelayout.png
new file mode 100644
index 00000000..8274c1aa
Binary files /dev/null and b/images/2.4.0/dashboard/dashboard-deletelayout.png differ
diff --git a/images/2.4.0/dashboard/dashboard-layout-setastemplate.png b/images/2.4.0/dashboard/dashboard-layout-setastemplate.png
new file mode 100644
index 00000000..a37e28ae
Binary files /dev/null and b/images/2.4.0/dashboard/dashboard-layout-setastemplate.png differ
diff --git a/images/2.4.0/dashboard/dashboard-layoutselector-options.png b/images/2.4.0/dashboard/dashboard-layoutselector-options.png
new file mode 100644
index 00000000..1ba92220
Binary files /dev/null and b/images/2.4.0/dashboard/dashboard-layoutselector-options.png differ
diff --git a/images/2.4.0/dashboard/dashboard-layoutselector.png b/images/2.4.0/dashboard/dashboard-layoutselector.png
new file mode 100644
index 00000000..ddea531e
Binary files /dev/null and b/images/2.4.0/dashboard/dashboard-layoutselector.png differ
diff --git a/images/2.4.0/dashboard/dashboard-layouttemplate.png b/images/2.4.0/dashboard/dashboard-layouttemplate.png
new file mode 100644
index 00000000..20a22c9e
Binary files /dev/null and b/images/2.4.0/dashboard/dashboard-layouttemplate.png differ
diff --git a/images/2.4.0/dashboard/dashboard-rearrange.png b/images/2.4.0/dashboard/dashboard-rearrange.png
new file mode 100644
index 00000000..7d8ce5b8
Binary files /dev/null and b/images/2.4.0/dashboard/dashboard-rearrange.png differ
diff --git a/images/2.4.0/dashboard/dashboard-renamelayout.png b/images/2.4.0/dashboard/dashboard-renamelayout.png
new file mode 100644
index 00000000..61b0709e
Binary files /dev/null and b/images/2.4.0/dashboard/dashboard-renamelayout.png differ
diff --git a/images/2.4.0/dashboard/dashboard-resize.png b/images/2.4.0/dashboard/dashboard-resize.png
new file mode 100644
index 00000000..dde41bb9
Binary files /dev/null and b/images/2.4.0/dashboard/dashboard-resize.png differ
diff --git a/images/2.4.0/dashboard/dashboard-templatepicker-name.png b/images/2.4.0/dashboard/dashboard-templatepicker-name.png
new file mode 100644
index 00000000..3b3d7812
Binary files /dev/null and b/images/2.4.0/dashboard/dashboard-templatepicker-name.png differ
diff --git a/images/2.4.0/dashboard/dashboard-templatepicker.png b/images/2.4.0/dashboard/dashboard-templatepicker.png
new file mode 100644
index 00000000..28911026
Binary files /dev/null and b/images/2.4.0/dashboard/dashboard-templatepicker.png differ
diff --git a/images/2.4.0/dashboard/mbeanmetrics-configuration.png b/images/2.4.0/dashboard/mbeanmetrics-configuration.png
new file mode 100644
index 00000000..6f88bcd6
Binary files /dev/null and b/images/2.4.0/dashboard/mbeanmetrics-configuration.png differ
diff --git a/images/2.4.0/dashboard/mbeanmetrics-preview.png b/images/2.4.0/dashboard/mbeanmetrics-preview.png
new file mode 100644
index 00000000..b60eb291
Binary files /dev/null and b/images/2.4.0/dashboard/mbeanmetrics-preview.png differ
diff --git a/images/2.4.0/dashboard/mbeanmetrics.png b/images/2.4.0/dashboard/mbeanmetrics.png
new file mode 100644
index 00000000..46005175
Binary files /dev/null and b/images/2.4.0/dashboard/mbeanmetrics.png differ
diff --git a/images/2.4.0/dashboard/targetjvmdetails-details.png b/images/2.4.0/dashboard/targetjvmdetails-details.png
new file mode 100644
index 00000000..0154e976
Binary files /dev/null and b/images/2.4.0/dashboard/targetjvmdetails-details.png differ
diff --git a/images/2.4.0/dashboard/targetjvmdetails-preview.png b/images/2.4.0/dashboard/targetjvmdetails-preview.png
new file mode 100644
index 00000000..66740173
Binary files /dev/null and b/images/2.4.0/dashboard/targetjvmdetails-preview.png differ
diff --git a/images/2.4.0/dashboard/targetjvmdetails-resources.png b/images/2.4.0/dashboard/targetjvmdetails-resources.png
new file mode 100644
index 00000000..4b22fba3
Binary files /dev/null and b/images/2.4.0/dashboard/targetjvmdetails-resources.png differ
diff --git a/images/2.4.0/download-an-active-or-archived-recording-1.png b/images/2.4.0/download-an-active-or-archived-recording-1.png
new file mode 100644
index 00000000..a3b4cc78
Binary files /dev/null and b/images/2.4.0/download-an-active-or-archived-recording-1.png differ
diff --git a/images/2.4.0/download-an-active-or-archived-recording-2.png b/images/2.4.0/download-an-active-or-archived-recording-2.png
new file mode 100644
index 00000000..402bf865
Binary files /dev/null and b/images/2.4.0/download-an-active-or-archived-recording-2.png differ
diff --git a/images/2.4.0/download-an-automated-rule-1.png b/images/2.4.0/download-an-automated-rule-1.png
new file mode 100644
index 00000000..193c315c
Binary files /dev/null and b/images/2.4.0/download-an-automated-rule-1.png differ
diff --git a/images/2.4.0/download-edit-and-upload-a-customized-event-template-1.png b/images/2.4.0/download-edit-and-upload-a-customized-event-template-1.png
new file mode 100644
index 00000000..8afcb9e1
Binary files /dev/null and b/images/2.4.0/download-edit-and-upload-a-customized-event-template-1.png differ
diff --git a/images/2.4.0/download-edit-and-upload-a-customized-event-template-2.png b/images/2.4.0/download-edit-and-upload-a-customized-event-template-2.png
new file mode 100644
index 00000000..b5ce3054
Binary files /dev/null and b/images/2.4.0/download-edit-and-upload-a-customized-event-template-2.png differ
diff --git a/images/2.4.0/download-edit-and-upload-a-customized-event-template-3.png b/images/2.4.0/download-edit-and-upload-a-customized-event-template-3.png
new file mode 100644
index 00000000..e515dd50
Binary files /dev/null and b/images/2.4.0/download-edit-and-upload-a-customized-event-template-3.png differ
diff --git a/images/2.4.0/download-edit-and-upload-a-customized-event-template-4.png b/images/2.4.0/download-edit-and-upload-a-customized-event-template-4.png
new file mode 100644
index 00000000..b66e9f99
Binary files /dev/null and b/images/2.4.0/download-edit-and-upload-a-customized-event-template-4.png differ
diff --git a/images/2.4.0/download-edit-and-upload-a-customized-event-template-5.png b/images/2.4.0/download-edit-and-upload-a-customized-event-template-5.png
new file mode 100644
index 00000000..e1a4bfcc
Binary files /dev/null and b/images/2.4.0/download-edit-and-upload-a-customized-event-template-5.png differ
diff --git a/images/2.4.0/edit-template-with-jmc-1.png b/images/2.4.0/edit-template-with-jmc-1.png
new file mode 100644
index 00000000..1ba9fa7a
Binary files /dev/null and b/images/2.4.0/edit-template-with-jmc-1.png differ
diff --git a/images/2.4.0/edit-template-with-jmc-2.png b/images/2.4.0/edit-template-with-jmc-2.png
new file mode 100644
index 00000000..55438ab0
Binary files /dev/null and b/images/2.4.0/edit-template-with-jmc-2.png differ
diff --git a/images/2.4.0/edit-template-with-jmc-3.png b/images/2.4.0/edit-template-with-jmc-3.png
new file mode 100644
index 00000000..44df1d90
Binary files /dev/null and b/images/2.4.0/edit-template-with-jmc-3.png differ
diff --git a/images/2.4.0/edit-template-with-jmc-4.png b/images/2.4.0/edit-template-with-jmc-4.png
new file mode 100644
index 00000000..38718d05
Binary files /dev/null and b/images/2.4.0/edit-template-with-jmc-4.png differ
diff --git a/images/2.4.0/edit-template-with-jmc-5.png b/images/2.4.0/edit-template-with-jmc-5.png
new file mode 100644
index 00000000..d3f0651e
Binary files /dev/null and b/images/2.4.0/edit-template-with-jmc-5.png differ
diff --git a/images/2.4.0/edit-template-with-jmc-6.png b/images/2.4.0/edit-template-with-jmc-6.png
new file mode 100644
index 00000000..bb7aceda
Binary files /dev/null and b/images/2.4.0/edit-template-with-jmc-6.png differ
diff --git a/images/2.4.0/guided-tour.png b/images/2.4.0/guided-tour.png
new file mode 100644
index 00000000..5f12ecd8
Binary files /dev/null and b/images/2.4.0/guided-tour.png differ
diff --git a/images/2.4.0/masthead-help.png b/images/2.4.0/masthead-help.png
new file mode 100644
index 00000000..fff19623
Binary files /dev/null and b/images/2.4.0/masthead-help.png differ
diff --git a/images/2.4.0/navigate-to-all-archives.png b/images/2.4.0/navigate-to-all-archives.png
new file mode 100644
index 00000000..a2f53adc
Binary files /dev/null and b/images/2.4.0/navigate-to-all-archives.png differ
diff --git a/images/2.4.0/navigate-to-all-targets.png b/images/2.4.0/navigate-to-all-targets.png
new file mode 100644
index 00000000..97d51ad8
Binary files /dev/null and b/images/2.4.0/navigate-to-all-targets.png differ
diff --git a/images/2.4.0/navigate-to-dashboard.png b/images/2.4.0/navigate-to-dashboard.png
new file mode 100644
index 00000000..42fa8722
Binary files /dev/null and b/images/2.4.0/navigate-to-dashboard.png differ
diff --git a/images/2.4.0/navigate-to-events-1.png b/images/2.4.0/navigate-to-events-1.png
new file mode 100644
index 00000000..0c88c844
Binary files /dev/null and b/images/2.4.0/navigate-to-events-1.png differ
diff --git a/images/2.4.0/navigate-to-events-2.png b/images/2.4.0/navigate-to-events-2.png
new file mode 100644
index 00000000..ae4369fe
Binary files /dev/null and b/images/2.4.0/navigate-to-events-2.png differ
diff --git a/images/2.4.0/navigate-to-recordings-1.png b/images/2.4.0/navigate-to-recordings-1.png
new file mode 100644
index 00000000..fd42f7f9
Binary files /dev/null and b/images/2.4.0/navigate-to-recordings-1.png differ
diff --git a/images/2.4.0/navigate-to-recordings-2.png b/images/2.4.0/navigate-to-recordings-2.png
new file mode 100644
index 00000000..26781c03
Binary files /dev/null and b/images/2.4.0/navigate-to-recordings-2.png differ
diff --git a/images/2.4.0/navigate-to-security.png b/images/2.4.0/navigate-to-security.png
new file mode 100644
index 00000000..33d1a94a
Binary files /dev/null and b/images/2.4.0/navigate-to-security.png differ
diff --git a/images/2.4.0/navigate-to-settings.png b/images/2.4.0/navigate-to-settings.png
new file mode 100644
index 00000000..4b7ba1aa
Binary files /dev/null and b/images/2.4.0/navigate-to-settings.png differ
diff --git a/images/2.4.0/navigate-to-topology.png b/images/2.4.0/navigate-to-topology.png
new file mode 100644
index 00000000..da9acce8
Binary files /dev/null and b/images/2.4.0/navigate-to-topology.png differ
diff --git a/images/2.4.0/notifications-setting.png b/images/2.4.0/notifications-setting.png
new file mode 100644
index 00000000..429ce24e
Binary files /dev/null and b/images/2.4.0/notifications-setting.png differ
diff --git a/images/2.4.0/quick-start-catalog.png b/images/2.4.0/quick-start-catalog.png
new file mode 100644
index 00000000..43212c12
Binary files /dev/null and b/images/2.4.0/quick-start-catalog.png differ
diff --git a/images/2.4.0/re-upload-a-recording-to-archives-1.png b/images/2.4.0/re-upload-a-recording-to-archives-1.png
new file mode 100644
index 00000000..3b904dae
Binary files /dev/null and b/images/2.4.0/re-upload-a-recording-to-archives-1.png differ
diff --git a/images/2.4.0/re-upload-a-recording-to-archives-2.png b/images/2.4.0/re-upload-a-recording-to-archives-2.png
new file mode 100644
index 00000000..07ff2797
Binary files /dev/null and b/images/2.4.0/re-upload-a-recording-to-archives-2.png differ
diff --git a/images/2.4.0/re-upload-a-recording-to-archives-3.png b/images/2.4.0/re-upload-a-recording-to-archives-3.png
new file mode 100644
index 00000000..00961644
Binary files /dev/null and b/images/2.4.0/re-upload-a-recording-to-archives-3.png differ
diff --git a/images/2.4.0/re-upload-a-recording-to-archives-4.png b/images/2.4.0/re-upload-a-recording-to-archives-4.png
new file mode 100644
index 00000000..76ce3b21
Binary files /dev/null and b/images/2.4.0/re-upload-a-recording-to-archives-4.png differ
diff --git a/images/2.4.0/select-a-recording.png b/images/2.4.0/select-a-recording.png
new file mode 100644
index 00000000..8b8443fb
Binary files /dev/null and b/images/2.4.0/select-a-recording.png differ
diff --git a/images/2.4.0/select-target-application.png b/images/2.4.0/select-target-application.png
new file mode 100644
index 00000000..cc899842
Binary files /dev/null and b/images/2.4.0/select-target-application.png differ
diff --git a/images/2.4.0/snapshot-a-recording-1.png b/images/2.4.0/snapshot-a-recording-1.png
new file mode 100644
index 00000000..9db94d4f
Binary files /dev/null and b/images/2.4.0/snapshot-a-recording-1.png differ
diff --git a/images/2.4.0/snapshot-a-recording-2.png b/images/2.4.0/snapshot-a-recording-2.png
new file mode 100644
index 00000000..ac7747c9
Binary files /dev/null and b/images/2.4.0/snapshot-a-recording-2.png differ
diff --git a/images/2.4.0/startstop-a-recording-1.png b/images/2.4.0/startstop-a-recording-1.png
new file mode 100644
index 00000000..77f962b9
Binary files /dev/null and b/images/2.4.0/startstop-a-recording-1.png differ
diff --git a/images/2.4.0/startstop-a-recording-2.png b/images/2.4.0/startstop-a-recording-2.png
new file mode 100644
index 00000000..e34e1aa0
Binary files /dev/null and b/images/2.4.0/startstop-a-recording-2.png differ
diff --git a/images/2.4.0/startstop-a-recording-3.png b/images/2.4.0/startstop-a-recording-3.png
new file mode 100644
index 00000000..a157de44
Binary files /dev/null and b/images/2.4.0/startstop-a-recording-3.png differ
diff --git a/images/2.4.0/store-credentials-1.png b/images/2.4.0/store-credentials-1.png
new file mode 100644
index 00000000..a191b8f9
Binary files /dev/null and b/images/2.4.0/store-credentials-1.png differ
diff --git a/images/2.4.0/store-credentials-2.png b/images/2.4.0/store-credentials-2.png
new file mode 100644
index 00000000..35ab1571
Binary files /dev/null and b/images/2.4.0/store-credentials-2.png differ
diff --git a/images/2.4.0/store-credentials-3.png b/images/2.4.0/store-credentials-3.png
new file mode 100644
index 00000000..7495ef8e
Binary files /dev/null and b/images/2.4.0/store-credentials-3.png differ
diff --git a/images/2.4.0/topology-1.png b/images/2.4.0/topology-1.png
new file mode 100644
index 00000000..01e9fce0
Binary files /dev/null and b/images/2.4.0/topology-1.png differ
diff --git a/images/2.4.0/topology-2.png b/images/2.4.0/topology-2.png
new file mode 100644
index 00000000..93ffee18
Binary files /dev/null and b/images/2.4.0/topology-2.png differ
diff --git a/images/2.4.0/topology-3.png b/images/2.4.0/topology-3.png
new file mode 100644
index 00000000..d92744e7
Binary files /dev/null and b/images/2.4.0/topology-3.png differ
diff --git a/images/2.4.0/topology-4.png b/images/2.4.0/topology-4.png
new file mode 100644
index 00000000..4944c023
Binary files /dev/null and b/images/2.4.0/topology-4.png differ
diff --git a/images/2.4.0/topology-5.png b/images/2.4.0/topology-5.png
new file mode 100644
index 00000000..80d26ded
Binary files /dev/null and b/images/2.4.0/topology-5.png differ
diff --git a/images/2.4.0/topology-6.png b/images/2.4.0/topology-6.png
new file mode 100644
index 00000000..75d11126
Binary files /dev/null and b/images/2.4.0/topology-6.png differ
diff --git a/images/2.4.0/topology-7.png b/images/2.4.0/topology-7.png
new file mode 100644
index 00000000..ae346a28
Binary files /dev/null and b/images/2.4.0/topology-7.png differ
diff --git a/images/2.4.0/upload-an-automated-rule-1.png b/images/2.4.0/upload-an-automated-rule-1.png
new file mode 100644
index 00000000..1fdb74f5
Binary files /dev/null and b/images/2.4.0/upload-an-automated-rule-1.png differ
diff --git a/images/2.4.0/upload-an-automated-rule-2.png b/images/2.4.0/upload-an-automated-rule-2.png
new file mode 100644
index 00000000..ab65d1e2
Binary files /dev/null and b/images/2.4.0/upload-an-automated-rule-2.png differ
diff --git a/images/2.4.0/view-archives-recordings-1.png b/images/2.4.0/view-archives-recordings-1.png
new file mode 100644
index 00000000..ba2ba7f4
Binary files /dev/null and b/images/2.4.0/view-archives-recordings-1.png differ
diff --git a/images/2.4.0/view-archives-recordings-2.png b/images/2.4.0/view-archives-recordings-2.png
new file mode 100644
index 00000000..79f34d85
Binary files /dev/null and b/images/2.4.0/view-archives-recordings-2.png differ
diff --git a/images/2.4.0/view-in-grafana-1.png b/images/2.4.0/view-in-grafana-1.png
new file mode 100644
index 00000000..ecc4af7e
Binary files /dev/null and b/images/2.4.0/view-in-grafana-1.png differ
diff --git a/images/2.4.0/view-in-grafana-2.png b/images/2.4.0/view-in-grafana-2.png
new file mode 100644
index 00000000..f2e22bde
Binary files /dev/null and b/images/2.4.0/view-in-grafana-2.png differ
diff --git a/images/2.4.0/view-in-grafana-3.png b/images/2.4.0/view-in-grafana-3.png
new file mode 100644
index 00000000..fd909639
Binary files /dev/null and b/images/2.4.0/view-in-grafana-3.png differ
diff --git a/images/2.4.0/view-in-grafana-4.png b/images/2.4.0/view-in-grafana-4.png
new file mode 100644
index 00000000..1bc1c062
Binary files /dev/null and b/images/2.4.0/view-in-grafana-4.png differ
diff --git a/images/2.4.0/welcome-tour.png b/images/2.4.0/welcome-tour.png
new file mode 100644
index 00000000..bd8956d4
Binary files /dev/null and b/images/2.4.0/welcome-tour.png differ
diff --git a/images/cryostat-operatorhub-install-complete.png b/images/cryostat-operatorhub-install-complete.png
index 923875f1..61539322 100644
Binary files a/images/cryostat-operatorhub-install-complete.png and b/images/cryostat-operatorhub-install-complete.png differ
diff --git a/images/cryostat-operatorhub-install-in-progress.png b/images/cryostat-operatorhub-install-in-progress.png
index 095320c8..e6961e4c 100644
Binary files a/images/cryostat-operatorhub-install-in-progress.png and b/images/cryostat-operatorhub-install-in-progress.png differ
diff --git a/images/cryostat-resource-creation.png b/images/cryostat-resource-creation.png
index fedd1f18..e24c647f 100644
Binary files a/images/cryostat-resource-creation.png and b/images/cryostat-resource-creation.png differ
diff --git a/images/cryostat-resource-status.png b/images/cryostat-resource-status.png
index eeffa729..ae6d3fa0 100644
Binary files a/images/cryostat-resource-status.png and b/images/cryostat-resource-status.png differ
diff --git a/images/cryostat-resources-after.png b/images/cryostat-resources-after.png
index 545faa89..b2e4b5ab 100644
Binary files a/images/cryostat-resources-after.png and b/images/cryostat-resources-after.png differ
diff --git a/images/cryostat-resources-before.png b/images/cryostat-resources-before.png
index cfc28e82..d1fb932a 100644
Binary files a/images/cryostat-resources-before.png and b/images/cryostat-resources-before.png differ
diff --git a/images/installed-operators.png b/images/installed-operators.png
index 80afb01c..b5734c00 100644
Binary files a/images/installed-operators.png and b/images/installed-operators.png differ
diff --git a/images/permissions-auth-page.png b/images/permissions-auth-page.png
index 92c3d45b..782beaa8 100644
Binary files a/images/permissions-auth-page.png and b/images/permissions-auth-page.png differ
diff --git a/images/sso-auth-page.png b/images/sso-auth-page.png
index fa5a388a..e98db724 100644
Binary files a/images/sso-auth-page.png and b/images/sso-auth-page.png differ
diff --git a/images/topology-view.png b/images/topology-view.png
index cc3405cf..790baa83 100644
Binary files a/images/topology-view.png and b/images/topology-view.png differ
diff --git a/version/2.3.0/guides/_subsections/add-a-trusted-certificate.md b/version/2.3.0/guides/_subsections/add-a-trusted-certificate.md
new file mode 100644
index 00000000..dd7ec201
--- /dev/null
+++ b/version/2.3.0/guides/_subsections/add-a-trusted-certificate.md
@@ -0,0 +1,40 @@
+## [Add a Trusted Certificate](#add-a-trusted-certificate)
+If you have Java Management Extensions (JMX) over SSL enabled on your containerized JVMs, you must configure Cryostat to trust the SSL certificate presented by the containerized JVM when Cryostat attempts to open a JMX connection. If you do not complete this configuration, Cryostat cannot open a JMX connection for the purposes of performing JFR management tasks.
+
+Here's how to add a trusted SSL certificate with the Cryostat web UI.
+
+<ol>
+    <li>
+        {% include howto_step.html
+          summary="Navigate to the Security tab"
+          image-name="2.3.0/navigate-to-security.png"
+          text="Click the <i>Security</i> tab."
+        %}
+    </li>
+    <li>
+        {% include howto_step.html
+          summary="Upload the Certificate"
+          image-name="2.3.0/add-a-trusted-certificate-upload.png"
+          text="
+              Click the <i>Upload</i> button on the <i>Import SSL Certificates</i> card. This action opens a file-upload dialog, where you can choose the certificate that you want to upload to Cryostat. You can repeat this process multiple times to add multiple trusted certificates.
+          "
+        %}
+    </li>
+    <li>
+        Restart Cryostat to apply the changes. If you do not restart your Cryostat instance, the added certificates are not reloaded. This causes connections to fail because the Cryostat JMX client cannot trust the certificates. Depending on your deployment platform and configuration, restarting Cryostat might require any of the following:
+        <ul>
+            <li>
+                On OpenShift/Kubernetes with Cryostat Operator:
+                <pre>oc delete cryostat/&lt;my-cryostat-cr-name&gt;<br>oc create -f &lt;my-cryostat-cr-name&gt;.yaml</pre>
+            </li>
+            <li>
+                On OpenShift/Kubernetes without Cryostat Operator:
+                <pre>oc rollout retry dc/&lt;my-cryostat-dc-name&gt;</pre>
+            </li>
+            <li>
+                On Podman:
+                <pre>podman restart &lt;my-cryostat-container-id&gt;</pre>
+            </li>
+        </ul>
+    </li>
+</ol>
diff --git a/version/2.3.0/guides/_subsections/add-and-edit-recording-metadata-labels.md b/version/2.3.0/guides/_subsections/add-and-edit-recording-metadata-labels.md
new file mode 100644
index 00000000..3673f5fd
--- /dev/null
+++ b/version/2.3.0/guides/_subsections/add-and-edit-recording-metadata-labels.md
@@ -0,0 +1,83 @@
+## [Add and Edit Recording Metadata Labels](#add-and-edit-recording-metadata-labels)
+Users can attach metadata or custom labels to JDK flight recordings managed by Cryostat. Recording labels can be used to identify recordings during queries or perform actions on multiple recordings containing the same labels. Here’s how to add and edit metadata labels on your JDK flight recordings.
+
+<ol>
+  <li>
+    {% include_relative _subsections/common/navigate-to-recordings.md %}
+  </li>
+  <li>
+    {% include_relative _subsections/common/click-create.md %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="Add metadata labels to the Create Recording form"
+      image-name="2.3.0/add-and-edit-recording-metadata-labels-1.png"
+      text="
+        When creating a custom flight recording with Cryostat, expand the form section <i>Show metadata options</i>. Click <i>Add Label</i> and add key-value label pairs to the form. Finally, click <i>Create</i> to attach the labels and create the recording.
+      "
+    %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="View your labels on the Active Recordings Table"
+      image-name="2.3.0/add-and-edit-recording-metadata-labels-2.png"
+      text="
+        The new recording will appear in the Recordings tab with your custom label as well as default labels containing information about the selected recording template.
+      "
+    %}
+  </li>
+  <li>
+    {% capture edit-an-existing-label-text %}
+    <p>
+      Recording labels can also be edited after recordings have been created or re-uploaded to archives. It looks like the custom label in our example contains a typo - we can fix the typo by editing the label. First select a recording from the table with the 🗹 checkbox. Then, click the <i>Edit Labels</i> button to bring up the label drawer. Finally, click the <i>Edit</i> button that appears from the drawer.
+      <br><br>
+      <a href="{{ site.url }}/images/2.3.0/add-and-edit-recording-metadata-labels-4.png" target="_blank">
+        <img src="{{ site.url }}/images/2.3.0/add-and-edit-recording-metadata-labels-4.png">
+      </a>
+      <br><br>
+      The labels section will appear as a form where you can add, edit, or delete existing labels, just like before when we created the recording. Fix the typo, and click <i>Save</i> to save your edited labels.
+    </p>
+    {% endcapture %}
+    {% include howto_step.html
+      summary="Edit an existing label"
+      image-name="2.3.0/add-and-edit-recording-metadata-labels-3.png"
+      text=edit-an-existing-label-text
+    %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="View your edited labels"
+      image-name="2.3.0/add-and-edit-recording-metadata-labels-5.png"
+      text="
+        The recording labels should be updated in the Active Recordings table. 
+      "
+    %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="<i>(Optional)</i> Archive your recording to view labels copied onto the archived recording"
+      image-name="2.3.0/add-and-edit-recording-metadata-labels-6.png"
+      text="
+        On the Active Recordings table, click the checkbox next to the recording, then click <i>Archive</i> to archive your recording. Notice that the archived recording also copies the labels from the active recording. You can also add labels to any recording uploaded to Cryostat’s archives.
+      "
+    %}
+  </li>
+  <li>
+    {% capture bulk-edit-recording-labels-text %}
+    <p>
+      Create another recording on the same target. Then select both recordings on the Recordings Table and click <i>Edit Labels</i> and <i>Edit</i>.This time, only labels that are present on both recordings will be shown in the form. Let's delete the two common template-related labels, and add a new label to both recordings. Then finally, click <i>Save</i>.
+      <br><br>
+      <a href="{{ site.url }}/images/2.3.0/add-and-edit-recording-metadata-labels-8.png" target="_blank">
+        <img src="{{ site.url }}/images/2.3.0/add-and-edit-recording-metadata-labels-8.png">
+      </a>
+      <br><br>
+      Congratulations, you have successfully bulk-edited labels across multiple recordings!
+    </p>
+    {% endcapture %}
+    {% include howto_step.html
+      summary="<i>(Optional)</i> Bulk-edit recording labels across multiple recordings"
+      image-name="2.3.0/add-and-edit-recording-metadata-labels-7.png"
+      text=bulk-edit-recording-labels-text
+    %}
+  </li>
+</ol>
diff --git a/version/2.3.0/guides/_subsections/archive-a-recording.md b/version/2.3.0/guides/_subsections/archive-a-recording.md
new file mode 100644
index 00000000..43b19af8
--- /dev/null
+++ b/version/2.3.0/guides/_subsections/archive-a-recording.md
@@ -0,0 +1,55 @@
+## [Archive a Recording](#archive-a-recording)
+In contrast to <i>Active Recordings</i>, which reside within the container
+of the target application, <i>Archived Recordings</i> reside within persistent
+storage attached to a Cryostat instance. In OpenShift, for example, the
+archives are stored in a `PersistentVolumeClaim`.
+
+Archived recordings are created by performing archival upon active recordings.
+When this is requested, Cryostat connects to the target application and copies
+the Flight Recorder data from the selected active recording into an archived
+recording file in storage. The active source recording may be continuous or
+fixed-duration, may be using any event template, may be in
+any state (`RUNNING`, `STOPPED`, etc.), and may even be a snapshot.
+
+<ol>
+  <li>
+    {% include_relative _subsections/common/select-target-application.md %}
+  </li>
+  <li>
+    {% include_relative _subsections/common/navigate-to-recordings.md %}
+  </li>
+  <li>
+    {% capture select-recording-additional-content %}
+      <p>
+        If you do not have any recordings present in the Active Recordings
+        view, follow
+        <a href="{{ page.url }}#startstop-a-recording">Start/Stop a Recording</a>
+        to create one, or select a different target application.
+      </p>
+    {% endcapture %}
+    {% include howto_step.html
+      summary="Select an Active Recording"
+      image-name="2.3.0/archive-a-recording-1.png"
+      caption=select-recording-additional-content
+    %}
+  </li>
+  <li>
+    <summary>Click the <i>Archive</i> button</summary>
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="Navigate to the <i>Archived Recordings</i> tab"
+      image-name="2.3.0/archive-a-recording-2.png"
+      caption="
+        Once the recording has been archived, a new entry will appear in the
+        target JVM's <i>Archived Recordings</i> table. All recordings that were
+        saved from the current target will be listed here in their own table.
+        Switching to a different target from the dropdown will list only the 
+        recordings archived from that source target. The name of the archived 
+        recording reflects the address of the target application, the original 
+        name of the active recording that it was retrieved from, and includes a 
+        timestamp indicating when the archived recording was created.
+      "
+    %}
+  </li>
+</ol>
diff --git a/version/2.3.0/guides/_subsections/automated-analysis.md b/version/2.3.0/guides/_subsections/automated-analysis.md
new file mode 100644
index 00000000..b6a8dac2
--- /dev/null
+++ b/version/2.3.0/guides/_subsections/automated-analysis.md
@@ -0,0 +1,90 @@
+## [View and Download Automated Analysis for a Recording](#view-and-download-automated-analysis-for-a-recording)
+Cryostat integrates the same automated analysis reports that you would
+find in [JDK Mission Control](https://github.com/openjdk/jmc). The
+JMC rules engine analyzes your recording and looks for common problems
+and assigns a severity score from 0 (no problem) to 100 (potentially
+severe problem). Results with score 0 are hidden from the report unless
+you select the _Show OK Results_ checkbox. More details on each
+result can be found by clicking on the _+_ symbol to the right of
+the rule name. These details often include suggestions on how to fix
+the problem. Cryostat also allows you to download the report HTML file
+for offline use.
+
+Cryostat also provides an *Automated Analysis Card* that is able to display the same information in a more user-friendly format, with more tools and control over the data you see. The card is available for use in the *Dashboard*. Read the section on the [Automated Analysis Card](#automated-analysis-card) for more information.
+
+<ol>
+  <li>
+    {% include_relative _subsections/common/select-target-application.md %}
+  </li>
+  <li>
+    {% include_relative _subsections/common/navigate-to-recordings.md %}
+  </li>
+  <li>
+    {% include_relative _subsections/common/select-a-recording.md
+      select-a-recording-caption="
+        If you do not have any recordings present in the Active Recordings
+        view, follow
+        <a href='#startstop-a-recording'>Start/Stop a Recording</a>
+        to create one, or select a different target application.
+        You may also select an archived recording for automated analysis.
+      "
+    %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="Expand the recording"
+      image-name="2.3.0/automated-analysis-1.png"
+      caption="
+        Expand the recording with the chevron to the left of the recording
+        name. The automated analysis report will appear below the recording.
+      "
+    %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="View details and suggestions for results"
+      image-name="2.3.0/automated-analysis-2.png"
+      caption="
+        Click the <i>+</i> button on the right side of each result to view
+        specifics on what the result means and possible suggestions to fix
+        the potential problem.
+      "
+    %}
+  </li>
+  <li>
+    {% capture download-report-text %}
+    <p>
+      <figure>
+        <a href="{{ site.url }}/images/2.3.0/automated-analysis-4.png" target="_blank">
+          <img src="{{ site.url }}/images/2.3.0/automated-analysis-4.png">
+        </a>
+        <figcaption>
+          View the report on its own without connecting to Cryostat.
+          Check <i>Show OK Results</i> to include results where the rules
+          engine found no issues in the recording.
+        </figcaption>
+      </figure>
+      <figure>
+        <a href="{{ site.url }}/images/2.3.0/automated-analysis-5.png" target="_blank">
+          <img src="{{ site.url }}/images/2.3.0/automated-analysis-5.png">
+        </a>
+        <figcaption>
+          To download the HTML <i>Automated Analysis</i> report to local disk, right click 
+          the page and select <i>Save Page As...</i>. Alternatively, press <kbd>Ctrl</kbd>+<kbd>S</kbd> 
+          on Windows/Linux, or <kbd>⌘</kbd>+<kbd>S</kbd> on macOS.
+        </figcaption>
+      </figure>
+    </p>
+    {% endcapture %}
+    {% include howto_step.html
+      summary="Download the report"
+      image-name="2.3.0/automated-analysis-3.png"
+      caption="
+        To download the automated analysis report for offline viewing,
+        select <i>View Report ...</i> from the recording's overflow
+        menu.
+      "
+      text=download-report-text
+    %}
+  </li>
+</ol>
diff --git a/version/2.3.0/guides/_subsections/common/card-catalog.md b/version/2.3.0/guides/_subsections/common/card-catalog.md
new file mode 100644
index 00000000..8e36330e
--- /dev/null
+++ b/version/2.3.0/guides/_subsections/common/card-catalog.md
@@ -0,0 +1,9 @@
+{% capture card-catalog-include-text %}
+ The <i>Dashboard Card Catalog</i> contains a list of available cards that can be added to the dashboard. Clicking on a card will open a panel containing a preview.
+{% endcapture %}
+{% include howto_step.html
+  summary="Open the Card Catalog"
+  image-name="2.3.0/dashboard/card-catalog.png"
+  caption="Open the card catalog by clicking the Catalog icon on the Dashboard toolbar."
+  text=card-catalog-include-text
+%}
diff --git a/version/2.3.0/guides/_subsections/common/click-create.md b/version/2.3.0/guides/_subsections/common/click-create.md
new file mode 100644
index 00000000..cda1f924
--- /dev/null
+++ b/version/2.3.0/guides/_subsections/common/click-create.md
@@ -0,0 +1,4 @@
+{% include howto_step.html
+  summary="Click <i>Create</i>"
+  image-name="2.3.0/click-create.png"
+%}
diff --git a/version/2.3.0/guides/_subsections/common/layout-selector.md b/version/2.3.0/guides/_subsections/common/layout-selector.md
new file mode 100644
index 00000000..018e13e2
--- /dev/null
+++ b/version/2.3.0/guides/_subsections/common/layout-selector.md
@@ -0,0 +1,9 @@
+{% capture layout-selector-text %}
+The layout selector contains a list of all available layouts. The currently selected layout is indicated with a check mark "✓".
+{% endcapture %}
+{% include howto_step.html
+summary="Open the layout selector dropdown"
+image-name="2.3.0/dashboard/dashboard-layoutselector.png"
+caption="Click the layout selector dropdown to view the available layouts."
+text=layout-selector-text
+%}
diff --git a/version/2.3.0/guides/_subsections/common/navigate-to-dashboard.md b/version/2.3.0/guides/_subsections/common/navigate-to-dashboard.md
new file mode 100644
index 00000000..815adbc3
--- /dev/null
+++ b/version/2.3.0/guides/_subsections/common/navigate-to-dashboard.md
@@ -0,0 +1,9 @@
+{% capture navigate-to-dashboard-include-text %}
+ The <i>Cryostat Dashboard</i> provides a high-level overview of the state of your Cryostat instance and the target JVM applications it is monitoring.
+{% endcapture %}
+{% include howto_step.html
+  summary="Navigate to <i>Dashboard</i>"
+  image-name="2.3.0/navigate-to-dashboard.png"
+  caption="Add dashboard cards, switch between dashboard layouts, and modify the layout configuration to suit your needs."
+  text=navigate-to-dashboard-include-text
+%}
diff --git a/version/2.3.0/guides/_subsections/common/navigate-to-recordings.md b/version/2.3.0/guides/_subsections/common/navigate-to-recordings.md
new file mode 100644
index 00000000..9f49e1d3
--- /dev/null
+++ b/version/2.3.0/guides/_subsections/common/navigate-to-recordings.md
@@ -0,0 +1,20 @@
+{% capture navigate-to-recordings-include-text %}
+  If the target JVM has SSL/TLS enabled on JMX connections then it may be
+  necessary to add the target's certificate to Cryostat's trust store. Go
+  to <a href="{{ site.url }}/guides/#add-a-trusted-certificate">Add a Trusted Certificate</a>
+  and return to this section after completing that guide.
+  <a href="{{ site.url }}/images/2.3.0/navigate-to-recordings-2.png" target="_blank">
+    <img src="{{ site.url }}/images/2.3.0/navigate-to-recordings-2.png">
+  </a>
+  {{ include.additional-content }}
+{% endcapture %}
+{% include howto_step.html
+  summary="Navigate to Recordings"
+  image-name="2.3.0/navigate-to-recordings-1.png"
+  caption="
+    Supply JMX credentials to authenticate to the target, if necessary. If
+    the target is not configured with JMX authentication then the
+    connection attempt will continue without prompting for credentials.
+  "
+  text=navigate-to-recordings-include-text
+%}
diff --git a/version/2.3.0/guides/_subsections/common/navigate-to-settings.md b/version/2.3.0/guides/_subsections/common/navigate-to-settings.md
new file mode 100644
index 00000000..b9583a1a
--- /dev/null
+++ b/version/2.3.0/guides/_subsections/common/navigate-to-settings.md
@@ -0,0 +1,14 @@
+{% capture navigate-to-settings-include-text %}
+  The Settings view contains web-client instance configuration settings. These
+  affect the appearance or behaviour of the web-client frontend only, not the
+  behaviour of the Cryostat backend server. These frontend settings are persisted
+  to web browser local storage only.
+{% endcapture %}
+{% include howto_step.html
+  summary="Navigate to Settings"
+  image-name="2.3.0/navigate-to-settings.png"
+  caption="
+    Click the cog or gear icon in the application masthead to access the Settings view.
+  "
+  text=navigate-to-settings-include-text
+%}
diff --git a/version/2.3.0/guides/_subsections/common/navigate-to-topology.md b/version/2.3.0/guides/_subsections/common/navigate-to-topology.md
new file mode 100644
index 00000000..c09fef7e
--- /dev/null
+++ b/version/2.3.0/guides/_subsections/common/navigate-to-topology.md
@@ -0,0 +1,9 @@
+{% capture navigate-to-topology-include-text %}
+  When you need to view or perform actions on multiple target JVMs at the same time, <b>Topology View</b> is the way.
+{% endcapture %}
+{% include howto_step.html
+  summary="Navigate to Topology"
+  image-name="2.3.0/navigate-to-topology.png"
+  caption="Use the bottom control bar to adjust the graph view as needed."
+  text=navigate-to-topology-include-text
+%}
diff --git a/version/2.3.0/guides/_subsections/common/select-a-recording.md b/version/2.3.0/guides/_subsections/common/select-a-recording.md
new file mode 100644
index 00000000..31681af9
--- /dev/null
+++ b/version/2.3.0/guides/_subsections/common/select-a-recording.md
@@ -0,0 +1,12 @@
+{% capture caption-content %}
+  {{ include.select-a-recording-caption }}
+{% endcapture %}
+{% capture text-content %}
+  {{ include.select-a-recording-additional-content }}
+{% endcapture %}
+{% include howto_step.html
+  summary="Select a recording"
+  image-name="2.3.0/select-a-recording.png"
+  caption=caption-content
+  text=text-content
+%}
diff --git a/version/2.3.0/guides/_subsections/common/select-target-application.md b/version/2.3.0/guides/_subsections/common/select-target-application.md
new file mode 100644
index 00000000..08361484
--- /dev/null
+++ b/version/2.3.0/guides/_subsections/common/select-target-application.md
@@ -0,0 +1,12 @@
+{% capture caption-content %}
+  {{ include.select-target-application-caption }}
+{% endcapture %}
+{% capture text-content %}
+  {{ include.select-target-application-additional-content }}
+{% endcapture %}
+{% include howto_step.html
+  summary="Select the target application"
+  image-name="2.3.0/select-target-application.png"
+  caption=caption-content
+  text=text-content
+%}
diff --git a/version/2.3.0/guides/_subsections/configure-credentials-storage.md b/version/2.3.0/guides/_subsections/configure-credentials-storage.md
new file mode 100644
index 00000000..0ef2ede1
--- /dev/null
+++ b/version/2.3.0/guides/_subsections/configure-credentials-storage.md
@@ -0,0 +1,44 @@
+## [Configure Credentials Storage](#configure-credentials-storage)
+
+Target JVM applications may require Cryostat to pass an authentication challenge before being able to communicate over JMX or HTTP
+and manage JFR. Cryostat has two supported mechanisms for these credentials:
+<ol>
+  <li>
+    <b>Credentials Keyring</b>: see <a href="#store-credentials">Store Credentials</a> for more detail.
+    This mechanism entails uploading a Credentials definition to the Cryostat backend keyring storage. Cryostat
+    automatically checks the keyring for credentials matching a target application when a request to that application
+    is opened. If no credentials are found, Cryostat responds to the requesting client (e.g. the Cryostat Web UI) with
+    a response indicating the authentication failure.
+  </li>
+  <li>
+    <b>X-JMX-Authorization</b> header passthrough: when the Cryostat Web UI receives a JMX authentication failure response
+    from the Cryostat server, it displays a prompt asking for JMX credentials. Depending on the configuration set in this
+    section, those credentials may either be held locally in your browser session, or they may be uploaded to the Cryostat
+    credentials keyring. If the credentials are held locally in your browser session, then the Cryostat Web UI will
+    automatically attach a custom header with API requests containing the JMX credentials you specify. The Cryostat
+    server sees this header and uses the credentials when opening the JMX connection to the target, but <i>does not
+    persist these credentials</i>. When the JMX credentials passthrough header is present, they supersede credentials
+    stored in the Cryostat server's keyring.
+  </li>
+</ol>
+
+Now that you understand the difference, let's continue to see how you can configure the Cryostat Web UI to use one
+or the other when you complete a Authentication prompt.
+
+<ol>
+  <li>
+    {% include_relative _subsections/common/navigate-to-settings.md %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="Locate the Credentials Storage setting"
+      image-name="2.3.0/credentials-setting.png"
+      text="
+        This setting contains a brief explanation of its purpose and a simple dropdown menu with selections for where any
+        Credentials entered into a <i>Authentication Required</i> challenge modal will be stored.
+        Choose <i>Session (Browser Memory)</i> to use the header passthrough mechanism described above, or choose
+        <i>Backend</i> to automatically store the credentials in the Cryostat server keyring.
+      "
+    %}
+  </li>
+</ol>
diff --git a/version/2.3.0/guides/_subsections/configure-graphical-notifications.md b/version/2.3.0/guides/_subsections/configure-graphical-notifications.md
new file mode 100644
index 00000000..848c9b97
--- /dev/null
+++ b/version/2.3.0/guides/_subsections/configure-graphical-notifications.md
@@ -0,0 +1,27 @@
+## [Configure Graphical Notifications](#configure-graphical-notifications)
+Actions such as starting/stopping/archiving recordings and state changes such as recordings stopping after a fixed duration
+produce graphical notifications. These notifications appear both when an interactive user performs the action via the
+web-client, as well as when an [Automated Rule](#create-an-automated-rule) performs the action, or when any other API
+client performs the action. If many Automated Rules or other API clients are active then the notification stream within
+the web-client graphical console can become quite noisy.
+
+<ol>
+  <li>
+    {% include_relative _subsections/common/navigate-to-settings.md %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="Locate the Notifications setting"
+      image-name="2.3.0/notifications-setting.png"
+      text="
+        The Notifications setting within this view is used to control the graphical display of notifications that
+        correspond to WebSocket messages sent by the Cryostat backend when actions and state changes occur. The setting
+        contains a toggle switch for each category of notification, as well as a global switch to enable/disable all
+        categories at once. Disabling a notification category only prevents it from appearing as a pop-up notification
+        toast in the current web-client instance. The notification will still appear in the notification drawer, accessed
+        by clicking the bell icon in the application masthead, and other web-client instances or API clients will still
+        receive the notification to process as they will.
+      "
+    %}
+  </li>
+</ol>
diff --git a/version/2.3.0/guides/_subsections/create-a-custom-target.md b/version/2.3.0/guides/_subsections/create-a-custom-target.md
new file mode 100644
index 00000000..b98ba408
--- /dev/null
+++ b/version/2.3.0/guides/_subsections/create-a-custom-target.md
@@ -0,0 +1,84 @@
+## [Create a Custom Target](#create-a-custom-target)
+
+By default, Cryostat automatically discovers target JVMs over remote Java Management Extensions (JMX), using various mechanisms (e.g. Kubernetes API, JDP). However, in some cases (e.g. for Kubernetes API, JMX port is not `9091` and port name is not `jfr-jmx`), Cryostat might not see your applications. Fortunately, you can tell Cryostat about them by filling out the *Custom Target* form to specify *Custom Targets*.
+
+<ol>
+  <li>
+    {% include_relative _subsections/common/navigate-to-topology.md %}
+  </li>
+  <li>
+    {% capture open-custom-target-form-text %}
+    <p>
+      Search for <i>Custom Target</i> tab and click <i>Create</i> to open the <i>Custom Target</i> form.
+      <figure>
+        <a href="{{ site.url }}/images/2.3.0/custom-target-1.png" target="_blank">
+          <img src="{{ site.url }}/images/2.3.0/custom-target-1.png">
+        </a>
+        <figcaption>
+          Use the <i>Custom Target</i> form to tell Cryostat about a JVM application that are not automatically discovered.
+        </figcaption>
+      </figure>
+    </p>
+    {% endcapture %}
+    {% include howto_step.html
+      summary="Open the <i>Custom Target</i> form"
+      image-name="2.3.0/topology-7.png"
+      caption="Click on Catalog Icon to open the Topology Entity Catalog."
+      text=open-custom-target-form-text
+    %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="Enter <i>Custom Target</i> definition"
+      image-name="2.3.0/custom-target-2.png"
+      caption="Use the form to enter the <i>Custom Target</i> definition."
+      text="
+      The <code>Connection URL</code> is required for Cryostat to attempt to find the target. You can optionally provide an  <code>Alias</code> or <code>JMX credentials</code> if the target has JMX authentication enabled.
+      "
+    %}
+  </li>
+  <li>
+    {% capture test-custom-target-text %}
+      <p>
+        Once you enter a valid connection URL, click on the sample node to test the target connection.
+        <figure>
+          <a href="{{ site.url }}/images/2.3.0/custom-target-4.png" target="_blank">
+            <img src="{{ site.url }}/images/2.3.0/custom-target-4.png">
+          </a>
+          <figcaption>
+            An exclamation mark and an alert banner will show if an error occurs while connecting to the target.
+          </figcaption>
+        </figure>
+      </p>
+    {% endcapture %}
+    {% include howto_step.html
+      summary="Test the <i>Custom Target</i> definition"
+      image-name="2.3.0/custom-target-3.png"
+      caption="A checkmark will show if Cryostat can connect to the sample app."
+      text=test-custom-target-text
+    %}
+  </li>
+  <li>
+    <summary>Click <i>Create</i> button to generate a new <i>Custom Target</i> definition once the test is successful.</summary>
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="View the <i>Custom Targets</i>"
+      image-name="2.3.0/custom-target-5.png"
+      caption="The <i>Custom Target</i> will be available under <i>Custom Targets</i> realm."
+      text="
+      Once the <i>Custom Target</i> form is successfully submitted, you will be redirected to the Topology View. Here, you can view your target under <i>Custom Targets</i> realm.
+      "
+    %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="<i>(Optional)</i> Delete <i>Custom Targets</i>"
+      image-name="2.3.0/custom-target-6.png"
+      caption="<i>Custom Targets</i> can be cleaned up with Actions menu."
+      text="
+      If the <i>Custom Targets</i> is no longer needed, in the target detail panel, click the <i>Actions</i> menu and select <b>Delete Target</b>.
+      "
+    %}
+  </li>
+</ol>
diff --git a/version/2.3.0/guides/_subsections/create-an-automated-rule.md b/version/2.3.0/guides/_subsections/create-an-automated-rule.md
new file mode 100644
index 00000000..ebb2895b
--- /dev/null
+++ b/version/2.3.0/guides/_subsections/create-an-automated-rule.md
@@ -0,0 +1,199 @@
+## [Create an Automated Rule](#create-an-automated-rule)
+
+Automated Rules are configurations that instruct Cryostat to create JDK Flight Recordings on matching
+target JVM applications. Each Automated Rule specifies parameters for which Event Template to use, how
+much data should be kept in the application recording buffer, and how frequently Cryostat should copy the
+application recording buffer into Cryostat's own archived storage.
+
+Once you've created a rule, Cryostat immediately matches it against all existing discovered targets and starts your flight recording. Cryostat will also apply the rule to newly discovered targets that match its definition. You can create multiple rules to match different subsets of targets or to layer different recording options for your needs.
+
+We'll walk through two use cases: continuous monitoring in a containerized JVM, and custom monitoring with Kubernetes labels or annotations.
+
+### [Continuous monitoring in a containerized JVM](#continuous-monitoring-in-a-containerized-jvm)
+
+Previously, if we wanted to enable always-on continuous monitoring using JDK Flight Recorder (JFR) in a containerized Java virtual machine (JVM), we would set JVM flags on the target application, then restart the application to start monitoring. With Cryostat's automated rules, we can enable JDK Flight Recorder at runtime to continuously monitor an already-running target application, with no restart, no redeploy, and no downtime.
+
+<ol>
+  <li>
+      {% include howto_step.html
+      summary="Navigate to the <i>Automated Rules</i> tab"
+      image-name="2.3.0/create-an-automated-rule-1.png"
+      caption="Switch to the <i>Automated Rules</i> tab."
+    %}
+  </li>
+  <li>
+    <summary>Click the <i>Create</i> button</summary>
+  </li>
+  <li>
+      {% include howto_step.html
+        summary="Configure the new automated rule"
+        image-name="2.3.0/create-an-automated-rule-2.png"
+        text="
+      <p>
+        <b>Name:</b> Enter a name for the new rule. The form will alert you if the name
+        entered has an invalid format. If the name is already in use then the
+        creation will fail and you will need to try again.
+      </p>
+      <p>
+        <b>Description:</b> Enter an optional description for your rule.
+      </p>
+      <p>
+        <b>Match Expression:</b> We will fill this field in the next step.
+      </p>
+      <p>
+        <b>Enabled:</b> Enable or disable the rule. If disabled, the rule will not be applied to any targets.
+      </p>
+      <p>
+        <b>Template:</b> Select an event template or enter a custom event definition. If you are
+        unsure which to choose, the <i>Continuous</i> template is useful for
+        always-on production monitoring with the <i>continuous</i> recording
+        duration setting, and the <i>Profiling</i> template is useful for
+        collecting extra information for troubleshooting a specifically
+        identified problem with a fixed recording duration.
+      </p>
+      "
+      %}  
+  </li>
+  <li>
+    <details>
+        <summary>Create your match expression</summary>
+        <p>
+            The match expression in a rule definition is a Java-like snippet of code that Cryostat interprets and uses to determine if a rule should be applied to any given target. Match expressions should thus evaluate to a boolean value. The simplest match expressions would be the booleans true or false; if we use true, the rule will apply to every target. The expression has a target object in global scope, with the following form in JSON notation:
+        </p>
+        <figure>
+{% highlight json %}
+{
+  "alias": "myAppAlias",
+  "connectUrl": "service:jmx:rmi:///jndi/rmi://cryostat:9091/jmxrmi",
+  "labels": {
+    "com.example/service": "customer-login",
+  },
+  "annotations": {
+    "platform": {
+      "io.kubernetes/annotation": "annotated"
+    },
+    "cryostat": {
+      "PORT": 9091,
+      "HOST": "cryostat",
+      "NAMESPACE": "myproject"
+    }
+  }
+}
+{% endhighlight %}
+        </figure>
+        <p>
+          The <i>alias, connectUrl, labels, annotations.platform,</i> and <i>annotations.cryostat</i> properties are all guaranteed to be present on the target object. <i>alias</i> and <i>connectUrl</i> will be non-empty strings. The <i>labels</i> and <i>platform annotations</i> may be empty—in OpenShift or Kubernetes, these are populated from the labels and annotations applied to the target’s pod, if any. The Cryostat annotations map will vary per platform, but on OpenShift or Kubernetes you can expect the <i>HOST, PORT, NAMESPACE,</i> and <i>POD_NAME</i> keys to be present and non-empty.
+
+          Here are some examples of match expressions:
+        </p>
+        <figure>
+
+{% highlight bash %}
+target.alias == ’com.example.MainClass’
+
+target.alias == ’myAlias’
+
+target.labels[‘com.example/service’] == ’customer-login’
+
+target.labels[‘com.example/service’] != ’customer-login’
+
+target.annotations.cryostat.PORT > 3000
+
+target.annotations.cryostat.PORT > 3000 && target.annotations.platform[‘io.kubernetes/annotation’] == ‘enabled’
+
+!!target.annotations.platform[‘io.kubernetes/annotation’]
+
+/^customer-login[0-9]\*$/.test(target.alias)
+{% endhighlight %}
+
+</figure>
+</details>
+
+  </li>
+  <li>
+      {% include howto_step.html
+        summary="Check your match expression"
+        image-name="2.3.0/create-an-automated-rule-3.png"
+        caption="You can select a target JVM to view its properties and use them to build your Match Expression."
+        text="
+          <p>
+          When you enter a match expression in the <i>Match Expression</i> field, the <i>Match Expression Visualizer</i> will highlight which targets are matched.
+          </p>
+          "
+      %}
+  </li>
+  <li>
+      {% include howto_step.html
+        summary="<i>(Optional)</i> Adjust rule parameters"
+        image-name="2.3.0/create-an-automated-rule-4.png"
+        caption="
+          Optionally set the recording options and rule parameters."
+        text="
+        <p><b>Maximum Size:</b> The maximum size of recording data retained in the target application's recording buffer. Values less than 1 indicate no limit.</p>
+        <p><b>Maximum Age:</b> The maximum age of recording data retained in the target application's recording buffer. Values less than 1 indicate no limit.</p>
+        <p><b>Archival Period:</b> Time between copies of active recording data being pulled into Cryostat archive storage.
+        Values less than 1 prevent data from being copied into archives - recordings will be started and remain only in target JVM memory.</p>
+        <p><b>Initial Delay:</b> Time between rule creation and when the first archived copy should be transferred. Values less than 1 are treated as being equal to the <b>Archival Period</b> above.</p>
+        <p><b>Preserved Archives:</b> The number of recording copies to preserve in archives for each target application affected by this rule. Values less than 1 prevent data from being copied into archives - recordings will be started and remain only in target JVM memory.</p>
+
+        <p>In the example image, the maximum recording age was set to 300 seconds and the archival period was set to a slightly shorter time period of 285 seconds. This overlap ensures that all of your flight recorder data is preserved in Cryostat's archives. The initial delay is set to 60 seconds however, so the first archive copy will be made 1 minute after the rule is created. The next copy will be made 5 minutes after that, the next another 5 minute later, etc.</p>
+        "
+      %}
+
+  </li>
+  <li>
+    <summary>Click the <i>Create</i> button</summary>
+  </li>
+  <li>
+      {% include howto_step.html
+        summary="Observe the new rule in the <i>Automated Rules</i> table"
+        image-name="2.3.0/create-an-automated-rule-5.png"
+        caption="
+          The new rule will appear in the <i>Automated Rules</i> table."
+      %}  
+  </li>
+  <li>
+      {% include_relative _subsections/common/navigate-to-recordings.md %}
+  </li>
+  <li>
+      {% include howto_step.html
+        summary="Observe the automatically generated recording in the <i>Active Recordings</i> table"
+        image-name="2.3.0/create-an-automated-rule-6.png"
+        caption="
+          Switch to the <i>Recordings</i> tab and view the new recording in the <i>Active Recordings</i>
+          table."
+        text="Once you've set up your automated rules, Cryostat will continuously monitor applications that meet the criteria defined in those rules, with no need to restart or redeploy those applications."
+      %}  
+  </li>
+</ol>
+
+### [Custom monitoring with Kubernetes labels or annotations](#custom-monitoring-with-kubernetes-labels-or-annotations)
+
+We can define a rule that applies to any target application that has platform-specific attributes, such as Kubernetes labels or annotations. Here's an example in JSON notation:
+
+<figure>
+{% highlight json %}
+
+{
+  "name": "k8sMonitoring",
+  "description": "Enable the Demo template on any target with the jfrMonitoring=true annotation",
+  "matchExpression": "target.annotations.platform[‘jfrMonitoring’]==’enabled’",
+  "eventSpecifier": "template=Demo,type=CUSTOM",
+  "archivalPeriodSeconds": 300,
+  "preservedArchives": 12
+}
+
+{% endhighlight %}
+
+  <figcaption>
+    To create this rule with the Cryostat UI, follow the guide in <a href="{{ page.url }}#continuous-monitoring-in-a-containerized-jvm">Continuous monitoring in a containerized JVM</a>.
+  </figcaption>
+</figure>
+
+Once we've created this rule definition, Cryostat will check all of the existing target applications and watch for new targets that appear with the <i>jfrMonitoring=enabled</i> annotation. Any matching targets found will have a recording started automatically using the custom <i>Demo</i> template from our first use case. It will take an archived snapshot every five minutes and maintain an hour’s worth of these archives in storage.
+
+With this rule definition in place, Kubernetes or Red Hat OpenShift users can use familiar tools like <i>kubectl/oc</i> or the OpenShift console to mark target applications for monitoring, without needing to interact directly with the Cryostat API or UI. This opens the door to further automating your workflow.
+
+As an example, you might use or implement an Operator that monitors traffic flow or pod restarts and enables monitoring on pods after some criterion threshold is met, then disables it again if the target application's behavior returns to normal. As a Kubernetes administrator, you could receive a notification when this occurs and check the Cryostat archives to retrieve JDK Flight Recorder data from the target application recorded during the problematic period, or you could view these archived recordings in Cryostat’s Grafana dashboard.
+
+**Note**: An important caveat is that Cryostat does not watch for changes in the Kubernetes annotations or labels; it only watches to see if target applications appear or disappear. To apply the annotation to a target application, we must apply the annotation or label to the application <i>pod</i> (which will cause Kubernetes to roll out a new replica), and not to the <i>deployment</i>.
diff --git a/version/2.3.0/guides/_subsections/download-an-active-or-archived-recording.md b/version/2.3.0/guides/_subsections/download-an-active-or-archived-recording.md
new file mode 100644
index 00000000..b0f85498
--- /dev/null
+++ b/version/2.3.0/guides/_subsections/download-an-active-or-archived-recording.md
@@ -0,0 +1,47 @@
+## [Download an Active or Archived Recording](#download-an-active-or-archived-recording)
+Cryostat provides some basic capabilities for analysis of Flight Recording data
+in-cluster. However, the core analysis workflow is to collect JFR files from
+target applications and copy them to local developer or admin workstations, then
+use [JDK Mission Control](https://github.com/openjdk/jmc) for the heavy lifting.
+
+<ol>
+  <li>
+    {% include_relative _subsections/common/select-target-application.md %}
+  </li>
+  <li>
+    {% include_relative _subsections/common/navigate-to-recordings.md %}
+  </li>
+  <li>
+    {% include_relative _subsections/common/select-a-recording.md
+        select-a-recording-caption="
+        Determine the recording you wish to download to your local workstation.
+        This may be either an <i>Active</i> or <i>Archived</i> recording.
+        Select the appropriate tab in the Recordings view. No actual action
+        needs to be taken at this step.
+      "
+    %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="Download the recording"
+      image-name="2.3.0/download-an-active-or-archived-recording-1.png"
+      caption="
+        Click the action overflow three-dot menu on the right side of the
+        recording entry in the table, then click <i>Download Recording</i>.
+      "
+    %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="Choose what to do with the recording file"
+      image-name="2.3.0/download-an-active-or-archived-recording-2.png"
+      caption="
+        Your browser will present you with its standard file-save dialog for both 
+        the <i>Archived Recording</i>, and a <code>.json</code> file containing any
+        metadata labels that were attached. It may take some time for these dialogs 
+        to appear. Once it does, you can choose to open the recording file directly 
+        in <i>JDK Mission Control</i>, or (recommended) to save the recording to disk.
+      "
+    %}
+  </li>
+</ol>
diff --git a/version/2.3.0/guides/_subsections/download-an-automated-rule.md b/version/2.3.0/guides/_subsections/download-an-automated-rule.md
new file mode 100644
index 00000000..f9cbf13e
--- /dev/null
+++ b/version/2.3.0/guides/_subsections/download-an-automated-rule.md
@@ -0,0 +1,17 @@
+## [Download an Automated Rule](#download-an-automated-rule)
+
+Automated Rules can easily be downloaded for viewing and editing.
+
+
+<ol>
+  <li>
+      {% include howto_step.html
+        summary="Open action menu for a selected rule"
+        image-name="2.3.0/download-an-automated-rule-1.png"
+        caption="Click the action overflow three-dot menu on the right side of selected rule entry in the table."
+      %}  
+  </li>
+  <li>
+    <summary>Click <i>Download</i> button to download.</summary>
+  </li>
+</ol>
diff --git a/version/2.3.0/guides/_subsections/download-edit-and-upload-a-customized-event-template.md b/version/2.3.0/guides/_subsections/download-edit-and-upload-a-customized-event-template.md
new file mode 100644
index 00000000..82d3fbca
--- /dev/null
+++ b/version/2.3.0/guides/_subsections/download-edit-and-upload-a-customized-event-template.md
@@ -0,0 +1,131 @@
+## [Download, Edit, and Upload a Customized Event Template](#download-edit-and-upload-a-customized-event-template)
+Most JVMs will come with at least two JFR event template definitions included:
+the *Continuous* and *Profiling* templates.
+
+The *Continuous* template:
+- has very low runtime overhead
+- collects basic data
+- is intended to be left on at all times, even in production
+
+The *Profiling* template:
+- may have some detectable runtime overhead
+- collects more in-depth data
+- should be used for a fixed duration when a specific problem is discovered at runtime
+
+These two definitions will fit many monitoring and profiling workflows, but not
+all. It may be useful to use either of these as a starting point and tailor it
+to meet your specific monitoring/profiling needs by including/excluding events,
+increasing/decreasing sample rates, raising/lowering thresholds, etc.
+
+Of special note, JFR allows for the definition of application-specific custom
+events, which would not be captured in either of the default templates above.
+
+Cryostat also provides the <code>ALL</code> meta-template, which enables all
+event types in the selected target application, with default values for each
+event option. This is not a true event template and does not have an XML
+definition to download.
+
+<ol>
+  <li>
+    {% include_relative _subsections/common/select-target-application.md
+      select-target-application-additional-content="
+        The target selected will provide the base <i>Continuous</i> and
+        <i>Profiling</i> template definitions to start from. Most target
+        applications will be interchangeable here.
+      "
+    %}
+  </li>
+  <li>
+    {% capture navigate-to-events-include-text %}
+    <p>
+      If the target JVM has SSL/TLS enabled on JMX connections then it may be
+      necessary to add the target's certificate to Cryostat's trust store. Go
+      to <a href="{{ page.url }}#add-a-trusted-certificate">Add a Trusted Certificate</a>
+      and return to this section after completing that guide.
+      <a href="{{ site.url }}/images/2.3.0/navigate-to-events-2.png" target="_blank">
+        <img src="{{ site.url }}/images/2.3.0/navigate-to-events-2.png">
+      </a>
+    </p>
+    {% endcapture %}
+    {% include howto_step.html
+      summary="Navigate to Events"
+      image-name="2.3.0/navigate-to-events-1.png"
+      caption="
+        Supply JMX credentials to authenticate to the target, if necessary. If
+        the target is not configured with JMX authentication then the
+        connection attempt will continue without prompting for credentials.
+      "
+      text=navigate-to-events-include-text
+    %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="Download the Template"
+      image-name="2.3.0/download-edit-and-upload-a-customized-event-template-1.png"
+      caption="
+        Click the action overflow three-dot menu on the right side of the
+        template entry in the table, then click <i>Download</i>.
+      "
+    %}
+  </li>
+  <li>
+    {% capture edit-template-additional-content %}
+      The template definition is an XML file, so you may open and edit it
+      with your favourite text editor or XML document editor. The JMC
+      Template Manager can also be used for this purpose, as described
+      <a href="{{ page.url }}#edit-template-with-jmc">
+        in this section
+      </a>.
+    {% endcapture %}
+    {% include howto_step.html
+      summary="Edit the Template"
+      image-name="2.3.0/download-edit-and-upload-a-customized-event-template-2.png"
+      caption=edit-template-additional-content
+      text="
+        Edit the template definition to suit your requirements. When you are
+        satisfied with the new configuration, give your new template a
+        meaningful and recognizable tag by editing the
+        <code>&lt;configuration&gt;</code> element at the top of the file and
+        setting the <code>label=</code> attribute to the desired name. You
+        should also save the file according to this new name, but this is not
+        strictly necessary. The <code>description</code> and
+        <code>provider</code> attributes can also be used to help identify this
+        template later and to explain its goals and purpose.
+      "
+    %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="Open the Template upload dialog"
+      image-name="2.3.0/download-edit-and-upload-a-customized-event-template-3.png"
+      caption="
+        Back on the Cryostat Events view, click the plus (<code>+</code>) icon
+        in the table toolbar. A dialog will appear.
+      "
+    %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="Upload the Template"
+      image-name="2.3.0/download-edit-and-upload-a-customized-event-template-4.png"
+      caption="
+        Click the <code>Browse</code> button. Your browser will present its
+        native file chooser dialog to select the file to upload. Browse and
+        select the template file, then click
+        <code>OK/Select/Continue/Open</code>. Click <code>Submit</code> on the
+        Cryostat dialog.
+      "
+    %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="Observe the new Template"
+      image-name="2.3.0/download-edit-and-upload-a-customized-event-template-5.png"
+      caption="
+        Once the template has been uploaded you will be returned to the
+        <code>Events</code> view, and your template will be present in the
+        table.
+      "
+    %}
+  </li>
+</ol>
diff --git a/version/2.3.0/guides/_subsections/edit-template-with-jmc.md b/version/2.3.0/guides/_subsections/edit-template-with-jmc.md
new file mode 100644
index 00000000..96d242f6
--- /dev/null
+++ b/version/2.3.0/guides/_subsections/edit-template-with-jmc.md
@@ -0,0 +1,86 @@
+## [Edit Template With JMC](#edit-template-with-jmc)
+[JDK Mission Control](https://github.com/openjdk/jmc) has a *Template Manager*
+functionality which also contains a graphical wizard for editing *.jfc* event
+template files. This may be preferred to editing the templates directly as XML
+plaintext or using XML document editors, which do not have .jfc-specific XSD
+validation or any hinting for event types and options.
+
+<ol>
+  <li>
+    {% capture acquire-template-additional-context %}
+      If you do not have an event template definition then you can visit
+      <a href="{{ page.url }}#download-edit-and-upload-a-customized-event-template">
+        Download, Edit, and Upload a Customized Event Template
+      </a>
+      and follow the first few steps to retrieve one from a remote target
+      application accessible by Cryostat. Otherwise, if you have the JDK
+      installed locally, you can find templates at
+      <code>$JAVA_HOME/lib/jfr</code>.
+    {% endcapture %}
+    {% include howto_step.html
+      summary="Acquire an Event Template"
+      image-name="2.3.0/edit-template-with-jmc-1.png"
+      caption="
+        Ensure that you have an event template definition <i>.jfc</i> file
+        somewhere on your local workstation, with read/write permissions.
+      "
+      text=acquire-template-additional-context
+    %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="Launch JDK Mission Control"
+      image-name="2.3.0/edit-template-with-jmc-2.png"
+      caption="The main JMC window after launch"
+    %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="Open the Template Manager"
+      image-name="2.3.0/edit-template-with-jmc-3.png"
+      caption="Select Window > Flight Recording Template Manager"
+    %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="Import the Base Template"
+      image-name="2.3.0/edit-template-with-jmc-4.png"
+      caption="
+        Click <i>Import Files...</i>, then browse to and select the
+        template from Step 1.
+      "
+    %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="Edit the Template"
+      image-name="2.3.0/edit-template-with-jmc-5.png"
+      caption="
+        Select the imported template, then click <i>Edit</i> and make your
+        desired changes. Before making changes you may also click
+        <i>Duplicate</i> to create an identical copy of the template as a base
+        to iterate upon.
+      "
+    %}
+  </li>
+  <li>
+    {% capture use-edited-template-additional-content %}
+      Once your edited template is saved to to a file on your local workstation
+      it can be used when starting new Flight Recordings. To do this using
+      Cryostat, see
+      <a href="{{ page.url }}#download-edit-and-upload-a-customized-event-template">Download, Edit, and Upload a Customized Event Template</a>
+      for instructions on how to upload the new template to Cryostat and 
+      <a href="{{ page.url }}#startstop-a-recording">Start/Stop a Recording</a>
+      for instructions on how to create a new recording using this template.
+    {% endcapture %}
+    {% include howto_step.html
+      summary="Export the Template"
+      image-name="2.3.0/edit-template-with-jmc-6.png"
+      caption="
+        Click <i>Export File...</i> to save the event template to a <i>.jfc</i>
+        file on your local workstation.
+      "
+      text=use-edited-template-additional-content
+    %}
+  </li>
+</ol>
diff --git a/version/2.3.0/guides/_subsections/navigate-the-dashboard.md b/version/2.3.0/guides/_subsections/navigate-the-dashboard.md
new file mode 100644
index 00000000..92facc72
--- /dev/null
+++ b/version/2.3.0/guides/_subsections/navigate-the-dashboard.md
@@ -0,0 +1,421 @@
+## [Navigate the Dashboard](#navigate-the-dashboard)
+The *Dashboard* is the first view you will see when you log into Cryostat. It provides a high-level overview of the state of your Cryostat instance and the target JVM applications it is monitoring.
+
+{% include_relative _subsections/common/navigate-to-dashboard.md %}
+
+### [Dashboard Cards](#dashboard-cards)
+
+Dashboard cards are widgets that display information about your Cryostat instance and the target JVM applications it is monitoring. Let's walk through the available cards and how to add them to your dashboard.
+
+{% include_relative _subsections/common/card-catalog.md %}
+
+#### [Target JVM Details Card](#target-jvm-details-card)
+
+<ol>
+  <li>
+    {% capture target-jvm-details-text %}
+    The <i>Target JVM Details</i> card displays information about the target JVM application that is currently selected. There are two tabs that display different information:
+    <ul>
+        <li>
+            <b>Details tab</b> - Displays information about the target JVM application, including:
+            <ol>
+                <li>
+                    <code>Connection URL</code> - The JMX connection URL of the target JVM application.
+                </li>
+                <li>
+                    <code>Alias</code> - The alias of the target JVM application.
+                </li>
+                <li>
+                    <code>JVM ID</code> - The JVM ID of the target JVM application.
+                </li>
+                <li>
+                    <code>Labels</code> - The labels of the target JVM application.
+                </li>
+                <li>
+                    <code>Annotations</code> - The annotations of the target JVM application.
+                </li>
+                and more...
+            </ol>
+        </li>
+        <li>
+            <b>Resources tab</b> - Displays the resources associated with the target JVM application. There are two tables:
+            <ul>
+                <li>
+                    <b>Owned Resources:</b> Resources that the JVM owns (i.e. <a href="#startstop-a-recording">Active Recordings</a>, <a href="#viewing-archived-recordings">Archived Recordings</a>, <a href="#download-edit-and-upload-a-customized-event-template">Event Templates</a> and <a href="#download-edit-and-upload-a-customized-event-template">Event Types</a>).
+                </li>
+                <li>
+                    <b>Related Resources:</b> Resources that are tied to the JVM by <i>Match Expression</i> (i.e. <a href="#create-an-automated-rule">Automated Rules</a> and <a href="#store-credentials">Credentials</a>).
+                </li>
+            </ul>
+        </li>
+    </ul>
+    {% endcapture %}
+    {% include howto_step.html
+      summary="Add the <i>Target JVM Details</i> card"
+      image-name="2.3.0/dashboard/targetjvmdetails-preview.png"
+      caption="
+        Click on the <i>Target JVM Details</i> card for a preview.
+      "
+      text=target-jvm-details-text
+    %}
+  </li>
+  <li>
+    <details>
+        <summary>Finish card creation</summary>
+              There are no extra steps in the creation wizard for this card. Click <code>Finish</code> to add the card to your dashboard.
+        <div class="multi-image">
+            <figure>
+                <a href="{{ site.url }}/images/2.3.0/dashboard/targetjvmdetails-details.png" target="_blank">
+                <img src="{{ site.url }}/images/2.3.0/dashboard/targetjvmdetails-details.png" alt="Details tab">
+                </a>
+                <figcaption><i>Details tab</i></figcaption>
+            </figure>
+            <figure>
+                <a href="{{ site.url }}/images/2.3.0/dashboard/targetjvmdetails-resources.png" target="_blank">
+                <img src="{{ site.url }}/images/2.3.0/dashboard/targetjvmdetails-resources.png" alt="Resources tab">
+                </a>
+                <figcaption><i>Resources tab</i></figcaption>
+            </figure>
+        </div>
+    </details>
+  </li>
+</ol>
+
+#### [Automated Analysis Card](#automated-analysis-card)
+
+<ol>
+  <li>
+    {% capture automated-analysis-text %}
+    <p>
+    The <i>Automated Analysis</i> card allows users to view JMC <i>Automated Analysis</i> reports in a nicely formatted dashboard card. The card allows the user to create a special recording, and then automatically generates a <i>Automated Analysis</i> report. The report displays potential problems with your JVM, and provides suggestions on how to improve the performance and security of your selected JVM application. The card also contains a toolbar that allows you to refresh the report, delete the report, filter results, and change the view.
+    </p>
+    <h4>Gallery view</h4>
+        <figure>
+            <a href="{{ site.url }}/images/2.3.0/dashboard/automatedanalysis-gallery.png" target="_blank">
+                <img src="{{ site.url }}/images/2.3.0/dashboard/automatedanalysis-gallery.png" alt="Gallery view">
+            </a>
+        </figure>
+        <p>
+            The Gallery view of the Automated Analysis Card displays a <i>Result</i>, a report summary, for each <i>Rule</i> that was triggered in the selected recording. In this view, each rule is listed in categories based on the event type. For example, the <code>Thrown Errors</code> rule and the <code>Thrown Exceptions</code> rule are part of the <code>exceptions</code> category, as seen in the figure above. By clicking on each rule, you can view more details about the rule and the <i>Result</i> that was generated.
+        </p>
+        <figure>
+            <a href="{{ site.url }}/images/2.3.0/dashboard/automatedanalysis-result.png" target="_blank">
+                <img src="{{ site.url }}/images/2.3.0/dashboard/automatedanalysis-result.png" alt="Automated Analysis Result">
+            </a>
+            <figcaption>
+                The <code>Discouraged Management Agent Settings</code> rule result with a severity score of 25.0.
+                A <i>Summary</i>, <i>Explanation</i>, and <i>Solution</i> can be seen in the <i>Result</i>.   
+            </figcaption>
+        </figure>
+        <p>
+            A <i>Result</i> has a severity score from 0 (no problem) to 100 (potentially severe problem).
+        </p>
+        <p>
+            The <i>Result</i> will also show three text details, if applicable:
+            <ul>
+                <li>
+                    <b>Summary:</b> A short summary of the problem.
+                </li>
+                <li>
+                    <b>Explanation:</b> A detailed explanation of the problem.
+                </li>
+                <li>
+                    <b>Solution:</b> A suggested solution to the problem.
+                </li>
+            </ul>
+        </p>
+    <h4>List view</h4>
+        <figure>
+            <a href="{{ site.url }}/images/2.3.0/dashboard/automatedanalysis-list.png" target="_blank">
+                <img src="{{ site.url }}/images/2.3.0/dashboard/automatedanalysis-list.png" alt="List view">
+            </a>
+        </figure>
+        <p>
+            The List view of the Automated Analysis Card displays each <i>Result</i> in a listed table. The table can be sorted by clicking on the column headers. The <i>Result</i> will also show the Summary, Explanation, and Solution in the Description column.
+        </p>
+    <h4>Toolbar</h4>
+        The toolbar allows you to filter results, change the view, refresh the report, and delete the report.
+
+        You are able to filter:
+         <ol>
+            <li>
+                <b>By severity:</b> You can filter by severity score by dragging the score slider or typing a score in the score input. The <i>Result</i> table will only show results with the score greater or equal to the selected filter score. Additionally, if there are <i>Critical</i> or <i>Warning</i> results, click the corresponding labels in the card header to only show those <i>Results</i>. Reset the filter by clicking on the buttons next to the <code>Reset</code> text.
+            </li>
+            <li>
+                <b>By category:</b> You can filter by rule <i>Name</i> or <i>Topic</i> by clicking on the <i>Name</i> filter dropdown. Then select a filtered item by clicking the dropdown next to it. You may also type in this dropdown to search for a specific item. The <i>Result</i> table will only show results that match the selected filter.
+            </li>
+        </ol>
+    {% endcapture %}
+    {% include howto_step.html
+      summary="Add the <i>Automated Analysis</i> card"
+      image-name="2.3.0/dashboard/automatedanalysis-preview.png"
+      caption="
+        Click on the <i>Automated Analysis</i> card for a preview.
+      "
+      text=automated-analysis-text
+    %}
+  </li>
+  <li>
+    {% capture configure-automated-analysis %}
+    <p>
+      In the next steps of the card creation, you can optionally provide advanced configuration. You can configure the settings of the special recording that is used to generate the report. The <i>Current Configuration</i> will be shown and can be edited by clicking the Pencil icon. By default, the recording uses a <code>Continuous</code> template, a <code>Maximum size</code> of <code>10MB</code>, and a <code>0</code> second <code>Maximum age</code> (meaning an unlimited recording duration).
+    </p>
+    <p>
+        <b>Note:</b> It is possible that setting both an infinite maximum size and age will result in an <code>Out Of Memory</code> error during report generation.
+    </p>
+    {% endcapture %}
+    {% include howto_step.html
+      summary="Configure the <i>Automated Analysis</i> card"
+      image-name="2.3.0/dashboard/automatedanalysis-configuration.png"
+      caption="Click <i>Next</i> to optionally provide advanced configuration."
+      text=configure-automated-analysis
+    %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="Finish card creation"
+      image-name="2.3.0/dashboard/automatedanalysis-errorview.png"
+      caption="The card will be added to the dashboard with an error view."
+      text="After clicking <i>Finish</i>, the card will be added to the dashboard with an error view. This is because the card has not yet detected a special <i>Automated Analysis</i> recording to source reports from."
+    %}
+  </li>
+  <li>
+      {% include howto_step.html
+      summary="Click <i>Create Recording</i>"
+      image-name="2.3.0/dashboard/automatedanalysis-success.png"
+      caption="The <i>Automated Analysis</i> card displayed with a successful report."
+      text="After clicking <i>Create Recording</i>, the card should be populated with report data containing the results of the <i>Automated Analysis</i> report."
+    %}
+    </li>
+</ol>
+
+#### [MBean Metrics Chart Card](#mbean-metrics-chart-card)
+
+<ol>
+  <li>
+    {% capture mbean-metrics-chart-text %}
+    <p>
+        The <i>MBean Metrics Chart</i> card displays performance metrics about the target JVM through remote access to supported Java MXBeans interfaces of the JVM, including Thread, Runtime, OperatingSystem, and Memory MXBeans.
+    </p>
+    <p>
+        Cryostat gathers this data and displays them in various charts. You can customize each card by going through the card creation wizard. The wizard will guide you through the process of selecting the metrics you want to display, how you want to display them, and other various configuration options. Some examples of Performance Metrics that can be displayed are:
+    </p>
+    <ul>
+        <li>Process CPU Load</li>
+        <li>System Load Average</li>
+        <li>Heap Memory Usage</li>
+        <li>...</li>
+    </ul>
+    {% endcapture %}
+    {% include howto_step.html
+      summary="Add the <i>MBean Metrics Chart</i> card"
+      image-name="2.3.0/dashboard/mbeanmetrics-preview.png"
+      caption="Click on the <i>MBean Metrics Chart</i> card for a preview."
+      text=mbean-metrics-chart-text
+    %}
+  </li>
+    <li>
+    {% capture configure-mbean-metrics-chart %}
+    <p>
+      In the next steps of the card creation, you can configure the details of the chart card. 
+    </p>
+    <p>
+      Configure the metric data by clicking the <i>Performance Metric</i> dropdown and selecting a metric. You can also configure the <i>Data Window</i> to display a specific time range of data, the <i>Refresh Period</i> to control how often the chart is updated, and the <i>Color Theme</i> to change the chart metric color.
+    </p>
+    {% endcapture %}
+    {% include howto_step.html
+      summary="Configure the <i>MBean Metrics Chart</i> card"
+      image-name="2.3.0/dashboard/mbeanmetrics-configuration.png"
+      caption="Click <i>Next</i> to provide card configuration."
+      text=configure-mbean-metrics-chart
+    %}
+  </li>
+  <li>
+    {% capture mbean-metrics-chart-finish %}
+    <p>
+        After clicking <i>Finish</i>, the card will be added to the dashboard. You can click the refresh button "↻" on the top right of the card at any time to reload the metrics.
+    </p>
+    {% endcapture %}
+    {% include howto_step.html
+      summary="Finish card creation"
+      image-name="2.3.0/dashboard/mbeanmetrics.png"
+      caption="The <i>MBean Metrics Chart</i> card displayed with the <i>Process CPU Load</i> metric."
+      text=mbean-metrics-chart-finish
+    %}
+  </li>
+</ol>
+
+### [Configuring the Dashboard](#configuring-the-dashboard)
+The <i>Dashboard</i> is highly customizable and can be configured to display the cards you want to see. You can customize the layout of the cards on the dashboard by moving, resizing, and removing cards.
+
+#### [Moving, resizing, and removing cards](#moving-and-resizing-cards)
+<ol>
+    <li>
+        {% include howto_step.html
+        summary="Add a card to the <i>Dashboard</i>"
+        image-name="2.3.0/dashboard/targetjvmdetails-preview.png"
+        caption="Open the card catalog by clicking the Catalog icon on the Dashboard toolbar."
+        text="Let's add the <i>Target JVM Details</i> card."
+        %}
+    </li>
+    <li>
+        {% include howto_step.html
+        summary="Resize the card"
+        image-name="2.3.0/dashboard/dashboard-resize.png"
+        caption="Click and drag the right edge of the card to resize it."
+        %}
+    </li>
+    <li>
+        {% include howto_step.html
+        summary="Add another card to the <i>Dashboard</i>"
+        image-name="2.3.0/dashboard/mbeanmetrics-preview.png"
+        caption="Open the card catalog by clicking the Catalog icon on the Dashboard toolbar."
+        text="Let's add the <i>MBean Metrics Chart</i> card this time."
+        %}
+    </li>
+    <li>
+        {% include howto_step.html
+        summary="Rearrange cards"
+        image-name="2.3.0/dashboard/dashboard-rearrange.png"
+        caption="Click and drag the <i>Target JVM Details</i> card's header on top or to the right of the <i>MBeans Metrics Chart</i> card to swap their positions."
+        %}
+    </li>
+    <li>
+        {% capture remove-card-text %}
+            <p>
+                Each card header contains a kebab icon that opens a menu of card actions. The actions menu contains the following options:
+                <ul>
+                    <li>
+                        <b>View</b> - Opens the card in fullscreen mode.
+                    </li>
+                    <li>
+                        <b>Remove</b> - Removes the card from the dashboard.
+                    </li>
+                    <li>
+                        <b>Reset Size</b> - Resets the card to its default size.
+                    </li>
+                </ul>
+            </p>
+            <figure>
+                <a href="{{ site.url }}/images/2.3.0/dashboard/dashboard-cardremoved.png" target="_blank">
+                    <img src="{{ site.url }}/images/2.3.0/dashboard/dashboard-cardremoved.png" alt="{{ Removed card }}">
+                </a>
+                <figcaption>Click <i>Remove</i> to remove the card.</figcaption>
+            </figure>
+        {% endcapture %}
+        {% include howto_step.html
+        summary="Remove cards"
+        image-name="2.3.0/dashboard/dashboard-cardkebab.png"
+        caption="Click the Kebab icon on the card header to open the card actions menu."
+        text=remove-card-text
+        %}
+    </li>
+</ol>
+
+### [Dashboard Layouts and Templates](#dashboard-layouts-and-templates)
+*Dashboard Layouts* are a way to organize your dashboard cards into different views. You can create multiple layouts and switch between them to view different cards. Favorite, rename, and delete layouts to customize your dashboard.
+
+By default, the `Default` layout is created for you. This layout contains the cards three *MBean Metrics Chart* cards. You can modify this layout's card configuration, but you cannot rename or delete it.
+
+*Layout Templates* save your layouts for later use. You can create a template from a layout, and then use that template to create a new layout with the same cards. You can also import and export templates to share them with other Cryostat users.
+
+#### [Create a new Dashboard Layout](#create-a-new-dashboard-layout)
+<ol>
+    <li>
+        {% include_relative _subsections/common/layout-selector.md %}
+    </li>
+    <li>
+        {% include howto_step.html
+        summary="Click <i>New Layout</i>"
+        image-name="2.3.0/dashboard/dashboard-blanklayout.png"
+        text="Clicking <i>New Layout</i> will create a new blank layout and switch the dashboard view to the new layout. The layout should be called something like <code>Custom1</code>."
+        %}
+    </li>
+    <li>
+        {% include howto_step.html
+        summary="<i>(Optional)</i> Rename layouts"
+        image-name="2.3.0/dashboard/dashboard-renamelayout.png"
+        caption="Click the pencil button to rename the currently selected layout."
+        text="You are able to rename layouts by clicking the pencil button next to the layout selector. This will rename the currently selected layout. You can also rename layouts within the layout selector dropdown itself."
+        %}
+    </li>
+    <li>
+        {% include howto_step.html
+        summary="<i>(Optional)</i> Delete layouts"
+        image-name="2.3.0/dashboard/dashboard-deletelayout.png"
+        caption="Click 🗑️ <i>Delete</i> to delete the currently selected layout."
+        text="Deletion is similar to renaming. Click the trash can icon with the text <i>Delete</i> next to the layout selector to delete the currently selected layout. You can also delete layouts within the layout selector dropdown itself."
+        %}
+    </li>
+</ol>
+
+#### [Set a layout as a template](#set-a-layout-as-a-template)
+<ol>
+    <li>
+        {% include howto_step.html
+        summary="Save a layout as a template"
+        image-name="2.3.0/dashboard/dashboard-layout-setastemplate.png"
+        caption='Click more options "⋮" on the dashboard toolbar, then click <i>Set as template</i> to set the desired layout as a template.'
+        text="The layout template will be saved as a <i>User-submitted</i> template in the template picker."
+        %}
+    </li>
+</ol>
+
+#### [Create a new Dashboard Layout from a template](#create-a-new-dashboard-layout-from-a-template)
+
+<ol>
+    <li>
+        {% include_relative _subsections/common/layout-selector.md %}
+    </li>
+    <li>
+        {% include howto_step.html
+        summary="Select <i>Choose Template</i>"
+        image-name="2.3.0/dashboard/dashboard-layoutselector-options.png"
+        text="Click the expandable menu on <i>New Layout</i> button and select <i>Choose Template</i>. This will open the template picker."
+        %}
+    </li>
+    <li>
+        {% capture template-picker-guide-text %}
+        <p>
+            The template picker displays all the available templates. Templates are categorized into 3 groups.
+            <ol>
+                <li>
+                    <b>Suggested:</b> Templates that are suggested for you based on recent activity.
+                </li>
+                <li>
+                    <b>Cryostat:</b> Templates that come with Cryostat.
+                </li>
+                <li>
+                    <b>User-submitted</b>: Templates that you have created or imported.
+                </li>
+            </ol>
+            <p>     
+            Additionally, you can search for templates by typing in the search bar or filter templates by category. You can also upload templates directly here by clicking <i>Upload</i>.
+            </p>
+            <p>
+            Select a template by clicking on it.
+            </p>
+        </p>
+        {% endcapture %}
+        {% include howto_step.html
+        summary="Choose a template"
+        image-name="2.3.0/dashboard/dashboard-templatepicker.png"
+        caption="Clicking a template will open a preview where you can view the template's cards."
+        text=template-picker-guide-text
+        %}
+    </li>
+    <li>
+        {% include howto_step.html
+        summary="Enter a name for the new layout"
+        image-name="2.3.0/dashboard/dashboard-templatepicker-name.png"
+        text="A layout name must be entered before the <i>Create</i> button is enabled. The name must be alphanumeric, can only contain underscores, dashes, and periods, and must be 20 characters or less."
+        %}
+    </li>
+    <li>
+        {% include howto_step.html
+        summary="Click <i>Create</i>"
+        image-name="2.3.0/dashboard/dashboard-layouttemplate.png"
+        caption="The new layout will be created and the dashboard view will switch to the new layout with the template applied."
+        %}
+    </li>
+</ol>
diff --git a/version/2.3.0/guides/_subsections/re-upload-a-recording-to-archives.md b/version/2.3.0/guides/_subsections/re-upload-a-recording-to-archives.md
new file mode 100644
index 00000000..c4407545
--- /dev/null
+++ b/version/2.3.0/guides/_subsections/re-upload-a-recording-to-archives.md
@@ -0,0 +1,52 @@
+## [Re-Upload a Recording to Archives](#re-upload-a-recording-to-archives)
+After downloading an archived recording from Cryostat, it can be re-uploaded
+into Cryostat's archives later. This is useful if, for example, your Cryostat
+instance has been scaled down or undeployed for some time and the attached
+storage lost, and you then want to use Cryostat's analysis tools with a
+previously retrieved recording in a new Cryostat instance.
+
+<ol>
+  <li>
+    {% include howto_step.html
+      summary="Navigate to the <i>Archives</i> tab"
+      image-name="2.3.0/re-upload-a-recording-to-archives-1.png"
+      caption="Select the Uploads tab."
+      text="The entire Archives view contains several tabs related to performing operations
+      on archived recordings. See <a href='#view-archived-recordings'>Viewing Archived Recordings</a>.
+      "
+    %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="Select the Recording to Upload"
+      image-name="2.3.0/re-upload-a-recording-to-archives-2.png"
+      caption="
+        Click the '+' button to bring up the upload prompt. Then click <i>Browse...</i> and select the
+        <code>.jfr</code> file to upload. Note that the file must follow the Cryostat archive recording
+        naming convention. Mouse over the <sup>[?]</sup> tooltip on the prompt for more information.
+      "
+    %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="<i>(Optional)</i> Add metadata labels"
+      image-name="2.3.0/re-upload-a-recording-to-archives-3.png"
+      caption="
+        Click <i>Show metadata options</i> to add optional metadata labels to recording.
+        You can either add labels by clicking the <i>Add Label</i> button, or by uploading
+        a custom <code>.json</code> labels file from your local storage. A custom labels file 
+        can be downloaded alongside downloading a recording. To learn how to download a recording
+        and any associated labels, see <a href='#download-an-active-or-archived-recording'>Download and Active or Archived Recording</a>. 
+        and for more on Cryostat metadata labels, see <a href='#add-and-edit-recording-metadata-labels'>Add and Edit Recording Metadata Labels</a>.
+      "
+    %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="Upload the Recording"
+      image-name="2.3.0/re-upload-a-recording-to-archives-4.png"
+      caption="Click <i>Upload</i> and observe that the recording is now present in
+      the <i>Uploads</i> tab of the <i>Archives</i> view."
+    %}
+  </li>
+</ol>
diff --git a/version/2.3.0/guides/_subsections/snapshot-a-recording.md b/version/2.3.0/guides/_subsections/snapshot-a-recording.md
new file mode 100644
index 00000000..06632ace
--- /dev/null
+++ b/version/2.3.0/guides/_subsections/snapshot-a-recording.md
@@ -0,0 +1,54 @@
+## [Snapshot a Recording](#snapshot-a-recording)
+Snapshotting an active recording produces a new recording in the target JVM
+named `snapshot-n`, where `n` is a natural number. This snapshot contains all of
+the JFR data that was present in the target JVM at the time that the snapshot
+was taken and is in the `STOPPED` state as soon as it is created (that is, the
+snapshot will never record any further information and is fixed in size).
+This is useful when you have an ongoing, continuous recording active in a
+target application and want to preserve the specific information at a given
+point in time. If the continuous source recording is configured with a maximum
+event age or maximum recording size then the need for snapshots is more
+apparent, since without snapshotting some older data will eventually be dropped
+from the source recording and lost.
+
+<ol>
+  <li>
+    {% include_relative _subsections/common/select-target-application.md %}
+  </li>
+  <li>
+    {% capture navigate-recordings-additional-content %}
+      <p>
+        If you do not have any recordings present in the Active Recordings
+        view, follow
+        <a href="{{ page.url }}#startstop-a-recording">Start/Stop a Recording</a>
+        to create one, or select a different target application.
+      </p>
+    {% endcapture %}
+    {% include_relative _subsections/common/navigate-to-recordings.md additional-content=navigate-recordings-additional-content %}
+  </li>
+  <li>
+    {% include_relative _subsections/common/click-create.md %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="Switch to the <i>Snapshot Recording</i> tab"
+      image-name="2.3.0/snapshot-a-recording-1.png"
+      caption="
+        Switch to the <i>Snapshot Recording</i> tab and click the <i>Create</i>
+        button.
+      "
+    %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="Observe the new snapshot"
+      image-name="2.3.0/snapshot-a-recording-2.png"
+      caption="
+        After clicking the <i>Create</i> button you will be returned to the
+        Active Recordings view and the new snapshot recording will be present
+        in the table. The snapshot recording can then be treated as any other
+        active recording in the target application's JVM memory.
+      "
+    %}
+  </li>
+</ol>
diff --git a/version/2.3.0/guides/_subsections/startstop-a-recording.md b/version/2.3.0/guides/_subsections/startstop-a-recording.md
new file mode 100644
index 00000000..93aac92c
--- /dev/null
+++ b/version/2.3.0/guides/_subsections/startstop-a-recording.md
@@ -0,0 +1,111 @@
+## [Start/Stop a Recording](#startstop-a-recording)
+The first and most basic workflow is to start a Flight Recording in a target
+JVM.
+
+<ol>
+  <li>
+    {% include_relative _subsections/common/select-target-application.md %}
+  </li>
+  <li>
+    {% include_relative _subsections/common/navigate-to-recordings.md %}
+  </li>
+  <li>
+    {% include_relative _subsections/common/click-create.md %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="Configure the new recording"
+      image-name="2.3.0/startstop-a-recording-1.png"
+      text="
+      <p>
+        Enter a name for the new recording. The form will alert you if the name
+        entered has an invalid format. If the name is already in use then the
+        creation will fail and you will need to try again.
+      </p>
+      <p>
+        Select the duration of the recording. The duration can be specified in
+        seconds, minutes, or hours. If you want to record indefinitely, select the
+        <i>Continuous</i> option. You may also want to save the recording to Cryostat archive
+        storage when the recording stops with the <i>Archive on Stop</i> option.
+      </p>
+      <p>
+        Select an event template or enter a custom event definition. If you are
+        unsure which to choose, the <code>Continuous</code> template is useful for
+        always-on production monitoring with the <i>Continuous</i> recording
+        duration setting, and the <code>Profiling</code> template is useful for
+        collecting extra information for troubleshooting a specifically
+        identified problem with a fixed recording duration.
+      </p>
+      <p>
+        To learn about <i>Metadata Options</i>, see <a href='#add-and-edit-recording-metadata-labels'>Add and Edit Recording Metadata Labels</a>.
+      </p>
+      "
+    %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="<i>(Optional)</i> Adjust any <i>Advanced Options</i> for the recording"
+      image-name="2.3.0/startstop-a-recording-2.png"
+      text="
+      <p>
+        In many cases, the <i>Advanced Options</i> can be left with their
+        default values. To view and change their values, select <i>Show
+        advanced options</i> above the <i>Create</i> button. The following
+        options are configurable:
+      </p>
+      <p>
+        <i>To Disk</i>: Use this parameter to specify whether to write data to
+        your JVM container's disk while recording. By default, this parameter
+        is true.
+      </p>
+      <p>
+        <i>Maximum Size</i>: Use this parameter to specify the maximum size of
+        disk data to keep for the recording. This parameter is valid only when
+        the disk parameter is set to true. By default, the maximum size of disk
+        data isn’t limited, and this parameter is set to 0.
+      </p>
+      <p>
+        <i>Maximum Age</i>: Use this parameter to specify the maximum number of
+        seconds, minutes, or hours that events should be kept in the recording
+        before being discarded. This parameter is valid only when the disk
+        parameter is set to true, and the recording duration is not <i>Continuous</i>.
+        By default, this parameter is set to 0, which means there is no limit set.
+      </p>
+      "
+    %}
+  </li>
+  <li>
+    <summary>Click the <i>Create</i> button</summary>
+  </li>
+  <li>
+    {% capture stop-the-recording-additional-content %}
+      <p>
+        When you no longer desire for the Flight Recording to be active and
+        collecting data in your target application, select the recording from
+        the list by clicking the checkbox to the left of the recording name.
+        This will enable the <i>Stop</i> button in the toolbar. Click the
+        <i>Stop</i> button to end the data collection. 
+      </p>
+      <p>
+        If the recording has a fixed duration then it will automatically stop
+        after the target JVM measures that the duration has elapsed. If the
+        recording was created with a continuous duration then it will collect
+        data until explicitly stopped.
+      </p>
+      <p>
+        After stopping a recording it remains in the <i>Active</i> section of
+        the Recordings view. This signifies that the recording data is still
+        present in the target JVM, and not within Cryostat's storage. If the
+        target JVM crashes, is killed, or the process otherwise restarts, then
+        the recording data will be lost. To learn how to persist the Flight
+        Recording data, continue on to
+        <a href="{{ page.url }}#archive-a-recording">Archive a Recording</a>.
+      </p>
+    {% endcapture %}
+    {% include howto_step.html
+      summary="Stop the recording"
+      image-name="2.3.0/startstop-a-recording-3.png"
+      text=stop-the-recording-additional-content
+    %}
+  </li>
+</ol>
diff --git a/version/2.3.0/guides/_subsections/store-credentials.md b/version/2.3.0/guides/_subsections/store-credentials.md
new file mode 100644
index 00000000..af9818b4
--- /dev/null
+++ b/version/2.3.0/guides/_subsections/store-credentials.md
@@ -0,0 +1,71 @@
+## [Store Credentials](#store-credentials)
+If you have Java Management Extensions (JMX) or HTTP authentication enabled on your containerized JVMs, Cryostat will prompt you to enter your credentials before it can access the JDK flight recordings on your target JVMs. You can <a href="#configure-credentials-storage">Configure Credentials Storage</a> and choose whether these credentials are held in browser memory for the current session only, or if they are uploaded to Cryostat's credentials keyring.
+
+If you intend to use Cryostat <a href="#create-an-automated-rule">Automated Rules</a>, then you should store target application credentials in Cryostat's credentials keyring, which is outlined below. Even if you do not use Automated Rules, you may find it more convenient to store credentials in the keyring. This way, the Cryostat web UI does not need to prompt you for credentials when you manually access JFR information about target applications.
+
+<ol>
+  <li>
+    {% include howto_step.html
+      summary="Navigate to the Security tab"
+      image-name="2.3.0/navigate-to-security.png"
+      text="
+        First, navigate to the <i>Security</i> tab. The Store Credentials table lists all credentials in Cryostat's keyring. Click <i>Add</i> to define a new credential.
+      "
+    %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="Enter your credentials"
+      image-name="2.3.0/store-credentials-1.png"
+      text="
+          A modal will appear. You can select a target JVM to view its properties.
+          These properties can be used to define a <i>matchExpression</i> that tests whether this credential should apply to the selected target JVM.
+          This is the same kind of <i>matchExpression</i> as those used by <a href='#create-an-automated-rule'>Automated Rules</a>, so you may find it useful to reuse the same
+          <i>matchExpressions</i> from your rule definitions for your credential definitions.
+          The <i>matchExpression</i>, username, and password fields are all required.
+      "
+    %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="Test your credentials"
+      image-name="2.3.0/store-credentials-3.png"
+      text="
+      Navigate to the <b>Test</b> tab to use the <b>Credential Test Table</b> to check if the entered credential is valid for the matched targets.
+      <br><br>
+
+      You can individually test each target or bulk test all targets at the same time. The <b>Status</b> column will report the following test status:
+
+      <ol>
+        <li>
+            <b>Valid:</b> valid credential for the target JVM.
+        </li>
+        <li>
+            <b>Invalid:</b> invalid credential for the target JVM.
+        </li>
+        <li>
+            <b>Not applicable:</b> JMX authentication is not enabled on the target JVM.
+        </li>
+      </ol>  
+      "
+    %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="(Alternative to Steps 1 and 2) Store Credentials when connecting to a target JVM"
+      image-name="2.3.0/navigate-to-recordings-1.png"
+      text="
+        Alternatively, credentials may also be stored if you navigate to either the <i>Recordings</i> tab or the <i>Events</i> tab and select a target JVM with authentication enabled. The authentication form will appear, prompting you to enter your credentials. If you have <a href='#configure-credentials-storage'>configured Backend Credentials Storage</a>, then a new credential definition with the provided username and password will be stored for this specific target application in the Cryostat keyring. If you have configured credentials with the <i>Session</i> option then these entered credentials will <i>not</i> be stored in the Cryostat keyring.
+      "
+    %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="View your stored credentials"
+      image-name="2.3.0/store-credentials-2.png"
+      text="
+        The <i>Store Credentials</i> table will update with a row for each of the credentials you have stored in the keyring. The <i>matchExpression</i> is visible along with a count of the number of known target applications that these credentials will apply to. You can expand the row to display a list of those matched target applications. For security reasons it is not possible to view the stored username and password associated with a credential definition in the keyring.
+      "
+    %}
+  </li>
+</ol>
diff --git a/version/2.3.0/guides/_subsections/upload-an-automated-rule.md b/version/2.3.0/guides/_subsections/upload-an-automated-rule.md
new file mode 100644
index 00000000..e507b879
--- /dev/null
+++ b/version/2.3.0/guides/_subsections/upload-an-automated-rule.md
@@ -0,0 +1,48 @@
+## [Upload an Automated Rule](#upload-an-automated-rule)
+
+Instead of stepping through the form every time, you can also edit your Automated Rule definition files (JSON format) locally and quickly upload them.
+
+Below is an example of a rule file content:
+
+{% highlight json %}
+{
+  "name":"my_automated_rule",
+  "description":"This is an example automated rule.",
+  "matchExpression":"target.alias == 'io.cryostat.Cryostat'",
+  "eventSpecifier":"template=Continuous,type=TARGET",
+  "archivalPeriodSeconds":285,
+  "initialDelaySeconds":60,
+  "preservedArchives":10,
+  "maxAgeSeconds":300,
+  "maxSizeBytes":0,
+  "enabled":true
+}
+{% endhighlight %}
+
+<ol>
+  <li>
+      {% include howto_step.html
+        summary="Open <i>Automated Rules</i> upload prompt"
+        image-name="2.3.0/upload-an-automated-rule-1.png"
+        caption="Click on upload icon button to open upload prompt."
+      %}  
+  </li>
+  <li>
+      {% include howto_step.html
+        summary="Attach a rule file by dragging & dropping or clicking <i>Browse...</i>."
+        image-name="2.3.0/upload-an-automated-rule-2.png"
+        caption="Select a rule file to upload."
+      %}  
+  </li>
+  <li>
+    <summary>Click <i>Submit</i> button to upload.</summary>
+  </li>
+  <li>
+      {% include howto_step.html
+        summary="Observe the new rule in the <i>Automated Rules</i> table"
+        image-name="2.3.0/create-an-automated-rule-5.png"
+        caption="
+          The new rule will appear in the <i>Automated Rules</i> table."
+      %}  
+  </li>
+</ol>
diff --git a/version/2.3.0/guides/_subsections/use-topology-view.md b/version/2.3.0/guides/_subsections/use-topology-view.md
new file mode 100644
index 00000000..1d0c2529
--- /dev/null
+++ b/version/2.3.0/guides/_subsections/use-topology-view.md
@@ -0,0 +1,113 @@
+## [Use Topology View](#use-topology-view)
+
+The *Topology View* provides a visual presentation of all the discovered JVM applications, and all their associated resources. It also allows users to perform actions on one or multiple targets.
+
+{% include_relative _subsections/common/navigate-to-topology.md %}
+
+### [View all target JVMs](#view-all-target-jvms)
+
+<ol>
+    {% capture topology-graphview-guide-text %}
+    By default, an interactive <b>Graph View</b> of target JVMs (<i>nodes</i>) are shown nested within their associated groups (<i>surrounding lines</i>), for example, Pods, or Realms (i.e. discovery mechanisms to discover Java Applications, such as Kubernetes API, JDP or <a href="#using-the-cryostat-agent">Cryostat Agent</a>). 
+    <br><br>
+
+    You can drag target nodes/groups or use the bottom control bar to adjust the graph. For example, zoom out or fit all nodes into view. A toolbar is also available to allow further customization:
+
+    <ol>
+        <li>
+            <b>Display Options:</b> adjust how the nodes and groups are displayed, for example, whether to show connection URL.
+        </li>
+        <li>
+            <b>Filters:</b> determine which targets or groups to show.
+        </li>
+        <li>
+            <b>Search bar:</b> find a target using <b>Match Expression</b>. The matched targets will be highlighted.
+        </li>
+    </ol>
+    {% endcapture %}
+    {% capture topology-listview-guide-text %}
+    <i>Topology View</i> also supports <b>List View</b> mode, where your JVM targets and their groups are shown as expandable rows. 
+    <br><br>
+    Click the List icon on the toolbar to switch to <b>List View</b>. Expand each row to see nested groups or targets. All the above features of the toolbar can also be used to customize your view.
+    {% endcapture %}
+
+    {% include howto_step.html
+      summary="View JVM applications with Graph View"
+      image-name="2.3.0/topology-1.png"
+      caption="View JVM applications with topology Graph view."
+      text=topology-graphview-guide-text
+    %}
+    {% include howto_step.html
+      summary="View JVM applications with List View"
+      image-name="2.3.0/topology-2.png"
+      caption="View JVM applications with Topology List view."
+      text=topology-listview-guide-text
+    %}
+</ol>
+
+### [View JVM details and resources](#view-jvm-details-and-resources)
+<ol>
+
+    {% capture sidebar-detail-guide-text %}
+    In <b>Graph View</b>, select a target JVM node to open the drawer panel that shows its details, for example, <code>Connection URL</code>, <code>Labels</code> and <code>Annotations</code>.
+    <br><br>
+    In <b>List View</b>, expand each row to open nested groups until you find the target. Expand the target to see its details and associated resources.
+
+    {% endcapture %}
+
+    {% capture sidebar-resource-guide-text %}
+        Navigate to the <b>Resources</b> tab to see the target’s associated resources. There are 2 tables:
+    <ol>
+        <li>
+        
+        <b>Owned Resources:</b> Resources that the JVM owns (i.e. <a href="#startstop-a-recording">Active Recordings</a>, <a href="#viewing-archived-recordings">Archived Recordings</a>, <a href="#download-edit-and-upload-a-customized-event-template">Event Templates</a> and <a href="#download-edit-and-upload-a-customized-event-template">Event Types</a>).</li>
+        <li>
+        <b>Related Resources:</b> Resources that are tied to the JVM by <b>Match Expression</b> (i.e. <a href="#create-an-automated-rule">Automated Rules</a> and <a href="#store-credentials">Credentials</a>).
+        </li>
+    </ol>
+
+    In the <b>Graph View</b>, each target node also has an indicator that tells whether the target has any running <b>Active Recordings</b>. The same information can be seen within the <b>Owned Resources</b> table by expanding the <b>Active Recordings</b> row.
+
+    {% endcapture %}
+
+    {% include howto_step.html
+      summary="View JVM details"
+      image-name="2.3.0/topology-3.png"
+      caption="View target JVM’s details with drawer panel."
+      text=sidebar-detail-guide-text
+    %}
+    {% include howto_step.html
+      summary="View JVM's associated resources"
+      image-name="2.3.0/topology-4.png"
+      caption="View JVM's associated resources with drawer panel."
+      text=sidebar-resource-guide-text
+    %}
+</ol>
+
+### [Perform actions on JVMs](#perform-actions-on-jvms)
+
+<ol>
+    {% capture single-action-guide-text %}
+    The details panel for each target JVM supports performing simple actions on the JVM. Click the <b>Actions</b> menu to show available options.
+    <br><br>
+    For example, select <b>View Recordings</b> to be redirected to the <i>Recordings</i> view for the target JVM, where you can view and manage <a href="#startstop-a-recording">Active Recordings</a>.
+    {% endcapture %}
+    {% capture bulk-action-guide-text %}
+    The details panel also supports performing actions on multiple target JVMs. Select a group of targets, for example, a Pod. A drawer panel will appear to show the group details. Select <b>Actions</b> menu to show available options.
+    <br><br>
+    For example, select <b>Start recording</b> to start a recording on all target JVMs under this group. <b>Caution:</b> repeatedly selecting this option will cause the recording to be restarted and may result in recording data loss.
+    {% endcapture %}
+    
+    {% include howto_step.html
+      summary="Perform actions for a single JVM"
+      image-name="2.3.0/topology-5.png"
+      caption="Perform actions on an individual JVM."
+      text=single-action-guide-text
+    %}
+    {% include howto_step.html
+      summary="Perform actions for a group of JVMs"
+      image-name="2.3.0/topology-6.png"
+      caption="Perform actions on a group of JVMs."
+      text=bulk-action-guide-text
+    %}
+</ol>
diff --git a/version/2.3.0/guides/_subsections/using-the-cryostat-agent.md b/version/2.3.0/guides/_subsections/using-the-cryostat-agent.md
new file mode 100644
index 00000000..ea29f931
--- /dev/null
+++ b/version/2.3.0/guides/_subsections/using-the-cryostat-agent.md
@@ -0,0 +1,19 @@
+## [Using the Cryostat Agent](#using-the-cryostat-agent)
+
+The Cryostat Agent is a new component of Cryostat, implemented as a Java Instrumentation Agent, which acts as a plugin for applications running on the JVM. Prior to the Agent, Cryostat extracted data from the JVM by initiating a connection over JMX. It then fetches the data from JFR and pulls it over the network back toward the Cryostat to be accessible to end users.
+
+The Agent works differently. It is responsible for fetching data from the JVM and sending it back to Cryostat over HTTP. The Agent works by looking for data within itself and the application it is plugged into. The Cryostat Agent locates Cryostat applications running on the network and it is able to initiate a connection with those applications. It is also able to communicate back to Cryostat about the Cryostat Agent and how to reach it. The Cryostat Agent also pushes its own Java Flight Recorder (JFR) data back to Cryostat by first initiating a network connection with Cryostat, which then analyzes and saves the data to makes it accessible to end users.
+
+The programming interfaces for Cryostat and its Agent are designed to implement Cryostat's specific feature set, rather than being generalized and flexible like JMX. The benefit of this is that the security considerations are easier to understand and model, but choosing to use the Cryostat Agent over JMX may also forego the ability to interoperate with other JMX tooling such as JDK Mission Control, visualvm, jconsole, hawtio, etc.
+
+<ol>
+    <li>The Cryostat Agent retrieves a wide range of information from those Cryostat applications such as memory usage, CPU utilization, etc. </li>
+    <li>The Cryostat analyzes these collected data to identify problems that might be affecting the application’s performance.</li>
+    <li>The Agent is a third-party Java Instrumentation Agent for developers which can be installed on the target JVM program through the command-line arguments or directly attaching to the running JVM instance.</li>
+    <li>The Agent is foreign code for developers to audit and inspect before including it in their application builds. It is a small amount of code to inspect and likely easier to trust than JMX.</li>
+    <li>Unlike JMX, JVM doesn’t come with the Agent, so developers are required to add the Cryostat Agent to their application builds, then rebuild and deploy the application.</li>
+    <li>Developers need to specify the JFR configuration in advance before the attached application starts. The configuration tells the Agent what kind of JFR data to collect and how often to send that data to Cryostat. This is necessary for Cryostat to save the data in storage for the user to analyze. At this point in time, the Agent does not allow for dynamically turning on and off JFR, and the data it collects will always be sent to Cryostat on a fixed consistent schedule.</li>
+    <li>Once the Agent has been installed or attached to the running JVM instance, it can begin collecting data and sending it to Cryostat for analysis.</li>
+</ol>
+
+For instructions on how to install the Cryostat Agent into your applications, [check the Setup section in Getting Started](/get-started/#using-the-cryostat-agent).
diff --git a/version/2.3.0/guides/_subsections/view-archived-recordings.md b/version/2.3.0/guides/_subsections/view-archived-recordings.md
new file mode 100644
index 00000000..7398f202
--- /dev/null
+++ b/version/2.3.0/guides/_subsections/view-archived-recordings.md
@@ -0,0 +1,73 @@
+## [Viewing Archived Recordings](#viewing-archived-recordings)
+There are several ways to view <i>Archived Recordings</i>. The first method is to navigate to the Archived Recordings tab. See <a href="#archive-a-recording">Archive a Recording</a>.
+
+### [All-Targets Archived Recordings View](#all-targets-archived-recordings-view)
+
+The second method is to navigate to the <i>All-Targets</i> archived recording view within the <i>Archives</i> tab on Cryostat console sidebar.
+
+The All-Targets view gathers all of Cryostat's discovered target JVM applications into one section for ease of access. Here, we are able to interact with any archived recordings that have been saved from a source target by opening a target's nested recordings table. 
+
+<ol>
+  <li>
+    {% capture navigate-to-all-targets-include-text %}
+    <p>
+        The option to automatically hide all targets with zero archived recordings is on by default and can be toggled. Targets can also be filtered in the search bar.
+    </p>
+    {% endcapture %}
+    {% include howto_step.html
+        summary="Navigate to the All-Targets Archived Recordings view"
+        image-name="2.3.0/navigate-to-all-targets.png"
+        caption="Click on the <i>Archives</i> tab on the sidebar, and the first tab should automatically be selected as the <i>All Targets</i> Archives view."
+        text=navigate-to-all-targets-include-text
+    %}
+
+  </li>
+  <li>
+    {% capture click-on-source-target-include-text %}
+    {% endcapture %}
+    {% include howto_step.html
+        summary="Select a source target application"
+        image-name="2.3.0/view-archives-recordings-1.png"
+        caption="Clicking the dropdown arrow next to a target name will list any archived recordings originating from that source target."
+        text=click-on-source-target-include-text
+    %}
+  </li>
+</ol>
+
+### [All-Archives Archived Recordings View](#all-archives-archived-recordings-view)
+
+The third method is to navigate to the <i>All-Archives</i> archived recording view within the <i>Archives</i> tab on Cryostat console sidebar. 
+
+The All-Archives view is a view which queries Cryostat's internal storage for any created archived recordings and the directories that contain them. Here, we are able to interact with any archived recordings that have been saved into storage by opening a nested recordings table within each directory.
+
+This view is used to save any lost archived recordings in case any target JVM restarts or exits. It will be empty if no recordings are currently saved to storage.
+
+<ol>
+  <li>
+    {% capture navigate-to-all-archives-include-text %}
+    <p>
+      Directories can be filtered in the search bar.
+    </p>
+    {% endcapture %}
+    {% include howto_step.html
+        summary="Navigate to the All-Archives Archived Recordings view"
+        image-name="2.3.0/navigate-to-all-archives.png"
+        caption="Click on the <i>Archives</i> tab on the sidebar, and select the second tab titled <i>All Archives</i>."
+        text=navigate-to-all-archives-include-text
+    %}
+
+  </li>
+  <li>
+      {% capture click-on-directory-include-text %}
+    <p>
+      A directory name is related to its corresponding source target's serviceUrl. Mousing over the tooltip, we can also see a Cryostat generated hash ID for that target.
+    </p>
+    {% endcapture %}
+    {% include howto_step.html
+        summary="Select an archives directory"
+        image-name="2.3.0/view-archives-recordings-2.png"
+        caption="Clicking the dropdown arrow next to a directory name will list any archived recordings within that directory in the Cryostat storage. Again, we can interact with any archived recordings in a similar fashion as before."
+        text=click-on-directory-include-text
+    %}
+  </li>
+</ol>
diff --git a/version/2.3.0/guides/_subsections/view-in-grafana.md b/version/2.3.0/guides/_subsections/view-in-grafana.md
new file mode 100644
index 00000000..128af5b8
--- /dev/null
+++ b/version/2.3.0/guides/_subsections/view-in-grafana.md
@@ -0,0 +1,79 @@
+## [View a Recording in Grafana](#view-a-recording-in-grafana)
+Cryostat provides integration with Grafana to plot curated time series
+metrics from a recording. By selecting _View in Grafana_ on either an
+_Active_ or _Archived Recording_, Cryostat uploads your recording to
+a custom Grafana Data Source, and launches Grafana in a new browser
+tab. If Cryostat was installed to a Kubernetes/OpenShift cluster using the
+Cryostat Operator, you must retrieve the credentials generated
+by the operator in order to log into Grafana. These credentials are stored
+in a Kubernetes Secret. Once logged in, navigate to the dashboard titled
+_Dashboard_. You will see a variety of metrics plotted from your recording.
+
+<ol>
+  <li>
+    <details>
+      <summary>Retrieve the Grafana credentials</summary>
+      <figure>
+        {% highlight bash %}
+CRYOSTAT_NAME=$(kubectl get cryostat -o jsonpath='{$.items[0].metadata.name}')
+# Username
+kubectl get secret ${CRYOSTAT_NAME}-grafana-basic -o jsonpath='{$.data.GF_SECURITY_ADMIN_USER}' | base64 -d
+# Password
+kubectl get secret ${CRYOSTAT_NAME}-grafana-basic -o jsonpath='{$.data.GF_SECURITY_ADMIN_PASSWORD}' | base64 -d
+        {% endhighlight %}
+        <figcaption>
+          If you installed Cryostat into Kubernetes or OpenShift using the
+          Cryostat Operator, use <i>kubectl</i> or <i>oc</i> to get the
+          generated username and password for Grafana and save them for later.
+        </figcaption>
+      </figure>
+    </details>
+  </li>
+  <li>
+    {% include_relative _subsections/common/select-target-application.md %}
+  </li>
+  <li>
+    {% include_relative _subsections/common/navigate-to-recordings.md %}
+  </li>
+  <li>
+    {% include_relative _subsections/common/select-a-recording.md
+      select-a-recording-caption="
+        If you do not have any recordings present in the Active Recordings
+        view, follow
+        <a href='#startstop-a-recording'>Start/Stop a Recording</a>
+        to create one, or select a different target application. 
+        You may also select an archived recording to view in Grafana.
+      "
+    %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="Select <i>View in Grafana...</i>"
+      image-name="2.3.0/view-in-grafana-1.png"
+      caption="
+        Select <i>View in Grafana...</i> from the recording's overflow
+        menu.
+      "
+    %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="Log into Grafana"
+      image-name="2.3.0/view-in-grafana-2.png"
+      caption="
+        Use the credentials retrieved in step 1 to log into the Grafana
+        web client.
+      "
+    %}
+  </li>
+  <li>
+    {% include howto_step.html
+      summary="View and interact with data from your recording"
+      image-name="2.3.0/view-in-grafana-4.png"
+      caption="
+        Observe the plotted time series data from curated metrics in your
+        recording. Select time ranges to zoom into the data.
+      "
+    %}
+  </li>
+</ol>
diff --git a/version/2.3.0/guides/index.md b/version/2.3.0/guides/index.md
new file mode 100644
index 00000000..0677e302
--- /dev/null
+++ b/version/2.3.0/guides/index.md
@@ -0,0 +1,57 @@
+---
+layout: guides
+title: Guides on Using Cryostat
+---
+
+This section explains some common Cryostat features by example, illustrating
+common actions and workflows of interest and why they are useful.
+
+* auto-gen TOC:
+{:toc}
+
+{% include_relative _subsections/navigate-the-dashboard.md %}
+
+{% include_relative _subsections/use-topology-view.md %}
+
+{% include_relative _subsections/create-a-custom-target.md %}
+
+{% include_relative _subsections/using-the-cryostat-agent.md %}
+
+{% include_relative _subsections/startstop-a-recording.md %}
+
+{% include_relative _subsections/snapshot-a-recording.md %}
+
+{% include_relative _subsections/archive-a-recording.md %}
+
+{% include_relative _subsections/view-archived-recordings.md %}
+
+{% include_relative _subsections/download-an-active-or-archived-recording.md %}
+
+{% include_relative _subsections/re-upload-a-recording-to-archives.md %}
+
+{% include_relative _subsections/download-edit-and-upload-a-customized-event-template.md %}
+
+{% include_relative _subsections/edit-template-with-jmc.md %}
+
+{% include_relative _subsections/view-in-grafana.md %}
+
+{% include_relative _subsections/automated-analysis.md %}
+
+{% include_relative _subsections/add-and-edit-recording-metadata-labels.md %}
+
+{% include_relative _subsections/store-credentials.md %}
+
+{% include_relative _subsections/configure-credentials-storage.md %}
+
+{% include_relative _subsections/add-a-trusted-certificate.md %}
+
+{% include_relative _subsections/create-an-automated-rule.md %}
+
+{% include_relative _subsections/upload-an-automated-rule.md %}
+
+{% include_relative _subsections/download-an-automated-rule.md %}
+
+{% include_relative _subsections/configure-graphical-notifications.md %}
+
+[comment]: # ## [Analyze Recordings Online](#analyze-recordings-online)
+[comment]: # TODO