diff --git a/docs/auth0_branding.md b/docs/auth0_branding.md
deleted file mode 100644
index 4ea304352..000000000
--- a/docs/auth0_branding.md
+++ /dev/null
@@ -1,37 +0,0 @@
----
-layout: default
----
-## auth0 branding
-
-Manage branding options
-
-### Synopsis
-
-Manage branding options.
-
-### Options
-
-```
-  -h, --help   help for branding
-```
-
-### Options inherited from parent commands
-
-```
-      --debug           Enable debug mode.
-      --json            Output in json format.
-      --no-color        Disable colors.
-      --no-input        Disable interactivity.
-      --tenant string   Specific tenant to use.
-```
-
-### SEE ALSO
-
-* [auth0](/auth0-cli/)	 - Supercharge your development workflow.
-* [auth0 branding domains](auth0_branding_domains.md)	 - Manage custom domains
-* [auth0 branding emails](auth0_branding_emails.md)	 - Manage custom email templates
-* [auth0 branding show](auth0_branding_show.md)	 - Display the custom branding settings for Universal Login
-* [auth0 branding templates](auth0_branding_templates.md)	 - Manage custom page templates
-* [auth0 branding texts](auth0_branding_texts.md)	 - Manage custom text for prompts
-* [auth0 branding update](auth0_branding_update.md)	 - Update the custom branding settings for Universal Login
-
diff --git a/docs/auth0_branding_domains.md b/docs/auth0_branding_domains.md
deleted file mode 100644
index dd944b599..000000000
--- a/docs/auth0_branding_domains.md
+++ /dev/null
@@ -1,37 +0,0 @@
----
-layout: default
----
-## auth0 branding domains
-
-Manage custom domains
-
-### Synopsis
-
-Manage custom domains.
-
-### Options
-
-```
-  -h, --help   help for domains
-```
-
-### Options inherited from parent commands
-
-```
-      --debug           Enable debug mode.
-      --json            Output in json format.
-      --no-color        Disable colors.
-      --no-input        Disable interactivity.
-      --tenant string   Specific tenant to use.
-```
-
-### SEE ALSO
-
-* [auth0 branding](auth0_branding.md)	 - Manage branding options
-* [auth0 branding domains create](auth0_branding_domains_create.md)	 - Create a custom domain
-* [auth0 branding domains delete](auth0_branding_domains_delete.md)	 - Delete a custom domain
-* [auth0 branding domains list](auth0_branding_domains_list.md)	 - List your custom domains
-* [auth0 branding domains show](auth0_branding_domains_show.md)	 - Show a custom domain
-* [auth0 branding domains update](auth0_branding_domains_update.md)	 - Update a custom domain
-* [auth0 branding domains verify](auth0_branding_domains_verify.md)	 - Verify a custom domain
-
diff --git a/docs/auth0_branding_texts.md b/docs/auth0_branding_texts.md
deleted file mode 100644
index 770ec7642..000000000
--- a/docs/auth0_branding_texts.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-layout: default
----
-## auth0 branding texts
-
-Manage custom text for prompts
-
-### Synopsis
-
-Manage custom text for prompts.
-
-### Options
-
-```
-  -h, --help   help for texts
-```
-
-### Options inherited from parent commands
-
-```
-      --debug           Enable debug mode.
-      --json            Output in json format.
-      --no-color        Disable colors.
-      --no-input        Disable interactivity.
-      --tenant string   Specific tenant to use.
-```
-
-### SEE ALSO
-
-* [auth0 branding](auth0_branding.md)	 - Manage branding options
-* [auth0 branding texts show](auth0_branding_texts_show.md)	 - Show the custom texts for a prompt
-* [auth0 branding texts update](auth0_branding_texts_update.md)	 - Update the custom texts for a prompt
-
diff --git a/docs/auth0_domains.md b/docs/auth0_domains.md
new file mode 100644
index 000000000..591d7ea18
--- /dev/null
+++ b/docs/auth0_domains.md
@@ -0,0 +1,37 @@
+---
+layout: default
+---
+## auth0 domains
+
+Manage custom domains
+
+### Synopsis
+
+Manage custom domains.
+
+### Options
+
+```
+  -h, --help   help for domains
+```
+
+### Options inherited from parent commands
+
+```
+      --debug           Enable debug mode.
+      --json            Output in json format.
+      --no-color        Disable colors.
+      --no-input        Disable interactivity.
+      --tenant string   Specific tenant to use.
+```
+
+### SEE ALSO
+
+* [auth0](/auth0-cli/)	 - Supercharge your development workflow.
+* [auth0 domains create](auth0_domains_create.md)	 - Create a custom domain
+* [auth0 domains delete](auth0_domains_delete.md)	 - Delete a custom domain
+* [auth0 domains list](auth0_domains_list.md)	 - List your custom domains
+* [auth0 domains show](auth0_domains_show.md)	 - Show a custom domain
+* [auth0 domains update](auth0_domains_update.md)	 - Update a custom domain
+* [auth0 domains verify](auth0_domains_verify.md)	 - Verify a custom domain
+
diff --git a/docs/auth0_branding_domains_create.md b/docs/auth0_domains_create.md
similarity index 80%
rename from docs/auth0_branding_domains_create.md
rename to docs/auth0_domains_create.md
index ce1c5e7ae..8637dec19 100644
--- a/docs/auth0_branding_domains_create.md
+++ b/docs/auth0_domains_create.md
@@ -1,7 +1,7 @@
 ---
 layout: default
 ---
