diff --git a/docs/extensions/app-provider/_index.md b/docs/extensions/app-provider/_index.md
index cbe1886e5..39221058a 100644
--- a/docs/extensions/app-provider/_index.md
+++ b/docs/extensions/app-provider/_index.md
@@ -1,5 +1,5 @@
 ---
-title: App Provider
+title: App-Provider
 date: 2022-03-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
diff --git a/docs/extensions/app-registry/_index.md b/docs/extensions/app-registry/_index.md
index 9b79ea4a8..233279020 100644
--- a/docs/extensions/app-registry/_index.md
+++ b/docs/extensions/app-registry/_index.md
@@ -1,5 +1,5 @@
 ---
-title: App Registry
+title: App-Registry
 date: 2022-03-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
diff --git a/docs/extensions/groups/_index.md b/docs/extensions/groups/_index.md
index 2ac5a6f39..5308c51bd 100644
--- a/docs/extensions/groups/_index.md
+++ b/docs/extensions/groups/_index.md
@@ -1,5 +1,5 @@
 ---
-title: Group
+title: Groups
 date: 2022-03-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
diff --git a/docs/extensions/search/_index.md b/docs/extensions/search/_index.md
new file mode 100644
index 000000000..b00af59fc
--- /dev/null
+++ b/docs/extensions/search/_index.md
@@ -0,0 +1,10 @@
+---
+title: Search
+weight: 20
+geekdocRepo: https://github.com/owncloud/ocis
+geekdocEditPath: edit/master/docs/extensions/search
+geekdocFilePath: _index.md
+geekdocCollapseSection: true
+---
+
+This service provides search functionality.
diff --git a/docs/extensions/search/configuration.md b/docs/extensions/search/configuration.md
new file mode 100644
index 000000000..a99f2f87f
--- /dev/null
+++ b/docs/extensions/search/configuration.md
@@ -0,0 +1,15 @@
+---
+title: Service Configuration
+date: 2018-05-02T00:00:00+00:00
+weight: 20
+geekdocRepo: https://github.com/owncloud/ocis
+geekdocEditPath: edit/master/docs/extensions/search
+geekdocFilePath: configuration.md
+geekdocCollapseSection: true
+---
+
+## Example YAML Config
+
+{{< include file="extensions/_includes/search-config-example.yaml"  language="yaml" >}}
+
+{{< include file="extensions/_includes/search_configvars.md" >}}
diff --git a/docs/extensions/sharing/_index.md b/docs/extensions/sharing/_index.md
new file mode 100644
index 000000000..e96801c9e
--- /dev/null
+++ b/docs/extensions/sharing/_index.md
@@ -0,0 +1,10 @@
+---
+title: Sharing
+weight: 20
+geekdocRepo: https://github.com/owncloud/ocis
+geekdocEditPath: edit/master/docs/extensions/sharing
+geekdocFilePath: _index.md
+geekdocCollapseSection: true
+---
+
+This service provides sharing functionality.
diff --git a/docs/extensions/sharing/configuration.md b/docs/extensions/sharing/configuration.md
new file mode 100644
index 000000000..199dd30ec
--- /dev/null
+++ b/docs/extensions/sharing/configuration.md
@@ -0,0 +1,15 @@
+---
+title: Service Configuration
+date: 2018-05-02T00:00:00+00:00
+weight: 20
+geekdocRepo: https://github.com/owncloud/ocis
+geekdocEditPath: edit/master/docs/extensions/sharing
+geekdocFilePath: configuration.md
+geekdocCollapseSection: true
+---
+
+## Example YAML Config
+
+{{< include file="extensions/_includes/sharing-config-example.yaml"  language="yaml" >}}
+
+{{< include file="extensions/_includes/sharing_configvars.md" >}}
diff --git a/docs/extensions/storage-publiclink/_index.md b/docs/extensions/storage-publiclink/_index.md
index cbe0f2a24..e5ad8de52 100644
--- a/docs/extensions/storage-publiclink/_index.md
+++ b/docs/extensions/storage-publiclink/_index.md
@@ -1,5 +1,5 @@
 ---
-title: Publiclink Storage
+title: Storage-Publiclink
 date: 2022-03-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
diff --git a/docs/extensions/storage-shares/_index.md b/docs/extensions/storage-shares/_index.md
index e878e42b8..0f8b2f601 100644
--- a/docs/extensions/storage-shares/_index.md
+++ b/docs/extensions/storage-shares/_index.md
@@ -1,5 +1,5 @@
 ---
-title: Shares Storage
+title: Storage-Shares
 date: 2022-03-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
diff --git a/docs/extensions/storage-metadata/_index.md b/docs/extensions/storage-system/_index.md
similarity index 91%
rename from docs/extensions/storage-metadata/_index.md
rename to docs/extensions/storage-system/_index.md
index b8d77ae53..2556908ab 100644
--- a/docs/extensions/storage-metadata/_index.md
+++ b/docs/extensions/storage-system/_index.md
@@ -1,5 +1,5 @@
 ---
-title: Metadata Storage
+title: Storage-System
 date: 2022-03-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
diff --git a/docs/extensions/storage-metadata/configuration.md b/docs/extensions/storage-system/configuration.md
similarity index 100%
rename from docs/extensions/storage-metadata/configuration.md
rename to docs/extensions/storage-system/configuration.md
diff --git a/docs/extensions/storage-users/_index.md b/docs/extensions/storage-users/_index.md
index e66f413d4..dbddd5532 100644
--- a/docs/extensions/storage-users/_index.md
+++ b/docs/extensions/storage-users/_index.md
@@ -1,5 +1,5 @@
 ---
-title: Users Storage
+title: Storage-Users
 date: 2022-03-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
diff --git a/docs/extensions/users/_index.md b/docs/extensions/users/_index.md
index 3626724f7..1c90dbf56 100644
--- a/docs/extensions/users/_index.md
+++ b/docs/extensions/users/_index.md
@@ -1,5 +1,5 @@
 ---
-title: User
+title: Users
 date: 2022-03-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
diff --git a/docs/extensions/web/_index.md b/docs/extensions/web/_index.md
index c4473c772..cb8c7900b 100644
--- a/docs/extensions/web/_index.md
+++ b/docs/extensions/web/_index.md
@@ -1,5 +1,5 @@
 ---
-title: "ownCloud Web"
+title: "Web"
 date: 2018-05-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis