From 52130358c8b63a721f34ab079e3b11e45cb499d9 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Sat, 28 Jan 2006 20:26:04 +0000
Subject: [PATCH] converting to new template format

---
 .../wgtemplate_center_image.tmpl              |  51 +++-
 .../wgtemplate_classifieds.tmpl               |  70 +++++-
 .../wgtemplate_default_article.tmpl           |  57 ++++-
 .../wgtemplate_default_forum.tmpl             | 105 +++++++-
 .../wgtemplate_default_thread.tmpl            | 224 +++++++++++++++++-
 .../wgtemplate_default_uss.tmpl               |  89 ++++++-
 .../templates-6.9.0/wgtemplate_faq.tmpl       |  67 +++++-
 .../wgtemplate_guest_book.tmpl                |  45 +++-
 .../templates-6.9.0/wgtemplate_item.tmpl      |  25 +-
 .../wgtemplate_item_with_pop_up_links.tmpl    |  25 +-
 .../wgtemplate_job_listing.tmpl               |  88 ++++++-
 .../wgtemplate_left_align_image.tmpl          |  57 ++++-
 .../templates-6.9.0/wgtemplate_link_list.tmpl |  64 ++++-
 .../wgtemplate_linked_image_with_caption.tmpl |  61 ++++-
 .../templates-6.9.0/wgtemplate_news.tmpl      |  32 +--
 .../wgtemplate_ordered_list.tmpl              |  64 ++++-
 .../wgtemplate_photo_gallery.tmpl             |  65 ++++-
 .../wgtemplate_right_column.tmpl              |  31 +--
 .../wgtemplate_side_by_side.tmpl              |  34 +--
 .../wgtemplate_three_over_1.tmpl              |  40 ++--
 docs/upgrades/upgrade_6.8.5-6.9.0.pl          |  55 +++++
 21 files changed, 1262 insertions(+), 87 deletions(-)

diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_center_image.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_center_image.tmpl
index d97ac637f..7647b9c6d 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_center_image.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_center_image.tmpl
@@ -1,2 +1,51 @@
 #PBtmpl0000000000000084
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>

<tmpl_if session.var.adminOn>
	<p><tmpl_var controls></p>
</tmpl_if>

<tmpl_if displayTitle>
	<h2><tmpl_var title></h2>
</tmpl_if>

<tmpl_if pagination.isFirstPage>
<tmpl_if image.url>
	<div align="center"><img src="<tmpl_var image.url>" alt="<tmpl_var image.url>" border="0" /></div>
</tmpl_if>
</tmpl_if>

<tmpl_if description>
	<tmpl_var description>
	<p />
</tmpl_if>

<tmpl_if pagination.isLastPage>
<tmpl_if linkurl>
	<tmpl_if linktitle>
		<p />
		<a href="<tmpl_var linkUrl>"><tmpl_var linkTitle></a>
	</tmpl_if>
</tmpl_if>
<tmpl_var attachment.box>
<p />
</tmpl_if>

<tmpl_if pagination.pageCount.isMultiple>
<tmpl_var pagination.previousPage>
&#183;
<tmpl_var pagination.pageList.upTo20>
&#183;
<tmpl_var pagination.nextPage>
</tmpl_if>

<tmpl_if pagination.isLastPage>
<tmpl_if allowDiscussion>
	<table width="100%" cellspacing="2" cellpadding="1" border="0">
	<tr>
	<td align="center" width="50%" class="tableMenu"><a href="<tmpl_var replies.URL>"><tmpl_var replies.label> (<tmpl_var replies.count>)</a></td>
	<td align="center" width="50%" class="tableMenu"><a href="<tmpl_var post.url>"><tmpl_var post.label></a></td>
	</tr>
	</table>
</tmpl_if>
</tmpl_if>
\ No newline at end of file
+<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
+
+<tmpl_if session.var.adminOn>
+	<p><tmpl_var controls></p>
+</tmpl_if>
+
+<tmpl_if displayTitle>
+	<h2><tmpl_var title></h2>
+</tmpl_if>
+
+<tmpl_if pagination.isFirstPage>
+<tmpl_if image.url>
+	<div align="center"><img src="<tmpl_var image.url>" alt="<tmpl_var image.url>" border="0" /></div>
+</tmpl_if>
+</tmpl_if>
+
+<tmpl_if description>
+	<tmpl_var description>
+	<p />
+</tmpl_if>
+
+<tmpl_if pagination.isLastPage>
+<tmpl_if linkurl>
+	<tmpl_if linktitle>
+		<p />
+		<a href="<tmpl_var linkUrl>"><tmpl_var linkTitle></a>
+	</tmpl_if>
+</tmpl_if>
+<tmpl_var attachment.box>
+<p />
+</tmpl_if>
+
+<tmpl_if pagination.pageCount.isMultiple>
+<tmpl_var pagination.previousPage>
+&#183;
+<tmpl_var pagination.pageList.upTo20>
+&#183;
+<tmpl_var pagination.nextPage>
+</tmpl_if>
+
+<tmpl_if pagination.isLastPage>
+<tmpl_if allowDiscussion>
+	<table width="100%" cellspacing="2" cellpadding="1" border="0">
+	<tr>
+	<td align="center" width="50%" class="tableMenu"><a href="<tmpl_var replies.URL>"><tmpl_var replies.label> (<tmpl_var replies.count>)</a></td>
+	<td align="center" width="50%" class="tableMenu"><a href="<tmpl_var post.url>"><tmpl_var post.label></a></td>
+	</tr>
+	</table>
+</tmpl_if>
+</tmpl_if>
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_classifieds.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_classifieds.tmpl
index dd8cb02a2..2f44829ad 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_classifieds.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_classifieds.tmpl
@@ -1,4 +1,70 @@
 #PBtmpl0000000000000128
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>

<tmpl_if session.var.adminOn>
	<p><tmpl_var controls></p>
</tmpl_if>

<tmpl_if displayTitle>
	<h2><tmpl_var title></h2>
</tmpl_if>

<tmpl_if description>
	<tmpl_var description>
</tmpl_if>

<p>
	<tmpl_if user.canPost>
		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
		&bull;
	</tmpl_if>
	<tmpl_unless user.isVisitor>
		<tmpl_if user.isSubscribed>
			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
		<tmpl_else>
			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
		</tmpl_if>
		&bull;
	</tmpl_unless>
	<a href="<tmpl_var search.url>"><tmpl_var search.label></a>
</p>
+<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
+
+<tmpl_if session.var.adminOn>
+	<p><tmpl_var controls></p>
+</tmpl_if>
+
+<tmpl_if displayTitle>
+	<h2><tmpl_var title></h2>
+</tmpl_if>
+
+<tmpl_if description>
+	<tmpl_var description>
+</tmpl_if>
+
+<p>
+	<tmpl_if user.canPost>
+		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
+		&bull;
+	</tmpl_if>
+	<tmpl_unless user.isVisitor>
+		<tmpl_if user.isSubscribed>
+			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
+		<tmpl_else>
+			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
+		</tmpl_if>
+		&bull;
+	</tmpl_unless>
+	<a href="<tmpl_var search.url>"><tmpl_var search.label></a>
+</p>
+
+
+<br />
+
+<tmpl_loop post_loop>
+	<div class="ad">
+		<div style="text-align: center;">
+			<b><a href="<tmpl_var url>"><tmpl_var title></a></b><br />
+			<tmpl_if user.isPoster>(<tmpl_var status>)</tmpl_if>
+			<tmpl_if thumbnail>
+				<div style="margin: 3px;">
+					<a href="<tmpl_var url>"><img src="<tmpl_var thumbnail>" alt="<tmpl_var thumbnail>" border="0" /></a>
+				</div>
+			</tmpl_if>
+		</div>
+		<tmpl_var synopsis>
+	</div>
+</tmpl_loop>
+
+<div style="clear: both;"></div>
+
+<tmpl_if pagination.pageCount.isMultiple>
+	<div class="pagination">
+		<tmpl_var pagination.previousPage> &middot; <tmpl_var pagination.pageList.upTo10> &middot; <tmpl_var pagination.nextPage>
+	</div>
+</tmpl_if>
+~~~
+<style type="text/css">
+.ad {
+	border: 1px dotted #aaaaaa;
+	padding: 10px;
+	margin: 0px;
+	float: left;
+	width: 140px;
+	font-size: 12px;
+	height: 175px;
+	overflow: hidden;
+}
+</style>
 
-^RawHeadTags(<style type="text/css">
.ad {
	border: 1px dotted #aaaaaa;
	padding: 10px;
	margin: 0px;
	float: left;
	width: 140px;
	font-size: 12px;
	height: 175px;
	overflow: hidden;
}
</style>);

<br />

<tmpl_loop post_loop>
	<div class="ad">
		<div style="text-align: center;">
			<b><a href="<tmpl_var url>"><tmpl_var title></a></b><br />
			<tmpl_if user.isPoster>(<tmpl_var status>)</tmpl_if>
			<tmpl_if thumbnail>
				<div style="margin: 3px;">
					<a href="<tmpl_var url>"><img src="<tmpl_var thumbnail>" alt="<tmpl_var thumbnail>" border="0" /></a>
				</div>
			</tmpl_if>
		</div>
		<tmpl_var synopsis>
	</div>
</tmpl_loop>

<div style="clear: both;"></div>

<tmpl_if pagination.pageCount.isMultiple>
	<div class="pagination">
		<tmpl_var pagination.previousPage> &middot; <tmpl_var pagination.pageList.upTo10> &middot; <tmpl_var pagination.nextPage>
	</div>
</tmpl_if>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_default_article.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_default_article.tmpl
index 4bf99312c..d722032e7 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_default_article.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_default_article.tmpl
@@ -1,2 +1,57 @@
 #PBtmpl0000000000000002
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>

<tmpl_if session.var.adminOn>
	<p><tmpl_var controls></p>
</tmpl_if>

<tmpl_if displayTitle>
	<h2><tmpl_var title></h2>
</tmpl_if>

<tmpl_if pagination.isFirstPage>
<tmpl_if image.url>
	<table width="100%" border="0" cellpadding="0" cellspacing="0"><tr><td class="content">
	<img src="<tmpl_var image.url>" align="right" border="0" alt="<tmpl_var image.url>" />
</tmpl_if>
</tmpl_if>

<tmpl_if description>
	<tmpl_var description>
</tmpl_if>

<tmpl_if pagination.isLastPage>
	<tmpl_if linkUrl>
	<tmpl_if linkTitle>
		<p />
		<a href="<tmpl_var linkUrl>"><tmpl_var linkTitle></a>
	</tmpl_if>
	</tmpl_if>
	<tmpl_var attachment.box>
</tmpl_if>

<tmpl_if pagination.pageCount.isMultiple>
<tmpl_var pagination.previousPage>
&#183;
<tmpl_var pagination.pageList.upTo20>
&#183;
<tmpl_var pagination.nextPage>
</tmpl_if>

<tmpl_if pagination.isFirstPage>
<tmpl_if image.url>
	</td></tr></table>
</tmpl_if>
</tmpl_if>

