diff --git a/exampleSite/content/authoring/_index.en.md b/exampleSite/content/authoring/_index.en.md
index 548ebc8d1d..b14d538b46 100644
--- a/exampleSite/content/authoring/_index.en.md
+++ b/exampleSite/content/authoring/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["reference"]
 menuPre = "<i class='fa-fw fab fa-markdown'></i> "
 title = "Authoring"
 type = "chapter"
diff --git a/exampleSite/content/authoring/_index.pir.md b/exampleSite/content/authoring/_index.pir.md
index d07b50593d..0e1934ea0b 100644
--- a/exampleSite/content/authoring/_index.pir.md
+++ b/exampleSite/content/authoring/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["reference"]
 menuPre = "<i class='fa-fw fab fa-markdown'></i> "
 title = "Rambl'n"
 type = "chapter"
diff --git a/exampleSite/content/authoring/frontmatter/_index.en.md b/exampleSite/content/authoring/frontmatter/_index.en.md
index 1453b86ca9..af9b84787b 100644
--- a/exampleSite/content/authoring/frontmatter/_index.en.md
+++ b/exampleSite/content/authoring/frontmatter/_index.en.md
@@ -1,5 +1,6 @@
 +++
 alwaysopen = false
+categories = ["reference"]
 description = "All things front matter"
 title = "Front Matter"
 weight = 2
diff --git a/exampleSite/content/authoring/frontmatter/_index.pir.md b/exampleSite/content/authoring/frontmatter/_index.pir.md
index 30b1f20002..186367cf70 100644
--- a/exampleSite/content/authoring/frontmatter/_index.pir.md
+++ b/exampleSite/content/authoring/frontmatter/_index.pir.md
@@ -1,5 +1,6 @@
 +++
 alwaysopen = false
+categories = ["reference"]
 description = "All things front matter"
 title = "Front Matter"
 weight = 2
diff --git a/exampleSite/content/authoring/frontmatter/designs/_index.en.md b/exampleSite/content/authoring/frontmatter/designs/_index.en.md
index 7abd4c8ec0..e403df1acc 100644
--- a/exampleSite/content/authoring/frontmatter/designs/_index.en.md
+++ b/exampleSite/content/authoring/frontmatter/designs/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "How to vary layouts by using page designs"
 title = "Page Designs"
 weight = 1
diff --git a/exampleSite/content/authoring/frontmatter/designs/_index.pir.md b/exampleSite/content/authoring/frontmatter/designs/_index.pir.md
index ebe4f76d30..627633cd22 100644
--- a/exampleSite/content/authoring/frontmatter/designs/_index.pir.md
+++ b/exampleSite/content/authoring/frontmatter/designs/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "How to vary layouts by using page designs"
 title = "Page Designs"
 weight = 1
diff --git a/exampleSite/content/authoring/frontmatter/linking/index.en.md b/exampleSite/content/authoring/frontmatter/linking/index.en.md
index cadfd4f9c4..ca2bac92d5 100644
--- a/exampleSite/content/authoring/frontmatter/linking/index.en.md
+++ b/exampleSite/content/authoring/frontmatter/linking/index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "What options are available for links and images"
 frontmatter = ["externalLinkTarget", "image.errorlevel", "link.errorlevel"]
 options = ["externalLinkTarget", "image.errorlevel", "link.errorlevel"]
diff --git a/exampleSite/content/authoring/frontmatter/linking/index.pir.md b/exampleSite/content/authoring/frontmatter/linking/index.pir.md
index 47feacd694..b96d5381e8 100644
--- a/exampleSite/content/authoring/frontmatter/linking/index.pir.md
+++ b/exampleSite/content/authoring/frontmatter/linking/index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "What options are available for links and images"
 frontmatter = ["externalLinkTarget", "image.errorlevel", "link.errorlevel"]
 options = ["externalLinkTarget", "image.errorlevel", "link.errorlevel"]
diff --git a/exampleSite/content/authoring/frontmatter/navigationmenu/_index.en.md b/exampleSite/content/authoring/frontmatter/navigationmenu/_index.en.md
index 60d3a1f80f..65a609b8a0 100644
--- a/exampleSite/content/authoring/frontmatter/navigationmenu/_index.en.md
+++ b/exampleSite/content/authoring/frontmatter/navigationmenu/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "Behavior of the navigation menu"
 frontmatter = ["alwaysopen", "collapsibleMenu", "linkTitle", "menuPost", "menuPre", "ordersectionsby"]
 options = ["alwaysopen", "collapsibleMenu", "ordersectionsby"]
diff --git a/exampleSite/content/authoring/frontmatter/navigationmenu/_index.pir.md b/exampleSite/content/authoring/frontmatter/navigationmenu/_index.pir.md
index 7fdb8a711c..b70aa52303 100644
--- a/exampleSite/content/authoring/frontmatter/navigationmenu/_index.pir.md
+++ b/exampleSite/content/authoring/frontmatter/navigationmenu/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "Behavior of the navigation menu"
 frontmatter = ["alwaysopen", "collapsibleMenu", "linkTitle", "menuPost", "menuPre", "ordersectionsby"]
 options = ["alwaysopen", "collapsibleMenu", "ordersectionsby"]
diff --git a/exampleSite/content/authoring/frontmatter/reference/_index.en.md b/exampleSite/content/authoring/frontmatter/reference/_index.en.md
index 11ce32e37c..a9f2850e61 100644
--- a/exampleSite/content/authoring/frontmatter/reference/_index.en.md
+++ b/exampleSite/content/authoring/frontmatter/reference/_index.en.md
@@ -1,7 +1,7 @@
 +++
+categories = ["reference"]
 description = "All front matter for the Relearn theme"
 linkTitle = "Reference"
-tags = ["reference"]
 title = "Front Matter Reference"
 weight = 5
 +++
diff --git a/exampleSite/content/authoring/frontmatter/reference/_index.pir.md b/exampleSite/content/authoring/frontmatter/reference/_index.pir.md
index c6f04b4614..87d6c0928e 100644
--- a/exampleSite/content/authoring/frontmatter/reference/_index.pir.md
+++ b/exampleSite/content/authoring/frontmatter/reference/_index.pir.md
@@ -1,7 +1,7 @@
 +++
+categories = ["reference"]
 description = "All front matter for the Relearn theme"
 linkTitle = "Reference"
-tags = ["reference"]
 title = "Front Matter Reference"
 weight = 5
 +++
diff --git a/exampleSite/content/authoring/frontmatter/topbar/_index.en.md b/exampleSite/content/authoring/frontmatter/topbar/_index.en.md
index 29bd588c6c..32a7ef9919 100644
--- a/exampleSite/content/authoring/frontmatter/topbar/_index.en.md
+++ b/exampleSite/content/authoring/frontmatter/topbar/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "Configure the topbar"
 frontmatter = ["disableBreadcrumb", "disableNextPrev", "disableToc", "editURL"]
 options = ["disableBreadcrumb", "disableNextPrev", "disableToc", "editURL"]
diff --git a/exampleSite/content/authoring/frontmatter/topbar/_index.pir.md b/exampleSite/content/authoring/frontmatter/topbar/_index.pir.md
index 393cd129d1..6b79a0f834 100644
--- a/exampleSite/content/authoring/frontmatter/topbar/_index.pir.md
+++ b/exampleSite/content/authoring/frontmatter/topbar/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "Configure the topbar"
 frontmatter = ["disableBreadcrumb", "disableNextPrev", "disableToc", "editURL"]
 options = ["disableBreadcrumb", "disableNextPrev", "disableToc", "editURL"]
diff --git a/exampleSite/content/authoring/imageeffects.en.md b/exampleSite/content/authoring/imageeffects.en.md
index 76af200e0d..7eca2aee5d 100644
--- a/exampleSite/content/authoring/imageeffects.en.md
+++ b/exampleSite/content/authoring/imageeffects.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["explanation"]
 description = "How to apply graphical effects to your images"
 frontmatter = ["imageEffects"]
 title = "Image Effects"
diff --git a/exampleSite/content/authoring/imageeffects.pir.md b/exampleSite/content/authoring/imageeffects.pir.md
index d59e7cad7e..e2dd1e62cb 100644
--- a/exampleSite/content/authoring/imageeffects.pir.md
+++ b/exampleSite/content/authoring/imageeffects.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["explanation"]
 description = "How to apply graphical effects to your images"
 frontmatter = ["imageEffects"]
 title = "Image Effects"
diff --git a/exampleSite/content/authoring/markdown.en.md b/exampleSite/content/authoring/markdown.en.md
index a28b3afabd..e0d3aaf2fc 100644
--- a/exampleSite/content/authoring/markdown.en.md
+++ b/exampleSite/content/authoring/markdown.en.md
@@ -1,6 +1,6 @@
 +++
 description = "Reference of CommonMark and Markdown extensions"
-tags = ["reference"]
+categories = ["howto", "reference"]
 title = "Markdown Syntax"
 weight = 4
 +++
diff --git a/exampleSite/content/authoring/markdown.pir.md b/exampleSite/content/authoring/markdown.pir.md
index 3420d4b1d2..6e4c3c7eef 100644
--- a/exampleSite/content/authoring/markdown.pir.md
+++ b/exampleSite/content/authoring/markdown.pir.md
@@ -1,6 +1,6 @@
 +++
 description = "Reference of CommonMark and Markdown extensions"
-tags = ["reference"]
+categories = ["howto", "reference"]
 title = "Marrrkdown Rules"
 weight = 4
 +++
diff --git a/exampleSite/content/authoring/meta/_index.en.md b/exampleSite/content/authoring/meta/_index.en.md
index caa41d585d..3b3c8a64f7 100644
--- a/exampleSite/content/authoring/meta/_index.en.md
+++ b/exampleSite/content/authoring/meta/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "What page meta information are available"
 frontmatter = ["headingPost", "headingPre", "hidden", "LastModifierDisplayName", "LastModifierEmail"]
 title = "Meta Information"
diff --git a/exampleSite/content/authoring/meta/_index.pir.md b/exampleSite/content/authoring/meta/_index.pir.md
index 9c481ccd3b..62c083eb6a 100644
--- a/exampleSite/content/authoring/meta/_index.pir.md
+++ b/exampleSite/content/authoring/meta/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "What page meta information are available"
 frontmatter = ["headingPost", "headingPre", "hidden", "LastModifierDisplayName", "LastModifierEmail"]
 title = "Meta Information"
diff --git a/exampleSite/content/authoring/structure/index.en.md b/exampleSite/content/authoring/structure/index.en.md
index e3bbda38b8..7a67d0cc1b 100644
--- a/exampleSite/content/authoring/structure/index.en.md
+++ b/exampleSite/content/authoring/structure/index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["explanation"]
 description = "Your content's directory structure"
 title = "Directory Structure"
 weight = 1
diff --git a/exampleSite/content/authoring/structure/index.pir.md b/exampleSite/content/authoring/structure/index.pir.md
index ef3d4aa5f1..dc7e09ae0e 100644
--- a/exampleSite/content/authoring/structure/index.pir.md
+++ b/exampleSite/content/authoring/structure/index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["explanation"]
 description = "Your content's directory structure"
 title = "Directory Structure"
 weight = 1
diff --git a/exampleSite/content/configuration/_index.en.md b/exampleSite/content/configuration/_index.en.md
index 1db409394c..cbaf05799f 100644
--- a/exampleSite/content/configuration/_index.en.md
+++ b/exampleSite/content/configuration/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["reference"]
 menuPre = "<i class='fa-fw fas fa-gears'></i> "
 title = "Configuration"
 type = "chapter"
diff --git a/exampleSite/content/configuration/_index.pir.md b/exampleSite/content/configuration/_index.pir.md
index 10e290b837..1f07a9da34 100644
--- a/exampleSite/content/configuration/_index.pir.md
+++ b/exampleSite/content/configuration/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["reference"]
 menuPre = "<i class='fa-fw fas fa-gears'></i> "
 title = "Configurrrat'n"
 type = "chapter"
diff --git a/exampleSite/content/configuration/branding/_index.en.md b/exampleSite/content/configuration/branding/_index.en.md
index 556966f671..b3a6296f49 100644
--- a/exampleSite/content/configuration/branding/_index.en.md
+++ b/exampleSite/content/configuration/branding/_index.en.md
@@ -1,5 +1,6 @@
 +++
 alwaysopen = false
+categories = ["reference"]
 description = "Change colors and logos of your site"
 title = "Branding"
 weight = 2
diff --git a/exampleSite/content/configuration/branding/_index.pir.md b/exampleSite/content/configuration/branding/_index.pir.md
index 37fcc22118..b0c81729cd 100644
--- a/exampleSite/content/configuration/branding/_index.pir.md
+++ b/exampleSite/content/configuration/branding/_index.pir.md
@@ -1,5 +1,6 @@
 +++
 alwaysopen = false
+categories = ["reference"]
 description = "Change colors and logos of your site"
 title = "Brrrand'n"
 weight = 2
diff --git a/exampleSite/content/configuration/branding/colors/_index.en.md b/exampleSite/content/configuration/branding/colors/_index.en.md
index 767b43137d..e33ced2f37 100644
--- a/exampleSite/content/configuration/branding/colors/_index.en.md
+++ b/exampleSite/content/configuration/branding/colors/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["explanation", "howto"]
 description = "Learn how to customize your site's colors"
 options = ["themeVariant"]
 title = "Colors"
diff --git a/exampleSite/content/configuration/branding/colors/_index.pir.md b/exampleSite/content/configuration/branding/colors/_index.pir.md
index 54a1cedac3..e4ded9c17a 100644
--- a/exampleSite/content/configuration/branding/colors/_index.pir.md
+++ b/exampleSite/content/configuration/branding/colors/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["explanation", "howto"]
 description = "Learn how to customize your site's colors"
 options = ["themeVariant"]
 title = "Brrrand'n"
diff --git a/exampleSite/content/configuration/branding/generator/_index.en.md b/exampleSite/content/configuration/branding/generator/_index.en.md
index 47471d3380..b878a92a9d 100644
--- a/exampleSite/content/configuration/branding/generator/_index.en.md
+++ b/exampleSite/content/configuration/branding/generator/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["tutorial"]
 description = "An interactive tool to generate color variant stylesheets"
 mermaid.force = true
 options = ["themeVariant"]
diff --git a/exampleSite/content/configuration/branding/generator/_index.pir.md b/exampleSite/content/configuration/branding/generator/_index.pir.md
index c4bada51f1..c538e49736 100644
--- a/exampleSite/content/configuration/branding/generator/_index.pir.md
+++ b/exampleSite/content/configuration/branding/generator/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["tutorial"]
 description = "An interactive tool to generate color variant stylesheets"
 mermaid.force = true
 options = ["themeVariant"]
diff --git a/exampleSite/content/configuration/branding/logo/_index.en.md b/exampleSite/content/configuration/branding/logo/_index.en.md
index 6ed0b13edd..5bed32a2ae 100644
--- a/exampleSite/content/configuration/branding/logo/_index.en.md
+++ b/exampleSite/content/configuration/branding/logo/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "Provide your own logo and favicon"
 title = "Logo"
 weight = 1
diff --git a/exampleSite/content/configuration/branding/logo/_index.pir.md b/exampleSite/content/configuration/branding/logo/_index.pir.md
index 93434af0d0..421aa20e9b 100644
--- a/exampleSite/content/configuration/branding/logo/_index.pir.md
+++ b/exampleSite/content/configuration/branding/logo/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "Provide your own logo and favicon"
 title = "Logo"
 weight = 1
diff --git a/exampleSite/content/configuration/branding/modules/_index.en.md b/exampleSite/content/configuration/branding/modules/_index.en.md
index 24cbc86228..a0ba11dc59 100644
--- a/exampleSite/content/configuration/branding/modules/_index.en.md
+++ b/exampleSite/content/configuration/branding/modules/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "Colors of syntax highlighting and 3rd-party modules"
 title = "Module Theming"
 weight = 3
diff --git a/exampleSite/content/configuration/branding/modules/_index.pir.md b/exampleSite/content/configuration/branding/modules/_index.pir.md
index e8a5cf4e0b..784e8a0406 100644
--- a/exampleSite/content/configuration/branding/modules/_index.pir.md
+++ b/exampleSite/content/configuration/branding/modules/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "Colors of syntax highlighting and 3rd-party modules"
 title = "Module Theming"
 weight = 3
