diff --git a/silkaj/cli.py b/silkaj/cli.py
index 53928a4ef3449214ad55b53c67f1b413c7af4d71..0655d94306e9e1a6b923c71204f109a3d4920a90 100644
--- a/silkaj/cli.py
+++ b/silkaj/cli.py
@@ -40,6 +40,30 @@ from silkaj.wot.lookup import lookup_cmd
 from silkaj.wot.membership import send_membership
 from silkaj.wot.status import status
 
+click.rich_click.SHOW_ARGUMENTS = True
+click.rich_click.OPTION_GROUPS = {
+    "silkaj": [
+        {
+            "name": "Basic options",
+            "options": ["--help", "--version"],
+        },
+        {
+            "name": "Endpoint and currency specification",
+            "options": ["--endpoint", "--gtest"],
+        },
+        {
+            "name": "Authentication",
+            "options": [
+                "--auth-scrypt",
+                "--nrp",
+                "--auth-file",
+                "--auth-seed",
+                "--auth-wif",
+            ],
+        },
+    ],
+}
+
 
 @click.group()
 @click.help_option("-h", "--help")