<tmpl_if pagination.isLastPage>
<tmpl_if allowDiscussion>
	<p>
	<table width="100%" cellspacing="2" cellpadding="1" border="0">
	<tr>
	<td align="center" width="50%" class="tableMenu"><a href="<tmpl_var replies.URL>"><tmpl_var replies.label> (<tmpl_var replies.count>)</a></td>
	<td align="center" width="50%" class="tableMenu"><a href="<tmpl_var post.url>"><tmpl_var post.label></a></td>
	</tr>
	</table>
</tmpl_if>
</tmpl_if>
\ No newline at end of file
+<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
+
+<tmpl_if session.var.adminOn>
+	<p><tmpl_var controls></p>
+</tmpl_if>
+
+<tmpl_if displayTitle>
+	<h2><tmpl_var title></h2>
+</tmpl_if>
+
+<tmpl_if pagination.isFirstPage>
+<tmpl_if image.url>
+	<table width="100%" border="0" cellpadding="0" cellspacing="0"><tr><td class="content">
+	<img src="<tmpl_var image.url>" align="right" border="0" alt="<tmpl_var image.url>" />
+</tmpl_if>
+</tmpl_if>
+
+<tmpl_if description>
+	<tmpl_var description>
+</tmpl_if>
+
+<tmpl_if pagination.isLastPage>
+	<tmpl_if linkUrl>
+	<tmpl_if linkTitle>
+		<p />
+		<a href="<tmpl_var linkUrl>"><tmpl_var linkTitle></a>
+	</tmpl_if>
+	</tmpl_if>
+	<tmpl_var attachment.box>
+</tmpl_if>
+
+<tmpl_if pagination.pageCount.isMultiple>
+<tmpl_var pagination.previousPage>
+&#183;
+<tmpl_var pagination.pageList.upTo20>
+&#183;
+<tmpl_var pagination.nextPage>
+</tmpl_if>
+
+<tmpl_if pagination.isFirstPage>
+<tmpl_if image.url>
+	</td></tr></table>
+</tmpl_if>
+</tmpl_if>
+
+<tmpl_if pagination.isLastPage>
+<tmpl_if allowDiscussion>
+	<p>
+	<table width="100%" cellspacing="2" cellpadding="1" border="0">
+	<tr>
+	<td align="center" width="50%" class="tableMenu"><a href="<tmpl_var replies.URL>"><tmpl_var replies.label> (<tmpl_var replies.count>)</a></td>
+	<td align="center" width="50%" class="tableMenu"><a href="<tmpl_var post.url>"><tmpl_var post.label></a></td>
+	</tr>
+	</table>
+</tmpl_if>
+</tmpl_if>
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_default_forum.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_default_forum.tmpl
index c3e8d0b01..6268d68e4 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_default_forum.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_default_forum.tmpl
@@ -1,2 +1,105 @@
 #PBtmpl0000000000000026
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>

<tmpl_if session.var.adminOn>
	<p><tmpl_var controls></p>
</tmpl_if>

^RawHeadTags(<style type="text/css">
.forumHead {
	background-color: #eeeeee;
	border-bottom: 1px solid #cccccc;
	padding: 2px;
	padding-bottom: 4px;
	font-size: 13px;
	font-weight: bold;
}
.oddThread {
	font-size: 13px;
	border-bottom: 1px dashed #83cc83;
	padding-bottom: 4px;
}
.evenThread {
	font-size: 13px;
	border-bottom: 1px dashed #aaaaff;
	padding-bottom: 4px;
}
</style>);

<tmpl_if displayTitle>
	<h2><tmpl_var title></h2>
</tmpl_if>

<tmpl_if description>
	<tmpl_var description>
</tmpl_if>

<p>
	<tmpl_if user.canPost>
		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
		&#149;
	</tmpl_if>
	<tmpl_unless user.isVisitor>
		<tmpl_if user.isSubscribed>
			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
		<tmpl_else>
			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
		</tmpl_if>
		&#149;
	</tmpl_unless>
	<a href="<tmpl_var search.url>"><tmpl_var search.label></a>
</p>

<table width="100%">
<tr>
	<tmpl_if user.isModerator>
		<td class="forumHead"><tmpl_var status.label></td>
	</tmpl_if>
	<td class="forumHead"><tmpl_var subject.label></td>
	<td class="forumHead"><tmpl_var user.label></td>
	<td class="forumHead"><a href="<tmpl_var sortby.views.url>"><tmpl_var views.label></a></td>
	<td class="forumHead"><a href="<tmpl_var sortby.replies.url>"><tmpl_var replies.label></a></td>
	<td class="forumHead"><a href="<tmpl_var sortby.rating.url>"><tmpl_var rating.label></a></td>
	<td class="forumHead"><a href="<tmpl_var sortby.date.url>"><tmpl_var date.label></a></td>
	<tmpl_if displayLastReply>
		<td class="forumHead"><a href="<tmpl_var sortby.lastreply.url>"><tmpl_var lastReply.label></a></td>
	</tmpl_if>
</tr>
<tmpl_loop post_loop>
<tr>
	<tmpl_if user.isModerator>
		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var status></td>
	</tmpl_if>
	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><a href="<tmpl_var url>"><tmpl_var title></a></td>
	<tmpl_if user.isVisitor>
		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var username></td>
	<tmpl_else>
		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><a href="<tmpl_var userProfile.url>"><tmpl_var username></a></td>
	</tmpl_if>
	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>" align="center"><tmpl_var views></td>
	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>" align="center"><tmpl_var replies></td>
	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>" align="center"><tmpl_var rating></td>
	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var dateSubmitted.human> @ <tmpl_var timeSubmitted.human></td>
	<tmpl_if displayLastReply>
		<td  class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>" style="font-size: 11px;">
			<a href="<tmpl_var lastReply.url>"><tmpl_var lastReply.title></a>
			by
			<tmpl_if lastReply.user.isVisitor>
				<tmpl_var lastReply.username>
			<tmpl_else>
				<a href="<tmpl_var lastReply.userProfile.url>"><tmpl_var lastReply.username></a>
			</tmpl_if>
			on <tmpl_var lastReply.dateSubmitted.human> @ <tmpl_var lastReply.timeSubmitted.human>
		</td>
	</tmpl_if>
</tr>
</tmpl_loop>
</table>

<tmpl_if pagination.pageCount.isMultiple>
	<div class="pagination">
		<tmpl_var pagination.previousPage>  &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
	</div>
</tmpl_if>
\ No newline at end of file
+<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
+
+<tmpl_if session.var.adminOn>
+	<p><tmpl_var controls></p>
+</tmpl_if>
+
+<tmpl_if displayTitle>
+	<h2><tmpl_var title></h2>
+</tmpl_if>
+
+<tmpl_if description>
+	<tmpl_var description>
+</tmpl_if>
+
+<p>
+	<tmpl_if user.canPost>
+		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
+		&#149;
+	</tmpl_if>
+	<tmpl_unless user.isVisitor>
+		<tmpl_if user.isSubscribed>
+			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
+		<tmpl_else>
+			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
+		</tmpl_if>
+		&#149;
+	</tmpl_unless>
+	<a href="<tmpl_var search.url>"><tmpl_var search.label></a>
+</p>
+
+<table width="100%">
+<tr>
+	<tmpl_if user.isModerator>
+		<td class="forumHead"><tmpl_var status.label></td>
+	</tmpl_if>
+	<td class="forumHead"><tmpl_var subject.label></td>
+	<td class="forumHead"><tmpl_var user.label></td>
+	<td class="forumHead"><a href="<tmpl_var sortby.views.url>"><tmpl_var views.label></a></td>
+	<td class="forumHead"><a href="<tmpl_var sortby.replies.url>"><tmpl_var replies.label></a></td>
+	<td class="forumHead"><a href="<tmpl_var sortby.rating.url>"><tmpl_var rating.label></a></td>
+	<td class="forumHead"><a href="<tmpl_var sortby.date.url>"><tmpl_var date.label></a></td>
+	<tmpl_if displayLastReply>
+		<td class="forumHead"><a href="<tmpl_var sortby.lastreply.url>"><tmpl_var lastReply.label></a></td>
+	</tmpl_if>
+</tr>
+<tmpl_loop post_loop>
+<tr>
+	<tmpl_if user.isModerator>
+		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var status></td>
+	</tmpl_if>
+	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><a href="<tmpl_var url>"><tmpl_var title></a></td>
+	<tmpl_if user.isVisitor>
+		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var username></td>
+	<tmpl_else>
+		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><a href="<tmpl_var userProfile.url>"><tmpl_var username></a></td>
+	</tmpl_if>
+	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>" align="center"><tmpl_var views></td>
+	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>" align="center"><tmpl_var replies></td>
+	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>" align="center"><tmpl_var rating></td>
+	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var dateSubmitted.human> @ <tmpl_var timeSubmitted.human></td>
+	<tmpl_if displayLastReply>
+		<td  class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>" style="font-size: 11px;">
+			<a href="<tmpl_var lastReply.url>"><tmpl_var lastReply.title></a>
+			by
+			<tmpl_if lastReply.user.isVisitor>
+				<tmpl_var lastReply.username>
+			<tmpl_else>
+				<a href="<tmpl_var lastReply.userProfile.url>"><tmpl_var lastReply.username></a>
+			</tmpl_if>
+			on <tmpl_var lastReply.dateSubmitted.human> @ <tmpl_var lastReply.timeSubmitted.human>
+		</td>
+	</tmpl_if>
+</tr>
+</tmpl_loop>
+</table>
+
+<tmpl_if pagination.pageCount.isMultiple>
+	<div class="pagination">
+		<tmpl_var pagination.previousPage>  &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
+	</div>
+</tmpl_if>
+~~~
+<style type="text/css">
+.forumHead {
+	background-color: #eeeeee;
+	border-bottom: 1px solid #cccccc;
+	padding: 2px;
+	padding-bottom: 4px;
+	font-size: 13px;
+	font-weight: bold;
+}
+.oddThread {
+	font-size: 13px;
+	border-bottom: 1px dashed #83cc83;
+	padding-bottom: 4px;
+}
+.evenThread {
+	font-size: 13px;
+	border-bottom: 1px dashed #aaaaff;
+	padding-bottom: 4px;
+}
+</style>
+
+
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_default_thread.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_default_thread.tmpl
index d61edef15..e7e4c44e5 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_default_thread.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_default_thread.tmpl
@@ -1,2 +1,224 @@
 #PBtmpl0000000000000032
-<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>

<tmpl_if session.var.adminOn> 
	<p><tmpl_var controls></p>
</tmpl_if>

^RawHeadTags(<style type="text/css">
	.postBorder {
		border: 1px solid #cccccc;
		margin-bottom: 10px;
	}
 	.postBorderCurrent {
		border: 3px dotted black;
		margin-bottom: 10px;
	}
	.postSubject {
		border-bottom: 1px solid #cccccc;
		font-weight: bold;
		padding: 3px;
	}
	.postData {
		border-bottom: 1px solid #cccccc;
		font-size: 11px;
		background-color: #eeeeee;
		color: black;
		padding: 3px;
	}
	.postControls {
		border-top: 1px solid #cccccc;
		background-color: #eeeeee;
		color: black;
		padding: 3px;
	}
	.postMessage {
		padding: 3px;
	}
	.currentThread {
		background-color: #eeeeee;
	}
	.threadHead {
		font-weight: bold;
		border-bottom: 1px solid #cccccc;
		font-size: 11px;
		background-color: #eeeeee;
		color: black;
		padding: 3px;
	}
	.threadData {
		font-size: 11px;
		padding: 3px;
	}
</style>);
	