-## auth0 branding domains create
+## auth0 domains create
 
 Create a custom domain
 
@@ -10,14 +10,14 @@ Create a custom domain
 Create a custom domain.
 
 ```
-auth0 branding domains create [flags]
+auth0 domains create [flags]
 ```
 
 ### Examples
 
 ```
-auth0 branding domains create 
-auth0 branding domains create <id>
+auth0 domains create 
+auth0 domains create <id>
 ```
 
 ### Options
@@ -43,5 +43,5 @@ auth0 branding domains create <id>
 
 ### SEE ALSO
 
-* [auth0 branding domains](auth0_branding_domains.md)	 - Manage custom domains
+* [auth0 domains](auth0_domains.md)	 - Manage custom domains
 
diff --git a/docs/auth0_branding_domains_delete.md b/docs/auth0_domains_delete.md
similarity index 69%
rename from docs/auth0_branding_domains_delete.md
rename to docs/auth0_domains_delete.md
index f06e7f9c2..b4bbf21ca 100644
--- a/docs/auth0_branding_domains_delete.md
+++ b/docs/auth0_domains_delete.md
@@ -1,7 +1,7 @@
 ---
 layout: default
 ---
-## auth0 branding domains delete
+## auth0 domains delete
 
 Delete a custom domain
 
@@ -10,14 +10,14 @@ Delete a custom domain
 Delete a custom domain.
 
 ```
-auth0 branding domains delete [flags]
+auth0 domains delete [flags]
 ```
 
 ### Examples
 
 ```
-auth0 branding domains delete 
-auth0 branding domains delete <id>
+auth0 domains delete 
+auth0 domains delete <id>
 ```
 
 ### Options
@@ -39,5 +39,5 @@ auth0 branding domains delete <id>
 
 ### SEE ALSO
 
-* [auth0 branding domains](auth0_branding_domains.md)	 - Manage custom domains
+* [auth0 domains](auth0_domains.md)	 - Manage custom domains
 
diff --git a/docs/auth0_branding_domains_list.md b/docs/auth0_domains_list.md
similarity index 68%
rename from docs/auth0_branding_domains_list.md
rename to docs/auth0_domains_list.md
index 5a56ee141..d9fa0c8ab 100644
--- a/docs/auth0_branding_domains_list.md
+++ b/docs/auth0_domains_list.md
@@ -1,24 +1,24 @@
 ---
 layout: default
 ---
-## auth0 branding domains list
+## auth0 domains list
 
 List your custom domains
 
 ### Synopsis
 
 List your existing custom domains. To create one try:
-auth0 branding domains create
+auth0 domains create
 
 ```
-auth0 branding domains list [flags]
+auth0 domains list [flags]
 ```
 
 ### Examples
 
 ```
-auth0 branding domains list
-auth0 branding domains ls
+auth0 domains list
+auth0 domains ls
 ```
 
 ### Options
@@ -39,5 +39,5 @@ auth0 branding domains ls
 
 ### SEE ALSO
 
-* [auth0 branding domains](auth0_branding_domains.md)	 - Manage custom domains
+* [auth0 domains](auth0_domains.md)	 - Manage custom domains
 
