diff --git a/static/js/postactions.js b/static/js/postactions.js
index 90b1f18..7862445 100644
--- a/static/js/postactions.js
+++ b/static/js/postactions.js
@@ -1,122 +1,122 @@
 var postActions = function() {
 	var basePath = window.WF_BASE_PATH || "";
 	var $container = He.get('moving');
 	var MultiMove = function(el, id, singleUser) {
 		var lbl = el.options[el.selectedIndex].textContent;
 		var collAlias = el.options[el.selectedIndex].value;
 		var $lbl = He.$('label[for=move-'+id+']')[0];
 		$lbl.textContent = "moving to "+lbl+"...";
 		var params;
 		if (collAlias == '|anonymous|') {
 			params = [id];
 		} else {
 			params = [{
 				id: id
 			}];
 		}
 		var callback = function(code, resp) {
 			if (code == 200) {
 				for (var i=0; i<resp.data.length; i++) {
 					if (resp.data[i].code == 200) {
 						$lbl.innerHTML = "moved to <strong>"+lbl+"</strong>";
-						var pre = "/"+collAlias;
+						var pre = `${basePath}/${collAlias}`;
 						if (typeof singleUser !== 'undefined' && singleUser) {
 							pre = "";
 						}
-					var newPostURL = basePath+pre+"/"+resp.data[i].post.slug;
+						var newPostURL = pre+"/"+resp.data[i].post.slug;
 						try {
 							// Posts page
 							He.$('#post-'+resp.data[i].post.id+' > h3 > a')[0].href = newPostURL;
 						} catch (e) {
 							// Blog index
 							var $article = He.get('post-'+resp.data[i].post.id);
 							$article.className = 'norm moved';
 							if (collAlias == '|anonymous|') {
 								var draftPre = "";
 								if (typeof singleUser !== 'undefined' && singleUser) {
 									draftPre = "d/";
 								}
-								$article.innerHTML = '<p><a href="'+basePath+'/'+draftPre+resp.data[i].post.id+'">Unpublished post</a>.</p>';
+								$article.innerHTML = `<p>Moved to <a style="font-weight:bold" href=${newPostURL}>${lbl}</a>.</p>`;
 							} else {
-								$article.innerHTML = '<p>Moved to <a style="font-weight:bold" href="'+newPostURL+'">'+lbl+'</a>.</p>';
+								$article.innerHTML = `<p>Moved to <a style="font-weight:bold" href=${newPostURL}>${lbl}</a>.</p>`;
 							}
 						}
 					} else {
 						$lbl.innerHTML = "unable to move: "+resp.data[i].error_msg;
 					}
 				}
 			}
 		};
 		if (collAlias == '|anonymous|') {
 			He.postJSON(basePath + "/api/posts/disperse", params, callback);
 		} else {
 			He.postJSON(basePath + "/api/collections/"+collAlias+"/collect", params, callback);
 		}
 	};
 	var Move = function(el, id, collAlias, singleUser) {
 		var lbl = el.textContent;
 		try {
 			var m = lbl.match(/move to (.*)/);
 			lbl = m[1];
 		} catch (e) {
 			if (collAlias == '|anonymous|') {
 				lbl = "draft";
 			}
 		}
 
 		el.textContent = "moving to "+lbl+"...";
 		if (collAlias == '|anonymous|') {
 			params = [id];
 		} else {
 			params = [{
 				id: id
 			}];
 		}
 		var callback = function(code, resp) {
 			if (code == 200) {
 				for (var i=0; i<resp.data.length; i++) {
 					if (resp.data[i].code == 200) {
 						el.innerHTML = "moved to <strong>"+lbl+"</strong>";
 						el.onclick = null;
-						var pre = "/"+collAlias;
+						var pre = `${basePath}/${collAlias}`;
 						if (typeof singleUser !== 'undefined' && singleUser) {
 							pre = "";
 						}
-					var newPostURL = basePath+pre+"/"+resp.data[i].post.slug;
+						var newPostURL = pre+"/"+resp.data[i].post.slug;
 						el.href = newPostURL;
 						el.title = "View on "+lbl;
 						try {
 							// Posts page
 							He.$('#post-'+resp.data[i].post.id+' > h3 > a')[0].href = newPostURL;
 						} catch (e) {
 							// Blog index 
 							var $article = He.get('post-'+resp.data[i].post.id);
 							$article.className = 'norm moved';
 							if (collAlias == '|anonymous|') {
 								var draftPre = "";
 								if (typeof singleUser !== 'undefined' && singleUser) {
 									draftPre = "d/";
 								}
-								$article.innerHTML = '<p><a href="'+basePath+'/'+draftPre+resp.data[i].post.id+'">Unpublished post</a>.</p>';
+								$article.innerHTML = `<p><a href=${basePath}/${draftPre+resp.data[i].post.id}>Unpublished post</a>.</p>`;
 							} else {
-								$article.innerHTML = '<p>Moved to <a style="font-weight:bold" href="'+newPostURL+'">'+lbl+'</a>.</p>';
+								$article.innerHTML = `<p>Moved to <a style="font-weight:bold" href=${newPostURL}>${lbl}</a>.</p>`;
 							}
 						}
 					} else {
-						el.innerHTML = "unable to move: "+resp.data[i].error_msg;
+						el.innerHTML = `unable to move: ${resp.data[i].error_msg}`;
 					}
 				}
 			}
 		}
 		if (collAlias == '|anonymous|') {
 			He.postJSON(basePath + "/api/posts/disperse", params, callback);
 		} else {
 			He.postJSON(basePath + "/api/collections/"+collAlias+"/collect", params, callback);
 		}
 	};
 
 	return {
 		move: Move,
 		multiMove: MultiMove,
 	};
 }();
diff --git a/templates/chorus-collection.tmpl b/templates/chorus-collection.tmpl
index aa1168b..09195ea 100644
--- a/templates/chorus-collection.tmpl
+++ b/templates/chorus-collection.tmpl
@@ -1,243 +1,243 @@
 {{define "collection"}}<!DOCTYPE HTML>
 <html {{if .Language}}lang="{{.Language}}"{{end}} dir="{{.Direction}}">
 	<head>
 		{{template "head-base" .}}
 		<meta charset="utf-8">
 
 		<title>{{.DisplayTitle}}{{if not .SingleUser}} &mdash; {{.SiteName}}{{end}}</title>
 
 		<link rel="stylesheet" type="text/css" href="css/write.css" />
 		{{if .CustomCSS}}<link rel="stylesheet" type="text/css" href="local/custom.css" />{{end}}
 		{{if .Favicon}}<link rel="shortcut icon" href="{{.Favicon}}" />{{else}}<link rel="shortcut icon" href="favicon.ico" />{{end}}
 		<link rel="canonical" href="{{.CanonicalURL}}">
 		{{if gt .CurrentPage 1}}<link rel="prev" href="{{.PrevPageURL .Prefix .NavSuffix .CurrentPage .IsTopLevel}}">{{end}}
 		{{if lt .CurrentPage .TotalPages}}<link rel="next" href="{{.NextPageURL .Prefix .NavSuffix .CurrentPage .IsTopLevel}}">{{end}}
 		{{if not .IsPrivate}}<link rel="alternate" type="application/rss+xml" title="{{.DisplayTitle}} &raquo; Feed" href="{{.CanonicalURL}}feed/" />{{end}}
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
 		<meta name="generator" content="WriteFreely">
 		<meta name="description" content="{{.Description}}">
 		<meta itemprop="name" content="{{.DisplayTitle}}">
 		<meta itemprop="description" content="{{.Description}}">
 		<meta name="twitter:card" content="summary">
 		<meta name="twitter:title" content="{{.DisplayTitle}}">
 		<meta name="twitter:image" content="{{.AvatarURL}}">
 		<meta name="twitter:description" content="{{.Description}}">
 		<meta property="og:title" content="{{.DisplayTitle}}" />
 		<meta property="og:site_name" content="{{.DisplayTitle}}" />
 		<meta property="og:type" content="article" />
 		<meta property="og:url" content="{{.CanonicalURL}}" />
 		<meta property="og:description" content="{{.Description}}" />
 		<meta property="og:image" content="{{.AvatarURL}}">
 		{{template "collection-meta" .}}
 		{{if .StyleSheet}}<style type="text/css">{{.StyleSheetDisplay}}</style>{{end}}
 	<style type="text/css">
 body#collection header {
 	max-width: 40em;
 	margin: 1em auto;
     text-align: left;
 	padding: 0;
 }
 body#collection header.multiuser {
     max-width: 100%;
     margin: 1em;
 }
 body#collection header nav:not(.pinned-posts) {
 	display: inline;
 }
 body#collection header nav.dropdown-nav,
 body#collection header nav.tabs,
 body#collection header nav.tabs a:first-child {
 	margin: 0 0 0 1em;
 }
 	</style>
 
 		{{if .RenderMathJax}}
 		  <!-- Add mathjax logic -->
 		  {{template "mathjax" .}}
 		{{end}}
 
 		{{if .RenderMermaid}}
 		  <!-- Add Mermaid diagram rendering -->
 		  {{template "mermaid" .}}
 		{{end}}
 
 		<!-- Add highlighting logic -->
 		{{template "highlighting" . }}
 
 	</head>
 	<body id="collection" itemscope itemtype="http://schema.org/WebPage">
 		{{template "user-navigation" .}}
 
 		{{if .Silenced}}
 			{{template "user-silenced"}}
 		{{end}}
 		<header>
 		<h1 dir="{{.Direction}}" id="blog-title"><a href="{{if .IsTopLevel}}{{else}}{{.Prefix}}{{.Alias}}/{{end}}" class="h-card p-author u-url" rel="me author">{{.DisplayTitle}}</a></h1>
 		{{if .Description}}<p class="description p-note">{{.Description}}</p>{{end}}
 		{{/*if not .Public/*}}
 			<!--p class="meta-note"><span>Private collection</span>. Only you can see this page.</p-->
 		{{/*end*/}}
 		{{if .PinnedPosts}}<nav class="pinned-posts">
 			{{range .PinnedPosts}}<a class="pinned" href="{{if not $.SingleUser}}/{{$.Alias}}/{{.Slug.String}}{{else}}{{.CanonicalURL $.Host}}{{end}}">{{.PlainDisplayTitle}}</a>{{end}}</nav>
 		{{end}}
 		</header>
 
 		{{if .Posts}}<section id="wrapper" itemscope itemtype="http://schema.org/Blog">{{else}}<div id="wrapper">{{end}}
 
 			{{if .IsWelcome}}
 			<div id="welcome">
 				<h2>Welcome, <strong>{{.Username}}</strong>!</h2>
 				<p>This is your new blog.</p>
 				<p><a class="simple-cta" href="#{{.Alias}}">Start writing</a>, or <a class="simple-cta" href="me/c/{{.Alias}}">customize</a> your blog.</p>
 				<p>Check out our <a class="simple-cta" href="https://writefreely.org/docs/latest/writer/writing">writing guide</a> to see what else you can do, and <a class="simple-cta" href="contact">get in touch</a> anytime with questions or feedback.</p>
 			</div>
 			{{end}}
 
 			{{template "posts" .}}
 
 		{{if gt .TotalPages 1}}<nav id="paging" class="content-container clearfix">
 			{{if or (and .Format.Ascending (le .CurrentPage .TotalPages)) (isRTL .Direction)}}
 				{{if gt .CurrentPage 1}}<a href="{{.PrevPageURL .Prefix .NavSuffix .CurrentPage .IsTopLevel}}">&#8672; {{if and .Format.Ascending (le .CurrentPage .TotalPages)}}Previous{{else}}Newer{{end}}</a>{{end}}
 				{{if lt .CurrentPage .TotalPages}}<a style="float:right;" href="{{.NextPageURL .Prefix .NavSuffix .CurrentPage .IsTopLevel}}">{{if and .Format.Ascending (lt .CurrentPage .TotalPages)}}Next{{else}}Older{{end}} &#8674;</a>{{end}}
 			{{else}}
 				{{if lt .CurrentPage .TotalPages}}<a href="{{.NextPageURL .Prefix .NavSuffix .CurrentPage .IsTopLevel}}">&#8672; Older</a>{{end}}
 				{{if gt .CurrentPage 1}}<a style="float:right;" href="{{.PrevPageURL .Prefix .NavSuffix .CurrentPage .IsTopLevel}}">Newer &#8674;</a>{{end}}
 			{{end}}
 		</nav>{{end}}
 
 		{{if .Posts}}</section>{{else}}</div>{{end}}
 
 		{{if .ShowFooterBranding }}
 		<footer>
 			<hr />
 			<nav dir="ltr">
 				{{if not .SingleUser}}<a class="home pubd" href="">{{.SiteName}}</a> &middot; {{end}}powered by <a style="margin-left:0" href="https://writefreely.org">writefreely</a>
 			</nav>
 		</footer>
 		{{ end }}
 	</body>
 
 	{{if .CanShowScript}}
 		{{range .ExternalScripts}}<script type="text/javascript" src="{{.}}" async></script>{{end}}
 		{{if .Script}}<script type="text/javascript">{{.ScriptDisplay}}</script>{{end}}
 	{{end}}
 	<script src="js/h.js"></script>
 	<script src="js/localdate.js"></script>
 	<script>window.WF_BASE_PATH = "{{subdir}}";</script>
 	<script src="js/postactions.js"></script>
 	<script type="text/javascript">
 var deleting = false;
 function delPost(e, id, owned) {
 	e.preventDefault();
 	if (deleting) {
 		return;
 	}
 
 	// TODO: UNDO!
 	if (window.confirm('Are you sure you want to delete this post?')) {
 		// AJAX
 		deletePost(id, "", function() {
 			// Remove post from list
 			var $postEl = document.getElementById('post-' + id);
 			$postEl.parentNode.removeChild($postEl);
 			// TODO: add next post from this collection at the bottom
 		});
 	}
 }
 
 var deletePost = function(postID, token, callback) {
 	deleting = true;
 
 	var $delBtn = document.getElementById('post-' + postID).getElementsByClassName('delete action')[0];
 	$delBtn.innerHTML = '...';
 
 	var http = new XMLHttpRequest();
 	var url = "{{subdir}}/api/posts/" + postID;
 	http.open("DELETE", url, true);
 	http.onreadystatechange = function() {
 		if (http.readyState == 4) {
 			deleting = false;
 			if (http.status == 204) {
 				callback();
 			} else if (http.status == 409) {
 				$delBtn.innerHTML = 'delete';
 				alert("Post is synced to another account. Delete the post from that account instead.");
 				// TODO: show "remove" button instead of "delete" now
 				// Persist that state.
 				// Have it remove the post locally only.
 			} else {
 				$delBtn.innerHTML = 'delete';
 				alert("Failed to delete." + (http.status>=500?" Please try again.":""));
 			}
 		}
 	}
 	http.send();
 };
 
 var pinning = false;
 function pinPost(e, postID, slug, title) {
 	e.preventDefault();
 	if (pinning) {
 		return;
 	}
 	pinning = true;
 
 	var callback = function() {
 		// Visibly remove post from collection
 		var $postEl = document.getElementById('post-' + postID);
 		$postEl.parentNode.removeChild($postEl);
 		var $header = document.querySelector('header:not(.multiuser)');
 		var $pinnedNavs = $header.getElementsByTagName('nav');
 		// Add link to nav
-		var link = '<a class="pinned" href="{{.Alias}}/'+slug+'">'+title+'</a>';
+		var link = '<a class="pinned" href="{{subdir}}/{{.Alias}}/'+slug+'">'+title+'</a>';
 		if ($pinnedNavs.length == 0) {
 			$header.insertAdjacentHTML("beforeend", '<nav>'+link+'</nav>');
 		} else {
 			$pinnedNavs[0].insertAdjacentHTML("beforeend", link);
 		}
 	};
 
 	var $pinBtn = document.getElementById('post-' + postID).getElementsByClassName('pin action')[0];
 	$pinBtn.innerHTML = '...';
 
 	var http = new XMLHttpRequest();
 	var url = "{{subdir}}/api/collections/{{.Alias}}/pin";
 	var params = [ { "id": postID } ];
 	http.open("POST", url, true);
 	http.setRequestHeader("Content-type", "application/json");
 	http.onreadystatechange = function() {
 		if (http.readyState == 4) {
 			pinning = false;
 			if (http.status == 200) {
 				callback();
 			} else if (http.status == 409) {
 				$pinBtn.innerHTML = 'pin';
 				alert("Post is synced to another account. Delete the post from that account instead.");
 				// TODO: show "remove" button instead of "delete" now
 				// Persist that state.
 				// Have it remove the post locally only.
 			} else {
 				$pinBtn.innerHTML = 'pin';
 				alert("Failed to pin." + (http.status>=500?" Please try again.":""));
 			}
 		}
 	}
 	http.send(JSON.stringify(params));
 };
 
 	try {
 	  WebFontConfig = {
 		custom: { families: [ 'Lora:400,700:latin', 'Open+Sans:400,700:latin' ], urls: [ 'css/fonts.css' ] }
 	  };
 	  (function() {
 		var wf = document.createElement('script');
 		wf.src = 'js/webfont.js';
 		wf.type = 'text/javascript';
 		wf.async = 'true';
 		var s = document.getElementsByTagName('script')[0];
 		s.parentNode.insertBefore(wf, s);
 	  })();
 	} catch (e) {}
 	</script>
 </html>{{end}}
diff --git a/templates/collection-archive.tmpl b/templates/collection-archive.tmpl
index ec1cc43..5bcd127 100644
--- a/templates/collection-archive.tmpl
+++ b/templates/collection-archive.tmpl
@@ -1,119 +1,119 @@
 {{define "collection"}}<!DOCTYPE HTML>
 <html>
 <head prefix="og: http://ogp.me/ns# article: http://ogp.me/ns/article#">
 	{{template "head-base" .}}
 	<meta charset="utf-8">
 
 	<title>Archive &mdash; {{.Collection.DisplayTitle}}</title>
 
 	<link rel="stylesheet" type="text/css" href="css/write.css" />
     {{if .CustomCSS}}<link rel="stylesheet" type="text/css" href="local/custom.css" />{{end}}
 	{{if .Favicon}}<link rel="shortcut icon" href="{{.Favicon}}" />{{else}}<link rel="shortcut icon" href="favicon.ico" />{{end}}
 	<link rel="canonical" href="{{.CanonicalURL}}">
     {{if gt .CurrentPage 1}}<link rel="prev" href="{{.PrevPageURL .Prefix .NavSuffix .CurrentPage .IsTopLevel}}">{{end}}
     {{if lt .CurrentPage .TotalPages}}<link rel="next" href="{{.NextPageURL .Prefix .NavSuffix .CurrentPage .IsTopLevel}}">{{end}}
     {{if not .IsPrivate}}<link rel="alternate" type="application/rss+xml" title="{{.DisplayTitle}} &raquo; Feed" href="{{.CanonicalURL}}feed/" />{{end}}
 	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
 	<meta name="generator" content="WriteFreely">
 	<meta name="description" content="{{.PlainDescription}}">
 	<meta itemprop="name" content="{{.DisplayTitle}}">
 	<meta itemprop="description" content="{{.PlainDescription}}">
 	<meta name="twitter:card" content="summary">
 	<meta name="twitter:title" content="{{.DisplayTitle}}">
 	<meta name="twitter:image" content="{{.AvatarURL}}">
 	<meta name="twitter:description" content="{{.PlainDescription}}">
 	<meta property="og:title" content="{{.DisplayTitle}}" />
 	<meta property="og:site_name" content="{{.DisplayTitle}}" />
 	<meta property="og:type" content="article" />
 	<meta property="og:url" content="{{.CanonicalURL}}" />
 	<meta property="og:description" content="{{.PlainDescription}}" />
 	<meta property="og:image" content="{{.AvatarURL}}">
     {{template "collection-meta" .}}
     {{if .StyleSheet}}<style type="text/css">{{.StyleSheetDisplay}}</style>{{end}}
 
 </head>
 <body id="subpage">
 
 <div id="overlay"></div>
 
 <header>
 	<h1 dir="{{.Direction}}" id="blog-title"><a href="{{if .IsTopLevel}}{{else}}{{.Collection.Alias}}/{{end}}" class="h-card p-author">{{.Collection.DisplayTitle}}</a></h1>
 	<nav>
         {{if .PinnedPosts}}