<div style="float: left; width: 70%">
	<h2><a href="<tmpl_var collaboration.url>"><tmpl_var collaboration.title></a></h2>
</div>
<div style="width: 30%; float: left; text-align: right;">
	<tmpl_if layout.isFlat>
		<a href="<tmpl_var layout.nested.url>"><tmpl_var layout.nested.label></a>
	<tmpl_else>
		<a href="<tmpl_var layout.flat.url>"><tmpl_var layout.flat.label></a>
	</tmpl_if>
</div>
<div style="clear: both;"></div>

<tmpl_if layout.isFlat>
<!-- begin flat layout -->
	<tmpl_loop post_loop>
		<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
			<a name="<tmpl_var assetId>"></a>
			<div class="postSubject">
				<tmpl_var title>
			</div>
			<div class="postData">
				<div style="float: left; width: 50%">
					<b><tmpl_var user.label>:</b> 
						<tmpl_if user.isVisitor>
							<tmpl_var username>
						<tmpl_else>
							<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
						</tmpl_if>
						<br />
					<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
				</div>	
				<div>
					<b><tmpl_var views.label>:</b> <tmpl_var views><br />
					<b><tmpl_var rating.label>:</b> <tmpl_var rating>
						<tmpl_unless hasRated>
							 &nbsp; &nbsp;<tmpl_var rate.label> [ <a href="<tmpl_var rate.url.1>">1</a>, <a href="<tmpl_var rate.url.2>">2</a>, <a href="<tmpl_var rate.url.3>">3</a>, <a href="<tmpl_var rate.url.4>">4</a>, <a href="<tmpl_var rate.url.5>">5</a> ]
						</tmpl_unless>
						<br />
					<tmpl_if user.isModerator>
						<b><tmpl_var status.label>:</b> <tmpl_var status> &nbsp; &nbsp; [ <a href="<tmpl_var approve.url>"><tmpl_var approve.label></a> | <a href="<tmpl_var deny.url>"><tmpl_var deny.label></a> ]<br />
					<tmpl_else>	
						<tmpl_if user.isPoster>
							<b><tmpl_var status.label>:</b> <tmpl_var status><br />
						</tmpl_if>	
					</tmpl_if>	
				</div>	
			</div>
			<div class="postMessage">
				<tmpl_var content>
<tmpl_loop attachment_loop>
	<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
</tmpl_loop>
<div style="clear: both;"></div>

			</div>
			<tmpl_unless isLocked>
				<div class="postControls">
					<tmpl_if user.canReply>
						<a href="<tmpl_var reply.url>">[<tmpl_var reply.label>]</a>
					</tmpl_if>
					<tmpl_if user.canEdit>
						<a href="<tmpl_var edit.url>">[<tmpl_var edit.label>]</a>
						<a href="<tmpl_var delete.url>">[<tmpl_var delete.label>]</a>
					</tmpl_if>
				</div>
			</tmpl_unless>
		</div>
	</tmpl_loop>
<!-- end flat layout -->
</tmpl_if>

<tmpl_if layout.isNested>
<!-- begin nested layout -->
	<tmpl_loop post_loop>
		<div style="margin-left: <tmpl_var depthX10>px;">
			<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
				<a name="<tmpl_var assetId>"></a>
				<div class="postSubject">
					<tmpl_var title>
				</div>
				<div class="postData">
					<div style="float: left; width: 50%">
						<b><tmpl_var user.label>:</b> 
							<tmpl_if user.isVisitor>
								<tmpl_var username>
							<tmpl_else>
								<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
							</tmpl_if>
							<br />
						<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
					</div>	
					<div>
						<b><tmpl_var views.label>:</b> <tmpl_var views><br />
						<b><tmpl_var rating.label>:</b> <tmpl_var rating>
							<tmpl_unless hasRated>
								 &nbsp; &nbsp;<tmpl_var rate.label> [ <a href="<tmpl_var rate.url.1>">1</a>, <a href="<tmpl_var rate.url.2>">2</a>, <a href="<tmpl_var rate.url.3>">3</a>, <a href="<tmpl_var rate.url.4>">4</a>, <a href="<tmpl_var rate.url.5>">5</a> ]
							</tmpl_unless>
							<br />
						<tmpl_if user.isModerator>
							<b><tmpl_var status.label>:</b> <tmpl_var status> &nbsp; &nbsp; [ <a href="<tmpl_var approve.url>"><tmpl_var approve.label></a> | <a href="<tmpl_var deny.url>"><tmpl_var deny.label></a> ]<br />
						<tmpl_else>	
							<tmpl_if user.isPoster>
								<b><tmpl_var status.label>:</b> <tmpl_var status><br />
							</tmpl_if>	
						</tmpl_if>	
					</div>	
				</div>
				<div class="postMessage">
					<tmpl_var content>
<tmpl_loop attachment_loop>
	<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
</tmpl_loop>
<div style="clear: both;"></div>

				</div>
				<tmpl_unless isLocked>
					<div class="postControls">
						<tmpl_if user.canReply>
							<a href="<tmpl_var reply.url>">[<tmpl_var reply.label>]</a>
						</tmpl_if>
						<tmpl_if user.canEdit>
							<a href="<tmpl_var edit.url>">[<tmpl_var edit.label>]</a>
							<a href="<tmpl_var delete.url>">[<tmpl_var delete.label>]</a>
						</tmpl_if>
					</div>
				</tmpl_unless>
			</div>
		</div>
	</tmpl_loop>
<!-- end nested layout -->
</tmpl_if>

<tmpl_if pagination.pageCount.isMultiple>
	<div class="pagination" style="margin-top: 20px;">
		[ <tmpl_var pagination.previousPage> | <tmpl_var pagination.pageList.upTo10> | <tmpl_var pagination.nextPage> ]
	</div>
</tmpl_if>

<div style="margin-top: 20px;">
	<tmpl_if previous.url>
		<a href="<tmpl_var previous.url>">[<tmpl_var previous.label>]</a> 
	</tmpl_if>	
	<tmpl_if next.url>
		<a href="<tmpl_var next.url>">[<tmpl_var next.label>]</a> 
	</tmpl_if>	
	<tmpl_if user.canPost>
		<a href="<tmpl_var add.url>">[<tmpl_var add.label>]</a>
	</tmpl_if>
	<tmpl_if user.isModerator>
		<tmpl_if isSticky>
			<a href="<tmpl_var unstick.url>">[<tmpl_var unstick.label>]</a>
		<tmpl_else>
			<a href="<tmpl_var stick.url>">[<tmpl_var stick.label>]</a>
		</tmpl_if>
		<tmpl_if isLocked>
			<a href="<tmpl_var unlock.url>">[<tmpl_var unlock.label>]</a>
		<tmpl_else>
			<a href="<tmpl_var lock.url>">[<tmpl_var lock.label>]</a>
		</tmpl_if>
	</tmpl_if>
	<tmpl_unless user.isVisitor>
		<tmpl_if user.isSubscribed>
			<a href="<tmpl_var unsubscribe.url>">[<tmpl_var unsubscribe.label>]</a>
		<tmpl_else>
			<a href="<tmpl_var subscribe.url>">[<tmpl_var subscribe.label>]</a>
		</tmpl_if>
	</tmpl_unless>
