diff --git a/docs/config.toml b/docs/config.toml
index 262f7dd7e9..656d451fc9 100644
--- a/docs/config.toml
+++ b/docs/config.toml
@@ -5,6 +5,10 @@ description = "Everything you need to make a static site engine in one binary."
 compile_sass = true
 build_search_index = true
 
+taxonomies = [
+  { name = "theme-tags"}
+]
+
 [search]
 index_format = "elasticlunr_json"
 
diff --git a/docs/content/documentation/themes/creating-a-theme.md b/docs/content/documentation/themes/creating-a-theme.md
index ae862b267e..1931e73447 100644
--- a/docs/content/documentation/themes/creating-a-theme.md
+++ b/docs/content/documentation/themes/creating-a-theme.md
@@ -16,6 +16,8 @@ following fields:
 ```toml
 name = "my theme name"
 description = "A classic blog theme"
+# An optional tags to allow quick search
+tags = []
 license = "MIT"
 homepage = "https://github.com/getzola/hyde"
 # The minimum version of Zola required
diff --git a/docs/templates/theme-tags/list.html b/docs/templates/theme-tags/list.html
new file mode 100644
index 0000000000..bb2b5ee4e6
--- /dev/null
+++ b/docs/templates/theme-tags/list.html
@@ -0,0 +1,17 @@
+{% extends "index.html" %}
+
+{% block extra_nav_class %}{% endblock extra_nav_class %}
+{% block extra_content_class %}content--reversed{% endblock extra_content_class %}
+
+{% block title %}Themes | {{ super() }} {% endblock title %}
+
+{% block content %}
+<h1>Tags</h1>
+{% set section = get_section(path = "themes/_index.md") %}
+<p><a href="{{ get_url(path = "themes") }}">All themes ({{ section.pages | length }}</a></p>
+<ul style="list-style-type: none;">
+{% for t in terms %}
+<li><a href="{{ t.permalink }}">{{ t.name }}({{ t.page_count }}</a></li>
+{% endfor %}
+</ul>
+{% endblock content %}
\ No newline at end of file
diff --git a/docs/templates/theme-tags/single.html b/docs/templates/theme-tags/single.html
new file mode 100644
index 0000000000..b11bc95603
--- /dev/null
+++ b/docs/templates/theme-tags/single.html
@@ -0,0 +1,22 @@
+{% extends "index.html" %}
+
+{% block extra_nav_class %}{% endblock extra_nav_class %}
+{% block extra_content_class %}content--reversed{% endblock extra_content_class %}
+
+{% block title %}Themes | {{ super() }} {% endblock title %}
+
+{% block content %}
+    <div class="themes-container">
+        {% block theme_content %}
+            <h1>Zola themes in {{ term.name }}</h1>
+            <div class="themes">
+                {% for theme in term.pages %}
+                    <a class="theme" href="{{theme.permalink}}">
+                        <img src="{{theme.permalink}}screenshot.png" alt="Screenshot of {{theme.title}}">
+                        <span>{{theme.title}}</span>
+                    </a>
+                {% endfor %}
+            </div>
+        {% endblock theme_content %}
+    </div>
+{% endblock content %}
diff --git a/docs/templates/theme.html b/docs/templates/theme.html
index 27c1f08a3e..aac0f0c8e8 100644
--- a/docs/templates/theme.html
+++ b/docs/templates/theme.html
@@ -13,6 +13,16 @@ <h1>{{ page.title }}</h1>
             {% if page.extra.demo %}
               <p><b>Live Demo:</b> <a href="{{page.extra.demo}}">{{page.extra.demo}}</a></p>
             {% endif %}
+            {% if page.taxonomies["theme-tags"] %}
+              <div>
+              <p>Tags:</p>
+              <ul style="list-style-type: none;">
+              {% for t in page.taxonomies["theme-tags"] %}
+                {% set term = get_taxonomy_term(kind="theme-tags", term = t) %}
+                <li><a href="{{ term.permalink }}">{{ term.name }}</a></li>
+                {% endfor %}
+              </div>
+            {% endif %}
             <p><b>Last updated:</b> {{page.extra.updated }}</p>
         </div>
     </div>
diff --git a/docs/templates/themes.html b/docs/templates/themes.html
index 85a837112d..8ede7f2e47 100644
--- a/docs/templates/themes.html
+++ b/docs/templates/themes.html
@@ -9,6 +9,10 @@
     <div class="themes-container">
         {% block theme_content %}
             <h1>Zola themes</h1>
+            {% set tax = get_taxonomy(kind = "theme-tags") %}
+            {% if tax and tax.items | length > 0 %}
+              <p><a href="{{ get_url(path = "theme-tags") }}">Search by tags</a></p>
+            {% endif %}
             <div class="themes">
                 {% for theme in section.pages %}
                     <a class="theme" href="{{theme.permalink}}">