diff --git a/exampleSite/content/configuration/content/_index.en.md b/exampleSite/content/configuration/content/_index.en.md
index aebb01e56b..418e4adf8e 100644
--- a/exampleSite/content/configuration/content/_index.en.md
+++ b/exampleSite/content/configuration/content/_index.en.md
@@ -1,5 +1,6 @@
 +++
 alwaysopen = false
+categories = ["reference"]
 description = "Configure the content area of your site"
 title = "Content"
 weight = 4
diff --git a/exampleSite/content/configuration/content/_index.pir.md b/exampleSite/content/configuration/content/_index.pir.md
index d5ad80376b..960d2a8a70 100644
--- a/exampleSite/content/configuration/content/_index.pir.md
+++ b/exampleSite/content/configuration/content/_index.pir.md
@@ -1,5 +1,6 @@
 +++
 alwaysopen = false
+categories = ["reference"]
 description = "Configure the content area of your site"
 title = "Content"
 weight = 4
diff --git a/exampleSite/content/configuration/content/headings/index.en.md b/exampleSite/content/configuration/content/headings/index.en.md
index 0e392cd14f..1d79e5611c 100644
--- a/exampleSite/content/configuration/content/headings/index.en.md
+++ b/exampleSite/content/configuration/content/headings/index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "Configuring heading anchors"
 options = ["disableAnchorCopy", "disableAnchorScrolling"]
 title = "Headings"
diff --git a/exampleSite/content/configuration/content/headings/index.pir.md b/exampleSite/content/configuration/content/headings/index.pir.md
index 0a9793be27..1567d71cfb 100644
--- a/exampleSite/content/configuration/content/headings/index.pir.md
+++ b/exampleSite/content/configuration/content/headings/index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "Configuring heading anchors"
 options = ["disableAnchorCopy", "disableAnchorScrolling"]
 title = "Headings"
diff --git a/exampleSite/content/configuration/content/hidden/_index.en.md b/exampleSite/content/configuration/content/hidden/_index.en.md
index 6f03b81241..41657871c6 100644
--- a/exampleSite/content/configuration/content/hidden/_index.en.md
+++ b/exampleSite/content/configuration/content/hidden/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["explanation", "howto"]
 description = "Learn about the hidden pages feature"
 options = ["disableSearchHiddenPages", "disableSeoHiddenPages", "disableTagHiddenPages"]
 title = "Hidden Pages"
diff --git a/exampleSite/content/configuration/content/hidden/_index.pir.md b/exampleSite/content/configuration/content/hidden/_index.pir.md
index 453f824ff2..49ae57842f 100644
--- a/exampleSite/content/configuration/content/hidden/_index.pir.md
+++ b/exampleSite/content/configuration/content/hidden/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["explanation", "howto"]
 description = "Learn about the hidden pages feature"
 options = ["disableSearchHiddenPages", "disableSeoHiddenPages", "disableTagHiddenPages"]
 title = "Hidden Pages"
diff --git a/exampleSite/content/configuration/content/linking/index.en.md b/exampleSite/content/configuration/content/linking/index.en.md
index f41feb69a4..29d06402c6 100644
--- a/exampleSite/content/configuration/content/linking/index.en.md
+++ b/exampleSite/content/configuration/content/linking/index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "What options are available for links and images"
 options = ["disableDefaultRelref", "disableExplicitIndexURLs"]
 title = "Linking"
diff --git a/exampleSite/content/configuration/content/linking/index.pir.md b/exampleSite/content/configuration/content/linking/index.pir.md
index 67f5946c6b..7742d8d769 100644
--- a/exampleSite/content/configuration/content/linking/index.pir.md
+++ b/exampleSite/content/configuration/content/linking/index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "What options are available for links and images"
 options = ["disableDefaultRelref", "disableExplicitIndexURLs"]
 title = "Linking"
diff --git a/exampleSite/content/configuration/content/titles/index.en.md b/exampleSite/content/configuration/content/titles/index.en.md
index 4bdaeea013..89f338325d 100644
--- a/exampleSite/content/configuration/content/titles/index.en.md
+++ b/exampleSite/content/configuration/content/titles/index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "Configuring titles and breadcrumbs to your needs"
 options = ["breadcrumbSeparator", "disableRootBreadcrumb", "disableTermBreadcrumbs", "titleSeparator"]
 title = "Titles & Breadcrumbs"
diff --git a/exampleSite/content/configuration/content/titles/index.pir.md b/exampleSite/content/configuration/content/titles/index.pir.md
index fb2066993f..5ba1e998e6 100644
--- a/exampleSite/content/configuration/content/titles/index.pir.md
+++ b/exampleSite/content/configuration/content/titles/index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "Configuring titles and breadcrumbs to your needs"
 options = ["breadcrumbSeparator", "disableRootBreadcrumb", "disableTermBreadcrumbs", "titleSeparator"]
 title = "Titles & Breadcrumbs"
diff --git a/exampleSite/content/configuration/content/width/_index.en.md b/exampleSite/content/configuration/content/width/_index.en.md
index 567823c0e9..ca4c5c2394 100644
--- a/exampleSite/content/configuration/content/width/_index.en.md
+++ b/exampleSite/content/configuration/content/width/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "Changing the content area width"
 title = "Width"
 weight = 1
diff --git a/exampleSite/content/configuration/content/width/_index.pir.md b/exampleSite/content/configuration/content/width/_index.pir.md
index b84bafd854..ebe63e06d7 100644
--- a/exampleSite/content/configuration/content/width/_index.pir.md
+++ b/exampleSite/content/configuration/content/width/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "Changing the content area width"
 title = "Width"
 weight = 1
diff --git a/exampleSite/content/configuration/customization/_index.en.md b/exampleSite/content/configuration/customization/_index.en.md
index 3695211d5a..5b550b3b2f 100644
--- a/exampleSite/content/configuration/customization/_index.en.md
+++ b/exampleSite/content/configuration/customization/_index.en.md
@@ -1,5 +1,6 @@
 +++
 alwaysopen = false
+categories = ["reference"]
 description = "Customize files for advanced usage"
 title = "Customization"
 weight = 5
diff --git a/exampleSite/content/configuration/customization/_index.pir.md b/exampleSite/content/configuration/customization/_index.pir.md
index 833a770881..fac5d3ae9f 100644
--- a/exampleSite/content/configuration/customization/_index.pir.md
+++ b/exampleSite/content/configuration/customization/_index.pir.md
@@ -1,5 +1,6 @@
 +++
 alwaysopen = false
+categories = ["reference"]
 description = "Customize files for advanced usage"
 title = "Customization"
 weight = 5
diff --git a/exampleSite/content/configuration/customization/dependencies/_index.en.md b/exampleSite/content/configuration/customization/dependencies/_index.en.md
index 6888a22f20..33d17486b4 100644
--- a/exampleSite/content/configuration/customization/dependencies/_index.en.md
+++ b/exampleSite/content/configuration/customization/dependencies/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["explanation", "howto"]
 description = "Add further code to your site"
 options = ["relearn.dependencies"]
 title = "Extending Scripts"
diff --git a/exampleSite/content/configuration/customization/dependencies/_index.pir.md b/exampleSite/content/configuration/customization/dependencies/_index.pir.md
index 5d48d31da8..87bbd42f1c 100644
--- a/exampleSite/content/configuration/customization/dependencies/_index.pir.md
+++ b/exampleSite/content/configuration/customization/dependencies/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["explanation", "howto"]
 description = "Add further code to your site"
 options = ["relearn.dependencies"]
 title = "Extending Scripts"
diff --git a/exampleSite/content/configuration/customization/designs/index.en.md b/exampleSite/content/configuration/customization/designs/index.en.md
index 254899dee4..8c17ccf84c 100644
--- a/exampleSite/content/configuration/customization/designs/index.en.md
+++ b/exampleSite/content/configuration/customization/designs/index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["explanation", "howto"]
 description = "Extending page designs"
 title = "Page Designs"
 weight = 5
diff --git a/exampleSite/content/configuration/customization/designs/index.pir.md b/exampleSite/content/configuration/customization/designs/index.pir.md
index 8a65b93515..8120753890 100644
--- a/exampleSite/content/configuration/customization/designs/index.pir.md
+++ b/exampleSite/content/configuration/customization/designs/index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["explanation", "howto"]
 description = "Using and extending page designs"
 title = "Page Designs"
 weight = 5
