diff --git a/Website.lektorproject b/Website.lektorproject
index f6f43cb0..13079808 100644
--- a/Website.lektorproject
+++ b/Website.lektorproject
@@ -16,4 +16,5 @@ lektor-markdown-header-anchors = 0.1
 lektor-markdown-highlighter = 0.1
 lektor-markdown-admonition = 0.1
 lektor-atom = 0.2
-lektor-tags = 0.1
+lektor-tags = 0.3
+lektor-slugify = 0.4
diff --git a/configs/tags.ini b/configs/tags.ini
index a6260ff6..2c090ee4 100644
--- a/configs/tags.ini
+++ b/configs/tags.ini
@@ -1,2 +1,3 @@
 parent = /plugins
 template = plugin-tag.html
+url_path = {{ this.parent.url_path }}tag/{{ tag|slug(lowercase=False) }}
diff --git a/content/plugins/lektor-asciidoc/contents.lr b/content/plugins/lektor-asciidoc/contents.lr
index 11a5e1f6..4e5ba283 100644
--- a/content/plugins/lektor-asciidoc/contents.lr
+++ b/content/plugins/lektor-asciidoc/contents.lr
@@ -1,9 +1,11 @@
+_model: plugin
+---
 name: lektor-asciidoc
 ---
 categories: content
 ---
 tags:
 
-asciidoc
+AsciiDoc
 field type
 setup-env
diff --git a/content/plugins/lektor-asciidoctor/contents.lr b/content/plugins/lektor-asciidoctor/contents.lr
index 1247fbb4..9e0ad6f1 100644
--- a/content/plugins/lektor-asciidoctor/contents.lr
+++ b/content/plugins/lektor-asciidoctor/contents.lr
@@ -1,8 +1,10 @@
+_model: plugin
+---
 name: lektor-asciidoctor
 ---
 tags:
 
-asciidoc
+AsciiDoc
 field type
 setup-env
 ---
diff --git a/content/plugins/lektor-atom/contents.lr b/content/plugins/lektor-atom/contents.lr
index 75421e2c..53af43dd 100644
--- a/content/plugins/lektor-atom/contents.lr
+++ b/content/plugins/lektor-atom/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-atom
 ---
 categories: templates
diff --git a/content/plugins/lektor-bibtex-support/contents.lr b/content/plugins/lektor-bibtex-support/contents.lr
index da33bfc1..bf042a84 100644
--- a/content/plugins/lektor-bibtex-support/contents.lr
+++ b/content/plugins/lektor-bibtex-support/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-bibtex-support
 ---
 categories: content
@@ -5,5 +7,5 @@ categories: content
 tags:
 
 setup-env
-jinja globals
+Jinja globals
 LaTeX
\ No newline at end of file
diff --git a/content/plugins/lektor-creative-commons/contents.lr b/content/plugins/lektor-creative-commons/contents.lr
index dfc9b008..a4927282 100644
--- a/content/plugins/lektor-creative-commons/contents.lr
+++ b/content/plugins/lektor-creative-commons/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-creative-commons
 ---
 categories: templates
@@ -6,10 +8,6 @@ tags:
 
 Creative Commons
 Licensing
-jinja globals
-multi-language
-multilingual
-setup-env
-translate
-translation
+Jinja globals
+i18n
 setup-env
diff --git a/content/plugins/lektor-disqus-comments/contents.lr b/content/plugins/lektor-disqus-comments/contents.lr
index 47920acc..5c1fa3ca 100644
--- a/content/plugins/lektor-disqus-comments/contents.lr
+++ b/content/plugins/lektor-disqus-comments/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-disqus-comments
 ---
 categories: templates
diff --git a/content/plugins/lektor-github-repos/contents.lr b/content/plugins/lektor-github-repos/contents.lr
index 04dca9db..8baa5fe5 100644
--- a/content/plugins/lektor-github-repos/contents.lr
+++ b/content/plugins/lektor-github-repos/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-github-repos
 ---
 categories: templates
diff --git a/content/plugins/lektor-google-analytics/contents.lr b/content/plugins/lektor-google-analytics/contents.lr
index bffeafbe..e9a72e38 100644
--- a/content/plugins/lektor-google-analytics/contents.lr
+++ b/content/plugins/lektor-google-analytics/contents.lr
@@ -1,10 +1,12 @@
+_model: plugin
+---
 name: lektor-google-analytics
 ---
 tags:
 
 analytics
 Google Analytics
-jinja globals
+Jinja globals
 setup-env
 ---
 categories: templates
