Update to solstice theme
diff --git a/_projectCommon.php b/_projectCommon.php
index 7af8f9d..b5eb0ff 100755
--- a/_projectCommon.php
+++ b/_projectCommon.php
@@ -1,13 +1,13 @@
 <?php
 /*******************************************************************************
- * Copyright (c) 2011, 2012 Eclipse Foundation and others.
+ * Copyright (c) 2014 Eclipse Foundation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    
+ *    Stuart McCulloch (Sonatype, Inc.) - Custom content for Sisu
  *******************************************************************************/
 
 require_once($_SERVER['DOCUMENT_ROOT'] . "/projects/classes/Project.class.php");
@@ -30,8 +30,9 @@
 $release = "0.2.1";
 
 # Set the theme for your project's web pages.
-# See http://eclipse.org/phoenix/
-$theme = "Nova";
+# See the Committer Tools "Phoenix" secion in the How Do I? for list of themes
+# https://dev.eclipse.org/committers/
+$theme = "solstice";
 
 # Define keywords, author and title here, or in each PHP page specifically
 $pageKeywords	= "sisu, dependency injection, inject, ioc, jsr330";
@@ -44,7 +45,7 @@
 # these are optional
 
 # If you want to override the eclipse.org navigation, uncomment below.
-$Nav->setLinkList(array());
+# $Nav->setLinkList(array());
 
 # Break the navigation into sections
 $Nav->addNavSeparator("$projectName Home", $projectUrl);
@@ -66,6 +67,27 @@
 
 # To define additional CSS or other pre-body headers
 
+# Initialize custom solstice $variables.
+$variables = array();
+# Add classes to <body>. (String)
+$variables['body_classes'] = '';
+# Insert custom HTML in the breadcrumb region. (String)
+$variables['breadcrumbs_html'] = "";
+# Hide the breadcrumbs. (Bool)
+$variables['hide_breadcrumbs'] = FALSE;
+# Insert HTML before the left nav. (String)
+$variables['leftnav_html'] = '';
+# Update the main container class (String)
+$variables['main_container_classes'] = 'container';
+# Insert HTML after opening the main content container, before the left sidebar. (String)
+$variables['main_container_html'] = '';
+
+# Set Solstice theme variables. (Array)
+$App->setThemeVariables($variables);
+
+# Insert extra html before closing </head> tag.
+$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="/sisu/assets/css/banner.css"/>');
+
 # To enable occasional Eclipse Foundation Promotion banners on your pages (EclipseCon, etc)
 $App->Promotion = FALSE;
 
