diff --git a/docs/upgrades/templates-6.99.1/wgtemplate_bug_tracker_post.tmpl b/docs/upgrades/templates-6.99.1/wgtemplate_bug_tracker_post.tmpl
new file mode 100644
index 000000000..c1c04f7ef
--- /dev/null
+++ b/docs/upgrades/templates-6.99.1/wgtemplate_bug_tracker_post.tmpl
@@ -0,0 +1,349 @@
+#3OFMIKHCK_NkREwLDGfCjw
+<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a> 
+
+<tmpl_if session.var.adminOn> 
+	<p><tmpl_var controls></p>
+</tmpl_if>
+
+<h2><tmpl_var title></h2>
+
+<div class="defaultSubmissionDetails">
+	<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 />
+	<b><tmpl_var severity.label>:</b> <tmpl_var userDefined1><br />
+	<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> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
+		</tmpl_unless>
+		<br />
+	<tmpl_if user.isModerator>
+		<b><tmpl_var status.label>:</b> <tmpl_if isArchived><tmpl_var closed.label> &nbsp; &nbsp; [ <a href="<tmpl_var unarchive.url>"><tmpl_var open.label></a> <tmpl_else> <tmpl_var open.label> &nbsp; &nbsp; [ <a href="<tmpl_var archive.url>"><tmpl_var close.label></a></tmpl_if> ]<br />
+	<tmpl_else>	
+		<tmpl_if user.isPoster>
+			<b><tmpl_var status.label>:</b> <tmpl_if isArchived><tmpl_var closed.label> <tmpl_else> <tmpl_var open.label></tmpl_if><br />
+		</tmpl_if>	
+	</tmpl_if>	
+<tmpl_if karmaIsEnabled>
+	<b><tmpl_var karmaRank.label>:</b> <tmpl_var karmaRank><br />
+<b><tmpl_var transferkarma.label>:</b>
+<tmpl_var transfer.karma.form>
+</tmpl_if>	
+</div>
+
+<div class="collaborationThreadContent">
+<p><b><tmpl_var userDefined2> <tmpl_var userDefined3></b></p>
+	<tmpl_var content>
+</div>
+
+<tmpl_if attachment_loop>
+	<br />
+		<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>
+	<br />
+</tmpl_if>
+
+
+
+<tmpl_unless isLocked>
+	<div class="postControls">
+		<tmpl_if user.canReply>
+			<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
+			&bull;
+		</tmpl_if>
+		<tmpl_if user.canEdit>
+			<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
+			&bull;
+			<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
+		</tmpl_if>
+	</div>
+</tmpl_unless>
+
+<div style="clear:both;"></div>
+
+<tmpl_if repliesAllowed>
+	<div style="float: left; width: 70%">
+		<h2><tmpl_var replies.label></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>
+			<tmpl_unless isThreadRoot>
+				<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">	
+						<table cellpadding="0" cellspacing="0">
+						<tbody>
+						<tr>
+							<td style="width:50%;text-align:left;">
+								<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>
+							</td>
+							<td style="width:50%;text-align:left;">
+								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
+								<tmpl_unless hasRated>
+								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
+								</tmpl_unless>														
+							</td>
+						</tr>
+						</table>
+					</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>
+								&bull;
+							</tmpl_if>
+							<tmpl_if user.canEdit>
+								<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
+								&bull;
+								<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
+							</tmpl_if>
+						</div>
+					</tmpl_unless>
+				</div>
+			</tmpl_unless>
+		</tmpl_loop>
+	<!-- end flat layout -->
+	</tmpl_if>
+	
+	<tmpl_if layout.isNested>
+	<!-- begin nested layout -->
+		<tmpl_loop post_loop>
+			<tmpl_unless isThreadRoot>
+				<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">
+						<table cellpadding="0" cellspacing="0">
+						<tbody>
+						<tr>
+							<td style="width:50%;text-align:left;">
+								<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>
+							</td>
+							<td style="width:50%;text-align:left;">
+								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
+								<tmpl_unless hasRated>
+								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
+								</tmpl_unless>														
+							</td>
+						</tr>
+						</table>
+						</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>" style="border-style:none;" alt="<tmpl_var filename>" /><tmpl_else><img src="<tmpl_var icon>" style="border-style:none;vertical-align:middle;" alt="<tmpl_var filename>" /> <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>
+									&bull;
+								</tmpl_if>
+								<tmpl_if user.canEdit>
+									<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
+									&bull;
+									<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
+								</tmpl_if><br />
+							</div>
+						</tmpl_unless>
+					</div>
+				</div>
+			</tmpl_unless>
+		</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>
+</tmpl_if>	
+
+<div class="postControls">
+	<tmpl_if previous.url>
+		<a href="<tmpl_var previous.url>"><tmpl_var previous.label></a> 
+		&bull;
+	</tmpl_if>	
+	<a href="<tmpl_var collaboration.url>"><tmpl_var back.label></a>
+	
+	<tmpl_if next.url>
+		&bull;
+		<a href="<tmpl_var next.url>"><tmpl_var next.label></a>				
+	</tmpl_if>	
+	<tmpl_if user.canPost>
+		&bull;
+		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
+		&bull;
+	</tmpl_if>
+	<tmpl_if user.isModerator>
+		<tmpl_if isSticky>
+			<a href="<tmpl_var unstick.url>"><tmpl_var unstick.label></a>
+			&bull;
+		<tmpl_else>
+			<a href="<tmpl_var stick.url>"><tmpl_var stick.label></a>
+			&bull;
+		</tmpl_if>
+		<tmpl_if isLocked>
+			<a href="<tmpl_var unlock.url>"><tmpl_var unlock.label></a>
+			&bull;
+		<tmpl_else>
+			<a href="<tmpl_var lock.url>"><tmpl_var lock.label></a>
+			&bull;
+		</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>
+	<br />
+</div>
+
+~~~
+<style type="text/css">
+.defaultSubmissionDetails
+{
+	float: right; 		
+	padding: 2px; 
+	margin: 2px;
+	font-size:9pt;
+	font-family:arial;
+	margin-bottom:20px;
+}
+
+.defaultSubmissionDetails a
+{
+	color:#29587E;
+}
+
+.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;
+	font-family:arial;
+}
+.postData {
+	border-bottom: 1px solid #cccccc;
+	background-color: #eeeeee;
+	padding: 3px;
+}
+.postData td {
+	font-size: 9pt;
+	color: black;
+	font-family:arial;
+}
+.postControls {
+	border-top: 1px solid #cccccc;
+	background-color: #eeeeee;
+	color: black;
+	padding: 3px;
+	font-family:arial;
+	clear:both;
+	width:100%;
+display:block;
+	-moz-box-sizing:border-box;
+}
+.postMessage {
+	padding: 3px;
+}
+.currentThread {
+	background-color: #eeeeee;
+}
+.threadHead {
+	font-weight: bold;
+	border-bottom: 1px solid #cccccc;
+	font-size: 9pt;
+	background-color: #eeeeee;
+	color: black;
+	padding: 3px;
+	font-family:arial;
+}
+.threadData {
+	font-size: 11px;
+	padding: 3px;
+	font-family:arial;
+}
+
+.postControls
+{
+	background:#C0C0C0;
+	display:block;
+	text-align:right;
+	padding:3px;
+	font-size:9pt;
+	font-family:arial;
+	margin-top: 1px;	
+}
+
+.postControls a
+{
+	color:white;
+}
+
+.collaborationThreadContent
+{
+	font-family:arial;
+	font-size:9pt;
+}
+
+</style>
diff --git a/docs/upgrades/templates-6.99.1/wgtemplate_default_forum_notification.tmpl b/docs/upgrades/templates-6.99.1/wgtemplate_default_forum_notification.tmpl
new file mode 100644
index 000000000..3227b4468
--- /dev/null
+++ b/docs/upgrades/templates-6.99.1/wgtemplate_default_forum_notification.tmpl
@@ -0,0 +1,17 @@
+#PBtmpl0000000000000027
+<table border="0" cellpadding="3">
+<tbody>
+<tr>
+	<td><i><tmpl_var notify.subscription.message></i></td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td bgcolor="#DFDFDF" style="background-color:#DFDFDF;"><a href="<tmpl_var url>"><b><tmpl_var url></a></b></td>
+</tr>
+<tr>
+	<td bgcolor="#F0F0F0" style="background-color:#F0F0F0;"><tmpl_var content></td>
+</tr>
+</tbody>
+</table>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.1/wgtemplate_default_submission.tmpl b/docs/upgrades/templates-6.99.1/wgtemplate_default_submission.tmpl
new file mode 100644
index 000000000..8020a6fda
--- /dev/null
+++ b/docs/upgrades/templates-6.99.1/wgtemplate_default_submission.tmpl
@@ -0,0 +1,346 @@
+#PBtmpl0000000000000067
+<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a> 
+
+<tmpl_if session.var.adminOn> 
+	<p><tmpl_var controls></p>
+</tmpl_if>
+
+<h2><tmpl_var title></h2>
+
+<div class="defaultSubmissionDetails">
+	<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 />
+	<b><tmpl_var severity.label>:</b> <tmpl_var userDefined1><br />
+	<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> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
+		</tmpl_unless>
+		<br />
+	<tmpl_if user.isModerator>
+		<b><tmpl_var status.label>:</b> <tmpl_if isArchived><tmpl_var closed.label> &nbsp; &nbsp; [ <a href="<tmpl_var unarchive.url>"><tmpl_var open.label></a> <tmpl_else> <tmpl_var open.label> &nbsp; &nbsp; [ <a href="<tmpl_var archive.url>"><tmpl_var close.label></a></tmpl_if> ]<br />
+	<tmpl_else>	
+		<tmpl_if user.isPoster>
+			<b><tmpl_var status.label>:</b> <tmpl_if isArchived><tmpl_var closed.label> <tmpl_else> <tmpl_var open.label></tmpl_if><br />
+		</tmpl_if>	
+	</tmpl_if>	
+<tmpl_if karmaIsEnabled>
+	<b><tmpl_var karmaRank.label>:</b> <tmpl_var karmaRank><br />
+<b><tmpl_var transferkarma.label>:</b>
+<tmpl_var transfer.karma.form>
+</tmpl_if>	
+</div>
+
+<div class="collaborationThreadContent">
+<p><b><tmpl_var userDefined2> <tmpl_var userDefined3></b></p>
+	<tmpl_var content>
+</div>
+
+<tmpl_if attachment_loop>
+	<br />
+		<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>
+	<br />
+</tmpl_if>
+
+
+
+<tmpl_unless isLocked>
+	<div class="postControls">
+		<tmpl_if user.canReply>
+			<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
+			&bull;
+		</tmpl_if>
+		<tmpl_if user.canEdit>
+			<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
+			&bull;
+			<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
+		</tmpl_if>
+	</div>
+</tmpl_unless>
+
+<div style="clear:both;"></div>
+
+<tmpl_if repliesAllowed>
+	<div style="float: left; width: 70%">
+		<h2><tmpl_var replies.label></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>
+			<tmpl_unless isThreadRoot>
+				<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">	
+						<table cellpadding="0" cellspacing="0">
+						<tbody>
+						<tr>
+							<td style="width:50%;text-align:left;">
+								<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>
+							</td>
+							<td style="width:50%;text-align:left;">
+								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
+								<tmpl_unless hasRated>
+								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
+								</tmpl_unless>														
+							</td>
+						</tr>
+						</table>
+					</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>
+								&bull;
+							</tmpl_if>
+							<tmpl_if user.canEdit>
+								<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
+								&bull;
+								<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
+							</tmpl_if>
+						</div>
+					</tmpl_unless>
+				</div>
+			</tmpl_unless>
+		</tmpl_loop>
+	<!-- end flat layout -->
+	</tmpl_if>
+	
+	<tmpl_if layout.isNested>
+	<!-- begin nested layout -->
+		<tmpl_loop post_loop>
+			<tmpl_unless isThreadRoot>
+				<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">
+						<table cellpadding="0" cellspacing="0">
+						<tbody>
+						<tr>
+							<td style="width:50%;text-align:left;">
+								<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>
+							</td>
+							<td style="width:50%;text-align:left;">
+								<b><tmpl_var rating.label>:</b> <tmpl_var rating>
+								<tmpl_unless hasRated>
+								&nbsp; &nbsp;<tmpl_var rate.label> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
+								</tmpl_unless>														
+							</td>
+						</tr>
+						</table>
+						</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>
+									&bull;
+								</tmpl_if>
+								<tmpl_if user.canEdit>
+									<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
+									&bull;
+									<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
+								</tmpl_if><br />
+							</div>
+						</tmpl_unless>
+					</div>
+				</div>
+			</tmpl_unless>
+		</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>
+</tmpl_if>	
+
+<div class="postControls">
+	<tmpl_if previous.url>
+		<a href="<tmpl_var previous.url>"><tmpl_var previous.label></a> 
+		&bull;
+	</tmpl_if>	
+	<a href="<tmpl_var collaboration.url>"><tmpl_var back.label></a>
+	
+	<tmpl_if next.url>
+		&bull;
+		<a href="<tmpl_var next.url>"><tmpl_var next.label></a>				
+	</tmpl_if>	
+	<tmpl_if user.canPost>
+		&bull;
+		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
+		&bull;
+	</tmpl_if>
+	<tmpl_if user.isModerator>
+		<tmpl_if isSticky>
+			<a href="<tmpl_var unstick.url>"><tmpl_var unstick.label></a>
+			&bull;
+		<tmpl_else>
+			<a href="<tmpl_var stick.url>"><tmpl_var stick.label></a>
+			&bull;
+		</tmpl_if>
+		<tmpl_if isLocked>
+			<a href="<tmpl_var unlock.url>"><tmpl_var unlock.label></a>
+			&bull;
+		<tmpl_else>
+			<a href="<tmpl_var lock.url>"><tmpl_var lock.label></a>
+			&bull;
+		</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>
+	<br />
+</div>
+~~~
+<style type="text/css">
+.defaultSubmissionDetails
+{
+	float: right; 		
+	padding: 2px; 
+	margin: 2px;
+	font-size:9pt;
+	font-family:arial;
+	margin-bottom:20px;
+}
+
+.defaultSubmissionDetails a
+{
+	color:#29587E;
+}
+
+.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;
+	font-family:arial;
+}
+.postData td {
+	border-bottom: 1px solid #cccccc;
+	font-size: 9pt;
+	background-color: #eeeeee;
+	color: black;
+	padding: 3px;
+	font-family:arial;
+}
+.postControls {
+	border-top: 1px solid #cccccc;
+	background-color: #eeeeee;
+	color: black;
+	padding: 3px;
+	font-family:arial;
+	clear:both;
+	width:100%;
+display:block;
+	-moz-box-sizing:border-box;
+}
+.postMessage {
+	padding: 3px;
+}
+.currentThread {
+	background-color: #eeeeee;
+}
+.threadHead {
+	font-weight: bold;
+	border-bottom: 1px solid #cccccc;
+	font-size: 9pt;
+	background-color: #eeeeee;
+	color: black;
+	padding: 3px;
+	font-family:arial;
+}
+.threadData {
+	font-size: 11px;
+	padding: 3px;
+	font-family:arial;
+}
+
+.postControls
+{
+	background:#C0C0C0;
+	display:block;
+	text-align:right;
+	padding:3px;
+	font-size:9pt;
+	font-family:arial;
+	margin-top: 1px;	
+}
+
+.postControls a
+{
+	color:white;
+}
+
+.collaborationThreadContent
+{
+	font-family:arial;
+	font-size:9pt;
+}
+
+</style>
diff --git a/docs/upgrades/templates-6.99.1/wgtemplate_default_thread.tmpl b/docs/upgrades/templates-6.99.1/wgtemplate_default_thread.tmpl
new file mode 100644
index 000000000..c9fd39f52
--- /dev/null
+++ b/docs/upgrades/templates-6.99.1/wgtemplate_default_thread.tmpl
@@ -0,0 +1,232 @@
+#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>
+
+	
+<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> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
+						</tmpl_unless>
+						<br />
+					<tmpl_if user.isModerator>
+		<b><tmpl_var status.label>:</b> <tmpl_var status> &nbsp; &nbsp; [ <tmpl_if isArchived><a href="<tmpl_var unarchive.url>"><tmpl_var unarchive.label></a> <tmpl_else> <a href="<tmpl_var archive.url>"><tmpl_var archive.label></a></tmpl_if> ]<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> &bull; 
+					</tmpl_if>
+					<tmpl_if user.canEdit>
+						<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a> &bull; 
+						<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> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
+							</tmpl_unless>
+							<br />
+							<tmpl_if user.isPoster>
+								<b><tmpl_var status.label>:</b> <tmpl_var status><br />
+							</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> &bull;
+						</tmpl_if>
+						<tmpl_if user.canEdit>
+							<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a> &bull; 
+							<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;" class="bottomControls">
+	<tmpl_if previous.url>
+		<a href="<tmpl_var previous.url>"><tmpl_var previous.label></a> &bull;
+	</tmpl_if>	
+	<tmpl_if next.url>
+		<a href="<tmpl_var next.url>"><tmpl_var next.label></a> &bull; 
+	</tmpl_if>	
+	<tmpl_if user.canPost>
+		<a href="<tmpl_var add.url>"><tmpl_var add.label></a> &bull;
+	</tmpl_if>
+	<tmpl_if user.isModerator>
+		<tmpl_if isSticky>
+			<a href="<tmpl_var unstick.url>"><tmpl_var unstick.label></a> &bull;
+		<tmpl_else>
+			<a href="<tmpl_var stick.url>"><tmpl_var stick.label></a> &bull;
+		</tmpl_if>
+		<tmpl_if isLocked>
+			<a href="<tmpl_var unlock.url>"><tmpl_var unlock.label></a> &bull;
+		<tmpl_else>
+			<a href="<tmpl_var lock.url>"><tmpl_var lock.label></a> &bull;
+		</tmpl_if>
+	</tmpl_if>
+	<tmpl_unless user.isVisitor>
+		<tmpl_if user.isSubscribed>
+			<a href="<tmpl_var unsubscribe.url>"><tmpl_var unsubscribe.label></a> &bull;
+		<tmpl_else>
+			<a href="<tmpl_var subscribe.url>"><tmpl_var subscribe.label></a> &bull;
+		</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: #C0C0C0;
+		color: black;
+		padding: 3px;
+		text-align:right;
+	}
+	.postControls a:visited, .postControls a:link {
+		color:white;
+	}
+	.bottomControls {
+		background-color:#C0C0C0;
+		padding: 3px;
+		text-align:right;
+	}
+	.bottomControls a:link, .bottomControls a:visited {
+		color:white;
+	}	
+	.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.99.1/wgtemplate_job.tmpl b/docs/upgrades/templates-6.99.1/wgtemplate_job.tmpl
new file mode 100644
index 000000000..a2ad48852
--- /dev/null
+++ b/docs/upgrades/templates-6.99.1/wgtemplate_job.tmpl
@@ -0,0 +1,324 @@
+#PBtmpl0000000000000098
+<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a> 
+
+<tmpl_if session.var.adminOn> 
+	<p><tmpl_var controls></p>
+</tmpl_if>
+
+<h2><tmpl_var title></h2>
+
+<tmpl_if user.isModerator>
+	<div style="float: right; font-size: 11px; border: 1px solid #cccccc; padding: 2px; margin: 2px;">
+		<b><tmpl_var status.label>:</b> <tmpl_var status> &nbsp; &nbsp; [ <tmpl_if isArchived><a href="<tmpl_var unarchive.url>"><tmpl_var unarchive.label></a> <tmpl_else> <a href="<tmpl_var archive.url>"><tmpl_var archive.label></a></tmpl_if> ]<br />
+	</div>
+</tmpl_if>	
+
+<tmpl_if content>
+	<b>Job Description</b><br />
+	<p><tmpl_var content></p>
+</tmpl_if>
+
+<tmpl_if userDefined3>
+	<b>Job Requirements</b><br />
+	<p><tmpl_var userDefined3></p>
+</tmpl_if>
+
+<table width="100%">
+<tr>
+	<td class="tableHeader">Date Posted</td>
+	<td class="tableData"><tmpl_var dateSubmitted.human>&#160;</td>
+</tr>
+<tr>
+	<td class="tableHeader">Location</td>
+	<td class="tableData"><tmpl_var userDefined2>&#160;</td>
+</tr>
+<tr>
+	<td class="tableHeader">Compensation</td>
+	<td class="tableData"><tmpl_var userDefined1>&#160;</td>
+</tr>
+<tr>
+	<td class="tableHeader">Views</td>
+	<td class="tableData"><tmpl_var views>&#160;</td>
+</tr>
+</table>
+
+<tmpl_if attachment_loop>
+	<br />
+		<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>
+	<br />
+</tmpl_if>
+
+<tmpl_unless isLocked>
+	<div class="postControls">
+		<tmpl_if user.canReply>
+			<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
+			&bull;
+		</tmpl_if>
+		<tmpl_if user.canEdit>
+			<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
+			&bull;
+			<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
+		</tmpl_if>
+	</div>
+</tmpl_unless>
+
+<tmpl_if repliesAllowed>
+
+	<div style="float: left; width: 70%">
+		<h2><tmpl_var replies.label></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>
+			<tmpl_unless isThreadRoot>
+				<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> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
+								</tmpl_unless>
+								<br />
+								<tmpl_if user.isPoster>
+									<b><tmpl_var status.label>:</b> <tmpl_var status><br />
+								</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>
+								&bull;
+							</tmpl_if>
+							<tmpl_if user.canEdit>
+								<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
+								&bull;
+								<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
+							</tmpl_if>
+						</div>
+					</tmpl_unless>
+				</div>
+			</tmpl_unless>
+		</tmpl_loop>
+	<!-- end flat layout -->
+	</tmpl_if>
+	
+	<tmpl_if layout.isNested>
+	<!-- begin nested layout -->
+		<tmpl_loop post_loop>
+			<tmpl_unless isThreadRoot>
+				<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> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
+									</tmpl_unless>
+									<br />
+									<tmpl_if user.isPoster>
+										<b><tmpl_var status.label>:</b> <tmpl_var status><br />
+									</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>
+									&bull;
+								</tmpl_if>
+								<tmpl_if user.canEdit>
+									<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
+									&bull;
+									<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
+								</tmpl_if>
+							</div>
+						</tmpl_unless>
+					</div>
+				</div>
+			</tmpl_unless>
+		</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>
+</tmpl_if>	
+
+<div class="postControls">
+	<tmpl_if previous.url>
+		<a href="<tmpl_var previous.url>"><tmpl_var previous.label></a> 
+		&bull;
+	</tmpl_if>	
+	<a href="<tmpl_var collaboration.url>"><tmpl_var back.label></a>	
+	<tmpl_if next.url>
+		&bull;
+		<a href="<tmpl_var next.url>"><tmpl_var next.label></a> 
+	</tmpl_if>	
+	<tmpl_if user.canPost>
+		&bull;
+		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
+		&bull;
+	</tmpl_if>
+	<tmpl_if user.isModerator>
+		<tmpl_if isSticky>
+			<a href="<tmpl_var unstick.url>"><tmpl_var unstick.label></a>
+			&bull;
+		<tmpl_else>
+			<a href="<tmpl_var stick.url>"><tmpl_var stick.label></a>
+			&bull;
+		</tmpl_if>
+		<tmpl_if isLocked>
+			<a href="<tmpl_var unlock.url>"><tmpl_var unlock.label></a>
+			&bull;
+		<tmpl_else>
+			<a href="<tmpl_var lock.url>"><tmpl_var lock.label></a>
+			&bull;
+		</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;
+	font-family:arial;
+	font-size:9pt;
+}
+.postData {
+	border-bottom: 1px solid #cccccc;
+	font-family:arial;
+	font-size:9pt;
+	background-color: #eeeeee;
+	color: black;
+	padding: 3px;
+}
+.postControls
+{
+	background:#C0C0C0;
+	display:block;
+	text-align:right;
+	padding:3px;
+	font-size:9pt;
+	font-family:arial;
+	margin-top: 1px;	
+}
+.postControls a:link, .postControls a:visited
+{
+	color:white;
+}
+.postMessage {
+	padding: 3px;
+}
+.currentThread {
+	background-color: #eeeeee;
+}
+.threadHead {
+	font-weight: bold;
+	border-bottom: 1px solid #cccccc;
+	font-family:arial;
+	font-size:9pt;
+	background-color: #eeeeee;
+	color: black;
+	padding: 3px;
+}
+.threadData {
+	font-family:arial;
+	font-size:9pt;
+	padding: 3px;
+}
+
+.tableHeader
+{
+	width:20%;
+	background-color:#DADADA;
+	font-family:arial;
+	font-size:9pt;	
+}
+
+.tableData
+{
+	width:80%;
+	border:solid #DADADA 1px;
+	font-family:arial;
+	font-size:9pt;	
+}
+
+</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.1/wgtemplate_link.tmpl b/docs/upgrades/templates-6.99.1/wgtemplate_link.tmpl
new file mode 100644
index 000000000..15bf17549
--- /dev/null
+++ b/docs/upgrades/templates-6.99.1/wgtemplate_link.tmpl
@@ -0,0 +1,307 @@
+#PBtmpl0000000000000113
+<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a> 
+
+<tmpl_if session.var.adminOn> 
+	<p><tmpl_var controls></p>
+</tmpl_if>
+
+<h2><tmpl_var title></h2>
+
+<tmpl_if user.isModerator>
+	<div style="float: right; font-size: 11px; border: 1px solid #cccccc; padding: 2px; margin: 2px;">
+		<b><tmpl_var status.label>:</b> <tmpl_var status> &nbsp; &nbsp; [ <tmpl_if isArchived><a href="<tmpl_var unarchive.url>"><tmpl_var unarchive.label></a> <tmpl_else> <a href="<tmpl_var archive.url>"><tmpl_var archive.label></a></tmpl_if> ]<br />
+	</div>
+</tmpl_if>	
+
+<tmpl_if content>
+	<div class="linkContent">
+	<b>Link Description</b><br /><br />
+	<tmpl_var content><br />
+	
+	<b>Link URL</b><br /><br />
+	<a href="<tmpl_var userDefined1>"><tmpl_var userDefined1></a><br /><br />
+	</div>
+</tmpl_if>
+
+
+
+<tmpl_if attachment_loop>
+	<br />
+		<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>
+	<br />
+</tmpl_if>
+
+<tmpl_unless isLocked>
+	<div class="postControls">
+		<tmpl_if user.canReply>
+			<a href="<tmpl_var reply.url>"><tmpl_var reply.label></a>
+			&bull;
+		</tmpl_if>
+		<tmpl_if user.canEdit>
+			<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a>
+			&bull;
+			<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
+		</tmpl_if>
+	</div>
+</tmpl_unless>
+
+<tmpl_if repliesAllowed>
+
+	<div style="float: left; width: 70%">
+		<h2><tmpl_var replies.label></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>
+			<tmpl_unless isThreadRoot>
+				<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
+					<a name="id<tmpl_var assetId>" id="id<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> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
+								</tmpl_unless>
+								<br />
+								<tmpl_if user.isPoster>
+									<b><tmpl_var status.label>:</b> <tmpl_var status><br />
+								</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> &bull; 
+							</tmpl_if>
+							<tmpl_if user.canEdit>
+								<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a> &bull;
+								<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
+							</tmpl_if>
+						</div>
+					</tmpl_unless>
+				</div>
+			</tmpl_unless>
+		</tmpl_loop>
+	<!-- end flat layout -->
+	</tmpl_if>
+	
+	<tmpl_if layout.isNested>
+	<!-- begin nested layout -->
+		<tmpl_loop post_loop>
+			<tmpl_unless isThreadRoot>
+				<div style="margin-left: <tmpl_var depthX10>px;">
+					<div class="postBorder<tmpl_if isCurrent>Current</tmpl_if>">
+						<a name="id<tmpl_var assetId>" id="id<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> [ <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsUp>"><img src="<tmpl_var thumbsUp.icon.url>" alt="+" style="border: 0px;vertical-align:middle;" /></a></p> | <p style="display:inline;vertical-align:middle;"><a href="<tmpl_var rate.url.thumbsDown>"><img src="<tmpl_var thumbsDown.icon.url>" alt="-" style="border: 0px;vertical-align:middle;" /></a></p> ]
+									</tmpl_unless>
+									<br />
+									<tmpl_if user.isPoster>
+										<b><tmpl_var status.label>:</b> <tmpl_var status><br />
+									</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> &bull;
+								</tmpl_if>
+								<tmpl_if user.canEdit>
+									<a href="<tmpl_var edit.url>"><tmpl_var edit.label></a> &bull; 
+									<a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
+								</tmpl_if>
+							</div>
+						</tmpl_unless>
+					</div>
+				</div>
+			</tmpl_unless>
+		</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>
+</tmpl_if>	
+
+<div class="postControls">
+	<tmpl_if previous.url>
+		<a href="<tmpl_var previous.url>"><tmpl_var previous.label></a> 
+		&bull;
+	</tmpl_if>	
+	<a href="<tmpl_var collaboration.url>">List All Links</a>
+	<tmpl_if next.url>
+		&bull;
+		<a href="<tmpl_var next.url>"><tmpl_var next.label></a> 
+	</tmpl_if>	
+	<tmpl_if user.canPost>
+		&bull;
+		<a href="<tmpl_var add.url>"><tmpl_var add.label></a>
+	</tmpl_if>
+	<tmpl_if user.isModerator>
+		&bull;
+		<tmpl_if isSticky>
+			<a href="<tmpl_var unstick.url>"><tmpl_var unstick.label></a>
+			&bull;
+		<tmpl_else>
+			<a href="<tmpl_var stick.url>"><tmpl_var stick.label></a>
+			&bull;
+		</tmpl_if>
+		<tmpl_if isLocked>
+			<a href="<tmpl_var unlock.url>"><tmpl_var unlock.label></a>
+			&bull;
+		<tmpl_else>
+			<a href="<tmpl_var lock.url>"><tmpl_var lock.label></a>
+			&bull;
+		</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;
+	font-family:arial;
+	font-size:9pt;
+	padding: 3px;
+}
+.postData {
+	border-bottom: 1px solid #cccccc;
+	font-family:arial;
+	font-size:9pt;
+	background-color: #eeeeee;
+	color: black;
+	padding: 3px;
+}
+.postControls
+{
+	background:#C0C0C0;
+	display:block;
+	text-align:right;
+	padding:3px;
+	font-size:9pt;
+	font-family:arial;
+	margin-top: 1px;	
+}
+.postControls a:link, .postControls a:visited
+{
+	color:white;
+}
+.postMessage {
+	padding: 3px;
+}
+.currentThread {
+	background-color: #eeeeee;
+}
+.threadHead {
+	font-weight: bold;
+	border-bottom: 1px solid #cccccc;
+	font-family:arial;
+	font-size:9pt;
+	background-color: #eeeeee;
+	color: black;
+	padding: 3px;
+}
+.threadData {
+	font-family:arial;
+	font-size:9pt;
+	padding: 3px;
+}
+
+.linkContent
+{
+	font-family:arial;
+	font-size:9pt;
+}
+
+.linkContent a
+{
+	color:#29587E;
+}
+
+
+h2
+{
+	font-family:arial;
+}
+
+
+</style>
+
+