diff --git a/exampleSite/content/configuration/customization/imageeffects.en.md b/exampleSite/content/configuration/customization/imageeffects.en.md
index caf20db4db..3f3bba39c4 100644
--- a/exampleSite/content/configuration/customization/imageeffects.en.md
+++ b/exampleSite/content/configuration/customization/imageeffects.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["explanation", "howto"]
 description = "How to extend image effects"
 options = ["imageEffects"]
 title = "Image Effects"
diff --git a/exampleSite/content/configuration/customization/imageeffects.pir.md b/exampleSite/content/configuration/customization/imageeffects.pir.md
index 61732d1162..a62efad158 100644
--- a/exampleSite/content/configuration/customization/imageeffects.pir.md
+++ b/exampleSite/content/configuration/customization/imageeffects.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["explanation", "howto"]
 description = "How to extend image effects"
 options = ["imageEffects"]
 title = "Image Effects"
diff --git a/exampleSite/content/configuration/customization/outputformats/_index.en.md b/exampleSite/content/configuration/customization/outputformats/_index.en.md
index 41ea22c413..23988ec7e5 100644
--- a/exampleSite/content/configuration/customization/outputformats/_index.en.md
+++ b/exampleSite/content/configuration/customization/outputformats/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["explanation", "howto"]
 description = "Adding Custom Output Formats"
 title = "Output Formats"
 weight = 6
diff --git a/exampleSite/content/configuration/customization/outputformats/_index.pir.md b/exampleSite/content/configuration/customization/outputformats/_index.pir.md
index 6a674b98ed..3a47a2b121 100644
--- a/exampleSite/content/configuration/customization/outputformats/_index.pir.md
+++ b/exampleSite/content/configuration/customization/outputformats/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["explanation", "howto"]
 description = "Adding Custom Output Formats"
 title = "Output Formats"
 weight = 6
diff --git a/exampleSite/content/configuration/customization/partials/index.en.md b/exampleSite/content/configuration/customization/partials/index.en.md
index fec8049cc7..cfd918ea43 100644
--- a/exampleSite/content/configuration/customization/partials/index.en.md
+++ b/exampleSite/content/configuration/customization/partials/index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["explanation"]
 description = "Modifying partials to your needs"
 title = "Partials"
 weight = 1
diff --git a/exampleSite/content/configuration/customization/partials/index.pir.md b/exampleSite/content/configuration/customization/partials/index.pir.md
index d13d92a57f..a779486fbb 100644
--- a/exampleSite/content/configuration/customization/partials/index.pir.md
+++ b/exampleSite/content/configuration/customization/partials/index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["explanation"]
 description = "Modifying partials to your needs"
 title = "Partials"
 weight = 1
diff --git a/exampleSite/content/configuration/customization/taxonomy.en.md b/exampleSite/content/configuration/customization/taxonomy.en.md
index 9b3ce52be1..c420792072 100644
--- a/exampleSite/content/configuration/customization/taxonomy.en.md
+++ b/exampleSite/content/configuration/customization/taxonomy.en.md
@@ -1,7 +1,6 @@
 +++
-categories = ["taxonomy", "content"]
+categories = ["explanation", "howto", "reference"]
 description = "How to display custom taxonomies on your pages"
-tags = "tutorial"
 title = "Taxonomies"
 weight = 7
 +++
diff --git a/exampleSite/content/configuration/customization/taxonomy.pir.md b/exampleSite/content/configuration/customization/taxonomy.pir.md
index b9f51f1cf2..ed7f85d38b 100644
--- a/exampleSite/content/configuration/customization/taxonomy.pir.md
+++ b/exampleSite/content/configuration/customization/taxonomy.pir.md
@@ -1,7 +1,6 @@
 +++
-categories = ["taxonomy", "content"]
+categories = ["explanation", "howto", "reference"]
 description = "How to display custom taxonomies on your pages"
-tags = "tutorrrial"
 title = "Taxonomies"
 weight = 7
 +++
diff --git a/exampleSite/content/configuration/customization/topbar/_index.en.md b/exampleSite/content/configuration/customization/topbar/_index.en.md
index c144a1925a..c5c89bdf30 100644
--- a/exampleSite/content/configuration/customization/topbar/_index.en.md
+++ b/exampleSite/content/configuration/customization/topbar/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["explanation", "reference"]
 description = "How to extend the topbar"
 options = ["editURL"]
 title = "Topbar"
diff --git a/exampleSite/content/configuration/customization/topbar/_index.pir.md b/exampleSite/content/configuration/customization/topbar/_index.pir.md
index 18f363fef1..bc06e38c9e 100644
--- a/exampleSite/content/configuration/customization/topbar/_index.pir.md
+++ b/exampleSite/content/configuration/customization/topbar/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["explanation", "reference"]
 description = "How to extend the topbar"
 options = ["editURL"]
 title = "Topbarrr"
diff --git a/exampleSite/content/configuration/reference/_index.en.md b/exampleSite/content/configuration/reference/_index.en.md
index adc44aaebe..25f50a6c00 100644
--- a/exampleSite/content/configuration/reference/_index.en.md
+++ b/exampleSite/content/configuration/reference/_index.en.md
@@ -1,6 +1,6 @@
 +++
+categories = ["reference"]
 description = "All configuration options for the Relearn theme"
-tags = ["reference"]
 title = "Options Reference"
 weight = 6
 +++
diff --git a/exampleSite/content/configuration/reference/_index.pir.md b/exampleSite/content/configuration/reference/_index.pir.md
index 0448d9aa46..9e7ba8569a 100644
--- a/exampleSite/content/configuration/reference/_index.pir.md
+++ b/exampleSite/content/configuration/reference/_index.pir.md
@@ -1,6 +1,6 @@
 +++
+categories = ["reference"]
 description = "All configuration options for the Relearn theme"
-tags = ["reference"]
 title = "Options Reference"
 weight = 6
 +++
diff --git a/exampleSite/content/configuration/sidebar/_index.en.md b/exampleSite/content/configuration/sidebar/_index.en.md
index 307918deda..6cad40b923 100644
--- a/exampleSite/content/configuration/sidebar/_index.en.md
+++ b/exampleSite/content/configuration/sidebar/_index.en.md
@@ -1,5 +1,6 @@
 +++
 alwaysopen = false
+categories = ["reference"]
 description = "Configure all things sidebar"
 title = "Sidebar"
 weight = 3
diff --git a/exampleSite/content/configuration/sidebar/_index.pir.md b/exampleSite/content/configuration/sidebar/_index.pir.md
index d39172175b..6c1218135c 100644
--- a/exampleSite/content/configuration/sidebar/_index.pir.md
+++ b/exampleSite/content/configuration/sidebar/_index.pir.md
@@ -1,5 +1,6 @@
 +++
 alwaysopen = false
+categories = ["reference"]
 description = "Configure all things sidebar"
 title = "Sidebar"
 weight = 3
diff --git a/exampleSite/content/configuration/sidebar/headerfooter/_index.en.md b/exampleSite/content/configuration/sidebar/headerfooter/_index.en.md
index 738a07610f..4d6c0f1076 100644
--- a/exampleSite/content/configuration/sidebar/headerfooter/_index.en.md
+++ b/exampleSite/content/configuration/sidebar/headerfooter/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "Configure the header and footer"
 options = ["disableLandingPageButton", "landingPageName", "linkTitle", "showVisitedLinks"]
 title = "Header & Footer"
diff --git a/exampleSite/content/configuration/sidebar/headerfooter/_index.pir.md b/exampleSite/content/configuration/sidebar/headerfooter/_index.pir.md
index fd6a950c5c..b5931fb487 100644
--- a/exampleSite/content/configuration/sidebar/headerfooter/_index.pir.md
+++ b/exampleSite/content/configuration/sidebar/headerfooter/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "Configure the header and footer"
 options = ["disableLandingPageButton", "landingPageName", "linkTitle", "showVisitedLinks"]
 title = "Header & Footer"