-			{{range .PinnedPosts}}<a class="pinned" href="{{if $.IsOwner}}{{$.Collection.Alias}}/{{.Slug.String}}{{else}}{{.CanonicalURL}}{{end}}">{{.DisplayTitle}}</a>{{end}}
+			{{range .PinnedPosts}}<a class="pinned" href="{{if $.IsOwner}}{{subdir}}/{{$.Collection.Alias}}/{{.Slug.String}}{{else}}{{.CanonicalURL}}{{end}}">{{.DisplayTitle}}</a>{{end}}
         {{end}}
 	</nav>
 </header>
 
 {{if .Posts -}}
 <section id="wrapper" class="archive" itemscope itemtype="http://schema.org/Blog">
     {{- else -}}
 	<div id="wrapper" class="archive">
         {{- end}}
 
 		<h1>Archive</h1>
 
         {{if .Flash}}
 			<div class="alert success flash">
 				<p>{{.Flash}}</p>
 			</div>
         {{end}}
 
 		<ul>
             {{ $curYear := 0 }}
             {{ range $el := .Posts }}
                 {{if ne $curYear .Created.Year}}<li class="year">{{.Created.Year}}</li>{{ $curYear = .Created.Year }}{{end}}
 				<li>
                     {{if .HasTitleLink -}}
                         {{.HTMLTitleArrow}}
                     {{- else -}}
 						<a href="{{if $.SingleUser}}{{.Slug.String}}{{else}}{{$.Alias}}/{{.Slug.String}}{{end}}" itemprop="url" class="u-url">
                             {{- if .DisplayTitle -}}
                                 {{- .DisplayTitle -}}
                             {{- else -}}
 								(Untitled)
                             {{end}}
 						</a>
                     {{- end}}
                     {{if .IsScheduled}}[Scheduled]{{end}}
                     {{if $.Format.ShowDates -}}
 						<time class="dt-published" datetime="{{.Created8601}}" pubdate itemprop="datePublished" content="{{.Created}}">
                             {{- if .HasTitleLink -}}
 							<a href="{{if $.SingleUser}}{{.Slug.String}}{{else}}{{$.Alias}}/{{.Slug.String}}{{end}}" itemprop="url">
                                 {{- end -}}
                                 {{.DisplayDate}}
                                 {{- if .HasTitleLink -}}
                                 {{- if .IsPaid}}{{template "paid-badge" (dict "CDNHost" $.CDNHost)}}{{end -}}</a>
                             {{- end -}}
 						</time>
                     {{- else -}}
                         {{- if .HasTitleLink -}}
 							<a href="{{if $.SingleUser}}{{.Slug.String}}{{else}}{{$.Alias}}/{{.Slug.String}}{{end}}" itemprop="url">view</a>
                         {{- end -}}
                     {{- end}}
 				</li>
             {{end}}
 		</ul>
 
         {{template "paging" .}}
 
     {{if .Posts}}</section>{{else}}</div>{{end}}
 
 	{{if .ShowFooterBranding }}
 		<footer>
 			<hr />
 			<nav dir="ltr">
 				{{if not .SingleUser}}<a class="home pubd" href="">{{.SiteName}}</a> &middot; {{end}}powered by <a style="margin-left:0" href="https://writefreely.org">writefreely</a>
 			</nav>
 		</footer>
 	{{ end }}
 
 </body>
 
 {{if .CanShowScript}}
     {{range .ExternalScripts}}<script type="text/javascript" src="{{.}}" async></script>{{end}}
     {{if .Collection.Script}}<script type="text/javascript">{{.ScriptDisplay}}</script>{{end}}
 {{end}}
 <script src="js/localdate.js"></script>
 </html>{{end}}