</div>
\ No newline at end of file
+<div><a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a></div>
+
+<tmpl_if session.var.adminOn> 
+	<p><tmpl_var controls></p>
+</tmpl_if>
+
+	
+<div style="float: left; width: 70%">
+	<h2><a href="<tmpl_var collaboration.url>"><tmpl_var collaboration.title></a></h2>
+</div>
+<div style="width: 30%; float: left; text-align: right;">
+	<tmpl_if layout.isFlat>
+		<a href="<tmpl_var layout.nested.url>"><tmpl_var layout.nested.label></a>
+	<tmpl_else>
+		<a href="<tmpl_var layout.flat.url>"><tmpl_var layout.flat.label></a>
+	</tmpl_if>
+</div>
+<div style="clear: both;"></div>
+
+<tmpl_if layout.isFlat>
+<!-- begin flat layout -->
+	<tmpl_loop post_loop>
+		<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
+			<a name="<tmpl_var assetId>"></a>
+			<div class="postSubject">
+				<tmpl_var title>
+			</div>
+			<div class="postData">
+				<div style="float: left; width: 50%">
+					<b><tmpl_var user.label>:</b> 
+						<tmpl_if user.isVisitor>
+							<tmpl_var username>
+						<tmpl_else>
+							<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
+						</tmpl_if>
+						<br />
+					<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
+				</div>	
+				<div>
+					<b><tmpl_var views.label>:</b> <tmpl_var views><br />
+					<b><tmpl_var rating.label>:</b> <tmpl_var rating>
+						<tmpl_unless hasRated>
+							 &nbsp; &nbsp;<tmpl_var rate.label> [ <a href="<tmpl_var rate.url.1>">1</a>, <a href="<tmpl_var rate.url.2>">2</a>, <a href="<tmpl_var rate.url.3>">3</a>, <a href="<tmpl_var rate.url.4>">4</a>, <a href="<tmpl_var rate.url.5>">5</a> ]
+						</tmpl_unless>
+						<br />
+					<tmpl_if user.isModerator>
+						<b><tmpl_var status.label>:</b> <tmpl_var status> &nbsp; &nbsp; [ <a href="<tmpl_var approve.url>"><tmpl_var approve.label></a> | <a href="<tmpl_var deny.url>"><tmpl_var deny.label></a> ]<br />
+					<tmpl_else>	
+						<tmpl_if user.isPoster>
+							<b><tmpl_var status.label>:</b> <tmpl_var status><br />
+						</tmpl_if>	
+					</tmpl_if>	
+				</div>	
+			</div>
+			<div class="postMessage">
+				<tmpl_var content>
+<tmpl_loop attachment_loop>
+	<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
+</tmpl_loop>
+<div style="clear: both;"></div>
+
+			</div>
+			<tmpl_unless isLocked>
+				<div class="postControls">
+					<tmpl_if user.canReply>
+						<a href="<tmpl_var reply.url>">[<tmpl_var reply.label>]</a>
+					</tmpl_if>
+					<tmpl_if user.canEdit>
+						<a href="<tmpl_var edit.url>">[<tmpl_var edit.label>]</a>
+						<a href="<tmpl_var delete.url>">[<tmpl_var delete.label>]</a>
+					</tmpl_if>
+				</div>
+			</tmpl_unless>
+		</div>
+	</tmpl_loop>
+<!-- end flat layout -->
+</tmpl_if>
+
+<tmpl_if layout.isNested>
+<!-- begin nested layout -->
+	<tmpl_loop post_loop>
+		<div style="margin-left: <tmpl_var depthX10>px;">
+			<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
+				<a name="<tmpl_var assetId>"></a>
+				<div class="postSubject">
+					<tmpl_var title>
+				</div>
+				<div class="postData">
+					<div style="float: left; width: 50%">
+						<b><tmpl_var user.label>:</b> 
+							<tmpl_if user.isVisitor>
+								<tmpl_var username>
+							<tmpl_else>
+								<a href="<tmpl_var userProfile.url>"><tmpl_var username></a>
+							</tmpl_if>
+							<br />
+						<b><tmpl_var date.label>:</b> <tmpl_var dateSubmitted.human><br />
+					</div>	
+					<div>
+						<b><tmpl_var views.label>:</b> <tmpl_var views><br />
+						<b><tmpl_var rating.label>:</b> <tmpl_var rating>
+							<tmpl_unless hasRated>
+								 &nbsp; &nbsp;<tmpl_var rate.label> [ <a href="<tmpl_var rate.url.1>">1</a>, <a href="<tmpl_var rate.url.2>">2</a>, <a href="<tmpl_var rate.url.3>">3</a>, <a href="<tmpl_var rate.url.4>">4</a>, <a href="<tmpl_var rate.url.5>">5</a> ]
+							</tmpl_unless>
+							<br />
+						<tmpl_if user.isModerator>
+							<b><tmpl_var status.label>:</b> <tmpl_var status> &nbsp; &nbsp; [ <a href="<tmpl_var approve.url>"><tmpl_var approve.label></a> | <a href="<tmpl_var deny.url>"><tmpl_var deny.label></a> ]<br />
+						<tmpl_else>	
+							<tmpl_if user.isPoster>
+								<b><tmpl_var status.label>:</b> <tmpl_var status><br />
+							</tmpl_if>	
+						</tmpl_if>	
+					</div>	
+				</div>
+				<div class="postMessage">
+					<tmpl_var content>
+<tmpl_loop attachment_loop>
+	<div style="float: left; padding: 5px;"><a href="<tmpl_var url>"><tmpl_if isImage><img src="<tmpl_var thumbnail>" border="0" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" border="0" alt="<tmpl_var filename>" align="middle" /> <tmpl_var filename></tmpl_if></a></div>
+</tmpl_loop>
+<div style="clear: both;"></div>
+
+				</div>
+				<tmpl_unless isLocked>
+					<div class="postControls">
+						<tmpl_if user.canReply>
+							<a href="<tmpl_var reply.url>">[<tmpl_var reply.label>]</a>
+						</tmpl_if>
+						<tmpl_if user.canEdit>
+							<a href="<tmpl_var edit.url>">[<tmpl_var edit.label>]</a>
+							<a href="<tmpl_var delete.url>">[<tmpl_var delete.label>]</a>
+						</tmpl_if>
+					</div>
+				</tmpl_unless>
+			</div>
+		</div>
+	</tmpl_loop>
+<!-- end nested layout -->
+</tmpl_if>
+
+<tmpl_if pagination.pageCount.isMultiple>
+	<div class="pagination" style="margin-top: 20px;">
+		[ <tmpl_var pagination.previousPage> | <tmpl_var pagination.pageList.upTo10> | <tmpl_var pagination.nextPage> ]
+	</div>
+</tmpl_if>
+
+<div style="margin-top: 20px;">
+	<tmpl_if previous.url>
+		<a href="<tmpl_var previous.url>">[<tmpl_var previous.label>]</a> 
+	</tmpl_if>	
+	<tmpl_if next.url>
+		<a href="<tmpl_var next.url>">[<tmpl_var next.label>]</a> 
+	</tmpl_if>	
+	<tmpl_if user.canPost>
+		<a href="<tmpl_var add.url>">[<tmpl_var add.label>]</a>
+	</tmpl_if>
+	<tmpl_if user.isModerator>
+		<tmpl_if isSticky>
+			<a href="<tmpl_var unstick.url>">[<tmpl_var unstick.label>]</a>
+		<tmpl_else>
+			<a href="<tmpl_var stick.url>">[<tmpl_var stick.label>]</a>
+		</tmpl_if>
+		<tmpl_if isLocked>
+			<a href="<tmpl_var unlock.url>">[<tmpl_var unlock.label>]</a>
+		<tmpl_else>
+			<a href="<tmpl_var lock.url>">[<tmpl_var lock.label>]</a>
+		</tmpl_if>
+	</tmpl_if>
+	<tmpl_unless user.isVisitor>
+		<tmpl_if user.isSubscribed>
+			<a href="<tmpl_var unsubscribe.url>">[<tmpl_var unsubscribe.label>]</a>
+		<tmpl_else>
+			<a href="<tmpl_var subscribe.url>">[<tmpl_var subscribe.label>]</a>
+		</tmpl_if>
+	</tmpl_unless>
+</div>
+~~~
+<style type="text/css">
+	.postBorder {
+		border: 1px solid #cccccc;
+		margin-bottom: 10px;
+	}
+ 	.postBorderCurrent {
+		border: 3px dotted black;
+		margin-bottom: 10px;
+	}
+	.postSubject {
+		border-bottom: 1px solid #cccccc;
+		font-weight: bold;
+		padding: 3px;
+	}
+	.postData {
+		border-bottom: 1px solid #cccccc;
+		font-size: 11px;
+		background-color: #eeeeee;
+		color: black;
+		padding: 3px;
+	}
+	.postControls {
+		border-top: 1px solid #cccccc;
+		background-color: #eeeeee;
+		color: black;
+		padding: 3px;
+	}
+	.postMessage {
+		padding: 3px;
+	}
+	.currentThread {
+		background-color: #eeeeee;
+	}
+	.threadHead {
+		font-weight: bold;
+		border-bottom: 1px solid #cccccc;
+		font-size: 11px;
+		background-color: #eeeeee;
+		color: black;
+		padding: 3px;
+	}
+	.threadData {
+		font-size: 11px;
+		padding: 3px;
+	}
+</style>
+
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_default_uss.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_default_uss.tmpl
index 79ed14624..253982b9d 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_default_uss.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_default_uss.tmpl
@@ -1,4 +1,89 @@
 #PBtmpl0000000000000066
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>

<tmpl_if session.var.adminOn>
	<tmpl_var controls>
</tmpl_if>
+<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
+
+<tmpl_if session.var.adminOn>
+	<tmpl_var controls>
+</tmpl_if>
+
+<tmpl_if displayTitle>
+	<h2><tmpl_var title></h2>
+</tmpl_if>
+
+<tmpl_if description>
+	<tmpl_var description>
+</tmpl_if>
+
+<p>
+	<tmpl_if user.canPost>
+		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
+		&#149;
+	</tmpl_if>
+	<tmpl_unless user.isVisitor>
+		<tmpl_if user.isSubscribed>
+			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
+		<tmpl_else>
+			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
+		</tmpl_if>
+		&#149;
+	</tmpl_unless>
+	<a href="<tmpl_var search.url>"><tmpl_var search.label></a>
+</p>
+
+<table width="100%">
+<tr>
+	<tmpl_if user.isModerator>
+		<td class="forumHead"><tmpl_var status.label></td>
+	</tmpl_if>
+	<td class="forumHead"><a href="<tmpl_var sortby.title.url>"><tmpl_var title.label></a></td>
+	<td class="forumHead"><a href="<tmpl_var sortby.date.url>"><tmpl_var date.label></a></td>
+	<td class="forumHead"><a href="<tmpl_var sortby.username.url>"><tmpl_var by.label></a></td>
+</tr>
+<tmpl_loop post_loop>
+<tr>
+	<tmpl_if user.isModerator>
+		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var status></td>
+	</tmpl_if>
+	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><a href="<tmpl_var url>"><tmpl_var title></a><tmpl_if user.isPoster> (<tmpl_var status>)</tmpl_if></td>
+	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var dateUpdated.human></td>
+	<tmpl_if user.isVisitor>
+		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var username></td>
+	<tmpl_else>
+		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><a href="<tmpl_var userProfile.url>"><tmpl_var username></a></td>
+	</tmpl_if>
+</tr>
+</tmpl_loop>
+</table>
+
+<tmpl_if pagination.pageCount.isMultiple>
+	<div class="pagination">
+		<tmpl_var pagination.previousPage> &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
+	</div>
+</tmpl_if>
+~~~
+
+<style type="text/css">
+
+.forumHead {
+	background-color: #eeeeee;
+	border-bottom: 1px solid #cccccc;
+	padding: 2px;
+	padding-bottom: 4px;
+	font-size: 13px;
+	font-weight: bold;
+}
+
+.oddThread {
+	font-size: 13px;
+	border-bottom: 1px dashed #83cc83;
+	padding-bottom: 4px;
+}
+
+.evenThread {
+	font-size: 13px;
+	border-bottom: 1px dashed #aaaaff;
+	padding-bottom: 4px;
+}
+
+</style>
+
 
-^RawHeadTags(
<style type="text/css">

.forumHead {
	background-color: #eeeeee;
	border-bottom: 1px solid #cccccc;
	padding: 2px;
	padding-bottom: 4px;
	font-size: 13px;
	font-weight: bold;
}

.oddThread {
	font-size: 13px;
	border-bottom: 1px dashed #83cc83;
	padding-bottom: 4px;
}

.evenThread {
	font-size: 13px;
	border-bottom: 1px dashed #aaaaff;
	padding-bottom: 4px;
}

</style>);

<tmpl_if displayTitle>
	<h2><tmpl_var title></h2>
</tmpl_if>

<tmpl_if description>
	<tmpl_var description>
</tmpl_if>

<p>
	<tmpl_if user.canPost>
		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
		&#149;
	</tmpl_if>
	<tmpl_unless user.isVisitor>
		<tmpl_if user.isSubscribed>
			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
		<tmpl_else>
			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
		</tmpl_if>
		&#149;
	</tmpl_unless>
	<a href="<tmpl_var search.url>"><tmpl_var search.label></a>
</p>

<table width="100%">
<tr>
	<tmpl_if user.isModerator>
		<td class="forumHead"><tmpl_var status.label></td>
	</tmpl_if>
	<td class="forumHead"><a href="<tmpl_var sortby.title.url>"><tmpl_var title.label></a></td>
	<td class="forumHead"><a href="<tmpl_var sortby.date.url>"><tmpl_var date.label></a></td>
	<td class="forumHead"><a href="<tmpl_var sortby.username.url>"><tmpl_var by.label></a></td>
</tr>
<tmpl_loop post_loop>
<tr>
	<tmpl_if user.isModerator>
		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var status></td>
	</tmpl_if>
	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><a href="<tmpl_var url>"><tmpl_var title></a><tmpl_if user.isPoster> (<tmpl_var status>)</tmpl_if></td>
	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var dateUpdated.human></td>
	<tmpl_if user.isVisitor>
		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var username></td>
	<tmpl_else>
		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><a href="<tmpl_var userProfile.url>"><tmpl_var username></a></td>
	</tmpl_if>
</tr>
</tmpl_loop>
</table>

<tmpl_if pagination.pageCount.isMultiple>
	<div class="pagination">
		<tmpl_var pagination.previousPage> &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
	</div>
</tmpl_if>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_faq.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_faq.tmpl
index 153c4896e..94f0aabd5 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_faq.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_faq.tmpl
@@ -1,2 +1,67 @@
 #PBtmpl0000000000000080
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>

<tmpl_if session.var.adminOn>
	<tmpl_var controls>
</tmpl_if>

<tmpl_if displayTitle>
	<h2><tmpl_var title></h2>
</tmpl_if>

<tmpl_if description>
	<tmpl_var description>
</tmpl_if>

