diff --git a/config-form.css b/config-form.css
index 1fdd2c0..b3f8e35 100644
--- a/config-form.css
+++ b/config-form.css
@@ -1,23 +1,3 @@
-* {
-	font-family: Arial;
-}
-#All {
-	width: 50em;
-	margin: 2em auto;
-	border: 1px #CCC solid;
-	padding: 1em;
-}
-form {
-	margin: 0;
-}
-h1 {
-	margin-top: 0;
-}
-
-label span {
-	float: left;
-	width: 12em;
-}
 
 .good td {
 	color: green;
@@ -28,36 +8,36 @@ label span {
 }
 
 .testResults .error td {
-	background-color: #C00;
-	border: 1px #700 solid;
-	color: white;
+	border: 1px #CCC solid;
+	color: red;
 }
 
 p.error {
 	padding: 0.5em;
-	background-color: #C00;
-	border: 1px #700 solid;
-	color: white;
+	background-color: #DDD;
+	border: 1px #CCC solid;
+	color: red;
 }
 p.warning {
 	padding: 0.5em;
-	background-color: #E70;
-	border: 1px #A70 solid;
-	color: white;
+	background-color: #DDD;
+	border: 1px #CCC solid;
+	color: orange;
 }
 p.good {
 	padding: 0.5em;
-	background-color: #0C0;
-	border: 1px #070 solid;
-	color: white;
+	background-color: #DDD;
+	border: 1px #CCC solid;
+	color: #0C0;
 }
 
 .testResults {
 	border-collapse: collapse;
-	font-size: 80%;
+	font-size: 80%;
+	width: 90%;
 }
 .testResults td {
 	border: 1px #CCC solid;
 	width: 400px;
 	padding: 0.2em;
-}
\ No newline at end of file
+}
diff --git a/config-form.html b/config-form.html
index 5d6ee37..db62cb8 100644
--- a/config-form.html
+++ b/config-form.html
@@ -9,140 +9,156 @@
 				document.getElementById(id).style.display = 'none';
 			}
 		</script>
+		<link rel="stylesheet" type="text/css" href="themes/blackcandy/css/layout.css" />
+		<link rel="stylesheet" type="text/css" href="themes/blackcandy/css/typography.css" />
+		<link rel="stylesheet" type="text/css" href="themes/blackcandy/css/form.css" />
 		<link rel="stylesheet" type="text/css" href="config-form.css" />
 	</head>
 
 	<body>