diff --git a/templates/collection-tags.tmpl b/templates/collection-tags.tmpl
index abed7d2..71acaff 100644
--- a/templates/collection-tags.tmpl
+++ b/templates/collection-tags.tmpl
@@ -1,218 +1,218 @@
 {{define "collection-tags"}}<!DOCTYPE HTML>
 <html>
 	<head prefix="og: http://ogp.me/ns# article: http://ogp.me/ns/article#">
 		{{template "head-base" .}}
 		<meta charset="utf-8">
 
 		<title>{{.Tag}} &mdash; {{.Collection.DisplayTitle}}</title>
 		
 		<link rel="stylesheet" type="text/css" href="css/write.css" />
 		{{if .CustomCSS}}<link rel="stylesheet" type="text/css" href="local/custom.css" />{{end}}
 		{{if .Favicon}}<link rel="shortcut icon" href="{{.Favicon}}" />{{else}}<link rel="shortcut icon" href="favicon.ico" />{{end}}
 		{{if not .Collection.IsPrivate}}<link rel="alternate" type="application/rss+xml" title="{{.Tag}} posts on {{.DisplayTitle}}" href="{{.CanonicalURL}}tag:{{.Tag}}/feed/" />{{end}}
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 		<link rel="canonical" href="{{.CanonicalURL}}tag:{{.Tag | tolower}}" />
 		<meta name="generator" content="Write.as">
 		<meta name="title" content="{{.Tag}} &mdash; {{.Collection.DisplayTitle}}">
 		<meta name="description" content="{{.Tag}} posts on {{.Collection.DisplayTitle}}">
 		<meta name="application-name" content="Write.as">
 		<meta name="application-url" content="https://write.as">
 		{{if gt .Views 1}}<meta name="twitter:label1" value="Views">
 		<meta name="twitter:data1" value="{{largeNumFmt .Views}}">{{end}}
 		<meta itemprop="name" content="{{.Collection.DisplayTitle}}">
 		<meta itemprop="description" content="{{.Tag}} posts on {{.Collection.DisplayTitle}}">
 		<meta name="twitter:card" content="summary">
 		<meta name="twitter:site" content="@writeas__">
 		<meta name="twitter:description" content="{{.Tag}} posts on {{.Collection.DisplayTitle}}">
 		<meta name="twitter:title" content="{{.Tag}} &mdash; {{.Collection.DisplayTitle}}">
 		<meta name="twitter:image" content="{{.Collection.AvatarURL}}">
 		<meta property="og:title" content="{{.Tag}} &mdash; {{.Collection.DisplayTitle}}" />
 		<meta property="og:site_name" content="{{.DisplayTitle}}" />
 		<meta property="og:type" content="article" />
 		<meta property="og:url" content="{{.CanonicalURL}}tag:{{.Tag}}" />
 		<meta property="og:image" content="{{.Collection.AvatarURL}}">
 		{{template "collection-meta" .}}
 		{{if .Collection.StyleSheet}}<style type="text/css">{{.Collection.StyleSheetDisplay}}</style>{{end}}
 
 		{{if .Collection.RenderMathJax}}
 		  <!-- Add mathjax logic -->
 		  {{template "mathjax" .}}
 		{{end}}
 
 		{{if .Collection.RenderMermaid}}
 		  <!-- Add Mermaid diagram rendering -->
 		  {{template "mermaid" .}}
 		{{end}}
 
 		<!-- Add highlighting logic -->
 		{{template "highlighting" . }}
 
 	</head>
 	<body id="subpage">
 		
 		<div id="overlay"></div>
 
 		<header>
 		<h1 dir="{{.Direction}}" id="blog-title"><a href="{{if .IsTopLevel}}{{else}}{{.Collection.Alias}}/{{end}}" class="h-card p-author">{{.Collection.DisplayTitle}}</a></h1>
 			<nav>
 				{{if .PinnedPosts}}
