diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_sql_report.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_sql_report.tmpl
new file mode 100644
index 000000000..6640b32f5
--- /dev/null
+++ b/docs/upgrades/templates-6.99.0/wgtemplate_default_sql_report.tmpl
@@ -0,0 +1,156 @@
+#PBtmpl0000000000000059
+<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>
+	<p />
+</tmpl_if>
+
+<tmpl_if debugMode>
+	<ul>
+	<tmpl_loop debug_loop>
+		<li><tmpl_var debug.output></li>
+	</tmpl_loop>
+	</ul>
+</tmpl_if>
+
+<table width="100%" cellspacing="0" cellpadding="0" style="border: 1px solid black;">
+<tr>
+<tmpl_loop columns_loop>
+	<td class="tableHeader"><tmpl_var column.name></td>
+</tmpl_loop>
+</tr>
+<tmpl_loop rows_loop>
+	<tr>
+	<tmpl_loop row.field_loop>
+		<td class="tableData"><tmpl_var field.value></td>
+	</tmpl_loop>
+	</tr>
+	<!-- Handle nested query2 -->
+	<tmpl_if hasNest>
+		<tr>
+		<td colspan="<tmpl_var columns.count>">
+		<table width="100%" cellspacing="0" cellpadding="0">
+		<tr>
+		<td width="20">&nbsp;</td>
+		<td>
+		<table width="100%" cellspacing="0" cellpadding="0" style="border: 1px solid black;">
+		<tr>
+		<tmpl_loop query2.columns_loop>
+			<td class="tableHeader"><tmpl_var column.name></td>
+		</tmpl_loop>
+		</tr>
+		<tmpl_loop query2.rows_loop>
+			<tr>
+			<tmpl_loop query2.row.field_loop>
+				<td class="tableData"><tmpl_var field.value></td>
+			</tmpl_loop>
+			</tr>
+			<!-- Handle nested query3 -->
+			<tmpl_if query2.hasNest>
+				<tr>
+				<td colspan="<tmpl_var query2.columns.count>">
+				<table width="100%" cellspacing="0" cellpadding="0">
+				<tr>
+				<td style="width:20px;">&nbsp;</td>
+				<td>
+				<table width="100%" cellspacing="0" cellpadding="0" style="border: 1px solid black;">
+				<tr>
+				<tmpl_loop query3.columns_loop>
+					<td class="tableHeader"><tmpl_var column.name></td>
+				</tmpl_loop>
+				</tr>
+				<tmpl_loop query3.rows_loop>
+					<tr>
+					<tmpl_loop query3.row.field_loop>
+						<td class="tableData"><tmpl_var field.value></td>
+					</tmpl_loop>
+					</tr>
+		   			<!-- Handle nested query4 -->
+					<tmpl_if query3.hasNest>
+						<tr>
+						<td colspan="<tmpl_var query3.columns.count>">
+						<table width="100%" cellspacing="0" cellpadding="0">
+						<tr>
+						<td style="width:20px;">&nbsp;</td>
+						<td>
+						<table width="100%" cellspacing="0" cellpadding="0" style="border: 1px solid black;">
+						<tr>
+						<tmpl_loop query4.columns_loop>
+							<td class="tableHeader"><tmpl_var column.name></td>
+						</tmpl_loop>
+						</tr>
+						<tmpl_loop query4.rows_loop>
+							<tr>
+							<tmpl_loop query4.row.field_loop>
+								<td class="tableData"><tmpl_var field.value></td>
+							</tmpl_loop>
+				   			<!-- Handle nested query5 -->
+							<tmpl_if query4.hasNest>
+								<tr>
+								<td colspan="<tmpl_var query4.columns.count>">
+								<table width="100%" cellspacing="0" cellpadding="0">
+								<tr>
+								<td style="width:20px;">&nbsp;</td>
+								<td>
+								<table width="100%" cellspacing="0" cellpadding="0" style="border: 1px solid black;">
+								<tr>
+								<tmpl_loop query5.columns_loop>
+									<td class="tableHeader"><tmpl_var column.name></td>
+								</tmpl_loop>
+								</tr>
+								<tmpl_loop query5.rows_loop>
+									<tr>
+									<tmpl_loop query5.row.field_loop>
+										<td class="tableData"><tmpl_var field.value></td>
+									</tmpl_loop>
+									</tr>
+								</tmpl_loop>
+								</table>
+								</td>
+								</tr>
+								</table>
+						        	</td>
+				        			</tr>
+							</tmpl_if>
+							</tr>
+						</tmpl_loop>
+						</table>
+						</td>
+						</tr>
+						</table>
+				        	</td>
+				        	</tr>
+					</tmpl_if>
+				</tmpl_loop>
+				</table>
+				</td>
+				</tr>
+				</table>
+			        </td>
+			        </tr>
+			</tmpl_if>
+		</tmpl_loop>
+		</table>
+		</td>
+		</tr>
+		</table>
+		</td>
+		</tr>
+	</tmpl_if>
+</tmpl_loop>
+</table>
+
+<tmpl_if pagination.pageCount.isMultiple>
+	<div class="pagination">
+		<tmpl_var pagination.previousPage> <tmpl_var pagination.pageList.upTo20> <tmpl_var pagination.nextPage>
+	</div>
+</tmpl_if>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_fail_safe.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_fail_safe.tmpl
new file mode 100644
index 000000000..d3d6a4f51
--- /dev/null
+++ b/docs/upgrades/templates-6.99.0/wgtemplate_fail_safe.tmpl
@@ -0,0 +1,59 @@
+#PBtmpl0000000000000060
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>^Page("title"); - WebGUI</title>
+	<tmpl_var head.tags>
+</head>
+<body>
+	^AdminBar;
+	<div class="topwrapper">
+
+	<div class="menu">
+		^AssetProxy(flexmenu);
+	</div>
+
+	<div class="contentArea">
+		<tmpl_var body.content>
+		<br />
+		<br />
+		<hr />
+		^LoginToggle; &nbsp; ^a(^@;); &nbsp; ^H; &nbsp; ^AdminToggle;
+	</div>
+
+	</div>
+
+</body>
+</html>
+~~~
+<style type="text/css">
+
+div.topwrapper {
+	position: relative;
+}
+
+.menu {
+	position: absolute;
+	top: 25px;
+	left: 10px;
+	width: 180px;
+	font-family: helvetica, arial;
+	font-size: 12px;
+}
+
+.contentArea {
+	border: 1px solid #cccccc;
+	margin: 25px 10px 10px 190px;
+	padding: 5px;
+	font-family: helvetica, arial;
+	min-height: 400px;
+}
+
+/* Hides from non-ie: the holly hack \*/
+* html .adminConsoleWorkArea {
+	zoom: 1.00;
+	display: inline;
+}
+/* End hide from non-ie */
+
+	</style>
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_make_page_printable.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_make_page_printable.tmpl
new file mode 100644
index 000000000..796e4d497
--- /dev/null
+++ b/docs/upgrades/templates-6.99.0/wgtemplate_make_page_printable.tmpl
@@ -0,0 +1,106 @@
+#PBtmpl0000000000000111
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+		<html>
+		<head>
+			<title>^Page(title); - <tmpl_var session.setting.companyName></title>
+				
+	<link rel="icon" href="^Extras;favicon.png" type="image/png" />
+	<link rel="SHORTCUT ICON" href="^Extras;favicon.ico" />
+	<tmpl_var head.tags>
+	
+		<style type="text/css">
+
+.content{
+  background-color: #ffffff;
+  color: #000000;
+  font-family: helvetica, arial;
+  font-size: 10pt;
+  padding: 10pt;
+}
+
+H1 {
+  font-family: helvetica, arial;
+  font-size: 16pt;
+}
+
+A {
+  color: #EF4200;
+}
+
+.pagination {
+  font-family: helvetica, arial;
+  font-size: 8pt;
+  text-align: center;
+}
+
+.formDescription {
+  font-family: helvetica, arial;
+  font-size: 10pt;
+  font-weight: bold;
+}
+
+.formSubtext {
+  font-family: helvetica, arial;
+  font-size: 8pt;
+}
+
+.highlight {
+  background-color: #dddddd;
+}
+
+.tableMenu {
+  background-color: #cccccc;
+  font-size: 8pt;
+  font-family: Helvetica, Arial;
+}
+
+.tableMenu a {
+  text-decoration: none;
+}
+
+.tableHeader {
+  background-color: #cccccc;
+  font-size: 10pt;
+  font-family: Helvetica, Arial;
+}
+
+.tableData {
+  font-size: 10pt;
+  font-family: Helvetica, Arial;
+}
+
+.pollAnswer {
+  font-family: Helvetica, Arial;
+  font-size: 8pt;
+}
+
+.pollColor {
+  background-color: #444444;
+}
+
+.pollQuestion {
+  font-face: Helvetica, Arial;
+  font-weight: bold;
+}
+
+.faqQuestion {
+  font-size: 12pt;
+  font-weight: bold;
+  color: #000000;
+}
+
+</style>
+		</head>
+		^AdminBar("");
+
+<body onload="window.print()">
+<div style="text-align:center;"><a href="^PageUrl;"><img src="^Extras;plainblack.gif" style="border-style:none;" alt="" /></a></div>
+
+<div>
+			<tmpl_var body.content>
+</div>		
+
+<div style="text-align:center;">? 2001-2004 Plain Black LLC</div>
+</body>
+		</html>
+		
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_style_admin_console.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_style_admin_console.tmpl
new file mode 100644
index 000000000..4d8a5e078
--- /dev/null
+++ b/docs/upgrades/templates-6.99.0/wgtemplate_style_admin_console.tmpl
@@ -0,0 +1,13 @@
+#PBtmpl0000000000000137
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>WebGUI <tmpl_var session.webgui.version>-<tmpl_var session.webgui.status> Admin Console</title>
+	<link rel="icon" href="^Extras;favicon.png" type="image/png" />
+	<link rel="shortcut icon" href="^Extras;favicon.ico" />
+	<tmpl_var head.tags>
+</head>
+<body>
+	<tmpl_var body.content>
+</body>
+</html>