diff --git a/docs/auth0_quickstarts_download.md b/docs/auth0_quickstarts_download.md
index 13442459c..2e32894d7 100644
--- a/docs/auth0_quickstarts_download.md
+++ b/docs/auth0_quickstarts_download.md
@@ -15,9 +15,12 @@ auth0 quickstarts download [flags]
 ## Examples
 
 ```
-  auth0 quickstarts download --stack <stack>
-  auth0 qs download -s <stack>
-  auth0 qs download -s "Next.js"
+  auth0 quickstarts download
+  auth0 quickstarts download <app-id>
+  auth0 quickstarts download <app-id> --stack <stack>
+  auth0 qs download <app-id> -s <stack>
+  auth0 qs download <app-id> -s "Next.js"
+  auth0 qs download <app-id> -s "Next.js" --force
 ```
 
 
@@ -25,7 +28,7 @@ auth0 quickstarts download [flags]
 
 ```
       --force          Skip confirmation.
-  -s, --stack string   Tech/Language of the quickstart sample to download.
+  -s, --stack string   Tech/language of the Quickstart sample to download. You can use the 'auth0 quickstarts list' command to see all available tech stacks. 
 ```
 
 
diff --git a/internal/cli/apps.go b/internal/cli/apps.go
index 9d2e12f23..963b4a342 100644
--- a/internal/cli/apps.go
+++ b/internal/cli/apps.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/auth0/auth0-cli/internal/ansi"
 	"github.com/auth0/auth0-cli/internal/auth0"
+	"github.com/auth0/auth0-cli/internal/display"
 	"github.com/auth0/auth0-cli/internal/prompt"
 )
 
@@ -885,7 +886,12 @@ func (c *cli) appPickerOptions(requestOpts ...management.RequestOption) pickerOp
 		var priorityOpts, opts pickerOptions
 		for _, client := range clientList.Clients {
 			value := client.GetClientID()
-			label := fmt.Sprintf("%s %s", client.GetName(), ansi.Faint("("+value+")"))
+			label := fmt.Sprintf(
+				"%s [%s] %s",
+				client.GetName(),
+				display.ApplyColorToFriendlyAppType(display.FriendlyAppType(client.GetAppType())),
+				ansi.Faint("("+value+")"),
+			)
 			option := pickerOption{value: value, label: label}
 
 			if tenant.DefaultAppID == client.GetClientID() {
diff --git a/internal/cli/quickstarts.go b/internal/cli/quickstarts.go
index 96bd572e6..c5794b6dc 100644
--- a/internal/cli/quickstarts.go
+++ b/internal/cli/quickstarts.go
@@ -35,10 +35,11 @@ var (
 	}
 
 	qsStack = Flag{
-		Name:       "Stack",
-		LongForm:   "stack",
-		ShortForm:  "s",
-		Help:       "Tech/Language of the quickstart sample to download.",
+		Name:      "Stack",
+		LongForm:  "stack",
+		ShortForm: "s",
+		Help: "Tech/language of the Quickstart sample to download. " +
+			"You can use the 'auth0 quickstarts list' command to see all available tech stacks. ",
 		IsRequired: true,
 	}
 )
@@ -98,9 +99,12 @@ func downloadQuickstartCmd(cli *cli) *cobra.Command {
 		Short: "Download a Quickstart sample app for a specific tech stack",
 		Long: "Download a Quickstart sample application for that’s already configured for your Auth0 application. " +
 			"There are many different tech stacks available.",
-		Example: `  auth0 quickstarts download --stack <stack>
-  auth0 qs download -s <stack>
-  auth0 qs download -s "Next.js"`,
+		Example: `  auth0 quickstarts download
+  auth0 quickstarts download <app-id>
+  auth0 quickstarts download <app-id> --stack <stack>
+  auth0 qs download <app-id> -s <stack>
+  auth0 qs download <app-id> -s "Next.js"
+  auth0 qs download <app-id> -s "Next.js" --force`,
 		RunE: downloadQuickstart(cli, &inputs),
 	}