-				{{range .PinnedPosts}}<a class="pinned" href="{{if not $.SingleUser}}{{$.Collection.Alias}}/{{.Slug.String}}{{else}}{{.CanonicalURL $.Host}}{{end}}">{{.DisplayTitle}}</a>{{end}}
+				{{range .PinnedPosts}}<a class="pinned" href="{{if not $.SingleUser}}{{subdir}}/{{$.Collection.Alias}}/{{.Slug.String}}{{else}}{{.CanonicalURL $.Host}}{{end}}">{{.DisplayTitle}}</a>{{end}}
 				{{end}}
 			</nav>
 		</header>
 		
 		{{if .Silenced}}
 			{{template "user-silenced"}}
 		{{end}}
 		{{if .Posts}}<section id="wrapper" itemscope itemtype="http://schema.org/Blog">{{else}}<div id="wrapper">{{end}}
 			<h1>{{.Tag}}</h1>
 			{{template "posts" .}}
 
 		{{if gt .TotalPages 1}}<nav id="paging" class="content-container clearfix">
 			{{if or (and .Format.Ascending (lt .CurrentPage .TotalPages)) (isRTL .Direction)}}
 				{{if gt .CurrentPage 1}}<a href="{{.PrevPageURL .Prefix .CurrentPage .IsTopLevel}}">&#8672; {{if and .Format.Ascending (lt .CurrentPage .TotalPages)}}Previous{{else}}Newer{{end}}</a>{{end}}
 				{{if lt .CurrentPage .TotalPages}}<a style="float:right;" href="{{.NextPageURL .Prefix .CurrentPage .IsTopLevel}}">{{if and .Format.Ascending (lt .CurrentPage .TotalPages)}}Next{{else}}Older{{end}} &#8674;</a>{{end}}
 			{{else}}
 				{{if lt .CurrentPage .TotalPages}}<a href="{{.NextPageURL .Prefix .CurrentPage .IsTopLevel}}">&#8672; Older</a>{{end}}
 				{{if gt .CurrentPage 1}}<a style="float:right;" href="{{.PrevPageURL .Prefix .CurrentPage .IsTopLevel}}">Newer &#8674;</a>{{end}}
 			{{end}}
 		</nav>{{end}}
 
 		{{if .Posts}}</section>{{else}}</div>{{end}}
 
 		{{ if .Collection.ShowFooterBranding }}
 		<footer dir="ltr">
 			<hr>
 			<nav>
 				<p style="font-size: 0.9em"><a class="home pubd" href="">{{.SiteName}}</a> &middot; powered by <a style="margin-left:0" href="https://writefreely.org">writefreely</a></p>
 			</nav>
 		</footer>
 		{{ end }}
 	</body>
 	
 	{{if .CanShowScript}}
 		{{range .ExternalScripts}}<script type="text/javascript" src="{{.}}" async></script>{{end}}
 		{{if .Collection.Script}}<script type="text/javascript">{{.ScriptDisplay}}</script>{{end}}
 	{{end}}
 	<script src="js/localdate.js"></script>
 	{{if .IsOwner}}
 	<script src="js/h.js"></script>
 	<script>window.WF_BASE_PATH = "{{subdir}}";</script>
 	<script src="js/postactions.js"></script>
 	{{end}}
 	<script type="text/javascript">
 {{if .IsOwner}}
 var deleting = false;
 function delPost(e, id, owned) {
 	e.preventDefault();
 	if (deleting) {
 		return;
 	}
 
 	// TODO: UNDO!
 	if (window.confirm('Are you sure you want to delete this post?')) {
 		// AJAX
 		deletePost(id, "", function() {
 			// Remove post from list
 			var $postEl = document.getElementById('post-' + id);
 			$postEl.parentNode.removeChild($postEl);
 			// TODO: add next post from this collection at the bottom
 		});
 	}
 }
 
 var deletePost = function(postID, token, callback) {
 	deleting = true;
 
 	var $delBtn = document.getElementById('post-' + postID).getElementsByClassName('delete action')[0];
 	$delBtn.innerHTML = '...';
 
 	var http = new XMLHttpRequest();
 	var url = "{{subdir}}/api/posts/" + postID;
 	http.open("DELETE", url, true);
 	http.onreadystatechange = function() {
 		if (http.readyState == 4) {
 			deleting = false;
 			if (http.status == 204) {
 				callback();
 			} else if (http.status == 409) {
 				$delBtn.innerHTML = 'delete';
 				alert("Post is synced to another account. Delete the post from that account instead.");
 				// TODO: show "remove" button instead of "delete" now
 				// Persist that state.
 				// Have it remove the post locally only.
 			} else {
 				$delBtn.innerHTML = 'delete';
 				alert("Failed to delete." + (http.status>=500?" Please try again.":""));
 			}
 		}
 	}
 	http.send();
 };
 
 var pinning = false;
 function pinPost(e, postID, slug, title) {
 	e.preventDefault();
 	if (pinning) {
 		return;
 	}
 	pinning = true;
 
 	var callback = function() {
 		// Visibly remove post from collection
 		var $postEl = document.getElementById('post-' + postID);
 		$postEl.parentNode.removeChild($postEl);
 		var $header = document.getElementsByTagName('header')[0];
 		var $pinnedNavs = $header.getElementsByTagName('nav');
 		// Add link to nav
-		var link = '<a class="pinned" href="{{if not .SingleUser}}{{.Alias}}/{{end}}'+slug+'">'+title+'</a>';
+		var link = '<a class="pinned" href="{{if not .SingleUser}}{{subdir}}/{{.Alias}}/{{end}}'+slug+'">'+title+'</a>';
 		if ($pinnedNavs.length == 0) {
 			$header.insertAdjacentHTML("beforeend", '<nav>'+link+'</nav>');
 		} else {
 			$pinnedNavs[0].insertAdjacentHTML("beforeend", link);
 		}
 	};
 
 	var $pinBtn = document.getElementById('post-' + postID).getElementsByClassName('pin action')[0];
 	$pinBtn.innerHTML = '...';
 
 	var http = new XMLHttpRequest();
 	var url = "{{subdir}}/api/collections/{{.Alias}}/pin";
 	var params = [ { "id": postID } ];
 	http.open("POST", url, true);
 	http.setRequestHeader("Content-type", "application/json");
 	http.onreadystatechange = function() {
 		if (http.readyState == 4) {
 			pinning = false;
 			if (http.status == 200) {
 				callback();
 			} else if (http.status == 409) {
 				$pinBtn.innerHTML = 'pin';
 				alert("Post is synced to another account. Delete the post from that account instead.");
 				// TODO: show "remove" button instead of "delete" now
 				// Persist that state.
 				// Have it remove the post locally only.
 			} else {
 				$pinBtn.innerHTML = 'pin';
 				alert("Failed to pin." + (http.status>=500?" Please try again.":""));
 			}
 		}
 	}
 	http.send(JSON.stringify(params));
 };
 {{end}}
 	try { // Fonts
 	  WebFontConfig = {
 		custom: { families: [ 'Lora:400,700:latin', 'Open+Sans:400,700:latin' ], urls: [ 'css/fonts.css' ] }
 	  };
 	  (function() {
 		var wf = document.createElement('script');
 		wf.src = 'js/webfont.js';
 		wf.type = 'text/javascript';
 		wf.async = 'true';
 		var s = document.getElementsByTagName('script')[0];
 		s.parentNode.insertBefore(wf, s);
 	  })();
 	} catch (e) { /* ¯\_(ツ)_/¯ */ }
 	</script>
 </html>{{end}}