diff --git a/content/plugins/lektor-gulp/contents.lr b/content/plugins/lektor-gulp/contents.lr
index ade28fef..9b3fee02 100644
--- a/content/plugins/lektor-gulp/contents.lr
+++ b/content/plugins/lektor-gulp/contents.lr
@@ -1,11 +1,13 @@
+_model: plugin
+---
 name: lektor-gulp
 ---
 categories: build
 ---
 tags:
-html
-css
-javascript
+HTML
+CSS
+JavaScript
 gulp
 before-build-all
 server-stop
diff --git a/content/plugins/lektor-htmlmin/contents.lr b/content/plugins/lektor-htmlmin/contents.lr
index 2c75f119..71bc722e 100644
--- a/content/plugins/lektor-htmlmin/contents.lr
+++ b/content/plugins/lektor-htmlmin/contents.lr
@@ -1,11 +1,12 @@
+_model: plugin
+---
 name: lektor-htmlmin
 ---
 categories: build
 ---
 tags:
 
-html
+HTML
 minify
 htmlmin
 after-build-all
-
diff --git a/content/plugins/lektor-i18n/contents.lr b/content/plugins/lektor-i18n/contents.lr
index 2a7e15d9..814f6754 100644
--- a/content/plugins/lektor-i18n/contents.lr
+++ b/content/plugins/lektor-i18n/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-i18n
 ---
 categories: build
@@ -6,15 +8,10 @@ summary: Use GetText .PO files to translate your site content.
 ---
 tags:
 
-multilingual
-multi-language
-language
 GetText
-translate
-translation
 alternatives
 i18n
-babel
+Babel
 setup-env
 before-build
 after-build
diff --git a/content/plugins/lektor-jinja-content/contents.lr b/content/plugins/lektor-jinja-content/contents.lr
index d79e2fce..08dce637 100644
--- a/content/plugins/lektor-jinja-content/contents.lr
+++ b/content/plugins/lektor-jinja-content/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-jinja-content
 ---
 categories: content
@@ -5,8 +7,8 @@ categories: content
 tags:
 
 process-template-context
-jinja
+Jinja
 templates
 content
 context
-markdown
+Markdown
diff --git a/content/plugins/lektor-make/contents.lr b/content/plugins/lektor-make/contents.lr
index faf46fe2..8e5ed594 100644
--- a/content/plugins/lektor-make/contents.lr
+++ b/content/plugins/lektor-make/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-make
 ---
 categories: build
@@ -6,6 +8,5 @@ tags:
 
 before-build-all
 make
-makefile
 ---
 summary: Run <code>make lektor</code> for custom build systems.
diff --git a/content/plugins/lektor-markdown-admonition/contents.lr b/content/plugins/lektor-markdown-admonition/contents.lr
index 759a1868..98f5ba83 100644
--- a/content/plugins/lektor-markdown-admonition/contents.lr
+++ b/content/plugins/lektor-markdown-admonition/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-markdown-admonition
 ---
 categories: content
@@ -7,6 +9,6 @@ official: yes
 tags:
 
 official
-markdown
+Markdown
 admonition
 markdown-config
diff --git a/content/plugins/lektor-markdown-excerpt/contents.lr b/content/plugins/lektor-markdown-excerpt/contents.lr
index 70c5996b..c2124ed1 100644
--- a/content/plugins/lektor-markdown-excerpt/contents.lr
+++ b/content/plugins/lektor-markdown-excerpt/contents.lr
@@ -1,9 +1,11 @@
+_model: plugin
+---
 name: lektor-markdown-excerpt
 ---
 categories: templates
 ---
 tags:
 
-markdown
-jinja filters
+Markdown
+Jinja filters
 setup-env
diff --git a/content/plugins/lektor-markdown-header-anchors/contents.lr b/content/plugins/lektor-markdown-header-anchors/contents.lr
index 9082d21c..0fc52f7f 100644
--- a/content/plugins/lektor-markdown-header-anchors/contents.lr
+++ b/content/plugins/lektor-markdown-header-anchors/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-markdown-header-anchors
 ---
 categories: content
@@ -7,7 +9,7 @@ official: yes
 tags:
 
 official
-markdown
+Markdown
 headers
 anchors
 table of contents
diff --git a/content/plugins/lektor-markdown-highlighter/contents.lr b/content/plugins/lektor-markdown-highlighter/contents.lr
index add0f701..afcca90d 100644
--- a/content/plugins/lektor-markdown-highlighter/contents.lr
+++ b/content/plugins/lektor-markdown-highlighter/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-markdown-highlighter
 ---
 categories: content