<p>
	<tmpl_if user.canPost>
		<a href="<tmpl_var add.url>">[<tmpl_var add.label>]</a>
	</tmpl_if>
	<tmpl_unless user.isVisitor>
		<tmpl_if user.isSubscribed>
			<a href="<tmpl_var unsubscribe.url>">[<tmpl_var unsubscribe.label>]</a>
		<tmpl_else>
			<a href="<tmpl_var subscribe.url>">[<tmpl_var subscribe.label>]</a>
		</tmpl_if>
	</tmpl_unless>
	<tmpl_if pagination.pageCount.isMultiple>
		<a href="<tmpl_var search.url>">[<tmpl_var search.label>]</a>
	</tmpl_if>
</p>

<ul>
	<tmpl_loop post_loop>
	   <li><a href="#id<tmpl_var assetId>"><span class="faqQuestion"><tmpl_var title></span></a></li>
	</tmpl_loop>
</ul>

<tmpl_loop post_loop>
	<tmpl_if user.isPoster>
		<tmpl_unless session.var.adminOn>
			<div>[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]</div>
		</tmpl_unless>
	</tmpl_if>
	<tmpl_if user.isModerator>
		<div>
			<tmpl_if session.var.adminOn>
				<tmpl_var controls>
			<tmpl_else>
				<tmpl_unless user.isPoster>
					<tmpl_unless session.var.adminOn>
						[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]
					</tmpl_unless>
				</tmpl_unless>
			</tmpl_if>
			(<a href="<tmpl_var url>"><tmpl_var status></a>)
		</div>
	</tmpl_if>
	<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a><span class="faqQuestion"><tmpl_var title></span><br />
	<tmpl_var content>
	<p><a href="#top">[top]</a></p>
</tmpl_loop>

<tmpl_if pagination.pageCount.isMultiple>
	<div class="pagination">
		<tmpl_var pagination.previousPage>  &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
	</div>
</tmpl_if>
\ No newline at end of file
+<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
+
+<tmpl_if session.var.adminOn>
+	<tmpl_var controls>
+</tmpl_if>
+
+<tmpl_if displayTitle>
+	<h2><tmpl_var title></h2>
+</tmpl_if>
+
+<tmpl_if description>
+	<tmpl_var description>
+</tmpl_if>
+
+<p>
+	<tmpl_if user.canPost>
+		<a href="<tmpl_var add.url>">[<tmpl_var add.label>]</a>
+	</tmpl_if>
+	<tmpl_unless user.isVisitor>
+		<tmpl_if user.isSubscribed>
+			<a href="<tmpl_var unsubscribe.url>">[<tmpl_var unsubscribe.label>]</a>
+		<tmpl_else>
+			<a href="<tmpl_var subscribe.url>">[<tmpl_var subscribe.label>]</a>
+		</tmpl_if>
+	</tmpl_unless>
+	<tmpl_if pagination.pageCount.isMultiple>
+		<a href="<tmpl_var search.url>">[<tmpl_var search.label>]</a>
+	</tmpl_if>
+</p>
+
+<ul>
+	<tmpl_loop post_loop>
+	   <li><a href="#id<tmpl_var assetId>"><span class="faqQuestion"><tmpl_var title></span></a></li>
+	</tmpl_loop>
+</ul>
+
+<tmpl_loop post_loop>
+	<tmpl_if user.isPoster>
+		<tmpl_unless session.var.adminOn>
+			<div>[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]</div>
+		</tmpl_unless>
+	</tmpl_if>
+	<tmpl_if user.isModerator>
+		<div>
+			<tmpl_if session.var.adminOn>
+				<tmpl_var controls>
+			<tmpl_else>
+				<tmpl_unless user.isPoster>
+					<tmpl_unless session.var.adminOn>
+						[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]
+					</tmpl_unless>
+				</tmpl_unless>
+			</tmpl_if>
+			(<a href="<tmpl_var url>"><tmpl_var status></a>)
+		</div>
+	</tmpl_if>
+	<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a><span class="faqQuestion"><tmpl_var title></span><br />
+	<tmpl_var content>
+	<p><a href="#top">[top]</a></p>
+</tmpl_loop>
+
+<tmpl_if pagination.pageCount.isMultiple>
+	<div class="pagination">
+		<tmpl_var pagination.previousPage>  &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
+	</div>
+</tmpl_if>
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_guest_book.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_guest_book.tmpl
index 9e3bd632b..19bb9f823 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_guest_book.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_guest_book.tmpl
@@ -1,2 +1,45 @@
 #PBtmpl0000000000000133
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>

<tmpl_if session.var.adminOn>
	<tmpl_var controls>
</tmpl_if>

<tmpl_if displayTitle>
	<h2><tmpl_var title></h2>
</tmpl_if>

<tmpl_if description>
	<tmpl_var description>
</tmpl_if>

<p>
	<tmpl_if user.canPost>
		<a href="<tmpl_var add.url>">[<tmpl_var add.label>]</a>
	</tmpl_if>
	<tmpl_unless user.isVisitor>
		<tmpl_if user.isSubscribed>
			<a href="<tmpl_var unsubscribe.url>">[<tmpl_var unsubscribe.label>]</a>
		<tmpl_else>
			<a href="<tmpl_var subscribe.url>">[<tmpl_var subscribe.label>]</a>
		</tmpl_if>
	</tmpl_unless>
	<tmpl_if pagination.pageCount.isMultiple>
		<a href="<tmpl_var search.url>">[<tmpl_var search.label>]</a>
	</tmpl_if>
</p>

<tmpl_loop post_loop>

<div><b>On <tmpl_var dateSubmitted.human> <a href="<tmpl_var userProfile.url>"><tmpl_var username></a> from <a href="<tmpl_var url>">the '<tmpl_var title>' department</a> wrote</b></div>
<div><i><tmpl_var synopsis></i></div>
<div><a href="<tmpl_var url>"><tmpl_var readmore.label></a></div>
<p />

</tmpl_loop>

<tmpl_if pagination.pageCount.isMultiple>
	<div class="pagination">
		<tmpl_var pagination.previousPage> &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
	</div>
</tmpl_if>
\ No newline at end of file
+<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
+
+<tmpl_if session.var.adminOn>
+	<tmpl_var controls>
+</tmpl_if>
+
+<tmpl_if displayTitle>
+	<h2><tmpl_var title></h2>
+</tmpl_if>
+
+<tmpl_if description>
+	<tmpl_var description>
+</tmpl_if>
+
+<p>
+	<tmpl_if user.canPost>
+		<a href="<tmpl_var add.url>">[<tmpl_var add.label>]</a>
+	</tmpl_if>
+	<tmpl_unless user.isVisitor>
+		<tmpl_if user.isSubscribed>
+			<a href="<tmpl_var unsubscribe.url>">[<tmpl_var unsubscribe.label>]</a>
+		<tmpl_else>
+			<a href="<tmpl_var subscribe.url>">[<tmpl_var subscribe.label>]</a>
+		</tmpl_if>
+	</tmpl_unless>
+	<tmpl_if pagination.pageCount.isMultiple>
+		<a href="<tmpl_var search.url>">[<tmpl_var search.label>]</a>
+	</tmpl_if>
+</p>
+
+<tmpl_loop post_loop>
+
+<div><b>On <tmpl_var dateSubmitted.human> <a href="<tmpl_var userProfile.url>"><tmpl_var username></a> from <a href="<tmpl_var url>">the '<tmpl_var title>' department</a> wrote</b></div>
+<div><i><tmpl_var synopsis></i></div>
+<div><a href="<tmpl_var url>"><tmpl_var readmore.label></a></div>
+<p />
+
+</tmpl_loop>
+
+<tmpl_if pagination.pageCount.isMultiple>
+	<div class="pagination">
+		<tmpl_var pagination.previousPage> &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
+	</div>
+</tmpl_if>
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_item.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_item.tmpl
index d242c06ca..87e14639f 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_item.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_item.tmpl
@@ -1,2 +1,25 @@
 #PBtmpl0000000000000123
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>

<tmpl_if session.var.adminOn>
	<p><tmpl_var controls></p>
</tmpl_if>

<tmpl_if displaytitle>
	<tmpl_if linkurl>
		<a href="<tmpl_var linkurl>">
	</tmpl_if>
	<span class="itemTitle"><tmpl_var title></span>
	<tmpl_if linkurl>
		</a>
	</tmpl_if>
</tmpl_if>

<tmpl_if attachment.name>
	<tmpl_if displaytitle> - </tmpl_if>
	<a href="<tmpl_var attachment.url>"><img src="<tmpl_var attachment.Icon>" alt="<tmpl_var attachment.name>" width="16" height="16" border="0" align="middle" /></a>
</tmpl_if>

<tmpl_if description>
  - <tmpl_var description>
</tmpl_if>
\ No newline at end of file
+<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
+
+<tmpl_if session.var.adminOn>
+	<p><tmpl_var controls></p>
+</tmpl_if>
+
+<tmpl_if displaytitle>
+	<tmpl_if linkurl>
+		<a href="<tmpl_var linkurl>">
+	</tmpl_if>
+	<span class="itemTitle"><tmpl_var title></span>
+	<tmpl_if linkurl>
+		</a>
+	</tmpl_if>
+</tmpl_if>
+
+<tmpl_if attachment.name>
+	<tmpl_if displaytitle> - </tmpl_if>
+	<a href="<tmpl_var attachment.url>"><img src="<tmpl_var attachment.Icon>" alt="<tmpl_var attachment.name>" width="16" height="16" border="0" align="middle" /></a>
+</tmpl_if>
+
+<tmpl_if description>
+  - <tmpl_var description>
+</tmpl_if>
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_item_with_pop_up_links.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_item_with_pop_up_links.tmpl
index 9bf47d0d9..3a16f2e41 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_item_with_pop_up_links.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_item_with_pop_up_links.tmpl
@@ -1,2 +1,25 @@
 #PBtmpl0000000000000129
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>

<tmpl_if session.var.adminOn>
	<p><tmpl_var controls></p>
</tmpl_if>

<tmpl_if displaytitle>
	<tmpl_if linkurl>
		<a href="<tmpl_var linkurl>" target="_blank">
	</tmpl_if>
	<span class="itemTitle"><tmpl_var title></span>
	<tmpl_if linkurl>
		</a>
	</tmpl_if>
</tmpl_if>

<tmpl_if attachment.name>
	<tmpl_if displaytitle> - </tmpl_if>
	<a href="<tmpl_var attachment.url>" target="_blank"><img src="<tmpl_var attachment.Icon>" alt="<tmpl_var attachment.name>" width="16" height="16" border="0" align="middle" /></a>
</tmpl_if>

<tmpl_if description>
  - <tmpl_var description>
</tmpl_if>
\ No newline at end of file
+<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
+
+<tmpl_if session.var.adminOn>
+	<p><tmpl_var controls></p>
+</tmpl_if>
+
+<tmpl_if displaytitle>
+	<tmpl_if linkurl>
+		<a href="<tmpl_var linkurl>" target="_blank">
+	</tmpl_if>
+	<span class="itemTitle"><tmpl_var title></span>
+	<tmpl_if linkurl>
+		</a>
+	</tmpl_if>
+</tmpl_if>
+
+<tmpl_if attachment.name>
+	<tmpl_if displaytitle> - </tmpl_if>
+	<a href="<tmpl_var attachment.url>" target="_blank"><img src="<tmpl_var attachment.Icon>" alt="<tmpl_var attachment.name>" width="16" height="16" border="0" align="middle" /></a>
+</tmpl_if>
+
+<tmpl_if description>
+  - <tmpl_var description>
+</tmpl_if>
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_job_listing.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_job_listing.tmpl
index 9dbda1060..96374fc61 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_job_listing.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_job_listing.tmpl
@@ -1,5 +1,87 @@
 #PBtmpl0000000000000077
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>