-		<div id="All">
-			<p style="float: right">
-				<b>Version <?= $silverstripe_version ?></b>
-			</p>
-			<h1>SilverStripe CMS Installation</h1>
-			<p>
-				Thanks for choosing to use SilverStripe!  Please follow the instructions below to get SilverStripe
-				installed.
-			</p>
-
-			<form action="install.php" method="post">
-				<?php if(isset($hasErrorOtherThanDatabase)) { ?>
-					<p class="error">
-						You aren't currently able to install the software.  Please <a style="color: #CCF" href="#requirements">see below</a> for details.
-					</p>
-				<?php } else { ?>
-					<?php if($req->hasWarnings()) { ?>
-						<p class="warning">
-							There are some issues that we recommend you look at before installing, however, you are still able to install the software.
-							Please see below for details.
-						</p>
-					<?php } else if(!$dbReq->hasErrors()) { ?>
-						<p class="good">
-							You're ready to install! &nbsp;&nbsp; 
-						</p>
-					<?php } ?>						
-					<p>
-						<b>Template to install:</b>
-					</p>
-					<input type="radio" name="template" value="default" checked="checked">BlackCandy, default template ready to use.</input><br />
-					<input type="radio" name="template" value="tutorial">Empty template, ready to begin the tutorial.</input><br />
-					<p>You can change the template or download another from the SilverStripe website after installation.</p>
-
-					
-					<?php if($alreadyInstalled) { ?>
+		<div id="BgContainer">
+			<div id="Container">
+				<div id="Header">
+					<h1>SilverStripe CMS Installation</h1>
+					<p>Version <?= $silverstripe_version ?></p>
+				</div>
+				
+				<div id="Layout">
+					<div class="typography">
 						<p>
-							<b>Note:</b> It seems as though SilverStripe is already installed here.  If you ask me to install, I will overwrite
-							the <b>.htaccess</b> and <b>mysite/_config.php</b> files. <br /> <br />
-							<label style="cursor: pointer">
-								<input type="checkbox" name="force_reinstall" onclick="document.getElementById('install_button').disabled = !this.checked" /> That's okay, please re-install SilverStripe and overwrite these files.
-							</label>
+							Thanks for choosing to use SilverStripe!  Please follow the instructions below to get SilverStripe
+							installed.
 						</p>
-					<? } ?>
-
-					<p>
-						<?php if($alreadyInstalled) { ?>
-							<input id="install_button" type="submit" disabled="disabled" name="go" value="Install SilverStripe" onclick="document.getElementById('saving_top').style.display = ''; this.value = 'Installing SilverStripe...'" />
-						<?php } else { ?>
-							<input id="install_button" type="submit" name="go" value="Install SilverStripe" onclick="document.getElementById('saving_top').style.display = ''; this.value = 'Installing SilverStripe...'" />
-						<? } ?>
-						
-						<span id="saving_top" style="display: none">
-							&nbsp;
-							<img src="cms/images/network-save.gif" />
-							(this will take a minute or so)
-						</span>
-					</p>
-				<?php } ?>
-
-				<input type="hidden" name="database" value="MySQLDatabase" />
-				<h2>MySQL Database</h2>
-				<p>
-					SilverStripe stores its content in a MySQL database.  Please provide the username
-					and password to connect to the server here.  If this account has permission to create databases, then we will
-					create the database for you; otherwise, you must give the name of a database that already exists.
-				</p>
-
-				<?php if($dbReq->hasErrors()) { ?>
-					<p class="error">
-						These database details don't appear to be correct.  Please enter the correct details before installing.
-					</p>
-				<?php } else { ?>
-					<p class="good">
-						These database details look all good!
-					</p>
-				<?php } ?>
-
-				<p style="margin-left: 2em" id="mysql_credentials">
-					<label for="mysql_server">
-						<span>MySQL server:</span>
-						<input id="mysql_server" type="text" name="mysql[server]" value="<?= $databaseConfig['server'] ?>" />
-					</label> <br />
-					<label for="mysql_username">
-						<span>MySQL username:</span>
-						<input id="mysql_username" type="text" name="mysql[username]" value="<?= $databaseConfig['username'] ?>"  />
-					</label> <br />
-					<label for="mysql_password">
-						<span>MySQL password:</span>
-						<input id="mysql_password" type="password" name="mysql[password]" value="<?= $databaseConfig['password'] ?>" />
-					</label> <br />
-					<label for="mysql_database">
-						<span>MySQL database:</span>
-						<input id="mysql_database" type="text" name="mysql[database]" value="<?= $databaseConfig['database'] ?>" onchange="this.value = this.value.replace(/[^A-Za-z0-9_]+/g,'');" />
-					</label> <br />
-				</p>
-
-				<p style="margin-left: 2em">
-					<input type="submit" value="Re-check requirements" />
-				</p>
-
-				<h4>Details</h4>
-				<?php $dbReq->showTable("MySQL Configuration"); ?>
-
-				<br /><hr />
-
-				<h2>SilverStripe Administration Account</h2>
-				<p>
-					We will set up 1 administrator account for you automatically.  Enter the email address and password.  If you'd
-					rather log-in with a username instead of an email address, enter that instead.
-				</p>
-
-				<p style="margin-left: 2em">
-					<label for="username">
-						<span>Administrator email:</span>
-						<input type="text" name="username" id="username" value="admin" />
-					</label><br />
-					<label for="password">
-						<span>Administrator password:</span>
-						<input type="text" name="password" id="password" value="password" />
-					</label> <br />
-				</p>
-
-				<br /><hr />
-
-				<h2 id="requirements">Requirements</h2>
-				<?php
-					$req->showTable();
+			
+						<form action="install.php" method="post">
+							<?php if(isset($hasErrorOtherThanDatabase)) { ?>
+								<p class="error">
+									You aren't currently able to install the software.  Please <a style="color: #CCF" href="#requirements">see below</a> for details.
+								</p>
+							<?php } else { ?>
+								<?php if($req->hasWarnings()) { ?>
+									<p class="warning">
+										There are some issues that we recommend you look at before installing, however, you are still able to install the software.
+										Please see below for details.
+									</p>
+								<?php } else if(!$dbReq->hasErrors()) { ?>
+									<p class="good">
+										You're ready to install! &nbsp;&nbsp; 
+									</p>
+								<?php } ?>						
+								<p>
+									<b>Template to install:</b>
+								</p>
+								<p>
+									<input type="radio" name="template" value="default" checked="checked">BlackCandy, default template ready to use.</input><br />
+									<input type="radio" name="template" value="tutorial">Empty template, ready to begin the tutorial.</input><br />
+								</p>
+								<p>You can change the template or download another from the SilverStripe website after installation.</p>
+			
+								
+								<?php if($alreadyInstalled) { ?>
+									<p>
+										<b>Note:</b> It seems as though SilverStripe is already installed here.  If you ask me to install, I will overwrite
+										the <b>.htaccess</b> and <b>mysite/_config.php</b> files. <br /> <br />
+										<label style="cursor: pointer">
+											<input type="checkbox" name="force_reinstall" onclick="document.getElementById('install_button').disabled = !this.checked" /> That's okay, please re-install SilverStripe and overwrite these files.
+										</label>
+									</p>
+								<? } ?>
+			
+								<p>
+									<?php if($alreadyInstalled) { ?>
+										<input id="install_button" type="submit" disabled="disabled" name="go" value="Install SilverStripe" onclick="document.getElementById('saving_top').style.display = ''; this.value = 'Installing SilverStripe...'" />
+									<?php } else { ?>
+										<input id="install_button" type="submit" name="go" value="Install SilverStripe" onclick="document.getElementById('saving_top').style.display = ''; this.value = 'Installing SilverStripe...'" />
+									<? } ?>
+									
+									<span id="saving_top" style="display: none">
+										&nbsp;
+										<img src="cms/images/network-save.gif" />
+										(this will take a minute or so)
+									</span>
+								</p>
+							<?php } ?>
+			
+							<input type="hidden" name="database" value="MySQLDatabase" />
+							<h2>MySQL Database</h2>
+							<p>
+								SilverStripe stores its content in a MySQL database.  Please provide the username
+								and password to connect to the server here.  If this account has permission to create databases, then we will
+								create the database for you; otherwise, you must give the name of a database that already exists.
+							</p>
+			
+							<?php if($dbReq->hasErrors()) { ?>
+								<p class="error">
+									These database details don't appear to be correct.  Please enter the correct details before installing.
+								</p>
+							<?php } else { ?>
+								<p class="good">
+									These database details look all good!
+								</p>
+							<?php } ?>
+			
+							<p style="margin-left: 2em" id="mysql_credentials">
+								<label for="mysql_server">
+									<span>MySQL server:</span>
+									<input id="mysql_server" type="text" name="mysql[server]" value="<?= $databaseConfig['server'] ?>" />
+								</label> <br />
+								<label for="mysql_username">
+									<span>MySQL username:</span>
+									<input id="mysql_username" type="text" name="mysql[username]" value="<?= $databaseConfig['username'] ?>"  />
+								</label> <br />
+								<label for="mysql_password">
+									<span>MySQL password:</span>
+									<input id="mysql_password" type="password" name="mysql[password]" value="<?= $databaseConfig['password'] ?>" />
+								</label> <br />
+								<label for="mysql_database">
+									<span>MySQL database:</span>
+									<input id="mysql_database" type="text" name="mysql[database]" value="<?= $databaseConfig['database'] ?>" onchange="this.value = this.value.replace(/[^A-Za-z0-9_]+/g,'');" />
+								</label> <br />
+							</p>
+			
+							<p style="margin-left: 2em">
+								<input type="submit" value="Re-check requirements" />
+							</p>
+			
+							<h4>Details</h4>
+							<?php $dbReq->showTable("MySQL Configuration"); ?>
+			
+							<br />
+			
+							<h2>SilverStripe Administration Account</h2>
+							<p>
+								We will set up 1 administrator account for you automatically.  Enter the email address and password.  If you'd
+								rather log-in with a username instead of an email address, enter that instead.
+							</p>
+			
+							<p style="margin-left: 2em">
+								<label for="username">
+									<span>Administrator email:</span>
+									<input type="text" name="username" id="username" value="admin" />
+								</label><br />
+								<label for="password">
+									<span>Administrator password:</span>
+									<input type="text" name="password" id="password" value="password" />
+								</label> <br />
+							</p>
+			
+							<br />
+			
+							<h2 id="requirements">Requirements</h2>
+							<?php
+								$req->showTable();
 				?>
-
-			</form>
+			
+						</form>
+					</div>
+				</div>
+			</div>
+			
+			<div id="Footer">
+					<p>Copyright &copy; 2007 | Powered by <a href="http://www.silverstripe.com">SilverStripe Open Source CMS</a></p>
+			</div>
 		</div>
 	</body>
 </html>