diff --git a/exampleSite/content/configuration/sidebar/search/_index.en.md b/exampleSite/content/configuration/sidebar/search/_index.en.md
index 1f79cb613f..a76623b416 100644
--- a/exampleSite/content/configuration/sidebar/search/_index.en.md
+++ b/exampleSite/content/configuration/sidebar/search/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "Configure search and the search form"
 options = ["additionalContentLanguage", "disableSearch", "disableSearchIndex", "disableSearchPage", "searchIndexURL", "searchPageURL"]
 title = "Search"
diff --git a/exampleSite/content/configuration/sidebar/search/_index.pir.md b/exampleSite/content/configuration/sidebar/search/_index.pir.md
index e5d410e83a..107651ff1d 100644
--- a/exampleSite/content/configuration/sidebar/search/_index.pir.md
+++ b/exampleSite/content/configuration/sidebar/search/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "Configure search and the search form"
 options = ["additionalContentLanguage", "disableSearch", "disableSearchIndex", "disableSearchPage", "searchIndexURL", "searchPageURL"]
 title = "Search"
diff --git a/exampleSite/content/configuration/sidebar/shortcutmenu/_index.en.md b/exampleSite/content/configuration/sidebar/shortcutmenu/_index.en.md
index 2f55d601eb..dcd64d5b69 100644
--- a/exampleSite/content/configuration/sidebar/shortcutmenu/_index.en.md
+++ b/exampleSite/content/configuration/sidebar/shortcutmenu/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "Add additional shortcut links to the sidebar"
 options = ["disableShortcutsTitle"]
 title = "Shortcut Menu"
diff --git a/exampleSite/content/configuration/sidebar/shortcutmenu/_index.pir.md b/exampleSite/content/configuration/sidebar/shortcutmenu/_index.pir.md
index 26e89572ce..495d2d11c1 100644
--- a/exampleSite/content/configuration/sidebar/shortcutmenu/_index.pir.md
+++ b/exampleSite/content/configuration/sidebar/shortcutmenu/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "Add additional shortcut links to the sidebar"
 options = ["disableShortcutsTitle"]
 title = "Shortcut Menu"
diff --git a/exampleSite/content/configuration/sidebar/width/_index.en.md b/exampleSite/content/configuration/sidebar/width/_index.en.md
index 58a3d82516..e62940df23 100644
--- a/exampleSite/content/configuration/sidebar/width/_index.en.md
+++ b/exampleSite/content/configuration/sidebar/width/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "Changing the width of the sidebar"
 title = "Width"
 weight = 1
diff --git a/exampleSite/content/configuration/sidebar/width/_index.pir.md b/exampleSite/content/configuration/sidebar/width/_index.pir.md
index ab5c06afd3..600c51d573 100644
--- a/exampleSite/content/configuration/sidebar/width/_index.pir.md
+++ b/exampleSite/content/configuration/sidebar/width/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "Changing the width of the sidebar"
 title = "Width"
 weight = 1
diff --git a/exampleSite/content/configuration/sitemanagement/_index.en.md b/exampleSite/content/configuration/sitemanagement/_index.en.md
index 9d51c19be6..216b9e0cb7 100644
--- a/exampleSite/content/configuration/sitemanagement/_index.en.md
+++ b/exampleSite/content/configuration/sitemanagement/_index.en.md
@@ -1,5 +1,6 @@
 +++
 alwaysopen = false
+categories = ["reference"]
 description = "Get yourself familiar with the general structure of your website"
 title = "Site Management"
 weight = 1
diff --git a/exampleSite/content/configuration/sitemanagement/_index.pir.md b/exampleSite/content/configuration/sitemanagement/_index.pir.md
index a6414cb4f0..659ebb9a58 100644
--- a/exampleSite/content/configuration/sitemanagement/_index.pir.md
+++ b/exampleSite/content/configuration/sitemanagement/_index.pir.md
@@ -1,5 +1,6 @@
 +++
 alwaysopen = false
+categories = ["reference"]
 description = "Get yourself familiar with the general structure of your website"
 title = "Site Management"
 weight = 1
diff --git a/exampleSite/content/configuration/sitemanagement/deployment/_index.en.md b/exampleSite/content/configuration/sitemanagement/deployment/_index.en.md
index 3cfa162e24..a78413b6ed 100644
--- a/exampleSite/content/configuration/sitemanagement/deployment/_index.en.md
+++ b/exampleSite/content/configuration/sitemanagement/deployment/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "Options for specific deployment needs"
 title = "Deployment Scenarios"
 weight = 4
diff --git a/exampleSite/content/configuration/sitemanagement/deployment/_index.pir.md b/exampleSite/content/configuration/sitemanagement/deployment/_index.pir.md
index 8b7aec977b..3c02bce31e 100644
--- a/exampleSite/content/configuration/sitemanagement/deployment/_index.pir.md
+++ b/exampleSite/content/configuration/sitemanagement/deployment/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "Options for specific deployment needs"
 title = "Deployment Scenarios"
 weight = 4
diff --git a/exampleSite/content/configuration/sitemanagement/meta/_index.en.md b/exampleSite/content/configuration/sitemanagement/meta/_index.en.md
index 10ab9ce987..991592b3d5 100644
--- a/exampleSite/content/configuration/sitemanagement/meta/_index.en.md
+++ b/exampleSite/content/configuration/sitemanagement/meta/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "What site-wide meta information can be set"
 frontmatter = ["description"]
 options = ["author.email", "author.name"]
diff --git a/exampleSite/content/configuration/sitemanagement/meta/_index.pir.md b/exampleSite/content/configuration/sitemanagement/meta/_index.pir.md
index 7979ccfa31..700085244f 100644
--- a/exampleSite/content/configuration/sitemanagement/meta/_index.pir.md
+++ b/exampleSite/content/configuration/sitemanagement/meta/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "What site-wide meta information can be set"
 frontmatter = ["description"]
 options = ["author.email", "author.name"]
diff --git a/exampleSite/content/configuration/sitemanagement/multilingual/_index.en.md b/exampleSite/content/configuration/sitemanagement/multilingual/_index.en.md
index 1bd60fe24d..1e9e74e26b 100644
--- a/exampleSite/content/configuration/sitemanagement/multilingual/_index.en.md
+++ b/exampleSite/content/configuration/sitemanagement/multilingual/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "How to set up a multilingual site"
 options = ["disableLanguageSwitchingButton"]
 title = "Multilingual"
diff --git a/exampleSite/content/configuration/sitemanagement/multilingual/_index.pir.md b/exampleSite/content/configuration/sitemanagement/multilingual/_index.pir.md
index 75f0fc8f49..600963a7ee 100644
--- a/exampleSite/content/configuration/sitemanagement/multilingual/_index.pir.md
+++ b/exampleSite/content/configuration/sitemanagement/multilingual/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "How to set up a multilingual site"
 options = ["disableLanguageSwitchingButton"]
 title = "Multilingual"
diff --git a/exampleSite/content/configuration/sitemanagement/outputformats/_index.en.md b/exampleSite/content/configuration/sitemanagement/outputformats/_index.en.md
index e3ee64a3d9..a52a9bcc02 100644
--- a/exampleSite/content/configuration/sitemanagement/outputformats/_index.en.md
+++ b/exampleSite/content/configuration/sitemanagement/outputformats/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "What other formats can a page be displayed in"
 title = "Available Output Formats"
 weight = 5
diff --git a/exampleSite/content/configuration/sitemanagement/outputformats/_index.pir.md b/exampleSite/content/configuration/sitemanagement/outputformats/_index.pir.md
index 5ba4e8ebff..b7815b09da 100644
--- a/exampleSite/content/configuration/sitemanagement/outputformats/_index.pir.md
+++ b/exampleSite/content/configuration/sitemanagement/outputformats/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "What other formats can a page be displayed in"
 title = "Available Output Formats"
 weight = 5
diff --git a/exampleSite/content/configuration/sitemanagement/stableoutput/_index.en.md b/exampleSite/content/configuration/sitemanagement/stableoutput/_index.en.md
index 8278b199d0..0022a29d69 100644
--- a/exampleSite/content/configuration/sitemanagement/stableoutput/_index.en.md
+++ b/exampleSite/content/configuration/sitemanagement/stableoutput/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "How to make your generated HTML output stable"
 options = ["disableAssetsBusting", "disableGeneratorVersion", "disableRandomIds"]
 title = "Stable Output"