<tmpl_if session.var.adminOn>
	<p><tmpl_var controls></p>
</tmpl_if>
+<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
+
+<tmpl_if session.var.adminOn>
+	<p><tmpl_var controls></p>
+</tmpl_if>
+
+<tmpl_if displayTitle>
+	<h2><tmpl_var title></h2>
+</tmpl_if>
+
+<tmpl_if description>
+	<tmpl_var description>
+</tmpl_if>
+
+<p>
+	<tmpl_if user.canPost>
+		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
+		&#149;
+	</tmpl_if>
+	<tmpl_unless user.isVisitor>
+		<tmpl_if user.isSubscribed>
+			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
+		<tmpl_else>
+			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
+		</tmpl_if>
+		&#149;
+	</tmpl_unless>
+	<a href="<tmpl_var search.url>"><tmpl_var search.label></a>
+</p>
+
+<table width="100%">
+<tr>
+	<tmpl_if user.isModerator>
+		<td class="forumHead"><tmpl_var status.label></td>
+	</tmpl_if>
+	<td class="forumHead"><tmpl_var job.title.label></td>
+	<td class="forumHead"><tmpl_var location.label></td>
+	<td class="forumHead"><tmpl_var compensation.label></td>
+	<td class="forumHead"><tmpl_var date.label></td>
+</tr>
+
+<tmpl_loop post_loop>
+<tr>
+	<tmpl_if user.isModerator>
+		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var status></td>
+	</tmpl_if>
+	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><a href="<tmpl_var url>"><tmpl_var title></a><tmpl_if user.isPoster> (<tmpl_var status>)</tmpl_if></td>
+	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var userDefined2></td>
+	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var userDefined1></td>
+	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var dateSubmitted.human></td>
+</tr>
+</tmpl_loop>
+</table>
+
+<tmpl_if pagination.pageCount.isMultiple>
+	<div class="pagination">
+		<tmpl_var pagination.previousPage> &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
+	</div>
+</tmpl_if>
+~~~
+
+<style type="text/css">
+
+.forumHead {
+	background-color: #eeeeee;
+	border-bottom: 1px solid #cccccc;
+	padding: 2px;
+	padding-bottom: 4px;
+	font-size: 13px;
+	font-weight: bold;
+}
+
+.oddThread {
+	font-size: 13px;
+	border-bottom: 1px dashed #83cc83;
+	padding-bottom: 4px;
+}
+
+.evenThread {
+	font-size: 13px;
+	border-bottom: 1px dashed #aaaaff;
+	padding-bottom: 4px;
+}
+</style>
+
 
-^RawHeadTags(
<style type="text/css">

.forumHead {
	background-color: #eeeeee;
	border-bottom: 1px solid #cccccc;
	padding: 2px;
	padding-bottom: 4px;
	font-size: 13px;
	font-weight: bold;
}

.oddThread {
	font-size: 13px;
	border-bottom: 1px dashed #83cc83;
	padding-bottom: 4px;
}

.evenThread {
	font-size: 13px;
	border-bottom: 1px dashed #aaaaff;
	padding-bottom: 4px;
}
</style>);
-
<tmpl_if displayTitle>
	<h2><tmpl_var title></h2>
</tmpl_if>

<tmpl_if description>
	<tmpl_var description>
</tmpl_if>

<p>
	<tmpl_if user.canPost>
		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
		&#149;
	</tmpl_if>
	<tmpl_unless user.isVisitor>
		<tmpl_if user.isSubscribed>
			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
		<tmpl_else>
			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
		</tmpl_if>
		&#149;
	</tmpl_unless>
	<a href="<tmpl_var search.url>"><tmpl_var search.label></a>
</p>

<table width="100%">
<tr>
	<tmpl_if user.isModerator>
		<td class="forumHead"><tmpl_var status.label></td>
	</tmpl_if>
	<td class="forumHead"><tmpl_var job.title.label></td>
	<td class="forumHead"><tmpl_var location.label></td>
	<td class="forumHead"><tmpl_var compensation.label></td>
	<td class="forumHead"><tmpl_var date.label></td>
</tr>

<tmpl_loop post_loop>
<tr>
	<tmpl_if user.isModerator>
		<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var status></td>
	</tmpl_if>
	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><a href="<tmpl_var url>"><tmpl_var title></a><tmpl_if user.isPoster> (<tmpl_var status>)</tmpl_if></td>
	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var userDefined2></td>
	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var userDefined1></td>
	<td class="<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>"><tmpl_var dateSubmitted.human></td>
</tr>
</tmpl_loop>
</table>

<tmpl_if pagination.pageCount.isMultiple>
	<div class="pagination">
		<tmpl_var pagination.previousPage> &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
	</div>
</tmpl_if>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_left_align_image.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_left_align_image.tmpl
index a560d400b..eda252b1b 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_left_align_image.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_left_align_image.tmpl
@@ -1,2 +1,57 @@
 #PBtmpl0000000000000103
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>

<tmpl_if session.var.adminOn>
	<p><tmpl_var controls></p>
</tmpl_if>

<tmpl_if displayTitle>
	<h2><tmpl_var title></h2>
</tmpl_if>

<tmpl_if pagination.isFirstPage>
<tmpl_if image.url>
	<table width="100%" border="0" cellpadding="0" cellspacing="0"><tr><td class="content">
	<img src="<tmpl_var image.url>" alt="<tmpl_var image.url>" align="left" border="0" />
</tmpl_if>
</tmpl_if>

<tmpl_if description>
	<tmpl_var description>
	<p />
</tmpl_if>

<tmpl_if pagination.isLastPage>
<tmpl_if linkurl>
	<tmpl_if linktitle>
		<p />
		<a href="<tmpl_var linkUrl>"><tmpl_var linkTitle></a>
	</tmpl_if>
</tmpl_if>

<tmpl_var attachment.box> <p />
</tmpl_if>

<tmpl_if pagination.isFirstPage>
<tmpl_if image.url>
	</td></tr></table>
</tmpl_if>
</tmpl_if>

<tmpl_if pagination.pageCount.isMultiple>
<tmpl_var pagination.previousPage>
&#183;
<tmpl_var pagination.pageList.upTo20>
&#183;
<tmpl_var pagination.nextPage>
</tmpl_if>

<tmpl_if pagination.isLastPage>
<tmpl_if allowDiscussion>
	<p />
	<table width="100%" cellspacing="2" cellpadding="1" border="0">
	<tr><td align="center" width="50%" class="tableMenu"><a href="<tmpl_var replies.URL>"><tmpl_var replies.label> (<tmpl_var replies.count>)</a></td>
	<td align="center" width="50%" class="tableMenu"><a href="<tmpl_var post.url>"><tmpl_var post.label></a></td></tr>
	</table>
</tmpl_if>
</tmpl_if>
\ No newline at end of file
+<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
+
+<tmpl_if session.var.adminOn>
+	<p><tmpl_var controls></p>
+</tmpl_if>
+
+<tmpl_if displayTitle>
+	<h2><tmpl_var title></h2>
+</tmpl_if>
+
+<tmpl_if pagination.isFirstPage>
+<tmpl_if image.url>
+	<table width="100%" border="0" cellpadding="0" cellspacing="0"><tr><td class="content">
+	<img src="<tmpl_var image.url>" alt="<tmpl_var image.url>" align="left" border="0" />
+</tmpl_if>
+</tmpl_if>
+
+<tmpl_if description>
+	<tmpl_var description>
+	<p />
+</tmpl_if>
+
+<tmpl_if pagination.isLastPage>
+<tmpl_if linkurl>
+	<tmpl_if linktitle>
+		<p />
+		<a href="<tmpl_var linkUrl>"><tmpl_var linkTitle></a>
+	</tmpl_if>
+</tmpl_if>
+
+<tmpl_var attachment.box> <p />
+</tmpl_if>
+
+<tmpl_if pagination.isFirstPage>
+<tmpl_if image.url>
+	</td></tr></table>
+</tmpl_if>
+</tmpl_if>
+
+<tmpl_if pagination.pageCount.isMultiple>
+<tmpl_var pagination.previousPage>
+&#183;
+<tmpl_var pagination.pageList.upTo20>
+&#183;
+<tmpl_var pagination.nextPage>
+</tmpl_if>
+
+<tmpl_if pagination.isLastPage>
+<tmpl_if allowDiscussion>
+	<p />
+	<table width="100%" cellspacing="2" cellpadding="1" border="0">
+	<tr><td align="center" width="50%" class="tableMenu"><a href="<tmpl_var replies.URL>"><tmpl_var replies.label> (<tmpl_var replies.count>)</a></td>
+	<td align="center" width="50%" class="tableMenu"><a href="<tmpl_var post.url>"><tmpl_var post.label></a></td></tr>
+	</table>
+</tmpl_if>
+</tmpl_if>
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_link_list.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_link_list.tmpl
index 281a2b295..f8d92ceaa 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_link_list.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_link_list.tmpl
@@ -1,2 +1,64 @@
 #PBtmpl0000000000000083
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>

<tmpl_if session.var.adminOn>
	<tmpl_var controls>
</tmpl_if>

<tmpl_if displayTitle>
	<h2><tmpl_var title></h2>
</tmpl_if>

<tmpl_if description>
	<tmpl_var description>
</tmpl_if>

<p>
	<tmpl_if user.canPost>
		<a href="<tmpl_var add.url>">[<tmpl_var add.label>]</a>
	</tmpl_if>
	<tmpl_unless user.isVisitor>
		<tmpl_if user.isSubscribed>
			<a href="<tmpl_var unsubscribe.url>">[<tmpl_var unsubscribe.label>]</a>
		<tmpl_else>
			<a href="<tmpl_var subscribe.url>">[<tmpl_var subscribe.label>]</a>
		</tmpl_if>
	</tmpl_unless>
	<tmpl_if pagination.pageCount.isMultiple>
		<a href="<tmpl_var search.url>">[<tmpl_var search.label>]</a>
	</tmpl_if>
</p>

<tmpl_loop post_loop>
	<tmpl_if user.isPoster>
		<tmpl_unless session.var.adminOn>
			<div>[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]</div>
		</tmpl_unless>
	</tmpl_if>
	<tmpl_if user.isModerator>
		<div>
			<tmpl_if session.var.adminOn>
				<tmpl_var controls>
			<tmpl_else>
				<tmpl_unless user.isPoster>
					<tmpl_unless session.var.adminOn>
						[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]
					</tmpl_unless>
				</tmpl_unless>
			</tmpl_if>
			(<a href="<tmpl_var url>"><tmpl_var status></a>)
		</div>
	</tmpl_if>
	<p>
		<tmpl_if userDefined1><a href="<tmpl_var userDefined1>"	<tmpl_if userDefined2>target="_blank"</tmpl_if>></tmpl_if><tmpl_var title><tmpl_if userDefined1></a></tmpl_if>
		<tmpl_if content>
				  - <tmpl_var content>
		</tmpl_if>
	</p>