@@ -7,7 +9,7 @@ official: yes
 tags:
 
 official
-markdown
+Markdown
 syntax highlighting
 Pygments
 markdown-config
diff --git a/content/plugins/lektor-minify/contents.lr b/content/plugins/lektor-minify/contents.lr
index 046c13e9..927d09fa 100644
--- a/content/plugins/lektor-minify/contents.lr
+++ b/content/plugins/lektor-minify/contents.lr
@@ -1,14 +1,16 @@
+_model: plugin
+---
 name: lektor-minify
 ---
 tags:
 
 django_htmlmin
-rcssmin
-rjsmin
+rCSSmin
+rJSmin
 minify
-html
-css
-js
+HTML
+CSS
+JavaScript
 setup-env
 after-build
 ---
diff --git a/content/plugins/lektor-natural-language/contents.lr b/content/plugins/lektor-natural-language/contents.lr
index 95d1ba97..5999a3c1 100644
--- a/content/plugins/lektor-natural-language/contents.lr
+++ b/content/plugins/lektor-natural-language/contents.lr
@@ -1,10 +1,12 @@
+_model: plugin
+---
 name: lektor-natural-language
 ---
 categories: templates
 ---
 tags:
 
-jinja filters
-nltk
+Jinja filters
+NLTK
 natural language
 setup-env
diff --git a/content/plugins/lektor-netlify/contents.lr b/content/plugins/lektor-netlify/contents.lr
index 24c1dc2e..47776e60 100644
--- a/content/plugins/lektor-netlify/contents.lr
+++ b/content/plugins/lektor-netlify/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-netlify
 ---
 categories: deploy
diff --git a/content/plugins/lektor-nofollow/contents.lr b/content/plugins/lektor-nofollow/contents.lr
index 584e92f2..7b5ce500 100644
--- a/content/plugins/lektor-nofollow/contents.lr
+++ b/content/plugins/lektor-nofollow/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-nofollow
 ---
 categories: content
@@ -5,7 +7,7 @@ categories: content
 tags:
 
 nofollow links
-markdown
+Markdown
 markdown-config
 ---
-summary: Easily create nofollow links in markdown
+summary: Easily create nofollow links in Markdown.
diff --git a/content/plugins/lektor-npm-support/contents.lr b/content/plugins/lektor-npm-support/contents.lr
index a3eb054a..055e74c4 100644
--- a/content/plugins/lektor-npm-support/contents.lr
+++ b/content/plugins/lektor-npm-support/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-npm-support
 ---
 categories: build
@@ -5,11 +7,13 @@ categories: build
 tags:
 
 webpack
-browserify
+Browserify
 Parcel
 Babel
 Sass
-yarn
+Node
+npm
+Yarn
 server-spawn
 server-stop
 before-build-all
diff --git a/content/plugins/lektor-pythonmarkdown/contents.lr b/content/plugins/lektor-pythonmarkdown/contents.lr
index 9deba25e..2998ffa3 100644
--- a/content/plugins/lektor-pythonmarkdown/contents.lr
+++ b/content/plugins/lektor-pythonmarkdown/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-pythonmarkdown
 ---
 allow_comments: yes
@@ -8,6 +10,6 @@ official: no
 ---
 tags:
 
-markdown
+Markdown
 setup-env
 field type
diff --git a/content/plugins/lektor-read-full-post/contents.lr b/content/plugins/lektor-read-full-post/contents.lr
index 613a9071..34f1ab4f 100644
--- a/content/plugins/lektor-read-full-post/contents.lr
+++ b/content/plugins/lektor-read-full-post/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-read-full-post
 ---
 categories: content
@@ -5,8 +7,8 @@ categories: content
 tags:
 
 setup-env
-jinja globals
+Jinja globals
 blog
-markdown
+Markdown
 ---
 summary: Allows blog listing posts to be shortened with a link to the full post.
diff --git a/content/plugins/lektor-root-relative-path/contents.lr b/content/plugins/lektor-root-relative-path/contents.lr
index 9025b4d2..e4530c75 100644
--- a/content/plugins/lektor-root-relative-path/contents.lr
+++ b/content/plugins/lektor-root-relative-path/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-root-relative-path
 ---
 categories: templates
@@ -5,5 +7,5 @@ categories: templates
 tags:
 
 navigation
-jinja filters
+Jinja filters
 setup-env