diff --git a/docs/auth0_branding_domains_show.md b/docs/auth0_domains_show.md
similarity index 68%
rename from docs/auth0_branding_domains_show.md
rename to docs/auth0_domains_show.md
index a034d1834..826a52ae6 100644
--- a/docs/auth0_branding_domains_show.md
+++ b/docs/auth0_domains_show.md
@@ -1,7 +1,7 @@
 ---
 layout: default
 ---
-## auth0 branding domains show
+## auth0 domains show
 
 Show a custom domain
 
@@ -10,14 +10,14 @@ Show a custom domain
 Show a custom domain.
 
 ```
-auth0 branding domains show [flags]
+auth0 domains show [flags]
 ```
 
 ### Examples
 
 ```
-auth0 branding domains show 
-auth0 branding domains show <id>
+auth0 domains show 
+auth0 domains show <id>
 ```
 
 ### Options
@@ -38,5 +38,5 @@ auth0 branding domains show <id>
 
 ### SEE ALSO
 
-* [auth0 branding domains](auth0_branding_domains.md)	 - Manage custom domains
+* [auth0 domains](auth0_domains.md)	 - Manage custom domains
 
diff --git a/docs/auth0_branding_domains_update.md b/docs/auth0_domains_update.md
similarity index 67%
rename from docs/auth0_branding_domains_update.md
rename to docs/auth0_domains_update.md
index 9f530b134..fd240ef37 100644
--- a/docs/auth0_branding_domains_update.md
+++ b/docs/auth0_domains_update.md
@@ -1,7 +1,7 @@
 ---
 layout: default
 ---
-## auth0 branding domains update
+## auth0 domains update
 
 Update a custom domain
 
@@ -10,15 +10,15 @@ Update a custom domain
 Update a custom domain.
 
 ```
-auth0 branding domains update [flags]
+auth0 domains update [flags]
 ```
 
 ### Examples
 
 ```
-auth0 branding domains update
-auth0 branding domains update <id> --policy compatible
-auth0 branding domains update <id> -p compatible --ip-header "cf-connecting-ip"
+auth0 domains update
+auth0 domains update <id> --policy compatible
+auth0 domains update <id> -p compatible --ip-header "cf-connecting-ip"
 ```
 
 ### Options
@@ -41,5 +41,5 @@ auth0 branding domains update <id> -p compatible --ip-header "cf-connecting-ip"
 
 ### SEE ALSO
 
-* [auth0 branding domains](auth0_branding_domains.md)	 - Manage custom domains
+* [auth0 domains](auth0_domains.md)	 - Manage custom domains
 
diff --git a/docs/auth0_branding_domains_verify.md b/docs/auth0_domains_verify.md
similarity index 68%
rename from docs/auth0_branding_domains_verify.md
rename to docs/auth0_domains_verify.md
index f4b2d7609..a7d0faf6a 100644
--- a/docs/auth0_branding_domains_verify.md
+++ b/docs/auth0_domains_verify.md
@@ -1,7 +1,7 @@
 ---
 layout: default
 ---
-## auth0 branding domains verify
+## auth0 domains verify
 
 Verify a custom domain
 
@@ -10,14 +10,14 @@ Verify a custom domain
 Verify a custom domain.
 
 ```
-auth0 branding domains verify [flags]
+auth0 domains verify [flags]
 ```
 
 ### Examples
 
 ```
-auth0 branding domains verify 
-auth0 branding domains verify <id>
+auth0 domains verify 
+auth0 domains verify <id>
 ```
 
 ### Options
@@ -38,5 +38,5 @@ auth0 branding domains verify <id>
 
 ### SEE ALSO
 
-* [auth0 branding domains](auth0_branding_domains.md)	 - Manage custom domains
+* [auth0 domains](auth0_domains.md)	 - Manage custom domains
 
diff --git a/docs/auth0_email.md b/docs/auth0_email.md
new file mode 100644
index 000000000..ee0ffcf53
--- /dev/null
+++ b/docs/auth0_email.md
@@ -0,0 +1,32 @@
+---
+layout: default
+---
+## auth0 email
+
+Manage email settings
+
+### Synopsis
+
+Manage email settings.
+
+### Options
+
+```
+  -h, --help   help for email
+```
+
+### Options inherited from parent commands
+
+```
+      --debug           Enable debug mode.
+      --json            Output in json format.
+      --no-color        Disable colors.
+      --no-input        Disable interactivity.
+      --tenant string   Specific tenant to use.
+```
+
+### SEE ALSO
+
+* [auth0](/auth0-cli/)	 - Supercharge your development workflow.
+* [auth0 email templates](auth0_email_templates.md)	 - Manage custom email templates
+
diff --git a/docs/auth0_branding_emails.md b/docs/auth0_email_templates.md
similarity index 68%
rename from docs/auth0_branding_emails.md
rename to docs/auth0_email_templates.md
index 54c7da65e..839afc707 100644
--- a/docs/auth0_branding_emails.md
+++ b/docs/auth0_email_templates.md
@@ -1,7 +1,7 @@
 ---
 layout: default
 ---