diff --git a/templates/collection.tmpl b/templates/collection.tmpl
index 87338fe..4752318 100644
--- a/templates/collection.tmpl
+++ b/templates/collection.tmpl
@@ -1,268 +1,268 @@
 {{define "collection"}}<!DOCTYPE HTML>
 <html {{if .Language}}lang="{{.Language}}"{{end}} dir="{{.Direction}}">
 	<head>
 		{{template "head-base" .}}
 		<meta charset="utf-8">
 
 		<title>{{.DisplayTitle}}{{if not .SingleUser}} &mdash; {{.SiteName}}{{end}}</title>
 
 		<link rel="stylesheet" type="text/css" href="css/write.css" />
 		{{if .CustomCSS}}<link rel="stylesheet" type="text/css" href="local/custom.css" />{{end}}
 		{{if .Favicon}}<link rel="shortcut icon" href="{{.Favicon}}" />{{else}}<link rel="shortcut icon" href="favicon.ico" />{{end}}
 		<link rel="canonical" href="{{.CanonicalURL}}">
 		{{if gt .CurrentPage 1}}<link rel="prev" href="{{.PrevPageURL .Prefix .NavSuffix .CurrentPage .IsTopLevel}}">{{end}}
 		{{if lt .CurrentPage .TotalPages}}<link rel="next" href="{{.NextPageURL .Prefix .NavSuffix .CurrentPage .IsTopLevel}}">{{end}}
 		{{if not .IsPrivate}}<link rel="alternate" type="application/rss+xml" title="{{.DisplayTitle}} &raquo; Feed" href="{{.CanonicalURL}}feed/" />{{end}}
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
 		<meta name="generator" content="WriteFreely">
 		<meta name="description" content="{{.PlainDescription}}">
 		<meta itemprop="name" content="{{.DisplayTitle}}">
 		<meta itemprop="description" content="{{.PlainDescription}}">
 		<meta name="twitter:card" content="summary">
 		<meta name="twitter:title" content="{{.DisplayTitle}}">
 		<meta name="twitter:image" content="{{if .Thumbnail}}{{.Thumbnail}}{{else}}{{.AvatarURL}}{{end}}">
 		<meta name="twitter:description" content="{{.PlainDescription}}">
 		<meta property="og:title" content="{{.DisplayTitle}}" />
 		<meta property="og:site_name" content="{{.DisplayTitle}}" />
 		<meta property="og:type" content="article" />
 		<meta property="og:url" content="{{.CanonicalURL}}" />
 		<meta property="og:description" content="{{.PlainDescription}}" />
 		<meta property="og:image" content="{{if .Thumbnail}}{{.Thumbnail}}{{else}}{{.AvatarURL}}{{end}}">
 		{{template "collection-meta" .}}
 		{{if .StyleSheet}}<style type="text/css">{{.StyleSheetDisplay}}</style>{{end}}
 
 		{{if .RenderMathJax}}
 		  <!-- Add mathjax logic -->
 		  {{template "mathjax" .}}
 		{{end}}
 
 		{{if .RenderMermaid}}
 		  <!-- Add Mermaid diagram rendering -->
 		  {{template "mermaid" .}}
 		{{end}}
 
 		<!-- Add highlighting logic -->
 		{{template "highlighting" . }}
 
 	</head>
 	<body id="collection" itemscope itemtype="http://schema.org/WebPage">
 		{{if or .IsOwner .SingleUser}}
 			<nav id="manage"><ul>
 				<li class="has-submenu"><a onclick="void(0)">&#9776; Menu</a>
 					<ul>
 						{{ if .IsOwner }}
 							{{if .SingleUser}}
 							<li><a href="me/new">New Post</a></li>
 							{{else}}
 							<li><a href="#{{.Alias}}" class="write">{{.SiteName}}</a></li>
 							{{end}}
 							{{if .SimpleNav}}<li><a href="new#{{.Alias}}">New Post</a></li>{{end}}
 							<li><a href="me/c/{{.Alias}}">Customize</a></li>
 							<li><a href="me/c/{{.Alias}}/stats">Stats</a></li>
 							<li><a href="me/c/{{.Alias}}/subscribers">Subscribers</a></li>
 							<li class="separator"><hr /></li>
 							{{if not .SingleUser}}<li><a href="me/c/"><img class="ic-18dp" src="img/ic_blogs_dark@2x.png" /> View Blogs</a></li>{{end}}
 							<li><a href="me/posts/"><img class="ic-18dp" src="img/ic_list_dark@2x.png" /> View Drafts</a></li>
 						{{ else }}
 							<li><a href="login">Log in{{if .IsProtected}} to {{.DisplayTitle}}{{end}}</a></li>
 							{{if .IsProtected}}
 								<li class="separator"><hr /></li>
 								<li><a href="logout">Log out</a></li>
 							{{end}}
 						{{ end }}
 					</ul>
 				</li>
 			</ul></nav>
 		{{else if .IsCollLoggedIn}}
 			<nav id="manage" class="shiny"><ul>
 				<li class="has-submenu"><a onclick="void(0)">&#9776; Menu</a>
 					<ul>
 						<li class="menu-heading" style="padding: .5rem .75rem; box-sizing: border-box;">{{.DisplayTitle}}</li>
 						<li><a href="{{.CanonicalURL}}logout">Log out</a></li>
 					</ul>
 				</li>
 			</ul></nav>
 		{{end}}
 
 		<header>
 		{{if .Silenced}}
 			{{template "user-silenced"}}
 		{{end}}
 		<h1 dir="{{.Direction}}" id="blog-title">{{if .Posts}}{{else}}<span class="writeas-prefix"><a href="">write.as</a></span> {{end}}<a href="{{if .IsTopLevel}}{{else}}{{.Prefix}}{{.Alias}}/{{end}}" class="h-card p-author u-url" rel="me author">{{.DisplayTitle}}</a></h1>
 		{{if .Description}}<p class="description p-note">{{.DisplayDescription}}</p>{{end}}
 		{{/*if not .Public/*}}
 			<!--p class="meta-note"><span>Private collection</span>. Only you can see this page.</p-->
 		{{/*end*/}}
 		{{if .PinnedPosts}}<nav>