diff --git a/content/plugins/lektor-rst/contents.lr b/content/plugins/lektor-rst/contents.lr
index 37c6516b..a646888a 100644
--- a/content/plugins/lektor-rst/contents.lr
+++ b/content/plugins/lektor-rst/contents.lr
@@ -1,10 +1,11 @@
+_model: plugin
+---
 name: lektor-rst
 ---
 categories: content
 ---
 tags:
 
-rst
 reStructuredText
 field type
 setup-env
diff --git a/content/plugins/lektor-s3/contents.lr b/content/plugins/lektor-s3/contents.lr
index 8fc52326..535ea59b 100644
--- a/content/plugins/lektor-s3/contents.lr
+++ b/content/plugins/lektor-s3/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-s3
 ---
 categories: deploy
@@ -6,7 +8,7 @@ tags:
 
 AWS
 S3
-Cloudfront
+CloudFront
 publisher
 setup-env
 ---
diff --git a/content/plugins/lektor-shortcodes/contents.lr b/content/plugins/lektor-shortcodes/contents.lr
index 09b56f8c..818bf55b 100644
--- a/content/plugins/lektor-shortcodes/contents.lr
+++ b/content/plugins/lektor-shortcodes/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-shortcodes
 ---
 categories: templates
@@ -5,9 +7,9 @@ categories: templates
 tags:
 
 shortcodes
-markdown
+Markdown
 markdown-config
-jinja filters
+Jinja filters
 setup-env
 ---
 summary: Allows you to use shortcodes (something like tags) in your model fields.
diff --git a/content/plugins/lektor-slugify/contents.lr b/content/plugins/lektor-slugify/contents.lr
index 5bdf89ae..7486a65a 100644
--- a/content/plugins/lektor-slugify/contents.lr
+++ b/content/plugins/lektor-slugify/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-slugify
 ---
 categories: templates
@@ -5,6 +7,6 @@ categories: templates
 tags:
 
 slugify
-jinja filters
+Jinja filters
 python-slugify
 setup-env
diff --git a/content/plugins/lektor-strip-html-tags/contents.lr b/content/plugins/lektor-strip-html-tags/contents.lr
index f90574d8..552b9583 100644
--- a/content/plugins/lektor-strip-html-tags/contents.lr
+++ b/content/plugins/lektor-strip-html-tags/contents.lr
@@ -1,9 +1,11 @@
+_model: plugin
+---
 name: lektor-strip-html-tags
 ---
 categories: templates
 ---
 tags:
 
-jinja filters
-html
+Jinja filters
+HTML
 setup-env
diff --git a/content/plugins/lektor-surge/contents.lr b/content/plugins/lektor-surge/contents.lr
index bd958353..4b314ca7 100644
--- a/content/plugins/lektor-surge/contents.lr
+++ b/content/plugins/lektor-surge/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-surge
 ---
 categories: deploy
diff --git a/content/plugins/lektor-tags/contents.lr b/content/plugins/lektor-tags/contents.lr
index 4c727443..45c6873c 100644
--- a/content/plugins/lektor-tags/contents.lr
+++ b/content/plugins/lektor-tags/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-tags
 ---
 categories: content
diff --git a/content/plugins/lektor-thumbnail-generator/contents.lr b/content/plugins/lektor-thumbnail-generator/contents.lr
index 61ba38e6..43ea5982 100644
--- a/content/plugins/lektor-thumbnail-generator/contents.lr
+++ b/content/plugins/lektor-thumbnail-generator/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-thumbnail-generator
 ---
 categories: templates
diff --git a/content/plugins/lektor-webdav/contents.lr b/content/plugins/lektor-webdav/contents.lr
index ba6791f9..d7e86039 100644
--- a/content/plugins/lektor-webdav/contents.lr
+++ b/content/plugins/lektor-webdav/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-webdav
 ---
 categories: templates
@@ -5,8 +7,8 @@ categories: templates
 tags:
 
 WebDAV
+content
 remote content
-jinja globals
-jinja filters
+Jinja globals
+Jinja filters
 setup-env
-
diff --git a/content/plugins/lektor-webpack-support/contents.lr b/content/plugins/lektor-webpack-support/contents.lr
index 4cc1f57e..fc1e399d 100644
--- a/content/plugins/lektor-webpack-support/contents.lr
+++ b/content/plugins/lektor-webpack-support/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-webpack-support
 ---
 categories: build
@@ -9,9 +11,9 @@ tags:
 official
 webpack
 npm
-yarn
-node
-scss
+Yarn
+Node
+sCSS
 server-spawn
 server-stop
 before-build-all
