diff --git a/sponsor_incl.html b/sponsor_incl.html
index a2f87e8..2ba5cd9 100644
--- a/sponsor_incl.html
+++ b/sponsor_incl.html
@@ -1,44 +1,38 @@
-<center>
-QuakeForge would like to thank these sponsors for their contributions to our
-project:
-<br>
-<TABLE BORDER=0>
-<TR>
-<TD ALIGN=CENTER>
-<a href="http://www.idsoftware.com/"><img src="images/id.png" border=0 alt="id Software" width=70 height=80></a>
-</TD>
-<TD ALIGN=CENTER>
-<a href="http://www.sourceforge.net"><img src="images/sflogo.png" border=0 alt="SourceForge"></a>
-<BR>
-<a href="http://www.planetquake.com/aftershock/"><img src="images/aftershock_logo.png" border=0 alt="Aftershock"></a>
-</TD>
-<TD ALIGN=CENTER>
-<a href="http://www.valinux.com/"><img src="images/valinux2.png" border=0 alt="VA Linux"></a>
-<BR>
-<a href="http://www.matrox.com/"><img src="images/matrox.png" border=0 alt="Matrox"></a>
-</TD>
-</tr>
-<tr>
-<TD ALIGN=CENTER>
-<a href="http://www.3dfx.com/"><img src="images/3dfx.jpg" border=0 alt="3Dfx" width=100 height=80></a>
-</TD>
-<TD ALIGN=CENTER>
-<a href="http://copyleft.net/"><img src="images/copyleft_black.png" border=0 alt="Copyleft"></a>
-</TD>
-<TD ALIGN=CENTER>
-<a href="http://www.creative.com/"><img src="images/creative.png" border=0 alt="Creative Labs"></a>
-</TD>
-</TR>
-</TABLE>
-</center>
+QuakeForge would like to thank these organizations for their contributions:
 
-<center>
-<table border=0>
-<tr>
-<td algin=center>
-<hr>
-"The future is not set, and the end is always near." -- The Doors
-</td>
-</tr>
-</table>
-</center>
+<TABLE cellSpacing=0 cellPadding=0 border=0>
+	<TR vAlign="top">
+		<?
+			tableSpacer(9, 1, 1, "black");
+		?>
+	</TR>
+	<TR vAlign="center">
+		<TD align="center">
+			<A href="http://www.idsoftware.com/"><IMG src="images/id.png" border=0 alt="id Software" width=70 height=80></A>
+		</TD>
+		<TD align="center">
+			<A href="http://www.sourceforge.net"><IMG src="images/sflogo.png" border=0 alt="SourceForge"></A><BR>
+			<A href="http://www.planetquake.com/aftershock/"><IMG src="images/aftershock_logo.png" border=0 alt="Aftershock"></A>
+		</TD>
+		<TD align="center">
+			<A href="http://www.valinux.com/"><IMG src="images/valinux2.png" border=0 alt="VA Linux Systems"></A><BR>
+			<A href="http://www.matrox.com/"><IMG src="images/matrox.png" border=0 alt="Matrox Electronic Systems, Ltd."></A>
+		</TD>
+	</TR>
+	<TR vAlign="top">
+		<?
+			tableSpacer(9, 1, 1, "black");
+		?>
+	</TR>
+	<TR vAlign="center">
+		<TD align="center">
+			<A href="http://www.3dfx.com/"><IMG src="images/3dfx.jpg" border=0 alt="3Dfx Interactive, Inc." width=100 height=80></A>
+		</TD>
+		<TD align="center">
+			<A href="http://copyleft.net/"><IMG src="images/copyleft_black.png" border=0 alt="Copyleft"></A>
+		</TD>
+		<TD align="center">
+			<A href="http://www.creative.com/"><IMG src="images/creative.png" border=0 alt="Creative Labs, Inc."></a>
+		</TD>
+	</TR>
+</TABLE>		
diff --git a/template.php b/template.php
index 7174c50..c6fc06c 100644
--- a/template.php
+++ b/template.php
@@ -1,34 +1,11 @@
-<?PHP
-	$sitename = "The QuakeForge Project";
+<?	// Preamble
 	$pagename = "Page Name";
-	require("parts/library.php");				// Load function library
-	include("parts/head.php"); 				// Load the HEAD and open BODY
-	include("parts/topstrip.php");			// Display top strip
-	include("parts/titletable.php"); 		// Display main title w/ logos
+	$focused = "none";					// Dock icon name to gets a border
+	require("parts/preamble.php");		// Load most of document
+?>
+<!--SEARCHME-->
+Page content goes here. Yes, it's that simple.
+<!--NOSEARCH-->
+<?
+	require("parts/postamble.php"); 	// Finish this sucker up
 ?>
-<TABLE width="100%" cellspacing=0 cellpadding=0 border=0>
-	<TR valign="top">
-		<?php
-			include("parts/menu.php"); 			// Import left-side menus
-			tableSpacer( 1, 9, 1, "black");		// Separate content from menus
-		?>
-		<TD width="100%">
-			<?php
-				$focused = "none";					// name of focused icon
-				include( "parts/topmain.php" );	// Display content top table
-			?>
-			<P>
-			Body Goes Here
-		</TD>
-		<?php
-			tableSpacer( 1, 9, 1, "black");
-		?>
-	</TR>
-	<TR>
-		<TD COLSPAN="4">
-			<?php
-				include("parts/copyright.php");
-			?>
-		</TD>
-	</TR>
-</TABLE>