diff --git a/_includes/post-meta.html b/_includes/post-meta.html
index ee28564..ba189ba 100755
--- a/_includes/post-meta.html
+++ b/_includes/post-meta.html
@@ -1,3 +1,15 @@
+{% if page.categories %}
+  {% capture categories %}
+    {% for category in page.categories %}
+      <span class="label  label--category"><a href="{{ site.baseurl }}/categories#{{ category | downcase }}">{{ category }}</a></span>{% if forloop.last == false %},{% endif %}
+    {% endfor %}
+  {% endcapture %}
+{% elsif page.category %}
+  {% capture categories %}
+    <span class="label  label--category"><a href="{{ site.baseurl }}/categories#{{ page.category | downcase }}">{{ page.category }}</a></span>
+  {% endcapture %}
+{% endif %}
+
 <small class="small  post-meta">
-  {% if page.category %}<span class="label  label--category">{{ page.category }}</span>&nbsp;&nbsp;&middot;&nbsp;&nbsp;{% endif %}<time datetime="{{ page.date | date_to_xmlschema }}" class="time">{{ page.date | date_to_string }}</time>
+  {{ categories | append: "&nbsp;&middot;&nbsp;" }}<time datetime="{{ page.date | date_to_xmlschema }}" class="time">{{ page.date | date_to_string }}</time>
 </small>
diff --git a/garth-jekyll-theme.gemspec b/garth-jekyll-theme.gemspec
index d01a971..c403f2f 100755
--- a/garth-jekyll-theme.gemspec
+++ b/garth-jekyll-theme.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "garth-jekyll-theme"
-  spec.version       = "0.5.0"
+  spec.version       = "0.6.0"
   spec.authors       = ["David Darnes"]
   spec.email         = ["me@daviddarnes.com"]
 
@@ -11,10 +11,12 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://garth.darn.es"
   spec.license       = "MIT"
 
+  spec.metadata["plugin_type"] = "theme"
+
   spec.files         = `git ls-files -z`.split("\x0").select { |f| f.match(%r{^(assets|_layouts|_includes|_sass|LICENSE|README)}i) }
 
-  spec.add_runtime_dependency "jekyll", "~> 3.3"
+  spec.add_runtime_dependency "jekyll", "~> 3.6"
   spec.add_runtime_dependency "jekyll-paginate", "~> 1.1"
 
-  spec.add_development_dependency "bundler", "~> 1.12"
+  spec.add_development_dependency "bundler", "~> 1.14"
 end