diff --git a/reference_codegen/field.mdx.mustache b/reference_codegen/field.mdx.mustache
index 178b347f2..019d1b4c8 100644
--- a/reference_codegen/field.mdx.mustache
+++ b/reference_codegen/field.mdx.mustache
@@ -1,3 +1,4 @@
+
 ## `{{ alias }}`
 
 <Field
diff --git a/reference_codegen/generate.js b/reference_codegen/generate.js
index 7dd8ca41e..37cb48aa7 100644
--- a/reference_codegen/generate.js
+++ b/reference_codegen/generate.js
@@ -24,7 +24,15 @@ const fieldTemplate = fs.readFileSync(
   "utf8"
 );
 
-function renderSubsystemTemplate(view) {
+function renderSubsystemTemplate(view, helpAll) {
+  view.related_subsystems = (
+    (helpAll.name_to_goal_info[view.scope] || {}).consumed_scopes || []
+  )
+    .filter((str) => str !== "" && str !== view.scope)
+    .sort()
+    .map((str) => {
+      return { scope: str, is_goal: helpAll.scope_to_help_info[str].is_goal };
+    });
   return Mustache.render(subsystemTemplate, view, { option: optionTemplate });
 }
 
@@ -33,21 +41,23 @@ function renderTargetTemplate(view) {
 }
 
 function convertDefault(val, type) {
+  if (val === true) return "True";
+  if (val === false) return "False";
+  if (type === "float" && Number.isInteger(val)) return String(val) + ".0";
   if (Array.isArray(val) || typeof val === "object") {
     if (val && Object.keys(val).length === 1) {
-      return JSON.stringify(val, Object.keys(val).sort(), 2);
+      val = JSON.stringify(val, Object.keys(val), 2).replace(/\n/g, "\\n");
+    } else if (val === null) return "None";
+    else {
+      val = JSON.stringify(val, null, 2).replace(/\n/g, "\\n");
     }
-    if (val === null) return "None";
-    return JSON.stringify(val, null, 2).replace(/\n/g, "\\n");
+  } else {
+    val = String(val).replace(/\\n/g, "\\\\n");
   }
-  if (val === true) return "True";
-  if (val === false) return "False";
-  if (type === "float" && Number.isInteger(val)) return String(val) + ".0";
 
-  return String(val)
+  return val
     .replace(buildroot, "<buildroot>")
-    .replace(cachedir, "$XDG_CACHE_HOME")
-    .replace(/\\n/g, "\\\\n");
+    .replace(cachedir, "$XDG_CACHE_HOME");
 }
 
 function escape(val) {
@@ -72,7 +82,12 @@ function convertDescription(val) {
   let backtickedBlock = false;
   val.split("\n").forEach((line) => {
     // If we're starting a tabbed block
-    if (!tabbedBlock && line.startsWith("    ") && !backtickedBlock) {
+    if (
+      !tabbedBlock &&
+      !backtickedBlock &&
+      line.startsWith("    ") &&
+      lines[lines.length - 1] == ""
+    ) {
       tabbedBlock = true;
       if (!line.startsWith("    ```")) {
         lines.push("```");
@@ -106,7 +121,7 @@ function convertDescription(val) {
 
   if (tabbedBlock) lines.push("```");
 
-  return lines.join("\n").replace("\n\n```", "\n```");
+  return lines.join("\n").replaceAll("\n\n```", "\n```");
 }
 
 let buildroot = "";
@@ -140,16 +155,19 @@ Object.entries(helpAll.name_to_target_type_info).forEach(([name, info]) => {
   });
 });
 
-fs.mkdirSync(reference_dir);
-process.chdir(reference_dir);
+fs.mkdirSync(reference_dir, { recursive: true });
+process.chdir(reference_dir, { recursive: true });
+fs.rmSync("goals", { recursive: true, force: true });
 fs.mkdirSync("goals");
+fs.rmSync("subsystems", { recursive: true, force: true });
 fs.mkdirSync("subsystems");
+fs.rmSync("targets", { recursive: true, force: true });
 fs.mkdirSync("targets");
 
 // Global Options
 fs.writeFileSync(
   "global-options.mdx",
-  renderSubsystemTemplate(helpAll["scope_to_help_info"][""])
+  renderSubsystemTemplate(helpAll["scope_to_help_info"][""], helpAll)
 );
 
 // Subsystems
@@ -160,7 +178,7 @@ Object.entries(helpAll.scope_to_help_info).forEach(([scope, info]) => {
   const parent = info.is_goal ? "goals" : "subsystems";
   fs.writeFileSync(
     path.join(parent, `${info.scope}.mdx`),
-    renderSubsystemTemplate(info)
+    renderSubsystemTemplate(info, helpAll)
   );
 });
 
@@ -178,13 +196,13 @@ Object.entries(helpAll.name_to_target_type_info).forEach(([name, info]) => {
 // `_category_.json` files
 fs.writeFileSync(
   "goals/_category_.json",
-  '{\n  "label": "Goals",\n  "link": {\n    "type": "generated-index",\n    "slug": "/reference/goals",    "title": "Goals"\n  }}\n'
+  '{\n  "label": "Goals",\n  "link": {\n    "type": "generated-index",\n    "slug": "/reference/goals",\n    "title": "Goals"\n  }\n}\n'
 );
 fs.writeFileSync(
   "subsystems/_category_.json",
-  '{\n  "label": "Subsystems",\n  "link": {\n    "type": "generated-index",\n    "slug": "/reference/subsystems",    "title": "Subsystems"\n  }}\n'
+  '{\n  "label": "Subsystems",\n  "link": {\n    "type": "generated-index",\n    "slug": "/reference/subsystems",\n    "title": "Subsystems"\n  }\n}\n'
 );
 fs.writeFileSync(
   "targets/_category_.json",
-  '{\n  "label": "Targets",\n  "link": {\n    "type": "generated-index",\n    "slug": "/reference/targets",\n    "title": "Targets"\n  }}\n'
+  '{\n  "label": "Targets",\n  "link": {\n    "type": "generated-index",\n    "slug": "/reference/targets",\n    "title": "Targets"\n  }\n}\n'
 );
diff --git a/reference_codegen/subsystem.mdx.mustache b/reference_codegen/subsystem.mdx.mustache
index b3762b409..3cfd4d1f5 100644
--- a/reference_codegen/subsystem.mdx.mustache
+++ b/reference_codegen/subsystem.mdx.mustache
@@ -6,8 +6,8 @@ import Option from "@site/src/components/reference/Option";
 import styles from "@site/src/components/reference/styles.module.css";
 
 ---
-
 {{#is_goal}}
+
 ```
 pants {{scope}} [args]
 ```
@@ -15,41 +15,51 @@ pants {{scope}} [args]
 
 {{{description}}}
 
-Backend: <span className="color--primary">{{provider}}</span>
-Config section: <span className="color--primary">[{{scope}}{{^scope}}GLOBAL{{/scope}}]</span>
+Backend: <span className="color--primary">`{{provider}}`</span>
+
+Config section: <span className="color--primary">`[{{scope}}{{^scope}}GLOBAL{{/scope}}]`</span>
 
 <span className={styles.options}>
 
 ## Basic options
-
 {{#basic}}
 {{> option}}
 {{/basic}}
 {{^basic}}
+
 None
 {{/basic}}
 
 ## Advanced options
-
 {{#advanced}}
 {{> option}}
 {{/advanced}}
 {{^advanced}}
+
 None
 {{/advanced}}
 
 ## Deprecated options
-
 {{#deprecated}}
 {{> option}}
 {{/deprecated}}
 {{^deprecated}}
+
 None
 {{/deprecated}}
 
-{{#comma_separated_consumed_scopes}}
 ## Related subsystems
-{{comma_separated_consumed_scopes}}
-{{/comma_separated_consumed_scopes}}
 
-</span>
\ No newline at end of file
+{{#related_subsystems}}
+{{#is_goal}}
+- [{{scope}}](../goals/{{scope}}.mdx)
+{{/is_goal}}
+{{^is_goal}}
+- [{{scope}}](../subsystems/{{scope}}.mdx)
+{{/is_goal}}
+{{/related_subsystems}}
+{{^related_subsystems}}
+None
+{{/related_subsystems}}
+
+</span>
diff --git a/reference_codegen/target.mdx.mustache b/reference_codegen/target.mdx.mustache
index 227405c12..982b1a7a4 100644
--- a/reference_codegen/target.mdx.mustache
+++ b/reference_codegen/target.mdx.mustache
@@ -19,4 +19,4 @@ Backend: <span className="color--primary">`{{ provider }}`</span>
 {{> field}}
 {{/fields}}
 
-</span>
\ No newline at end of file
+</span>