Clean up to use default theme

Change-Id: I1d29ce6152d35c631da6311f0ec93ddf06991f30
Signed-off-by: Eric Poirier <eric.poirier@eclipse-foundation.org>
diff --git a/_projectCommon.php b/_projectCommon.php
deleted file mode 100644
index 1fdcdb6..0000000
--- a/_projectCommon.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-	# Set the theme for your project's web pages.
-	# See the Committer Tools "How Do I" for list of themes
-	# https://dev.eclipse.org/committers/
-	# Optional: defaults to system theme 
-	$theme = "solstice";
-	$App->Promotion = TRUE;
-	//$App->ExtraHtmlHeaders = '<link rel="stylesheet" type="text/css" href="/equinox/equinox.css">';
-	# Define your project-wide Nav bars here.
-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# these are optional
-	$Nav->setLinkList( array() );
-	$Nav->addNavSeparator("Support Eclipse", "/membership/support_eclipse/");
-	$Nav->addCustomNav("Home", "/membership/support_eclipse/", "_self", 1);
-	$Nav->addCustomNav("How to Support", "/support_eclipse/support.php", "_self", 1);
-
-?>
\ No newline at end of file
diff --git a/content/en_corp_sponsor_details.php b/content/en_corp_sponsor_details.php
index cb68cdf..90e9835 100644
--- a/content/en_corp_sponsor_details.php
+++ b/content/en_corp_sponsor_details.php
@@ -1,108 +1,80 @@
 <?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://eclipse.org/legal/epl-v10.html
