diff --git a/content/docs/contents.lr b/content/docs/contents.lr
index 531a8c07..3acd5660 100644
--- a/content/docs/contents.lr
+++ b/content/docs/contents.lr
@@ -14,4 +14,4 @@ special :ref](what/).
The documentation is a work in progress and there will be areas that are
lacking. If you have any feedback or you want to help out with the
documentation project you can head over to the
-[GitHub Repository :ext](https://github.com/lektor/lektor-website) of this website.
+[GitHub Repository :ext](https://github.com/lektor/lektor-website) GitHub Repositoryof this website.
diff --git a/content/docs/plugins/publishing/contents.lr b/content/docs/plugins/publishing/contents.lr
index 5f89d591..42ff10cd 100644
--- a/content/docs/plugins/publishing/contents.lr
+++ b/content/docs/plugins/publishing/contents.lr
@@ -99,3 +99,5 @@ We'd love to see your new plugin listed on [our plugins page :ref](/plugins). T
* `url` to link to your repository
The `long_description` can be set to be your `README.md` file, and is especially important. Without it, your plugin's page will look a little sparse.
+
+When you submit your pull request, be sure to add some tags. Tags are used on this site to help navigation and discovery of plugins. These are not the same as keywords in your `setup.py`, which are used on PyPI. Specifically, at least include tags for the plugin events that your plugin hooks, such as `setup-env`. These in particular will help new plugin developers learn how to interact with these hooks by example.
diff --git a/content/plugins/flask/contents.lr b/content/plugins/flask/contents.lr
deleted file mode 100644
index e25e1cb2..00000000
--- a/content/plugins/flask/contents.lr
+++ /dev/null
@@ -1,5 +0,0 @@
-name: flask
----
-categories: content
----
-summary:
diff --git a/content/plugins/lektor-atom/contents.lr b/content/plugins/lektor-atom/contents.lr
new file mode 100644
index 00000000..75421e2c
--- /dev/null
+++ b/content/plugins/lektor-atom/contents.lr
@@ -0,0 +1,10 @@
+name: lektor-atom
+---
+categories: templates
+---
+tags:
+
+Atom
+RSS
+virtual paths
+setup-env
diff --git a/content/plugins/lektor-creative-commons/contents.lr b/content/plugins/lektor-creative-commons/contents.lr
new file mode 100644
index 00000000..dfc9b008
--- /dev/null
+++ b/content/plugins/lektor-creative-commons/contents.lr
@@ -0,0 +1,15 @@
+name: lektor-creative-commons
+---
+categories: templates
+---
+tags:
+
+Creative Commons
+Licensing
+jinja globals
+multi-language
+multilingual
+setup-env
+translate
+translation
+setup-env
diff --git a/content/plugins/lektor-disqus-comments/contents.lr b/content/plugins/lektor-disqus-comments/contents.lr
new file mode 100644
index 00000000..9da04388
--- /dev/null
+++ b/content/plugins/lektor-disqus-comments/contents.lr
@@ -0,0 +1,13 @@
+name: lektor-disqus-comments
+---
+categories: templates
+---
+official: yes
+---
+tags:
+
+official
+Disqus
+comments
+blog
+setup-env
diff --git a/content/plugins/lektor-github-repos/contents.lr b/content/plugins/lektor-github-repos/contents.lr
new file mode 100644
index 00000000..04dca9db
--- /dev/null
+++ b/content/plugins/lektor-github-repos/contents.lr
@@ -0,0 +1,8 @@
+name: lektor-github-repos
+---
+categories: templates
+---
+tags:
+
+GitHub
+process-template-context
diff --git a/content/plugins/lektor-google-analytics/contents.lr b/content/plugins/lektor-google-analytics/contents.lr
new file mode 100644
index 00000000..98602bab
--- /dev/null
+++ b/content/plugins/lektor-google-analytics/contents.lr
@@ -0,0 +1,8 @@
+name: lektor-google-analytics
+---
+tags:
+
+analytics
+Google Analytics
+jinja globals
+setup-env
diff --git a/content/plugins/lektor-htmlmin/contents.lr b/content/plugins/lektor-htmlmin/contents.lr
index 5f180048..2c75f119 100644
--- a/content/plugins/lektor-htmlmin/contents.lr
+++ b/content/plugins/lektor-htmlmin/contents.lr
@@ -1,3 +1,11 @@
name: lektor-htmlmin
---
categories: build
+---
+tags:
+
+html
+minify
+htmlmin
+after-build-all
+
diff --git a/content/plugins/lektor-i18n/contents.lr b/content/plugins/lektor-i18n/contents.lr
index c28f59a9..2a7e15d9 100644
--- a/content/plugins/lektor-i18n/contents.lr
+++ b/content/plugins/lektor-i18n/contents.lr
@@ -1,3 +1,22 @@
name: lektor-i18n
---
categories: build
+---
+summary: Use GetText .PO files to translate your site content.
+---
+tags:
+
+multilingual
+multi-language
+language
+GetText
+translate
+translation
+alternatives
+i18n
+babel
+setup-env
+before-build
+after-build
+before-build-all
+after-build-all
diff --git a/content/plugins/lektor-make/contents.lr b/content/plugins/lektor-make/contents.lr
index 93d65c7f..faf46fe2 100644
--- a/content/plugins/lektor-make/contents.lr
+++ b/content/plugins/lektor-make/contents.lr
@@ -1,3 +1,11 @@
name: lektor-make
---
categories: build
+---
+tags:
+
+before-build-all
+make
+makefile
+---
+summary: Run make lektor
for custom build systems.
diff --git a/content/plugins/lektor-markdown-admonition/contents.lr b/content/plugins/lektor-markdown-admonition/contents.lr
new file mode 100644
index 00000000..759a1868
--- /dev/null
+++ b/content/plugins/lektor-markdown-admonition/contents.lr
@@ -0,0 +1,12 @@
+name: lektor-markdown-admonition
+---
+categories: content
+---
+official: yes
+---
+tags:
+
+official
+markdown
+admonition
+markdown-config
diff --git a/content/plugins/lektor-markdown-excerpt/contents.lr b/content/plugins/lektor-markdown-excerpt/contents.lr
new file mode 100644
index 00000000..1a946c45
--- /dev/null
+++ b/content/plugins/lektor-markdown-excerpt/contents.lr
@@ -0,0 +1,9 @@
+name: lektor-markdown-excerpt
+---
+categories: templates
+---
+tags:
+
+markdown
+jinja filter
+setup-env
diff --git a/content/plugins/lektor-markdown-header-anchors/contents.lr b/content/plugins/lektor-markdown-header-anchors/contents.lr
new file mode 100644
index 00000000..9082d21c
--- /dev/null
+++ b/content/plugins/lektor-markdown-header-anchors/contents.lr
@@ -0,0 +1,16 @@
+name: lektor-markdown-header-anchors
+---
+categories: content
+---
+official: yes
+---
+tags:
+
+official
+markdown
+headers
+anchors
+table of contents
+markdown-config
+makrdown-meta-init
+markdown-meta-postprocess
diff --git a/content/plugins/lektor-minify/contents.lr b/content/plugins/lektor-minify/contents.lr
new file mode 100644
index 00000000..509c4532
--- /dev/null
+++ b/content/plugins/lektor-minify/contents.lr
@@ -0,0 +1,15 @@
+name: lektor-minify
+---
+tags:
+
+django_htmlmin
+rcssmin
+rjsmin
+minify
+html
+css
+js
+setup_env
+after_build
+---
+categories: build
diff --git a/content/plugins/lektor-natural-language/contents.lr b/content/plugins/lektor-natural-language/contents.lr
new file mode 100644
index 00000000..95d1ba97
--- /dev/null
+++ b/content/plugins/lektor-natural-language/contents.lr
@@ -0,0 +1,10 @@
+name: lektor-natural-language
+---
+categories: templates
+---
+tags:
+
+jinja filters
+nltk
+natural language
+setup-env
diff --git a/content/plugins/lektor-netlify/contents.lr b/content/plugins/lektor-netlify/contents.lr
new file mode 100644
index 00000000..95f44393
--- /dev/null
+++ b/content/plugins/lektor-netlify/contents.lr
@@ -0,0 +1,9 @@
+name: lektor-netlify
+---
+categories: deploy
+---
+tags:
+
+Netlify
+deploy target
+setup-env
diff --git a/content/plugins/lektor-nofollow/contents.lr b/content/plugins/lektor-nofollow/contents.lr
new file mode 100644
index 00000000..584e92f2
--- /dev/null
+++ b/content/plugins/lektor-nofollow/contents.lr
@@ -0,0 +1,11 @@
+name: lektor-nofollow
+---
+categories: content
+---
+tags:
+
+nofollow links
+markdown
+markdown-config
+---
+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 0a955e79..68b54fa0 100644
--- a/content/plugins/lektor-npm-support/contents.lr
+++ b/content/plugins/lektor-npm-support/contents.lr
@@ -1,3 +1,17 @@
name: lektor-npm-support
---
-categories: build
+categories: templates
+---
+tags:
+
+webpack
+browserify
+Parcel
+Babel
+Sass
+yarn
+server-spawn
+server-stop
+before-build-all
+---
+summary: Adds support for using npm/yarn to build assets in Lektor using tools such as Parcel, webpack, etc.
diff --git a/content/plugins/lektor-rst/contents.lr b/content/plugins/lektor-rst/contents.lr
new file mode 100644
index 00000000..d3c17822
--- /dev/null
+++ b/content/plugins/lektor-rst/contents.lr
@@ -0,0 +1,10 @@
+name: lektor-rst
+---
+categories: content
+---
+tags:
+
+rst
+reStructuredText
+content type
+setup-env
diff --git a/content/plugins/lektor-s3/contents.lr b/content/plugins/lektor-s3/contents.lr
new file mode 100644
index 00000000..f75598b5
--- /dev/null
+++ b/content/plugins/lektor-s3/contents.lr
@@ -0,0 +1,11 @@
+name: lektor-s3
+---
+categories: deploy
+---
+tags:
+
+AWS
+S3
+Cloudfront
+deploy target
+setup-env
diff --git a/content/plugins/lektor-shortcodes/contents.lr b/content/plugins/lektor-shortcodes/contents.lr
new file mode 100644
index 00000000..1649bde8
--- /dev/null
+++ b/content/plugins/lektor-shortcodes/contents.lr
@@ -0,0 +1,11 @@
+name: lektor-shortcodes
+---
+categories: templates
+---
+tags:
+
+shortcodes
+markdown
+markdown-config
+jinja filters
+setup-env
diff --git a/content/plugins/lektor-slugify/contents.lr b/content/plugins/lektor-slugify/contents.lr
new file mode 100644
index 00000000..5bdf89ae
--- /dev/null
+++ b/content/plugins/lektor-slugify/contents.lr
@@ -0,0 +1,10 @@
+name: lektor-slugify
+---
+categories: templates
+---
+tags:
+
+slugify
+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
new file mode 100644
index 00000000..f90574d8
--- /dev/null
+++ b/content/plugins/lektor-strip-html-tags/contents.lr
@@ -0,0 +1,9 @@
+name: lektor-strip-html-tags
+---
+categories: templates
+---
+tags:
+
+jinja filters
+html
+setup-env
diff --git a/content/plugins/lektor-surge/contents.lr b/content/plugins/lektor-surge/contents.lr
new file mode 100644
index 00000000..eaa0a4d4
--- /dev/null
+++ b/content/plugins/lektor-surge/contents.lr
@@ -0,0 +1,9 @@
+name: lektor-surge
+---
+categories: deploy
+---
+tags:
+
+Surge
+deploy-target
+setup-env
diff --git a/content/plugins/lektor-tags/contents.lr b/content/plugins/lektor-tags/contents.lr
new file mode 100644
index 00000000..4c727443
--- /dev/null
+++ b/content/plugins/lektor-tags/contents.lr
@@ -0,0 +1,10 @@
+name: lektor-tags
+---
+categories: content
+---
+tags:
+
+tags
+page generation
+virtual paths
+setup-env
diff --git a/content/plugins/lektor-thumbnail-generator/contents.lr b/content/plugins/lektor-thumbnail-generator/contents.lr
new file mode 100644
index 00000000..61ba38e6
--- /dev/null
+++ b/content/plugins/lektor-thumbnail-generator/contents.lr
@@ -0,0 +1,8 @@
+name: lektor-thumbnail-generator
+---
+categories: templates
+---
+tags:
+
+images
+thumbnails
diff --git a/content/plugins/lektor-webdav/contents.lr b/content/plugins/lektor-webdav/contents.lr
new file mode 100644
index 00000000..ba6791f9
--- /dev/null
+++ b/content/plugins/lektor-webdav/contents.lr
@@ -0,0 +1,12 @@
+name: lektor-webdav
+---
+categories: templates
+---
+tags:
+
+WebDAV
+remote content
+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 9c2359bf..4cc1f57e 100644
--- a/content/plugins/lektor-webpack-support/contents.lr
+++ b/content/plugins/lektor-webpack-support/contents.lr
@@ -3,3 +3,15 @@ name: lektor-webpack-support
categories: build
---
official: yes
+---
+tags:
+
+official
+webpack
+npm
+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
new file mode 100644
index 00000000..0de5a9df
--- /dev/null
+++ b/content/plugins/lektor-yandex-metrica/contents.lr
@@ -0,0 +1,10 @@
+name: lektor-yandex-metrica
+---
+categories: templates
+---
+tags:
+
+analytics
+Yandex Metrica
+setup-env
+jinja globals
diff --git a/content/plugins/markdown-highlighter/contents.lr b/content/plugins/markdown-highlighter/contents.lr
new file mode 100644
index 00000000..add0f701
--- /dev/null
+++ b/content/plugins/markdown-highlighter/contents.lr
@@ -0,0 +1,14 @@
+name: lektor-markdown-highlighter
+---
+categories: content
+---
+official: yes
+---
+tags:
+
+official
+markdown
+syntax highlighting
+Pygments
+markdown-config
+setup-env