diff --git a/exampleSite/content/configuration/sitemanagement/stableoutput/_index.pir.md b/exampleSite/content/configuration/sitemanagement/stableoutput/_index.pir.md
index c7be80a323..312d4f778f 100644
--- a/exampleSite/content/configuration/sitemanagement/stableoutput/_index.pir.md
+++ b/exampleSite/content/configuration/sitemanagement/stableoutput/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "How to make your generated HTML output stable"
 options = ["disableAssetsBusting", "disableGeneratorVersion", "disableRandomIds"]
 title = "Stable Output"
diff --git a/exampleSite/content/configuration/sitemanagement/structure/_index.en.md b/exampleSite/content/configuration/sitemanagement/structure/_index.en.md
index 1791d2efe5..3995538bdc 100644
--- a/exampleSite/content/configuration/sitemanagement/structure/_index.en.md
+++ b/exampleSite/content/configuration/sitemanagement/structure/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["explanation"]
 description = "Your site's directory structure"
 title = "Directory Structure"
 weight = 1
diff --git a/exampleSite/content/configuration/sitemanagement/structure/_index.pir.md b/exampleSite/content/configuration/sitemanagement/structure/_index.pir.md
index 50f5ab3a60..1bff78e7d2 100644
--- a/exampleSite/content/configuration/sitemanagement/structure/_index.pir.md
+++ b/exampleSite/content/configuration/sitemanagement/structure/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["explanation"]
 description = "Your site's directory structure"
 title = "Directory Structure"
 weight = 1
diff --git a/exampleSite/content/development/_index.en.md b/exampleSite/content/development/_index.en.md
index 7671c5fc83..dbfdc86c1c 100644
--- a/exampleSite/content/development/_index.en.md
+++ b/exampleSite/content/development/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["reference"]
 menuPre = "<i class='fa-fw fas fa-code-pull-request'></i> "
 hidden = true
 title = "Development"
diff --git a/exampleSite/content/development/_index.pir.md b/exampleSite/content/development/_index.pir.md
index cffa56ba7e..671759580c 100644
--- a/exampleSite/content/development/_index.pir.md
+++ b/exampleSite/content/development/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["reference"]
 menuPre = "<i class='fa-fw fas fa-code-pull-request'></i> "
 hidden = true
 title = "Development"
diff --git a/exampleSite/content/development/contributing/_index.en.md b/exampleSite/content/development/contributing/_index.en.md
index cdcdec03af..392c4157bd 100644
--- a/exampleSite/content/development/contributing/_index.en.md
+++ b/exampleSite/content/development/contributing/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["explanation"]
 description = "What to know if you want to contribute"
 title = "Contributing"
 +++
diff --git a/exampleSite/content/development/contributing/_index.pir.md b/exampleSite/content/development/contributing/_index.pir.md
index 8f8518feab..c578da7f8a 100644
--- a/exampleSite/content/development/contributing/_index.pir.md
+++ b/exampleSite/content/development/contributing/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["explanation"]
 description = "What to know if you want to contribute"
 title = "Contributing"
 +++
diff --git a/exampleSite/content/development/maintaining/_index.en.md b/exampleSite/content/development/maintaining/_index.en.md
index d14446c838..c3ed02c9be 100644
--- a/exampleSite/content/development/maintaining/_index.en.md
+++ b/exampleSite/content/development/maintaining/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["explanation", "howto"]
 description = "What to know as a maintainer"
 title = "Maintaining"
 +++
diff --git a/exampleSite/content/development/maintaining/_index.pir.md b/exampleSite/content/development/maintaining/_index.pir.md
index 488fa16bd0..d5dccc9e1d 100644
--- a/exampleSite/content/development/maintaining/_index.pir.md
+++ b/exampleSite/content/development/maintaining/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["explanation", "howto"]
 description = "What to know as a maintainer"
 title = "Maintaining"
 +++
diff --git a/exampleSite/content/development/screenshots/_index.en.md b/exampleSite/content/development/screenshots/_index.en.md
index ec3f19fbd9..f0783b7bb2 100644
--- a/exampleSite/content/development/screenshots/_index.en.md
+++ b/exampleSite/content/development/screenshots/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["explanation", "howto"]
 description = "Recipe to create various documentation screenshots"
 title = "Screenshots"
 +++
diff --git a/exampleSite/content/development/screenshots/_index.pir.md b/exampleSite/content/development/screenshots/_index.pir.md
index 626b144803..924be6dc2f 100644
--- a/exampleSite/content/development/screenshots/_index.pir.md
+++ b/exampleSite/content/development/screenshots/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["explanation", "howto"]
 description = "Recipe t' create various documentat'n scrrreenshots"
 title = "Scrrrenshots"
 +++
diff --git a/exampleSite/content/introduction/changelog/_index.en.md b/exampleSite/content/introduction/changelog/_index.en.md
index 90874bca53..b3b338c8ff 100644
--- a/exampleSite/content/introduction/changelog/_index.en.md
+++ b/exampleSite/content/introduction/changelog/_index.en.md
@@ -1,5 +1,6 @@
 +++
 alwaysopen = false
+categories = ["reference"]
 description = "The detailed changelog"
 disableToc = false
 title = "Changelog"
diff --git a/exampleSite/content/introduction/changelog/_index.pir.md b/exampleSite/content/introduction/changelog/_index.pir.md
index 509eb7dd2f..3fa86e03b2 100644
--- a/exampleSite/content/introduction/changelog/_index.pir.md
+++ b/exampleSite/content/introduction/changelog/_index.pir.md
@@ -1,5 +1,6 @@
 +++
 alwaysopen = false
+categories = ["reference"]
 description = "The detailed changelog"
 disableToc = false
 title = "Changelog"
diff --git a/exampleSite/content/introduction/quickstart/_index.en.md b/exampleSite/content/introduction/quickstart/_index.en.md
index 6c672aa05b..1c96a9dded 100644
--- a/exampleSite/content/introduction/quickstart/_index.en.md
+++ b/exampleSite/content/introduction/quickstart/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["tutorial"]
 description = "Initialize your website in a few simple steps"
 title = "Getting Started"
 weight = 1
diff --git a/exampleSite/content/introduction/quickstart/_index.pir.md b/exampleSite/content/introduction/quickstart/_index.pir.md
index b17cf4ac00..04055c4bd8 100644
--- a/exampleSite/content/introduction/quickstart/_index.pir.md
+++ b/exampleSite/content/introduction/quickstart/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["tutorial"]
 description = "Initialize your website in a few simple steps"
 title = "Gettin' started"
 weight = 1
diff --git a/exampleSite/content/introduction/releasenotes/_index.en.md b/exampleSite/content/introduction/releasenotes/_index.en.md
index 243eaf6fe2..0442e3fce5 100644
--- a/exampleSite/content/introduction/releasenotes/_index.en.md
+++ b/exampleSite/content/introduction/releasenotes/_index.en.md
@@ -1,5 +1,6 @@
 +++
 alwaysopen = false
+categories = ["explanation"]
 description = "What's new in this version"
 disableToc = false
 title = "What's New"
diff --git a/exampleSite/content/introduction/releasenotes/_index.pir.md b/exampleSite/content/introduction/releasenotes/_index.pir.md
index 9e475e996f..84ce8d0a1f 100644
--- a/exampleSite/content/introduction/releasenotes/_index.pir.md
+++ b/exampleSite/content/introduction/releasenotes/_index.pir.md
@@ -1,5 +1,6 @@
 +++
 alwaysopen = false
+categories = ["explanation"]
 description = "What's new in this version"
 disableToc = false
 title = "What's New"
diff --git a/exampleSite/content/introduction/tools/_index.en.md b/exampleSite/content/introduction/tools/_index.en.md
index 5aca6b3409..ba3fcc5866 100644
--- a/exampleSite/content/introduction/tools/_index.en.md
+++ b/exampleSite/content/introduction/tools/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "All about supported 3rd party tools"
 title = "Tool Integration"
 weight = 2
diff --git a/exampleSite/content/introduction/tools/_index.pir.md b/exampleSite/content/introduction/tools/_index.pir.md
index c641c221f6..a9276a1d1f 100644
--- a/exampleSite/content/introduction/tools/_index.pir.md
+++ b/exampleSite/content/introduction/tools/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto"]
 description = "All about supported 3rd party tools"
 title = "Tool Integration"
 weight = 2