</tmpl_loop>

<tmpl_if pagination.pageCount.isMultiple>
	<div class="pagination">
		<tmpl_var pagination.previousPage> &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
	</div>
</tmpl_if>
\ No newline at end of file
+<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
+
+<tmpl_if session.var.adminOn>
+	<tmpl_var controls>
+</tmpl_if>
+
+<tmpl_if displayTitle>
+	<h2><tmpl_var title></h2>
+</tmpl_if>
+
+<tmpl_if description>
+	<tmpl_var description>
+</tmpl_if>
+
+<p>
+	<tmpl_if user.canPost>
+		<a href="<tmpl_var add.url>">[<tmpl_var add.label>]</a>
+	</tmpl_if>
+	<tmpl_unless user.isVisitor>
+		<tmpl_if user.isSubscribed>
+			<a href="<tmpl_var unsubscribe.url>">[<tmpl_var unsubscribe.label>]</a>
+		<tmpl_else>
+			<a href="<tmpl_var subscribe.url>">[<tmpl_var subscribe.label>]</a>
+		</tmpl_if>
+	</tmpl_unless>
+	<tmpl_if pagination.pageCount.isMultiple>
+		<a href="<tmpl_var search.url>">[<tmpl_var search.label>]</a>
+	</tmpl_if>
+</p>
+
+<tmpl_loop post_loop>
+	<tmpl_if user.isPoster>
+		<tmpl_unless session.var.adminOn>
+			<div>[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]</div>
+		</tmpl_unless>
+	</tmpl_if>
+	<tmpl_if user.isModerator>
+		<div>
+			<tmpl_if session.var.adminOn>
+				<tmpl_var controls>
+			<tmpl_else>
+				<tmpl_unless user.isPoster>
+					<tmpl_unless session.var.adminOn>
+						[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]
+					</tmpl_unless>
+				</tmpl_unless>
+			</tmpl_if>
+			(<a href="<tmpl_var url>"><tmpl_var status></a>)
+		</div>
+	</tmpl_if>
+	<p>
+		<tmpl_if userDefined1><a href="<tmpl_var userDefined1>"	<tmpl_if userDefined2>target="_blank"</tmpl_if>></tmpl_if><tmpl_var title><tmpl_if userDefined1></a></tmpl_if>
+		<tmpl_if content>
+				  - <tmpl_var content>
+		</tmpl_if>
+	</p>
+</tmpl_loop>
+
+<tmpl_if pagination.pageCount.isMultiple>
+	<div class="pagination">
+		<tmpl_var pagination.previousPage> &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
+	</div>
+</tmpl_if>
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_linked_image_with_caption.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_linked_image_with_caption.tmpl
index 345ac60d2..2b430f6d3 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_linked_image_with_caption.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_linked_image_with_caption.tmpl
@@ -1,2 +1,61 @@
 #PBtmpl0000000000000115
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>

<tmpl_if session.var.adminOn>
	<p><tmpl_var controls></p>
</tmpl_if>

<tmpl_if displayTitle>
	<h2><tmpl_var title></h2>
</tmpl_if>

<tmpl_if pagination.isFirstPage>
<tmpl_if image.url>
	<table width="100%" border="0" cellpadding="0" cellspacing="0"><tr><td class="content">
		<table align="right">
		<tr><td align="center">
			<tmpl_if linkUrl>
				<a href="<tmpl_var linkUrl>">
				<img src="<tmpl_var image.url>" alt="<tmpl_var image.url>" border="0" /><br /><tmpl_var linkTitle>
				</a>
			<tmpl_else>
				<img src="<tmpl_var image.url>" alt="<tmpl_var image.url>" border="0" /><br /><tmpl_var linkTitle>
			</tmpl_if>
		</td></tr>
		</table>
</tmpl_if>
</tmpl_if>

<tmpl_if description>
	<tmpl_var description>
	<p />
</tmpl_if>

<tmpl_if pagination.isLastPage>
	<tmpl_var attachment.box>
	<p />
</tmpl_if>

<tmpl_if pagination.isFirstPage>
<tmpl_if image.url>
	</td></tr></table>
</tmpl_if>
</tmpl_if>

<tmpl_if pagination.pageCount.isMultiple>
<tmpl_var pagination.previousPage>
&#183;
<tmpl_var pagination.pageList.upTo20>
&#183;
<tmpl_var pagination.nextPage>
</tmpl_if>

<tmpl_if pagination.isLastPage>
<tmpl_if allowDiscussion>
	<p />
	<table width="100%" cellspacing="2" cellpadding="1" border="0">
	<tr><td align="center" width="50%" class="tableMenu"><a href="<tmpl_var replies.URL>"><tmpl_var replies.label> (<tmpl_var replies.count>)</a></td>
	<td align="center" width="50%" class="tableMenu"><a href="<tmpl_var post.url>"><tmpl_var post.label></a></td></tr>
	</table>
</tmpl_if>
</tmpl_if>
\ No newline at end of file
+<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
+
+<tmpl_if session.var.adminOn>
+	<p><tmpl_var controls></p>
+</tmpl_if>
+
+<tmpl_if displayTitle>
+	<h2><tmpl_var title></h2>
+</tmpl_if>
+
+<tmpl_if pagination.isFirstPage>
+<tmpl_if image.url>
+	<table width="100%" border="0" cellpadding="0" cellspacing="0"><tr><td class="content">
+		<table align="right">
+		<tr><td align="center">
+			<tmpl_if linkUrl>
+				<a href="<tmpl_var linkUrl>">
+				<img src="<tmpl_var image.url>" alt="<tmpl_var image.url>" border="0" /><br /><tmpl_var linkTitle>
+				</a>
+			<tmpl_else>
+				<img src="<tmpl_var image.url>" alt="<tmpl_var image.url>" border="0" /><br /><tmpl_var linkTitle>
+			</tmpl_if>
+		</td></tr>
+		</table>
+</tmpl_if>
+</tmpl_if>
+
+<tmpl_if description>
+	<tmpl_var description>
+	<p />
+</tmpl_if>
+
+<tmpl_if pagination.isLastPage>
+	<tmpl_var attachment.box>
+	<p />
+</tmpl_if>
+
+<tmpl_if pagination.isFirstPage>
+<tmpl_if image.url>
+	</td></tr></table>
+</tmpl_if>
+</tmpl_if>
+
+<tmpl_if pagination.pageCount.isMultiple>
+<tmpl_var pagination.previousPage>
+&#183;
+<tmpl_var pagination.pageList.upTo20>
+&#183;
+<tmpl_var pagination.nextPage>
+</tmpl_if>
+
+<tmpl_if pagination.isLastPage>
+<tmpl_if allowDiscussion>
+	<p />
+	<table width="100%" cellspacing="2" cellpadding="1" border="0">
+	<tr><td align="center" width="50%" class="tableMenu"><a href="<tmpl_var replies.URL>"><tmpl_var replies.label> (<tmpl_var replies.count>)</a></td>
+	<td align="center" width="50%" class="tableMenu"><a href="<tmpl_var post.url>"><tmpl_var post.label></a></td></tr>
+	</table>
+</tmpl_if>
+</tmpl_if>
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_news.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_news.tmpl
index 3d9579696..0f79ab731 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_news.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_news.tmpl
@@ -5,21 +5,6 @@
 	<p><tmpl_var controls></p>
 </tmpl_if>
 
-^RawHeadTags(<style type="text/css">
-.firstColumn {
-	float: left;
-	width: 50%;
-}
-.secondColumn {
-	float: left;
-	width: auto;
-	max-width: 50%;
-}
-.endFloat {
-	clear: both;
-}
-</style>);
-
 <tmpl_if displayTitle>
 	<h2><tmpl_var title></h2>
 </tmpl_if>
@@ -140,3 +125,20 @@
 	<table><tr id="blank" class="hidden"><td><div><div class="empty">&nbsp;</div></div></td></tr></table>
 	<tmpl_var dragger.init>
 </tmpl_if>
+~~~
+<style type="text/css">
+.firstColumn {
+	float: left;
+	width: 50%;
+}
+.secondColumn {
+	float: left;
+	width: auto;
+	max-width: 50%;
+}
+.endFloat {
+	clear: both;
+}
+</style>
+
+
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_ordered_list.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_ordered_list.tmpl
index fb2868ba7..8d395cbf1 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_ordered_list.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_ordered_list.tmpl
@@ -1,2 +1,64 @@
 #PBtmpl0000000000000101
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>

<tmpl_if session.var.adminOn>
	<tmpl_var controls>
</tmpl_if>

<tmpl_if displayTitle>
	<h2><tmpl_var title></h2>
</tmpl_if>

<tmpl_if description>
	<tmpl_var description>
</tmpl_if>

<p>
	<tmpl_if user.canPost>
		<a href="<tmpl_var add.url>">[<tmpl_var add.label>]</a>
	</tmpl_if>
	<tmpl_unless user.isVisitor>
		<tmpl_if user.isSubscribed>
			<a href="<tmpl_var unsubscribe.url>">[<tmpl_var unsubscribe.label>]</a>
		<tmpl_else>
			<a href="<tmpl_var subscribe.url>">[<tmpl_var subscribe.label>]</a>
		</tmpl_if>
	</tmpl_unless>
	<tmpl_if pagination.pageCount.isMultiple>
		<a href="<tmpl_var search.url>">[<tmpl_var search.label>]</a>
	</tmpl_if>
</p>

<ol>
	<tmpl_loop post_loop>
		<li>
			<tmpl_if user.isPoster>
				<tmpl_unless session.var.adminOn>
					[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]
				</tmpl_unless>
			</tmpl_if>
			<tmpl_if user.isModerator>
				<tmpl_if session.var.adminOn>
					<tmpl_var controls>
				<tmpl_else>
					<tmpl_unless user.isPoster>
						<tmpl_unless session.var.adminOn>
							[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]
						</tmpl_unless>
					</tmpl_unless>
				</tmpl_if>
				(<a href="<tmpl_var url>"><tmpl_var status></a>)
			</tmpl_if>
			<tmpl_if userDefined1><a href="<tmpl_var userDefined1>"	<tmpl_if userDefined2>target="_blank"</tmpl_if>></tmpl_if><tmpl_var title><tmpl_if userDefined1></a></tmpl_if>
			<tmpl_if content>
					  - <tmpl_var content>
			</tmpl_if>
		</li>
	</tmpl_loop>
</ol>

<tmpl_if pagination.pageCount.isMultiple>
	<div class="pagination">
		<tmpl_var pagination.previousPage> &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
	</div>
