diff --git a/docs/esm.md b/docs/esm.md
index df952136..94d6a7b4 100644
--- a/docs/esm.md
+++ b/docs/esm.md
@@ -33,7 +33,7 @@ Here's a high level overview of ESM/CJS interoperability:
 
 ## Creating an ESM plugin
 
-To generate a new ESM plugin from the [hello-world-esm template](https://github.com/oclif/hello-world-esm) run the `oclif generate` command and select `ESM` when it prompts you to select a module type:
+To generate a new ESM plugin, run the `oclif generate` command and select `ESM` when it prompts you to select a module type:
 
 ```
 $ npx oclif generate my-esm-plugin
diff --git a/docs/examples.md b/docs/examples.md
index 3e5dd1ab..2bfe5263 100644
--- a/docs/examples.md
+++ b/docs/examples.md
@@ -4,7 +4,7 @@ title: Examples
 
 Here are some examples to get an idea of how to use oclif in various setups.
 
-* [Hello World Example (CommonJS)](https://github.com/oclif/hello-world)
-* [Hello World Example (ESM)](https://github.com/oclif/hello-world-esm)
+* [CommonJS plugin](https://github.com/oclif/test-plugin-cjs-1)
+* [ESM plugin](https://github.com/oclif/plugin-test-esm-1)
 * [Using esbuild](https://github.com/oclif/plugin-test-esbuild)
 * [Hook-only plugin](https://github.com/oclif/plugin-not-found)
diff --git a/docs/features.md b/docs/features.md
index 562b571e..f793162f 100644
--- a/docs/features.md
+++ b/docs/features.md
@@ -20,11 +20,11 @@ Run a single command to scaffold out a fully functional CLI and get started quic
 
 ### Testing Helpers
 
-We've put a lot of work into making commands easily testable and easy to mock out stdout/stderr. The generator will automatically create [scaffolded tests](https://github.com/oclif/hello-world/blob/main/test/commands/hello/world.test.ts).
+We've put a lot of work into making commands easily testable and easy to mock out stdout/stderr. The generator will automatically create scaffolded tests.
 
 ### Auto-documentation
 
-By default you can pass `--help` to the CLI to get help such as flag options and argument information. This information is also automatically placed in the README whenever the npm package of the CLI is published. See the [hello-world CLI example](https://github.com/oclif/hello-world)
+By default you can pass `--help` to the CLI to get help such as flag options and argument information. This information is also automatically placed in the README whenever the npm package of the CLI is published. See the [plugin-plugins](https://github.com/oclif/plugin-plugins) as an example.
 
 ### Plugins
 
diff --git a/docs/generator_commands.md b/docs/generator_commands.md
index ec5b325e..98ad014c 100644
--- a/docs/generator_commands.md
+++ b/docs/generator_commands.md
@@ -12,9 +12,9 @@ Generate a new CLI
 
 ```
 USAGE
-  $ oclif generate NAME [-y] [--author <value>] [--bin <value>] [--description <value>] [--license <value>]
-    [--module-type CommonJS|ESM] [--name <value>] [--owner <value>] [--package-manager npm|yarn] [--repository <value>]
-    [-d <value>]
+  $ oclif generate NAME [--author <value>] [--bin <value>] [--description <value>] [--license <value>]
+    [--module-type CommonJS|ESM] [--name <value>] [--owner <value>] [--package-manager npm|yarn|pnpm] [--repository
+    <value>] [-d <value>] [-y]
 
 ARGUMENTS
   NAME  Directory name of new project.
@@ -32,15 +32,18 @@ FLAGS
       --owner=<value>             Supply answer for prompt: Who is the GitHub owner of repository
                                   (https://github.com/OWNER/repo)
       --package-manager=<option>  Supply answer for prompt: Select a package manager
-                                  <options: npm|yarn>
+                                  <options: npm|yarn|pnpm>
       --repository=<value>        Supply answer for prompt: What is the GitHub name of repository
                                   (https://github.com/owner/REPO)
 
 DESCRIPTION
   Generate a new CLI
 
-  This will clone the template repo and update package properties. For CommonJS, the 'oclif/hello-world' template will
-  be used and for ESM, the 'oclif/hello-world-esm' template will be used.
+  This will generate a fully functional oclif CLI that you can build on. It will prompt you for all the necessary
+  information to get started. If you want to skip the prompts, you can pass the --yes flag to accept the defaults for
+  all prompts. You can also pass individual flags to set specific values for prompts.
+
+  Head to oclif.io/docs/introduction to learn more about building CLIs with oclif.
 
 EXAMPLES
   Generate a new CLI with prompts for all properties
@@ -60,7 +63,7 @@ EXAMPLES
     $ oclif generate my-cli --module-type CommonJS --author "John Doe" --yes
 ```
 
-_See code: [src/commands/generate.ts](https://github.com/oclif/oclif/blob/v4.6.0/src/commands/generate.ts)_
+_See code: [src/commands/generate.ts](https://github.com/oclif/oclif/blob/4.10.1/src/commands/generate.ts)_
 
 ## `oclif generate command NAME`
 
@@ -68,7 +71,7 @@ Add a command to an existing CLI or plugin.
 
 ```
 USAGE
-  $ oclif generate command NAME [-y] [--commands-dir <value>] [--force]
+  $ oclif generate command NAME [--commands-dir <value>] [--force]
 
 ARGUMENTS
   NAME  name of command
@@ -81,7 +84,7 @@ DESCRIPTION
   Add a command to an existing CLI or plugin.
 ```
 
-_See code: [src/commands/generate/command.ts](https://github.com/oclif/oclif/blob/v4.6.0/src/commands/generate/command.ts)_
+_See code: [src/commands/generate/command.ts](https://github.com/oclif/oclif/blob/4.10.1/src/commands/generate/command.ts)_
 
 ## `oclif generate hook NAME`
 
@@ -89,7 +92,7 @@ Add a hook to an existing CLI or plugin.
 
 ```
 USAGE
-  $ oclif generate hook NAME [-y] [--event <value>] [--force]
+  $ oclif generate hook NAME [--event <value>] [--force]
 
 ARGUMENTS
   NAME  Name of hook (snake_case).
@@ -102,4 +105,4 @@ DESCRIPTION
   Add a hook to an existing CLI or plugin.
 ```
 
-_See code: [src/commands/generate/hook.ts](https://github.com/oclif/oclif/blob/v4.6.0/src/commands/generate/hook.ts)_
+_See code: [src/commands/generate/hook.ts](https://github.com/oclif/oclif/blob/4.10.1/src/commands/generate/hook.ts)_
diff --git a/docs/introduction.md b/docs/introduction.md
index e2d7760d..938a8fe3 100644
--- a/docs/introduction.md
+++ b/docs/introduction.md
@@ -4,7 +4,7 @@ title: Introduction
 
 oclif is a framework for building CLIs in Node. It can be used like a [simple flag parser](https://github.com/oclif/core#usage) but is capable of much more. It's designed to be extensible so that you can easily add plugins such as the [update warning plugin](https://github.com/oclif/plugin-warn-if-update-available) or build your own for users to install at runtime.
 
-The oclif generator creates a CLI project in [TypeScript](https://github.com/oclif/hello-world) to get you started quickly. It requires very few runtime dependencies and has minimal overhead.
+The oclif generator creates a CLI project in TypeScript to get you started quickly. It requires very few runtime dependencies and has minimal overhead.
 
 Everything is customizable in oclif. Even the flag parser and help generation is optional and can be replaced. It's a platform to build upon that provides smart defaults without locking you in to any specific tools or behavior.
 
diff --git a/docs/performance.md b/docs/performance.md
index ef0723de..62d19851 100644
--- a/docs/performance.md
+++ b/docs/performance.md
@@ -133,7 +133,7 @@ marker?.addDetails({from: flags.from, person: args.person})
 marker?.stop()
 ```
 
-And a more thorough example using the `hello` command from the [hello-world](https://github.com/oclif/hello-world) template:
+And a more thorough example:
 
 ```typescript
 // ./src/commands/hello/index.ts
diff --git a/docs/templates.md b/docs/templates.md
index 8935b788..5d5482c5 100644
--- a/docs/templates.md
+++ b/docs/templates.md
@@ -2,14 +2,9 @@
 title: Templates
 ---
 
-There are two templates that `oclif generate` can use:
+When you run `oclif generate`, it will ask if you'd like to use either CommonJS or ESM for your CLI. Both options produce the same CLI (same tsconfig, bin scripts, example commands, etc).
 
-* [hello-world (CommonJS)](https://github.com/oclif/hello-world)
-* [hello-world-esm (ESM)](https://github.com/oclif/hello-world-esm)
-
-Both templates come with the same boiler plate (tsconfig, bin scripts, example commands and tests, etc.). The only difference is that the `hello-world` template uses CommonJS whereas the `hello-world-esm` template uses ESM.
-
-We'll give you a brief rundown of everything that's included in the templates:
+We'll give you a brief rundown of everything that's included in your newly generated CLI:
 
 ## Bin Scripts