-			{{range .PinnedPosts}}<a class="pinned" href="{{if not $.SingleUser}}/{{$.Alias}}/{{.Slug.String}}{{else}}{{.CanonicalURL $.Host}}{{end}}">{{.PlainDisplayTitle}}</a>{{end}}</nav>
+			{{range .PinnedPosts}}<a class="pinned" href="{{if not $.SingleUser}}/{{subdir}}/{{$.Alias}}/{{.Slug.String}}{{else}}{{.CanonicalURL $.Host}}{{end}}">{{.PlainDisplayTitle}}</a>{{end}}</nav>
 		{{end}}
 		</header>
 
 		{{if .Posts}}<section id="wrapper" itemscope itemtype="http://schema.org/Blog">{{else}}<div id="wrapper">{{end}}
 
 			{{if .IsWelcome}}
 			<div id="welcome">
 				<h2>Welcome, <strong>{{.Username}}</strong>!</h2>
 				<p>This is your new blog.</p>
 				<p><a class="simple-cta" href="#{{.Alias}}">Start writing</a>, or <a class="simple-cta" href="me/c/{{.Alias}}">customize</a> your blog.</p>
 				<p>Check out our <a class="simple-cta" href="https://writefreely.org/docs/latest/writer/writing">writing guide</a> to see what else you can do, and <a class="simple-cta" href="contact">get in touch</a> anytime with questions or feedback.</p>
 			</div>
 			{{end}}
 
 			{{if .Flash}}
 				<div class="alert success flash">
 					<p>{{.Flash}}</p>
 				</div>
 			{{end}}
 
 			{{template "posts" .}}
 
 		{{if gt .TotalPages 1}}<nav id="paging" class="content-container clearfix">
 			{{if or (and .Format.Ascending (le .CurrentPage .TotalPages)) (isRTL .Direction)}}
 				{{if gt .CurrentPage 1}}<a href="{{.PrevPageURL .Prefix .NavSuffix .CurrentPage .IsTopLevel}}">&#8672; {{if and .Format.Ascending (le .CurrentPage .TotalPages)}}Previous{{else}}Newer{{end}}</a>{{end}}
 				{{if lt .CurrentPage .TotalPages}}<a style="float:right;" href="{{.NextPageURL .Prefix .NavSuffix .CurrentPage .IsTopLevel}}">{{if and .Format.Ascending (lt .CurrentPage .TotalPages)}}Next{{else}}Older{{end}} &#8674;</a>{{end}}
 			{{else}}
 				{{if lt .CurrentPage .TotalPages}}<a href="{{.NextPageURL .Prefix .NavSuffix .CurrentPage .IsTopLevel}}">&#8672; Older</a>{{end}}
 				{{if gt .CurrentPage 1}}<a style="float:right;" href="{{.PrevPageURL .Prefix .NavSuffix .CurrentPage .IsTopLevel}}">Newer &#8674;</a>{{end}}
 			{{end}}
 		</nav>{{end}}
 
 		{{if not .IsWelcome}}{{template "emailsubscribe" .}}{{end}}
 
 		{{if .Posts}}</section>{{else}}</div>{{end}}
 
 		{{if .ShowFooterBranding }}
 		<footer>
 			<hr />
 			<nav dir="ltr">
 				{{if not .SingleUser}}<a class="home pubd" href="">{{.SiteName}}</a> &middot; {{end}}powered by <a style="margin-left:0" href="https://writefreely.org">writefreely</a>
 			</nav>
 		</footer>
 		{{ end }}
 	</body>
 
 	{{if .CanShowScript}}
 		{{range .ExternalScripts}}<script type="text/javascript" src="{{.}}" async></script>{{end}}
 		{{if .Script}}<script type="text/javascript">{{.ScriptDisplay}}</script>{{end}}
 	{{end}}
 	<script src="js/h.js"></script>
 	<script>window.WF_BASE_PATH = "{{subdir}}";</script>
 	<script src="js/postactions.js"></script>
 	<script src="js/localdate.js"></script>
 	<script type="text/javascript" src="js/menu.js"></script>
 	<script type="text/javascript">
 var deleting = false;
 function delPost(e, id, owned) {
 	e.preventDefault();
 	if (deleting) {
 		return;
 	}
 
 	// TODO: UNDO!
 	if (window.confirm('Are you sure you want to delete this post?')) {
 		// AJAX
 		deletePost(id, "", function() {
 			// Remove post from list
 			var $postEl = document.getElementById('post-' + id);
 			$postEl.parentNode.removeChild($postEl);
 			// TODO: add next post from this collection at the bottom
 		});
 	}
 }
 
 var deletePost = function(postID, token, callback) {
 	deleting = true;
 
 	var $delBtn = document.getElementById('post-' + postID).getElementsByClassName('delete action')[0];
 	$delBtn.innerHTML = '...';
 
 	var http = new XMLHttpRequest();
 	var url = "{{subdir}}/api/posts/" + postID;
 	http.open("DELETE", url, true);
 	http.onreadystatechange = function() {
 		if (http.readyState == 4) {
 			deleting = false;
 			if (http.status == 204) {
 				callback();
 			} else if (http.status == 409) {
 				$delBtn.innerHTML = 'delete';
 				alert("Post is synced to another account. Delete the post from that account instead.");
 				// TODO: show "remove" button instead of "delete" now
 				// Persist that state.
 				// Have it remove the post locally only.
 			} else {
 				$delBtn.innerHTML = 'delete';
 				alert("Failed to delete." + (http.status>=500?" Please try again.":""));
 			}
 		}
 	}
 	http.send();
 };
 
 var pinning = false;
 function pinPost(e, postID, slug, title) {
 	e.preventDefault();
 	if (pinning) {
 		return;
 	}
 	pinning = true;
 
 	var callback = function() {
 		// Visibly remove post from collection
 		var $postEl = document.getElementById('post-' + postID);
 		$postEl.parentNode.removeChild($postEl);
 		var $header = document.getElementsByTagName('header')[0];
 		var $pinnedNavs = $header.getElementsByTagName('nav');
 		// Add link to nav
-		var link = '<a class="pinned" href="{{if not .SingleUser}}/{{.Alias}}/{{end}}'+slug+'">'+title+'</a>';
+		var link = '<a class="pinned" href="{{if not .SingleUser}}{{subdir}}/{{.Alias}}/{{end}}'+slug+'">'+title+'</a>';
 		if ($pinnedNavs.length == 0) {
 			$header.insertAdjacentHTML("beforeend", '<nav>'+link+'</nav>');
 		} else {
 			$pinnedNavs[0].insertAdjacentHTML("beforeend", link);
 		}
 	};
 
 	var $pinBtn = document.getElementById('post-' + postID).getElementsByClassName('pin action')[0];
 	$pinBtn.innerHTML = '...';
 
 	var http = new XMLHttpRequest();
 	var url = "{{subdir}}/api/collections/{{.Alias}}/pin";
 	var params = [ { "id": postID } ];
 	http.open("POST", url, true);
 	http.setRequestHeader("Content-type", "application/json");
 	http.onreadystatechange = function() {
 		if (http.readyState == 4) {
 			pinning = false;
 			if (http.status == 200) {
 				callback();
 			} else if (http.status == 409) {
 				$pinBtn.innerHTML = 'pin';
 				alert("Post is synced to another account. Delete the post from that account instead.");
 				// TODO: show "remove" button instead of "delete" now
 				// Persist that state.
 				// Have it remove the post locally only.
 			} else {
 				$pinBtn.innerHTML = 'pin';
 				alert("Failed to pin." + (http.status>=500?" Please try again.":""));
 			}
 		}
 	}
 	http.send(JSON.stringify(params));
 };
 
 	try {
 	  WebFontConfig = {
 		custom: { families: [ 'Lora:400,700:latin', 'Open+Sans:400,700:latin' ], urls: [ 'css/fonts.css' ] }
 	  };
 	  (function() {
 		var wf = document.createElement('script');
 		wf.src = 'js/webfont.js';
 		wf.type = 'text/javascript';
 		wf.async = 'true';
 		var s = document.getElementsByTagName('script')[0];
 		s.parentNode.insertBefore(wf, s);
 	  })();
 	} catch (e) {}
 	</script>
 </html>{{end}}