3 files changed, 19 insertions, 11 deletions
diff --git a/themes/default/layouts/partials/meta-tags.html b/themes/default/layouts/partials/meta-tags.html
deleted file mode 100644
index cd13781..0000000
--- a/themes/default/layouts/partials/meta-tags.html
+++ /dev/null
@@ -1,6 +0,0 @@
-{{- with .Params.tags -}}
-  {{- range $tags, $tag := sort $.Params.tags }}
-    {{ $link := print ("tags/" | relURL) ($tag | urlize) "/" }}
-    {{- print "[#" $tag "](" $link ")" | markdownify -}}
-  {{- end -}}
-{{- end -}}
diff --git a/themes/default/layouts/partials/rss-tags.html b/themes/default/layouts/partials/rss-tags.html
deleted file mode 100644
index a54b628..0000000
--- a/themes/default/layouts/partials/rss-tags.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{{- with .Params.tags -}}
-  {{- range $tags, $tag := sort . }}
-    <a href="{{ "tags/" | absURL }}{{ $tag | urlize }}/">#{{ $tag }}</a>&nbsp;
-  {{- end }}
-{{- end }}
diff --git a/themes/default/layouts/partials/tags.html b/themes/default/layouts/partials/tags.html
new file mode 100644
index 0000000..1c798a4
--- /dev/null
+++ b/themes/default/layouts/partials/tags.html
@@ -0,0 +1,19 @@
+{{- $format := .Format -}}
+{{- $pageContext := .Context -}}
+{{- $path := "tags/" -}}
+{{- $url := $path | relURL -}}
+
+{{- with $pageContext.Params.tags -}}
+  {{- range $tags, $tag := sort $pageContext.Params.tags -}}
+    {{- if (eq $format "rss") -}}
+      {{- $url = $path | absURL -}}
+    {{- end -}}
+
+    {{- $link := print $url ($tag | urlize) "/" -}}
+    {{- print "[#" $tag "](" $link ")" | markdownify -}}
+
+    {{- if (eq $format "rss") -}}&nbsp;{{- end -}}
+  {{- end -}}
+{{- else -}}
+  <a href="{{ "tags/" | absURL }}">#untagged</a>
+{{- end -}}