diff --git a/jans-cli-tui/docs/docs/Gallery/gallery.md b/jans-cli-tui/docs/docs/Gallery/gallery.md
index 2e8da1886e6..a5e81262895 100755
--- a/jans-cli-tui/docs/docs/Gallery/gallery.md
+++ b/jans-cli-tui/docs/docs/Gallery/gallery.md
@@ -2,4 +2,7 @@
 gallery for all possibilities and future improvment for TUI
 
 
-![Screenshot](docs/img/new_tui/new_tui1.PNG)
\ No newline at end of file
+![Screenshot](docs/img/new_tui/new_tui1.PNG)
+
+- [TUI](/gluu-4/docs/Gallery/tui/)
+- [CLI](/gluu-4/docs/Gallery/cli/)
diff --git a/jans-cli-tui/docs/docs/models/oauth/edit_client_dialog.md b/jans-cli-tui/docs/docs/models/oauth/edit_client_dialog.md
deleted file mode 100755
index cca2afdb4e2..00000000000
--- a/jans-cli-tui/docs/docs/models/oauth/edit_client_dialog.md
+++ /dev/null
@@ -1 +0,0 @@
-<!-- ::: models.oauth.edit_client_dialog.EditClientDialog -->
\ No newline at end of file
diff --git a/jans-cli-tui/docs/docs/models/oauth/edit_scope_dialog.md b/jans-cli-tui/docs/docs/models/oauth/edit_scope_dialog.md
deleted file mode 100755
index 2534cba728b..00000000000
--- a/jans-cli-tui/docs/docs/models/oauth/edit_scope_dialog.md
+++ /dev/null
@@ -1 +0,0 @@
-<!-- ::: models.oauth.edit_scope_dialog.EditScopeDialog -->
\ No newline at end of file
diff --git a/jans-cli-tui/docs/docs/models/oauth/oauth.md b/jans-cli-tui/docs/docs/models/oauth/oauth.md
deleted file mode 100755
index da28b945bac..00000000000
--- a/jans-cli-tui/docs/docs/models/oauth/oauth.md
+++ /dev/null
@@ -1 +0,0 @@
-<!-- ::: models.oauth.oauth.JansAuthServer -->
\ No newline at end of file
diff --git a/jans-cli-tui/docs/docs/plugins/client_api/client_api.md b/jans-cli-tui/docs/docs/plugins/client_api/client_api.md
new file mode 100755
index 00000000000..e719802fd0c
--- /dev/null
+++ b/jans-cli-tui/docs/docs/plugins/client_api/client_api.md
@@ -0,0 +1 @@
+::: plugins.050_client_api.main
\ No newline at end of file
diff --git a/jans-cli-tui/docs/docs/plugins/config_api/config_api.md b/jans-cli-tui/docs/docs/plugins/config_api/config_api.md
new file mode 100755
index 00000000000..eaed174de6d
--- /dev/null
+++ b/jans-cli-tui/docs/docs/plugins/config_api/config_api.md
@@ -0,0 +1 @@
+::: plugins.040_config_api.main
\ No newline at end of file
diff --git a/jans-cli-tui/docs/docs/plugins/fido/fido.md b/jans-cli-tui/docs/docs/plugins/fido/fido.md
new file mode 100755
index 00000000000..5c30baa3f6b
--- /dev/null
+++ b/jans-cli-tui/docs/docs/plugins/fido/fido.md
@@ -0,0 +1 @@
+::: plugins.020_fido.main
\ No newline at end of file
diff --git a/jans-cli-tui/docs/docs/plugins/oauth/edit_client_dialog.md b/jans-cli-tui/docs/docs/plugins/oauth/edit_client_dialog.md
new file mode 100755
index 00000000000..1b901865e20
--- /dev/null
+++ b/jans-cli-tui/docs/docs/plugins/oauth/edit_client_dialog.md
@@ -0,0 +1 @@
+::: plugins.010_oxauth.edit_client_dialog
\ No newline at end of file
diff --git a/jans-cli-tui/docs/docs/plugins/oauth/edit_scope_dialog.md b/jans-cli-tui/docs/docs/plugins/oauth/edit_scope_dialog.md
new file mode 100755
index 00000000000..61a675cd85d
--- /dev/null
+++ b/jans-cli-tui/docs/docs/plugins/oauth/edit_scope_dialog.md
@@ -0,0 +1 @@
+::: plugins.010_oxauth.edit_scope_dialog
\ No newline at end of file
diff --git a/jans-cli-tui/docs/docs/plugins/oauth/edit_uma_dialog.md b/jans-cli-tui/docs/docs/plugins/oauth/edit_uma_dialog.md
new file mode 100755
index 00000000000..edccbaca4a4
--- /dev/null
+++ b/jans-cli-tui/docs/docs/plugins/oauth/edit_uma_dialog.md
@@ -0,0 +1 @@
+::: plugins.010_oxauth.view_uma_dialog
\ No newline at end of file
diff --git a/jans-cli-tui/docs/docs/plugins/oauth/oauth.md b/jans-cli-tui/docs/docs/plugins/oauth/oauth.md
new file mode 100755
index 00000000000..747de3264aa
--- /dev/null
+++ b/jans-cli-tui/docs/docs/plugins/oauth/oauth.md
@@ -0,0 +1 @@
+::: plugins.010_oxauth.main
\ No newline at end of file
diff --git a/jans-cli-tui/docs/docs/plugins/plugins.md b/jans-cli-tui/docs/docs/plugins/plugins.md
new file mode 100755
index 00000000000..a2c55b521eb
--- /dev/null
+++ b/jans-cli-tui/docs/docs/plugins/plugins.md
@@ -0,0 +1,11 @@
+# plugins
+####     There are six main plugins in the TUI and user may add other plugins
+----------------------------
+### The Main Plugins are
+- [Open Authorization (OAuth)](/gluu-4/docs/plugins/oauth/oauth/)
+- [Fast IDentity Online (FIDO)](/gluu-4/docs/plugins/fido/fido/)
+- [ System for Cross-domain Identity Management (SCIM)](/gluu-4/docs/plugins/scim/scim/)
+- [Config API (Config API)](/gluu-4/docs/plugins/config_api/config_api/)
+- [Client API (Client API)](/gluu-4/docs/plugins/client_api/client_api/)
+- [Scripts (Scripts)](/gluu-4/docs/plugins/scripts/scripts/)
+
diff --git a/jans-cli-tui/docs/docs/plugins/scim/scim.md b/jans-cli-tui/docs/docs/plugins/scim/scim.md
new file mode 100755
index 00000000000..7ede220362b
--- /dev/null
+++ b/jans-cli-tui/docs/docs/plugins/scim/scim.md
@@ -0,0 +1 @@
+::: plugins.030_scim.main
\ No newline at end of file
diff --git a/jans-cli-tui/docs/docs/plugins/scripts/scripts.md b/jans-cli-tui/docs/docs/plugins/scripts/scripts.md
new file mode 100755
index 00000000000..6cb17b690ac
--- /dev/null
+++ b/jans-cli-tui/docs/docs/plugins/scripts/scripts.md
@@ -0,0 +1 @@
+::: plugins.060_scripts.main
\ No newline at end of file
diff --git a/jans-cli-tui/docs/docs/wui_components/wui_components.md b/jans-cli-tui/docs/docs/wui_components/wui_components.md
index 42cb9d79dc0..8ae69e78b5e 100755
--- a/jans-cli-tui/docs/docs/wui_components/wui_components.md
+++ b/jans-cli-tui/docs/docs/wui_components/wui_components.md
@@ -2,24 +2,26 @@
 
 ## Content
 