</tmpl_if>
\ No newline at end of file
+<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
+
+<tmpl_if session.var.adminOn>
+	<tmpl_var controls>
+</tmpl_if>
+
+<tmpl_if displayTitle>
+	<h2><tmpl_var title></h2>
+</tmpl_if>
+
+<tmpl_if description>
+	<tmpl_var description>
+</tmpl_if>
+
+<p>
+	<tmpl_if user.canPost>
+		<a href="<tmpl_var add.url>">[<tmpl_var add.label>]</a>
+	</tmpl_if>
+	<tmpl_unless user.isVisitor>
+		<tmpl_if user.isSubscribed>
+			<a href="<tmpl_var unsubscribe.url>">[<tmpl_var unsubscribe.label>]</a>
+		<tmpl_else>
+			<a href="<tmpl_var subscribe.url>">[<tmpl_var subscribe.label>]</a>
+		</tmpl_if>
+	</tmpl_unless>
+	<tmpl_if pagination.pageCount.isMultiple>
+		<a href="<tmpl_var search.url>">[<tmpl_var search.label>]</a>
+	</tmpl_if>
+</p>
+
+<ol>
+	<tmpl_loop post_loop>
+		<li>
+			<tmpl_if user.isPoster>
+				<tmpl_unless session.var.adminOn>
+					[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]
+				</tmpl_unless>
+			</tmpl_if>
+			<tmpl_if user.isModerator>
+				<tmpl_if session.var.adminOn>
+					<tmpl_var controls>
+				<tmpl_else>
+					<tmpl_unless user.isPoster>
+						<tmpl_unless session.var.adminOn>
+							[<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>]
+						</tmpl_unless>
+					</tmpl_unless>
+				</tmpl_if>
+				(<a href="<tmpl_var url>"><tmpl_var status></a>)
+			</tmpl_if>
+			<tmpl_if userDefined1><a href="<tmpl_var userDefined1>"	<tmpl_if userDefined2>target="_blank"</tmpl_if>></tmpl_if><tmpl_var title><tmpl_if userDefined1></a></tmpl_if>
+			<tmpl_if content>
+					  - <tmpl_var content>
+			</tmpl_if>
+		</li>
+	</tmpl_loop>
+</ol>
+
+<tmpl_if pagination.pageCount.isMultiple>
+	<div class="pagination">
+		<tmpl_var pagination.previousPage> &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
+	</div>
+</tmpl_if>
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_photo_gallery.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_photo_gallery.tmpl
index f221631d4..7107eda85 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_photo_gallery.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_photo_gallery.tmpl
@@ -1,9 +1,68 @@
 #PBtmpl0000000000000121
-<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>

<tmpl_if session.var.adminOn>
	<p><tmpl_var controls></p>
</tmpl_if>

<tmpl_if displayTitle>
	<h2><tmpl_var title></h2>
</tmpl_if>

<tmpl_if description>
	<tmpl_var description>
</tmpl_if>

<p>
	<tmpl_if user.canPost>
		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
		&#149;
	</tmpl_if>
	<tmpl_unless user.isVisitor>
		<tmpl_if user.isSubscribed>
			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
		<tmpl_else>
			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
		</tmpl_if>
		&#149;
	</tmpl_unless>
	<a href="<tmpl_var search.url>"><tmpl_var search.label></a>
</p>
+<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
 
-^RawHeadTags(<style type="text/css">
.picture {
	padding: 0px;
	margin: 10px;
	float: left;
	width: 150px;
	font-size: 12px;
	height: 100px;
	overflow: hidden;
}
+<tmpl_if session.var.adminOn>
+	<p><tmpl_var controls></p>
+</tmpl_if>
+
+<tmpl_if displayTitle>
+	<h2><tmpl_var title></h2>
+</tmpl_if>
+
+<tmpl_if description>
+	<tmpl_var description>
+</tmpl_if>
+
+<p>
+	<tmpl_if user.canPost>
+		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
+		&#149;
+	</tmpl_if>
+	<tmpl_unless user.isVisitor>
+		<tmpl_if user.isSubscribed>
+			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a>
+		<tmpl_else>
+			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a>
+		</tmpl_if>
+		&#149;
+	</tmpl_unless>
+	<a href="<tmpl_var search.url>"><tmpl_var search.label></a>
+</p>
+
+<br />
+
+<tmpl_loop post_loop>
+	<div class="picture">
+		<div style="text-align: center;">
+			<tmpl_if user.isPoster><div>(<tmpl_var status>)</div></tmpl_if>
+			<div><a href="<tmpl_var url>"><img src="<tmpl_var thumbnail>" alt="<tmpl_var title>" /></a></div>
+			<div><a href="<tmpl_var url>"><tmpl_var title></a></div>
+		</div>
+	</div>
+</tmpl_loop>
+
+<div style="clear: both;"></div>
+
+<tmpl_if pagination.pageCount.isMultiple>
+	<div class="pagination">
+		<tmpl_var pagination.previousPage> &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
+	</div>
+</tmpl_if>
+~~~
+<style type="text/css">
+.picture {
+	padding: 0px;
+	margin: 10px;
+	float: left;
+	width: 150px;
+	font-size: 12px;
+	height: 100px;
+	overflow: hidden;
+}
 
 .picture img
 {
 	border: black solid 0px;
-}
</style>);

<br />

<tmpl_loop post_loop>
	<div class="picture">
		<div style="text-align: center;">
			<tmpl_if user.isPoster><div>(<tmpl_var status>)</div></tmpl_if>
			<div><a href="<tmpl_var url>"><img src="<tmpl_var thumbnail>" alt="<tmpl_var title>" /></a></div>
			<div><a href="<tmpl_var url>"><tmpl_var title></a></div>
		</div>
	</div>
</tmpl_loop>

<div style="clear: both;"></div>

<tmpl_if pagination.pageCount.isMultiple>
	<div class="pagination">
		<tmpl_var pagination.previousPage> &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
	</div>
</tmpl_if>
\ No newline at end of file
+}
+</style>
+
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_right_column.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_right_column.tmpl
index ece82f406..b6fd2f145 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_right_column.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_right_column.tmpl
@@ -5,21 +5,6 @@
 <p><tmpl_var controls></p>
 </tmpl_if>
 
-^RawHeadTags(<style type="text/css">
-.firstColumn {
-  float: left;
-  width: 65%;
-}
-.secondColumn {
-        float: left;
-        width: auto;
-        max-width: 33%;
-}
-.endFloat {
- clear: both;
-}
-</style>);
-
 <tmpl_if displayTitle>
   <h2><tmpl_var title></h2>
 </tmpl_if>
@@ -86,4 +71,20 @@
 	<table><tr id="blank" class="hidden"><td><div><div class="empty">&nbsp;</div></div></td></tr></table>
             <tmpl_var dragger.init>
 </tmpl_if>
+~~~
+<style type="text/css">
+.firstColumn {
+  float: left;
+  width: 65%;
+}
+.secondColumn {
+        float: left;
+        width: auto;
+        max-width: 33%;
+}
+.endFloat {
+ clear: both;
+}
+</style>
+
 
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_side_by_side.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_side_by_side.tmpl
index d5557eca5..f129dbc2a 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_side_by_side.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_side_by_side.tmpl
@@ -5,22 +5,6 @@
 	<p><tmpl_var controls></p>
 </tmpl_if>
 
-^RawHeadTags(<style type="text/css">
-.firstColumn {
-	float: left;
-	width: 50%;
-}
-
-.secondColumn {
-	float: left;
-	width: auto;
-	max-width: 50%;
-}
-
-.endFloat {
-	clear: both;
-}
-</style>);
 
 <tmpl_if displayTitle>
 	<h2><tmpl_var title></h2>
@@ -88,3 +72,21 @@
 	<table><tr id="blank" class="hidden"><td><div><div class="empty">&nbsp;</div></div></td></tr></table>
 	<tmpl_var dragger.init>
 </tmpl_if>
+~~~
+<style type="text/css">
+.firstColumn {
+	float: left;
+	width: 50%;
+}
+
+.secondColumn {
+	float: left;
+	width: auto;
+	max-width: 50%;
+}
+
+.endFloat {
+	clear: both;
+}
+</style>
+
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_three_over_1.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_three_over_1.tmpl
index 2e89d9a37..99aca349d 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_three_over_1.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_three_over_1.tmpl
@@ -5,25 +5,6 @@
 <p><tmpl_var controls></p>
 </tmpl_if>
 
-^RawHeadTags(<style type="text/css">
-.firstColumn {
-  float: left;
-  width: 33%;
-}
-.secondColumn {
-        float: left;
-        width: 33%;
-}
-.thirdColumn {
-        float: left;
-        width: auto;
-        max-width: 33%;
-}
-.endFloat {
- clear: both;
-}
-</style>);
-
 <tmpl_if displayTitle>
   <h2><tmpl_var title></h2>
 </tmpl_if>
@@ -142,3 +123,24 @@
 	<table><tr id="blank" class="hidden"><td><div><div class="empty">&nbsp;</div></div></td></tr></table>
             <tmpl_var dragger.init>
 </tmpl_if>
+~~~
+<style type="text/css">
+.firstColumn {
+  float: left;
+  width: 33%;
+}
+.secondColumn {
+        float: left;
+        width: 33%;
+}
+.thirdColumn {
+        float: left;
+        width: auto;
+        max-width: 33%;
+}
+.endFloat {
+ clear: both;
+}
+</style>
+
+
diff --git a/docs/upgrades/upgrade_6.8.5-6.9.0.pl b/docs/upgrades/upgrade_6.8.5-6.9.0.pl
index 763a1d832..2fa397c57 100644
--- a/docs/upgrades/upgrade_6.8.5-6.9.0.pl
+++ b/docs/upgrades/upgrade_6.8.5-6.9.0.pl
@@ -25,9 +25,64 @@ removeFiles();
 addSearchEngine();
 addEMSTemplates();
 addEMSTables();
+updateTemplates();
 
 finish($session); # this line required
 
+#-------------------------------------------------
+sub updateTemplates {
+        print "\tUpdating base templates for XHTML compliance, and a cleaner look.\n" unless ($quiet);
+	$session->db->write("alter table template add column headBlock text");
+	opendir(DIR,"templates-6.9.0");
+	my @files = readdir(DIR);
+	closedir(DIR);
+	my $importNode = WebGUI::Asset->getImportNode($session);
+	my $folder = $importNode->addChild({
+		className=>"WebGUI::Asset::Wobject::Folder",
+		title => "6.9.0 New Templates",
+		menuTitle => "6.9.0 New Templates",
+		url=> "6_9_0_new_templates",
+		groupIdView=>"12"
+		});
+	$folder->commit;
+	foreach my $file (@files) {
+		next unless ($file =~ /\.tmpl$/);
+		open(FILE,"<templates-6.9.0/".$file);
+		my $first = 1;
+		my $create = 0;
+		my $head = 0;
+		my %properties = (className=>"WebGUI::Asset::Template");
+		while (my $line = <FILE>) {
+			if ($first) {
+				$line =~ m/^\#(.*)$/;
+				$properties{id} = $1;
+				$first = 0;
+			} elsif ($line =~ m/^\#create$/) {
+				$create = 1;
+			} elsif ($line =~ m/^\#(.*):(.*)$/) {
+				$properties{$1} = $2;
+			} elsif ($line =~ m/^~~~$/) {
+				$head = 1;
+			} elsif ($head) {
+				$properties{headBlock} .= $line;
+			} else {
+				$properties{template} .= $line;	
+			}
+		}
+		close(FILE);
+		if ($create) {
+			my $template = $folder->addChild(\%properties, $properties{id});
+			$template->commit;
+		} else {
+			my $template = WebGUI::Asset->new($properties{id}, "WebGUI::Asset::Template");
+			if (defined $template) {
+				my $newRevision = $template->addRevision(\%propertes);
+				$newRevision->commit;
+			}
+		}
+	}
+}
+
 #-------------------------------------------------
 sub addEMSTemplates {
         print "\tAdding Event Management System Templates.\n" unless ($quiet);