diff --git a/categories.html b/categories.html
new file mode 100644
index 00000000..c8cd1a77
--- /dev/null
+++ b/categories.html
@@ -0,0 +1,42 @@
+---
+title: Plugins by Category
+---
+
+{% assign all_cats = "" | split: "/" %}
+{% for plugin in site.repo %}
+  {% for cat in plugin.categories %}
+    {% assign preprocessed = cat | strip | downcase %}
+    {% unless preprocessed == "" %}
+      {% assign all_cats = all_cats | push: preprocessed %}
+    {% endunless %}
+  {% endfor %}
+{% endfor %}
+{% assign all_cats = all_cats | uniq | sort %}
+
+<i class="fa fa-tag"></i>
+{% for cat in all_cats %}
+  {% unless tag == "" %}
+    <a class="label" href="{{ '/categories/' | prepend: site.baseurl }}#{{ cat | slugify }}">
+      <span class="badge rounded-pill bg-warning">{{ cat }}</span>
+    </a>
+  {% endunless %}
+{% endfor %}
+
+{% for cat in all_cats %}
+{% unless cat == "" %}
+<h2 id="{{ cat | slugify }}">{{ cat }}</h2>
+
+<div>
+  {% for plugin in site.repo %}
+    {% assign plugin_cats = "" | split: "/" %}
+    {% for cat in plugin.categories %}
+      {% assign lower_cat = cat | downcase %}
+      {% assign plugin_cats = plugin_cats | push: lower_cat %}
+    {% endfor %}
+    {% if plugin_cats contains cat %}
+      {% include plugin_card.html plugin=plugin %}
+    {% endif %}
+  {% endfor %}
+</div>
+{% endunless %}
+{% endfor %}
\ No newline at end of file
diff --git a/tags.html b/tags.html
new file mode 100644
index 00000000..842eff38
--- /dev/null
+++ b/tags.html
@@ -0,0 +1,42 @@
+---
+title: Plugins by Tags
+---
+
+{% assign all_tags = "" | split: "/" %}
+{% for plugin in site.repo %}
+  {% for tag in plugin.tags %}
+    {% assign preprocessed = tag | strip | downcase %}
+    {% unless preprocessed == "" %}
+      {% assign all_tags = all_tags | push: preprocessed %}
+    {% endunless %}
+  {% endfor %}
+{% endfor %}
+{% assign all_tags = all_tags | uniq | sort %}
+
+<i class="fa fa-tag"></i>
+{% for tag in all_tags %}
+  {% unless tag == "" %}
+  <a class="label" href="{{ '/tags/' | prepend: site.baseurl }}#{{ tag | slugify }}">
+    <span class="badge rounded-pill bg-info">{{ tag }}</span>
+  </a>
+  {% endunless %}
+{% endfor %}
+
+{% for tag in all_tags %}
+{% unless tag == "" %}
+<h2 id="{{ tag | slugify }}">{{ tag }}</h2>
+
+<div>
+  {% for plugin in site.repo %}
+    {% assign plugin_tags = "" | split: "/" %}
+    {% for tag in plugin.tags %}
+      {% assign lower_tag = tag | downcase %}
+      {% assign plugin_tags = plugin_tags | push: lower_tag %}
+    {% endfor %}
+    {% if plugin_tags contains tag %}
+      {% include plugin_card.html plugin=plugin %}
+    {% endif %}
+  {% endfor %}
+</div>
+{% endunless %}
+{% endfor %}
\ No newline at end of file