-This Sction contains all the wui components 
+This Sction contains all the wui components (Classes, attr and methods)
 
 **there are diffrent types such as**
-### Dialogs components
+### - Dialogs components
+- [cli dialog (jans_cli_dialog)](/gluu-4/docs/wui_components/jans_cli_dialog)
+- [dialog with navigation bar (dialog_with_nav)](/gluu-4/docs/wui_components/jans_dialog_with_nav)
+- [message dialog (jans_message_dialog)](/gluu-4/docs/wui_components/jans_message_dialog)
 
-- jans_cli_dialog
-- jans_dialog_with_nav
-- jans_message_dialog
+### - Navigation bar components 
 
-### Navigation bar components 
+- [Main navigation bar (jans_nav_bar)](/gluu-4/docs/wui_components/jans_nav_bar)
+- [Horizontal navigation bar (jans_side_nav_bar)](/gluu-4/docs/wui_components/jans_side_nav_bar)
+- [vetrical navigation bar (jans_vetrical_nav)](/gluu-4/docs/wui_components/jans_vetrical_nav)
 
-- jans_nav_bar
-- jans_side_nav_bar
-- jans_vetrical_nav
 
-### Custom components
-- jans_data_picker
-- jans_drop_down
+### - Custom components
+
+- [data picker widget (jans_data_picker)](/gluu-4/docs/wui_components/jans_data_picker)
+- [drop-down widget (jans_drop_down)](/gluu-4/docs/wui_components/jans_drop_down)
+
 
 <!-- ## JansDialogWithNav
 ::: wui_components.jans_dialog_with_nav.JansDialogWithNav