diff --git a/assets/css/banner.css b/assets/css/banner.css
new file mode 100644
index 0000000..54e3083
--- /dev/null
+++ b/assets/css/banner.css
@@ -0,0 +1,13 @@
+@CHARSET "UTF-8";
+div.sisu{position:relative;top:-244px;left:244px;}
+.sisu div{position:absolute;}
+.sisu-0{width:268px;height:88px;border:2px solid #000;}
+.sisu-1{left:25px;top:25px;background:#000;}
+.sisu-2{width:60px;height:2px;left:30px;top:30px;background:#000;}
+.sisu-3{width:60px;height:2px;top:60px;background:#000;}
+.sisu-4{left:55px;top:55px;background:#000;}
+.sisu-5{width:2px;height:88px;left:90px;background:#000;}
+.sisu-6{width:2px;height:88px;left:120px;background:#000;}
+.sisu-7{width:2px;height:60px;left:120px;background:#000;}
+.sisu-8{left:115px;top:55px;background:#000;}
+.sisu-dot{width:12px;height:12px;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px}
diff --git a/assets/css/landing.css b/assets/css/landing.css
deleted file mode 100644
index 38d0728..0000000
--- a/assets/css/landing.css
+++ /dev/null
@@ -1,234 +0,0 @@
-@CHARSET "UTF-8";
-#novaContent {
-	background: url("../img/backgroundMain.png") no-repeat;
-	padding-top: 210px;
-}
-
-#midcolumn {
-	width: 640px;
-	padding: 0 10px 10px 10px;
-}
-
-#rightcolumn {
-	width: 260px;
-}
-
-
-h3 {
-	clear: both;
-}
-
-h7 {
-	font-weight: bold;
-	padding: 5px;
-}
-
-a strong {
-	text-decoration: underline;
-}
-
-
-#novaContent {
-	background: url("../img/backgroundMain.png") no-repeat white;
-	padding-top: 170px;
-}
-
-#introText p.left {
-	width: 48%;
-	float: left;
-}
-
-#introText p.right {
-	width: 48%;
-	float: right;
-}
-
-#feature_1 {
-	float: left;
-	width: 30%;
-	margin-right: 3%;
-}
-
-#feature_2 {
-	float: left;
-	width: 30%;
-	margin-right: 3%
-}
-
-#feature_3 {
-	float: left;
-	width: 30%;
-}
-
-#feature_4 {
-	clear: both;
-	float: left;
-	width: 63%;
-	margin-right: 3%;	
-}
-
-#feature_more {
-	float: left;
-	width: 30%;
-}
-	
-#bigbuttons {
-  position: relative;
-  left: 420px;
-  top: -170px;
-}
-
-#bigbuttons h3 {
-  visibility: hidden;
-}
-
-#bigbuttons ul li {
-  display: block;
-  list-style-type: none;
-  padding: 0;
-  margin: 0;
-}
-
-#bigbuttons a {
-  position: absolute;
-  width: 250px;
-  height: 77px;
-  display: block;
-  padding: 0;
-  margin: 20px;
-}
-
-#bigbuttons a h4 {
-  font-size: 16px;
-  line-height: 15px;
-  font-weight: bold;
-  color: #333;
-  padding: 0;
-  margin: 12px 10px 4px 70px;
-}
-
-#bigbuttons a p {
-  font-size: 13px;
-  line-height: 14px;
-  font-weight: normal;
-  color: #444;
-  padding: 0;
-  margin: 4px 10px 5px 70px;
-}
-
-#bigbuttons a:hover {
-  text-decoration: none;
-}
-
-#bigbuttons a:hover h4 {
-  text-decoration: underline;
-}
-
-#bigbuttons div.buttonIcon {
-  position: absolute;
-  left: 12px;
-  top: 13px;
-  width: 50px;
-  height: 50px;
-}
-
-#buttonDownload {
-   background:transparent url("../img/buttons.png") no-repeat 0 0;
-   top: 0px;
-   left: 280px;
-}
-
-#buttonDownload:hover {
-   background:transparent url("../img/buttons.png") no-repeat -250px 0;
-}
-
-#buttonDownload div.buttonIcon {
-  background: transparent url( "../img/button-icons.png" ) no-repeat 0 0;
-}
-
-#buttonDocumentation {
-   background:transparent url("../img/buttons.png") no-repeat 0 -77px;
-   top: 0px;
-   left: 0px;
-}
-
-#buttonDocumentation:hover {
-   background:transparent url("../img/buttons.png") no-repeat -250px -77px;
-}
-
-#buttonDocumentation div.buttonIcon {
-  background: transparent url( "../img/button-icons.png" ) no-repeat -50px 0;
-}
-
-#buttonSupport {
-   background:transparent url("../img/buttons.png") no-repeat 0 -77px;
-   top: 87px;
-   left: 280px;
-}
-
-#buttonSupport:hover {
-   background:transparent url("../img/buttons.png") no-repeat -250px -77px;
-}
-
-#buttonSupport div.buttonIcon {
-  background: transparent url( "../img/button-icons.png" ) no-repeat -100px 0;
-}
-
-#buttonDevelopers {
-   background:transparent url("../img/buttons.png") no-repeat 0 -77px;
-   top: 87px;
-   left: 0px;
-}
-
-#buttonDevelopers:hover {
-   background:transparent url("../img/buttons.png") no-repeat -250px -77px;
-}
-
-#buttonDevelopers div.buttonIcon {
-  background: transparent url( "../img/button-icons.png" ) no-repeat -150px 0;
-}
-
-#headlines {
-}
-
-#headlines ul li {
-	margin: 0 0;
-	list-style-type: none;
-	list-style-image: none;
-}
-
-	
-#headlines div.title {
-	display: inline;
-	margin-right: 0.5em;
-}
-
-#headlines div.meta {
-	display: inline;
-	color: #444444;
-	font-size: smaller;  
-}
-
-#headlines div.item {
-	display: block;
-	}
-	
-#screencast {
-	margin-bottom: 10px;
-}
-
-#logo{position:relative;top:10px;}
-
-span.sisu{position:relative;top:-120px;left:80px;}
-.sisu div{position:absolute;}
-.sisu-dot{width:12px;height:12px;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px}
-.sisu-0{width:268px;height:88px;border:2px solid #000;}
-.sisu-1{left:25px;top:25px;background:#000;}
-.sisu-2{width:60px;height:2px;left:30px;top:30px;background:#000;}
-.sisu-3{width:60px;height:2px;top:60px;background:#000;}
-.sisu-4{left:55px;top:55px;background:#000;}
-.sisu-5{width:2px;height:90px;left:90px;background:#000;}
-.sisu-6{width:2px;height:90px;left:120px;background:#000;}
-.sisu-7{width:2px;height:60px;left:120px;background:#000;}
-.sisu-8{left:115px;top:55px;background:#000;}
-
diff --git a/assets/css/section.css b/assets/css/section.css
deleted file mode 100644
index 17d14ec..0000000
--- a/assets/css/section.css
+++ /dev/null
@@ -1,2 +0,0 @@
-@CHARSET "UTF-8";
-#logo{position:relative;top:10px;}
diff --git a/assets/img/backgroundMain.png b/assets/img/backgroundMain.png
deleted file mode 100644
index 9487b21..0000000
--- a/assets/img/backgroundMain.png
+++ /dev/null
Binary files differ
diff --git a/assets/img/button-icons.png b/assets/img/button-icons.png
deleted file mode 100644
index f7bb458..0000000
--- a/assets/img/button-icons.png
+++ /dev/null
Binary files differ
diff --git a/assets/img/buttons.png b/assets/img/buttons.png
deleted file mode 100644
index 0dfe2b7..0000000
--- a/assets/img/buttons.png
+++ /dev/null
Binary files differ
diff --git a/banner.php b/banner.php
new file mode 100755
index 0000000..413fb68
--- /dev/null
+++ b/banner.php
@@ -0,0 +1,29 @@
+<?php
+/*******************************************************************************
+ * Copyright (c) 2014 Eclipse Foundation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Stuart McCulloch (Sonatype, Inc.) - Custom content for Sisu
+ *******************************************************************************/
+?>
+<div class="sisu">
+  <div class="sisu-0"></div>
+  <div class="sisu-1 sisu-dot"></div>
+  <div class="sisu-2"></div>
+  <div class="sisu-3"></div>
+  <div class="sisu-4 sisu-dot"></div>
+  <div class="sisu-5"></div>
+  <div class="sisu-6">
+    <div class="sisu-1 sisu-dot"></div>
+    <div class="sisu-2"></div>
+    <div class="sisu-3"></div>
+    <div class="sisu-4 sisu-dot"></div>
+    <div class="sisu-5"></div>
+    <div class="sisu-7"></div>
+    <div class="sisu-8 sisu-dot"></div>
+  </div>
+</div>
diff --git a/developers/index.php b/developers/index.php
index 4672641..58bdf2f 100644
--- a/developers/index.php
+++ b/developers/index.php
@@ -1,31 +1,34 @@
 <?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
 /*******************************************************************************
- * Copyright (c) 2012 
+ * Copyright (c) 2014 Eclipse Foundation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    
+ *    Stuart McCulloch (Sonatype, Inc.) - Custom content for Sisu
  *******************************************************************************/
 
-$pageTitle = $pageTitle . " / Getting Involved";
+$pageTitle = "Getting Involved";
 
 $mailingLists = $summary->getMailingListsHtml();
 $committers = $summary->getCommittersSideItem();
 
-$html  = <<<EOHTML
+ob_start();
+require_once("../banner.php");
+?>
+
 <div id="midcolumn">
 
 <h3 id="wiki">Wiki</h3>
 <p>
-  Information about building, testing and debugging $projectName can be found in our <a href="$wiki">wiki space</a>.
+  Information about building, testing and debugging <?php print $projectName;?> can be found in our <a href="<?php print $wiki;?>">wiki space</a>.
 </p>
 
 <h3 id="sources">Source Code</h3>
 <p>
-  The source files of the project are stored in <a href="$sources">Git repositories</a>. Please
+  The source files of the project are stored in <a href="<?php print $sources;?>">Git repositories</a>. Please
   see the summary tab of a repository for details about the URL required to clone a repository to your local machine. 
 </p>
 <p>
@@ -56,21 +59,21 @@
 </p>
 <p>
   We use the <a href="http://wiki.eclipse.org/Development_Resources/Automatic_IP_Log">automatic IP log tool</a>
-  to track code contributions and third-party dependencies. See <a href="$iplog">$projectName's tentative IP log</a>
+  to track code contributions and third-party dependencies. See <a href="<?php print $iplog;?>"><?php print $projectName;?>'s tentative IP log</a>
   for the list of currently approved dependencies. 
 </p>
 
 <h3 id="issues">Bug Tracker</h3>
 <p>
-  The project uses Bugzilla to manage <a href="$issueTracker">bugs and feature requests</a>.
+  The project uses Bugzilla to manage <a href="<?php print $issueTracker;?>">bugs and feature requests</a>.
 </p>
 
 <h3 id="mail">Mailing Lists</h3>
-$mailingLists
+<?php print $mailingLists;?>
 
 <h3 id="ci">Continuous Integration</h3>
 <p>
-  We use <a href="$ci">Hudson</a> for our continuous integration
+  We use <a href="<?php print $ci;?>">Hudson</a> for our continuous integration
   builds. Hudson is configured to periodically poll our Git repositories for changes and automatically starts a new
   build when required. We also have a daily <a href="https://hudson.eclipse.org/sisu/job/sisu-sonar/">Sonar job</a>
   to track <a href="https://dev.eclipse.org/sonar/dashboard/index/org.eclipse.sisu:sisu-inject">code quality</a>.
@@ -87,10 +90,9 @@
     &lt;releases&gt;&lt;enabled&gt;false&lt;/enabled&gt;&lt;/releases&gt;
     &lt;snapshots&gt;&lt;enabled&gt;true&lt;/enabled&gt;&lt;/snapshots&gt;
   &lt;/repository&gt;
-
 </pre>
 <p>
-  Note: This repository contains snapshots of many projects, not just those produced by $projectName.
+  Note: This repository contains snapshots of many projects, not just those produced by <?php print $projectName;?>.
 </p>
 
 <h3 id="website">Website</h3>
@@ -106,12 +108,12 @@
 </div>
 
 <div id="rightcolumn">
-$incubation
-$committers
+<?php print $incubation;?>
+<?php print $committers;?>
 </div>
-EOHTML;
 
+<?php
+$html = ob_get_clean();
 # Generate the web page
-$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="' . $projectUrl . 'assets/css/section.css"/>');
 $App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
 ?>
diff --git a/docs/index.php b/docs/index.php
index c269e84..a3e7055 100644
--- a/docs/index.php
+++ b/docs/index.php
@@ -1,18 +1,21 @@
 <?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
 /*******************************************************************************
- * Copyright (c) 2012 
+ * Copyright (c) 2014 Eclipse Foundation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    
+ *    Stuart McCulloch (Sonatype, Inc.) - Custom content for Sisu
  *******************************************************************************/
 
-$pageTitle = $pageTitle . " / Documentation";
+$pageTitle = "Documentation";
 
-$html  = <<<EOHTML
+ob_start();
+require_once("../banner.php");
+?>
+
 <div id="midcolumn">
 
 <h3 id="demo">Tutorials</h3>
@@ -20,8 +23,8 @@
 
 <h3 id="api">API</h3>
 <ul>
-<li><a href="api/org.eclipse.sisu.inject/">Sisu-Inject $release javadoc</a></li>
-<li><a href="api/org.eclipse.sisu.plexus/">Sisu-Plexus $release javadoc</a></li>
+<li><a href="api/org.eclipse.sisu.inject/">Sisu-Inject <?php print $release;?> javadoc</a></li>
+<li><a href="api/org.eclipse.sisu.plexus/">Sisu-Plexus <?php print $release;?> javadoc</a></li>
 <li><a href="api/org.eclipse.sisu.mojos/">sisu-maven-plugin site</a></li>
 </ul>
 <p><i>also available from the Central Repository for IDEs with Maven integration.</i></p>
@@ -32,11 +35,11 @@
 </div>
 
 <div id="rightcolumn">
-$incubation
+<?php print $incubation;?>
 </div>
-EOHTML;
 
+<?php
+$html = ob_get_clean();
 # Generate the web page
-$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="' . $projectUrl . 'assets/css/section.css"/>');
 $App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
 ?>
diff --git a/download/index.php b/download/index.php
index 9b46fd1..ea03abe 100644
--- a/download/index.php
+++ b/download/index.php
@@ -1,18 +1,21 @@
 <?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
 /*******************************************************************************
- * Copyright (c) 2012 
+ * Copyright (c) 2014 Eclipse Foundation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    
+ *    Stuart McCulloch (Sonatype, Inc.) - Custom content for Sisu
  *******************************************************************************/
 
-$pageTitle = $pageTitle . " / Downloads";
+$pageTitle = "Downloads";
 
-$html  = <<<EOHTML
+ob_start();
+require_once("../banner.php");
+?>
+
 <div id="midcolumn">
 
 <p><i>The following downloads are provided under the terms and conditions of the
@@ -21,29 +24,29 @@
 
 <h3 id="dist">Distribution</h3>
 <ul>
-<li><a href="http://www.eclipse.org/downloads/download.php?file=/sisu/releases/org.eclipse.sisu.inject.site-$release.zip">Sisu-Inject $release bundles</a></li>
-<li><a href="http://www.eclipse.org/downloads/download.php?file=/sisu/releases/org.eclipse.sisu.plexus.site-$release.zip">Sisu-Plexus $release bundles</a></li>
+<li><a href="http://www.eclipse.org/downloads/download.php?file=/sisu/releases/org.eclipse.sisu.inject.site-<?php print $release;?>.zip">Sisu-Inject <?php print $release;?> bundles</a></li>
+<li><a href="http://www.eclipse.org/downloads/download.php?file=/sisu/releases/org.eclipse.sisu.plexus.site-<?php print $release;?>.zip">Sisu-Plexus <?php print $release;?> bundles</a></li>
 </ul>
 
 <h3 id="site">Update Site</h3>
 <p>To install a bundle distribution download the zip and point your P2 installer at it.</p>
 
 <h3 id="maven">Maven Artifacts</h3>
-<p>The following artifacts are also available from the <a href="http://search.maven.org/#search|ga|1|g%3A%22org.eclipse.sisu%22%20AND%20v:%22$release%22">Central Repository</a>:</p>
+<p>The following artifacts are also available from the <a href="http://search.maven.org/#search|ga|1|g%3A%22org.eclipse.sisu%22%20AND%20v:%22<?php print $release;?>%22">Central Repository</a>:</p>
 
 <pre>
   &lt;dependency&gt;
     &lt;groupId&gt;org.eclipse.sisu&lt;/groupId&gt;
     &lt;artifactId&gt;org.eclipse.sisu.inject&lt;/artifactId&gt;
-    &lt;version&gt;$release&lt;/version&gt;
+    &lt;version&gt;<?php print $release;?>&lt;/version&gt;
   &lt;/dependency&gt;
 
   &lt;dependency&gt;
     &lt;groupId&gt;org.eclipse.sisu&lt;/groupId&gt;
     &lt;artifactId&gt;org.eclipse.sisu.inject.extender&lt;/artifactId&gt;
-    &lt;version&gt;$release&lt;/version&gt;
+    &lt;version&gt;<?php print $release;?>&lt;/version&gt;
   &lt;/dependency&gt;
-<pre>
+</pre>
 
 <pre>
   &lt;plugin&gt;
@@ -51,30 +54,30 @@
     &lt;artifactId&gt;sisu-maven-plugin&lt;/artifactId&gt;
     &lt;version&gt;0.2.0&lt;/version&gt;
   &lt;/plugin&gt;
-<pre>
+</pre>
 
 <pre>
   &lt;dependency&gt;
     &lt;groupId&gt;org.eclipse.sisu&lt;/groupId&gt;
     &lt;artifactId&gt;org.eclipse.sisu.plexus&lt;/artifactId&gt;
-    &lt;version&gt;$release&lt;/version&gt;
+    &lt;version&gt;<?php print $release;?>&lt;/version&gt;
   &lt;/dependency&gt;
 
   &lt;dependency&gt;
     &lt;groupId&gt;org.eclipse.sisu&lt;/groupId&gt;
     &lt;artifactId&gt;org.eclipse.sisu.plexus.extender&lt;/artifactId&gt;
-    &lt;version&gt;$release&lt;/version&gt;
+    &lt;version&gt;<?php print $release;?>&lt;/version&gt;
   &lt;/dependency&gt;
-<pre>
+</pre>
 
 </div>
 
 <div id="rightcolumn">
-$incubation
+<?php print $incubation;?>
 </div>
-EOHTML;
 
+<?php
+$html = ob_get_clean();
 # Generate the web page
-$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="' . $projectUrl . 'assets/css/section.css"/>');
 $App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
 ?>
diff --git a/index.php b/index.php
index cdee9bf..d350819 100755
--- a/index.php
+++ b/index.php
@@ -1,57 +1,26 @@
 <?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
 /*******************************************************************************
- * Copyright (c) 2011, 2012 
+ * Copyright (c) 2014 Eclipse Foundation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    
+ *    Stuart McCulloch (Sonatype, Inc.) - Custom content for Sisu
  *******************************************************************************/
 
-$html = <<<EOHTML
-<span class="sisu">
-  <div class="sisu-0"></div>
-  <div class="sisu-1 sisu-dot"></div>
-  <div class="sisu-2"></div>
-  <div class="sisu-3"></div>
-  <div class="sisu-4 sisu-dot"></div>
-  <div class="sisu-5"></div>
-  <div class="sisu-6">
-    <div class="sisu-1 sisu-dot"></div>
-    <div class="sisu-2"></div>
-    <div class="sisu-3"></div>
-    <div class="sisu-4 sisu-dot"></div>
-    <div class="sisu-5"></div>
-    <div class="sisu-7"></div>
-    <div class="sisu-8 sisu-dot"></div>
-  </div>
-</span>
-<div id="bigbuttons">
-<h3>Primary Links</h3>
-<ul>
-  <li><a id="buttonDocumentation" href="docs/" title="Documentation">
-  <div class="buttonIcon"></div><h4>Documentation</h4>
-  <p>Tutorials, Javadoc,</p><p>Design documents</p></a></li>
-  <li><a id="buttonDownload" href="download/" title="Download">
-  <div class="buttonIcon"></div><h4>Download</h4>
-  <p>Distribution, Update site</p></a></li>
-  <li><a id="buttonDevelopers" href="developers/" title="Getting Involved">
-  <div class="buttonIcon"></div><h4>Getting Involved</h4>
-  <p>Sources, Wiki, Setup</p></a></li>
-  <li><a id="buttonSupport" href="support/" title="Support">
-  <div class="buttonIcon"></div><h4>Support</h4>
-  <p>Bug tracker, Mailing lists</p></a></li>
-</ul>
-</div>
+ob_start();
+require_once("banner.php");
+?>
+
 <div id="midcolumn">
-  <h2>$pageTitle</h2>
   <p>
-    $projectDescription
+    <?php print $projectDescription;?>
   </p>
-  <h1 style="text-align:center"><a href="docs/tutorials/index.html">Documentation is on the way!</a></h1>
+  <center><h3><a href="docs/tutorials/index.html">Documentation is on the way!</a></h3></center>
 </div>
+
 <div id="rightcolumn">
   <div class="sideitem">
     <h6>New and Noteworthy</h6>
@@ -62,11 +31,12 @@
       2014-02-17 &nbsp; Sisu 0.2.0 has been released!
     </div>
   </div>
-  $incubation
+  <?php print $incubation;?>
 </div>
-EOHTML;
+
+<?php
+$html = ob_get_clean();
 
 # Generate the web page
-$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="' . $projectUrl . 'assets/css/landing.css"/>');
-$App->generatePage($theme, $Menu, null, $pageAuthor, $pageKeywords, $pageTitle, $html);
+$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
 ?>
diff --git a/support/index.php b/support/index.php
index a51222a..ed9a22c 100644
--- a/support/index.php
+++ b/support/index.php
@@ -1,26 +1,29 @@
 <?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
 /*******************************************************************************
- * Copyright (c) 2012 
+ * Copyright (c) 2014 Eclipse Foundation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    
+ *    Stuart McCulloch (Sonatype, Inc.) - Custom content for Sisu
  *******************************************************************************/
 
-$pageTitle = $pageTitle . " / Support";
+$pageTitle = "Support";
 
 $issueTracker = normalizeHttpUrl($project->getBugzillaUrl()); 
 
-$html  = <<<EOHTML
+ob_start();
+require_once("../banner.php");
+?>
+
 <div id="midcolumn">
 
 <h3 id="bugs">Bug Tracker</h3>
 <p>
   If you encounter a bug or have a feature request, please enter a sufficiently detailed issue in our
-  <a href="$issueTracker">bug tracker</a>.
+  <a href="<?php print $issueTracker;?>">bug tracker</a>.
   We especially appreciate issues that come with suggested patches or enough information to be recreated locally.
 </p>
 <p>
@@ -45,11 +48,11 @@
 </div>
 
 <div id="rightcolumn">
-$incubation
+<?php print $incubation;?>
 </div>
-EOHTML;
 
+<?php
+$html = ob_get_clean();
 # Generate the web page
-$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="' . $projectUrl . 'assets/css/section.css"/>');
 $App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
 ?>