diff --git a/templates/chorus-collection-post.tmpl b/templates/chorus-collection-post.tmpl
index a6b6102..b9df8ad 100644
--- a/templates/chorus-collection-post.tmpl
+++ b/templates/chorus-collection-post.tmpl
@@ -1,153 +1,153 @@
{{define "post"}}
{{.PlainDisplayTitle}} {{localhtml "title dash" .Language.String}} {{.Collection.DisplayTitle}}
{{if gt .Views 1}}
{{end}}
{{if gt (len .Images) 0}}{{else}}{{end}}
{{range .Images}}{{else}}{{end}}
{{if .Collection.StyleSheet}}{{end}}
{{if .Collection.RenderMathJax}}
{{template "mathjax" . }}
{{end}}
{{template "highlighting" .}}
{{template "user-navigation" .}}
{{if .Suspended}}
{{template "user-suspended"}}
{{end}}
{{if .IsScheduled}}Scheduled
{{end}}{{if .Title.String}}{{.FormattedDisplayTitle}}
{{end}}{{/* TODO: check format: if .Collection.Format.ShowDates*/}}{{.HTMLContent}}
{{ if .Collection.ShowFooterBranding }}
{{ end }}
{{if .Collection.CanShowScript}}
{{range .Collection.ExternalScripts}}{{end}}
{{if .Collection.Script}}{{end}}
{{end}}
{{end}}
diff --git a/templates/chorus-collection.tmpl b/templates/chorus-collection.tmpl
index 504e54f..8250287 100644
--- a/templates/chorus-collection.tmpl
+++ b/templates/chorus-collection.tmpl
@@ -1,233 +1,233 @@
{{define "collection"}}
{{.DisplayTitle}}{{if not .SingleUser}} — {{.SiteName}}{{end}}
{{if gt .CurrentPage 1}}{{end}}
{{if lt .CurrentPage .TotalPages}}{{end}}
{{if not .IsPrivate}}{{end}}
{{if .StyleSheet}}{{end}}
{{if .RenderMathJax}}
{{template "mathjax" .}}
{{end}}
{{template "highlighting" . }}
{{template "user-navigation" .}}
{{if .Suspended}}
{{template "user-suspended"}}
{{end}}
{{if .Posts}}{{else}}{{end}}
{{if .ShowFooterBranding }}
{{ end }}
{{if .CanShowScript}}
{{range .ExternalScripts}}{{end}}
{{if .Script}}{{end}}
{{end}}
{{end}}
diff --git a/templates/collection-post.tmpl b/templates/collection-post.tmpl
index e24c6dd..a194cf4 100644
--- a/templates/collection-post.tmpl
+++ b/templates/collection-post.tmpl
@@ -1,133 +1,133 @@
{{define "post"}}
{{.PlainDisplayTitle}} {{localhtml "title dash" .Language.String}} {{.Collection.DisplayTitle}}
{{ if .IsFound }}
{{if gt .Views 1}}
{{end}}
{{if gt (len .Images) 0}}{{else}}{{end}}
{{range .Images}}{{else}}{{end}}
{{ end }}
{{if .Collection.StyleSheet}}{{end}}
{{if .Collection.RenderMathJax}}
{{template "mathjax" . }}
{{end}}
{{template "highlighting" .}}
{{if .Suspended}}
{{template "user-suspended"}}
{{end}}
{{if .IsScheduled}}Scheduled
{{end}}{{if .Title.String}}{{.FormattedDisplayTitle}}
{{end}}{{.HTMLContent}}
{{ if .Collection.ShowFooterBranding }}
{{ end }}
{{if .Collection.CanShowScript}}
{{range .Collection.ExternalScripts}}{{end}}
{{if .Collection.Script}}{{end}}
{{end}}
{{end}}
diff --git a/templates/collection-tags.tmpl b/templates/collection-tags.tmpl
index 2618f3d..f209162 100644
--- a/templates/collection-tags.tmpl
+++ b/templates/collection-tags.tmpl
@@ -1,197 +1,197 @@
{{define "collection-tags"}}
{{.Tag}} — {{.Collection.DisplayTitle}}
{{if not .Collection.IsPrivate}}{{end}}
{{if gt .Views 1}}
{{end}}
{{if .Collection.StyleSheet}}{{end}}
{{if .Collection.RenderMathJax}}
{{template "mathjax" .}}
{{end}}
{{template "highlighting" . }}
{{if .Suspended}}
{{template "user-suspended"}}
{{end}}
{{if .Posts}}{{else}}{{end}}
{{.Tag}}
{{template "posts" .}}
{{if .Posts}}{{else}}{{end}}
{{ if .Collection.ShowFooterBranding }}
{{ end }}
{{if .CanShowScript}}
{{range .ExternalScripts}}{{end}}
{{if .Collection.Script}}{{end}}
{{end}}
{{if .IsOwner}}
{{end}}
{{end}}
diff --git a/templates/collection.tmpl b/templates/collection.tmpl
index 47dc24d..b87ce87 100644
--- a/templates/collection.tmpl
+++ b/templates/collection.tmpl
@@ -1,233 +1,233 @@
{{define "collection"}}
{{.DisplayTitle}}{{if not .SingleUser}} — {{.SiteName}}{{end}}
{{if gt .CurrentPage 1}}{{end}}
{{if lt .CurrentPage .TotalPages}}{{end}}
{{if not .IsPrivate}}{{end}}
{{if .StyleSheet}}{{end}}
{{if .RenderMathJax}}
{{template "mathjax" .}}
{{end}}
{{template "highlighting" . }}
{{if or .IsOwner .SingleUser}}{{end}}
{{if .Suspended}}
{{template "user-suspended"}}
{{end}}
{{if .Description}}{{.Description}}
{{end}}
{{/*if not .Public/*}}
{{/*end*/}}
{{if .PinnedPosts}}
+ {{range .PinnedPosts}}{{.PlainDisplayTitle}}{{end}}
{{end}}
{{if .Posts}}{{else}}{{end}}
{{if .ShowFooterBranding }}
{{ end }}
{{if .CanShowScript}}
{{range .ExternalScripts}}{{end}}
{{if .Script}}{{end}}
{{end}}
{{end}}