-## auth0 branding emails
+## auth0 email templates
 
 Manage custom email templates
 
@@ -12,7 +12,7 @@ Manage custom email templates. This requires a custom email provider to be confi
 ### Options
 
 ```
-  -h, --help   help for emails
+  -h, --help   help for templates
 ```
 
 ### Options inherited from parent commands
@@ -27,7 +27,7 @@ Manage custom email templates. This requires a custom email provider to be confi
 
 ### SEE ALSO
 
-* [auth0 branding](auth0_branding.md)	 - Manage branding options
-* [auth0 branding emails show](auth0_branding_emails_show.md)	 - Show an email template
-* [auth0 branding emails update](auth0_branding_emails_update.md)	 - Update an email template
+* [auth0 email](auth0_email.md)	 - Manage email settings
+* [auth0 email templates show](auth0_email_templates_show.md)	 - Show an email template
+* [auth0 email templates update](auth0_email_templates_update.md)	 - Update an email template
 
diff --git a/docs/auth0_branding_emails_show.md b/docs/auth0_email_templates_show.md
similarity index 70%
rename from docs/auth0_branding_emails_show.md
rename to docs/auth0_email_templates_show.md
index c0384dcad..3c8f6698d 100644
--- a/docs/auth0_branding_emails_show.md
+++ b/docs/auth0_email_templates_show.md
@@ -1,7 +1,7 @@
 ---
 layout: default
 ---
-## auth0 branding emails show
+## auth0 email templates show
 
 Show an email template
 
@@ -10,14 +10,14 @@ Show an email template
 Show an email template.
 
 ```
-auth0 branding emails show [flags]
+auth0 email templates show [flags]
 ```
 
 ### Examples
 
 ```
-auth0 branding emails show <template>
-auth0 branding emails show welcome
+auth0 email templates show <template>
+auth0 email templates show welcome
 ```
 
 ### Options
@@ -38,5 +38,5 @@ auth0 branding emails show welcome
 
 ### SEE ALSO
 
-* [auth0 branding emails](auth0_branding_emails.md)	 - Manage custom email templates
+* [auth0 email templates](auth0_email_templates.md)	 - Manage custom email templates
 
diff --git a/docs/auth0_branding_emails_update.md b/docs/auth0_email_templates_update.md
similarity index 81%
rename from docs/auth0_branding_emails_update.md
rename to docs/auth0_email_templates_update.md
index 8c2bdf558..5648c6bc7 100644
--- a/docs/auth0_branding_emails_update.md
+++ b/docs/auth0_email_templates_update.md
@@ -1,7 +1,7 @@
 ---
 layout: default
 ---
-## auth0 branding emails update
+## auth0 email templates update
 
 Update an email template
 
@@ -10,14 +10,14 @@ Update an email template
 Update an email template.
 
 ```
-auth0 branding emails update [flags]
+auth0 email templates update [flags]
 ```
 
 ### Examples
 
 ```
-auth0 branding emails update <template>
-auth0 branding emails update welcome
+auth0 email templates update <template>
+auth0 email templates update welcome
 ```
 
 ### Options
@@ -44,5 +44,5 @@ auth0 branding emails update welcome
 
 ### SEE ALSO
 
-* [auth0 branding emails](auth0_branding_emails.md)	 - Manage custom email templates
+* [auth0 email templates](auth0_email_templates.md)	 - Manage custom email templates
 