diff --git a/jans-cli-tui/mkdocs.yml b/jans-cli-tui/mkdocs.yml
index 7a0fe96319f..be6e28574aa 100755
--- a/jans-cli-tui/mkdocs.yml
+++ b/jans-cli-tui/mkdocs.yml
@@ -6,16 +6,14 @@ site_description: "this is desc"
   
 plugins:
   - mkdocstrings
-  # - search
+  - search
 
 nav:
     - Home: 'docs/home/index.md'
     - Gallery: 
       - 'docs/Gallery/gallery.md'
-      - TUI :
-        - 'docs/Gallery/tui.md'
-      - CLI :
-        - 'docs/Gallery/cli.md'
+      - TUI : 'docs/Gallery/tui.md'
+      - CLI : 'docs/Gallery/cli.md'
 
     - Components:       
       - docs/wui_components/wui_components.md  
@@ -30,6 +28,24 @@ nav:
       - Custom components :
         - 'jans_data_picker': 'docs/wui_components/jans_data_picker.md'
         - 'jans_drop_down': 'docs/wui_components/jans_drop_down.md'
+    - Plugins : 
+      - 'Plugins': 'docs/plugins/plugins.md'
+      - OAuth : 
+        - Main OAuth : 'docs/plugins/oauth/oauth.md'
+        - 'Client Dialog': 'docs/plugins/oauth/edit_client_dialog.md'
+        - 'Scope Dialog': 'docs/plugins/oauth/edit_scope_dialog.md'
+        - 'UMA Dialog': 'docs/plugins/oauth/edit_uma_dialog.md'
+      - FIDO : 
+        - Main FIDO : 'docs/plugins/fido/fido.md'
+      - SCIM : 
+        - Main SCIM : 'docs/plugins/scim/scim.md'
+      - Config API : 
+        - Main Config API : 'docs/plugins/config_api/config_api.md'
+      - Client API : 
+        - Main Client API : 'docs/plugins/client_api/client_api.md'
+      - Scripts : 
+        - Main Scripts : 'docs/plugins/scripts/scripts.md'
+
 
 theme:
     homepage: https://example.com
@@ -45,6 +61,9 @@ theme:
       - navigation.tabs
       - navigation.tabs.sticky 
       - navigation.top
+      - navigation.sections
+      - content.code.annotate
+      # - navigation.expand
       
 
     palette: