diff --git a/mkdocs.yml b/mkdocs.yml
index a828f7a03ae475a8c40eae2eb9a990324433bea7..51e361801074b49fe1550466c7217edc336eb07d 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -3,14 +3,15 @@ docs_dir: docs.it4i
 site_url: https://docs.it4i.cz/
 extra_css:
    - src/css.css?id=2018100501
-   - https://unpkg.com/mermaid@7.0.5/dist/mermaid.css
+   - https://unpkg.com/mermaid@10.1.0/dist/mermaid.css
 
 extra_javascript:
-   - https://unpkg.com/mermaid@7.0.5/dist/mermaid.min.js
+   - https://unpkg.com/mermaid@10.1.0/dist/mermaid.min.js
 
 # Repository
 repo_name: sccs/docs.it4i.cz
 repo_url: https://code.it4i.cz/sccs/docs.it4i.cz
+edit_uri: edit/master/docs.it4i/
 
 # Copyright
 copyright: Copyright (c) 2013-__YEAR__ IT4Innovations__VERSION__
@@ -25,11 +26,21 @@ theme:
     - 404.html
 
   features:
+    - search.highlight
+    - search.share
+    - content.action.edit
     - navigation.tabs
+    - navigation.tabs.sticky
+    - navigation.instant
+    - navigation.path
+    - navigation.prune
+    - navigation.indexes
+    - navigation.top
 
   icon:
     logo: fontawesome/solid/book-open
     repo: fontawesome/brands/gitlab
+    edit: material/pencil 
 
   # Don't include MkDocs' JavaScript
   include_search_page: false
@@ -42,6 +53,20 @@ theme:
     primary: 'indigo'
     accent: 'indigo'
 
+  palette: 
+
+    # Palette toggle for light mode
+    - scheme: default
+      toggle:
+        icon: material/brightness-7 
+        name: Switch to dark mode
+
+    # Palette toggle for dark mode
+    - scheme: slate
+      toggle:
+        icon: material/brightness-4
+        name: Switch to light mode
+
   favicon: img/favicon.ico
 
 nav:
@@ -149,7 +174,6 @@ nav:
         - Storage: salomon/storage.md
         - Visualization Servers: salomon/visualization.md
       - PRACE: prace.md
-
   - Software:
     - Environment and Modules: environment-and-modules.md
     - Modules:
@@ -276,7 +300,7 @@ extra:
 
 plugins:
   - search:
-      separator: '[\s\.]+'
+      separator: '[\s\-,:!=\[\]()"/]+|(?!\b)(?=[A-Z][a-z])|\.(?!\d)|&[lg]t;'
       lang:
         - en
   - exclude-search:
@@ -285,6 +309,7 @@ plugins:
         - archive/*.md
         - prace.md
         - salomon/*.md
+#  - optimize
 
 markdown_extensions:
   - codehilite
diff --git a/requirements.txt b/requirements.txt
index 2df23cb3aa009eebef6ce08e50fe3ccb44230141..b18a5e45e1448769aa6fce07d42b98de8905c73e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,6 +13,8 @@ Markdown==3.4.3
 MarkupSafe==2.0.1
 mkdocs==1.4.3
 mkdocs-exclude-search==0.6.5
+mkdocs-git-committers-plugin-2==1.1.2
+mkdocs-git-revision-date-localized-plugin==1.2.0
 mkdocs-material==9.1.12
 mkdocs-material-extensions==1.1.1
 nltk==3.5