diff --git a/exampleSite/content/shortcodes/_index.en.md b/exampleSite/content/shortcodes/_index.en.md
index d3c53b19b6..1e106b07bd 100644
--- a/exampleSite/content/shortcodes/_index.en.md
+++ b/exampleSite/content/shortcodes/_index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["reference"]
 menuPre = "<i class='fa-fw fas fa-shapes'></i> "
 ordersectionsby = "title"
 title = "Shortcodes"
diff --git a/exampleSite/content/shortcodes/_index.pir.md b/exampleSite/content/shortcodes/_index.pir.md
index 8a206fbd73..00447ade40 100644
--- a/exampleSite/content/shortcodes/_index.pir.md
+++ b/exampleSite/content/shortcodes/_index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["reference"]
 menuPre = "<i class='fa-fw fas fa-shapes'></i> "
 ordersectionsby = "title"
 title = "Shorrrtcodes"
diff --git a/exampleSite/content/shortcodes/attachments/index.en.md b/exampleSite/content/shortcodes/attachments/index.en.md
index 469de2698f..7c51a2155c 100644
--- a/exampleSite/content/shortcodes/attachments/index.en.md
+++ b/exampleSite/content/shortcodes/attachments/index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto", "reference"]
 description = "List of files attached to a page"
 hidden = "true"
 title = "Attachments"
diff --git a/exampleSite/content/shortcodes/attachments/index.pir.md b/exampleSite/content/shortcodes/attachments/index.pir.md
index 32c05d4d13..d72ec64549 100644
--- a/exampleSite/content/shortcodes/attachments/index.pir.md
+++ b/exampleSite/content/shortcodes/attachments/index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto", "reference"]
 description = "Th' Attachments shorrrtcode displays a list o' files attached t' a plank"
 hidden = "true"
 title = "Attachments"
diff --git a/exampleSite/content/shortcodes/badge.en.md b/exampleSite/content/shortcodes/badge.en.md
index a172877acf..1d3815f898 100644
--- a/exampleSite/content/shortcodes/badge.en.md
+++ b/exampleSite/content/shortcodes/badge.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto", "reference"]
 description = "Marker badges to display in your text"
 title = "Badge"
 +++
diff --git a/exampleSite/content/shortcodes/badge.pir.md b/exampleSite/content/shortcodes/badge.pir.md
index a9b9c24565..d3365d84bd 100644
--- a/exampleSite/content/shortcodes/badge.pir.md
+++ b/exampleSite/content/shortcodes/badge.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto", "reference"]
 description = "Marker badges t' display 'n yer text"
 title = "Badge"
 +++
diff --git a/exampleSite/content/shortcodes/button.en.md b/exampleSite/content/shortcodes/button.en.md
index ae671fd37f..d3c2026d1d 100644
--- a/exampleSite/content/shortcodes/button.en.md
+++ b/exampleSite/content/shortcodes/button.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto", "reference"]
 description = "Clickable buttons"
 title = "Button"
 +++
diff --git a/exampleSite/content/shortcodes/button.pir.md b/exampleSite/content/shortcodes/button.pir.md
index c90ed98767..64b2954cee 100644
--- a/exampleSite/content/shortcodes/button.pir.md
+++ b/exampleSite/content/shortcodes/button.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto", "reference"]
 description = "Clickable buttons"
 title = "Button"
 +++
diff --git a/exampleSite/content/shortcodes/children/_index.en.md b/exampleSite/content/shortcodes/children/_index.en.md
index f4903adac8..bc96f1dcc6 100644
--- a/exampleSite/content/shortcodes/children/_index.en.md
+++ b/exampleSite/content/shortcodes/children/_index.en.md
@@ -1,5 +1,6 @@
 +++
 alwaysopen = false
+categories = ["howto", "reference"]
 frontmatter = ["ordersectionsby"]
 options = ["ordersectionsby"]
 description = "List the child pages of a page"
diff --git a/exampleSite/content/shortcodes/children/_index.pir.md b/exampleSite/content/shortcodes/children/_index.pir.md
index 03b94b6777..bd206a18a2 100644
--- a/exampleSite/content/shortcodes/children/_index.pir.md
+++ b/exampleSite/content/shortcodes/children/_index.pir.md
@@ -1,5 +1,6 @@
 +++
 alwaysopen = false
+categories = ["howto", "reference"]
 frontmatter = ["ordersectionsby"]
 options = ["ordersectionsby"]
 description = "List th' child planks on a plank"
diff --git a/exampleSite/content/shortcodes/expand.en.md b/exampleSite/content/shortcodes/expand.en.md
index f3413f42fb..28350cd587 100644
--- a/exampleSite/content/shortcodes/expand.en.md
+++ b/exampleSite/content/shortcodes/expand.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto", "reference"]
 description = "Expandable/collapsible sections of text"
 title = "Expand"
 +++
diff --git a/exampleSite/content/shortcodes/expand.pir.md b/exampleSite/content/shortcodes/expand.pir.md
index a667b7653f..5b4f958981 100644
--- a/exampleSite/content/shortcodes/expand.pir.md
+++ b/exampleSite/content/shortcodes/expand.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto", "reference"]
 description = "Expand'ble/collaps'ble sections of text"
 title = "Expand"
 +++
diff --git a/exampleSite/content/shortcodes/highlight.en.md b/exampleSite/content/shortcodes/highlight.en.md
index da8139170f..ccb58caa44 100644
--- a/exampleSite/content/shortcodes/highlight.en.md
+++ b/exampleSite/content/shortcodes/highlight.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto", "reference"]
 description = "Render code with a syntax highlighter"
 frontmatter = ["highlightWrap"]
 options = ["disableHoverBlockCopyToClipBoard", "disableInlineCopyToClipBoard", "highlightWrap"]
diff --git a/exampleSite/content/shortcodes/highlight.pir.md b/exampleSite/content/shortcodes/highlight.pir.md
index de50951cde..05a305a68b 100644
--- a/exampleSite/content/shortcodes/highlight.pir.md
+++ b/exampleSite/content/shortcodes/highlight.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto", "reference"]
 description = "Render code with a syntax highlighter"
 frontmatter = ["highlightWrap"]
 options = ["disableHoverBlockCopyToClipBoard", "disableInlineCopyToClipBoard", "highlightWrap"]
diff --git a/exampleSite/content/shortcodes/icon.en.md b/exampleSite/content/shortcodes/icon.en.md
index c7efc83962..a0cc9c9460 100644
--- a/exampleSite/content/shortcodes/icon.en.md
+++ b/exampleSite/content/shortcodes/icon.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto", "reference"]
 description = "Nice icons for your page"
 title = "Icon"
 +++
diff --git a/exampleSite/content/shortcodes/icon.pir.md b/exampleSite/content/shortcodes/icon.pir.md
index 5738f256b7..050827e185 100644
--- a/exampleSite/content/shortcodes/icon.pir.md
+++ b/exampleSite/content/shortcodes/icon.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto", "reference"]
 description = "Nice ay'cons fer yer plank"
 title = "Icon"
 +++
diff --git a/exampleSite/content/shortcodes/include/index.en.md b/exampleSite/content/shortcodes/include/index.en.md
index a1c5526e10..e42e639d5a 100644
--- a/exampleSite/content/shortcodes/include/index.en.md
+++ b/exampleSite/content/shortcodes/include/index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto", "reference"]
 description = "Displays content from other files"
 frontmatter = ["include.errorlevel"]
 options = ["include.errorlevel"]
diff --git a/exampleSite/content/shortcodes/include/index.pir.md b/exampleSite/content/shortcodes/include/index.pir.md
index 71c63ce63d..0059103827 100644
--- a/exampleSite/content/shortcodes/include/index.pir.md
+++ b/exampleSite/content/shortcodes/include/index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto", "reference"]
 description = "Displays content from other Marrrkdown files"
 frontmatter = ["include.errorlevel"]
 options = ["include.errorlevel"]