diff --git a/content/plugins/lektor-yandex-metrica/contents.lr b/content/plugins/lektor-yandex-metrica/contents.lr
index 0de5a9df..a7dc556c 100644
--- a/content/plugins/lektor-yandex-metrica/contents.lr
+++ b/content/plugins/lektor-yandex-metrica/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-yandex-metrica
 ---
 categories: templates
@@ -7,4 +9,4 @@ tags:
 analytics
 Yandex Metrica
 setup-env
-jinja globals
+Jinja globals
diff --git a/content/plugins/tags/contents.lr b/content/plugins/tags/contents.lr
new file mode 100644
index 00000000..8180d8e6
--- /dev/null
+++ b/content/plugins/tags/contents.lr
@@ -0,0 +1,5 @@
+_model: page
+---
+title: tags
+---
+_template: plugin-tags.html
diff --git a/models/plugins.ini b/models/plugins.ini
index e991a425..7e913380 100644
--- a/models/plugins.ini
+++ b/models/plugins.ini
@@ -3,5 +3,6 @@ name = Plugins
 inherits = page
 label = {{ this.title }}
 
-[children]
-model = plugin
+# Re-enable after being able to specify 2 models choices instead of only one
+# [children]
+# model = plugin
diff --git a/packages/project-data/setup.py b/packages/project-data/setup.py
index 92488a03..5495b7d9 100644
--- a/packages/project-data/setup.py
+++ b/packages/project-data/setup.py
@@ -9,7 +9,7 @@ setup(
     py_modules=['lektor_project_data'],
     install_requires=[
         'requests',
-        'readme_renderer==20.0',
+        'readme_renderer[md]==24.0',
     ],
     entry_points={
         'lektor.plugins': [
diff --git a/templates/plugin-tag.html b/templates/plugin-tag.html
index 48792e95..e9076037 100644
--- a/templates/plugin-tag.html
+++ b/templates/plugin-tag.html
@@ -28,4 +28,6 @@
   <div class="plugin">
     {{ render_plugin_list(this.items) }}
   </div>
+
+  <p>View a list of all Lektor plugin tags <a href="/plugins/tags" class="ref">here</a>.</p>
 {% endblock %}
diff --git a/templates/plugin-tags.html b/templates/plugin-tags.html
new file mode 100644
index 00000000..96d0a328
--- /dev/null
+++ b/templates/plugin-tags.html
@@ -0,0 +1,24 @@
+{% extends "plugin.html" %}
+
+{% block body %}
+  <h1>Plugin Tags</h1>
+
+  <p>
+    This is a list of all tags that Lektor plugins have.
+    Click on individual tags to see which plugins use that tag.
+  </p>
+  <div class="row">
+
+    {% set tags = this.parent.children.distinct("tags") %}
+    {% for column in tags|sort|slice(3) %}
+      <div class="col-md-4 child">
+        <ul>
+          {% for tag in column %}
+            <li><a href="{{ ('/plugins@tag/' ~ tag ~ '/')|url }}">{{ tag }}</a></li>
+          {% endfor %}
+        </ul>
+      </div>
+    {% endfor %}
+
+  </div>
+{% endblock %}
diff --git a/templates/plugin.html b/templates/plugin.html
index a9825986..73f13774 100644
--- a/templates/plugin.html
+++ b/templates/plugin.html
@@ -63,11 +63,12 @@
         {% if this.tags %}
           {% for t in this.tags|sort %}
             {{ "and " if loop.last }}
-            <a href="{{ ('/plugins/tag/' ~ t.lower() ~ '/')|url }}">{{ t }}</a>{{ ", " if not loop.last }}
+            <a href="{{ ('/plugins@tag/' ~ t ~ '/')|url }}">{{ t }}</a>{{ ", " if not loop.last }}
           {% endfor %}
         {% else %}
           <p>Plugin has no tags.</p>
         {% endif %}
+        <p>View <a href="/plugins/tags" class="ref">all tags</a>.</p>
       </div>
 
       <div class="col-sm-9 doc-styling">
diff --git a/templates/plugins.html b/templates/plugins.html
index 83c489f4..c8dbab36 100644
--- a/templates/plugins.html
+++ b/templates/plugins.html
@@ -21,4 +21,11 @@
       {{ render_plugin_list(category.children) }}
     </div>
   {% endfor %}
+
+  <h2>Tags</h2>
+  <p>
+    Plugins are also tagged with keywords and topics.
+    Their tags are listed on their page and are navigable.
+    You can view a list of all of the tags <a href="/plugins/tags" class="ref">here</a>.
+  </p>
 {% endblock %}