diff --git a/content/plugins/lektor-asciidoc/contents.lr b/content/plugins/lektor-asciidoc/contents.lr
index 09771294..4e5ba283 100644
--- a/content/plugins/lektor-asciidoc/contents.lr
+++ b/content/plugins/lektor-asciidoc/contents.lr
@@ -6,6 +6,6 @@ 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 f8c52b95..9e0ad6f1 100644
--- a/content/plugins/lektor-asciidoctor/contents.lr
+++ b/content/plugins/lektor-asciidoctor/contents.lr
@@ -4,7 +4,7 @@ name: lektor-asciidoctor
 ---
 tags:
 
-asciidoc
+AsciiDoc
 field type
 setup-env
 ---
diff --git a/content/plugins/lektor-bibtex-support/contents.lr b/content/plugins/lektor-bibtex-support/contents.lr
index d99e8683..bf042a84 100644
--- a/content/plugins/lektor-bibtex-support/contents.lr
+++ b/content/plugins/lektor-bibtex-support/contents.lr
@@ -7,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 02a73593..a4927282 100644
--- a/content/plugins/lektor-creative-commons/contents.lr
+++ b/content/plugins/lektor-creative-commons/contents.lr
@@ -8,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-google-analytics/contents.lr b/content/plugins/lektor-google-analytics/contents.lr
index a933f081..e9a72e38 100644
--- a/content/plugins/lektor-google-analytics/contents.lr
+++ b/content/plugins/lektor-google-analytics/contents.lr
@@ -6,7 +6,7 @@ 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 46380fe4..9b3fee02 100644
--- a/content/plugins/lektor-gulp/contents.lr
+++ b/content/plugins/lektor-gulp/contents.lr
@@ -5,9 +5,9 @@ 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 ed0297f2..71bc722e 100644
--- a/content/plugins/lektor-htmlmin/contents.lr
+++ b/content/plugins/lektor-htmlmin/contents.lr
@@ -6,8 +6,7 @@ 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 8741df88..814f6754 100644
--- a/content/plugins/lektor-i18n/contents.lr
+++ b/content/plugins/lektor-i18n/contents.lr
@@ -8,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 aefe1c1c..08dce637 100644
--- a/content/plugins/lektor-jinja-content/contents.lr
+++ b/content/plugins/lektor-jinja-content/contents.lr
@@ -7,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 ce867a26..8e5ed594 100644
--- a/content/plugins/lektor-make/contents.lr
+++ b/content/plugins/lektor-make/contents.lr
@@ -8,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 bcca2e05..98f5ba83 100644
--- a/content/plugins/lektor-markdown-admonition/contents.lr
+++ b/content/plugins/lektor-markdown-admonition/contents.lr
@@ -9,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 886b49d5..c2124ed1 100644
--- a/content/plugins/lektor-markdown-excerpt/contents.lr
+++ b/content/plugins/lektor-markdown-excerpt/contents.lr
@@ -6,6 +6,6 @@ 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 c774c163..0fc52f7f 100644
--- a/content/plugins/lektor-markdown-header-anchors/contents.lr
+++ b/content/plugins/lektor-markdown-header-anchors/contents.lr
@@ -9,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 e38c1ef8..afcca90d 100644
--- a/content/plugins/lektor-markdown-highlighter/contents.lr
+++ b/content/plugins/lektor-markdown-highlighter/contents.lr
@@ -9,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 49cd22f1..927d09fa 100644
--- a/content/plugins/lektor-minify/contents.lr
+++ b/content/plugins/lektor-minify/contents.lr
@@ -5,12 +5,12 @@ 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 c1d58d5b..5999a3c1 100644
--- a/content/plugins/lektor-natural-language/contents.lr
+++ b/content/plugins/lektor-natural-language/contents.lr
@@ -6,7 +6,7 @@ categories: templates
 ---
 tags:
 
-jinja filters
-nltk
+Jinja filters
+NLTK
 natural language
 setup-env
diff --git a/content/plugins/lektor-nofollow/contents.lr b/content/plugins/lektor-nofollow/contents.lr
index 8b8dbc9c..7b5ce500 100644
--- a/content/plugins/lektor-nofollow/contents.lr
+++ b/content/plugins/lektor-nofollow/contents.lr
@@ -7,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 49744348..055e74c4 100644
--- a/content/plugins/lektor-npm-support/contents.lr
+++ b/content/plugins/lektor-npm-support/contents.lr
@@ -7,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 ab0d72dd..2998ffa3 100644
--- a/content/plugins/lektor-pythonmarkdown/contents.lr
+++ b/content/plugins/lektor-pythonmarkdown/contents.lr
@@ -10,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 6889c778..34f1ab4f 100644
--- a/content/plugins/lektor-read-full-post/contents.lr
+++ b/content/plugins/lektor-read-full-post/contents.lr
@@ -7,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 cfea3c9a..e4530c75 100644
--- a/content/plugins/lektor-root-relative-path/contents.lr
+++ b/content/plugins/lektor-root-relative-path/contents.lr
@@ -7,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 a6964efd..a646888a 100644
--- a/content/plugins/lektor-rst/contents.lr
+++ b/content/plugins/lektor-rst/contents.lr
@@ -6,7 +6,6 @@ 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 ca93c425..535ea59b 100644
--- a/content/plugins/lektor-s3/contents.lr
+++ b/content/plugins/lektor-s3/contents.lr
@@ -8,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 57448a6d..818bf55b 100644
--- a/content/plugins/lektor-shortcodes/contents.lr
+++ b/content/plugins/lektor-shortcodes/contents.lr
@@ -7,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 a86d2113..7486a65a 100644
--- a/content/plugins/lektor-slugify/contents.lr
+++ b/content/plugins/lektor-slugify/contents.lr
@@ -7,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 50841366..552b9583 100644
--- a/content/plugins/lektor-strip-html-tags/contents.lr
+++ b/content/plugins/lektor-strip-html-tags/contents.lr
@@ -6,6 +6,6 @@ categories: templates
 ---
 tags:
 
-jinja filters
-html
+Jinja filters
+HTML
 setup-env
diff --git a/content/plugins/lektor-webdav/contents.lr b/content/plugins/lektor-webdav/contents.lr
index 401af384..d7e86039 100644
--- a/content/plugins/lektor-webdav/contents.lr
+++ b/content/plugins/lektor-webdav/contents.lr
@@ -7,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 02587834..fc1e399d 100644
--- a/content/plugins/lektor-webpack-support/contents.lr
+++ b/content/plugins/lektor-webpack-support/contents.lr
@@ -11,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 5f35c1d8..a7dc556c 100644
--- a/content/plugins/lektor-yandex-metrica/contents.lr
+++ b/content/plugins/lektor-yandex-metrica/contents.lr
@@ -9,4 +9,4 @@ tags:
 analytics
 Yandex Metrica
 setup-env
-jinja globals
+Jinja globals