-*
-* Contributors:
-*    Christopher Guindon (Eclipse Foundation) - Initial implementation
-*******************************************************************************/
+/**
+ * Copyright (c) 2014, 2018 Eclipse Foundation.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * Contributors:
+ * Christopher Guindon (Eclipse Foundation) - Initial implementation
+ * Eric Poirier (Eclipse Foundation)
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 ?>
-<div id="fullcolumn" class="galileo">
-	<div id="midcolumn">
-		<h1>Become an Eclipse Corporate Sponsor</h1>
-		<p>The Eclipse Foundation relies on the support of our members and
-			contributions from the user community to service and grow the Eclipse
-			ecosystem. We encourage companies that make extensive use of Eclipse
-			technology to support the Eclipse community through the Eclipse
-			Corporate Sponsor Program. The generous support of these Corporate
-			Sponsors allows the Foundation to provide world-class support for the
-			Eclipse open source projects.</p>
-
-		<p>A company may become a corporate sponsor by making a financial
-			contribution or an in-kind contribution of goods and services to the
-			Eclipse Foundation. There are three tiers of sponsorship: 1)
-			Platinum, 2) Gold and 3) Silver; each tier representing the level of
-			annual sponsorship to the Eclipse Foundation.
-
-
-		<h4>Platinum Sponsorship</h4>
-		<ul>
-			<li>Annual contribution of at least US$100,000</li>
-			<li>Corporate logo placed on the Eclipse Foundation Sponsor page.</li>
-			<li>Joint-press release issued between the Eclipse Foundation and
-				Platinum sponsor.</li>
-		</ul>
-		<h4>Gold Sponsorship</h4>
-		<ul>
-			<li>Annual contribution of at least US$25,000</li>
-			<li>Corporate logo recognized on the Eclipse Foundation Sponsor page.</li>
-			<li>Supporting press quote from the Eclipse Foundation for sponsor
-				announcement.</li>
-		</ul>
-
-		<h4>Silver Sponsorship</h4>
-		<ul>
-			<li>Annual contribution of at least US$5000</li>
-			<li>Corporate logo recognized on the Eclipse Foundation Sponsor page.</li>
-		</ul>
-		<br />
-
-		<h3>How to Become a Corporate Sponsor</h3>
-		<ul>
-			<li><h4>Step 1</h4>Determine the level of sponsorship your company
-				would like to make.
-
-			<li><h4>Step 2</h4>Contact the <a
-				href="mailto:membership@eclipse.org">Eclipse Foundation</a> to
-				determine method of payment. In-kind contributions will require
-				previous agreement from the Eclipse Foundation. Please note that is
-				Eclipse Foundation is a not-for-profit corporation. Contributions or
-				gifts to the Eclipse Foundation Inc. are not tax deductible as
-				charitable contributions.
-
-			<li><h4>Step 3</h4>Corporate sponsors, by signing our <a
-				href="http://www.eclipse.org/org/documents/Eclipse%20Logo%20Agreement%20%202008_04_30%20final.pdf">logo
-					agreement</a>, agree to have their corporate logo listed on the
-				Eclipse Corporate Sponsor page. If you do not want your logo listed,
-				please inform the Eclipse Foundation.
-
-		</ul>
-		<br>
-
-		<h3>Other Ways to Support Eclipse</h3>
-		<p>
-			The Eclipse Foundation is supported by our member companies through
-			their contributions to the Eclipse projects and membership dues. If
-			your company would like to <a
-				href="http://www.eclipse.org/membership/">become more involved in
-				the Eclipse community</a>, please explore the different membership
-			options. Individuals may also contributed to the Eclipse Foundation
-			through the <a href="http://eclipse.org/donate/">'Friends of Eclipse'</a>
-			program.
-		</p>
-
-	</div>
-	<div id="rightcolumn">
-
-
-		<div class="sideitem">
-			<h6>Support Eclipse</h6>
-			<div>
-				<ul>
-					<li class=""><a href="http://www.eclipse.org/corporate_sponsors/"
-						class="link">Corporate Sponsors</a><br /></li>
-					<li class=""><a
-						href="http://www.eclipse.org/membership/showAllMembers.php"
-						class="link">Eclipse Members</a><br /></li>
-					<li class=""><a href="http://eclipse.org/donate/donorlist.php"
-						class="link">Friends of Eclipse</a><br /></li>
-				</ul>
-			</div>
-		</div>
-	</div>
-
+<div id="midcolumn">
+  <h1><?php print $pageTitle; ?></h1>
+  <p>The Eclipse Foundation relies on the support of our members and contributions from the user
+    community to service and grow the Eclipse ecosystem. We encourage companies that make extensive
+    use of Eclipse technology to support the Eclipse community through the Eclipse Corporate Sponsor
+    Program. The generous support of these Corporate Sponsors allows the Foundation to provide
+    world-class support for the Eclipse open source projects.</p>
+  <p>A company may become a corporate sponsor by making a financial contribution or an in-kind
+    contribution of goods and services to the Eclipse Foundation. There are three tiers of
+    sponsorship: 1) Platinum, 2) Gold and 3) Silver; each tier representing the level of annual
+    sponsorship to the Eclipse Foundation.
+  
+  
+  <h4>Platinum Sponsorship</h4>
+  <ul>
+    <li>Annual contribution of at least US$100,000</li>
+    <li>Corporate logo placed on the Eclipse Foundation Sponsor page.</li>
+    <li>Joint-press release issued between the Eclipse Foundation and Platinum sponsor.</li>
+  </ul>
+  <h4>Gold Sponsorship</h4>
+  <ul>
+    <li>Annual contribution of at least US$25,000</li>
+    <li>Corporate logo recognized on the Eclipse Foundation Sponsor page.</li>
+    <li>Supporting press quote from the Eclipse Foundation for sponsor announcement.</li>
+  </ul>
+  <h4>Silver Sponsorship</h4>
+  <ul>
+    <li>Annual contribution of at least US$5000</li>
+    <li>Corporate logo recognized on the Eclipse Foundation Sponsor page.</li>
+  </ul>
+  <h3>How to Become a Corporate Sponsor</h3>
+  <ul>
+    <li><h4>Step 1</h4>Determine the level of sponsorship your company would like to make.
+    
+    <li><h4>Step 2</h4>Contact the <a href="mailto:membership@eclipse.org">Eclipse Foundation</a> to
+      determine method of payment. In-kind contributions will require previous agreement from the
+      Eclipse Foundation. Please note that is Eclipse Foundation is a not-for-profit corporation.
+      Contributions or gifts to the Eclipse Foundation Inc. are not tax deductible as charitable
+      contributions.
+    
+    <li><h4>Step 3</h4>Corporate sponsors, by signing our <a
+      href="/org/documents/Eclipse%20Logo%20Agreement%20%202008_04_30%20final.pdf"
+    >logo agreement</a>, agree to have their corporate logo listed on the Eclipse Corporate Sponsor
+      page. If you do not want your logo listed, please inform the Eclipse Foundation.</li>
+  </ul>
+  <h3>Other Ways to Support Eclipse</h3>
+  <p>
+    The Eclipse Foundation is supported by our member companies through their contributions to the
+    Eclipse projects and membership dues. If your company would like to <a href="/membership/">become
+      more involved in the Eclipse community</a>, please explore the different membership options.
+    Individuals may also contributed to the Eclipse Foundation through the <a href="/donate/">'Friends
+      of Eclipse'</a> program.
+  </p>
 </div>
-
+<div class="sideitem">
+  <h6>Support Eclipse</h6>
+  <ul>
+    <li class=""><a href="http://www.eclipse.org/corporate_sponsors/" class="link">Corporate
+        Sponsors</a><br /></li>
+    <li class=""><a href="http://www.eclipse.org/membership/showAllMembers.php" class="link">Eclipse
+        Members</a><br /></li>
+    <li class=""><a href="http://eclipse.org/donate/donorlist.php" class="link">Friends of Eclipse</a><br /></li>
+  </ul>
+</div>
+</div>
diff --git a/content/en_index.php b/content/en_index.php
index 8b9ea01..88960f9 100644
--- a/content/en_index.php
+++ b/content/en_index.php
@@ -1,52 +1,51 @@
 <?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://eclipse.org/legal/epl-v10.html
-*
-* Contributors:
-*    Christopher Guindon (Eclipse Foundation) - Initial implementation
-*******************************************************************************/
+/**
+ * Copyright (c) 2014, 2018 Eclipse Foundation.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * Contributors:
+ * Christopher Guindon (Eclipse Foundation) - Initial implementation
+ * Eric Poirier (Eclipse Foundation)
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 ?>
-<div id="fullcolumn" class="galileo">
-	<div id="midcolumn">
-		<h1><?php  print $pageTitle;?></h1>
-
-		<p>The Eclipse Foundation relies on the support of our members and
-			contributions from the user community to service and grow the Eclipse
-			ecosystem. We'd like to thank the following Corporate Sponsors who
-			have generously supported the Eclipse community.</p>
-
-		<p>
-			We encourage large corporate users of Eclipse to support the
-			community by <a href="/membership/">becoming members</a> and/or
-			joining the <a href="corp_sponsor_details.php">Corporate Sponsorship
-				Program</a>.
-		</p>
-
-		<ul class="list-inline margin-top-30 margin-bottom-30 text-center">
-			<li class="margin-right-30 margin-bottom-30"><img alt="Debeka" src="images/debeka.jpg" width="140" /></li>
-			<li><img alt="Arcesium" src="images/arcesium.jpg" /></li>
-		</ul>
-	</div>
-
-	<div id="rightcolumn">
-		<div class="sideitem">
-			<h6>Supporting Eclipse</h6>
-			<div>
-				<ul>
-					<li><a
-						href="http://www.eclipse.org/membership/showAllMembers.php"
-						class="link">Eclipse Members</a><br /></li>
-					<li><a href="http://eclipse.org/donate/donorlist.php"
-						class="link">Friends of Eclipse</a><br />
-
-					<li><a href="corp_sponsor_details.php" class="link">Become
-							a Corporate Sponsor</a><br /></li>
-				</ul>
-			</div>
-		</div>
-	</div>
+<div id="midcolumn">
+  <h1><?php print $pageTitle;?></h1>
+  <p>The Eclipse Foundation relies on the support of our members and contributions from the user
+    community to service and grow the Eclipse ecosystem. We'd like to thank the following Corporate
+    Sponsors who have generously supported the Eclipse community.</p>
+  <p>
+    We encourage large corporate users of Eclipse to support the community by <a href="/membership/">becoming
+      members</a> and/or joining the <a href="corp_sponsor_details.php">Corporate Sponsorship
+      Program</a>.
+  </p>
+      <div class="sideitem">
+      <h6>Corporate Sponsors</h6>
+        <ul class="list-inline margin-top-30 margin-bottom-30">
+          <li class="margin-right-30">
+            <img alt="Debeka" src="images/debeka.jpg" width="140"/>
+          </li>
+          <li>
+            <img alt="Arcesium" src="images/arcesium.jpg" />
+          </li>
+        </ul>
+      </div>
+</div>
+<div id="rightcolumn">
+  <div class="sideitem">
+    <h6>Supporting Eclipse</h6>
+    <div>
+      <ul>
+        <li><a href="http://www.eclipse.org/membership/showAllMembers.php" class="link">Eclipse
+            Members</a><br /></li>
+        <li><a href="http://eclipse.org/donate/donorlist.php" class="link">Friends of Eclipse</a><br />
+        
+        <li><a href="corp_sponsor_details.php" class="link">Become a Corporate Sponsor</a><br /></li>
+      </ul>
+    </div>
+  </div>
 </div>
\ No newline at end of file
diff --git a/content/en_support.php b/content/en_support.php
index f1f635d..301540e 100644
--- a/content/en_support.php
+++ b/content/en_support.php
@@ -1,100 +1,86 @@
 <?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://eclipse.org/legal/epl-v10.html
-*
-* Contributors:
-*    Christopher Guindon (Eclipse Foundation) - Initial implementation
-*******************************************************************************/
+/**
+ * Copyright (c) 2014, 2018 Eclipse Foundation.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * Contributors:
+ * Christopher Guindon (Eclipse Foundation) - Initial implementation
+ * Eric Poirier (Eclipse Foundation)
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 ?>
 <div id="midcolumn">
-
-	<h1>Support Eclipse</h1>
-	<p>
-		There are three simple ways you can financially support the Eclipse
-		Foundation. Choose whichever way is best for you, and please do not
-		hesitate to <a href="mailto:membership@eclipse.org">contact us.</a>
-	</p>
-
-
-	<h2>1 - Become an Associate Member</h2>
-	<ul>
-		<li>What are the benefits of becoming an Associate Member?</li>
-		<p>
-			The key benefit is supporting the infrastructure that brings you <a
-				href="http://wiki.eclipse.org/images/c/ca/Eclipse_foundation_about_us.pdf">great
-				open source software</a>! In addition to that, we'll put you on the
-			inside track of information about the Eclipse Ecosystem, invite you
-			to members' meetings, and give you discounts to Foundation events
-			&mdash; and your staff will appreciate knowing you support free
-			software too. If you would like more benefits, such as help promoting
-			your products and services to the Eclipse Ecosystem, voting rights,
-			and board representation, consider <a
-				href="http://www.eclipse.org/membership/become_a_member/"
-				target="_blank">other membership options</a>.
-		</p>
-		<li>How do I become an Associate Member?</li>
-		<p>
-			It's easy &mdash; just complete and fax these three documents listed
-			on our <a
-				href="http://www.eclipse.org/membership/become_a_member/membershipProcess.php">Membership
-				Page</a>. It really is quite simple. One doc is simply for your
-			contact information. Another doc says it's ok for us to post your
-			logo (and vice versa). The third doc has a lot of stuff relevant to
-			other membership classes; for Associate Membership, it basically says
-			that you agree to support the Foundation and we agree to invite you
-			to the members' meetings and events.
-		</p>
-		<li>How much is Associate Membership?</li>
-		<p>The minimum contribution is $5,000 USD per year. If it's more
-			convenient for you, we can break that into quarterly payments.</p>
-
-	</ul>
-
-	<h2>2 - Be a Corporate Sponsor</h2>
-	<p>
-		If Associate Membership isn't your style, there are other ways to
-		financially support the Eclipse Foundation. Please <a
-			href="mailto:membership@eclipse.org">contact us</a> to discuss some
-		of the options including:
-
-
-	<ul>
-		<li>Being a logo sponsor of Eclipse Foundation events</li>
-		<li>Being a corporate sponsor for some of our <a
-			href="http://www.eclipse.org/org/foundation/thankyou.php">infrastructure</a></li>
-		<li>Simply making a cash contribution</li>
-	</ul>
-	</p>
-
-	<h2>3 - Become a Friend of Eclipse</h2>
-	<p>
-		If having your organization become a member or sponsor isn't in the
-		cards, and you still want to show support for the Eclipse Foundation,
-		consider personally becoming a <a
-			href="http://eclipse.org/donate/index.php">Friend of Eclipse</a>. <br>
-		<br> <br>
-
-	</p>
+  <h1><?php print $pageTitle; ?></h1>
+  <p>
+    There are three simple ways you can financially support the Eclipse Foundation. Choose whichever
+    way is best for you, and please do not hesitate to <a href="mailto:membership@eclipse.org">contact
+      us.</a>
+  </p>
+  <h2>1 - Become an Associate Member</h2>
+  <ul>
+    <li>What are the benefits of becoming an Associate Member?</li>
+    <p>
+      The key benefit is supporting the infrastructure that brings you <a
+        href="http://wiki.eclipse.org/images/c/ca/Eclipse_foundation_about_us.pdf"
+      >great open source software</a>! In addition to that, we'll put you on the inside track of
+      information about the Eclipse Ecosystem, invite you to members' meetings, and give you
+      discounts to Foundation events &mdash; and your staff will appreciate knowing you support free
+      software too. If you would like more benefits, such as help promoting your products and
+      services to the Eclipse Ecosystem, voting rights, and board representation, consider <a
+        href="http://www.eclipse.org/membership/become_a_member/" target="_blank"
+      >other membership options</a>.
+    </p>
+    <li>How do I become an Associate Member?</li>
+    <p>
+      It's easy &mdash; just complete and fax these three documents listed on our <a
+        href="http://www.eclipse.org/membership/become_a_member/membershipProcess.php"
+      >Membership Page</a>. It really is quite simple. One doc is simply for your contact
+      information. Another doc says it's ok for us to post your logo (and vice versa). The third doc
+      has a lot of stuff relevant to other membership classes; for Associate Membership, it
+      basically says that you agree to support the Foundation and we agree to invite you to the
+      members' meetings and events.
+    </p>
+    <li>How much is Associate Membership?</li>
+    <p>The minimum contribution is $5,000 USD per year. If it's more convenient for you, we can
+      break that into quarterly payments.</p>
+  </ul>
+  <h2>2 - Be a Corporate Sponsor</h2>
+  <p>
+    If Associate Membership isn't your style, there are other ways to financially support the
+    Eclipse Foundation. Please <a href="mailto:membership@eclipse.org">contact us</a> to discuss
+    some of the options including:</p>
+  <ul>
+    <li>Being a logo sponsor of Eclipse Foundation events</li>
+    <li>Being a corporate sponsor for some of our <a
+      href="http://www.eclipse.org/org/foundation/thankyou.php"
+    >infrastructure</a></li>
+    <li>Simply making a cash contribution</li>
+  </ul>
+  <h2>3 - Become a Friend of Eclipse</h2>
+  <p>
+    If having your organization become a member or sponsor isn't in the cards, and you still want to
+    show support for the Eclipse Foundation, consider personally becoming a <a
+      href="http://eclipse.org/donate/index.php"
+    >Friend of Eclipse</a>. <br> <br> <br>
+  </p>
 </div>
-
-
 <div id="rightcolumn">
-
-	<?php print $support?>
-		<div class="sideitem">
-			More About Our Supporters:
-			<div>
-				<ul>
-					<li><a
-						href="http://www.eclipse.org/membership/showAllMembers.php"
-						class="link">Organization Supporters</a><br /></li>
-					<li><a href="http://eclipse.org/donate/donorlist.php"
-						class="link">Individual Supporters</a><br /></li>
-				</ul>
-			</div>
-		</div>
+  <div class="sideitem">
+    <h6>Some of our supporters...</h6>
+    <div style="text-align: center">
+      <?php print $support_logos; ?>
+    </div>
+  </div>
+  <div class="sideitem">
+    <h6>More About Our Supporters:</h6>
+    <ul>
+      <li><a href="http://www.eclipse.org/membership/showAllMembers.php" class="link">Organization
+          Supporters</a><br /></li>
+      <li><a href="http://eclipse.org/donate/donorlist.php" class="link">Individual Supporters</a><br /></li>
+    </ul>
+  </div>
 </div>
\ No newline at end of file
diff --git a/corp_sponsor_details.php b/corp_sponsor_details.php
index 28fd30a..16da403 100644
--- a/corp_sponsor_details.php
+++ b/corp_sponsor_details.php
@@ -1,33 +1,32 @@
 <?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://eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014, 2018 Eclipse Foundation.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *    Christopher Guindon (Eclipse Foundation) - Initial implementation
- *******************************************************************************/
+ *    Eric Poirier (Eclipse Foundation)
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
-	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");
+require_once ($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
 
-	$App 	= new App();
-	$Nav	= new Nav();
-	$Menu 	= new Menu();
-	include("_projectCommon.php");    # All on the same line to unclutter the user's desktop.
+$App = new App();
+$Theme = $App->getThemeClass();
 
-	$pageTitle 		= "Eclipse Corporate Sponsors";
-	$pageKeywords	= "corporate sponsorship, sponsor, eclipse";
-	$pageAuthor		= "Eclipse Foundation, Inc.";
+$pageTitle = "Become an Eclipse Corporate Sponsor";
+$Theme->setPageTitle($pageTitle);
+$Theme->setPageKeywords("corporate sponsorship, sponsor, eclipse");
+$Theme->setPageAuthor("Eclipse Foundation, Inc.");
 
-	ob_start();
-	include("content/en_" . $App->getScriptName());
-	$html = ob_get_clean();
+// Generate the web page
+ob_start();
+include("content/en_" . $App->getScriptName());
+$html = ob_get_clean();
 
-	# Generate the web page
-	$App->Promotion = TRUE;
-	$App->generatePage("solstice", $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
\ No newline at end of file
+$Theme->setHtml($html);
+$Theme->generatePage();
\ No newline at end of file
diff --git a/images/amazon.jpg b/images/amazon.jpg
deleted file mode 100644
index 3e5974e..0000000
--- a/images/amazon.jpg
+++ /dev/null
Binary files differ
diff --git a/images/arcesium.jpg b/images/arcesium.jpg
deleted file mode 100644
index c7660cb..0000000
--- a/images/arcesium.jpg
+++ /dev/null
Binary files differ
diff --git a/images/debeka.jpg b/images/debeka.jpg
deleted file mode 100644
index 4c941db..0000000
--- a/images/debeka.jpg
+++ /dev/null
Binary files differ
diff --git a/images/deshaw_logo.jpg b/images/deshaw_logo.jpg
deleted file mode 100644
index 84dfd28..0000000
--- a/images/deshaw_logo.jpg
+++ /dev/null
Binary files differ
diff --git a/images/logo.png b/images/logo.png
deleted file mode 100644
index 3c57552..0000000
--- a/images/logo.png
+++ /dev/null
Binary files differ
diff --git a/images/pdf-logo.gif b/images/pdf-logo.gif
deleted file mode 100644
index 1ba5cea..0000000
--- a/images/pdf-logo.gif
+++ /dev/null
Binary files differ
diff --git a/images/support.png b/images/support.png
deleted file mode 100644
index 3827afc..0000000
--- a/images/support.png
+++ /dev/null
Binary files differ
diff --git a/images/supporters.gif b/images/supporters.gif
deleted file mode 100644
index b4a2799..0000000
--- a/images/supporters.gif
+++ /dev/null
Binary files differ
diff --git a/index.php b/index.php
index 1f3fa3f..3e3a4b8 100644
--- a/index.php
+++ b/index.php
@@ -1,32 +1,33 @@
 <?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://eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014, 2018 Eclipse Foundation.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *    Christopher Guindon (Eclipse Foundation) - Initial implementation
- *******************************************************************************/
+ *    Eric Poirier (Eclipse Foundation)
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
-	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");
+require_once ($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
 
-	$App 	= new App();
-	$Nav	= new Nav();
-	$Menu 	= new Menu();
-	include("_projectCommon.php");    # All on the same line to unclutter the user's desktop.
+$App = new App();
+$Nav = new Nav();
+$Theme = $App->getThemeClass();
 
-	$pageTitle 		= "Eclipse Corporate Sponsors";
-	$pageKeywords	= "corporate sponsorship, sponsor, eclipse";
-	$pageAuthor		= "Eclipse Foundation, Inc.";
+$pageTitle = "Eclipse Corporate Sponsors";
+$Theme->setPageTitle($pageTitle);
+$Theme->setPageKeywords("corporate sponsorship, sponsor, eclipse");
+$Theme->setPageAuthor("Eclipse Foundation, Inc.");
 
-	ob_start();
-	include("content/en_" . $App->getScriptName());
-	$html = ob_get_clean();
+// Generate the web page
+ob_start();
+include("content/en_" . $App->getScriptName());
+$html = ob_get_clean();
 
-	# Generate the web page
-	$App->Promotion = TRUE;
-	$App->generatePage("solstice", $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);
+$Theme->setHtml($html);
+$Theme->generatePage();
diff --git a/support.php b/support.php
index e739ca8..30bd692 100644
--- a/support.php
+++ b/support.php
@@ -1,48 +1,43 @@
 <?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://eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014, 2018 Eclipse Foundation.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *    Christopher Guindon (Eclipse Foundation) - Initial implementation
- *******************************************************************************/
+ *    Eric Poirier (Eclipse Foundation)
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+require_once ($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.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();
+$Theme = $App->getThemeClass();
 
-	$App 	= new App();
-	$Nav	= new Nav();
-	$Menu 	= new Menu();
-	include("_projectCommon.php");
+$pageTitle = "Support Eclipse";
+$Theme->setPageTitle($pageTitle);
+$Theme->setPageKeywords("eclipse membership");
+$Theme->setPageAuthor("Eclipse Foundation, Inc.");
 
-	$pageTitle 		= "Support Eclipse";
-	$pageKeywords	= "eclipse membership";
-	$pageAuthor		= "Eclipse Foundation, Inc.";
+$supporters = array(
+  'cisco120.gif',
+  'eads120.png',
+  'rim120.png',
+  'siemens.gif'
+);
+shuffle($supporters);
+$support_logos = "";
+foreach ($supporters as $p) {
+  $support_logos .= '<img src="images/' . $p . '" alt="' . $p . '" style="padding:10px 0;">';
+}
 
-	$supporters = array (
-		'cisco120.gif',
-		'eads120.png',
-		'rim120.png',
-		'siemens.gif',
-	);
-	shuffle($supporters);
-	$support = '<div class="sideitem">';
-	$support .= '<h6>Some of our supporters...</h6><div style="text-align:center">';
-  foreach ( $supporters as $p ) {
-		$support .= '<img src="images/'  . $p . '" alt="'  . $p . '" style="padding:10px 0;">';
-	}
-	$support .= '</div></div>';
+// Generate the web page
+ob_start();
+include("content/en_" . $App->getScriptName());
+$html = ob_get_clean();
 
-	ob_start();
-	include("content/en_" . $App->getScriptName());
-	$html = ob_get_clean();
-
-
-	# Generate the web page
-	$App->Promotion = TRUE;
-	$App->generatePage("solstice", $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
+$Theme->setHtml($html);
+$Theme->generatePage();
\ No newline at end of file