diff --git a/docs/javascripts/tablesort.js b/docs/javascripts/tablesort.js
new file mode 100644
index 0000000..c916015
--- /dev/null
+++ b/docs/javascripts/tablesort.js
@@ -0,0 +1,6 @@
+document$.subscribe(function() {
+    var tables = document.querySelectorAll("article table:not([class])")
+    tables.forEach(function(table) {
+      new Tablesort(table)
+    })
+  })
\ No newline at end of file
diff --git a/mkdocs.yml b/mkdocs.yml
index 2265030..f48925c 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -87,6 +87,7 @@ plugins:
       enabled: !ENV [CI, false]
   - optimize:
       enabled: !ENV [CI, false]
+  - typeset
   - blog: 
       archive: false
   - git-revision-date-localized:
@@ -141,21 +142,45 @@ extra:
 # Extensions    
 markdown_extensions:
   - abbr
+  - admonition
   - attr_list
+  - def_list
+  - footnotes
   - md_in_html
   - pymdownx.betterem
   - pymdownx.blocks.caption
   - pymdownx.caret
+  - pymdownx.details
+  - pymdownx.emoji:
+      emoji_index: !!python/name:material.extensions.emoji.twemoji
+      emoji_generator: !!python/name:material.extensions.emoji.to_svg
   - pymdownx.mark
   - pymdownx.tilde  
   - pymdownx.critic
   - pymdownx.details
-  - pymdownx.highlight
-  - pymdownx.superfences
+  - pymdownx.highlight:
+      anchor_linenums: true
+      line_spans: __span
+      pygments_lang_class: true
+  - pymdownx.inlinehilite
+  - pymdownx.superfences:
+      custom_fences:
+        - name: mermaid
+          class: mermaid
+          format: !!python/name:pymdownx.superfences.fence_code_format
   - pymdownx.keys
   - pymdownx.smartsymbols
-  - pymdownx.tabbed
-  - pymdownx.tasklist
+  - pymdownx.snippets
+  - pymdownx.tabbed:
+      alternate_style: true
+  - pymdownx.tasklist:
+      custom_checkbox: true
+  - tables
+
+# Extra Javascript
+extra_javascript:
+  - https://unpkg.com/tablesort@5.3.0/dist/tablesort.min.js
+  - javascripts/tablesort.js
 
 # Page tree
 nav:
diff --git a/requirements.txt b/requirements.txt
index 07b1e93..3dbfb2b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -26,6 +26,7 @@ mkdocs~=1.6
 mkdocs-material-extensions~=1.3
 pygments~=2.16
 pymdown-extensions~=10.2
+mkdocs-material[imaging]
 
 # Plugins
 mkdocs-exporter~=6.2.0