diff --git a/exampleSite/content/shortcodes/math.en.md b/exampleSite/content/shortcodes/math.en.md
index 4e47e07850..f002c5c8d7 100644
--- a/exampleSite/content/shortcodes/math.en.md
+++ b/exampleSite/content/shortcodes/math.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto", "reference"]
 description = "Beautiful math and chemical formulae"
 frontmatter = ["customMathJaxURL", "math", "math.force", "mathJaxInitialize"]
 options = ["customMathJaxURL", "math", "math.force", "mathJaxInitialize"]
diff --git a/exampleSite/content/shortcodes/math.pir.md b/exampleSite/content/shortcodes/math.pir.md
index ff98be8115..e488ce0572 100644
--- a/exampleSite/content/shortcodes/math.pir.md
+++ b/exampleSite/content/shortcodes/math.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto", "reference"]
 description = "Beaut'fl math and chemical formulae"
 frontmatter = ["customMathJaxURL", "math", "math.force", "mathJaxInitialize"]
 options = ["customMathJaxURL", "math", "math.force", "mathJaxInitialize"]
diff --git a/exampleSite/content/shortcodes/mermaid.en.md b/exampleSite/content/shortcodes/mermaid.en.md
index f48bbcb0ac..038f574452 100644
--- a/exampleSite/content/shortcodes/mermaid.en.md
+++ b/exampleSite/content/shortcodes/mermaid.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto", "reference"]
 description = "Generate diagrams and flowcharts from text"
 frontmatter = ["customMermaidURL", "mermaid.force", "mermaidInitialize", "mermaidZoom"]
 options = ["customMermaidURL", "mermaid.force", "mermaidInitialize", "mermaidZoom"]
diff --git a/exampleSite/content/shortcodes/mermaid.pir.md b/exampleSite/content/shortcodes/mermaid.pir.md
index 25a9a4f7f2..06c4c330d0 100644
--- a/exampleSite/content/shortcodes/mermaid.pir.md
+++ b/exampleSite/content/shortcodes/mermaid.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto", "reference"]
 description = "Generrrat'n o' diagrrram an' flowcharrrt frrrom text"
 frontmatter = ["customMermaidURL", "mermaid.force", "mermaidInitialize", "mermaidZoom"]
 options = ["customMermaidURL", "mermaid.force", "mermaidInitialize", "mermaidZoom"]
diff --git a/exampleSite/content/shortcodes/notice.en.md b/exampleSite/content/shortcodes/notice.en.md
index 80e1d4757d..7ce809730f 100644
--- a/exampleSite/content/shortcodes/notice.en.md
+++ b/exampleSite/content/shortcodes/notice.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto", "reference"]
 description = "Disclaimers to help you structure your page"
 options = ["boxStyle"]
 title = "Notice"
diff --git a/exampleSite/content/shortcodes/notice.pir.md b/exampleSite/content/shortcodes/notice.pir.md
index 48f679f9f6..41550b134c 100644
--- a/exampleSite/content/shortcodes/notice.pir.md
+++ b/exampleSite/content/shortcodes/notice.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto", "reference"]
 description = "Disclaimers to help you structure your page"
 options = ["boxStyle"]
 title = "Notice"
diff --git a/exampleSite/content/shortcodes/openapi/_index.en.md b/exampleSite/content/shortcodes/openapi/_index.en.md
index 57706589fb..31ca6d5ee6 100644
--- a/exampleSite/content/shortcodes/openapi/_index.en.md
+++ b/exampleSite/content/shortcodes/openapi/_index.en.md
@@ -1,5 +1,6 @@
 +++
 aliases = "/shortcodes/swagger"
+categories = ["howto", "reference"]
 description = "UI for your OpenAPI / Swagger specifications"
 frontmatter = ["customOpenapiURL", "openapi.errorlevel", "openapi.force"]
 options = ["customOpenapiURL", "openapi.errorlevel", "openapi.force"]
diff --git a/exampleSite/content/shortcodes/openapi/_index.pir.md b/exampleSite/content/shortcodes/openapi/_index.pir.md
index 8e0fd844a3..5a532a3d0f 100644
--- a/exampleSite/content/shortcodes/openapi/_index.pir.md
+++ b/exampleSite/content/shortcodes/openapi/_index.pir.md
@@ -1,5 +1,6 @@
 +++
 aliases = "/pir/shortcodes/swagger"
+categories = ["howto", "reference"]
 description = "UI fer yer OpenAPI / Swaggerrr Specificat'ns"
 frontmatter = ["customOpenapiURL", "openapi.errorlevel", "openapi.force"]
 options = ["customOpenapiURL", "openapi.errorlevel", "openapi.force"]
diff --git a/exampleSite/content/shortcodes/resources/index.en.md b/exampleSite/content/shortcodes/resources/index.en.md
index 46d53f0372..0a1d4b8e85 100644
--- a/exampleSite/content/shortcodes/resources/index.en.md
+++ b/exampleSite/content/shortcodes/resources/index.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto", "reference"]
 description = "List resources contained in a page bundle"
 title = "Resources"
 [[resources]]
diff --git a/exampleSite/content/shortcodes/resources/index.pir.md b/exampleSite/content/shortcodes/resources/index.pir.md
index 00e0d9f30d..91991e345b 100644
--- a/exampleSite/content/shortcodes/resources/index.pir.md
+++ b/exampleSite/content/shortcodes/resources/index.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto", "reference"]
 description = "List Rrresources shorrrtcode contained in a plank bundle"
 title = "Resources"
 [[resources]]
diff --git a/exampleSite/content/shortcodes/siteparam.en.md b/exampleSite/content/shortcodes/siteparam.en.md
index 0fef7579e1..9f74dd0984 100644
--- a/exampleSite/content/shortcodes/siteparam.en.md
+++ b/exampleSite/content/shortcodes/siteparam.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto", "reference"]
 description = "Get value of site params"
 title = "SiteParam"
 +++
diff --git a/exampleSite/content/shortcodes/siteparam.pir.md b/exampleSite/content/shortcodes/siteparam.pir.md
index 8b410f8fa0..1302a851a0 100644
--- a/exampleSite/content/shortcodes/siteparam.pir.md
+++ b/exampleSite/content/shortcodes/siteparam.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto", "reference"]
 description = "Get value o' ship parrrams"
 title = "SiteParam"
 +++
diff --git a/exampleSite/content/shortcodes/tab.en.md b/exampleSite/content/shortcodes/tab.en.md
index b4c42c8d42..fe0e16f139 100644
--- a/exampleSite/content/shortcodes/tab.en.md
+++ b/exampleSite/content/shortcodes/tab.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto", "reference"]
 description = "Show content in a single tab"
 title = "Tab"
 +++
diff --git a/exampleSite/content/shortcodes/tab.pir.md b/exampleSite/content/shortcodes/tab.pir.md
index 3409f51b31..0670d289f9 100644
--- a/exampleSite/content/shortcodes/tab.pir.md
+++ b/exampleSite/content/shortcodes/tab.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto", "reference"]
 description = "Show rrrambl'n 'n a single tab"
 title = "Tab"
 +++
diff --git a/exampleSite/content/shortcodes/tabs.en.md b/exampleSite/content/shortcodes/tabs.en.md
index 379ed4cf5b..23cd467286 100644
--- a/exampleSite/content/shortcodes/tabs.en.md
+++ b/exampleSite/content/shortcodes/tabs.en.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto", "reference"]
 description = "Show content in tabbed views"
 title = "Tabs"
 +++
diff --git a/exampleSite/content/shortcodes/tabs.pir.md b/exampleSite/content/shortcodes/tabs.pir.md
index 878b78ca26..b0eeb1f323 100644
--- a/exampleSite/content/shortcodes/tabs.pir.md
+++ b/exampleSite/content/shortcodes/tabs.pir.md
@@ -1,4 +1,5 @@
 +++
+categories = ["howto", "reference"]
 description = "Show rrrambl'n 'n tabbed views"
 title = "Tabs"
 +++
diff --git a/layouts/partials/version.txt b/layouts/partials/version.txt
index ab65c455bd..0d56afb45b 100644
--- a/layouts/partials/version.txt
+++ b/layouts/partials/version.txt
@@ -1 +1 @@
-6.4.0+e4e750c1cce67804f5bc889a71bc27024c922f4b
\ No newline at end of file
+6.4.0+b581dbb6e5c093d4e091db21e06d529a35714ce5
\ No newline at end of file