diff --git a/content/plugins/lektor-asciidoc/contents.lr b/content/plugins/lektor-asciidoc/contents.lr
index 11a5e1f6..09771294 100644
--- a/content/plugins/lektor-asciidoc/contents.lr
+++ b/content/plugins/lektor-asciidoc/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-asciidoc
 ---
 categories: content
diff --git a/content/plugins/lektor-asciidoctor/contents.lr b/content/plugins/lektor-asciidoctor/contents.lr
index 1247fbb4..f8c52b95 100644
--- a/content/plugins/lektor-asciidoctor/contents.lr
+++ b/content/plugins/lektor-asciidoctor/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-asciidoctor
 ---
 tags:
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..d99e8683 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
diff --git a/content/plugins/lektor-creative-commons/contents.lr b/content/plugins/lektor-creative-commons/contents.lr
index dfc9b008..02a73593 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
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..a933f081 100644
--- a/content/plugins/lektor-google-analytics/contents.lr
+++ b/content/plugins/lektor-google-analytics/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-google-analytics
 ---
 tags:
diff --git a/content/plugins/lektor-gulp/contents.lr b/content/plugins/lektor-gulp/contents.lr
index ade28fef..46380fe4 100644
--- a/content/plugins/lektor-gulp/contents.lr
+++ b/content/plugins/lektor-gulp/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-gulp
 ---
 categories: build
diff --git a/content/plugins/lektor-htmlmin/contents.lr b/content/plugins/lektor-htmlmin/contents.lr
index 2c75f119..ed0297f2 100644
--- a/content/plugins/lektor-htmlmin/contents.lr
+++ b/content/plugins/lektor-htmlmin/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-htmlmin
 ---
 categories: build
diff --git a/content/plugins/lektor-i18n/contents.lr b/content/plugins/lektor-i18n/contents.lr
index 2a7e15d9..8741df88 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
diff --git a/content/plugins/lektor-jinja-content/contents.lr b/content/plugins/lektor-jinja-content/contents.lr
index d79e2fce..aefe1c1c 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
diff --git a/content/plugins/lektor-make/contents.lr b/content/plugins/lektor-make/contents.lr
index faf46fe2..ce867a26 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
diff --git a/content/plugins/lektor-markdown-admonition/contents.lr b/content/plugins/lektor-markdown-admonition/contents.lr
index 759a1868..bcca2e05 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
diff --git a/content/plugins/lektor-markdown-excerpt/contents.lr b/content/plugins/lektor-markdown-excerpt/contents.lr
index 70c5996b..886b49d5 100644
--- a/content/plugins/lektor-markdown-excerpt/contents.lr
+++ b/content/plugins/lektor-markdown-excerpt/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-markdown-excerpt
 ---
 categories: templates
diff --git a/content/plugins/lektor-markdown-header-anchors/contents.lr b/content/plugins/lektor-markdown-header-anchors/contents.lr
index 9082d21c..c774c163 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
diff --git a/content/plugins/lektor-markdown-highlighter/contents.lr b/content/plugins/lektor-markdown-highlighter/contents.lr
index add0f701..e38c1ef8 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
diff --git a/content/plugins/lektor-minify/contents.lr b/content/plugins/lektor-minify/contents.lr
index 046c13e9..49cd22f1 100644
--- a/content/plugins/lektor-minify/contents.lr
+++ b/content/plugins/lektor-minify/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-minify
 ---
 tags:
diff --git a/content/plugins/lektor-natural-language/contents.lr b/content/plugins/lektor-natural-language/contents.lr
index 95d1ba97..c1d58d5b 100644
--- a/content/plugins/lektor-natural-language/contents.lr
+++ b/content/plugins/lektor-natural-language/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-natural-language
 ---
 categories: templates
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..8b8dbc9c 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
diff --git a/content/plugins/lektor-npm-support/contents.lr b/content/plugins/lektor-npm-support/contents.lr
index a3eb054a..49744348 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
diff --git a/content/plugins/lektor-pythonmarkdown/contents.lr b/content/plugins/lektor-pythonmarkdown/contents.lr
index 9deba25e..ab0d72dd 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
diff --git a/content/plugins/lektor-read-full-post/contents.lr b/content/plugins/lektor-read-full-post/contents.lr
index 613a9071..6889c778 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
diff --git a/content/plugins/lektor-root-relative-path/contents.lr b/content/plugins/lektor-root-relative-path/contents.lr
index 9025b4d2..cfea3c9a 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
diff --git a/content/plugins/lektor-rst/contents.lr b/content/plugins/lektor-rst/contents.lr
index 37c6516b..a6964efd 100644
--- a/content/plugins/lektor-rst/contents.lr
+++ b/content/plugins/lektor-rst/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-rst
 ---
 categories: content
diff --git a/content/plugins/lektor-s3/contents.lr b/content/plugins/lektor-s3/contents.lr
index 8fc52326..ca93c425 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
diff --git a/content/plugins/lektor-shortcodes/contents.lr b/content/plugins/lektor-shortcodes/contents.lr
index 09b56f8c..57448a6d 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
diff --git a/content/plugins/lektor-slugify/contents.lr b/content/plugins/lektor-slugify/contents.lr
index 5bdf89ae..a86d2113 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
diff --git a/content/plugins/lektor-strip-html-tags/contents.lr b/content/plugins/lektor-strip-html-tags/contents.lr
index f90574d8..50841366 100644
--- a/content/plugins/lektor-strip-html-tags/contents.lr
+++ b/content/plugins/lektor-strip-html-tags/contents.lr
@@ -1,3 +1,5 @@
+_model: plugin
+---
 name: lektor-strip-html-tags
 ---
 categories: templates
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..401af384 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
diff --git a/content/plugins/lektor-webpack-support/contents.lr b/content/plugins/lektor-webpack-support/contents.lr
index 4cc1f57e..02587834 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
diff --git a/content/plugins/lektor-yandex-metrica/contents.lr b/content/plugins/lektor-yandex-metrica/contents.lr
index 0de5a9df..5f35c1d8 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
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': [