diff --git a/docs/auth0_universal-login.md b/docs/auth0_universal-login.md
new file mode 100644
index 000000000..155dfc1c5
--- /dev/null
+++ b/docs/auth0_universal-login.md
@@ -0,0 +1,35 @@
+---
+layout: default
+---
+## auth0 universal-login
+
+Manage the Universal Login experience
+
+### Synopsis
+
+Manage a consistent, branded Universal Login experience that can handle all of your authentication flows.
+
+### Options
+
+```
+  -h, --help   help for universal-login
+```
+
+### Options inherited from parent commands
+
+```
+      --debug           Enable debug mode.
+      --json            Output in json format.
+      --no-color        Disable colors.
+      --no-input        Disable interactivity.
+      --tenant string   Specific tenant to use.
+```
+
+### SEE ALSO
+
+* [auth0](/auth0-cli/)	 - Supercharge your development workflow.
+* [auth0 universal-login prompts](auth0_universal-login_prompts.md)	 - Manage custom text for prompts
+* [auth0 universal-login show](auth0_universal-login_show.md)	 - Display the custom branding settings for Universal Login
+* [auth0 universal-login templates](auth0_universal-login_templates.md)	 - Manage custom Universal Login templates
+* [auth0 universal-login update](auth0_universal-login_update.md)	 - Update the custom branding settings for Universal Login
+
diff --git a/docs/auth0_universal-login_prompts.md b/docs/auth0_universal-login_prompts.md
new file mode 100644
index 000000000..a2751e18d
--- /dev/null
+++ b/docs/auth0_universal-login_prompts.md
@@ -0,0 +1,33 @@
+---
+layout: default
+---
+## auth0 universal-login prompts
+
+Manage custom text for prompts
+
+### Synopsis
+
+Manage custom [text for prompts](https://auth0.com/docs/customize/universal-login-pages/customize-login-text-prompts).
+
+### Options
+
+```
+  -h, --help   help for prompts
+```
+
+### Options inherited from parent commands
+
+```
+      --debug           Enable debug mode.
+      --json            Output in json format.
+      --no-color        Disable colors.
+      --no-input        Disable interactivity.
+      --tenant string   Specific tenant to use.
+```
+
+### SEE ALSO
+
+* [auth0 universal-login](auth0_universal-login.md)	 - Manage the Universal Login experience
+* [auth0 universal-login prompts show](auth0_universal-login_prompts_show.md)	 - Show the custom text for a prompt
+* [auth0 universal-login prompts update](auth0_universal-login_prompts_update.md)	 - Update the custom text for a prompt
+
diff --git a/docs/auth0_branding_texts_show.md b/docs/auth0_universal-login_prompts_show.md
similarity index 58%
rename from docs/auth0_branding_texts_show.md
rename to docs/auth0_universal-login_prompts_show.md
index 7673b985a..4c74c47f0 100644
--- a/docs/auth0_branding_texts_show.md
+++ b/docs/auth0_universal-login_prompts_show.md
@@ -1,24 +1,24 @@
 ---
 layout: default
 ---
-## auth0 branding texts show
+## auth0 universal-login prompts show
 
-Show the custom texts for a prompt
+Show the custom text for a prompt
 
 ### Synopsis
 
-Show the custom texts for a prompt.
+Show the custom text for a prompt.
 
 ```
-auth0 branding texts show [flags]
+auth0 universal-login prompts show [flags]
 ```
 
 ### Examples
 
 ```
 
-auth0 branding texts show <prompt> --language es
-auth0 branding texts show <prompt> -l es
+auth0 universal-login prompts show <prompt> --language es
+auth0 universal-login prompts show <prompt> -l es
 ```
 
 ### Options
@@ -40,5 +40,5 @@ auth0 branding texts show <prompt> -l es
 
 ### SEE ALSO
 
-* [auth0 branding texts](auth0_branding_texts.md)	 - Manage custom text for prompts
+* [auth0 universal-login prompts](auth0_universal-login_prompts.md)	 - Manage custom text for prompts
 
diff --git a/docs/auth0_branding_texts_update.md b/docs/auth0_universal-login_prompts_update.md
similarity index 57%
rename from docs/auth0_branding_texts_update.md
rename to docs/auth0_universal-login_prompts_update.md
index a9e48d435..759c19645 100644
--- a/docs/auth0_branding_texts_update.md
+++ b/docs/auth0_universal-login_prompts_update.md
@@ -1,24 +1,24 @@
 ---
 layout: default
 ---
-## auth0 branding texts update
+## auth0 universal-login prompts update
 
-Update the custom texts for a prompt
+Update the custom text for a prompt
 
 ### Synopsis
 
-Update the custom texts for a prompt.
+Update the custom text for a prompt.
 
 ```
-auth0 branding texts update [flags]
+auth0 universal-login prompts update [flags]
 ```
 
 ### Examples
 
 ```
 
-auth0 branding texts update <prompt> --language es
-auth0 branding texts update <prompt> -l es
+auth0 universal-login prompts update <prompt> --language es
+auth0 universal-login prompts update <prompt> -l es
 ```
 
 ### Options
@@ -40,5 +40,5 @@ auth0 branding texts update <prompt> -l es
 
 ### SEE ALSO
 
-* [auth0 branding texts](auth0_branding_texts.md)	 - Manage custom text for prompts
+* [auth0 universal-login prompts](auth0_universal-login_prompts.md)	 - Manage custom text for prompts
 
diff --git a/docs/auth0_branding_show.md b/docs/auth0_universal-login_show.md
similarity index 74%
rename from docs/auth0_branding_show.md
rename to docs/auth0_universal-login_show.md
index 47c601746..19fcae514 100644
--- a/docs/auth0_branding_show.md
+++ b/docs/auth0_universal-login_show.md
@@ -1,7 +1,7 @@
 ---
 layout: default
 ---
-## auth0 branding show
+## auth0 universal-login show
 
 Display the custom branding settings for Universal Login
 
@@ -10,13 +10,13 @@ Display the custom branding settings for Universal Login
 Display the custom branding settings for Universal Login.
 
 ```
-auth0 branding show [flags]
+auth0 universal-login show [flags]
 ```
 
 ### Examples
 
 ```
-auth0 branding show
+auth0 universal-login show
 ```
 
 ### Options
@@ -37,5 +37,5 @@ auth0 branding show
 
 ### SEE ALSO
 
-* [auth0 branding](auth0_branding.md)	 - Manage branding options
+* [auth0 universal-login](auth0_universal-login.md)	 - Manage the Universal Login experience
 
diff --git a/docs/auth0_branding_templates.md b/docs/auth0_universal-login_templates.md
similarity index 72%
rename from docs/auth0_branding_templates.md
rename to docs/auth0_universal-login_templates.md
index 6a84cd803..84c3e4bfc 100644
--- a/docs/auth0_branding_templates.md
+++ b/docs/auth0_universal-login_templates.md
@@ -1,9 +1,9 @@
 ---
 layout: default
 ---
-## auth0 branding templates
+## auth0 universal-login templates
 
-Manage custom page templates
+Manage custom Universal Login templates
 
 ### Synopsis
 
@@ -42,7 +42,7 @@ Once you close the window, you’ll be asked if you want to save the template. I
 
 ### SEE ALSO
 
-* [auth0 branding](auth0_branding.md)	 - Manage branding options
-* [auth0 branding templates show](auth0_branding_templates_show.md)	 - Display the custom template for Universal Login
-* [auth0 branding templates update](auth0_branding_templates_update.md)	 - Update the custom template for Universal Login
+* [auth0 universal-login](auth0_universal-login.md)	 - Manage the Universal Login experience
+* [auth0 universal-login templates show](auth0_universal-login_templates_show.md)	 - Display the custom template for Universal Login
+* [auth0 universal-login templates update](auth0_universal-login_templates_update.md)	 - Update the custom template for Universal Login
 
diff --git a/docs/auth0_branding_templates_show.md b/docs/auth0_universal-login_templates_show.md
similarity index 68%
rename from docs/auth0_branding_templates_show.md
rename to docs/auth0_universal-login_templates_show.md
index e4723d3c2..6ae20a96a 100644
--- a/docs/auth0_branding_templates_show.md
+++ b/docs/auth0_universal-login_templates_show.md
@@ -1,7 +1,7 @@
 ---
 layout: default
 ---
-## auth0 branding templates show
+## auth0 universal-login templates show
 
 Display the custom template for Universal Login
 
@@ -10,13 +10,13 @@ Display the custom template for Universal Login
 Display the custom template for Universal Login.
 
 ```
-auth0 branding templates show [flags]
+auth0 universal-login templates show [flags]
 ```
 
 ### Examples
 
 ```
-auth0 branding templates show
+auth0 universal-login templates show
 ```
 
 ### Options
@@ -37,5 +37,5 @@ auth0 branding templates show
 
 ### SEE ALSO
 
-* [auth0 branding templates](auth0_branding_templates.md)	 - Manage custom page templates
+* [auth0 universal-login templates](auth0_universal-login_templates.md)	 - Manage custom Universal Login templates
 
diff --git a/docs/auth0_branding_templates_update.md b/docs/auth0_universal-login_templates_update.md
similarity index 67%
rename from docs/auth0_branding_templates_update.md
rename to docs/auth0_universal-login_templates_update.md
index 519b92574..7989f6784 100644
--- a/docs/auth0_branding_templates_update.md
+++ b/docs/auth0_universal-login_templates_update.md
@@ -1,7 +1,7 @@
 ---
 layout: default
 ---
-## auth0 branding templates update
+## auth0 universal-login templates update
 
 Update the custom template for Universal Login
 
@@ -10,13 +10,13 @@ Update the custom template for Universal Login
 Update the custom template for Universal Login.
 
 ```
-auth0 branding templates update [flags]
+auth0 universal-login templates update [flags]
 ```
 
 ### Examples
 
 ```
-auth0 branding templates update
+auth0 universal-login templates update
 ```
 
 ### Options
@@ -37,5 +37,5 @@ auth0 branding templates update
 
 ### SEE ALSO
 
-* [auth0 branding templates](auth0_branding_templates.md)	 - Manage custom page templates
+* [auth0 universal-login templates](auth0_universal-login_templates.md)	 - Manage custom Universal Login templates
 
diff --git a/docs/auth0_branding_update.md b/docs/auth0_universal-login_update.md
similarity index 71%
rename from docs/auth0_branding_update.md
rename to docs/auth0_universal-login_update.md
index 23aaed500..18caed560 100644
--- a/docs/auth0_branding_update.md
+++ b/docs/auth0_universal-login_update.md
@@ -1,7 +1,7 @@
 ---
 layout: default
 ---
-## auth0 branding update
+## auth0 universal-login update
 
 Update the custom branding settings for Universal Login
 
@@ -10,15 +10,15 @@ Update the custom branding settings for Universal Login
 Update the custom branding settings for Universal Login.
 
 ```
-auth0 branding update [flags]
+auth0 universal-login update [flags]
 ```
 
 ### Examples
 
 ```
-auth0 branding update
-auth0 branding update --accent "#FF4F40" --background "#2A2E35" 
-auth0 branding update -a "#FF4F40" -b "#2A2E35" --logo "https://example.com/logo.png"
+auth0 universal-login update
+auth0 universal-login update --accent "#FF4F40" --background "#2A2E35" 
+auth0 universal-login update -a "#FF4F40" -b "#2A2E35" --logo "https://example.com/logo.png"
 ```
 
 ### Options
@@ -44,5 +44,5 @@ auth0 branding update -a "#FF4F40" -b "#2A2E35" --logo "https://example.com/logo
 
 ### SEE ALSO
 
-* [auth0 branding](auth0_branding.md)	 - Manage branding options
+* [auth0 universal-login](auth0_universal-login.md)	 - Manage the Universal Login experience
 
diff --git a/docs/index.md b/docs/index.md
index 39bd2e575..2d3fe9e56 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -22,8 +22,9 @@ Supercharge your development workflow.
 * [auth0 api](auth0_api.md)	 - Makes an authenticated HTTP request to the Auth0 Management API
 * [auth0 apis](auth0_apis.md)	 - Manage resources for APIs
 * [auth0 apps](auth0_apps.md)	 - Manage resources for applications
-* [auth0 branding](auth0_branding.md)	 - Manage branding options
 * [auth0 completion](auth0_completion.md)	 - Setup autocomplete features for this CLI on your terminal
+* [auth0 domains](auth0_domains.md)	 - Manage custom domains
+* [auth0 email](auth0_email.md)	 - Manage email settings
 * [auth0 ips](auth0_ips.md)	 - Manage blocked IP addresses
 * [auth0 login](auth0_login.md)	 - Authenticate the Auth0 CLI
 * [auth0 logout](auth0_logout.md)	 - Log out of a tenant's session
@@ -35,5 +36,6 @@ Supercharge your development workflow.
 * [auth0 rules](auth0_rules.md)	 - Manage resources for rules
 * [auth0 tenants](auth0_tenants.md)	 - Manage configured tenants
 * [auth0 test](auth0_test.md)	 - Try your Universal Login box or get a token
+* [auth0 universal-login](auth0_universal-login.md)	 - Manage the Universal Login experience
 * [auth0 users](auth0_users.md)	 - Manage resources for users