diff --git a/tools/cli/infrastructure.go b/tools/cli/infrastructure.go
index 6eb74cd92..febb879d3 100644
--- a/tools/cli/infrastructure.go
+++ b/tools/cli/infrastructure.go
@@ -222,6 +222,8 @@ func prettify(text string) string {
 				val = val[idx:]
 			}
 			return bold_fmt(val)
+		case "opt":
+			return bold_fmt(val)
 		case "yellow":
 			return yellow_fmt(val)
 		case "blue":
@@ -348,6 +350,8 @@ func CreateCommand(cmd *cobra.Command) *cobra.Command {
 	if cmd.Run == nil {
 		cmd.Run = SubCommandRequired
 	}
+	cmd.PersistentFlags().SortFlags = false
+	cmd.Flags().SortFlags = false
 	return cmd
 }