Bug 318135 - Make Callisto pages in html

Change-Id: I0fa9d5b2437d995fac1c08b2e0dc83bd4cff5bfa
Signed-off-by: Eric Poirier <eric@eclipse.org>
diff --git a/_projectCommon.php b/_projectCommon.php
index 00e596e..0e72749 100644
--- a/_projectCommon.php
+++ b/_projectCommon.php
@@ -1,12 +1,18 @@
 <?php
+/*******************************************************************************
+ * Copyright (c) 2015 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:
+ *    Nathan Gervais (Eclipse Foundation) - Initial implementation
+ *    Eric Poirier (Eclipse Foundation)
+ *******************************************************************************/
+$theme = "solstice";
+$App->Promotion = FALSE;
 
-	# 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/
-	$theme = "solstice";
-	$App->Promotion = FALSE;
-	
-	$App->setOutDated('2011-11-11' ,'<a href="https://projects.eclipse.org/releases/callisto">Callisto</a> is a past version of Eclipse. Please visit our <a href="/downloads/">download</a> page for the latest version of Eclipse. ');
-	
+$App->setOutDated( '2011-11-11', '<a href="https://projects.eclipse.org/releases/callisto">Callisto</a> is a past version of Eclipse. Please visit our <a href="/downloads/">download</a> page for the latest version of Eclipse. ' );
 
 ?>
diff --git a/c-dev.php b/c-dev.php
index aeb62f8..eed2dcb 100644
--- a/c-dev.php
+++ b/c-dev.php
@@ -1,127 +1,36 @@
+<?php
+/*******************************************************************************
+ * Copyright (c) 2015 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:
+ *    Nathan Gervais (Eclipse Foundation) - Initial implementation
+ *    Eric Poirier (Eclipse Foundation)
+ *******************************************************************************/
+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");
 
-<?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'
+$App = new App();
+$Nav = new Nav();
+$Menu = new Menu();
+include($App->getProjectCommon()); // All on the same line to unclutter the user's desktop'
 
-	#*****************************************************************************
-	#
-	# template.php
-	#
-	# Author: 		Wayne Beaton
-	# Date:			2006-06-06
-	#
-	# Description: 
-	# This page contains pointers to download and tutorial information for
-	# individuals interested in using Eclipse for Java development.
-	#****************************************************************************
-	
-	#
-	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "Eclipse for C/C++ Developers";
-	$pageKeywords	= "callisto eclipse 3.2 cdt c cpp resource screencam screen cam tutorial ";
-	$pageAuthor		= "Wayne Beaton";
-	
-	# Add page-specific Nav bars here
-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 1);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 1);
-	#$Nav->addCustomNav("<img src=\"http://www.eclipsecon.org/2007/image125x125.gif\"/>","http://www.eclipsecon.org/2007", "_self", 1);
-	
-	# End: page-specific settings
-	#
-			
-	require_once("links.php");
-	
-	# Paste your HTML content between the EOHTML markers!	
-	$html = <<<EOHTML
-<script type="text/javascript">
-function show_section(name) {
-	if (document.getElementById(name).style.display=='block') return;
-	document.getElementById(name +'-down').style.display='none';
-	document.getElementById(name).style.display='block'
-}
-function hide_section(name) {
-	if (document.getElementById(name).style.display=='none') return;
-	document.getElementById(name +'-down').style.display='inline';
-	document.getElementById(name).style.display='none'
-}
-</script>
-<link rel="stylesheet" type="text/css" href="callisto.css" media="screen" />
 
-<div class="callistoRealEstate paddingLeft">
-	<div class="maincontent">
-        <table cellspacing=0 class="callistoButtons">
-        	<tr>
-        		<td width="50"><img src="images/c.jpg"></a></td>
-				<td width="100%" class="noRightBorder">$pageTitle</td>
-			</tr>
-		</table>
-       
-		<a href="http://www.eclipsecon.org/?tag=eclipse-callisto-cdev"><img style="margin-top:5px;" align="right" src="http://www.eclipsecon.org/2007/image125x125.gif"/></a>
+// Begin: page-specific settings. Change these.
+$pageTitle = "Eclipse for C/C++ Developers";
+$pageKeywords = "callisto eclipse 3.2 cdt c cpp resource screencam screen cam tutorial ";
+$pageAuthor = "Wayne Beaton";
 
-		<p>The Eclipse C/C++ Development Tools (CDT) runs on top of the Eclipse
-		Platform. The CDT provides advanced functionality for C/C++ developers, 
-		including:</p>
-		
-		<ul>
-		  <li>C/C++ Editor (basic functionality, syntax highlighting, code completion etc.) </li>
-		  <li>C/C++ Debugger (APIs &amp; Default implementation, using GDB) </li>
-		  <li>C/C++ Launcher (APIs &amp; Default implementation, launches and external application) </li>
-		  <li>Parser</li>
-		  <li>Search Engine</li>
-		  <li>Content Assist Provider</li>		
-		  <li>Makefile generator</li>
-		</ul>
-		
-		<p>You need to use the <a href="$callisto_discovery">Callisto Discovery Site</a> to add the CDT features.</p>
-		
-      	<div class="homeitem"  style="min-height:250px" >
-      		<h3>What do you need?</h3>
-				<p><strong><a href="http://archive.eclipse.org/eclipse/downloads/drops/R-3.2-200606291905/index.php">Eclipse 3.2</a> is required for Callisto.</strong> 
-				There is no upgrade path from previous versions of Eclipse.</p>
-      		
-			<ul>
-      			<li style="border-style: none">The <a href="$platform_runtime_binaries">Eclipse Platform Runtime</a> <span style="white-space:nowrap">Binaries<img id="platform-down" src="images/down.png" onclick="show_section('platform');"/></span>
-  					<div id="platform" style="border-style:solid;border-width:1px;margin-left:5%;display:none">
-  						<h3><img onclick="hide_section('platform');" align="right" src="images/close.png"/>Eclipse SDK</h3>
-      					The Eclipse Platform Runtime Binaries provides base integrated development 
-      					environment (IDE) functionality, but without support for any specific 
-      					programming language. Combining the CDT with the Platform Runtime forms 
-      					a first-class C/C++ IDE.
-  					</div>
-      			</li>
-      			<li style="border-style: none">The C/C++ Development tools <span style="white-space:nowrap">(<a href="/cdt">CDT</a>)<img id="cdt-down" src="images/down.png" onclick="show_section('cdt');"/></span>
-      				<div id="cdt" style="border-style:solid;border-width:1px;margin-left:5%;display:none">
-      					<h3><img onclick="hide_section('cdt');" align="right" src="images/close.png"/>CDT</h3>
-	      				The CDT provides advanced functionality for C/C++ developers.
-	      				Combining the CDT with the Platform Runtime forms 
-	      				a first-class C/C++ IDE.
-      				</div>
-      			</li>
-      		</ul>
-      	</div>    	
-      	<div class="homeitem">
-      		<h3>Tutorials and Help</h3>
-      		<ul>
-      		    <li style="list-style-image: url(images/movie.png);border-style: none"><a href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/install-eclipse/install-eclipse.html">Installing the Eclipse SDK</a></li>
-      		    <li style="list-style-image: url(images/movie.png);border-style: none"><a href="$install_cdt">Installing and using the C/C++ Development Tools</a></li>
-				<li style="list-style-image: url(images/tutorial.png);border-style: none"><a href="http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/cdt-home/user/Tutorials.html?cvsroot=Tools_Project">CDT Tutorials</a></li>
-				<li style="list-style-image: url(images/movie.png);border-style: none"><a href="$install_callisto">Installing Features from the Callisto Discovery Site</a></li>      			    		
-      		</ul>
-      	</div>
-      	
-      		
-      	<div class="homeitem">
-      		<h3>Suggested reading</h3>
-      		<ul>
-      			<li style="list-style-image: url(images/document.png);border-style: none"><a href="/cdt">The CDT home page</a></li>
-				<li style="list-style-image: url(images/document.png);border-style: none"><a href="http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/cdt-home/user/faq.html?cvsroot=Tools_Project">Frequently asked questions about the CDT</a></li>
-			</ul>
-      	</div>
-	</div>
-</div>
+// Place your html content in a file called content/en_pagename.php
+ob_start();
+include("content/en_" . $App->getScriptName());
+$html = ob_get_clean();
 
-EOHTML;
+# Generate the web page
 
-	# Generate the web page
-	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
+$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="/callisto/callisto.css" media="screen" />');
+$App->generatePage(NULL, $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);
\ No newline at end of file
diff --git a/callistoeffect.php b/callistoeffect.php
index 865f0fa..3da0a9f 100644
--- a/callistoeffect.php
+++ b/callistoeffect.php
@@ -1,606 +1,36 @@
-<?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'

+<?php

+/*******************************************************************************

+ * Copyright(c) 2015 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:

+ *    Nathan Gervais(Eclipse Foundation) - Initial implementation

+ *    Eric Poirier(Eclipse Foundation)

+ *******************************************************************************/

+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");

 

-	#*****************************************************************************

-	#

-	# template.php

-	#

-	# Author: 		Denis Roy

-	# Date:			2005-06-16

-	#

-	# Description: Type your page comments here - these are not sent to the browser

-	#

-	#

-	#****************************************************************************

-	

-	#

-	# Begin: page-specific settings.  Change these. 

-	$pageTitle 		= "Callisto Effect";

-	$pageKeywords	= "callisto marketing ";

-	$pageAuthor		= "Nathan Gervais";

-	

-	# Add page-specific Nav bars here

-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)

-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");

-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 1);

-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 1);

-

-	# End: page-specific settings

-	#

-	// This file is linked to from lots of different places.

-	// Use absolute paths to make sure that we can actually test

-	// that the file renders properly (i.e. testing using) "/index.php",

-	// and "/home/index.php" both work.

-

-		

-	# Paste your HTML content between the EOHTML markers!	

-	$html = <<<EOHTML

-<link rel="stylesheet" type="text/css" href="callisto.css" media="screen" />

-<div class="callistoRealEstate">

-	<div class="maincontent">

-        <h1>$pageTitle</h1>

-        <p>

-        The following are just some of the examples of what Eclipse members are doing with Callisto.

-        </p>

-       	<table>

-       		<tr>

-       			<td><div class="contentBox">

-		        <a href="http://www.businessobjects.com/eclipse"><b>Business Objects</b></a>

-		        <br /> <br />

-		        At Business Objects we are really excited about the Callisto release and 

-		        have decided to leverage this as the foundation for the release of 

-		        <a href="http://www.businessobjects.com/eclipse">Crystal Reports for Eclipse</a>. 

-		        Crystal Reports for Eclipse uses a number of 

-		        plugins (GEF, WTP, DTP), and benefits from the Callisto release.  

-		        The simultaneous release aspect makes it a lot easier for us to provide 

-		        a supported platform list to our end users as opposed to calling out 

-		        specific versions of each dependent plugin.  This efficiency simplifies 

-		        our testing and validation process saving time for us and providing 

-		        higher quality for our customers.

- 

-		        <br /><br />		        

-			    <p style="text-align:right;"><a href="http://creclipse.blogspot.com/">Tim Lang</a> - <a href="http://www.businessobjects.com/eclipse">VP Developer Programs</a></p>

-		        </div></td>

-        		<td valign="center" style="padding-left:10px;">

-        		 <a href="http://www.businessobjects.com/eclipse">

-	        		<img src="/callisto/images/callistoeffectlogos/businessobjects.gif" border=0 alt="BusinessObjects" title="BusinessObjects" style="float:right;clear:none;">

-    			 </a>

-        			</td>

-        	</tr>

-        </table>

-      <br />  

-        <table>

-       		<tr>

-       		    <td valign="center" style="padding-right:10px;">

-       		    	<a href="http://www.intalio.com/">

-       		    		<img src="/callisto/images/callistoeffectlogos/intalio.gif" border=0 alt="intalio" title="intalio" style="float:right;clear:none;">

-					</a>

-       		    </td>

- 

-       			<td><div class="contentBox">

-		        <a href="http://intalio.com"><b>Intalio</b></a>

-		        <br /> <br />

-		        Intalio uses Eclipse as the foundation for the 

-		        <a href="http://intalio.com/products/designer/index.html">Intalio|BPMS Designer</a>

-		        product, the first BPM development tool to provide Zero Code and 

-		        One Click Deploy capabilities for complex business processes. 

-		        Without the robustness of the Eclipse platform and the support we 

-		        are getting from the thriving Eclipse community, building such a 

-		        product would never ave been possible. We look forward to the 

-		        Callisto release as one that will push the envelope even further, 

-		        and make Eclipse the de-facto standard for Java-based development 

-		        environments.

-		        		        <br /><br />		        

-			    <p style="text-align:right;"><a href="http://itredux.com/">Ismael Ghalimi</a> - <a href="http://intalio.com">Founder and CEO</a></p>

-		        </div></td>

-        	</tr>

-        </table>

-     <br />     

-       	<table>

-       		<tr>

-       			<td><div class="contentBox">

-		        <a href="http://http://www.scapatech.com/home.html/"><b>Scapa Technologies</b></a>

-		        <br /> <br />

-		        Scapa is planning to release a new version of its 

-		        <a href="http://www.scapatech.com/products_services/intro.html">Test and Perfomance Platform</a>

-		        later in the year, which will be built on TPTP, BIRT, EMF, GEF and WTP as 

-		        well as the Eclipse Platform, so it is imperative that we are able to have 

-		        these projects ship in a coordinated manner with full integration testing.

- 

-		        <br /><br />		        

-			    <p style="text-align:right;"><a href="http://www.scapatech.com/">Mike Norman</a> - <a href="http://www.scapatech.com">Chief Executive and President</a></p>

-		        </div></td>

-        		<td valign="center" style="padding-left:10px;">

-        		 <a href="http://www.scapatech.com/">

-	        		<img src="/callisto/images/callistoeffectlogos/scapatech.gif" border=0 alt="Scapatech" title="Scapatech" style="float:right;clear:none;">

-    			 </a>

-        			</td>

-        	</tr>

-        </table>

-         <br />  

-        <table>

-       		<tr>

-       		    <td valign="center" style="padding-right:10px;">

-       		    	<a href="http://www.bea.com/">

-       		    		<img src="/callisto/images/callistoeffectlogos/bealogo.gif" border=0 alt="BEA" title="BEA" style="float:right;clear:none;">

-					</a>

-       		    </td>

- 

-       			<td><div class="contentBox">

-		        <a href="http://bea.com"><b>BEA</b></a>

-		        <br /> <br />

-		        The Callisto release, consisting of the Eclipse platform 3.2 and the Web Tools platform (WTP) version 1.5 is designed to represent an improvement in the stability and performance for next generation <a href="http://workshopstudio.bea.com/download.do?source=banner_eclipse.org_callistoeffect">web application tooling</a>. This is a key part of our <a href="http://www.bea.com/blended">Blended Strategy</a> and shows that - as a major contributor to Eclipse and WTP, BEA was able to be the first enterprise vendor to deliver a commercial product on the Callisto platform.   Partnering with the community continually hones the edge <a href="http://workshopstudio.bea.com/download.do?source=banner_eclipse.org_callistoeffect">BEA Workshop Studio</a> needs to be the "<a href="http://dev2dev.bea.com/blog/phumphrey/archive/2006/04/eclipse_awards.html">Best Commercial Eclipse-Based Tool</a>".

-		        <br /><br />		        

-			    <p style="text-align:right;"><a href="http://dev2dev.bea.com/blog/wgroth2/">Bill Roth</a> - <a href="http://dev2dev.bea.com/blog/wgroth2/">Vice President, Workshop Studio</a></p>

-		        </div></td>

-        	</tr>

-        </table>       

- <br />     

-       	<table>

-       		<tr>

-       			<td><div class="contentBox">

-		        <a href="http://www.lombardisoftware.com/"><b>Lombardi</b></a>

-		        <br /> <br />

-		        Lombardi won the 

-		        <a href="http://www.eclipse.org/org/foundation/eclipseawards/winners.php">Best Commercial RCP Award</a>

-		        because we fully leverage the 

-		        Eclipse platform to deliver value to our customers.  With the Calisto release, we 

-		        will be able to improve 

-		        <a href="http://www.lombardisoftware.com/bpm-software-solutions.php">Lombardi's BPM products</a>

-		        more quickly and easily. 

-		        Additionally, our products will also integrate better with all the new 

-		        Eclipse projects, such as BIRT, WTP, GMF, delivering an even richer and 

-		        more sophisticated set of tools that drive customer business processes, 

-		        models, events, rules, and dashboards.

- 

-		        <br /><br />		        

-			    <p style="text-align:right;"><a href="http://www.lombardisoftware.com/">Damion Heredia</a> - <a href="http://www.lombardisoftware.com">Director of Product Management</a></p>

-		        </div></td>

-        		<td valign="center" style="padding-left:10px;">

-        		 <a href="http://www.lombardisoftware.com/">

-	        		<img src="/callisto/images/callistoeffectlogos/lombardi.PNG" border=0 alt="Lombardi" title="Lombardi" style="float:right;clear:none;">

-    			 </a>

-        			</td>

-        	</tr>

-        </table>

-                <br />  

-        <table>

-       		<tr>

-       		    <td valign="center" style="padding-right:10px;">

-       		    	<a href="http://www.lynuxworks.com/">

-       		    		<img src="/callisto/images/callistoeffectlogos/lynuxlogo.gif" border=0 alt="LynuxWorks" title="LynuxWorks" style="float:right;clear:none;">

-					</a>

-       		    </td>

- 

-       			<td><div class="contentBox">

-		        <a href="http://www.lynuxworks.com/"><b>LynuxWorks</b></a>

-		        <br /> <br />

-		        

-		        At LynuxWorks we use Eclipse to power our 

-		        <a href="http://www.lynuxworks.com/products/eclipse/luminosity.php">

-		        Luminosity IDE. 

-		        </a>

-		        Luminosity provides a embedded 

-		        software development system for both Linux developers and users of our POSIX based LynxOS 

-		        real-time operating system.

-		        

-		        We take advantage of the CDT project today and are looking to also use elements from the 

-		        TPTP and DSDP projects in our future releases. Callisto is giving us a huge amount of 

-		        confidence that we can deliver our next version on-time, as all the project pieces we need 

-		        will be available with the new Eclipse platform from day one.

-      		        <br /><br />		        

-			    <p style="text-align:right;"><a href="http://www.lynuxworks.com/">Robert Day</a> - <a href="http://www.lynuxworks.com/">Vice President, Marketing</a></p>

-		        </div></td>

-        	</tr>

-        </table>     

- <br />     

-       	<table>

-       		<tr>

-       			<td><div class="contentBox">

-		        <a href="http://www.innoopract.de/"><b>Innoopract</b></a>

-		        <br /> <br />

-			 	As a provider of the 

-			 	 <a href="http://www.yoxos.com/">

-					      Yoxos Eclipse distribution,

-				</a>

-				Innoopract is very aware of the importance of a coordinated 

-				release of Eclipse software.  Callisto is a great step towards 

-				our mission of making Eclipse easier to manage and 

-				update.  Starting with the first release of Callisto, it 

-				will be an important part of our distribution offerings.  

-				Yoxos users will be able to easily extend Callisto and 

-				build custom configurations of Eclipse and third-party 

-				plugins and features through an Ajax-enabled 

-				“Download-on-Demand” service. Developers can pick & choose 

-				in a Web browser exactly those plugins they wish to install.

- 		        <br /><br />		        

-			    <p style="text-align:right;"><a href="http://www.innoopract.de/">Eric von der Heyden</a> - <a href="http://www.innoopract.de/">Managing Director</a></p>

-		        </div></td>

-        		<td valign="center" style="padding-left:10px;">

-        		 <a href="http://www.innoopract.de/">

-	        		<img src="/callisto/images/callistoeffectlogos/innologo.jpg" border=0 alt="Innoopract" title="Innoopract" style="float:right;clear:none;">

-    			 </a>

-        			</td>

-        	</tr>

-        </table>

-        

-                     <br />  

-        <table>

-       		<tr>

-       		    <td valign="center" style="padding-right:10px;">

-       		    	<a href="http://www.intervoice.com/">

-       		    		<img src="/callisto/images/callistoeffectlogos/intervoicelogo.gif" border=0 alt="Intervoice" title="Intervoice" style="float:right;clear:none;">

-					</a>

-       		    </td>

- 

-       			<td><div class="contentBox">

-		        <a href="http://www.intervoice.com/"><b>Intervoice</b></a>

-		        <br /> <br />

-	        

-		        Intervoice has adopted the Eclipse Platform as our framework for delivering 

-				development tools for our 

-				<a href="http://www.intervoice.com/prod_ent_media_exchange.cfm">

-		        Media Exchange platform.

-				</a>

-				Using Eclipse allows my team to focus on developing plug-in 

-				technologies that leverage our core competencies in voice automation while 

-				leveraging the features of the Eclipse Platform, providing our customers with 

-				tools that are ready to use for maximum productivity. 

-    		        <br /><br />		        

-			    <p style="text-align:right;"><a href="http://www.intervoice.com/">Andy Thomas</a> - <a href="http://www.intervoice.com/">Vice President, Poduct Development</a></p>

-		        </div></td>

-        	</tr>

-        </table>    

-         <br />     

-       	<table>

-       		<tr>

-       			<td><div class="contentBox">

-		        <a href="http://www.borland.com/"><b>Borland</b></a>

-		        <br /> <br />

-		      The simultaneous release of the ten projects under the Callisto 

-		      Project banner helps commercial vendors like Borland more easily 

-		      leverage Eclipse technology within their products.

-		      In addition to leveraging the Eclipse Web Tools Platform within our 

-		      award-winning IDE tools, the next major release of 

-		   	<a href="http://www.borland.com/us/products/together/index.html">

-		 		      Borland’s Together modeling product, 

-		      </a>

-		      expected this summer, will 

-		      incorporate technology from the 3.2 releases of the Java Development 

-		      Tools and C/C++ Development Tooling projects.  Additionally, we’ll be 

-		      using the Eclipse Modeling Framework and Graphical Modeling Framework 

-		      as key components within Borland’s next-generation modeling products.		      

- 		        <br /><br />		        

-			    <p style="text-align:right;"><a href="http://www.borland.com/">Rich Gronback</a> - <a href="http://www.borland.com/">Chief Scientist</a></p>

-		        </div></td>

-        		<td valign="center" style="padding-left:10px;">

-        		 <a href="http://www.borland.com/">

-	        		<img src="/callisto/images/callistoeffectlogos/borland.gif" border=0 alt="Borland" title="Borland" style="float:right;clear:none;">

-    			 </a>

-        			</td>

-        	</tr>

-        </table>

-        

-                     <br />  

-        <table>

-       		<tr>

-       		    <td valign="center" style="padding-right:10px;">

-       		    	<a href="http://www.klocwork.com/">

-       		    		<img src="/callisto/images/callistoeffectlogos/klocwork.gif" border=0 alt="Klocwork" title="Klocwork" style="float:right;clear:none;">

-					</a>

-       		    </td>

- 

-       			<td><div class="contentBox">

-		        <a href="http://www.klocwork.com/"><b>Klocwork</b></a>

-		        <br /> <br />

-	        

-		        As an Eclipse Foundation Member and Eclipse Add-In-Provider, Klocwork sees the 

-		        Callisto project as an important intiative.  Our Eclipse commitment is an important 

-		        part of both our customer value proposition and internal product development 

-		        strategy.  Klocwork customers benefit from our relationship with Eclipse since 

-		        they can access Klocwork's leading 

-		      	<a href="http://www.klocwork.com/products/klocworkk7.asp">

-		 	    defect and vulnerability detection technology 

-		 	    </a>

-		        inside Eclipse's C,C++ & Java IDEs.  In addition, Klocwork's reporting tools are 

-		        built using the Eclipse Rich Client Platform, enabling a flexible, open platform 

-		        for our own product development.  In short, the Callisto project will help streamline 

-		        our work with Eclipse and we see it as a great step forward by the Eclipse Foundation.

-

- 

- 

-    		        <br /><br />		        

-			    <p style="text-align:right;"><a href="http://www.klocwork.com/">Ian Gordon</a> - <a href="http://www.klocwork.com/">Vice President, Poduct Management</a></p>

-		        </div></td>

-        	</tr>

-        </table>    

-       

-          <br />     

-       	<table>

-       		<tr>

-       			<td><div class="contentBox">

-		        <a href="http://www.logiclibrary.com/"><b>LogicLibrary</b></a>

-		        <br /> <br />

-				The successful, on-schedule completion of Eclipse's Callisto 

-				initiative is a significant milestone for the software industry. 

-				Our flagship product, 

-				<a href="http://www.logiclibrary.com/solutions/logidex.php">

-		 	   	Logidex, 

-		 	   	</a>

-				is tightly integrated with the 

-				Eclipse development platform. This gives customers exceptional 

-				flexibility to use the tools they need for development projects 

-				and SOA initiatives. Eclipse has proven, yet again, that it is 

-				possible to consistently deliver large scale, world-class software 

-				projects that deliver great value.	      

- 		        <br /><br />		        

-			    <p style="text-align:right;"><a href="http://www.logiclibrary.com/">Brent Carlson</a> - <a href="http://www.logiclibrary.com/">VP of Technology</a></p>

-		        </div></td>

-        		<td valign="center" style="padding-left:10px;">

-        		 <a href="http://www.logiclibrary.com/">

-	        		<img src="/callisto/images/callistoeffectlogos/logiclibrary.jpg" border=0 alt="LogicLibrary" title="LogicLibrary" style="float:right;clear:none;">

-    			 </a>

-        			</td>

-        	</tr>

-        </table>

-        

-                     <br />  

-        <table>

-       		<tr>

-       		    <td valign="center" style="padding-right:10px;">

-       		    	<a href="http://www.lattix.com/">

-       		    		<img src="/callisto/images/callistoeffectlogos/lattix.gif" border=0 alt="Lattix" title="Lattix" style="float:right;clear:none;">

-					</a>

-       		    </td>

- 

-       			<td><div class="contentBox">

-		        <a href="http://www.lattix.com/"><b>Lattix</b></a>

-		        <br /> <br />

-	        

-		        Callisto is a key part of our strategy to deliver more value to our customers.  With 

-		        the Callisto release, our customers will be able to expand their use of the 

-		        <a href="http://www.lattix.com/products/products.htm">

-		 	   	Lattix LDM plugin

-		 	   	</a> 

-		        to manage the architecture of their Eclipse projects.  In addition 

-		        to Java projects, the web application tooling will allow our users to test the 

-		        architecture, detect violations while developing and prevent architectural erosion 

-		        of web applications.  

-    		        <br /><br />		        

-			    <p style="text-align:right;"><a href="http://www.lattix.com/">Neeraj Sangal</a> - <a href="http://www.lattix.com/">President</a></p>

-		        </div></td>

-        	</tr>

-        </table>     

-           

-           <br />     

-       	<table>

-       		<tr>

-       			<td><div class="contentBox">

-		        <a href="http://www.avantsoft.com/"><b>AvantSoft</b></a>

-		        <br /> <br />

-					AvantSoft, Inc. is proud to announce that it has successfully 

-					upgraded its full range of training and professional services 

-					for the Callisto release. AvantSoft consultants and project 

-					managers have embraced Callisto by conducting special internal 

-					sessions on Callisto projects. 

-					AvantSoft training programs 

-					have 

-					been updated with latest release of Eclipse platform and Callisto 

-					projects CDT, GEF, GMF, VE, DTP, EMF, WTP, TPTP, and BIRT. With 

-					this expertise, AvantSoft team is ready to provide in-depth onsite 

-					corporate training and execute consulting engagements using Callisto 

-					projects. AvantSoft can help customers get ready for Callisto 

-					through its full range of services - custom training on Callisto 

-					projects, consulting resources with expertise in Callisto projects, 

-					and project managers that can set up teams and execute entire lifecycle 

-					of Eclipse plugins and RCP application development using Callisto projects. 

-					AvantSoft has provided excellent training courses and executed consulting 

-					projects on Eclipse platform for several large corporations all 

-					over U.S. and Europe.  		        <br /><br />		        

-			    <p style="text-align:right;"><a href="http://www.avantsoft.com/">Ashvin Radiya</a> - <a href="http://www.avantsoft.com/">Founder and President</a></p>

-		        </div></td>

-        		<td valign="center" style="padding-left:10px;">

-        		 <a href="http://www.avantsoft.com/">

-	        		<img src="/callisto/images/callistoeffectlogos/avantsoft.PNG" border=0 alt="AvantSoft" title="AvantSoft" style="float:right;clear:none;">

-    			 </a>

-        			</td>

-        	</tr>

-        </table>

-  <br />  

-        <table>

-       		<tr>

-       		    <td valign="center" style="padding-right:10px;">

-       		    	<a href="http://www.actuate.com/">

-       		    		<img src="/callisto/images/callistoeffectlogos/actuate.gif" border=0 alt="Actuate" title="Actuate" style="float:right;clear:none;">

-					</a>

-       		    </td>

- 

-       			<td><div class="contentBox">

-		        <a href="http://www.actuate.com/"><b>Actuate</b></a>

-		        <br /> <br />

-	        

-		        Successful innovation is driven by ease of adoption and compatibility.

-		        At Actuate we know that a key component of our success is our ability to

-				quickly and easily add the latest and most cross-compatible technology into

-				our platform. For instance, we are using the Eclipse Data Tools Platform

-				and, with the release of 

-				       <a href="http://www.actuate.com/products/index.asp">

-		 				Actuate 9, 

-		 				</a>

-				have included the BIRT project in our

-				enterprise reporting application platform. The Eclipse Callisto release

-				gives us the ability to more easily investigate the benefits of adding other

-				Eclipse projects to our platform and the assurance that the Eclipse

-				ecosystem will expand as the benefits of using Eclipse as a standard

-				development environment continue to increase. 

-    		        <br /><br />		        

-			    <p style="text-align:right;"><a href="http://www.actuate.com/">Mark Coggins</a> - <a href="http://www.actuate.com/">Senior Vice President of Engineering</a></p>

-		        </div></td>

-        	</tr>

-        </table>   

-

-           <br />     

-       	<table>

-       		<tr>

-       			<td><div class="contentBox">

-		        <a href="http://www.qnx.com/"><b>QNX</b></a>

-		        <br /> <br />

-					Before the Callisto release, our <a href="http://www.qnx.com/products/eval/index.html">QNX Momentics development platform</a> had to juggle the separate release schedules of the Eclipse Platform and the CDT project. It was difficult to co-ordinate plug-ins targeting our QNX's Neutrino operating system and stay current with Eclipse releases. With Callisto, we can now align our product initiatives with one Eclipse release schedule, and have a common platform upon which to integrate partner plug-ins from vendors such as Klocwork and other Eclipse projects.  The Callisto release will give us a tremendous boost in productivity and innovation, and help keep QNX Momentics the best commercially available Eclipse offering for the embedded market.<br /><br />		        

-			    <p style="text-align:right;"><a href="http://cdtdoug.blogspot.com/">Doug Schaefer</a> - <a href="http://www.qnx.com/">CDT Project lead and Software Tools Manager </a></p>

-		        </div></td>

-        		<td valign="center" style="padding-left:10px;">

-        		 <a href="http://www.qnx.com/">

-	        		<img src="/callisto/images/callistoeffectlogos/qnx_logo.gif" border=0 alt="QNX" title="QNX" style="float:right;clear:none;">

-    			 </a>

-        			</td>

-        	</tr>

-        </table>

-  <br />  

-        <table>

-       		<tr>

-       		    <td valign="center" style="padding-right:10px;">

-       		    	<a href="http://www.ilog.com/">

-       		    		<img src="/callisto/images/callistoeffectlogos/ilog.gif" border=0 alt="ILOG" title="ILOG" style="float:right;clear:none;">

-					</a>

-       		    </td>

- 

-       			<td><div class="contentBox">

-		        <a href="http://www.ilog.com/"><b>ILOG</b></a>

-		        <br /> <br />

-	        	For an ISV, managing project release lifecycles and version dependencies of independent Eclipse projects is a challenge that added complexity to the designing, building, testing and deploying of our <a href="http://www.ilog.com/products/jrules/">JRules product</a>. The Eclipse community has responded to the needs of ISVs with Callisto by unifying the release lifecycles of independent projects.  ILOG welcomes Callisto and we think this underscores the viability of Eclipse as a foundation for commercial software. We also expect our customers will appreciate the many enhancements in Eclipse 3.2 for enhancing user interfaces, code refactoring support and performance improvements. 

-		        

-    		        <br /><br />		        

-			    <p style="text-align:right;"><a href="http://www.ilog.com/">Daniel Selman</a> - <a href="http://www.ilog.com/">Product Manager</a></p>

-		        </div></td>

-        	</tr>

-        </table>  

-           <br />     

-       	<table>

-       		<tr>

-       			<td><div class="contentBox">

-		        <a href="http://www.ibm.com/"><b>IBM</b></a>

-		        <br /> <br />

-					Callisto combines into a single release major developments with existing and new packages, including the WTP, TPTP, and GMF projects. Callisto is a big step forward for Eclipse because the simultaneous release of multiple projects will make it easier for both commercial and open source projects to adopt a broad array of Eclipse technology. Here at <a href="http://www-306.ibm.com/software/rational/">IBM Rational</a> this is important because Eclipse underlies most Rational products and more than 200 IBM products altogether. We invite you to discover IBM Rational Eclipse-based solutions for application development, modeling, and testing, as well as the many other innovative ways that IBM contributes to and utilizes Eclipse<br /><br />		        

-			    <p style="text-align:right;"><a href="http://www.ibm.com/">Lee Nackman</a> - <a href="http://www.ibm.com/">VP Product Development and Customer Support, IBM Rational</a></p>

-		        </div></td>

-        		<td valign="center" style="padding-left:10px;">

-        		 <a href="http://www.ibm.com/">

-	        		<img src="/callisto/images/callistoeffectlogos/ibmlogo.bmp" border=0 alt="IBM" title="IBM" style="float:right;clear:none;">

-    			 </a>

-        			</td>

-        	</tr>

-        </table>

-  <br />  

-        <table>

-       		<tr>

-       		    <td valign="center" style="padding-right:10px;">

-       		    	<a href="http://www.oracle.com/">

-       		    		<img src="/callisto/images/callistoeffectlogos/oraclelogo.gif" border=0 alt="Oracle" title="Oracle" style="float:right;clear:none;">

-					</a>

-       		    </td>

- 

-       			<td><div class="contentBox">

-		        <a href="http://www.oracle.com/"><b>Oracle</b></a>

-		        <br /> <br />

-	        	Helping developers improve productivity, while adhering to industry standards and providing a choice in technologies, is a key focus for Oracle and one of the reasons we are an Eclipse member. The Callisto Simultaneous Release brings several Eclipse projects together in one release with the same goal in mind -- to help the developer community be more productive.

-    		        <br /><br />		        

-			    <p style="text-align:right;"><a href="http://otazi.blogspot.com/">Omar Tazi</a> - <a href="http://www.oracle.com/">Chief Open Source evangelist, Middleware and Tools</a></p>

-		        </div></td>

-        	</tr>

-        </table>  

-           <br />     

-       	<table>

-       		<tr>

-       			<td><div class="contentBox">

-		        <a href="http://www.capeclear.com/"><b>Cape Clear</b></a>

-		        <br /> <br />

-					Cape Clear believes that ease-of-use is critical to the success of SOA projects. <a href="http://www.capeclear.com/products/studio.shtml">Cape Clear Studio</a>, an IDE supporting the end-to-end development of SOA-based applications, is based on WTP and the Eclipse Project. The efficiencies gained by building on the Eclipse platform have enabled us to accelerate the delivery of ease-of-use innovations to our customers. And the widespread adoption of Eclipse has opened the door to a number of interesting partnerships with other Eclipse plug-in providers. We view the Callisto release as another huge step forward in reducing the cost of building quality development tools.

-					<br /><br />		        

-			    <p style="text-align:right;"><a href="http://www.capeclear.com/">Jim Rivera</a> - <a href="http://www.capeclear.com/">VP of Product Management</a></p>

-		        </div></td>

-        		<td valign="center" style="padding-left:10px;">

-        		 <a href="http://www.capeclear.com/">

-	        		<img src="/callisto/images/callistoeffectlogos/capeclear.gif" border=0 alt="Cape Clear" title="Cape Clear" style="float:right;clear:none;">

-    			 </a>

-        			</td>

-        	</tr>

-        </table>

-  <br />  

-        <table>

-       		<tr>

-       		    <td valign="center" style="padding-right:10px;">

-       		    	<a href="http://www.novell.com/">

-       		    		<img src="/callisto/images/callistoeffectlogos/novell.gif" border=0 alt="Novell" title="Novell" style="float:right;clear:none;">

-					</a>

-       		    </td>

- 

-       			<td><div class="contentBox">

-		        <a href="http://www.novell.com/"><b>Novell</b></a>

-		        <br /> <br />

-	        	At Novell, we ship and support Eclipse as a key component of our SUSE Linux Enterprise SDK.  The Callisto release is key to Novell's continuing success with Eclipse.  Callisto's simultaneous release of all ten top-level Eclipse projects will allow Novell to offer a supported development environment to a much broader development audience.

-    		        <br /><br />		        

-			    <p style="text-align:right;"><a href="http://www.novellcom/">Chris Cooper</a> - <a href="http://www.oracle.com/">Director, Novell Partner Engineering</a></p>

-		        </div></td>

-        	</tr>

-        </table>

-           <br />     

-       	<table>

-       		<tr>

-       			<td><div class="contentBox">

-		        <a href="http://www.bandxi.com/"><b>BandXI</b></a>

-		        <br /> <br />

-					The Equinox OSGi R4 implementation and supporting tooling available in the Callisto release provide the foundation for rapidly delivering high quality embedded Java applications to our clients.  Band XI International has successfully test deployed an Equinox based solution for the Michigan National Guard's Weapons of Mass Destruction Civil Support Team.  This embedded Java solution represents a new breed of application, called sensor fusion, in which a remote, mobile device connects to an array of sensors and broadcasts sensing information across a secure network. Combined with location information, anyone on the grid has real-time situation awareness of what chemical, biological, radiological, nuclear, or explosive (CBRNE) threats are detected and where they have been encountered. Developing this solution with the Eclipse tooling and components has enabled Band XI and the US Army to work in a very agile manner, challenging conventional notions about cycle times for government projects.

-					<br /><br />		        

-			    <p style="text-align:right;"><a href="http://www.bandxi.com/">John Cunningham</a> - <a href="http://www.bandxi.com/">President, Band XI International</a></p>

-		        </div></td>

-        		<td valign="center" style="padding-left:10px;">

-        		 <a href="http://www.bandxi.com/">

-	        		<img src="/callisto/images/callistoeffectlogos/bandxi.jpg" border=0 alt="BandXI" title="BandXI" style="float:right;clear:none;">

-    			 </a>

-        			</td>

-        	</tr>

-        </table>        

-    

-     <br />  

-        <table>

-       		<tr>

-       		    <td valign="center" style="padding-right:10px;">

-       		    	<a href="http://www.postgresql.at">

-       		    		<img src="/callisto/images/callistoeffectlogos/cybertec.jpg" border=0 alt="Cybertec Geschwinde & Schönig GmbH" title="Cybertec Geschwinde & Schönig GmbH" style="float:right;clear:none;">

-					</a>

-       		    </td>

- 

-       			<td><div class="contentBox">

-		        <a href="http://www.postgresql.at"><b>Cybertec Geschwinde & Schönig GmbH</b></a>

-		        <br /> <br />

-	       Cybertec has been using Eclipse for a long time now because it provides 

-	       infrastructure to build wonderful SWT based client applications. In addition 

-	       to that it provides tools such as BIRT our customers can use for reporting 

-	       and to deal with PostgreSQL. We are also using the C / C++ as well as the 

-	       Java IDE to debug existing applications efficiently.

-	       <br /><br />		        

-			    <p style="text-align:right;"><a href="http://www.postgresql.at">Hans-Jürgen Schönig</a> - <a href="http://www.postgresql.at">CEO</a></p>

-		        </div></td>

-        	</tr>

-        </table>

-            

-        

-        

-        <h2>Add yourself to this page!</h2>

-        <p>

-  Send an email to <a href="mailto:callisto.feedback@eclipse.org">callisto.feedback@eclipse.org</a>

-        </p>

-        

-        

-

-	</div>

-

-</div>

+$App = new App();

+$Nav = new Nav();

+$Menu = new Menu();

+include($App->getProjectCommon()); // All on the same line to unclutter the user's desktop'

 

 

+// Begin: page-specific settings. Change these.

+$pageTitle 		= "Callisto Effect";

+$pageKeywords	= "callisto marketing ";

+$pageAuthor		= "Nathan Gervais";

 

+// Place your html content in a file called content/en_pagename.php

+ob_start();

+include("content/en_" . $App->getScriptName());

+$html = ob_get_clean();

 

-EOHTML;

+# Generate the web page

 

-	# Generate the web page

-$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);

-?>

+$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="/callisto/callisto.css" media="screen" />');

+$App->generatePage(NULL, $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);
\ No newline at end of file
diff --git a/callistoprojects.php b/callistoprojects.php
index 881eb15..4b3c2aa 100644
--- a/callistoprojects.php
+++ b/callistoprojects.php
@@ -1,63 +1,36 @@
-<?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'
+<?php
+/*******************************************************************************
+ * Copyright(c) 2015 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:
+ *    Nathan Gervais(Eclipse Foundation) - Initial implementation
+ *    Eric Poirier(Eclipse Foundation)
+ *******************************************************************************/
+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");
 
-	#*****************************************************************************
-	#
-	# template.php
-	#
-	# Author: 		Denis Roy
-	# Date:			2005-06-16
-	#
-	# Description: Type your page comments here - these are not sent to the browser
-	#
-	#
-	#****************************************************************************
-	
-	#
-	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "Eclipse Callisto Projects";
-	$pageKeywords	= "callisto marketing ";
-	$pageAuthor		= "Nathan Gervais";
-	
-	# Add page-specific Nav bars here
-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 1);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 1);
-
-	# End: page-specific settings
-	#
-	// This file is linked to from lots of different places.
-	// Use absolute paths to make sure that we can actually test
-	// that the file renders properly (i.e. testing using) "/index.php",
-	// and "/home/index.php" both work.
-
-		
-	# Paste your HTML content between the EOHTML markers!	
-	$html = <<<EOHTML
-<link rel="stylesheet" type="text/css" href="callisto.css" media="screen" />
-<div class="callistoRealEstate">
-	<div>
-        <h1>$pageTitle</h1>
-        	<p> Below is a listing of all ten projects involved in the Callisto Simuntaneous Release</p>
-        	<ul>
-        		<li><a href="/birt/">Business Intelligence and Reporting Tools (BIRT) Project</a></li>
-        		<li><a href="/cdt/">C/C++ IDE (CDT)</a></li>
-        		<li><a href="/datatools/">Data Tools Platform (DTP)</a></li>
-        		<li><a href="/emf/">Eclipse Modeling Framework (EMF)</a></li>
-        		<li><a href="/gef/">Graphical Editing Framework (GEF)</a></li>
-        		<li><a href="/gmf/">Graphical Modeling Framework (GMF)</a></li>
-        		<li><a href="/eclipse/">Eclipse Project</a></li>
-        		<li><a href="/tptp/">Eclipse Test and Performance Tools Platform Project (TPTP)</a></li>
-        		<li><a href="/webtools/">Eclipse Web Tools Platform Project (WTP)</a></li>
-        		<li><a href="/vep/">Visual Editor (VE)</a></li>
-        	</ul><br /><br />
-    </div>
-</div>
+$App = new App();
+$Nav = new Nav();
+$Menu = new Menu();
+include($App->getProjectCommon()); // All on the same line to unclutter the user's desktop'
 
 
-EOHTML;
+// Begin: page-specific settings. Change these.
+  $pageTitle    = "Eclipse Callisto Projects";
+  $pageKeywords = "callisto marketing ";
+  $pageAuthor   = "Nathan Gervais";
 
-	# Generate the web page
-	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
-        
\ No newline at end of file
+// Place your html content in a file called content/en_pagename.php
+ob_start();
+include("content/en_" . $App->getScriptName());
+$html = ob_get_clean();
+
+# Generate the web page
+
+$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="/callisto/callisto.css" media="screen" />');
+$App->generatePage(NULL, $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);
\ No newline at end of file
diff --git a/callistotags.php b/callistotags.php
index 33bbc0e..ee442b8 100644
--- a/callistotags.php
+++ b/callistotags.php
@@ -1,70 +1,36 @@
-<?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'
+<?php
+/*******************************************************************************
+ * Copyright(c) 2015 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:
+ *    Nathan Gervais(Eclipse Foundation) - Initial implementation
+ *    Eric Poirier(Eclipse Foundation)
+ *******************************************************************************/
+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");
 
-	#*****************************************************************************
-	#
-	# template.php
-	#
-	# Author: 		Denis Roy
-	# Date:			2005-06-16
-	#
-	# Description: Type your page comments here - these are not sent to the browser
-	#
-	#
-	#****************************************************************************
-	
-	#
-	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "Callisto Blogs";
-	$pageKeywords	= "callisto marketing ";
-	$pageAuthor		= "Nathan Gervais";
-	
-	# Add page-specific Nav bars here
-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 1);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 1);
-
-	# End: page-specific settings
-	#
-	// This file is linked to from lots of different places.
-	// Use absolute paths to make sure that we can actually test
-	// that the file renders properly (i.e. testing using) "/index.php",
-	// and "/home/index.php" both work.
-
-		
-	# Paste your HTML content between the EOHTML markers!	
-	$html = <<<EOHTML
-<link rel="stylesheet" type="text/css" href="callisto.css" media="screen" />
-<div class="callistoRealEstate">
-	<div class="maincontent">
-        <h1>Callisto Tags</h1>
-        <p>
-        
-			<script type="text/javascript" src="http://del.icio.us/feeds/js/ianskerrett/callisto-blogs?tags;extended;title=Callisto%20Related%20Blogs;icon"></script>
-			<noscript><a href="http://del.icio.us/ianskerrett/callisto-blogs">Callisto Related Blogs</a></noscript>
-        </p>
-        
-        <p>
-			<script type="text/javascript" src="http://del.icio.us/feeds/js/ianskerrett/callisto?tags;extended;count=30;title=Callisto%20News%20Items;icon"></script>
-			<noscript><a href="http://del.icio.us/ianskerrett/callisto">Callisto News Coverage</a></noscript>        
-        </p>
-       
-        <h3>Add yourself to this page!</h2>
-        <p>
-  Send a link to <strong>for:ianskerrett</strong> using del.icio.us <strong>for:</strong> tag.</a>
-        </p>
-        
-        
-
-	</div>
-
-</div>
+$App = new App();
+$Nav = new Nav();
+$Menu = new Menu();
+include($App->getProjectCommon()); // All on the same line to unclutter the user's desktop'
 
 
+// Begin: page-specific settings. Change these.
+  $pageTitle    = "Callisto Blogs";
+  $pageKeywords = "callisto marketing ";
+  $pageAuthor   = "Nathan Gervais";
 
+// Place your html content in a file called content/en_pagename.php
+ob_start();
+include("content/en_" . $App->getScriptName());
+$html = ob_get_clean();
 
-EOHTML;
+# Generate the web page
 
-	# Generate the web page
-$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
+$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="/callisto/callisto.css" media="screen" />');
+$App->generatePage(NULL, $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);
\ No newline at end of file
diff --git a/content/en_c-dev.php b/content/en_c-dev.php
new file mode 100644
index 0000000..983531d
--- /dev/null
+++ b/content/en_c-dev.php
@@ -0,0 +1,129 @@
+<?php
+/*******************************************************************************
+ * Copyright(c) 2015 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:
+ *    Nathan Gervais(Eclipse Foundation) - Initial implementation
+ *    Eric Poirier(Eclipse Foundation)
+ *******************************************************************************/
+ ?>
+
+<div class="callistoRealEstate paddingLeft">
+  <div class="maincontent">
+    <table cellspacing=0 class="callistoButtons">
+      <tr>
+        <td width="50"><img src="/callisto/images/c.jpg"></a></td>
+        <td width="100%" class="noRightBorder">Eclipse for C/C++
+          Developers</td>
+      </tr>
+    </table>
+
+
+    <p>The Eclipse C/C++ Development Tools (CDT) runs on top of the
+      Eclipse Platform. The CDT provides advanced functionality for
+      C/C++ developers, including:</p>
+
+    <ul>
+      <li>C/C++ Editor (basic functionality, syntax highlighting, code
+        completion etc.)</li>
+      <li>C/C++ Debugger (APIs &amp; Default implementation, using GDB)
+      </li>
+      <li>C/C++ Launcher (APIs &amp; Default implementation, launches
+        and external application)</li>
+      <li>Parser</li>
+      <li>Search Engine</li>
+      <li>Content Assist Provider</li>
+      <li>Makefile generator</li>
+    </ul>
+
+    <p>
+      You need to use the <a href="/callisto/discovery.php">Callisto Discovery
+        Site</a> to add the CDT features.
+    </p>
+
+    <div class="homeitem" style="min-height: 250px">
+      <h3>What do you need?</h3>
+      <p>
+        <strong><a
+          href="http://archive.eclipse.org/eclipse/downloads/drops/R-3.2-200606291905/index.html">Eclipse
+            3.2</a> is required for Callisto.</strong> There is no
+        upgrade path from previous versions of Eclipse.
+      </p>
+
+      <ul>
+        <li style="border-style: none">The <a
+          href="http://download.eclipse.org/eclipse/downloads/drops/R-3.2-200606291905/callisto.php">Eclipse
+            Platform Runtime</a> <span style="white-space: nowrap">Binaries<img
+            id="platform-down" src="/callisto/images/down.png"
+            onclick="show_section('platform');" /></span>
+          <div id="platform"
+            style="border-style: solid; border-width: 1px; margin-left: 5%; display: none">
+            <h3>
+              <img onclick="hide_section('platform');" align="right"
+                src="/callisto/images/close.png" />Eclipse SDK
+            </h3>
+            The Eclipse Platform Runtime Binaries provides base
+            integrated development environment (IDE) functionality, but
+            without support for any specific programming language.
+            Combining the CDT with the Platform Runtime forms a
+            first-class C/C++ IDE.
+          </div>
+        </li>
+        <li style="border-style: none">The C/C++ Development tools <span
+          style="white-space: nowrap">(<a href="/cdt">CDT</a>)<img
+            id="cdt-down" src="/callisto/images/down.png"
+            onclick="show_section('cdt');" /></span>
+          <div id="cdt"
+            style="border-style: solid; border-width: 1px; margin-left: 5%; display: none">
+            <h3>
+              <img onclick="hide_section('cdt');" align="right"
+                src="/callisto/images/close.png" />CDT
+            </h3>
+            The CDT provides advanced functionality for C/C++
+            developers. Combining the CDT with the Platform Runtime
+            forms a first-class C/C++ IDE.
+          </div>
+        </li>
+      </ul>
+    </div>
+    <div class="homeitem">
+      <h3>Tutorials and Help</h3>
+      <ul>
+        <li
+          style="list-style-image: url(/callisto/images/movie.png); border-style: none"><a
+          href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/install-eclipse/install-eclipse.html">Installing
+            the Eclipse SDK</a></li>
+        <li
+          style="list-style-image: url(/callisto/images/movie.png); border-style: none"><a
+          href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/install-cdt/callisto-cdt.html">Installing
+            and using the C/C++ Development Tools</a></li>
+        <li
+          style="list-style-image: url(/callisto/images/tutorial.png); border-style: none"><a
+          href="http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/cdt-home/user/Tutorials.html?cvsroot=Tools_Project">CDT
+            Tutorials</a></li>
+        <li
+          style="list-style-image: url(/callisto/images/movie.png); border-style: none"><a
+          href="http://www.eclipse.org/evangelism/demos/install-callisto/install-callisto.html">Installing
+            Features from the Callisto Discovery Site</a></li>
+      </ul>
+    </div>
+
+
+    <div class="homeitem">
+      <h3>Suggested reading</h3>
+      <ul>
+        <li
+          style="list-style-image: url(/callisto/images/document.png); border-style: none"><a
+          href="/cdt">The CDT home page</a></li>
+        <li
+          style="list-style-image: url(/callisto/images/document.png); border-style: none"><a
+          href="http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/cdt-home/user/faq.html?cvsroot=Tools_Project">Frequently
+            asked questions about the CDT</a></li>
+      </ul>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/content/en_callistoeffect.php b/content/en_callistoeffect.php
new file mode 100644
index 0000000..03e7ed1
--- /dev/null
+++ b/content/en_callistoeffect.php
@@ -0,0 +1,738 @@
+<?php
+/*******************************************************************************
+ * Copyright(c) 2015 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:
+ *    Nathan Gervais(Eclipse Foundation) - Initial implementation
+ *    Eric Poirier(Eclipse Foundation)
+ *******************************************************************************/
+ ?>
+
+    <h1>Callisto Effect</h1>
+    <p>The following are just some of the examples of what Eclipse
+      members are doing with Callisto.</p>
+    <table>
+      <tr>
+        <td><div class="contentBox">
+            <a href="http://www.businessobjects.com/eclipse"><b>Business
+                Objects</b></a> <br /> <br /> At Business Objects we are
+            really excited about the Callisto release and have decided
+            to leverage this as the foundation for the release of <a
+              href="http://www.businessobjects.com/eclipse">Crystal
+              Reports for Eclipse</a>. Crystal Reports for Eclipse uses
+            a number of plugins (GEF, WTP, DTP), and benefits from the
+            Callisto release. The simultaneous release aspect makes it a
+            lot easier for us to provide a supported platform list to
+            our end users as opposed to calling out specific versions of
+            each dependent plugin. This efficiency simplifies our
+            testing and validation process saving time for us and
+            providing higher quality for our customers. <br />
+            <br />
+            <p style="text-align: right;">
+              <a href="http://creclipse.blogspot.com/">Tim Lang</a> - <a
+                href="http://www.businessobjects.com/eclipse">VP
+                Developer Programs</a>
+            </p>
+          </div></td>
+        <td valign="center" style="padding-left: 10px;"><a
+          href="http://www.businessobjects.com/eclipse"> <img
+            src="/callisto/images/callistoeffectlogos/businessobjects.gif"
+            border=0 alt="BusinessObjects" title="BusinessObjects"
+            style="float: right; clear: none;">
+        </a></td>
+      </tr>
+    </table>
+    <br />
+    <table>
+      <tr>
+        <td valign="center" style="padding-right: 10px;"><a
+          href="http://www.intalio.com/"> <img
+            src="/callisto/images/callistoeffectlogos/intalio.gif"
+            border=0 alt="intalio" title="intalio"
+            style="float: right; clear: none;">
+        </a></td>
+
+        <td><div class="contentBox">
+            <a href="http://intalio.com"><b>Intalio</b></a> <br /> <br />
+            Intalio uses Eclipse as the foundation for the <a
+              href="http://intalio.com/products/designer/index.html">Intalio|BPMS
+              Designer</a> product, the first BPM development tool to
+            provide Zero Code and One Click Deploy capabilities for
+            complex business processes. Without the robustness of the
+            Eclipse platform and the support we are getting from the
+            thriving Eclipse community, building such a product would
+            never ave been possible. We look forward to the Callisto
+            release as one that will push the envelope even further, and
+            make Eclipse the de-facto standard for Java-based
+            development environments. <br />
+            <br />
+            <p style="text-align: right;">
+              <a href="http://itredux.com/">Ismael Ghalimi</a> - <a
+                href="http://intalio.com">Founder and CEO</a>
+            </p>
+          </div></td>
+      </tr>
+    </table>
+    <br />
+    <table>
+      <tr>
+        <td><div class="contentBox">
+            <a href="http://http://www.scapatech.com/home.html/"><b>Scapa
+                Technologies</b></a> <br /> <br /> Scapa is planning to
+            release a new version of its <a
+              href="http://www.scapatech.com/products_services/intro.html">Test
+              and Perfomance Platform</a> later in the year, which will
+            be built on TPTP, BIRT, EMF, GEF and WTP as well as the
+            Eclipse Platform, so it is imperative that we are able to
+            have these projects ship in a coordinated manner with full
+            integration testing. <br />
+            <br />
+            <p style="text-align: right;">
+              <a href="http://www.scapatech.com/">Mike Norman</a> - <a
+                href="http://www.scapatech.com">Chief Executive and
+                President</a>
+            </p>
+          </div></td>
+        <td valign="center" style="padding-left: 10px;"><a
+          href="http://www.scapatech.com/"> <img
+            src="/callisto/images/callistoeffectlogos/scapatech.gif"
+            border=0 alt="Scapatech" title="Scapatech"
+            style="float: right; clear: none;">
+        </a></td>
+      </tr>
+    </table>
+    <br />
+    <table>
+      <tr>
+        <td valign="center" style="padding-right: 10px;"><a
+          href="http://www.bea.com/"> <img
+            src="/callisto/images/callistoeffectlogos/bealogo.gif"
+            border=0 alt="BEA" title="BEA"
+            style="float: right; clear: none;">
+        </a></td>
+
+        <td><div class="contentBox">
+            <a href="http://bea.com"><b>BEA</b></a> <br /> <br /> The
+            Callisto release, consisting of the Eclipse platform 3.2 and
+            the Web Tools platform (WTP) version 1.5 is designed to
+            represent an improvement in the stability and performance
+            for next generation <a
+              href="http://workshopstudio.bea.com/download.do?source=banner_eclipse.org_callistoeffect">web
+              application tooling</a>. This is a key part of our <a
+              href="http://www.bea.com/blended">Blended Strategy</a> and
+            shows that - as a major contributor to Eclipse and WTP, BEA
+            was able to be the first enterprise vendor to deliver a
+            commercial product on the Callisto platform. Partnering with
+            the community continually hones the edge <a
+              href="http://workshopstudio.bea.com/download.do?source=banner_eclipse.org_callistoeffect">BEA
+              Workshop Studio</a> needs to be the "<a
+              href="http://dev2dev.bea.com/blog/phumphrey/archive/2006/04/eclipse_awards.html">Best
+              Commercial Eclipse-Based Tool</a>". <br />
+            <br />
+            <p style="text-align: right;">
+              <a href="http://dev2dev.bea.com/blog/wgroth2/">Bill Roth</a>
+              - <a href="http://dev2dev.bea.com/blog/wgroth2/">Vice
+                President, Workshop Studio</a>
+            </p>
+          </div></td>
+      </tr>
+    </table>
+    <br />
+    <table>
+      <tr>
+        <td><div class="contentBox">
+            <a href="http://www.lombardisoftware.com/"><b>Lombardi</b></a>
+            <br /> <br /> Lombardi won the <a
+              href="http://www.eclipse.org/org/foundation/eclipseawards/winners.php">Best
+              Commercial RCP Award</a> because we fully leverage the
+            Eclipse platform to deliver value to our customers. With the
+            Calisto release, we will be able to improve <a
+              href="http://www.lombardisoftware.com/bpm-software-solutions.php">Lombardi's
+              BPM products</a> more quickly and easily. Additionally,
+            our products will also integrate better with all the new
+            Eclipse projects, such as BIRT, WTP, GMF, delivering an even
+            richer and more sophisticated set of tools that drive
+            customer business processes, models, events, rules, and
+            dashboards. <br />
+            <br />
+            <p style="text-align: right;">
+              <a href="http://www.lombardisoftware.com/">Damion Heredia</a>
+              - <a href="http://www.lombardisoftware.com">Director of
+                Product Management</a>
+            </p>
+          </div></td>
+        <td valign="center" style="padding-left: 10px;"><a
+          href="http://www.lombardisoftware.com/"> <img
+            src="/callisto/images/callistoeffectlogos/lombardi.PNG"
+            border=0 alt="Lombardi" title="Lombardi"
+            style="float: right; clear: none;">
+        </a></td>
+      </tr>
+    </table>
+    <br />
+    <table>
+      <tr>
+        <td valign="center" style="padding-right: 10px;"><a
+          href="http://www.lynuxworks.com/"> <img
+            src="/callisto/images/callistoeffectlogos/lynuxlogo.gif"
+            border=0 alt="LynuxWorks" title="LynuxWorks"
+            style="float: right; clear: none;">
+        </a></td>
+
+        <td><div class="contentBox">
+            <a href="http://www.lynuxworks.com/"><b>LynuxWorks</b></a> <br />
+            <br /> At LynuxWorks we use Eclipse to power our <a
+              href="http://www.lynuxworks.com/products/eclipse/luminosity.php">
+              Luminosity IDE. </a> Luminosity provides a embedded
+            software development system for both Linux developers and
+            users of our POSIX based LynxOS real-time operating system.
+
+            We take advantage of the CDT project today and are looking
+            to also use elements from the TPTP and DSDP projects in our
+            future releases. Callisto is giving us a huge amount of
+            confidence that we can deliver our next version on-time, as
+            all the project pieces we need will be available with the
+            new Eclipse platform from day one. <br />
+            <br />
+            <p style="text-align: right;">
+              <a href="http://www.lynuxworks.com/">Robert Day</a> - <a
+                href="http://www.lynuxworks.com/">Vice President,
+                Marketing</a>
+            </p>
+          </div></td>
+      </tr>
+    </table>
+    <br />
+    <table>
+      <tr>
+        <td><div class="contentBox">
+            <a href="http://www.innoopract.de/"><b>Innoopract</b></a> <br />
+            <br /> As a provider of the <a href="http://www.yoxos.com/">
+              Yoxos Eclipse distribution, </a> Innoopract is very aware
+            of the importance of a coordinated release of Eclipse
+            software. Callisto is a great step towards our mission of
+            making Eclipse easier to manage and update. Starting with
+            the first release of Callisto, it will be an important part
+            of our distribution offerings. Yoxos users will be able to
+            easily extend Callisto and build custom configurations of
+            Eclipse and third-party plugins and features through an
+            Ajax-enabled �Download-on-Demand� service. Developers can
+            pick & choose in a Web browser exactly those plugins they
+            wish to install. <br />
+            <br />
+            <p style="text-align: right;">
+              <a href="http://www.innoopract.de/">Eric von der Heyden</a>
+              - <a href="http://www.innoopract.de/">Managing Director</a>
+            </p>
+          </div></td>
+        <td valign="center" style="padding-left: 10px;"><a
+          href="http://www.innoopract.de/"> <img
+            src="/callisto/images/callistoeffectlogos/innologo.jpg"
+            border=0 alt="Innoopract" title="Innoopract"
+            style="float: right; clear: none;">
+        </a></td>
+      </tr>
+    </table>
+
+    <br />
+    <table>
+      <tr>
+        <td valign="center" style="padding-right: 10px;"><a
+          href="http://www.intervoice.com/"> <img
+            src="/callisto/images/callistoeffectlogos/intervoicelogo.gif"
+            border=0 alt="Intervoice" title="Intervoice"
+            style="float: right; clear: none;">
+        </a></td>
+
+        <td><div class="contentBox">
+            <a href="http://www.intervoice.com/"><b>Intervoice</b></a> <br />
+            <br /> Intervoice has adopted the Eclipse Platform as our
+            framework for delivering development tools for our <a
+              href="http://www.intervoice.com/prod_ent_media_exchange.cfm">
+              Media Exchange platform. </a> Using Eclipse allows my team
+            to focus on developing plug-in technologies that leverage
+            our core competencies in voice automation while leveraging
+            the features of the Eclipse Platform, providing our
+            customers with tools that are ready to use for maximum
+            productivity. <br />
+            <br />
+            <p style="text-align: right;">
+              <a href="http://www.intervoice.com/">Andy Thomas</a> - <a
+                href="http://www.intervoice.com/">Vice President, Poduct
+                Development</a>
+            </p>
+          </div></td>
+      </tr>
+    </table>
+    <br />
+    <table>
+      <tr>
+        <td><div class="contentBox">
+            <a href="http://www.borland.com/"><b>Borland</b></a> <br />
+            <br /> The simultaneous release of the ten projects under
+            the Callisto Project banner helps commercial vendors like
+            Borland more easily leverage Eclipse technology within their
+            products. In addition to leveraging the Eclipse Web Tools
+            Platform within our award-winning IDE tools, the next major
+            release of <a
+              href="http://www.borland.com/us/products/together/index.html">
+              Borland�s Together modeling product, </a> expected this
+            summer, will incorporate technology from the 3.2 releases of
+            the Java Development Tools and C/C++ Development Tooling
+            projects. Additionally, we�ll be using the Eclipse Modeling
+            Framework and Graphical Modeling Framework as key components
+            within Borland�s next-generation modeling products. <br />
+            <br />
+            <p style="text-align: right;">
+              <a href="http://www.borland.com/">Rich Gronback</a> - <a
+                href="http://www.borland.com/">Chief Scientist</a>
+            </p>
+          </div></td>
+        <td valign="center" style="padding-left: 10px;"><a
+          href="http://www.borland.com/"> <img
+            src="/callisto/images/callistoeffectlogos/borland.gif"
+            border=0 alt="Borland" title="Borland"
+            style="float: right; clear: none;">
+        </a></td>
+      </tr>
+    </table>
+
+    <br />
+    <table>
+      <tr>
+        <td valign="center" style="padding-right: 10px;"><a
+          href="http://www.klocwork.com/"> <img
+            src="/callisto/images/callistoeffectlogos/klocwork.gif"
+            border=0 alt="Klocwork" title="Klocwork"
+            style="float: right; clear: none;">
+        </a></td>
+
+        <td><div class="contentBox">
+            <a href="http://www.klocwork.com/"><b>Klocwork</b></a> <br />
+            <br /> As an Eclipse Foundation Member and Eclipse
+            Add-In-Provider, Klocwork sees the Callisto project as an
+            important intiative. Our Eclipse commitment is an important
+            part of both our customer value proposition and internal
+            product development strategy. Klocwork customers benefit
+            from our relationship with Eclipse since they can access
+            Klocwork's leading <a
+              href="http://www.klocwork.com/products/klocworkk7.asp">
+              defect and vulnerability detection technology </a> inside
+            Eclipse's C,C++ & Java IDEs. In addition, Klocwork's
+            reporting tools are built using the Eclipse Rich Client
+            Platform, enabling a flexible, open platform for our own
+            product development. In short, the Callisto project will
+            help streamline our work with Eclipse and we see it as a
+            great step forward by the Eclipse Foundation. <br />
+            <br />
+            <p style="text-align: right;">
+              <a href="http://www.klocwork.com/">Ian Gordon</a> - <a
+                href="http://www.klocwork.com/">Vice President, Poduct
+                Management</a>
+            </p>
+          </div></td>
+      </tr>
+    </table>
+
+    <br />
+    <table>
+      <tr>
+        <td><div class="contentBox">
+            <a href="http://www.logiclibrary.com/"><b>LogicLibrary</b></a>
+            <br /> <br /> The successful, on-schedule completion of
+            Eclipse's Callisto initiative is a significant milestone for
+            the software industry. Our flagship product, <a
+              href="http://www.logiclibrary.com/solutions/logidex.php">
+              Logidex, </a> is tightly integrated with the Eclipse
+            development platform. This gives customers exceptional
+            flexibility to use the tools they need for development
+            projects and SOA initiatives. Eclipse has proven, yet again,
+            that it is possible to consistently deliver large scale,
+            world-class software projects that deliver great value. <br />
+            <br />
+            <p style="text-align: right;">
+              <a href="http://www.logiclibrary.com/">Brent Carlson</a> -
+              <a href="http://www.logiclibrary.com/">VP of Technology</a>
+            </p>
+          </div></td>
+        <td valign="center" style="padding-left: 10px;"><a
+          href="http://www.logiclibrary.com/"> <img
+            src="/callisto/images/callistoeffectlogos/logiclibrary.jpg"
+            border=0 alt="LogicLibrary" title="LogicLibrary"
+            style="float: right; clear: none;">
+        </a></td>
+      </tr>
+    </table>
+
+    <br />
+    <table>
+      <tr>
+        <td valign="center" style="padding-right: 10px;"><a
+          href="http://www.lattix.com/"> <img
+            src="/callisto/images/callistoeffectlogos/lattix.gif"
+            border=0 alt="Lattix" title="Lattix"
+            style="float: right; clear: none;">
+        </a></td>
+
+        <td><div class="contentBox">
+            <a href="http://www.lattix.com/"><b>Lattix</b></a> <br /> <br />
+
+            Callisto is a key part of our strategy to deliver more value
+            to our customers. With the Callisto release, our customers
+            will be able to expand their use of the <a
+              href="http://www.lattix.com/products/products.htm"> Lattix
+              LDM plugin </a> to manage the architecture of their
+            Eclipse projects. In addition to Java projects, the web
+            application tooling will allow our users to test the
+            architecture, detect violations while developing and prevent
+            architectural erosion of web applications. <br />
+            <br />
+            <p style="text-align: right;">
+              <a href="http://www.lattix.com/">Neeraj Sangal</a> - <a
+                href="http://www.lattix.com/">President</a>
+            </p>
+          </div></td>
+      </tr>
+    </table>
+
+    <br />
+    <table>
+      <tr>
+        <td><div class="contentBox">
+            <a href="http://www.avantsoft.com/"><b>AvantSoft</b></a> <br />
+            <br /> AvantSoft, Inc. is proud to announce that it has
+            successfully upgraded its full range of training and
+            professional services for the Callisto release. AvantSoft
+            consultants and project managers have embraced Callisto by
+            conducting special internal sessions on Callisto projects.
+            AvantSoft training programs have been updated with latest
+            release of Eclipse platform and Callisto projects CDT, GEF,
+            GMF, VE, DTP, EMF, WTP, TPTP, and BIRT. With this expertise,
+            AvantSoft team is ready to provide in-depth onsite corporate
+            training and execute consulting engagements using Callisto
+            projects. AvantSoft can help customers get ready for
+            Callisto through its full range of services - custom
+            training on Callisto projects, consulting resources with
+            expertise in Callisto projects, and project managers that
+            can set up teams and execute entire lifecycle of Eclipse
+            plugins and RCP application development using Callisto
+            projects. AvantSoft has provided excellent training courses
+            and executed consulting projects on Eclipse platform for
+            several large corporations all over U.S. and Europe. <br />
+            <br />
+            <p style="text-align: right;">
+              <a href="http://www.avantsoft.com/">Ashvin Radiya</a> - <a
+                href="http://www.avantsoft.com/">Founder and President</a>
+            </p>
+          </div></td>
+        <td valign="center" style="padding-left: 10px;"><a
+          href="http://www.avantsoft.com/"> <img
+            src="/callisto/images/callistoeffectlogos/avantsoft.PNG"
+            border=0 alt="AvantSoft" title="AvantSoft"
+            style="float: right; clear: none;">
+        </a></td>
+      </tr>
+    </table>
+    <br />
+    <table>
+      <tr>
+        <td valign="center" style="padding-right: 10px;"><a
+          href="http://www.actuate.com/"> <img
+            src="/callisto/images/callistoeffectlogos/actuate.gif"
+            border=0 alt="Actuate" title="Actuate"
+            style="float: right; clear: none;">
+        </a></td>
+
+        <td><div class="contentBox">
+            <a href="http://www.actuate.com/"><b>Actuate</b></a> <br />
+            <br /> Successful innovation is driven by ease of adoption
+            and compatibility. At Actuate we know that a key component
+            of our success is our ability to quickly and easily add the
+            latest and most cross-compatible technology into our
+            platform. For instance, we are using the Eclipse Data Tools
+            Platform and, with the release of <a
+              href="http://www.actuate.com/products/index.asp"> Actuate
+              9, </a> have included the BIRT project in our enterprise
+            reporting application platform. The Eclipse Callisto release
+            gives us the ability to more easily investigate the benefits
+            of adding other Eclipse projects to our platform and the
+            assurance that the Eclipse ecosystem will expand as the
+            benefits of using Eclipse as a standard development
+            environment continue to increase. <br />
+            <br />
+            <p style="text-align: right;">
+              <a href="http://www.actuate.com/">Mark Coggins</a> - <a
+                href="http://www.actuate.com/">Senior Vice President of
+                Engineering</a>
+            </p>
+          </div></td>
+      </tr>
+    </table>
+
+    <br />
+    <table>
+      <tr>
+        <td><div class="contentBox">
+            <a href="http://www.qnx.com/"><b>QNX</b></a> <br /> <br />
+            Before the Callisto release, our <a
+              href="http://www.qnx.com/products/eval/index.html">QNX
+              Momentics development platform</a> had to juggle the
+            separate release schedules of the Eclipse Platform and the
+            CDT project. It was difficult to co-ordinate plug-ins
+            targeting our QNX's Neutrino operating system and stay
+            current with Eclipse releases. With Callisto, we can now
+            align our product initiatives with one Eclipse release
+            schedule, and have a common platform upon which to integrate
+            partner plug-ins from vendors such as Klocwork and other
+            Eclipse projects. The Callisto release will give us a
+            tremendous boost in productivity and innovation, and help
+            keep QNX Momentics the best commercially available Eclipse
+            offering for the embedded market.<br />
+            <br />
+            <p style="text-align: right;">
+              <a href="http://cdtdoug.blogspot.com/">Doug Schaefer</a> -
+              <a href="http://www.qnx.com/">CDT Project lead and
+                Software Tools Manager </a>
+            </p>
+          </div></td>
+        <td valign="center" style="padding-left: 10px;"><a
+          href="http://www.qnx.com/"> <img
+            src="/callisto/images/callistoeffectlogos/qnx_logo.gif"
+            border=0 alt="QNX" title="QNX"
+            style="float: right; clear: none;">
+        </a></td>
+      </tr>
+    </table>
+    <br />
+    <table>
+      <tr>
+        <td valign="center" style="padding-right: 10px;"><a
+          href="http://www.ilog.com/"> <img
+            src="/callisto/images/callistoeffectlogos/ilog.gif" border=0
+            alt="ILOG" title="ILOG" style="float: right; clear: none;">
+        </a></td>
+
+        <td><div class="contentBox">
+            <a href="http://www.ilog.com/"><b>ILOG</b></a> <br /> <br />
+            For an ISV, managing project release lifecycles and version
+            dependencies of independent Eclipse projects is a challenge
+            that added complexity to the designing, building, testing
+            and deploying of our <a
+              href="http://www.ilog.com/products/jrules/">JRules product</a>.
+            The Eclipse community has responded to the needs of ISVs
+            with Callisto by unifying the release lifecycles of
+            independent projects. ILOG welcomes Callisto and we think
+            this underscores the viability of Eclipse as a foundation
+            for commercial software. We also expect our customers will
+            appreciate the many enhancements in Eclipse 3.2 for
+            enhancing user interfaces, code refactoring support and
+            performance improvements. <br />
+            <br />
+            <p style="text-align: right;">
+              <a href="http://www.ilog.com/">Daniel Selman</a> - <a
+                href="http://www.ilog.com/">Product Manager</a>
+            </p>
+          </div></td>
+      </tr>
+    </table>
+    <br />
+    <table>
+      <tr>
+        <td><div class="contentBox">
+            <a href="http://www.ibm.com/"><b>IBM</b></a> <br /> <br />
+            Callisto combines into a single release major developments
+            with existing and new packages, including the WTP, TPTP, and
+            GMF projects. Callisto is a big step forward for Eclipse
+            because the simultaneous release of multiple projects will
+            make it easier for both commercial and open source projects
+            to adopt a broad array of Eclipse technology. Here at <a
+              href="http://www-306.ibm.com/software/rational/">IBM
+              Rational</a> this is important because Eclipse underlies
+            most Rational products and more than 200 IBM products
+            altogether. We invite you to discover IBM Rational
+            Eclipse-based solutions for application development,
+            modeling, and testing, as well as the many other innovative
+            ways that IBM contributes to and utilizes Eclipse<br />
+            <br />
+            <p style="text-align: right;">
+              <a href="http://www.ibm.com/">Lee Nackman</a> - <a
+                href="http://www.ibm.com/">VP Product Development and
+                Customer Support, IBM Rational</a>
+            </p>
+          </div></td>
+        <td valign="center" style="padding-left: 10px;"><a
+          href="http://www.ibm.com/"> <img
+            src="/callisto/images/callistoeffectlogos/ibmlogo.bmp"
+            border=0 alt="IBM" title="IBM"
+            style="float: right; clear: none;">
+        </a></td>
+      </tr>
+    </table>
+    <br />
+    <table>
+      <tr>
+        <td valign="center" style="padding-right: 10px;"><a
+          href="http://www.oracle.com/"> <img
+            src="/callisto/images/callistoeffectlogos/oraclelogo.gif"
+            border=0 alt="Oracle" title="Oracle"
+            style="float: right; clear: none;">
+        </a></td>
+
+        <td><div class="contentBox">
+            <a href="http://www.oracle.com/"><b>Oracle</b></a> <br /> <br />
+            Helping developers improve productivity, while adhering to
+            industry standards and providing a choice in technologies,
+            is a key focus for Oracle and one of the reasons we are an
+            Eclipse member. The Callisto Simultaneous Release brings
+            several Eclipse projects together in one release with the
+            same goal in mind -- to help the developer community be more
+            productive. <br />
+            <br />
+            <p style="text-align: right;">
+              <a href="http://otazi.blogspot.com/">Omar Tazi</a> - <a
+                href="http://www.oracle.com/">Chief Open Source
+                evangelist, Middleware and Tools</a>
+            </p>
+          </div></td>
+      </tr>
+    </table>
+    <br />
+    <table>
+      <tr>
+        <td><div class="contentBox">
+            <a href="http://www.capeclear.com/"><b>Cape Clear</b></a> <br />
+            <br /> Cape Clear believes that ease-of-use is critical to
+            the success of SOA projects. <a
+              href="http://www.capeclear.com/products/studio.shtml">Cape
+              Clear Studio</a>, an IDE supporting the end-to-end
+            development of SOA-based applications, is based on WTP and
+            the Eclipse Project. The efficiencies gained by building on
+            the Eclipse platform have enabled us to accelerate the
+            delivery of ease-of-use innovations to our customers. And
+            the widespread adoption of Eclipse has opened the door to a
+            number of interesting partnerships with other Eclipse
+            plug-in providers. We view the Callisto release as another
+            huge step forward in reducing the cost of building quality
+            development tools. <br />
+            <br />
+            <p style="text-align: right;">
+              <a href="http://www.capeclear.com/">Jim Rivera</a> - <a
+                href="http://www.capeclear.com/">VP of Product
+                Management</a>
+            </p>
+          </div></td>
+        <td valign="center" style="padding-left: 10px;"><a
+          href="http://www.capeclear.com/"> <img
+            src="/callisto/images/callistoeffectlogos/capeclear.gif"
+            border=0 alt="Cape Clear" title="Cape Clear"
+            style="float: right; clear: none;">
+        </a></td>
+      </tr>
+    </table>
+    <br />
+    <table>
+      <tr>
+        <td valign="center" style="padding-right: 10px;"><a
+          href="http://www.novell.com/"> <img
+            src="/callisto/images/callistoeffectlogos/novell.gif"
+            border=0 alt="Novell" title="Novell"
+            style="float: right; clear: none;">
+        </a></td>
+
+        <td><div class="contentBox">
+            <a href="http://www.novell.com/"><b>Novell</b></a> <br /> <br />
+            At Novell, we ship and support Eclipse as a key component of
+            our SUSE Linux Enterprise SDK. The Callisto release is key
+            to Novell's continuing success with Eclipse. Callisto's
+            simultaneous release of all ten top-level Eclipse projects
+            will allow Novell to offer a supported development
+            environment to a much broader development audience. <br />
+            <br />
+            <p style="text-align: right;">
+              <a href="http://www.novellcom/">Chris Cooper</a> - <a
+                href="http://www.oracle.com/">Director, Novell Partner
+                Engineering</a>
+            </p>
+          </div></td>
+      </tr>
+    </table>
+    <br />
+    <table>
+      <tr>
+        <td><div class="contentBox">
+            <a href="http://www.bandxi.com/"><b>BandXI</b></a> <br /> <br />
+            The Equinox OSGi R4 implementation and supporting tooling
+            available in the Callisto release provide the foundation for
+            rapidly delivering high quality embedded Java applications
+            to our clients. Band XI International has successfully test
+            deployed an Equinox based solution for the Michigan National
+            Guard's Weapons of Mass Destruction Civil Support Team. This
+            embedded Java solution represents a new breed of
+            application, called sensor fusion, in which a remote, mobile
+            device connects to an array of sensors and broadcasts
+            sensing information across a secure network. Combined with
+            location information, anyone on the grid has real-time
+            situation awareness of what chemical, biological,
+            radiological, nuclear, or explosive (CBRNE) threats are
+            detected and where they have been encountered. Developing
+            this solution with the Eclipse tooling and components has
+            enabled Band XI and the US Army to work in a very agile
+            manner, challenging conventional notions about cycle times
+            for government projects. <br />
+            <br />
+            <p style="text-align: right;">
+              <a href="http://www.bandxi.com/">John Cunningham</a> - <a
+                href="http://www.bandxi.com/">President, Band XI
+                International</a>
+            </p>
+          </div></td>
+        <td valign="center" style="padding-left: 10px;"><a
+          href="http://www.bandxi.com/"> <img
+            src="/callisto/images/callistoeffectlogos/bandxi.jpg"
+            border=0 alt="BandXI" title="BandXI"
+            style="float: right; clear: none;">
+        </a></td>
+      </tr>
+    </table>
+
+    <br />
+    <table>
+      <tr>
+        <td valign="center" style="padding-right: 10px;"><a
+          href="http://www.postgresql.at"> <img
+            src="/callisto/images/callistoeffectlogos/cybertec.jpg"
+            border=0 alt="Cybertec Geschwinde & Sch�nig GmbH"
+            title="Cybertec Geschwinde & Sch�nig GmbH"
+            style="float: right; clear: none;">
+        </a></td>
+
+        <td><div class="contentBox">
+            <a href="http://www.postgresql.at"><b>Cybertec Geschwinde &
+                Sch�nig GmbH</b></a> <br /> <br /> Cybertec has been
+            using Eclipse for a long time now because it provides
+            infrastructure to build wonderful SWT based client
+            applications. In addition to that it provides tools such as
+            BIRT our customers can use for reporting and to deal with
+            PostgreSQL. We are also using the C / C++ as well as the
+            Java IDE to debug existing applications efficiently. <br />
+            <br />
+            <p style="text-align: right;">
+              <a href="http://www.postgresql.at">Hans-J�rgen Sch�nig</a>
+              - <a href="http://www.postgresql.at">CEO</a>
+            </p>
+          </div></td>
+      </tr>
+    </table>
+
+
+
+    <h2>Add yourself to this page!</h2>
+    <p>
+      Send an email to <a href="mailto:callisto.feedback@eclipse.org">callisto.feedback@eclipse.org</a>
+    </p>
+
+
diff --git a/content/en_callistoprojects.php b/content/en_callistoprojects.php
new file mode 100644
index 0000000..124ce01
--- /dev/null
+++ b/content/en_callistoprojects.php
@@ -0,0 +1,31 @@
+<?php
+/*******************************************************************************
+ * Copyright(c) 2015 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:
+ *    Nathan Gervais(Eclipse Foundation) - Initial implementation
+ *    Eric Poirier(Eclipse Foundation)
+ *******************************************************************************/
+ ?>
+
+<h1>Eclipse Callisto Projects</h1>
+<p>Below is a listing of all ten projects involved in the Callisto
+  Simuntaneous Release</p>
+<ul>
+  <li><a href="/birt/">Business Intelligence and Reporting Tools (BIRT)
+      Project</a></li>
+  <li><a href="/cdt/">C/C++ IDE (CDT)</a></li>
+  <li><a href="/datatools/">Data Tools Platform (DTP)</a></li>
+  <li><a href="/emf/">Eclipse Modeling Framework (EMF)</a></li>
+  <li><a href="/gef/">Graphical Editing Framework (GEF)</a></li>
+  <li><a href="/gmf/">Graphical Modeling Framework (GMF)</a></li>
+  <li><a href="/eclipse/">Eclipse Project</a></li>
+  <li><a href="/tptp/">Eclipse Test and Performance Tools Platform
+      Project (TPTP)</a></li>
+  <li><a href="/webtools/">Eclipse Web Tools Platform Project (WTP)</a></li>
+  <li><a href="/vep/">Visual Editor (VE)</a></li>
+</ul>
diff --git a/content/en_callistotags.php b/content/en_callistotags.php
new file mode 100644
index 0000000..1fe6471
--- /dev/null
+++ b/content/en_callistotags.php
@@ -0,0 +1,40 @@
+<?php
+/*******************************************************************************
+ * Copyright(c) 2015 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:
+ *    Nathan Gervais(Eclipse Foundation) - Initial implementation
+ *    Eric Poirier(Eclipse Foundation)
+ *******************************************************************************/
+ ?>
+
+<h1>Callisto Tags</h1>
+<p>
+  <script type="text/javascript"
+    src="http://del.icio.us/feeds/js/ianskerrett/callisto-blogs?tags;extended;title=Callisto%20Related%20Blogs;icon"></script>
+  <noscript>
+    <a href="http://del.icio.us/ianskerrett/callisto-blogs">Callisto
+      Related Blogs</a>
+  </noscript>
+</p>
+
+<p>
+  <script type="text/javascript"
+    src="http://del.icio.us/feeds/js/ianskerrett/callisto?tags;extended;count=30;title=Callisto%20News%20Items;icon"></script>
+  <noscript>
+    <a href="http://del.icio.us/ianskerrett/callisto">Callisto News
+      Coverage</a>
+  </noscript>
+</p>
+
+<h3>
+  Add yourself to this page!
+  </h2>
+  <p>
+    Send a link to <strong>for:ianskerrett</strong> using del.icio.us <strong>for:</strong>
+    tag.</a>
+  </p>
\ No newline at end of file
diff --git a/content/en_custom.php b/content/en_custom.php
new file mode 100644
index 0000000..f98092e
--- /dev/null
+++ b/content/en_custom.php
@@ -0,0 +1,311 @@
+<?php
+/*******************************************************************************
+ * Copyright(c) 2015 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:
+ *    Nathan Gervais(Eclipse Foundation) - Initial implementation
+ *    Eric Poirier(Eclipse Foundation)
+ *******************************************************************************/
+ ?>
+
+<table cellspacing=0 class="callistoButtons">
+  <tr>
+    <td width="50"><img src="/callisto/images/custom.jpg"></a></td>
+    <td width="100%" class="noRightBorder">Customize Your Callisto
+      Experience</td>
+  </tr>
+</table>
+<p>
+  The Callisto Experience starts with a small download in the form of
+  the Eclipse Platform Runtime Binaries. From this starting point, using
+  the <a href="discovery.php">Callisto Discovery Site</a>, you can add
+  as few or as many of the features produced by the ten projects
+  involved in the Callisto release train as you need.
+</p>
+
+<div class="homeitem">
+  <h3>What do you need?</h3>
+
+  <p>
+    <strong><a
+      href="http://download.eclipse.org/eclipse/downloads/drops/R-3.2-200606291905/index.html">Eclipse
+        3.2</a> is required for Callisto.</strong> There is no upgrade
+    path from previous versions of Eclipse.
+  </p>
+
+
+  <ul>
+    <li style="border-style: none">The <a
+      href="http://download.eclipse.org/eclipse/downloads/drops/R-3.2-200606291905/callisto.php">Eclipse
+        Platform Runtime</a> <span style="white-space: nowrap">Binaries<img
+        id="platform-down" src="/callisto/images/down.png"
+        onclick="show_section('platform');" /></span>
+      <div id="platform"
+        style="border-style: solid; border-width: 1px; margin-left: 5%; display: none">
+        <h3>
+          <img onclick="hide_section('platform');" align="right"
+            src="/callisto/images/close.png" />Eclipse SDK
+        </h3>
+        The Eclipse Platform Runtime Binaries provides base integrated
+        development environment (IDE) functionality, but without support
+        for any specific programming languages or tools. From the
+        Platform Runtime Binaries, you can connect to the Callisto
+        Discovery Site to install the features you need.
+      </div>
+    </li>
+    </li>
+    <li style="border-style: none">Optional features available via the <a
+      href="discovery.php">Callisto&nbsp;Discovery&nbsp;Site</a>
+      <ul>
+        <li style="border-style: none">C/C++ Development tools <span
+          style="white-space: nowrap">(<a href="/cdt">CDT</a>)<img
+            id="cdt-down" src="/callisto/images/down.png"
+            onclick="show_section('cdt');" /></span>
+          <div id="cdt"
+            style="border-style: solid; border-width: 1px; margin-left: 5%; display: none">
+            <h3>
+              <img onclick="hide_section('cdt');" align="right"
+                src="/callisto/images/close.png" />CDT
+            </h3>
+            The CDT provides advanced functionality for C/C++
+            developers. Combining the CDT with the Platform Runtime
+            forms a first-class C/C++ IDE.
+            <h4>Tutorials and Help</h4>
+            <ul>
+              <li
+                style="list-style-image: url(/callisto/images/movie.png); border-style: none"><a
+                href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/install-cdt/callisto-cdt.html">Installing
+                  and using the C/C++ Development Tools</a></li>
+              <li
+                style="list-style-image: url(/callisto/images/tutorial.png); border-style: none"><a
+                href="http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/cdt-home/user/Tutorials.html?cvsroot=Tools_Project">CDT
+                  Tutorials...</a></li>
+            </ul>
+          </div>
+        </li>
+
+        <li style="border-style: none">Data Tools <span
+          style="white-space: nowrap">(<a href="/datatools">DTP</a>)<img
+            id="dtp-down" src="/callisto/images/down.png"
+            onclick="show_section('dtp');" /></span>
+          <div id="dtp"
+            style="border-style: solid; border-width: 1px; margin-left: 5%; display: none">
+            <h3>
+              <img onclick="hide_section('dtp');" align="right"
+                src="/callisto/images/close.png" />Data Tools
+            </h3>
+            Data Tools provides tools for accessing, viewing and
+            manipulating databases and other data sources.
+          </div>
+        </li>
+
+        <li style="border-style: none">Eclipse Modeling Framework <span
+          style="white-space: nowrap">(<a href="/emf">EMF</a>)<img
+            id="emf-down" src="/callisto/images/down.png"
+            onclick="show_section('emf');" /></span>
+          <div id="emf"
+            style="border-style: solid; border-width: 1px; margin-left: 5%; display: none">
+            <h3>
+              <img onclick="hide_section('emf');" align="right"
+                src="/callisto/images/close.png" />Eclipse Modeling Framework
+            </h3>
+            EMF is a modeling framework and code generation facility for
+            building tools and other applications based on a structured
+            data model.
+          </div>
+        </li>
+
+        <li style="border-style: none">Graphical Editing Framework <span
+          style="white-space: nowrap">(<a href="/gef">GEF</a>)<img
+            id="gef-down" src="/callisto/images/down.png"
+            onclick="show_section('gef');" /></span>
+          <div id="gef"
+            style="border-style: solid; border-width: 1px; margin-left: 5%; display: none">
+            <h3>
+              <img onclick="hide_section('gef');" align="right"
+                src="/callisto/images/close.png" />Graphical Editing Framework
+            </h3>
+            The Graphical Editing Framework (GEF) allows developers to
+            take an existing application model and quickly create a rich
+            graphical editor.
+          </div>
+        </li>
+
+        <li style="border-style: none">Graphical Modeling Framework <span
+          style="white-space: nowrap">(<a href="/gmf">GMF</a>)<img
+            id="gmf-down" src="/callisto/images/down.png"
+            onclick="show_section('gmf');" /></span>
+          <div id="gmf"
+            style="border-style: solid; border-width: 1px; margin-left: 5%; display: none">
+            <h3>
+              <img onclick="hide_section('gmf');" align="right"
+                src="/callisto/images/close.png" />Graphical Modeling Framework
+            </h3>
+            The Eclipse Graphical Modeling Framework (GMF) provides a
+            generative component and runtime infrastructure for
+            developing graphical editors.
+          </div>
+        </li>
+
+        <li style="border-style: none">Java Development Tools <span
+          style="white-space: nowrap">(<a href="/jdt">JDT</a>)<img
+            id="jdt-down" src="/callisto/images/down.png"
+            onclick="show_section('jdt');" /></span>
+          <div id="jdt"
+            style="border-style: solid; border-width: 1px; margin-left: 5%; display: none">
+            <h3>
+              <img onclick="hide_section('jdt');" align="right"
+                src="/callisto/images/close.png" />Java Development Tools
+            </h3>
+            The Java Development Tools (JDT) provides tools that support
+            the development of any Java application, including Eclipse
+            plug-ins.
+            <ul>
+              <li
+                style="list-style-image: url(/callisto/images/movie.png); border-style: none"><a
+                href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/testfirst/testfirst.html">Test
+                  First Development using Eclipse</a></li>
+            </ul>
+          </div>
+        </li>
+
+        <li style="border-style: none">Java EE and Web Tools <span
+          style="white-space: nowrap">(<a href="/webtools">WTP</a>)<img
+            id="wtp-down" src="/callisto/images/down.png"
+            onclick="show_section('wtp');" /></span>
+          <div id="wtp"
+            style="border-style: solid; border-width: 1px; margin-left: 5%; display: none">
+            <h3>
+              <img onclick="hide_section('wtp');" align="right"
+                src="/callisto/images/close.png" />Java EE and Web Tools
+            </h3>
+            The Eclipse Web Tools Platform (WTP) extends the Eclipse
+            platform with tools for developing Java Enterprise Edition
+            and Web applications.
+            <ul>
+              <li
+                style="list-style-image: url(/callisto/images/tutorial.png); border-style: none"><a
+                href="http://www.eclipse.org/webtools/community/tutorials/BuildJ2EEWebApp/BuildJ2EEWebApp.html">Building
+                  and Running a Web Application</a></li>
+              <li
+                style="list-style-image: url(/callisto/images/tutorial.png); border-style: none"><a
+                href="http://www.eclipse.org/dali/viewlets/01-Add_Persistence_viewlet_swf.html">Adding
+                  Java Persistence API (JPA) Support to a Project</a></li>
+              <li
+                style="list-style-image: url(/callisto/images/tutorial.png); border-style: none"><a
+                href="http://www.eclipse.org/webtools/community/communityresources.html#tutorials">More
+                  Web and Java EE Tutorials...</a></li>
+            </ul>
+          </div>
+        </li>
+
+        <li style="border-style: none">Reporting Tools <span
+          style="white-space: nowrap">(<a href="/birt">BIRT</a>)<img
+            id="birt-down" src="/callisto/images/down.png"
+            onclick="show_section('birt');" /></span>
+          <div id="birt"
+            style="border-style: solid; border-width: 1px; margin-left: 5%; display: none">
+            <h3>
+              <img onclick="hide_section('birt');" align="right"
+                src="/callisto/images/close.png" />Reporting Tools
+            </h3>
+            BIRT is a reporting system that integrates with your
+            application to produce compelling reports for both web and
+            PDF.
+            <ul>
+              <li
+                style="list-style-image: url(/callisto/images/tutorial.png); border-style: none"><a
+                href="http://www.eclipse.org/birt/phoenix/tutorial/basic">Building
+                  a Simple Report with BIRT</a></li>
+              <li
+                style="list-style-image: url(/callisto/images/movie.png); border-style: none"><a
+                href="http://download.eclipse.org/birt/downloads/demos/FirstReport/MyFirstReport.html">My
+                  First Report</a></li>
+              <li
+                style="list-style-image: url(/callisto/images/tutorial.png); border-style: none"><a
+                href="http://www.eclipse.org/birt/phoenix/tutorial/">More
+                  BIRT Tutorials and screen casts...</a></li>
+            </ul>
+          </div>
+        </li>
+
+        <li style="border-style: none">Test and Performance Tools <span
+          style="white-space: nowrap">(<a href="/tptp">TPTP</a>)<img
+            id="tptp-down" src="/callisto/images/down.png"
+            onclick="show_section('tptp');" /></span>
+          <div id="tptp"
+            style="border-style: solid; border-width: 1px; margin-left: 5%; display: none">
+            <h3>
+              <img onclick="hide_section('tptp');" align="right"
+                src="/callisto/images/close.png" />Test and Performance Tools
+            </h3>
+            The Eclipse Test and Performance Tools Platform (TPTP)
+            Project provides an open platform supplying powerful
+            frameworks and services that allow software developers to
+            build unique test and performance tool, both open source and
+            commercial, that can be easily integrated with the platform
+            and with other tools.
+            <h4>Suggested reading</h4>
+            <ul>
+              <li
+                style="list-style-image: url(/callisto/images/tutorial.png); border-style: none"><a
+                href="http://www.eclipse.org/tptp/home/documents/conferences/eclipseCon2005/EclipseCon_2005_Tutorial_22_Antony_Miguel_Paul_Slauenwhite.pdf">Using
+                  TPTP Logging and Monitoring Tools</a></li>
+            </ul>
+          </div>
+        </li>
+
+        <li style="border-style: none">Visual Editor <span
+          style="white-space: nowrap">(<a href="/vep">VE</a>)<img
+            id="ve-down" src="/callisto/images/down.png"
+            onclick="show_section('ve');" /></span>
+          <div id="ve"
+            style="border-style: solid; border-width: 1px; margin-left: 5%; display: none">
+            <h3>
+              <img onclick="hide_section('ve');" align="right"
+                src="/callisto/images/close.png" />Visual Editor
+            </h3>
+            The Eclipse Visual Editor (VE) project is a vendor-neutral,
+            open development platform supplying frameworks for creating
+            GUI builders, and exemplary, extensible tool implementations
+            for <a href="/swt">SWT</a>/<a href="/rcp">RCP</a>.
+          </div>
+        </li>
+      </ul>
+    </li>
+  </ul>
+</div>
+<div class="homeitem">
+  <h3>Tutorials and Help</h3>
+  <ul>
+    <li
+      style="list-style-image: url(/callisto/images/movie.png); border-style: none"><a
+      href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/install-eclipse/install-eclipse.html">Installing
+        the Eclipse SDK</a></li>
+    <li
+      style="list-style-image: url(/callisto/images/movie.png); border-style: none"><a
+      href="http://www.eclipse.org/evangelism/demos/install-callisto/install-callisto.html">Installing
+        Features from the Callisto Discovery Site</a></li>
+    <li
+      style="list-style-image: url(/callisto/images/movie.png); border-style: none"><a
+      href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/install-cdt/callisto-cdt.html">Installing
+        and using the C/C++ Development Tools</a></li>
+    <li
+      style="list-style-image: url(/callisto/images/movie.png); border-style: none"><a
+      href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/install-wtp/install-wtp.html">Installing
+        and Using the Eclipse Web Tools</a></li>
+    <li
+      style="list-style-image: url(/callisto/images/tutorial.png); border-style: none"><a
+      href="http://www.eclipse.org/birt/phoenix/build/">Installing BIRT</a></li>
+    <li
+      style="list-style-image: url(/callisto/images/movie.png); border-style: none"><a
+      href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/install-ve/install-ve.html">Installing
+        and using the Eclipse Visual Editor</a></li>
+
+  </ul>
+</div>
+
diff --git a/content/en_discovery.php b/content/en_discovery.php
new file mode 100644
index 0000000..bf8e8af
--- /dev/null
+++ b/content/en_discovery.php
@@ -0,0 +1,92 @@
+<?php
+/*******************************************************************************
+ * Copyright(c) 2015 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:
+ *    Nathan Gervais(Eclipse Foundation) - Initial implementation
+ *    Eric Poirier(Eclipse Foundation)
+ *******************************************************************************/
+ ?>
+
+<h1>Eclipse Callisto Discovery Site</h1>
+<img src="callisto_slice.jpg">
+
+<h2>Using Callisto Discovery Site</h2>
+<p>The Callisto Discovery Site allows you to install any of the projects
+  included in the Callisto Release from a single location. Instead of
+  downloading each project individually and then installing them into
+  your workspace, the Callisto Discovery Site simplifies the process.</p>
+
+<div class="homeitem3col">
+  <h3>Instructions</h3>
+
+  <p>To access the Callisto Discovery site:</p>
+  <ul>
+    <li>First download either the <a
+      href="http://download.eclipse.org/eclipse/downloads/drops/R-3.2.2-200702121330/index.html">Eclipse
+        SDK</a> or the <a
+      href="http://download.eclipse.org/eclipse/downloads/drops/R-3.2-200606291905/callisto.php">Eclipse
+        Platform Runtime Binaries</a>.
+    </li>
+    <li>You then need to use the update manager to load Callisto
+      projects. See <a
+      href="http://help.eclipse.org/help31/index.jsp?topic=/org.eclipse.platform.doc.user/tasks/tasks-34.htm">Eclipse
+        Help</a> for general information about using Update Manager. You
+      can also view a <a
+      href="http://www.eclipse.org/evangelism/demos/install-callisto/install-callisto.html">screencam
+        demonstration</a> of using the Callisto Discovery Site.
+    </li>
+    <li>For most distributions of Eclipse, there should already be a
+      &quot;Callisto Discovery Site&quot; defined in its Update Manager.
+      If you do not see it you can try adding the following URL as a
+      remote update site in your update manager.
+      http://download.eclipse.org/callisto/releases/</li>
+    <li>Alternatively, if you would like to view the list or projects by
+      their Eclipse Project (PMC) organization, you can define a new
+      remote update site, and specify a site-byProject.xml file. In
+      other words,
+      http://download.eclipse.org/callisto/releases/site-byProject.xml</li>
+  </ul>
+  </p>
+</div>
+<div class="homeitem3col">
+  <h3>Tips</h3>
+  <ul>
+    <li>To lessen download time (by installing the minimum number of
+      features), first select the desired feature in the Eclipse update
+      install dialog, then use the &quot;Select Required&quot; button to
+      select only the minimum required prerequisite features.
+
+    <li>Any time you get a chance, export your bookmark files from the
+      &quot;Add a Site&quot; dialog. Having them saved away in a safe
+      place makes it much easier to re-create another development
+      environment.
+
+    <li>Since the workbench will have to shutdown and restart you can
+      you do the upgrade and installs with an empty workspace and once
+      satisfied all is well, then use the -data option on the Eclipse
+      command line (or shortcut) to point to your workspace of interest.
+
+
+    <li>Both before and after installing &quot;new&quot; features, you
+      may want to use update manager to &quot;Check for updates to
+      currently installed features&quot;. In some cases, just installing
+      a feature will not necessarily upgrade all of its prerequisites to
+      the highest available level.
+
+  </ul>
+</div>
+
+<div class="homeitem3col">
+  <h3>Example of Update Dialog</h3>
+  Here is an example screen shot highlighting. The example is from
+  having started with just the Eclipse Platform Feature installed. <br />
+  <p align="center">
+    <img src="/callisto/images/update-dialog.png">
+  </p>
+  <br />
+</div>
diff --git a/content/en_downloads.php b/content/en_downloads.php
new file mode 100644
index 0000000..704862e
--- /dev/null
+++ b/content/en_downloads.php
@@ -0,0 +1,132 @@
+<?php
+/*******************************************************************************
+ * Copyright(c) 2015 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:
+ *    Nathan Gervais(Eclipse Foundation) - Initial implementation
+ *    Eric Poirier(Eclipse Foundation)
+ *******************************************************************************/
+ ?>
+
+<h1>Eclipse Distros Downloads Page</h1>
+<p>These Eclipse Foundation Members have graciously offered to host
+  downloads and bundles of Eclipse projects. Each member site will have
+  all the Callisto related projects - plus some interesting bundles and
+  additional software!</p>
+<div class="homeitem3col">
+  <h3>Eclipse Distros</h3>
+
+  <div class="downloadsContainer">
+    <a href="redirect.php?A=IBM"> <img src="/callisto/images/ibm.jpg" height="64"
+      width="64">
+      <div class="downloadsInfo">
+        <h2>IBM</h2>
+        <br />Updated for 3.2.2 - Free, no-registration-necessary
+        Callisto bundles ready-to-use: 1) JavaEE development (WTP); 2)
+        software modeling (GMF); 3) testing (TPTP); 4) enterprise
+        projects. Let IBM help you jump-start your next Eclipse project.<br />
+        <strong>Projects: </strong>All<br />
+      </div>
+    </a>
+  </div>
+  <div class="downloadsContainer">
+    <a href="redirect.php?A=NexB"> <img src="/callisto/images/nexb.jpg"
+      height="64" width="64">
+      <div class="downloadsInfo">
+        <h2>nexB</h2>
+        <br />Get easy to install Eclipse Callisto-based distros and
+        open source plugins with EasyEclipse<br />
+        <strong>Projects: </strong>All<br />
+      </div>
+    </a>
+  </div>
+  <div class="downloadsContainer">
+    <a href="redirect.php?A=Innoopract"> <img
+      src="/callisto/images/innoopract.jpg" height="64" width="64">
+      <div class="downloadsInfo">
+        <h2>Innoopract</h2>
+        <br />
+        <div style='position: relative; margin-bottom: -10px;'>
+          Callisto and more: Use the really cool <img
+            style='clear: none; position: relative; top: 5px;'
+            src='images/yoxos_logo_48x16.png'> on Demand to configure
+          your individual download of eclipse.org and tested 3rd party
+          plugins.
+        </div>
+        <br />
+        <strong>Projects: </strong>All<br />
+      </div>
+    </a>
+  </div>
+  <div class="downloadsContainer">
+    <a href="redirect.php?A=WWIM"> <img src="/callisto/images/wilczek.jpg"
+      height="64" width="64">
+      <div class="downloadsInfo">
+        <h2>Weigle Wilczek - Information Management</h2>
+        <br />German and Russian servers.<br />
+        <strong>Projects: </strong>All<br />
+      </div>
+    </a>
+  </div>
+  <div class="downloadsContainer">
+    <a href="redirect.php?A=BEA"> <img src="/callisto/images/bea.jpg" height="64"
+      width="64">
+      <div class="downloadsInfo">
+        <h2>BEA</h2>
+        <br />
+        <div style='position: relative; margin-bottom: -10px;'>
+          Callisto all-in-one project downloads by Eclipse. No joke
+          bandwidth by <img
+            style='clear: none; position: relative; top: 5px;'
+            src='images/akamai.PNG'>. The #1 Commercial Eclipse based
+          tool by BEA.
+        </div>
+        <br />
+        <strong>Projects: </strong>SDK, WTP All-in-one, WTP+JST+WST
+        All-in-one and more!<br />
+      </div>
+    </a>
+  </div>
+  <div class="downloadsContainer">
+    <a href="redirect.php?A=ACT"> <img src="/callisto/images/actuate.PNG"
+      height="64" width="64">
+      <div class="downloadsInfo">
+        <h2>Actuate</h2>
+        <br />Download servers at China with translated download pages.<br />
+        <strong>Projects: </strong>Projects: SDK (English), BIRT
+        All-in-one.<br />
+      </div>
+    </a>
+  </div>
+  <div class="downloadsContainer">
+    <a href="redirect.php?A=ROW"> <img src="/callisto/images/rowebots64.jpg"
+      height="64" width="64">
+      <div class="downloadsInfo">
+        <h2>RoweBots</h2>
+        <br />C/C++Tools for Embedded System Development including
+        compiler tool chains, full support and single click install. No
+        registration required.<br />
+        <strong>Projects: </strong>10 Callisto Embedded Systems
+        Downloads.<br />
+      </div>
+    </a>
+  </div>
+  </table>
+</div>
+<p class="smallType">
+  Details for participating in the Callisto Members Downloads can be
+  found <a
+    href="http://www.eclipse.org/projects/callisto-files/callisto-download-proposal.php">HERE</a>.
+  If you would like to host Callisto projects and more while helping to
+  promote your organization to the Eclipse Ecosystem, please send an
+  email to <a href="mailto:callisto.feedback@eclipse.org">callisto.feedback@eclipse.org</a>.
+  If you are experiencing technical difficulties with any of the links,
+  please open a <a
+    href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Phoenix">bug
+    report</a>. If you are experiencing problems with a member site,
+  please contact their webmaster or persons noted on their landing page.
+</p>
\ No newline at end of file
diff --git a/content/en_friends-of-callisto.php b/content/en_friends-of-callisto.php
new file mode 100644
index 0000000..15632c1
--- /dev/null
+++ b/content/en_friends-of-callisto.php
@@ -0,0 +1,35 @@
+<?php
+/*******************************************************************************
+ * Copyright(c) 2015 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:
+ *    Nathan Gervais(Eclipse Foundation) - Initial implementation
+ *    Eric Poirier(Eclipse Foundation)
+ *******************************************************************************/
+ ?>
+
+<h1>Friends of Callisto</h1>
+<p>Want to join the Friends of Callisto? Put one of these images up on
+  your website.</p>
+
+<h2>Small Button (110 x 32 px)</h2>
+<img border=0 alt="The Next Total Eclipse" title="Eclipse Callisto"
+  src="/callisto/images/callistosmall.gif">
+<br />
+<textarea class="smallType" cols=60 rows=4 readonly>&lt;a href="http://www.eclipse.org/callisto/"&gt;&lt;img src="http://www.eclipse.org/callisto/images/callistosmall.gif" border=0 alt="The Next Total Eclipse" title="Callisto"&gt;&lt;/a&gt;</textarea>
+
+<h2>Large Button (220 x 64 px)</h2>
+<img border=0 alt="The Next Total Eclipse" title="Eclipse Callisto"
+  src="/callisto/images/callisto.gif">
+<br />
+<textarea class="smallType" cols=60 rows=4 readonly>&lt;a href="http://www.eclipse.org/callisto/"&gt;&lt;img src="http://www.eclipse.org/callisto/images/callisto.gif" border=0 alt="The Next Total Eclipse" title="Callisto" &gt;&lt;/a&gt;</textarea>
+
+<h2>Square Button (160 x 139 px)</h2>
+<img border=0 alt="The Next Total Eclipse" title="Eclipse Callisto"
+  src="/callisto/images/largecallisto.gif">
+<br />
+<textarea class="smallType" cols=60 rows=4 readonly>&lt;a href="http://www.eclipse.org/callisto/"&gt;&lt;img src="http://www.eclipse.org/callisto/images/largecallisto.gif" border=0 alt="The Next Total Eclipse" title="Callisto" &gt;&lt;/a&gt;</textarea>
diff --git a/content/en_getstarted.php b/content/en_getstarted.php
new file mode 100644
index 0000000..d9a1d26
--- /dev/null
+++ b/content/en_getstarted.php
@@ -0,0 +1,22 @@
+<?php
+/*******************************************************************************
+ * Copyright(c) 2015 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:
+ *    Nathan Gervais(Eclipse Foundation) - Initial implementation
+ *    Eric Poirier(Eclipse Foundation)
+ *******************************************************************************/
+ ?>
+
+<h1>Getting Started with Eclipse Callisto</h1>
+<img width="100%" src="callisto_slice.jpg">
+
+<center>
+  <a href="java.php"><img src="/callisto/images/buildJava.gif"></a> <a
+    href="plugin-dev.php"><img src="/callisto/images/buildPlugin.gif"></a> <a
+    href="c-dev.php"><img src="/callisto/images/buildC.gif"></a>
+</center>
diff --git a/content/en_index.php b/content/en_index.php
new file mode 100644
index 0000000..f105d5b
--- /dev/null
+++ b/content/en_index.php
@@ -0,0 +1,96 @@
+<?php
+/*******************************************************************************
+ * Copyright(c) 2015 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:
+ *    Nathan Gervais(Eclipse Foundation) - Initial implementation
+ *    Eric Poirier(Eclipse Foundation)
+ *******************************************************************************/
+ ?>
+
+<h1>Eclipse Callisto</h1>
+
+<h3>What is Callisto</h3>
+<table>
+  <tr>
+    <td valign="top">Callisto is about improving the productivity of the
+      developers working on top of Eclipse frameworks by providing a
+      more transparent and predictable development cycle. By releasing <a
+      href="callistoprojects.php">10 projects</a> at the same time in
+      2006, the goal is to eliminate uncertainty about version
+      compatibility and make it easier to incorporate multiple projects
+      into your environment. <br />
+    <br /> <em>While Callisto is about the simultaneous release of <a
+        href="callistoprojects.php">ten projects</a>, it is not a
+        unification of the projects - each project remains a separate
+        open source project operating with its own project leadership,
+        its own committers, and its own project plan.
+    </em>
+      <p>
+        Click <a href="//wiki.eclipse.org/Simultaneous_Release">here</a>
+        to find out about the newest Eclipse Simultaneous Release
+      </p>
+    </td>
+    <td valign="top" style="padding-left: 10px;"><img
+      src="/callisto/images/largeCallistoHere.gif" border=0
+      alt="The Next Total Eclipse" title="Callisto"
+      style="float: right; clear: none;"></td>
+  </tr>
+</table>
+<h3>How do I get Callisto?</h3>
+<!--<div class="countdownBox">
+        Callisto is coming in : <span class="countdown" id="cd"></span>
+        </div>-->
+<table cellspacing=0 class="callistoButtons">
+  <tr>
+    <td width="50"><a href="java.php"><img src="/callisto/images/java.jpg"></a></td>
+    <td width="25%" class="noRightBorder"><a href="java.php">I Build
+        Java / Web Applications</a></td>
+    <td width="50"><a href="plugin-dev.php"><img
+        src="/callisto/images/plugin.jpg"></a></td>
+    <td width="25%" class="noRightBorder"><a href="plugin-dev.php">I
+        build Plugins / RCP Applications</a></td>
+    <td width="50"><a href="c-dev.php"><img src="/callisto/images/c.jpg"></a></td>
+    <td width="25%" class="noRightBorder"><a href="c-dev.php">I Build
+        C/C++ Applications</a></td>
+    <td width="50"><a href="custom.php"><img src="/callisto/images/custom.jpg"></a></td>
+    <td width="25%"><a href="custom.php">Customize your Callisto
+        Install</a></td>
+  </tr>
+</table>
+<br />
+
+<div class="homeitem noMarginLeft">
+  <h3>Learn more</h3>
+  <ul>
+    <li><a href="callistotags.php">Callisto Experiences</a> from the
+      Blogsphere</li>
+    <li>Check out the latest <a href="webinars.php">Webinars</a></li>
+    <li>ISVs adopting <a href="callistoeffect.php">Callisto projects</a></li>
+    <li>Listen to the <a href="//www.eclipsezone.com/podcasts.jsp"
+      target="blank">EclipseZone Callisto Podcasts</a>
+
+  </ul>
+</div>
+
+<div class="homeitem noMarginRight">
+  <h3>
+    Callisto in the News <a href="news.php"><img src="/images/more.gif"></a>
+  </h3>
+  <ul>
+    <li><a
+      href="//dev2dev.bea.com/blog/wgroth2/archive/2006/07/bea_workshop_32_1.html">BEA
+        Workshop 3.2 Released</a></li>
+    <li><a href="//www.ddj.com/dept/opensource/190300469">Eclipse
+        Callisto Release Podcast</a></li>
+    <li><a
+      href="//www.canada.com/ottawacitizen/news/technology/story.html?id=436e7a0c-2b34-411b-97d9-d59004ba49fb">Eclipsing
+        the competition</a></li>
+  </ul>
+</div>
+
+
diff --git a/content/en_java.php b/content/en_java.php
new file mode 100644
index 0000000..47f7dbc
--- /dev/null
+++ b/content/en_java.php
@@ -0,0 +1,256 @@
+<?php
+/*******************************************************************************
+ * Copyright(c) 2015 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:
+ *    Nathan Gervais(Eclipse Foundation) - Initial implementation
+ *    Eric Poirier(Eclipse Foundation)
+ *******************************************************************************/
+ ?>
+
+<table cellspacing=0 class="callistoButtons">
+  <tr>
+    <td width="50"><img src="/callisto/images/java.jpg"></a></td>
+    <td width="100%" class="noRightBorder">Eclipse for Java and Web
+      Developers</td>
+  </tr>
+</table>
+<h2>
+  <a name="sdk"></a>
+</h2>
+<p>The Eclipse Software Development Kit (SDK) contains everything you
+  need to build Java applications. Considered by many to be the best
+  Java development tool available, the Eclipse Java Development Tools
+  (JDT) provides superior Java editing with on-the-fly validation,
+  incremental compilation, cross-referencing, code assist and much more.</p>
+<p>The new Eclipse 3.2 release features some exciting new capabilities,
+  including:
+<ul>
+  <li>Java 6 support</li>
+  <li>Refactoring scripts</li>
+  <li>Static analysis of Java code</li>
+  <li>Improved code completion and quick fix support</li>
+  <li>Improved usability and performance</li>
+  <li>Support for Mac OSX on Intel and preview support for Windows Vista</li>
+</ul>
+<p>
+  For a more complete list, check out the <a
+    href="http://www.eclipse.org/eclipse/development/readme_eclipse_3.2.2.html">New
+    and Noteworthy</a>.
+</p>
+
+<p>
+  If you are planning to use Eclipse to build Eclipse plug-ins or
+  Eclipse Rich Client Platform (RCP) applications, please see <a
+    href="plugin-dev.php">Eclipse for Plug-in Developers</a>.
+<div class="homeitem">
+  <h3>What do you need?</h3>
+
+  <p>
+    <strong><a
+      href="http://download.eclipse.org/eclipse/downloads/drops/R-3.2.2-200702121330/index.html">Eclipse
+        3.2</a> is required for Callisto.</strong> There is no upgrade
+    path from previous versions of Eclipse.
+  </p>
+
+  <ul>
+    <li style="border-style: none">The <a
+      href="http://download.eclipse.org/eclipse/downloads/drops/R-3.2.2-200702121330/index.html">Eclipse
+        SDK</a> <span style="white-space: nowrap">3.2<img
+        id="platform-down" src="/callisto/images/down.png"
+        onclick="show_section('platform');" /></span>
+      <div id="platform"
+        style="border-style: solid; border-width: 1px; margin-left: 5%; display: none">
+        <h3>
+          <img onclick="hide_section('platform');" align="right"
+            src="/callisto/images/close.png" />Eclipse SDK 3.2
+        </h3>
+        The SDK provides Java development tools.
+        <h4>Tutorials and Help</h4>
+        <ul>
+          <li
+            style="list-style-image: url(/callisto/images/movie.png); border-style: none"><a
+            href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/install-eclipse/install-eclipse.html">Installing
+              the Eclipse SDK 3.2</a></li>
+          <li
+            style="list-style-image: url(/callisto/images/movie.png); border-style: none"><a
+            href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/testfirst/testfirst.html">Test
+              First Development using Eclipse</a></li>
+        </ul>
+      </div>
+    </li>
+    </li>
+    <li style="border-style: none">Optional features available via the <a
+      href="discovery.php">Callisto&nbsp;Discovery&nbsp;Site</a>
+      <ul>
+        <li style="border-style: none">Visual Editor <span
+          style="white-space: nowrap">(<a href="/vep">VE</a>)<img
+            id="ve-down" src="/callisto/images/down.png"
+            onclick="show_section('ve');" /></span>
+          <div id="ve"
+            style="border-style: solid; border-width: 1px; margin-left: 5%; display: none">
+            <h3>
+              <img onclick="hide_section('ve');" align="right"
+                src="/callisto/images/close.png" />Visual Editor
+            </h3>
+            The Eclipse Visual Editor (VE) is a GUI builder for
+            Swing/JFC and <a href="/swt">SWT</a>/<a href="/rcp">RCP</a>.
+            <h4>Suggested reading</h4>
+            <ul>
+              <li
+                style="list-style-image: url(/callisto/images/document.png); border-style: none"><a
+                target="_blank"
+                href="http://www-106.ibm.com/developerworks/opensource/library/os-ecvisual/">Build
+                  GUIs with the Eclipse Visual Editor project</a>
+
+            </ul>
+          </div>
+        </li>
+
+        <li style="border-style: none">Java EE and Web Tools <span
+          style="white-space: nowrap">(<a href="/webtools">WTP</a>)<img
+            id="wtp-down" src="/callisto/images/down.png"
+            onclick="show_section('wtp');" /></span>
+          <div id="wtp"
+            style="border-style: solid; border-width: 1px; margin-left: 5%; display: none">
+            <h3>
+              <img onclick="hide_section('wtp');" align="right"
+                src="/callisto/images/close.png" />Java EE and Web Tools
+            </h3>
+            The Eclipse Web Tools Platform (WTP) extends the Eclipse
+            platform with tools for developing Java Enterprise Edition
+            and Web applications.
+            <ul>
+              <li
+                style="list-style-image: url(/callisto/images/tutorial.png); border-style: none"><a
+                href="http://www.eclipse.org/webtools/community/tutorials/BuildJ2EEWebApp/BuildJ2EEWebApp.html">Building
+                  and Running a Web Application</a></li>
+              <li
+                style="list-style-image: url(/callisto/images/tutorial.png); border-style: none"><a
+                href="http://www.eclipse.org/dali/viewlets/01-Add_Persistence_viewlet_swf.html">Adding
+                  Java Persistence API (JPA) Support to a Project</a></li>
+              <li
+                style="list-style-image: url(/callisto/images/tutorial.png); border-style: none"><a
+                href="http://www.eclipse.org/webtools/community/communityresources.html#tutorials">More
+                  Web and Java EE Tutorials...</a></li>
+            </ul>
+          </div>
+        </li>
+
+        <li style="border-style: none">Test and Performance Tools <span
+          style="white-space: nowrap">(<a href="/tptp">TPTP</a>)<img
+            id="tptp-down" src="/callisto/images/down.png"
+            onclick="show_section('tptp');" /></span>
+          <div id="tptp"
+            style="border-style: solid; border-width: 1px; margin-left: 5%; display: none">
+            <h3>
+              <img onclick="hide_section('tptp');" align="right"
+                src="/callisto/images/close.png" />Test and Performance Tools
+            </h3>
+            The Eclipse Test and Performance Tools Platform (TPTP)
+            Project provides an open platform supplying powerful
+            frameworks and services that allow software developers to
+            build unique test and performance tool, both open source and
+            commercial, that can be easily integrated with the platform
+            and with other tools.
+            <h4>Suggested reading</h4>
+            <ul>
+              <li
+                style="list-style-image: url(/callisto/images/tutorial.png); border-style: none"><a
+                href="http://www.eclipse.org/tptp/home/documents/conferences/eclipseCon2005/EclipseCon_2005_Tutorial_22_Antony_Miguel_Paul_Slauenwhite.pdf">Using
+                  TPTP Logging and Monitoring Tools</a></li>
+              <li
+                style="list-style-image: url(/callisto/images/tutorial.png); border-style: none"><a
+                href="http://www.eclipse.org/articles/Article-TPTP-Profiling-Tool/tptpProfilingArticle.html">Java
+                  Application Profiling using TPTP</a></li>
+            </ul>
+          </div>
+        </li>
+
+        <li style="border-style: none">Reporting Tools<span
+          style="white-space: nowrap">(<a href="/birt">BIRT</a>)<img
+            id="birt-down" src="/callisto/images/down.png"
+            onclick="show_section('birt');" /></span>
+          <div id="birt"
+            style="border-style: solid; border-width: 1px; margin-left: 5%; display: none">
+            <h3>
+              <img onclick="hide_section('birt');" align="right"
+                src="/callisto/images/close.png" />Reporting Tools
+            </h3>
+            BIRT is a reporting system that integrates with your
+            application to produce compelling reports for both web and
+            PDF.
+            <ul>
+              <li
+                style="list-style-image: url(/callisto/images/tutorial.png); border-style: none"><a
+                href="http://www.eclipse.org/birt/phoenix/tutorial/basic">Building
+                  a Simple Report with BIRT</a></li>
+              <li
+                style="list-style-image: url(/callisto/images/movie.png); border-style: none"><a
+                href="http://download.eclipse.org/birt/downloads/demos/FirstReport/MyFirstReport.html">My
+                  First Report</a></li>
+              <li
+                style="list-style-image: url(/callisto/images/tutorial.png); border-style: none"><a
+                href="http://www.eclipse.org/birt/phoenix/tutorial/">More
+                  BIRT Tutorials and screen casts...</a></li>
+            </ul>
+          </div>
+        </li>
+
+        <li style="border-style: none">Data Tools <span
+          style="white-space: nowrap">(<a href="/datatools">DTP</a>)<img
+            id="dtp-down" src="/callisto/images/down.png"
+            onclick="show_section('dtp');" /></span>
+          <div id="dtp"
+            style="border-style: solid; border-width: 1px; margin-left: 5%; display: none">
+            <h3>
+              <img onclick="hide_section('dtp');" align="right"
+                src="/callisto/images/close.png" />Data Tools
+            </h3>
+            Data Tools provides tools for accessing, viewing and
+            manipulating databases and other data sources.
+          </div>
+        </li>
+      </ul>
+    </li>
+  </ul>
+</div>
+<div class="homeitem">
+  <h3>Tutorials and Help</h3>
+  <ul>
+    <li
+      style="list-style-image: url(/callisto/images/movie.png); border-style: none"><a
+      href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/install-eclipse/install-eclipse.html">Installing
+        the Eclipse SDK 3.2</a></li>
+    <li
+      style="list-style-image: url(/callisto/images/movie.png); border-style: none"><a
+      href="http://www.eclipse.org/evangelism/demos/install-callisto/install-callisto.html">Installing
+        Features from the Callisto Discovery Site</a></li>
+    <li
+      style="list-style-image: url(/callisto/images/movie.png); border-style: none"><a
+      href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/install-ve/install-ve.html">Installing
+        and using the Eclipse Visual Editor</a></li>
+    <li
+      style="list-style-image: url(/callisto/images/movie.png); border-style: none"><a
+      href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/install-wtp/install-wtp.html">Installing
+        and Using the Eclipse Web Tools</a></li>
+    <li
+      style="list-style-image: url(/callisto/images/tutorial.png); border-style: none"><a
+      href="http://www.eclipse.org/birt/phoenix/build/">Installing BIRT</a></li>
+  </ul>
+</div>
+
+
+<div class="homeitem">
+  <h3>Suggested reading</h3>
+  <ul>
+    <li
+      style="list-style-image: url(/callisto/images/book.png); border-style: none"><a
+      href="http://www.oreilly.com/catalog/eclipsepg/cover.html">Eclipse
+        IDE Pocket Guide</a></li>
+  </ul>
+</div>
diff --git a/content/en_news.php b/content/en_news.php
new file mode 100644
index 0000000..7f6f9b5
--- /dev/null
+++ b/content/en_news.php
@@ -0,0 +1,282 @@
+<?php
+/*******************************************************************************
+ * Copyright(c) 2015 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:
+ *    Nathan Gervais(Eclipse Foundation) - Initial implementation
+ *    Eric Poirier(Eclipse Foundation)
+ *******************************************************************************/
+ ?>
+
+<h1>Eclipse News</h1>
+
+<div class="homeitem3col">
+  <h3>
+    <a href="/callisto/scripts/whatsnew.rss"><img src="/images/rss.gif"
+      align="right" title="RSS Feed" alt="[RSS]" /></a>Callisto in the
+    News
+  </h3>
+  <br />
+  <ul>
+    <li><a
+      href="http://dev2dev.bea.com/blog/wgroth2/archive/2006/07/bea_workshop_32_1.html">BEA
+        Workshop 3.2 Released</a> posted <br />
+    <br />BEA is the first enterprise vendor to deliver a commercial
+      product on the Callisto release, which includes the Core Eclipse
+      platform, version 3.2 and the Web Tools Project(WTP) version 1.5.<br />
+    <br /></li>
+    <li><a href="http://www.ddj.com/dept/opensource/190300469">Eclipse
+        Callisto Release Podcast</a> posted <br />
+    <br />Mike Milinkovich discusses Eclipse's recent Callisto release,
+      including the new Data Tools Project and Graphical Modeling
+      Framework, and what it means for Eclipse developers who want to
+      build applications that run on OSX on Intel and Windows Vista.
+      (MP3, 6:59 mins)<br />
+    <br /></li>
+    <li><a
+      href="http://www.canada.com/ottawacitizen/news/technology/story.html?id=436e7a0c-2b34-411b-97d9-d59004ba49fb">Eclipsing
+        the competition</a> posted <br />
+    <br />To the delight of millions of software developers around the
+      world, the Ottawa-based Eclipse Foundation has just released seven
+      million lines of code on the Internet for their use. Look out,
+      Microsoft<br />
+    <br /></li>
+    <li><a href="http://www.heise.de/open/news/meldung/74987">Kostenloser
+        Downloadservice fuer Eclipse-Benutzer</a> posted <br />
+    <br />Die Innoopract GmbH, Anbieter von Dienstleistungen und
+      Produkten fuer die freie Entwicklungsplattform Eclipse, hat ihren
+      Download-Service Yoxos on Demand vorgestellt. Eclipse 3.2 und die
+      Projekte des Callisto-Releases, die die Eclipse Foundation am
+      Freitag freigegeben hat, stehen darueber ab sofort zum
+      Herunterladen bereit. Ueber die Webapplikation kann sich der
+      Interessierte seine persoenliche Eclipse-Konfiguration
+      zusammenstellen. Das Ergebnis des Auswahlprozesses wird in einer
+      einzigen Download-Datei im Zip-Format abgelegt. Yoxos prüft die
+      Zusammenstellung und garantiert ihre Funktionsfaehigkeit.
+      Angeblich bietet Innopracts Angebot mehr Plug-ins als die
+      offizielle Configure your Eclipse Site der Foundation.<br />
+    <br /></li>
+    <li><a
+      href="http://www.javamagazin.de/itr/news/psecom,id,29456,nodeid,10.html">Interview
+        mit Ralph Mueller: Callisto ist ein Meilenstein in der Open
+        Source-Geschichte</a> posted <br />
+    <br />Den europaeischen Repraesentanten der Eclipse Foundation,
+      Ralph Mueller, haben die Leser des Eclipse Magazins durch seine
+      "Quartals"-Berichte ueber seine Arbeit und seine Eindruecke rund
+      um das europaeische Eclipse-Oekosystem bereits kennen gelernt. Das
+      Eclipse Magazin nahm die Moeglichkeit wahr, ihn zum "Grossprojekt"
+      Callisto, bei dem es sich um eine Initiative der Eclipse
+      Foundation handelt, mit dem Ziel, gleich mehrere Projekte auf
+      einen gemeinsamen Release-Termin fuer neue Versionen zu
+      verpflichten. zu befragen.<br />
+    <br /></li>
+    <li><a href="http://www.golem.de/0607/46261.html">Eclipse Callisto
+        steht zum Download bereit</a> posted <br />
+    <br />Die Sammlung von zehn freien Eclipse-Projekten "Callisto"
+      steht mittlerweile zum Download bereit. Die Zusammenstellung soll
+      vor allem garantieren, dass alle Programme zusammenarbeiten und
+      ihre Einrichtung erleichtern. Voraussetzung, um Callisto zu
+      nutzen, ist Eclipse 3.2.<br />
+    <br /></li>
+    <li><a
+      href="http://www.onjava.com/pub/a/onjava/2006/06/28/whats-new-in-eclipse-3-2-java-development-tools.html">What's
+        New in Eclipse 3.2 Java Development Tools</a> posted <br />
+    <br />Eclipse is a popular Integrated Development Environment (IDE)
+      for Java programming. It can also be used as an environment for
+      other languages like C++ and Ruby, as a framework for
+      consolidating tools of any kind, and as a Rich Client Platform for
+      creating desktop or server applications. The Eclipse open source
+      community is responsible for dozens of projects, ranging from
+      business intelligence to social networking. Eclipse is the name of
+      the non-profit foundation that manages those projects, as well.
+      (And, while I'm pretty sure it's not a floor wax, there is also an
+      Eclipse automobile, a soccer team, and a brand of chewing gum.)<br />
+    <br /></li>
+    <li><a
+      href="http://www.linuxinsider.com/story/bvapnsbQ431HUQ/Eclipse-Rolls-Out-Callisto-Open-Source-Bundle-on-Schedule.xhtml">Eclipse
+        Rolls Out Callisto Open Source Bundle on Schedule</a> posted <br />
+    <br />The Eclipse Foundation this week unveiled a grouped, open
+      source software release dubbed "Callisto" that it considers a
+      shining example of open source software development for the
+      enterprise.<br />
+    <br /></li>
+    <li><a href="http://www.heise.de/newsticker/meldung/74706">Callisto
+        fasst Eclipse-Projekte zusammen</a> posted <br />
+    <br />Unter dem Namen Callisto will die Eclipse Foundation zehn
+      unter ihrem Dach beheimatete Open-Source-Projekte zusammenfassen.
+      Das Paket soll für mehr Transparenz sorgen, indem es
+      Unsicherheiten hinsichtlich der Kompatibilitaet der Einzelprojekte
+      ausraeumt.<br />
+    <br /></li>
+    <li><a
+      href="http://www.eclipse-magazin.de/itr/news/psecom,id,29330,nodeid,229.html">Callisto:
+        Zehn Eclipse-Projekte in einer Initiative vereint</a> posted <br />
+    <br />Diese Woche erwartet die Eclipse-Community eine der
+      wichtigsten Veroeffentlichungen seit Initiierung der
+      Eclipse-Plattform vor sechs Jahren. Und zwar steht ab naechsten
+      Freitag die erste offizielle Version von Callisto zur Verfuegung,
+      zurzeit ist das Simultan-Release als Release Candidate verfuegbar.<br />
+    <br /></li>
+    <li><a href="http://www.adtmag.com/article.aspx?id=18780">Eclipse
+        Foundation synchronizes largest ever open-source project release</a>
+      posted <br />
+    <br />The Eclipse Foundation is making history this week with what
+      looks to be the largest ever synchronized open-source project
+      release. The Callisto Simultaneous Release initiative coordinates
+      10 Eclipse project upgrades, including business intelligence and
+      reporting tools, a modeling framework, a Web tools platform, test
+      and performance tools, integrated development environments, and
+      the latest version of the Eclipse tooling framework (3.2)
+      itself—all of which will be available for download this Friday,
+      June 30.<br />
+    <br /></li>
+    <li><a href="http://www.silicon.de/enid/b2b/20205">Eclipse Callisto
+        - zehn Projekte zum Mitmachen</a> posted <br />
+    <br />Die Eclipse Foundation hat mit 'Callisto' gleichzeitig zehn
+      Einzelprojekte vorgestellt, die Anwendern die synchrone
+      Einfuehrung von Eclipse-basierten Werkzeugen erleichtern sollen.<br />
+    <br /></li>
+    <li><a href="http://www.golem.de/0606/46119.html">Eclipse Callisto
+        erscheint am 30. Juni 2006</a> posted <br />
+    <br />Unter dem Namen "Callisto" veroeffentlicht die Eclipse
+      Foundation am 30. Juni 2006 zehn Open-Source-Projekte
+      gleichzeitig. Die Sammlung soll vor allem sicherstellen, dass alle
+      Programme zusammenarbeiten und ihre Einrichtung erleichtern. Ein
+      Release Candidate steht derweil schon zum Download bereit.<br />
+    <br /></li>
+    <li><a
+      href="http://www.internetnews.com/dev-news/article.php/3616221">Eclipse's
+        'Callisto' Onslaught</a> posted <br />
+    <br />There are many software projects in both the proprietary and
+      open source communities that don't keep their release schedules.
+      Eclipse is not one of them.<br /> In keeping with its release
+      record, the Eclipse Foundation this week will release 10 projects
+      right on schedule. It's such a huge undertaking that Eclipse
+      branded it Callisto.<br /> Callisto involves more than 7 million
+      lines of project code, developed by 260 developer committers,
+      including the efforts of 15 different ISVs spanning a dozen
+      countries around the globe. <br />
+    <br /></li>
+    <li><a
+      href="http://www.crn.com/sections/breakingnews/dailyarchives.jhtml;jsessionid=1TNJ3TNE1KYNYQSNDLPSKHSCJUNN2JVN?articleId=189601018&pgno=2&queryText">Callisto
+        Eclipses Other Open-Source Competition</a> posted <br />
+    <br /> Borland Software, in the process of selling off the IDE
+      business that was once its cornerstone, shifted its JBuilder IDE
+      to an Eclipse base last year. "Eclipse is increasingly popular and
+      impossible to ignore," said Richard Gronback, chief scientist at
+      Borland, Cupertino, Calif.<br /> ISVs say Callisto is a key step
+      forward in Eclipse's evolution. For the first time, a batch of
+      Eclipse projects have synchronized their release schedule with the
+      core Eclipse platform's annual June update, allowing developers to
+      field updates all at once rather than piecemeal. <br />
+    <br /></li>
+    <li><a
+      href="http://www.informationweek.com/software/showArticle.jhtml?articleID=189601094&subSection=Open+Source">Eclipse
+        Upgrades Open-Source Tools</a> posted <br />
+    <br /> The Eclipse Foundation next week will announce new releases
+      for 10 open-source projects in an effort to synchronize version
+      compatibilities for each.<br /> On June 30, the foundation plans
+      to make available seven million lines of code as part of the
+      coordinated release for the project, code name "Callisto." These
+      include upgrades for Eclipse business intelligence and reporting
+      tools, modeling framework, Web tools platform, visual editor, test
+      and performance tools, and C and C ++ integrated development
+      environment tools. <br />
+    <br /></li>
+    <li><a href="http://news.com.com/2061-10795_3-6086792.html">Eclipse
+        packs ten projects in Callisto, adds Motorola</a> posted <br />
+    <br />The Eclipse open-source foundation will release software from
+      ten of its projects in tandem next Friday, reflecting the maturity
+      of Eclipse and open-source software, in general. <br />
+    <br />Separately, mobile phone manufacturer on Thursday said it will
+      join the Eclipse Foundation.<br />
+    <br /></li>
+    <li><a
+      href="http://www.computerworld.com/action/article.do?command=viewArticleBasic&articleId=9001362">Eclipse
+        plans coordinated code release for 10 open-source projects</a>
+      posted <br />
+    <br />The Eclipse Foundation next week will announce new releases of
+      10 of its open-source projects in a coordinated effort to
+      synchronize the version compatibility of the projects. <br />
+    <br /> The foundation plans on June 30 to make available seven
+      million lines of code as part of its "Callisto" coordinated
+      release. Callisto includes upgrades of the Eclipse business
+      intelligence and reporting tools, modeling framework, Web tools
+      platform, visual editor, test and performance tools, and C and C
+      ++ integrated development environment tools.<br />
+    <br /></li>
+    <li><a
+      href="http://news.yahoo.com/news?tmpl=story&cid=2265&ncid=2265&e=2&u=/infoworld/20060619/tc_infoworld/79424">Eclipse
+        to deliver on Callisto project</a> posted <br />
+    <br /> The Eclipse Foundation on June 30 plans to roll out multiple
+      Eclipse technologies under the banner of the open source software
+      group's Callisto release.<br />
+    <br />Ten different projects ranging from the Eclipse Project, which
+      features the group's popular IDE, to the Eclipse Data Tools
+      Project will be released simultaneously. "The important thing here
+      is [Callisto] is an event," said Eclipse Executive Director Mike
+      Milinkovich. <br />
+    <br /></li>
+    <li><a
+      href="http://www.oreillynet.com/onjava/blog/2006/06/upgrading_eclipse_time_to_try.html">Upgrading
+        Eclipse? Time to try Callisto.</a> posted <br />
+    <br /> Whenever I upgrade Eclipse, I'm tempted to download the
+      latest development release. Instead of clicking on the production
+      release, I tend to look for other versions and download the latest
+      release candidate or integration build. I've been running a
+      Eclipse 3.2 integration build since last November, and it worked
+      so well I forgot that I was using an early integration build. I
+      finally upgraded this week, and in doing so I decided to try the
+      latest release candidate of the Callisto Simultaneous Release.
+      Verdict? It's official, Eclipse is no longer just an IDE, it is a
+      powerful platform, and I was surprised at the breadth and quality
+      of this release. Read on for an account of my own experience. <br />
+    <br /></li>
+    <li><a
+      href="http://www.computerweekly.com/Articles/2006/05/16/215905/Hot+skills+Eclipse+lets+developers+cash+in+on+existing.htm#ContentContinues">Hot
+        skills: Eclipse lets developers cash in on existing skills</a>
+      posted <br />
+    <br /> The Eclipse project is an open source initiative aiming to
+      provide a supplier-neutral software development platform. Analyst
+      firm Gartner described it as one of the two main integrated
+      development environments (IDEs), along with Microsoft&apos;s
+      Visual Studio.<br /> Strictly speaking, the Eclipse platform is
+      not itself an IDE, but it contains the functionality required to
+      build IDEs for Java, C++ and potentially other languages.
+      Different components can also be used to build
+      &quot;arbitrary&quot; applications, without subscribing to the
+      IDE. <br />
+    <br /></li>
+    <li><a
+      href="http://www.sdtimes.com/article/special-20060515-01.html">Eclipse
+        Sets Off a Big Bang</a> posted <br />
+    <br /> To avoid some of the chaos that can accompany open-source
+      team efforts, the Eclipse Foundation is orchestrating the release
+      of 10 of its most prominent projects. The grand finale takes place
+      near the end of June, when all 10 projects release major updates
+      on the same day. This 10-way coordination, code-named Callisto,
+      has been in the works since August 2005. The Callisto release
+      includes updates to BIRT (the Business Intelligence and Reporting
+      Tools project), WTP (the Web Tools Platform project), TPTP (the
+      Test and Performance Tools Platform project) and other projects in
+      the Eclipse dominion. Also included as part of the Callisto plan
+      is the release of Eclipse 3.2, this year&apos;s update of the
+      overarching Eclipse Project. <br />
+    <br /></li>
+    <li><a href="http://www.adtmag.com/blogs/blog.aspx?a=18198">The
+        Eclipse Foundation's Coordinated Kickoff</a> posted <br />
+    <br /> The third annual EclipseCon tradeshow produced a swarm of
+      news and new product announcements last week. But easily the most
+      intriguing recent development in the Eclipse ecosystem is the
+      Callisto Simultaneous Release initiative. <br>Word that the
+      Eclipse Foundation was planning to synchronize the release of 10
+      of its 61 projects actually began circulating in January. The
+      details seemed to come together at the show <br />
+    <br /></li>
+  </ul>
+
+</div>
\ No newline at end of file
diff --git a/content/en_plugin-dev.php b/content/en_plugin-dev.php
new file mode 100644
index 0000000..0c3aea5
--- /dev/null
+++ b/content/en_plugin-dev.php
@@ -0,0 +1,147 @@
+<?php
+/*******************************************************************************
+ * Copyright(c) 2015 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:
+ *    Nathan Gervais(Eclipse Foundation) - Initial implementation
+ *    Eric Poirier(Eclipse Foundation)
+ *******************************************************************************/
+ ?>
+
+        <table cellspacing=0 class="callistoButtons">
+          <tr>
+            <td width="50"><img src="/callisto/images/plugin.jpg"></a></td>
+        <td width="100%"class="noRightBorder">Eclipse for Plug-in and RCP Developers</td>
+      </tr>
+    </table>
+
+
+    <p>The Eclipse Software Development Kit (SDK) contains everything you need to build
+    Eclipse applications, including plug-ins for the development environment and Eclipse Rich Client Platform (<a href="http://wiki.eclipse.org/index.html/Rich_Client_Platform">RCP</a>) applications.</p>
+    <p>The new Eclipse SDK 3.2 release features some exciting new capabilities for plug-in and RCP developers, including:
+    <ul>
+      <li>Java 6 support</li>
+      <li>Support for Mac OSX on Intel and Preview support for Windows Vista</li>
+      <li><a href="/swt">SWT</a> Enhancements including support for OpenGL, virtual trees, custom table cell drawing</li>
+      <li>Improvements in Plug-in Development Environment (<a href="http://www.eclipse.org/pde/">PDE</a>) to make building RCP applications easier</li>
+      <li>Common Navigator Framework</li>
+      <li>New standalone OSGi framework</li>
+    </ul>
+    <p>For a more complete list, check out the <a href="http://www.eclipse.org/eclipse/development/readme_eclipse_3.2.2.html">New and Noteworthy</a>.</p>
+
+    <p>The Eclipse SDK can be extended to provide additional functionality by adding features from the
+    <a href="discovery.php">Callisto Discovery Site</a>.</p>
+
+        <div class="homeitem">
+          <h3>What do you need?</h3>
+
+      <p><strong><a href="http://download.eclipse.org/eclipse/downloads/drops/R-3.2-200606291905/index.html">Eclipse 3.2</a> is required for Callisto.</strong>
+      There is no upgrade path from previous versions of Eclipse.</p>
+
+
+          <ul>
+            <li style="border-style: none">The <a href="http://download.eclipse.org/eclipse/downloads/drops/R-3.2.2-200702121330/index.html">Eclipse SDK</a> <span style="white-space:nowrap">3.2<img id="platform-down" src="/callisto/images/down.png" onclick="show_section('platform');"/></span>
+              <div id="platform" style="border-style:solid;border-width:1px;margin-left:5%;display:none">
+                    <h3><img onclick="hide_section('platform');" align="right" src="/callisto/images/close.png"/>Eclipse SDK 3.2</h3>
+                    The SDK provides Java development tools.
+                    <h4>Tutorials and Help</h4>
+                    <ul>
+                        <li style="list-style-image: url(/callisto/images/movie.png);border-style: none"><a href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/install-eclipse/install-eclipse.html">Installing the Eclipse SDK 3.2</a></li>
+                        <li style="list-style-image: url(/callisto/images/movie.png);border-style: none"><a href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/testfirst/testfirst.html">Test First Development using Eclipse</a></li>
+                    </ul>
+                  </div>
+                </li>
+            <li style="border-style: none">Optional features available via the <a href="discovery.php">Callisto&nbsp;Discovery&nbsp;Site</a>
+              <ul>
+                <li style="border-style: none">Visual Editor <span style="white-space:nowrap">(<a href="/vep">VE</a>)<img id="ve-down" src="/callisto/images/down.png" onclick="show_section('ve');"/></span>
+                  <div id="ve" style="border-style:solid;border-width:1px;margin-left:5%;display:none">
+                    <h3><img onclick="hide_section('ve');" align="right" src="/callisto/images/close.png"/>Visual Editor</h3>
+                    The Eclipse Visual Editor (VE) project is a vendor-neutral, open
+                    development platform supplying frameworks for creating GUI
+                    builders, and exemplary, extensible tool implementations for
+                    <a href="/swt">SWT</a>/<a href="/rcp">RCP</a>.
+                  </div>
+                </li>
+                <li style="border-style: none">Eclipse Modeling Framework <span style="white-space:nowrap">(<a href="/emf">EMF</a>)<img id="emf-down" src="/callisto/images/down.png" onclick="show_section('emf');"/></span>
+                  <div id="emf" style="border-style:solid;border-width:1px;margin-left:5%;display:none">
+                    <h3><img onclick="hide_section('emf');" align="right" src="/callisto/images/close.png"/>Eclipse Modeling Framework</h3>
+                    EMF is a modeling framework and code generation facility for building tools and other
+                    applications based on a structured data model.
+                  </div>
+                </li>
+                <li style="border-style: none">Graphical Editing Framework <span style="white-space:nowrap">(<a href="/gef">GEF</a>)<img id="gef-down" src="/callisto/images/down.png" onclick="show_section('gef');"/></span>
+                  <div id="gef" style="border-style:solid;border-width:1px;margin-left:5%;display:none">
+                    <h3><img onclick="hide_section('gef');" align="right" src="/callisto/images/close.png"/>Graphical Editing Framework</h3>
+                    The Graphical Editing Framework (GEF) allows developers to take an existing
+                    application model and quickly create a rich graphical editor.
+                  </div>
+                </li>
+                <li style="border-style: none">Graphical Modeling Framework <span style="white-space:nowrap">(<a href="/gmf">GMF</a>)<img id="gmf-down" src="/callisto/images/down.png" onclick="show_section('gmf');"/></span>
+                  <div id="gmf" style="border-style:solid;border-width:1px;margin-left:5%;display:none">
+                    <h3><img onclick="hide_section('gmf');" align="right" src="/callisto/images/close.png"/>Graphical Modeling Framework</h3>
+                    The Eclipse Graphical Modeling Framework (GMF) provides a
+                    generative component and runtime infrastructure for developing
+                    graphical editors.
+                  </div>
+                </li>
+
+
+
+                <li style="border-style: none">Reporting Tools <span style="white-space:nowrap">(<a href="/birt">BIRT</a>)<img id="birt-down" src="/callisto/images/down.png" onclick="show_section('birt');"/></span>
+                  <div id="birt" style="border-style:solid;border-width:1px;margin-left:5%;display:none">
+                    <h3><img onclick="hide_section('birt');" align="right" src="/callisto/images/close.png"/>Reporting Tools</h3>
+                    BIRT is a reporting system that integrates with your application to produce
+                    compelling reports for both web and PDF.
+                    <ul>
+                        <li style="list-style-image: url(/callisto/images/tutorial.png);border-style: none"><a href="http://www.eclipse.org/birt/phoenix/tutorial/basic">Building a Simple Report with BIRT</a></li>
+                  <li style="list-style-image: url(/callisto/images/movie.png);border-style: none"><a href="http://download.eclipse.org/birt/downloads/demos/FirstReport/MyFirstReport.html">My First Report</a></li>
+                  <li style="list-style-image: url(/callisto/images/tutorial.png);border-style: none"><a href="http://www.eclipse.org/birt/phoenix/tutorial/">More BIRT Tutorials and screen casts...</a></li>
+                </ul>
+                  </div>
+                </li>
+
+                <li style="border-style: none">Data Tools <span style="white-space:nowrap">(<a href="/datatools">DTP</a>)<img id="dtp-down" src="/callisto/images/down.png" onclick="show_section('dtp');"/></span>
+                  <div id="dtp" style="border-style:solid;border-width:1px;margin-left:5%;display:none">
+                    <h3><img onclick="hide_section('dtp');" align="right" src="/callisto/images/close.png"/>Data Tools</h3>
+                    The Eclipse Data Tools Platform (DTP) is a set of extensible frameworks and
+                exemplary tools for developing data-centric applications in Eclipse.
+                  </div>
+                </li>
+              </ul>
+          </li>
+          </ul>
+        </div>
+
+        <div class="homeitem">
+          <h3>Tutorials and help</h3>
+          <ul>
+              <li style="list-style-image: url(/callisto/images/movie.png);border-style: none"><a href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/install-eclipse/install-eclipse.html">Installing the Eclipse SDK 3.2</a></li>
+            <li style="list-style-image: url(/callisto/images/movie.png);border-style: none"><a href="http://www.eclipse.org/evangelism/demos/install-callisto/install-callisto.html">Installing Features from the Callisto Discovery Site</a></li>
+            <li style="list-style-image: url(/callisto/images/movie.png);border-style: none"><a href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/install-ve/install-ve.html">Installing and using the Eclipse Visual Editor</a></li>
+            <li style="list-style-image: url(/callisto/images/movie.png);border-style: none"><a href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/testfirst/testfirst.html">Test First Development using Eclipse</a></li>
+          </ul>
+        </div>
+
+        <div class="homeitem">
+          <h3>Suggested reading</h3>
+          <ul>
+            <li style="list-style-image: url(/callisto/images/document.png);border-style: none"><a href="http://www.eclipse.org/articles/">Eclipse Corner Articles</a></li>
+            <li style="list-style-image: url(/callisto/images/document.png);border-style: none"><a href="http://local.phoenix.eclipse.org/articles/Whitepaper-Platform-3.1/eclipse-platform-whitepaper.html">Eclipse Platform Technical Overview</a></li>
+            <li style="list-style-image: url(/callisto/images/book.png);border-style: none"><a href="http://www.aw-bc.com/catalog/academic/product/0,1144,032142672X,00.html">Eclipse: Building Commercial-Quality Plug-ins</a></li>
+            <li style="list-style-image: url(/callisto/images/book.png);border-style: none"><a href="http://www.aw-bc.com/catalog/academic/product/0,1144,0321205758,00.html">Contributing to Eclipse: Principles, Patterns, and Plug-Ins</a></li>
+            <li style="list-style-image: url(/callisto/images/book.png);border-style: none"><a href="http://www.aw-bc.com/catalog/academic/product/0,1144,0321334612,00.html">Eclipse Rich Client Platform: Designing, Coding, and Packaging Java&trade; Applications</a></li>
+            <li style="list-style-image: url(/callisto/images/document.png);border-style: none">Building a Common Navigator based viewer
+              <a href="http://scribbledideas.blogspot.com/2006/05/building-common-navigator-based-viewer.html">Part I</a>,
+              <a href="http://scribbledideas.blogspot.com/2006/05/building-common-navigator-based-viewer_22.html">Part II</a>,
+              <a href="http://scribbledideas.blogspot.com/2006/06/building-common-navigator-based-viewer.html">Part III</a>, and
+              <a href="http://scribbledideas.blogspot.com/2006/06/building-common-navigator-based-viewer_18.html">Part IV</a>
+            </li>
+          </ul>
+        </div>
+  </div>
+
+</div>
\ No newline at end of file
diff --git a/content/en_updating.php b/content/en_updating.php
new file mode 100644
index 0000000..19c781a
--- /dev/null
+++ b/content/en_updating.php
@@ -0,0 +1,26 @@
+<?php
+/*******************************************************************************
+ * Copyright(c) 2015 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:
+ *    Nathan Gervais(Eclipse Foundation) - Initial implementation
+ *    Eric Poirier(Eclipse Foundation)
+ *******************************************************************************/
+ ?>
+
+<h1>Eclipse Callisto Discovery Site</h1>
+<img src="callisto_slice.jpg">
+
+<h2>
+  <a name="update">Adding Features to Eclipse</a>
+</h2>
+<p>For examples, please see the following demonstrations:</p>
+<ul>
+  <li>Adding C/C++ development support to Eclipse</li>
+  <li>Adding Reporting support to Eclipse</li>
+  <li>More...</li>
+</ul>
\ No newline at end of file
diff --git a/content/en_webinars.php b/content/en_webinars.php
new file mode 100644
index 0000000..6884430
--- /dev/null
+++ b/content/en_webinars.php
@@ -0,0 +1,117 @@
+<?php
+/*******************************************************************************
+ * Copyright(c) 2015 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:
+ *    Nathan Gervais(Eclipse Foundation) - Initial implementation
+ *    Eric Poirier(Eclipse Foundation)
+ *******************************************************************************/
+ ?>
+
+<h1>Eclipse Webinars</h1>
+
+<p>Looking to learn more about the different projects involved in
+  Callisto? We are running a series of free webinars to help you better
+  understand how you can use the different Eclipse projects. Take a look
+  below and sign-up today.</p>
+<p>
+  <i>Special thanks to Adobe for contributing access to their <a
+    href="http://www.adobe.com/products/breeze/?sdid=HCSA">Macromedia
+      Breeze</a> meeting service to host these webinars.
+  </i>
+</p>
+
+<h2>Using the Eclipse Modeling Frameworks</h2>
+<a href="http://adobedev.breezecentral.com/p17835008/">Webinar Recording</a>
+<p>
+<ul>
+  <li><p>Presenters: Ed Merks and Richard Gronback, Eclipse Modeling
+      Project Co-leaders</p></li>
+  <li><p>There is great potential with model-driven development
+      techniques to reduce the complexity and effort required to develop
+      high quality applications, while promoting a focus on domain
+      models. The new Eclipse Modeling Project aims to unify and promote
+      such technologies within the Eclipse community, with two important
+      projects presented here to illustrate the potential of the
+      approach.</p>
+
+    <p>The Eclipse Modeling Framework (EMF) is a modeling framework and
+      code generation facility for building tools and other applications
+      based on a structured data model. From a model specification
+      described in one of several supported formats, EMF provides tools
+      and runtime support to produce a set of Java classes for the
+      model, a set of adapter classes that enable viewing and
+      command-based editing of the model, and a basic editor.</p>
+
+    <p>The Graphical Modeling Framework (GMF) provides a generative
+      component and runtime infrastructure for developing graphical
+      editors based on EMF and the Graphical Editing Framework (GEF).
+      GMF is therefore complementary to EMF, and also leverages several
+      of the EMF Technology (EMFT) projects, such as OCL, Query,
+      Validation, and Transaction.</p>
+
+    <p>In this webinar, a domain model will be developed using EMF,
+      resulting in a generated set of model and edit code. A graphical
+      editor for this domain model will also be defined and generated
+      using GMF to illustrate how model-driven development techniques
+      are currently being used within the context of the Eclipse
+      Modeling Project.</p>
+
+</ul>
+</p>
+
+<h2>Building Data Centric RCP Applications</h2>
+<a href="http://adobedev.breezecentral.com/p89156273/">Webinar Recording</a>
+<p>
+<ul>
+  <li><p>
+      Presenters: John Graham, DTP PMC Leader,<br> Linda Chan, DTP PMC
+      and BIRT Committer, <br> Jason Weathersby, BIRT PMC
+    </p></li>
+  <li><p>Learn how to use the new Data Tools Platform (DTP) and Business
+      Intelligence and Report Tools (BIRT) to create stand alone desktop
+      applications that run on Eclipse RCP. The webinar will describe
+      how to use the DTP data access capability to connect to multiple
+      data stores and then create dynamic reports using BIRT.</p></li>
+  <li>A recording of this webinar can be viewed <a
+    href=" http://adobedev.breezecentral.com/p89156273/">here.</a> The
+    sample code used during the webinar is located <a
+    href="http://www.eclipse.org/downloads/download.php?file=/datatools/downloads/callisto/webinar_060506/webinar_demo.zip">here.</a>
+
+</ul>
+</p>
+
+<h2>Developing and Profiling Web Services</h2>
+<a href="http://adobedev.breezecentral.com/p83921118/">Webinar Recording</a>
+
+<p>
+<ul>
+  <li><p>Presenters: Kathy Chan, WTP and Valentian Popsescu, TPTP</p></li>
+  <li><p>The Web services tool in WTP allows the user to develop and
+      consume Web services. It also lets the user easily monitor the
+      SOAP traffic, test the Web services using the Web Services
+      Explorer or using the generated sample JSPs. Come to this webinar
+      to learn to use the newly updated Web services tools in WTP 1.5.</p>
+
+    <p>The TPTP tools can be used to analyze the Web application
+      execution and look for performance hot spots or memory leaks.</p>
+
+    <p>In this webinar, the Web services tools will be used to develop a
+      Web service from a WSDL file and to test the Web service using the
+      Web Services Explorer. The Web services tools will then be used to
+      generate a Web service client proxy to talk to the Web service and
+      invoke it using the generated sample JSP while monitoring the SOAP
+      traffic using the TCP/IP monitor. Afterwards, the TPTP tool will
+      be used to start profiling the Web application and to set the
+      profiling filters and options. Then, various TPTP views will be
+      used to analyze the application execution and look for performance
+      hot spots.</p></li>
+  <li>A recording of this webinar can be viewed <a
+    href="http://adobedev.breezecentral.com/p83921118/">here</a>
+
+</ul>
+</p>
\ No newline at end of file
diff --git a/custom.php b/custom.php
index 4d9150e..eb2e747 100644
--- a/custom.php
+++ b/custom.php
@@ -1,221 +1,36 @@
+<?php
+/*******************************************************************************
+ * Copyright(c) 2015 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:
+ *    Nathan Gervais(Eclipse Foundation) - Initial implementation
+ *    Eric Poirier(Eclipse Foundation)
+ *******************************************************************************/
+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");
 
-<?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'
+$App = new App();
+$Nav = new Nav();
+$Menu = new Menu();
+include($App->getProjectCommon()); // All on the same line to unclutter the user's desktop'
 
-	#*****************************************************************************
-	#
-	# template.php
-	#
-	# Author: 		Wayne Beaton
-	# Date:			2006-06-06
-	#
-	# Description: 
-	# This page contains pointers to download and tutorial information for
-	# individuals interested in using Eclipse for Java development.
-	#****************************************************************************
-	
-	#
-	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "Customize Your Callisto Experience";
-	$pageKeywords	= "callisto eclipse 3.2 custom customize projects features resource screencam screen cam tutorial ";
-	$pageAuthor		= "Wayne Beaton";
-	
-	# Add page-specific Nav bars here
-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 1);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 1);
-	#$Nav->addCustomNav("<img src=\"http://www.eclipsecon.org/2007/image125x125.gif\"/>","http://www.eclipsecon.org/2007", "_self", 1);
-	
-	# End: page-specific settings
-	#
-			
-	require_once("links.php");
-	
-	# Paste your HTML content between the EOHTML markers!	
-	$html = <<<EOHTML
-<script type="text/javascript">
-function show_section(name) {
-	if (document.getElementById(name).style.display=='block') return;
-	document.getElementById(name +'-down').style.display='none';
-	document.getElementById(name).style.display='block'
-}
-function hide_section(name) {
-	if (document.getElementById(name).style.display=='none') return;
-	document.getElementById(name +'-down').style.display='inline';
-	document.getElementById(name).style.display='none'
-}
-</script>
-<link rel="stylesheet" type="text/css" href="callisto.css" media="screen" />
 
-<div class="callistoRealEstate paddingLeft">
-	<div class="maincontent">
-        <table cellspacing=0 class="callistoButtons">
-        	<tr>
-        		<td width="50"><img src="images/custom.jpg"></a></td>
-				<td width="100%"class="noRightBorder">$pageTitle</td>
-			</tr>
-		</table>
+// Begin: page-specific settings. Change these.
+$pageTitle    = "Customize Your Callisto Experience";
+$pageKeywords = "callisto eclipse 3.2 custom customize projects features resource screencam screen cam tutorial ";
+$pageAuthor   = "Wayne Beaton";
 
-        <a href="http://www.eclipsecon.org/?tag=eclipse-callisto-custom"><img style="margin-top:5px;" align="right" src="http://www.eclipsecon.org/2007/image125x125.gif"/></a>
+// Place your html content in a file called content/en_pagename.php
+ob_start();
+include("content/en_" . $App->getScriptName());
+$html = ob_get_clean();
 
-		<p>The Callisto Experience starts with a small download in the form of the
-		Eclipse Platform Runtime Binaries. From this starting point, using the
-		<a href="$callisto_discovery">Callisto Discovery Site</a>, you can add as few or as many of the features
-		produced by the ten projects involved in the Callisto release train as you
-		need.</p>
-				
-      	<div class="homeitem">
-      		<h3>What do you need?</h3>
+# Generate the web page
 
-			<p><strong><a href="http://download.eclipse.org/eclipse/downloads/drops/R-3.2-200606291905/index.php">Eclipse 3.2</a> is required for Callisto.</strong> 
-			There is no upgrade path from previous versions of Eclipse.</p>
-      		
-
-      		<ul>
-      			<li style="border-style: none">The <a href="$platform_runtime_binaries">Eclipse Platform Runtime</a> <span style="white-space:nowrap">Binaries<img id="platform-down" src="images/down.png" onclick="show_section('platform');"/></span>
-      						<div id="platform" style="border-style:solid;border-width:1px;margin-left:5%;display:none">
-      							<h3><img onclick="hide_section('platform');" align="right" src="images/close.png"/>Eclipse SDK</h3>
-	      						The Eclipse Platform Runtime Binaries provides base integrated development
-	      						environment (IDE) functionality, but without support for any specific programming 
-	      						languages or tools. From the Platform Runtime Binaries, you can connect to the
-	      						Callisto Discovery Site to install the features you need.
-      						</div>
-      					</li>
-      			</li>
-      			<li style="border-style: none">Optional features available via the <a href="$callisto_discovery">Callisto&nbsp;Discovery&nbsp;Site</a>
-      				<ul>
-		      			<li style="border-style: none">C/C++ Development tools <span style="white-space:nowrap">(<a href="/cdt">CDT</a>)<img id="cdt-down" src="images/down.png" onclick="show_section('cdt');"/></span>
-		      				<div id="cdt" style="border-style:solid;border-width:1px;margin-left:5%;display:none">
-		      					<h3><img onclick="hide_section('cdt');" align="right" src="images/close.png"/>CDT</h3>
-			      				The CDT provides advanced functionality for C/C++ developers.
-			      				Combining the CDT with the Platform Runtime forms 
-			      				a first-class C/C++ IDE.
-		      					<h4>Tutorials and Help</h4>
-							    <ul>
-							    	<li style="list-style-image: url(images/movie.png);border-style: none"><a href="$install_cdt">Installing and using the C/C++ Development Tools</a></li>
-									<li style="list-style-image: url(images/tutorial.png);border-style: none"><a href="http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/cdt-home/user/Tutorials.html?cvsroot=Tools_Project">CDT Tutorials...</a></li>
-								</ul>
-		      				</div>
-		      			</li>		      			
-      					     					
-      					<li style="border-style: none">Data Tools <span style="white-space:nowrap">(<a href="/datatools">DTP</a>)<img id="dtp-down" src="images/down.png" onclick="show_section('dtp');"/></span>
-      						<div id="dtp" style="border-style:solid;border-width:1px;margin-left:5%;display:none">
-      							<h3><img onclick="hide_section('dtp');" align="right" src="images/close.png"/>Data Tools</h3>
-	      						Data Tools provides tools for accessing, viewing and manipulating databases and
-	      						other data sources.
-      						</div>
-      					</li>
-      					
-      					<li style="border-style: none">Eclipse Modeling Framework <span style="white-space:nowrap">(<a href="/emf">EMF</a>)<img id="emf-down" src="images/down.png" onclick="show_section('emf');"/></span>
-      						<div id="emf" style="border-style:solid;border-width:1px;margin-left:5%;display:none">
-      							<h3><img onclick="hide_section('emf');" align="right" src="images/close.png"/>Eclipse Modeling Framework</h3>
-      							EMF is a modeling framework and code generation facility for building tools and other 
-      							applications based on a structured data model.
-      						</div>
-      					</li>
-      					
-      					<li style="border-style: none">Graphical Editing Framework <span style="white-space:nowrap">(<a href="/gef">GEF</a>)<img id="gef-down" src="images/down.png" onclick="show_section('gef');"/></span>
-      						<div id="gef" style="border-style:solid;border-width:1px;margin-left:5%;display:none">      							
-      							<h3><img onclick="hide_section('gef');" align="right" src="images/close.png"/>Graphical Editing Framework</h3>
-      							The Graphical Editing Framework (GEF) allows developers to take an existing 
-      							application model and quickly create a rich graphical editor.
-      						</div>
-      					</li>
-      					
-      					<li style="border-style: none">Graphical Modeling Framework <span style="white-space:nowrap">(<a href="/gmf">GMF</a>)<img id="gmf-down" src="images/down.png" onclick="show_section('gmf');"/></span>
-      						<div id="gmf" style="border-style:solid;border-width:1px;margin-left:5%;display:none">
-      							<h3><img onclick="hide_section('gmf');" align="right" src="images/close.png"/>Graphical Modeling Framework</h3>
-      							The Eclipse Graphical Modeling Framework (GMF) provides a 
-      							generative component and runtime infrastructure for developing 
-      							graphical editors.
-      						</div>
-      					</li>
- 
-      					<li style="border-style: none">Java Development Tools <span style="white-space:nowrap">(<a href="/jdt">JDT</a>)<img id="jdt-down" src="images/down.png" onclick="show_section('jdt');"/></span>
-      						<div id="jdt" style="border-style:solid;border-width:1px;margin-left:5%;display:none">
-      							<h3><img onclick="hide_section('jdt');" align="right" src="images/close.png"/>Java Development Tools</h3>
-	      						The Java Development Tools (JDT) provides tools that support
-	      						the development of any Java application, including Eclipse plug-ins. 
-      							<ul>
-					      		    <li style="list-style-image: url(images/movie.png);border-style: none"><a href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/testfirst/testfirst.html">Test First Development using Eclipse</a></li>
-					      		</ul>
-      						</div>
-      					</li>  
-      					
-      					<li style="border-style: none">Java EE and Web Tools <span style="white-space:nowrap">(<a href="/webtools">WTP</a>)<img id="wtp-down" src="images/down.png" onclick="show_section('wtp');"/></span>
-      						<div id="wtp" style="border-style:solid;border-width:1px;margin-left:5%;display:none">
-      							<h3><img onclick="hide_section('wtp');" align="right" src="images/close.png"/>Java EE and Web Tools</h3>
-	      						The Eclipse Web Tools Platform (WTP) extends the Eclipse 
-      							platform with tools for developing Java Enterprise Edition and
-      							Web applications.
-      							<ul>
-					      		    <li style="list-style-image: url(images/tutorial.png);border-style: none"><a href="http://www.eclipse.org/webtools/community/tutorials/BuildJ2EEWebApp/BuildJ2EEWebApp.html">Building and Running a Web Application</a></li>
-									<li style="list-style-image: url(images/tutorial.png);border-style: none"><a href="http://www.eclipse.org/dali/viewlets/01-Add_Persistence_viewlet_swf.html">Adding Java Persistence API (JPA) Support to a Project</a></li>
-									<li style="list-style-image: url(images/tutorial.png);border-style: none"><a href="http://www.eclipse.org/webtools/community/communityresources.html#tutorials">More Web and Java EE Tutorials...</a></li>
-								</ul>
-      						</div>
-      					</li>  
-      					
-      					<li style="border-style: none">Reporting Tools <span style="white-space:nowrap">(<a href="/birt">BIRT</a>)<img id="birt-down" src="images/down.png" onclick="show_section('birt');"/></span>
-      						<div id="birt" style="border-style:solid;border-width:1px;margin-left:5%;display:none">
-      							<h3><img onclick="hide_section('birt');" align="right" src="images/close.png"/>Reporting Tools</h3>
-	      						BIRT is a reporting system that integrates with your application to produce 
-	      						compelling reports for both web and PDF.
-	      						<ul>
-					      		    <li style="list-style-image: url(images/tutorial.png);border-style: none"><a href="http://www.eclipse.org/birt/phoenix/tutorial/basic">Building a Simple Report with BIRT</a></li>
-									<li style="list-style-image: url(images/movie.png);border-style: none"><a href="http://download.eclipse.org/birt/downloads/demos/FirstReport/MyFirstReport.html">My First Report</a></li>
-									<li style="list-style-image: url(images/tutorial.png);border-style: none"><a href="http://www.eclipse.org/birt/phoenix/tutorial/">More BIRT Tutorials and screen casts...</a></li>
-								</ul>
-      						</div>
-      					</li>
-      					
-      					<li style="border-style: none">Test and Performance Tools <span style="white-space:nowrap">(<a href="/tptp">TPTP</a>)<img id="tptp-down" src="images/down.png" onclick="show_section('tptp');"/></span>
-      						<div id="tptp" style="border-style:solid;border-width:1px;margin-left:5%;display:none">
-      							<h3><img onclick="hide_section('tptp');" align="right" src="images/close.png"/>Test and Performance Tools</h3>
-	      						The Eclipse Test and Performance Tools Platform (TPTP) Project 
-	      						provides an open platform supplying powerful frameworks and 
-	      						services that allow software developers to build unique test 
-	      						and performance tool, both open source and commercial, that 
-	      						can be easily integrated with the platform and with other tools.
-      							<h4>Suggested reading</h4>
-					      		<ul>      		  	
-					      			<li style="list-style-image: url(images/tutorial.png);border-style: none"><a href="http://www.eclipse.org/tptp/home/documents/conferences/eclipseCon2005/EclipseCon_2005_Tutorial_22_Antony_Miguel_Paul_Slauenwhite.pdf">Using TPTP Logging and Monitoring Tools</a></li>
-					      		</ul>
-      						</div>
-      					</li>
-      					
-      					<li style="border-style: none">Visual Editor <span style="white-space:nowrap">(<a href="/vep">VE</a>)<img id="ve-down" src="images/down.png" onclick="show_section('ve');"/></span>
-      						<div id="ve" style="border-style:solid;border-width:1px;margin-left:5%;display:none">
-      							<h3><img onclick="hide_section('ve');" align="right" src="images/close.png"/>Visual Editor</h3>
-	      						The Eclipse Visual Editor (VE) project is a vendor-neutral, open 
-      							development platform supplying frameworks for creating GUI 
-      							builders, and exemplary, extensible tool implementations for 
-      							<a href="/swt">SWT</a>/<a href="/rcp">RCP</a>.
-      						</div>
-      					</li>
-      				</ul>
-   				</li>
-      		</ul>
-      	</div>    	
-      	<div class="homeitem">
-      		<h3>Tutorials and Help</h3>
-      		<ul>
-      		    <li style="list-style-image: url(images/movie.png);border-style: none"><a href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/install-eclipse/install-eclipse.html">Installing the Eclipse SDK</a></li>
-      		    <li style="list-style-image: url(images/movie.png);border-style: none"><a href="$install_callisto">Installing Features from the Callisto Discovery Site</a></li>
-      			<li style="list-style-image: url(images/movie.png);border-style: none"><a href="$install_cdt">Installing and using the C/C++ Development Tools</a></li>
-				<li style="list-style-image: url(images/movie.png);border-style: none"><a href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/install-wtp/install-wtp.html">Installing and Using the Eclipse Web Tools</a></li>
-				<li style="list-style-image: url(images/tutorial.png);border-style: none"><a href="http://www.eclipse.org/birt/phoenix/build/">Installing BIRT</a></li>
-				  <li style="list-style-image: url(images/movie.png);border-style: none"><a href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/install-ve/install-ve.html">Installing and using the Eclipse Visual Editor</a></li>
-			     			    		
-      		</ul>
-      	</div>
-      	
-	</div>
-
-</div>
-
-EOHTML;
-
-	# Generate the web page
-	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
+$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="/callisto/callisto.css" media="screen" />');
+$App->generatePage(NULL, $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);
\ No newline at end of file
diff --git a/discovery.php b/discovery.php
index ae8b5c4..989d24a 100644
--- a/discovery.php
+++ b/discovery.php
@@ -1,93 +1,36 @@
-<?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'
+<?php
+/*******************************************************************************
+ * Copyright(c) 2015 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:
+ *    Nathan Gervais(Eclipse Foundation) - Initial implementation
+ *    Eric Poirier(Eclipse Foundation)
+ *******************************************************************************/
+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");
 
-	#*****************************************************************************
-	#
-	# template.php
-	#
-	# Author: 		Denis Roy
-	# Date:			2005-06-16
-	#
-	# Description: Type your page comments here - these are not sent to the browser
-	#
-	#
-	#****************************************************************************
-	
-	#
-	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "Eclipse Callisto Discovery Site";
-	$pageKeywords	= "eclipse callisto release download what is";
-	$pageAuthor		= "Nathan Gervais";
-	
-	# Add page-specific Nav bars here
-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 1);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 1);
-
-	# End: page-specific settings
-	#
-	// This file is linked to from lots of different places.
-	// Use absolute paths to make sure that we can actually test
-	// that the file renders properly (i.e. testing using) "/index.php",
-	// and "/home/index.php" both work.
-
-	require_once("links.php");
-
-	# Paste your HTML content between the EOHTML markers!	
-	$html = <<<EOHTML
-<div id="maincontent">
-	<div id="midcolumn">
-		<h1>$pageTitle</h1>
-		<img src="callisto_slice.jpg">
-
-		<h2>Using Callisto Discovery Site</h2>
- 		<p>
- 			The Callisto Discovery Site allows you to install any of the projects included 
- 			in the Callisto Release from a single location.   Instead of downloading each project individually	and then installing 
- 			them into your workspace, the Callisto Discovery Site simplifies the process.	</p>
- 			
-		<div class="homeitem3col">
-		<h3>Instructions</h3>
-		
-		<p>To access the Callisto Discovery site:</p>
- 		<ul>
- 			<li> First download either the <a href="$eclipse_sdk">Eclipse SDK</a> or
- 			the <a href="$platform_runtime_binaries">Eclipse Platform Runtime Binaries</a>.</li>
- 			<li>You then need to use the update manager to load Callisto projects.  See <a href="http://help.eclipse.org/help31/index.jsp?topic=/org.eclipse.platform.doc.user/tasks/tasks-34.htm">Eclipse Help</a> for general information about using Update Manager. 
-			You can also view a <a href="$install_callisto">screencam demonstration</a> of using the Callisto Discovery Site.</li>
-			<li>For most distributions of Eclipse, there should already be a &quot;Callisto Discovery Site&quot; defined in its 
-		Update Manager. If you do not see it you can try adding the following URL as a remote update site in your 
-		update manager. http://download.eclipse.org/callisto/releases/  </li>
-		<li>Alternatively, if you would like to view the list or projects by their Eclipse Project (PMC) 
-			organization, you can define a new remote update site, and specify a site-byProject.xml file. In other 
-			words, http://download.eclipse.org/callisto/releases/site-byProject.xml
-			</li>
-		</ul>
-			</p>
-		</div>
-		<div class="homeitem3col">
-			<h3>Tips</h3>
-			<ul>
-			<li>To lessen download time (by installing the minimum number of features), first select the desired feature in the Eclipse update install dialog, then use the &quot;Select Required&quot; button to select only the minimum required prerequisite features.
-			<li>Any time you get a chance, export your bookmark files from the &quot;Add a Site&quot; dialog. Having them saved away in a safe place makes it much easier to re-create another development environment.
-			<li>Since the workbench will have to shutdown and restart you can you do the upgrade and installs with an empty workspace and once satisfied all is well, then use the -data option on the Eclipse command line (or shortcut) to point to your workspace of interest.
-			<li>Both before and after installing &quot;new&quot; features, you may want to use update manager to &quot;Check for updates to currently installed features&quot;. In some cases, just installing a feature will not necessarily upgrade all of its prerequisites to the highest available level.
-			</ul>
-		</div>
-		
-		<div class="homeitem3col">
-			<h3>Example of Update Dialog</h3>
-			Here is an example screen shot highlighting. The example is from having started with just the Eclipse Platform Feature installed.
-			<br/>
-			<p align="center"><img src="images/update-dialog.png"></p><br/>
-		</div>
-	</div>
-</div>
-
-	
-EOHTML;
+$App = new App();
+$Nav = new Nav();
+$Menu = new Menu();
+include($App->getProjectCommon()); // All on the same line to unclutter the user's desktop'
 
 
-	# Generate the web page
-	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
\ No newline at end of file
+// Begin: page-specific settings. Change these.
+$pageTitle    = "Eclipse Callisto Discovery Site";
+$pageKeywords = "eclipse callisto release download what is";
+$pageAuthor   = "Nathan Gervais";
+
+// Place your html content in a file called content/en_pagename.php
+ob_start();
+include("content/en_" . $App->getScriptName());
+$html = ob_get_clean();
+
+# Generate the web page
+
+$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="/callisto/callisto.css" media="screen" />');
+$App->generatePage(NULL, $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);
\ No newline at end of file
diff --git a/downloads.php b/downloads.php
index 4a454ad..1529921 100644
--- a/downloads.php
+++ b/downloads.php
@@ -1,150 +1,36 @@
-<?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'
+<?php
+/*******************************************************************************
+ * Copyright(c) 2015 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:
+ *    Nathan Gervais(Eclipse Foundation) - Initial implementation
+ *    Eric Poirier(Eclipse Foundation)
+ *******************************************************************************/
+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");
 
-	#*****************************************************************************
-	#
-	# template.php
-	#
-	# Author: 		Denis Roy
-	# Date:			2005-06-16
-	#
-	# Description: Type your page comments here - these are not sent to the browser
-	#
-	#
-	#****************************************************************************
-
-	#
-		# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "Eclipse Distros Downloads Page";
-	$pageKeywords	= "Download, Callisto, Mirrors, Members";
-	$pageAuthor		= "Type your name here";
-	
-	# Add page-specific Nav bars here
-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 1);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 1);
-
-	# End: page-specific settings
-	#
-
-	//error_reporting(1);
-
-	
-	/// Nathan -- Add new companies below this line
-	/// Order of items is the same order as class declaration above.
-	$BEA = new companyInfo("BEA", "images/bea.jpg", "<div style='position:relative;margin-bottom:-10px;'> Callisto all-in-one project downloads by Eclipse.  No joke bandwidth by <img style='clear:none;position:relative;top:5px;' src='images/akamai.PNG'>.  The #1 Commercial Eclipse based tool by BEA.</div>", "SDK, WTP All-in-one, WTP+JST+WST All-in-one and more!", "redirect.php?A=BEA", 300, 1);
-	$Innoopract = new companyInfo("Innoopract", "images/innoopract.jpg", "<div style='position:relative;margin-bottom:-10px;'> Callisto and more: Use the really cool <img style='clear:none;position:relative;top:5px;' src='images/yoxos_logo_48x16.png'> on Demand to configure your individual download of eclipse.org and tested 3rd party plugins.</div>", "All", "redirect.php?A=Innoopract", 300, 1);
-	$NexB = new companyInfo("nexB", "images/nexb.jpg", "Get easy to install Eclipse Callisto-based distros and open source plugins with EasyEclipse", "All", "redirect.php?A=NexB", 100, 1);
-	$WWIM = new companyInfo("Weigle Wilczek - Information Management", "images/wilczek.jpg", "German and Russian servers.", "All", "redirect.php?A=WWIM", 100, 1);
-	$IBM = new companyInfo("IBM", "images/ibm.jpg", "Updated for 3.2.2 - Free, no-registration-necessary Callisto bundles ready-to-use: 1) JavaEE development (WTP); 2) software modeling (GMF); 3) testing (TPTP); 4) enterprise projects. Let IBM help you jump-start your next Eclipse project.", "All", "redirect.php?A=IBM",  100, 1);
-	$ACTUATE = new companyInfo("Actuate", "images/actuate.PNG", "Download servers at China with translated download pages.", "Projects: SDK (English), BIRT All-in-one.", "redirect.php?A=ACT",  50, 1);
-	$ROWE = new companyInfo("RoweBots", "images/rowebots64.jpg", "C/C++Tools for Embedded System Development including compiler tool chains, full support and single click install.  No registration required.", "10 Callisto Embedded Systems Downloads.", "redirect.php?A=ROW",  50, 1);
-
-	///  Add the new Variable to this array  
-	$companyinfo = array(&$Innoopract, &$WWIM, &$IBM, &$BEA, &$NexB, &$ACTUATE, &$ROWE);
-	///////////////////////////////////////////////////////////////////////////////////////////
-	$randomized = randomSeed ($companyinfo);
-	
-	
-	# Paste your HTML content between the EOHTML markers!	
-	ob_start();
-	?>
-<link rel="stylesheet" type="text/css" href="callisto.css" media="screen" />	
-	<div id="midcolumn">
-	
-		<h1><?=$pageTitle;?></h1>
-				<p>These Eclipse Foundation Members have graciously offered to host downloads and bundles of Eclipse projects.  Each member site will have all the Callisto related projects - plus some interesting bundles and additional software!</p>
-		<div class="homeitem3col">
-			<h3>Eclipse Distros</h3>
-     		
-			<? 
-				$i = 0;
-				$count = count($companyinfo);
-				while ($i < $count)
-				{ 
-					
-					$index = $randomized[$i];
-				?>
-					<div class="downloadsContainer">
-						<a href="<?=$companyinfo[$index]->linkTo;?>">
-						<img src="<?=$companyinfo[$index]->companyLogo;?>" height="64" width="64" >
-						<div class="downloadsInfo"><h2><?=$companyinfo[$index]->companyName;?></h2><br/><?=$companyinfo[$index]->companyBlurb;?><br/><strong>Projects: </strong><?=$companyinfo[$index]->projects;?><br/></div>
-						</a>
-					</div>
-				<?
-				$i++; 
-				}
-			?>
-			</table>
-		</div>
-		<p class="smallType">Details for participating in the Callisto Members Downloads can be found <a href="http://www.eclipse.org/projects/callisto-files/callisto-download-proposal.php">HERE</a>.  If you would like to host Callisto projects and more while helping to promote your organization to the Eclipse Ecosystem, please send an email to <a href="mailto:callisto.feedback@eclipse.org">callisto.feedback@eclipse.org</a>.   If you are experiencing technical difficulties with any of the links, please open a <a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Phoenix">bug report</a>.  If you are experiencing problems with a member site, please contact their webmaster or persons noted on their landing page.</p>
-	</div>
-
-	<?
-	$html = ob_get_contents();
-	ob_end_clean();
-	
-	# Generate the web page
-	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+$App = new App();
+$Nav = new Nav();
+$Menu = new Menu();
+include($App->getProjectCommon()); // All on the same line to unclutter the user's desktop'
 
 
+// Begin: page-specific settings. Change these.
+$pageTitle    = "Eclipse Distros Downloads Page";
+$pageKeywords = "Download, Callisto, Mirrors, Members";
+$pageAuthor   = "Type your name here";
 
-function randomSeed (& $companyinfoArray) {
-			$max = 0;
-			$arrayCount = count($companyinfoArray);
-			
-			//This For loop creates the catalog that we Rand into and finds our total wieght ($max)
-			foreach ($companyinfoArray as $key => $value)
-			{
-				$weight = round($value->speed * $value->ranking);   
-				$max += $weight;
-				$catalog[$key]= $weight;
-			}
-			
-			//This loop continues till there are no items left
-			while (count($catalog))
-			{
-				$count = 0;
-				$rand = rand (1, $max);
-				// This Loop grabs the item and compares the rand number to its value + count
-				foreach ($catalog as $key => $value)
-				{
-					if ( ($value + $count) >= $rand)  // Going in here means we found the right number
-					{
-						unset ($catalog[$key]); // Unset removes the entry from the array
-						$randomized[] = $key;   // Add the key of the array to our ordered array
-						$max -= $value;			// Remove the weight of the item from $max
-						break;
-					}
-					else  
-					{
-						$count += $value;  // Value is too low increase count
-					}
-				}
-			}
-	//$randomized is the randomly ordered order of display
-	return $randomized;		
-	}
-	
-	
-	class companyInfo {
-		var $companyName;
-		var $companyLogo;
-		var $companyBlurb;
-		var $projects;
-		var $linkTo;
-		var $speed;
-		var $ranking;
-		
-		function companyInfo ($_companyName, $_companyLogo, $_companyBlurb, $_projects, $_linkTo, $_speed, $_ranking = "1") {
-			$this->companyName = $_companyName;
-			$this->companyLogo = $_companyLogo;
-			$this->companyBlurb = $_companyBlurb;
-			$this->projects = $_projects;
-			$this->linkTo = $_linkTo;
-			$this->speed = $_speed;
-			$this->ranking = $_ranking;	
-		}
-	}
-	
-?>
+// Place your html content in a file called content/en_pagename.php
+ob_start();
+include("content/en_" . $App->getScriptName());
+$html = ob_get_clean();
+
+# Generate the web page
+
+$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="/callisto/callisto.css" media="screen" />');
+$App->generatePage(NULL, $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);
\ No newline at end of file
diff --git a/ecosystem/callistoecosystemnews.php b/ecosystem/callistoecosystemnews.php
index 27c9a97..30040cc 100644
--- a/ecosystem/callistoecosystemnews.php
+++ b/ecosystem/callistoecosystemnews.php
@@ -1,71 +1,40 @@
-<?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'

+<?php

+/*******************************************************************************

+ * Copyright (c) 2015 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:

+ *    Nathan Gervais (Eclipse Foundation) - Initial implementation

+ *    Eric Poirier (Eclipse Foundation)

+ *******************************************************************************/

 

-	#*****************************************************************************

-	#

-	# template.php

-	#

-	# Author: 		Denis Roy

-	# Date:			2005-06-16

-	#

-	# Description: Type your page comments here - these are not sent to the browser

-	#

-	#

-	#****************************************************************************

-	

-	#

-	# Begin: page-specific settings.  Change these. 

-	$pageTitle 		= "Eclipse Callisto Ecosystem News";

-	$pageKeywords	= "eclipse callisto release download what is";

-	$pageAuthor		= "Donald Smith";

-	

-	# Add page-specific Nav bars here

-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)

-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");

-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 1);

-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 1);

+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");

 

-	# End: page-specific settings

-	#

-	// This file is linked to from lots of different places.

-	// Use absolute paths to make sure that we can actually test

-	// that the file renders properly (i.e. testing using) "/index.php",

-	// and "/home/index.php" both work.

-

-	# Paste your HTML content between the EOHTML markers!	

-	$html = <<<EOHTML

-<div id="maincontent">

-	<div id="midcolumn">

-		<h1>$pageTitle</h1>

-		<img src="../callisto_slice.jpg">

-		<h2>Callisto Ecosystem</h2>

-		<p>Have news or know of a great link to the Callisto Ecosystem?  Please email

-			<a href="mailto:callisto.feedback@eclipse.org?subject=Callisto Ecosystem News">callisto.feedback@eclipse.org</a>!!!

-		</p>

-			

-		<h2>Member News</h2>

-		<p>

-		<ul>

-			<li> Today - <a href="mailto:callisto.feedback@eclipse.org?subject=Callisto Ecosystem News"> Your story here!</a> </li>

-		</ul>	

-		</p>

-

-		<h2>Ecosystem News</h2>

-		<p>

-		<ul>

-			<li> Mar 26, 2006 - <a href="http://www.adtmag.com/blogs/blog.aspx?a=18198">ADT Magazine Interview with Mike Milinkovich</a> </li>

-			<li> Feb  8, 2006 - <a href="http://www.eclipsezone.com/eclipse/forums/t63440.html">EclipseZone Discussion</a> </li>

-

-		</ul>	

-		

-		</p>

-

-	</div>

-</div>

-

-	

-EOHTML;

+$App = new App();

+$Nav = new Nav();

+$Menu = new Menu();

+include ($App->getProjectCommon ()); // All on the same line to unclutter the user's desktop'

 

 

-	# Generate the web page

-	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);

-?>
\ No newline at end of file
+// Begin: page-specific settings. Change these.

+$pageTitle = "Eclipse Callisto Ecosystem News";

+$pageKeywords = "eclipse callisto release download what is";

+$pageAuthor = "Donald Smith";

+

+// Place your html content in a file called content/en_pagename.php

+ob_start();

+include("content/en_" . $App->getScriptName());

+$html = ob_get_clean();

+

+# Generate the web page

+

+$App->AddExtraHtmlHeader('<link href="//fonts.googleapis.com/css?family=Raleway:100,300,500,400,700" rel="stylesheet" type="text/css">');

+$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="/mars/assets/public/stylesheets/styles.min.css" media="screen" />');

+$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="/callisto/callisto.css" media="screen" />');

+$App->AddExtraJSFooter('<script type="text/javascript" src="/mars/assets/public/javascript/scripts.min.js"></script>');

+$App->generatePage(NULL, $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);
\ No newline at end of file
diff --git a/ecosystem/content/en_callistoecosystemnews.php b/ecosystem/content/en_callistoecosystemnews.php
new file mode 100644
index 0000000..6e494b3
--- /dev/null
+++ b/ecosystem/content/en_callistoecosystemnews.php
@@ -0,0 +1,32 @@
+<?php
+/*******************************************************************************
+ * Copyright (c) 2015 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:
+ *    Nathan Gervais (Eclipse Foundation) - Initial implementation
+ *    Eric Poirier (Eclipse Foundation)
+ *******************************************************************************/
+ ?>
+    <h1>Eclipse Callisto Ecosystem News</h1>
+    <img src="../callisto_slice.jpg">
+    <h2>Callisto Ecosystem</h2>
+    <p>Have news or know of a great link to the Callisto Ecosystem?  Please email
+      <a href="mailto:callisto.feedback@eclipse.org?subject=Callisto Ecosystem News">callisto.feedback@eclipse.org</a>!!!
+    </p>
+
+    <h2>Member News</h2>
+    <p>
+    <ul>
+      <li> Today - <a href="mailto:callisto.feedback@eclipse.org?subject=Callisto Ecosystem News"> Your story here!</a> </li>
+    </ul>
+    </p>
+
+    <h2>Ecosystem News</h2>
+    <ul>
+      <li> Mar 26, 2006 - <a href="http://www.adtmag.com/blogs/blog.aspx?a=18198">ADT Magazine Interview with Mike Milinkovich</a> </li>
+      <li> Feb  8, 2006 - <a href="http://www.eclipsezone.com/eclipse/forums/t63440.html">EclipseZone Discussion</a> </li>
+    </ul>
\ No newline at end of file
diff --git a/ecosystem/content/en_index.php b/ecosystem/content/en_index.php
new file mode 100644
index 0000000..752e43a
--- /dev/null
+++ b/ecosystem/content/en_index.php
@@ -0,0 +1,64 @@
+<?php
+/*******************************************************************************
+ * Copyright (c) 2015 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:
+ *    Nathan Gervais (Eclipse Foundation) - Initial implementation
+ *    Eric Poirier (Eclipse Foundation)
+ *******************************************************************************/
+ ?>
+    <h1>Eclipse Callisto Ecosystem Page</h1>
+    <img src="../callisto_slice.jpg">
+    <h2>Callisto Ecosystem</h2>
+    <p>This page is a landing page for the Eclipse Ecosystem to share information about the
+    upcoming release of Callisto.  If you have any Ecosystem related questions about the
+    Callisto release, please me sure to contact
+      <a href="mailto:callisto.feedback@eclipse.org">callisto.feedback@eclipse.org</a>.
+    </p>
+    <p>Here are some important links to find out more information regarding the Callisto Release:
+    <ul>
+      <li> <a href="/callisto/index.php"> Eclipse Callisto Discovery Site</a> </li>
+      <li> <a href="/projects/callisto.php"> Callisto Project Page</a> </li>
+      <li> <a href="/projects/callisto-files/callisto-bug-contest.php">Callisto Bug Finding Contest</a> </li>
+      <li> <a href="callistoecosystemnews.php"> Callisto Ecosystem News</a></li>
+    </ul>
+    </p>
+
+    <h2>Why is the Callisto release important to the Ecosystem?</h2>
+    <p>
+    Callisto represents the synchronous release of ten different Eclipse projects -
+    Business Intelligence and Reporting Tools (BIRT),
+    C/C++ Development Tools (CDT),
+    Data Tools Platform (DTP),
+    Eclipse Modeling Framework (EMF),
+    Graphical Editor Framework (GEF),
+    Graphical Modeling Framework (GMF),
+    Eclipse Project (Platform, Equinox, Java development tools (JDT), Plug-in development environment (PDE)),
+    Test and Performance Tools Platform (TPTP),
+    Web Tools Platform (WTP),
+    Visual Editor (VE).
+    </p>
+
+    <p>
+    Synchronizing the releases helps eliminate uncertainty about versions and compatbility
+    thus allowing the ecyosystem to start their own integration, cross-project and
+    cross-product development and testing efforts sooner.  Callisto is about improving
+    the productivity of developers working with Eclipse frameworks by providing a transparent
+    and predictable development cycle.  Hopefully Callisto will be the first of many annual
+    simultaneous releases that demonstrate Eclipse as the predicable platform upon which
+    to develop tools and applications.
+    </p>
+
+    <h2>We need YOU!</h2>
+    <p>
+    Announce your plans for Callisto and
+    <a href="mailto:callisto.feedback@eclipse.org?subject=Callisto Ecosystem News">send us a link</a>
+    for the
+    <a href="callistoecosystemnews.html">Callisto Ecosystem News</a> page.  Have you spotted
+    a great BLOG entry or news article about Callisto?
+    <a href="mailto:callisto.feedback@eclipse.org?subject=Callisto Ecosystem News">Send it our way!</a>
+    </p>
\ No newline at end of file
diff --git a/ecosystem/index.php b/ecosystem/index.php
index dcdd2c6..05128bd 100644
--- a/ecosystem/index.php
+++ b/ecosystem/index.php
@@ -1,99 +1,41 @@
-<?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'

+<?php

+/*******************************************************************************

+ * Copyright (c) 2015 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:

+ *    Nathan Gervais (Eclipse Foundation) - Initial implementation

+ *    Eric Poirier (Eclipse Foundation)

+ *******************************************************************************/

 

-	#*****************************************************************************

-	#

-	# template.php

-	#

-	# Author: 		Denis Roy

-	# Date:			2005-06-16

-	#

-	# Description: Type your page comments here - these are not sent to the browser

-	#

-	#

-	#****************************************************************************

-	

-	#

-	# Begin: page-specific settings.  Change these. 

-	$pageTitle 		= "Eclipse Callisto Ecosystem Page";

-	$pageKeywords	= "eclipse callisto release download what is";

-	$pageAuthor		= "Donald Smith";

-	

-	# Add page-specific Nav bars here

-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)

-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");

-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 1);

-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 1);

+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");

 

-	# End: page-specific settings

-	#

-	// This file is linked to from lots of different places.

-	// Use absolute paths to make sure that we can actually test

-	// that the file renders properly (i.e. testing using) "/index.php",

-	// and "/home/index.php" both work.

-

-	# Paste your HTML content between the EOHTML markers!	

-	$html = <<<EOHTML

-<div id="maincontent">

-	<div id="midcolumn">

-		<h1>$pageTitle</h1>

-		<img src="../callisto_slice.jpg">

-		<h2>Callisto Ecosystem</h2>

-		<p>This page is a landing page for the Eclipse Ecosystem to share information about the

-		upcoming release of Callisto.  If you have any Ecosystem related questions about the

-		Callisto release, please me sure to contact 

-			<a href="mailto:callisto.feedback@eclipse.org">callisto.feedback@eclipse.org</a>.

-		</p>

-		<p>Here are some important links to find out more information regarding the Callisto Release:

-		<ul>

-			<li> <a href="../index.php"> Eclipse Callisto Discovery Site</a> </li>

-			<li> <a href="/projects/callisto.php"> Callisto Project Page</a> </li>

-			<li> <a href="/projects/callisto-files/callisto-bug-contest.php">Callisto Bug Finding Contest</a> </li>

-			<li> <a href="callistoecosystemnews.php"> Callisto Ecosystem News</a></li>

-		</ul>

-		</p>	

-		

-		<h2>Why is the Callisto release important to the Ecosystem?</h2>

-		<p>

-		Callisto represents the synchronous release of ten different Eclipse projects - 

-		Business Intelligence and Reporting Tools (BIRT),

-		C/C++ Development Tools (CDT), 

-		Data Tools Platform (DTP),

-		Eclipse Modeling Framework (EMF),

-		Graphical Editor Framework (GEF),

-		Graphical Modeling Framework (GMF),

-		Eclipse Project (Platform, Equinox, Java development tools (JDT), Plug-in development environment (PDE)),

-		Test and Performance Tools Platform (TPTP),

-		Web Tools Platform (WTP),

-		Visual Editor (VE).  

-		</p>

-		

-		<p>

-		Synchronizing the releases helps eliminate uncertainty about versions and compatbility

-		thus allowing the ecyosystem to start their own integration, cross-project and

-		cross-product development and testing efforts sooner.  Callisto is about improving

-		the productivity of developers working with Eclipse frameworks by providing a transparent

-		and predictable development cycle.  Hopefully Callisto will be the first of many annual

-		simultaneous releases that demonstrate Eclipse as the predicable platform upon which

-		to develop tools and applications.		

-		</p>

-

-		<h2>We need YOU!</h2>

-		<p>

-		Announce your plans for Callisto and 

-		<a href="mailto:callisto.feedback@eclipse.org?subject=Callisto Ecosystem News">send us a link</a> 

-		for the 

-		<a href="callistoecosystemnews.php">Callisto Ecosystem News</a> page.  Have you spotted

-		a great BLOG entry or news article about Callisto?  

-		<a href="mailto:callisto.feedback@eclipse.org?subject=Callisto Ecosystem News">Send it our way!</a>

-		</p>

-

-	</div>

-</div>

-

-	

-EOHTML;

+$App = new App();

+$Nav = new Nav();

+$Menu = new Menu();

+include ($App->getProjectCommon ()); // All on the same line to unclutter the user's desktop'

 

 

-	# Generate the web page

-	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);

-?>
\ No newline at end of file
+// Begin: page-specific settings. Change these.

+$pageTitle = "Eclipse Callisto Ecosystem Page";

+$pageKeywords = "eclipse callisto release download what is";

+$pageAuthor = "Donald Smith";

+

+// Place your html content in a file called content/en_pagename.php

+ob_start();

+include("content/en_" . $App->getScriptName());

+$html = ob_get_clean();

+

+# Generate the web page

+

+$App->AddExtraHtmlHeader('<link href="//fonts.googleapis.com/css?family=Raleway:100,300,500,400,700" rel="stylesheet" type="text/css">');

+$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="/mars/assets/public/stylesheets/styles.min.css" media="screen" />');

+$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="/callisto/callisto.css" media="screen" />');

+$App->AddExtraJSFooter('<script type="text/javascript" src="/mars/assets/public/javascript/scripts.min.js"></script>');

+$App->generatePage(NULL, $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);

+

diff --git a/friends-of-callisto.php b/friends-of-callisto.php
index 90d9363..0bbca79 100644
--- a/friends-of-callisto.php
+++ b/friends-of-callisto.php
@@ -1,66 +1,36 @@
-<?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'
+<?php
+/*******************************************************************************
+ * Copyright(c) 2015 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:
+ *    Nathan Gervais(Eclipse Foundation) - Initial implementation
+ *    Eric Poirier(Eclipse Foundation)
+ *******************************************************************************/
+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");
 
-	#*****************************************************************************
-	#
-	# template.php
-	#
-	# Author: 		Denis Roy
-	# Date:			2005-06-16
-	#
-	# Description: Type your page comments here - these are not sent to the browser
-	#
-	#
-	#****************************************************************************
-	
-	#
-	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "Friends of Callisto";
-	$pageKeywords	= "callisto marketing, friends of callisto";
-	$pageAuthor		= "Nathan Gervais";
-	
-	# Add page-specific Nav bars here
-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 1);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 1);
-
-	# End: page-specific settings
-	#
-	// This file is linked to from lots of different places.
-	// Use absolute paths to make sure that we can actually test
-	// that the file renders properly (i.e. testing using) "/index.php",
-	// and "/home/index.php" both work.
-
-		
-	# Paste your HTML content between the EOHTML markers!	
-	$html = <<<EOHTML
-<link rel="stylesheet" type="text/css" href="callisto.css" media="screen" />
-<div class="callistoRealEstate">
-	<div>
-        <h1>$pageTitle</h1>
-		<p>Want to join the Friends of Callisto?  Put one of these images up on your website.</p>
-		<div>
-			<h2>Small Button (110 x 32 px)</h2>
-			<img border=0 alt="The Next Total Eclipse" title="Eclipse Callisto" src="images/callistosmall.gif"><br />
-			<textarea class="smallType" cols=60 rows=4 readonly>&lt;a href="http://www.eclipse.org/callisto/"&gt;&lt;img src="http://www.eclipse.org/callisto/images/callistosmall.gif" border=0 alt="The Next Total Eclipse" title="Callisto"&gt;&lt;/a&gt;</textarea>
-		</div>
-		<div>
-			<h2>Large Button (220 x 64 px)</h2>
-			<img border=0 alt="The Next Total Eclipse" title="Eclipse Callisto" src="images/callisto.gif"><br />
-			<textarea class="smallType" cols=60 rows=4 readonly>&lt;a href="http://www.eclipse.org/callisto/"&gt;&lt;img src="http://www.eclipse.org/callisto/images/callisto.gif" border=0 alt="The Next Total Eclipse" title="Callisto" &gt;&lt;/a&gt;</textarea>
-		</div>
-						<div>
-			<h2>Square Button (160 x 139 px)</h2>
-			<img border=0 alt="The Next Total Eclipse" title="Eclipse Callisto" src="images/largecallisto.gif"><br />
-			<textarea class="smallType" cols=60 rows=4 readonly>&lt;a href="http://www.eclipse.org/callisto/"&gt;&lt;img src="http://www.eclipse.org/callisto/images/largecallisto.gif" border=0 alt="The Next Total Eclipse" title="Callisto" &gt;&lt;/a&gt;</textarea>
-		</div>
-    </div>
-</div>
+$App = new App();
+$Nav = new Nav();
+$Menu = new Menu();
+include($App->getProjectCommon()); // All on the same line to unclutter the user's desktop'
 
 
-EOHTML;
+// Begin: page-specific settings. Change these.
+$pageTitle    = "Friends of Callisto";
+$pageKeywords = "callisto marketing, friends of callisto";
+$pageAuthor   = "Nathan Gervais";
 
-	# Generate the web page
-	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
-        
\ No newline at end of file
+// Place your html content in a file called content/en_pagename.php
+ob_start();
+include("content/en_" . $App->getScriptName());
+$html = ob_get_clean();
+
+# Generate the web page
+
+$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="/callisto/callisto.css" media="screen" />');
+$App->generatePage(NULL, $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);
\ No newline at end of file
diff --git a/getstarted.php b/getstarted.php
index 3dfe308..546314d 100644
--- a/getstarted.php
+++ b/getstarted.php
@@ -1,52 +1,36 @@
-<?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'
+<?php
+/*******************************************************************************
+ * Copyright(c) 2015 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:
+ *    Nathan Gervais(Eclipse Foundation) - Initial implementation
+ *    Eric Poirier(Eclipse Foundation)
+ *******************************************************************************/
+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");
 
-	#*****************************************************************************
-	#
-	# template.php
-	#
-	# Author: 		Wayne Beaton
-	# Date:			2006-06-06
-	#
-	# Description: Getting Started with Callisto
-	#
-	#
-	#****************************************************************************
-	
-	#
-	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "Getting Started with Eclipse Callisto";
-	$pageKeywords	= "eclipse callisto release download what is";
-	$pageAuthor		= "Wayne Beaton";
-	
-	# Add page-specific Nav bars here
-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 1);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 1);
-
-	# End: page-specific settings
-	#
-
-	# Paste your HTML content between the EOHTML markers!	
-	$html = <<<EOHTML
-<div id="maincontent">
-	<div id="midcolumn">
-		<h1>$pageTitle</h1>
-		<img width="100%" src="callisto_slice.jpg">
-		
-		<center><br/>
-			<a href="java.php"><img src="images/buildJava.gif"></a> 
-			<a href="plugin-dev.php"><img src="images/buildPlugin.gif"></a>
-			<a href="cdt.php"><img src="images/buildC.gif"></a>
-        </center>
-	</div>
-	
-</div>
-
-	
-EOHTML;
+$App = new App();
+$Nav = new Nav();
+$Menu = new Menu();
+include($App->getProjectCommon()); // All on the same line to unclutter the user's desktop'
 
 
-	# Generate the web page
-	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
\ No newline at end of file
+// Begin: page-specific settings. Change these.
+$pageTitle    = "Getting Started with Eclipse Callisto";
+$pageKeywords = "eclipse callisto release download what is";
+$pageAuthor   = "Wayne Beaton";
+
+// Place your html content in a file called content/en_pagename.php
+ob_start();
+include("content/en_" . $App->getScriptName());
+$html = ob_get_clean();
+
+# Generate the web page
+
+$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="/callisto/callisto.css" media="screen" />');
+$App->generatePage(NULL, $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);
\ No newline at end of file
diff --git a/index.php b/index.php
index a2abf89..01c4999 100644
--- a/index.php
+++ b/index.php
@@ -1,100 +1,36 @@
 <?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'
-include_once '_projectCommon.php';
+/*******************************************************************************
+ * Copyright(c) 2015 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:
+ *    Nathan Gervais (Eclipse Foundation) - Initial implementation
+ *    Eric Poirier (Eclipse Foundation)
+ *******************************************************************************/
+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");
 
-	#*****************************************************************************
-	#
-	# template.php
-	#
-	# Author: 		Denis Roy
-	# Date:			2005-06-16
-	#
-	# Description: Type your page comments here - these are not sent to the browser
-	#
-	#
-	#****************************************************************************
-
-	#
-	# Begin: page-specific settings.  Change these.
-	$pageTitle 		= "Eclipse Callisto";
-	$pageKeywords	= "callisto marketing ";
-	$pageAuthor		= "Nathan Gervais";
-
-	# Add page-specific Nav bars here
-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 1);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 1);
-
-	# End: page-specific settings
-	#
-	// This file is linked to from lots of different places.
-	// Use absolute paths to make sure that we can actually test
-	// that the file renders properly (i.e. testing using) "/index.php",
-	// and "/home/index.php" both work.
-	include ('scripts/whatsnew.php');
-	$whatsnew = rss_to_html('whatsnew');
-
-	# Paste your HTML content between the EOHTML markers!
-	$html = <<<EOHTML
-<link rel="stylesheet" type="text/css" href="callisto.css" media="screen" />
-<div class="callistoRealEstate paddingLeft">
-	    <h1>$pageTitle</h1>
-
-       	<h3>What is Callisto</h3>
-       	<table>
-       		<tr>
-       			<td valign="top">
-		        Callisto is about improving the productivity of the developers working on top of Eclipse frameworks by providing a more transparent and predictable development cycle.  By releasing <a href="callistoprojects.php">10 projects</a> at the same time in 2006, the goal is to eliminate uncertainty about version compatibility and make it easier to incorporate multiple projects into your environment.
-		        <br /><br />
-
-		        <em>While Callisto is about the simultaneous release of <a href="callistoprojects.php">ten projects</a>, it is
-		        not a unification of the projects - each project remains a
-		        separate open source project operating with its own project leadership,
-		        its own committers, and its own project plan.</em>
-		        <p>Click <a href="http://wiki.eclipse.org/Simultaneous_Release">here</a> to find out about the newest Eclipse Simultaneous Release</p>
-		        </td>
-        		<td valign="top" style="padding-left:10px;"><img src="/callisto/images/largeCallistoHere.gif" border=0 alt="The Next Total Eclipse" title="Callisto" style="float:right;clear:none;"></td>
-        	</tr>
-        </table>
-        <h3>How do I get Callisto?</h3>
-        <!--<div class="countdownBox">
-        Callisto is coming in : <span class="countdown" id="cd"></span>
-        </div>-->
-        <table cellspacing=0 class="callistoButtons">
-        	<tr>
-        		<td width="50"><a href="java.php"><img src="images/java.jpg"></a></td>
-				<td width="25%"class="noRightBorder"><a href="java.php">I Build Java / Web Applications</a></td>
-        		<td width="50"><a href="plugin-dev.php"><img src="images/plugin.jpg"></a></td>
-        		<td width="25%"class="noRightBorder"><a href="plugin-dev.php">I build Plugins / RCP Applications</a></td>
-        		<td width="50"><a href="c-dev.php"><img src="images/c.jpg"></a></td>
-        		<td width="25%"class="noRightBorder"><a href="c-dev.php">I Build C/C++ Applications</a></td>
-        		<td width="50"><a href="custom.php"><img src="images/custom.jpg"></a></td>
-        		<td width="25%"><a href="custom.php">Customize your Callisto Install</a></td>
-        	</tr>
-        </table>
-        <br/>
-
-        <div class="homeitem noMarginLeft">
-        <h3>Learn more</h3>
-        <ul>
-        	<li><a href="callistotags.php">Callisto Experiences</a> from the Blogsphere</li>
-        	<li>Check out the latest <a href="webinars.php">Webinars</a></li>
-        	<li>ISVs adopting <a href="callistoeffect.php">Callisto projects</a></li>
-        	<li> Listen to the <a href="http://www.eclipsezone.com/podcasts.jsp" target="blank">EclipseZone Callisto Podcasts</a>
-        </ul>
-        </div>
-
-        $whatsnew
-
-</div>
-<div id="rightcolumn">
-</div>
+$App = new App();
+$Nav = new Nav();
+$Menu = new Menu();
+include($App->getProjectCommon()); // All on the same line to unclutter the user's desktop'
 
 
+// Begin: page-specific settings. Change these.
+$pageTitle    = "Eclipse Callisto";
+$pageKeywords = "callisto marketing ";
+$pageAuthor   = "Nathan Gervais";
 
-EOHTML;
+// Place your html content in a file called content/en_pagename.php
+ob_start();
+include("content/en_" . $App->getScriptName());
+$html = ob_get_clean();
 
-	# Generate the web page
-	$App->generatePage($theme, $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
+# Generate the web page
+
+$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="/callisto/callisto.css" media="screen" />');
+$App->generatePage(NULL, $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);
\ No newline at end of file
diff --git a/index2.php b/index2.php
deleted file mode 100644
index fda3415..0000000
--- a/index2.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?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'
-
-	#*****************************************************************************
-	#
-	# template.php
-	#
-	# Author: 		Denis Roy
-	# Date:			2005-06-16
-	#
-	# Description: Type your page comments here - these are not sent to the browser
-	#
-	#
-	#****************************************************************************
-	
-	#
-	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "Eclipse Callisto";
-	$pageKeywords	= "callisto marketing ";
-	$pageAuthor		= "Nathan Gervais";
-	
-	# Add page-specific Nav bars here
-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 1);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 1);
-
-	# End: page-specific settings
-	#
-	// This file is linked to from lots of different places.
-	// Use absolute paths to make sure that we can actually test
-	// that the file renders properly (i.e. testing using) "/index.php",
-	// and "/home/index.php" both work.
-	include ('scripts/whatsnew.php');
-	$whatsnew = rss_to_html('whatsnew');	
-		
-	# Paste your HTML content between the EOHTML markers!	
-	$html = <<<EOHTML
-<script type="text/javascript" src="scripts/countdown.js"></script>	
-<link rel="stylesheet" type="text/css" href="callisto.css" media="screen" />
-<div class="callistoRealEstate paddingLeft">
-	    <h1>$pageTitle</h1>
-		
-       	<h3>What is Callisto</h3>
-       	<table>
-       		<tr>
-       			<td valign="top">
-		        Callisto is about improving the productivity of the developers working on top of Eclipse frameworks by providing a more transparent and predictable development cycle.  By releasing <a href="callistoprojects.php">10 projects</a> at the same time, the goal is to eliminate uncertainty about version compatibility and make it easier to incorporate multiple projects into your environment.
-		        <br /><br />
-		              
-		        <em>While Callisto is about the simultaneous release of <a href="callistoprojects.php">ten projects</a>, it is
-		        not a unification of the projects - each project remains a
-		        separate open source project operating with its own project leadership,
-		        its own committers, and its own project plan.</em>
-		        </td>
-        		<td valign="top" style="padding-left:10px;"><img src="/callisto/images/largecallisto.gif" border=0 alt="The Next Total Eclipse" title="Callisto" style="float:right;clear:none;"></td>
-        	</tr>
-        </table>
-        <h3>How do I get Callisto?</h3>
-        <!--<div class="countdownBox">
-        Callisto is coming in : <span class="countdown" id="cd"></span>
-        </div>-->
-        <table cellspacing=0 class="callistoButtons">
-        	<tr>
-        		<td width="50"><a href="java.php"><img src="images/java.jpg"></a></td>
-				<td width="25%"class="noRightBorder"><a href="java.php">I Build Java / Web Applications</a></td>
-        		<td width="50"><a href="plugin-dev.php"><img src="images/plugin.jpg"></a></td>
-        		<td width="25%"class="noRightBorder"><a href="plugin-dev.php">I build Plugins / RCP Applications</a></td>
-        		<td width="50"><a href="c-dev.php"><img src="images/c.jpg"></a></td>
-        		<td width="25%"class="noRightBorder"><a href="c-dev.php">I Build C/C++ Applications</a></td>
-        		<td width="50"><a href="custom.php"><img src="images/custom.jpg"></a></td>
-        		<td width="25%"><a href="custom.php">Customize your Callisto Install</a></td>
-        	</tr>
-        </table>
-        <br/>
-        
-        <div class="homeitem noMarginLeft">
-        <h3>Learn more</h3>
-        <ul>
-        	<li><a href="http://wiki.eclipse.org/index.php/Callisto_experiences">Callisto Experiences</a> from the Blogshere</li>
-        	<li>Check out the latest <a href="webinars.php">Webinars</a></li>
-        	<li>ISVs adopting <a href="callistoeffect.php">Callisto projects</a></li>
-        	<li> Listen to the <a href="http://www.eclipsezone.com/podcasts.jsp" target="blank">EclipseZone Callisto Podcasts</a>
-        </ul>
-        </div>
-        
-        $whatsnew
-
-</div>
-
-
-
-
-EOHTML;
-
-	# Generate the web page
-	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
diff --git a/java.php b/java.php
index 7522dfb..c595ad4 100644
--- a/java.php
+++ b/java.php
@@ -1,191 +1,36 @@
+<?php
+/*******************************************************************************
+ * Copyright(c) 2015 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:
+ *    Nathan Gervais(Eclipse Foundation) - Initial implementation
+ *    Eric Poirier(Eclipse Foundation)
+ *******************************************************************************/
+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");
 
-<?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'
+$App = new App();
+$Nav = new Nav();
+$Menu = new Menu();
+include($App->getProjectCommon()); // All on the same line to unclutter the user's desktop'
 
-	#*****************************************************************************
-	#
-	# template.php
-	#
-	# Author: 		Wayne Beaton
-	# Date:			2006-06-06
-	#
-	# Description: 
-	# This page contains pointers to download and tutorial information for
-	# individuals interested in using Eclipse for Java development.
-	#****************************************************************************
-	
-	#
-	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "Eclipse for Java and Web Developers";
-	$pageKeywords	= "callisto java mustang 3.2 matisse windowbuilder j2ee enterprise servlet tomcat eclipse resource screencam screen cam tutorial ";
-	$pageAuthor		= "Wayne Beaton";
-	
-	# Add page-specific Nav bars here
-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 1);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 1);
-	
-	#$Nav->addCustomNav("<img src=\"http://www.eclipsecon.org/2007/image125x125.gif\"/>","http://www.eclipsecon.org/2007", "_self", 1);
-	# End: page-specific settings
-	#
-			
-	require_once("links.php");
-	
-	# Paste your HTML content between the EOHTML markers!	
-	$html = <<<EOHTML
-<script type="text/javascript">
-function show_section(name) {
-	if (document.getElementById(name).style.display=='block') return;
-	document.getElementById(name +'-down').style.display='none';
-	document.getElementById(name).style.display='block'
-}
-function hide_section(name) {
-	if (document.getElementById(name).style.display=='none') return;
-	document.getElementById(name +'-down').style.display='inline';
-	document.getElementById(name).style.display='none'
-}
-</script>
-<link rel="stylesheet" type="text/css" href="callisto.css" media="screen" />
 
-<div class="callistoRealEstate paddingLeft">
-	<div class="maincontent">
-        <table cellspacing=0 class="callistoButtons">
-        	<tr>
-        		<td width="50"><img src="images/java.jpg"></a></td>
-				<td width="100%"class="noRightBorder">$pageTitle</td>
-			</tr>
-		</table>
-        <a href="http://www.eclipsecon.org/?tag=eclipse-callisto-java"><img style="margin-top:5px;" align="right" src="http://www.eclipsecon.org/2007/image125x125.gif"/></a>
-        <h2><a name="sdk"></a></h2>
-		<p>The Eclipse Software Development Kit (SDK) contains everything you need to build
-		Java applications. Considered by many to be the best Java development tool available,
-		the Eclipse Java Development Tools (JDT) provides superior Java editing with on-the-fly validation, 
-		incremental compilation, cross-referencing, code assist and much more.</p>
-		<p>The new Eclipse 3.2 release features some exciting new capabilities, including:
-		<ul>
-			<li>Java 6 support</li>
-			<li>Refactoring scripts</li>
-			<li>Static analysis of Java code</li>
-			<li>Improved code completion and quick fix support</li>
-			<li>Improved usability and performance</li>
-			<li>Support for Mac OSX on Intel and preview support for Windows Vista</li>
-		</ul>	
-		<p>For a more complete list, check out the <a href="$new_noteworthy">New and Noteworthy</a>.</p>
-		
-		<p>If you are planning to use Eclipse to build Eclipse plug-ins or Eclipse Rich Client Platform (RCP)
-		applications, please see <a href="plugin-dev.php">Eclipse for Plug-in Developers</a>.
-			
-      	<div class="homeitem">
-      		<h3>What do you need?</h3>
-			
-			<p><strong><a href="$eclipse_sdk">Eclipse 3.2</a> is required for Callisto.</strong> 
-			There is no upgrade path from previous versions of Eclipse.</p>
-      		
-			<ul>
-      			<li style="border-style: none">The <a href="$eclipse_sdk">Eclipse SDK</a> <span style="white-space:nowrap">3.2<img id="platform-down" src="images/down.png" onclick="show_section('platform');"/></span>
-      						<div id="platform" style="border-style:solid;border-width:1px;margin-left:5%;display:none">
-      							<h3><img onclick="hide_section('platform');" align="right" src="images/close.png"/>Eclipse SDK 3.2</h3>
-	      						The SDK provides Java development tools.
-	      						<h4>Tutorials and Help</h4>
-					      		<ul>
-					      		    <li style="list-style-image: url(images/movie.png);border-style: none"><a href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/install-eclipse/install-eclipse.html">Installing the Eclipse SDK 3.2</a></li>
-      		    					<li style="list-style-image: url(images/movie.png);border-style: none"><a href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/testfirst/testfirst.html">Test First Development using Eclipse</a></li>
-					      		</ul>
-      						</div>
-      					</li>
-      			</li>
-      			<li style="border-style: none">Optional features available via the <a href="$callisto_discovery">Callisto&nbsp;Discovery&nbsp;Site</a>
-      				<ul>
-      					<li style="border-style: none">Visual Editor <span style="white-space:nowrap">(<a href="/vep">VE</a>)<img id="ve-down" src="images/down.png" onclick="show_section('ve');"/></span>
-      						<div id="ve" style="border-style:solid;border-width:1px;margin-left:5%;display:none">
-      							<h3><img onclick="hide_section('ve');" align="right" src="images/close.png"/>Visual Editor</h3>
-	      						The Eclipse Visual Editor (VE) is a GUI builder
-      							for Swing/JFC and <a href="/swt">SWT</a>/<a href="/rcp">RCP</a>.
-					      		<h4>Suggested reading</h4>
-					      		<ul>
-					      		<li style="list-style-image: url(images/document.png);border-style: none"><a target="_blank" href="http://www-106.ibm.com/developerworks/opensource/library/os-ecvisual/">Build GUIs with the Eclipse Visual Editor project</a>
-					      		</ul>
-      							</div>
-      					</li>      				
-      					
-      					<li style="border-style: none">Java EE and Web Tools <span style="white-space:nowrap">(<a href="/webtools">WTP</a>)<img id="wtp-down" src="images/down.png" onclick="show_section('wtp');"/></span>
-      						<div id="wtp" style="border-style:solid;border-width:1px;margin-left:5%;display:none">
-      							<h3><img onclick="hide_section('wtp');" align="right" src="images/close.png"/>Java EE and Web Tools</h3>
-	      						The Eclipse Web Tools Platform (WTP) extends the Eclipse 
-      							platform with tools for developing Java Enterprise Edition and
-      							Web applications.
-      							<ul>
-					      		    <li style="list-style-image: url(images/tutorial.png);border-style: none"><a href="http://www.eclipse.org/webtools/community/tutorials/BuildJ2EEWebApp/BuildJ2EEWebApp.html">Building and Running a Web Application</a></li>
-									<li style="list-style-image: url(images/tutorial.png);border-style: none"><a href="http://www.eclipse.org/dali/viewlets/01-Add_Persistence_viewlet_swf.html">Adding Java Persistence API (JPA) Support to a Project</a></li>
-									<li style="list-style-image: url(images/tutorial.png);border-style: none"><a href="http://www.eclipse.org/webtools/community/communityresources.html#tutorials">More Web and Java EE Tutorials...</a></li>
-								</ul>
-      						</div>
-      					</li>  
-      					
-      					<li style="border-style: none">Test and Performance Tools <span style="white-space:nowrap">(<a href="/tptp">TPTP</a>)<img id="tptp-down" src="images/down.png" onclick="show_section('tptp');"/></span>
-      						<div id="tptp" style="border-style:solid;border-width:1px;margin-left:5%;display:none">
-      							<h3><img onclick="hide_section('tptp');" align="right" src="images/close.png"/>Test and Performance Tools</h3>
-	      						The Eclipse Test and Performance Tools Platform (TPTP) Project 
-	      						provides an open platform supplying powerful frameworks and 
-	      						services that allow software developers to build unique test 
-	      						and performance tool, both open source and commercial, that 
-	      						can be easily integrated with the platform and with other tools.
-      							<h4>Suggested reading</h4>
-					      		<ul>      		  	
-					      			<li style="list-style-image: url(images/tutorial.png);border-style: none"><a href="http://www.eclipse.org/tptp/home/documents/conferences/eclipseCon2005/EclipseCon_2005_Tutorial_22_Antony_Miguel_Paul_Slauenwhite.pdf">Using TPTP Logging and Monitoring Tools</a></li>
-					      			<li style="list-style-image: url(images/tutorial.png);border-style: none"><a href="http://www.eclipse.org/articles/Article-TPTP-Profiling-Tool/tptpProfilingArticle.html">Java Application Profiling using TPTP</a></li>
-					      		</ul>
-      						</div>
-      					</li>
-      					
-      					<li style="border-style: none">Reporting Tools<span style="white-space:nowrap">(<a href="/birt">BIRT</a>)<img id="birt-down" src="images/down.png" onclick="show_section('birt');"/></span>
-      						<div id="birt" style="border-style:solid;border-width:1px;margin-left:5%;display:none">
-      							<h3><img onclick="hide_section('birt');" align="right" src="images/close.png"/>Reporting Tools</h3>
-	      						BIRT is a reporting system that integrates with your application to produce 
-	      						compelling reports for both web and PDF.
-	      						<ul>
-					      		    <li style="list-style-image: url(images/tutorial.png);border-style: none"><a href="http://www.eclipse.org/birt/phoenix/tutorial/basic">Building a Simple Report with BIRT</a></li>
-									<li style="list-style-image: url(images/movie.png);border-style: none"><a href="http://download.eclipse.org/birt/downloads/demos/FirstReport/MyFirstReport.html">My First Report</a></li>
-									<li style="list-style-image: url(images/tutorial.png);border-style: none"><a href="http://www.eclipse.org/birt/phoenix/tutorial/">More BIRT Tutorials and screen casts...</a></li>
-								</ul>
-      						</div>
-      					</li>
-      					
-      					<li style="border-style: none">Data Tools <span style="white-space:nowrap">(<a href="/datatools">DTP</a>)<img id="dtp-down" src="images/down.png" onclick="show_section('dtp');"/></span>
-      						<div id="dtp" style="border-style:solid;border-width:1px;margin-left:5%;display:none">
-      							<h3><img onclick="hide_section('dtp');" align="right" src="images/close.png"/>Data Tools</h3>
-	      						Data Tools provides tools for accessing, viewing and manipulating databases and
-	      						other data sources.
-      						</div>
-      					</li>
-      				</ul>
-   				</li>
-      		</ul>
-      	</div>    	
-      	<div class="homeitem">
-      		<h3>Tutorials and Help</h3>
-      		<ul>
-      		    <li style="list-style-image: url(images/movie.png);border-style: none"><a href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/install-eclipse/install-eclipse.html">Installing the Eclipse SDK 3.2</a></li>
-      		    <li style="list-style-image: url(images/movie.png);border-style: none"><a href="$install_callisto">Installing Features from the Callisto Discovery Site</a></li>
-      			<li style="list-style-image: url(images/movie.png);border-style: none"><a href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/install-ve/install-ve.html">Installing and using the Eclipse Visual Editor</a></li>
-				<li style="list-style-image: url(images/movie.png);border-style: none"><a href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/install-wtp/install-wtp.html">Installing and Using the Eclipse Web Tools</a></li>
-				<li style="list-style-image: url(images/tutorial.png);border-style: none"><a href="http://www.eclipse.org/birt/phoenix/build/">Installing BIRT</a></li>      			    		
-      		</ul>
-      	</div>
-      	
-      		
-      	<div class="homeitem">
-      		<h3>Suggested reading</h3>
-      		<ul>
-      			<li style="list-style-image: url(images/book.png);border-style: none"><a href="http://www.oreilly.com/catalog/eclipsepg/cover.html">Eclipse IDE Pocket Guide</a></li>
-			</ul>
-      	</div>
-	</div>
+// Begin: page-specific settings. Change these.
+  $pageTitle    = "Eclipse for Java and Web Developers";
+  $pageKeywords = "callisto java mustang 3.2 matisse windowbuilder j2ee enterprise servlet tomcat eclipse resource screencam screen cam tutorial ";
+  $pageAuthor   = "Wayne Beaton";
 
-</div>
+// Place your html content in a file called content/en_pagename.php
+ob_start();
+include("content/en_" . $App->getScriptName());
+$html = ob_get_clean();
 
-EOHTML;
+# Generate the web page
 
-	# Generate the web page
-	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
+$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="/callisto/callisto.css" media="screen" />');
+$App->generatePage(NULL, $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);
\ No newline at end of file
diff --git a/links.php b/links.php
deleted file mode 100644
index e9a6547..0000000
--- a/links.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php 
-
-// Where do we find the SDK/Platform?
-$drop="R-3.2.2-200702121330";
-$eclipse_sdk = "http://download.eclipse.org/eclipse/downloads/drops/$drop/index.php";
-$platform_runtime_binaries = "http://download.eclipse.org/eclipse/downloads/drops/R-3.2-200606291905/callisto.php";
-$new_noteworthy = "http://www.eclipse.org/eclipse/development/readme_eclipse_3.2.2.html";
-
-// Where is the discovery site (relative to this page).
-$callisto_discovery = "discovery.php";
-		
-// Where is the "install-callisto" screencam demo?		
-$install_callisto = "http://www.eclipse.org/evangelism/demos/install-callisto/install-callisto.html";		
-# Uncomment line below to use "install-callisto" from downloads
-#$install_callisto = "http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/install-callisto/install-callisto.html";	
-
-// Where is the install-cdt screencam demo?
-$install_cdt = "http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/install-cdt/callisto-cdt.html";	
-
-?>
diff --git a/news.php b/news.php
index 0b378ba..6d27f3b 100644
--- a/news.php
+++ b/news.php
@@ -1,54 +1,36 @@
-<?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'
+<?php
+/*******************************************************************************
+ * Copyright(c) 2015 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:
+ *    Nathan Gervais(Eclipse Foundation) - Initial implementation
+ *    Eric Poirier(Eclipse Foundation)
+ *******************************************************************************/
+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");
 
-	#*****************************************************************************
-	#
-	# template.php
-	#
-	# Author: 		Denis Roy
-	# Date:			2005-06-16
-	#
-	# Description: Type your page comments here - these are not sent to the browser
-	#
-	#
-	#****************************************************************************
-
-	#
-	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "Eclipse News";
-	$pageKeywords	= "Type, page, keywords, here";
-	$pageAuthor		= "Type your name here";
-	
-	# Add page-specific Nav bars here
-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 1);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 1);
-
-	# End: page-specific settings
-	#
-		
-	# The next two lines load the $news variable with the HTML equivalent to the contents of the eclipsenews.rss file.
-	# Reference the $news variable to drop the HTML into your content...
-	include('scripts/whatsnew.php');
-	$whatsnew = rss_to_html_verbose('whatsnew', 100);
-	
-	# Paste your HTML content between the EOHTML markers!	
-	$html = <<<EOHTML
-
-	<div id="midcolumn">
-	
-		<h1>$pageTitle</h1>
-				
-		<div class="homeitem3col">
-			$whatsnew
-		</div>
-	</div>
-	
+$App = new App();
+$Nav = new Nav();
+$Menu = new Menu();
+include($App->getProjectCommon()); // All on the same line to unclutter the user's desktop'
 
 
-EOHTML;
+// Begin: page-specific settings. Change these.
+  $pageTitle    = "Eclipse News";
+  $pageKeywords = "Type, page, keywords, here";
+  $pageAuthor   = "Type your name here";
 
+// Place your html content in a file called content/en_pagename.php
+ob_start();
+include("content/en_" . $App->getScriptName());
+$html = ob_get_clean();
 
-	# Generate the web page
-	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
+# Generate the web page
+
+$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="/callisto/callisto.css" media="screen" />');
+$App->generatePage(NULL, $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);
\ No newline at end of file
diff --git a/plugin-dev.php b/plugin-dev.php
index 32285fd..90dd13e 100644
--- a/plugin-dev.php
+++ b/plugin-dev.php
@@ -1,195 +1,36 @@
+<?php
+/*******************************************************************************
+ * Copyright(c) 2015 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:
+ *    Nathan Gervais (Eclipse Foundation) - Initial implementation
+ *    Eric Poirier (Eclipse Foundation)
+ *******************************************************************************/
+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");
 
-<?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'
-
-	#*****************************************************************************
-	#
-	# template.php
-	#
-	# Author: 		Wayne Beaton
-	# Date:			2006-06-06
-	#
-	# Description: 
-	# This page contains pointers to download and tutorial information for
-	# individuals interested in using Eclipse for Java development.
-	#****************************************************************************
-	
-	#
-	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "Eclipse for Plug-in and RCP Developers";
-	$pageKeywords	= "callisto plug-in rcp rich client platform eclipse 3.2 resource screencam screen cam tutorial ";
-	$pageAuthor		= "Wayne Beaton";
-	
-	# Add page-specific Nav bars here
-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 1);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 1);
-	#$Nav->addCustomNav("<img src=\"http://www.eclipsecon.org/2007/image125x125.gif\"/>","http://www.eclipsecon.org/2007", "_self", 1);
-	
-	# End: page-specific settings
-	#
-			
-	require_once("links.php");
-	
-	# Paste your HTML content between the EOHTML markers!	
-	$html = <<<EOHTML
-<link rel="stylesheet" type="text/css" href="callisto.css" media="screen" />
-
-<script type="text/javascript">
-function show_section(name) {
-	if (document.getElementById(name).style.display=='block') return;
-	document.getElementById(name +'-down').style.display='none';
-	document.getElementById(name).style.display='block'
-}
-function hide_section(name) {
-	if (document.getElementById(name).style.display=='none') return;
-	document.getElementById(name +'-down').style.display='inline';
-	document.getElementById(name).style.display='none'
-}
-</script>
-
-<div class="callistoRealEstate paddingLeft">
-	<div class="maincontent">
-        <table cellspacing=0 class="callistoButtons">
-        	<tr>
-        		<td width="50"><img src="images/plugin.jpg"></a></td>
-				<td width="100%"class="noRightBorder">$pageTitle</td>
-			</tr>
-		</table>
-
-        <a href="http://www.eclipsecon.org/?tag=eclipse-callisto-plugin"><img style="margin-top:5px;" align="right" src="http://www.eclipsecon.org/2007/image125x125.gif"/></a>
-
-		<p>The Eclipse Software Development Kit (SDK) contains everything you need to build
-		Eclipse applications, including plug-ins for the development environment and Eclipse Rich Client Platform (<a href="http://wiki.eclipse.org/index.php/Rich_Client_Platform">RCP</a>) applications.</p>
-		<p>The new Eclipse SDK 3.2 release features some exciting new capabilities for plug-in and RCP developers, including:
-		<ul>
-			<li>Java 6 support</li>
-			<li>Support for Mac OSX on Intel and Preview support for Windows Vista</li>
-			<li><a href="/swt">SWT</a> Enhancements including support for OpenGL, virtual trees, custom table cell drawing</li>
-			<li>Improvements in Plug-in Development Environment (<a href="http://www.eclipse.org/pde/">PDE</a>) to make building RCP applications easier</li>
-			<li>Common Navigator Framework</li>
-			<li>New standalone OSGi framework</li>
-		</ul>	
-		<p>For a more complete list, check out the <a href="$new_noteworthy">New and Noteworthy</a>.</p>
-		
-		<p>The Eclipse SDK can be extended to provide additional functionality by adding features from the 
-		<a href="$callisto_discovery">Callisto Discovery Site</a>.</p>
-	      
-      	<div class="homeitem">
-      		<h3>What do you need?</h3>
-
-			<p><strong><a href="http://download.eclipse.org/eclipse/downloads/drops/R-3.2-200606291905/index.php">Eclipse 3.2</a> is required for Callisto.</strong> 
-			There is no upgrade path from previous versions of Eclipse.</p>
-      		
-
-      		<ul>
-      			<li style="border-style: none">The <a href="$eclipse_sdk">Eclipse SDK</a> <span style="white-space:nowrap">3.2<img id="platform-down" src="images/down.png" onclick="show_section('platform');"/></span>
-      				<div id="platform" style="border-style:solid;border-width:1px;margin-left:5%;display:none">
-      							<h3><img onclick="hide_section('platform');" align="right" src="images/close.png"/>Eclipse SDK 3.2</h3>
-	      						The SDK provides Java development tools.
-	      						<h4>Tutorials and Help</h4>
-					      		<ul>
-					      		    <li style="list-style-image: url(images/movie.png);border-style: none"><a href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/install-eclipse/install-eclipse.html">Installing the Eclipse SDK 3.2</a></li>
-      		    					<li style="list-style-image: url(images/movie.png);border-style: none"><a href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/testfirst/testfirst.html">Test First Development using Eclipse</a></li>
-					      		</ul>
-      						</div>
-      					</li>
-      			<li style="border-style: none">Optional features available via the <a href="$callisto_discovery">Callisto&nbsp;Discovery&nbsp;Site</a>
-      				<ul>      					
-      					<li style="border-style: none">Visual Editor <span style="white-space:nowrap">(<a href="/vep">VE</a>)<img id="ve-down" src="images/down.png" onclick="show_section('ve');"/></span>
-      						<div id="ve" style="border-style:solid;border-width:1px;margin-left:5%;display:none">
-      							<h3><img onclick="hide_section('ve');" align="right" src="images/close.png"/>Visual Editor</h3>
-	      						The Eclipse Visual Editor (VE) project is a vendor-neutral, open 
-      							development platform supplying frameworks for creating GUI 
-      							builders, and exemplary, extensible tool implementations for 
-      							<a href="/swt">SWT</a>/<a href="/rcp">RCP</a>.
-      						</div>
-      					</li>
-      					<li style="border-style: none">Eclipse Modeling Framework <span style="white-space:nowrap">(<a href="/emf">EMF</a>)<img id="emf-down" src="images/down.png" onclick="show_section('emf');"/></span>
-      						<div id="emf" style="border-style:solid;border-width:1px;margin-left:5%;display:none">
-      							<h3><img onclick="hide_section('emf');" align="right" src="images/close.png"/>Eclipse Modeling Framework</h3>
-      							EMF is a modeling framework and code generation facility for building tools and other 
-      							applications based on a structured data model.
-      						</div>
-      					</li>
-      					<li style="border-style: none">Graphical Editing Framework <span style="white-space:nowrap">(<a href="/gef">GEF</a>)<img id="gef-down" src="images/down.png" onclick="show_section('gef');"/></span>
-      						<div id="gef" style="border-style:solid;border-width:1px;margin-left:5%;display:none">      							
-      							<h3><img onclick="hide_section('gef');" align="right" src="images/close.png"/>Graphical Editing Framework</h3>
-      							The Graphical Editing Framework (GEF) allows developers to take an existing 
-      							application model and quickly create a rich graphical editor.
-      						</div>
-      					</li>
-      					<li style="border-style: none">Graphical Modeling Framework <span style="white-space:nowrap">(<a href="/gmf">GMF</a>)<img id="gmf-down" src="images/down.png" onclick="show_section('gmf');"/></span>
-      						<div id="gmf" style="border-style:solid;border-width:1px;margin-left:5%;display:none">
-      							<h3><img onclick="hide_section('gmf');" align="right" src="images/close.png"/>Graphical Modeling Framework</h3>
-      							The Eclipse Graphical Modeling Framework (GMF) provides a 
-      							generative component and runtime infrastructure for developing 
-      							graphical editors.
-      						</div>
-      					</li>
- 
-      					
-       					
-      					<li style="border-style: none">Reporting Tools <span style="white-space:nowrap">(<a href="/birt">BIRT</a>)<img id="birt-down" src="images/down.png" onclick="show_section('birt');"/></span>
-      						<div id="birt" style="border-style:solid;border-width:1px;margin-left:5%;display:none">
-      							<h3><img onclick="hide_section('birt');" align="right" src="images/close.png"/>Reporting Tools</h3>
-	      						BIRT is a reporting system that integrates with your application to produce 
-	      						compelling reports for both web and PDF.
-	      						<ul>
-					      		    <li style="list-style-image: url(images/tutorial.png);border-style: none"><a href="http://www.eclipse.org/birt/phoenix/tutorial/basic">Building a Simple Report with BIRT</a></li>
-									<li style="list-style-image: url(images/movie.png);border-style: none"><a href="http://download.eclipse.org/birt/downloads/demos/FirstReport/MyFirstReport.html">My First Report</a></li>
-									<li style="list-style-image: url(images/tutorial.png);border-style: none"><a href="http://www.eclipse.org/birt/phoenix/tutorial/">More BIRT Tutorials and screen casts...</a></li>
-								</ul>
-      						</div>
-      					</li>
-      					
-      					<li style="border-style: none">Data Tools <span style="white-space:nowrap">(<a href="/datatools">DTP</a>)<img id="dtp-down" src="images/down.png" onclick="show_section('dtp');"/></span>
-      						<div id="dtp" style="border-style:solid;border-width:1px;margin-left:5%;display:none">
-      							<h3><img onclick="hide_section('dtp');" align="right" src="images/close.png"/>Data Tools</h3>
-	      						The Eclipse Data Tools Platform (DTP) is a set of extensible frameworks and
-								exemplary tools for developing data-centric applications in Eclipse.
-      						</div>
-      					</li>
-      				</ul>
-   				</li>
-      		</ul>
-      	</div>
-      	
-      	<div class="homeitem">
-      		<h3>Tutorials and help</h3>
-      		<ul>
-      		    <li style="list-style-image: url(images/movie.png);border-style: none"><a href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/install-eclipse/install-eclipse.html">Installing the Eclipse SDK 3.2</a></li>
-      			<li style="list-style-image: url(images/movie.png);border-style: none"><a href="$install_callisto">Installing Features from the Callisto Discovery Site</a></li>
-      			<li style="list-style-image: url(images/movie.png);border-style: none"><a href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/install-ve/install-ve.html">Installing and using the Eclipse Visual Editor</a></li>
-      			<li style="list-style-image: url(images/movie.png);border-style: none"><a href="http://www.eclipse.org/downloads/download.php?r=1&file=/technology/phoenix/demos/testfirst/testfirst.html">Test First Development using Eclipse</a></li>
-      		</ul>
-      	</div>
-      			
-      	<div class="homeitem">
-      		<h3>Suggested reading</h3>
-      		<ul>
-      			<li style="list-style-image: url(images/document.png);border-style: none"><a href="http://www.eclipse.org/articles/">Eclipse Corner Articles</a></li>
-      			<li style="list-style-image: url(images/document.png);border-style: none"><a href="http://local.phoenix.eclipse.org/articles/Whitepaper-Platform-3.1/eclipse-platform-whitepaper.html">Eclipse Platform Technical Overview</a></li>
-      			<li style="list-style-image: url(images/book.png);border-style: none"><a href="http://www.aw-bc.com/catalog/academic/product/0,1144,032142672X,00.html">Eclipse: Building Commercial-Quality Plug-ins</a></li>
-      			<li style="list-style-image: url(images/book.png);border-style: none"><a href="http://www.aw-bc.com/catalog/academic/product/0,1144,0321205758,00.html">Contributing to Eclipse: Principles, Patterns, and Plug-Ins</a></li>
-      			<li style="list-style-image: url(images/book.png);border-style: none"><a href="http://www.aw-bc.com/catalog/academic/product/0,1144,0321334612,00.html">Eclipse Rich Client Platform: Designing, Coding, and Packaging Java&trade; Applications</a></li>
-      			<li style="list-style-image: url(images/document.png);border-style: none">Building a Common Navigator based viewer
-      				<a href="http://scribbledideas.blogspot.com/2006/05/building-common-navigator-based-viewer.html">Part I</a>,
-      				<a href="http://scribbledideas.blogspot.com/2006/05/building-common-navigator-based-viewer_22.html">Part II</a>,
-      				<a href="http://scribbledideas.blogspot.com/2006/06/building-common-navigator-based-viewer.html">Part III</a>, and
-      				<a href="http://scribbledideas.blogspot.com/2006/06/building-common-navigator-based-viewer_18.html">Part IV</a>
-      			</li>
-      		</ul>
-      	</div>      	
-	</div>
-
-</div>
+$App = new App();
+$Nav = new Nav();
+$Menu = new Menu();
+include($App->getProjectCommon()); // All on the same line to unclutter the user's desktop'
 
 
+// Begin: page-specific settings. Change these.
+  $pageTitle    = "Eclipse for Plug-in and RCP Developers";
+  $pageKeywords = "callisto plug-in rcp rich client platform eclipse 3.2 resource screencam screen cam tutorial ";
+  $pageAuthor   = "Wayne Beaton";
 
+// Place your html content in a file called content/en_pagename.php
+ob_start();
+include("content/en_" . $App->getScriptName());
+$html = ob_get_clean();
 
-EOHTML;
+# Generate the web page
 
-	# Generate the web page
-	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
+$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="/callisto/callisto.css" media="screen" />');
+$App->generatePage(NULL, $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);
\ No newline at end of file
diff --git a/redirect.php b/redirect.php
deleted file mode 100644
index 1935b0c..0000000
--- a/redirect.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-	$companyArray = array(	"BEA" => "http://www.bea.com/callisto/eclipse.html", 
-							"Innoopract" => "http://yoxos.com/ondemand/",
-							"NexB" => "http://easyeclipse.org/site/home/callisto.html",
-							"WWIM" => "http://www.weiglewilczek.com/callisto", 
-							"IBM" => "http://www.ibm.com/developerworks/eclipse/downloads/",
-							"ACT" => "http://download.actuatechina.com/callisto/",
-							"ROW" => "http://rowebots.com/opensource/eclipse_downloads/"
-							
-							);
-	$companyName = $_GET['A'];
-	$url = $companyArray[$companyName];
-	if ($companyName != "" & $url != "")
-	{
-		header( "HTTP/1.1 301 Moved Permanently" );
-		header( "Status: 301 Moved Permanently" );
-		header( "Location: ". $url );
-		exit(0); // This is Optional but suggested, to avoid any accidental output		
-	}
-	else
-	{
-		header( "HTTP/1.1 301 Moved Permanently" );
-		header( "Status: 301 Moved Permanently" );
-		header( "Location: /callisto/downloads.php");
-		exit(0); // This is Optional but suggested, to avoid any accidental output			
-	}
-
-?>
-
diff --git a/updating.php b/updating.php
index b0a8d2d..078d2e2 100644
--- a/updating.php
+++ b/updating.php
@@ -1,59 +1,36 @@
-<?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'
+<?php
+/*******************************************************************************
+ * Copyright(c) 2015 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:
+ *    Nathan Gervais (Eclipse Foundation) - Initial implementation
+ *    Eric Poirier (Eclipse Foundation)
+ *******************************************************************************/
+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");
 
-	#*****************************************************************************
-	#
-	# template.php
-	#
-	# Author: 		Denis Roy
-	# Date:			2005-06-16
-	#
-	# Description: Type your page comments here - these are not sent to the browser
-	#
-	#
-	#****************************************************************************
-	
-	#
-	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "Eclipse Callisto Discovery Site";
-	$pageKeywords	= "eclipse callisto release download what is";
-	$pageAuthor		= "Nathan Gervais";
-	
-	# Add page-specific Nav bars here
-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 1);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 1);
-
-	# End: page-specific settings
-	#
-	// This file is linked to from lots of different places.
-	// Use absolute paths to make sure that we can actually test
-	// that the file renders properly (i.e. testing using) "/index.php",
-	// and "/home/index.php" both work.
-
-	# Paste your HTML content between the EOHTML markers!	
-	$html = <<<EOHTML
-<div id="maincontent">
-	<div id="midcolumn">
-		<h1>$pageTitle</h1>
-		<img src="callisto_slice.jpg">
-		
-		<h2><a name="update">Adding Features to Eclipse</a></h2>
-		<p>For examples, please see the following demonstrations:</p>
-		<ul>
-		<li>Adding C/C++ development support to Eclipse</li>
-		<li>Adding Reporting support to Eclipse</li>
-		<li>More...</li>
-		<ul>
-		
-
-	</div>
-</div>
-
-	
-EOHTML;
+$App = new App();
+$Nav = new Nav();
+$Menu = new Menu();
+include($App->getProjectCommon()); // All on the same line to unclutter the user's desktop'
 
 
-	# Generate the web page
-	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
\ No newline at end of file
+// Begin: page-specific settings. Change these.
+  $pageTitle    = "Eclipse Callisto Discovery Site";
+  $pageKeywords = "eclipse callisto release download what is";
+  $pageAuthor   = "Nathan Gervais";
+
+// Place your html content in a file called content/en_pagename.php
+ob_start();
+include("content/en_" . $App->getScriptName());
+$html = ob_get_clean();
+
+# Generate the web page
+
+$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="/callisto/callisto.css" media="screen" />');
+$App->generatePage(NULL, $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);
\ No newline at end of file
diff --git a/webinars.php b/webinars.php
index 4421f2e..fd12e40 100644
--- a/webinars.php
+++ b/webinars.php
@@ -1,122 +1,36 @@
-<?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'
+<?php
+/*******************************************************************************
+ * Copyright(c) 2015 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:
+ *    Nathan Gervais (Eclipse Foundation) - Initial implementation
+ *    Eric Poirier (Eclipse Foundation)
+ *******************************************************************************/
+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");
 
-	#*****************************************************************************
-	#
-	# template.php
-	#
-	# Author: 		Denis Roy
-	# Date:			2005-06-16
-	#
-	# Description: Type your page comments here - these are not sent to the browser
-	#
-	#
-	#****************************************************************************
-	
-	#
-	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "Eclipse Webinars";
-	$pageKeywords	= "";
-	$pageAuthor		= "Ian Skerrett";
-	
-	# Add page-specific Nav bars here
-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 1);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 1);
-
-	# End: page-specific settings
-	#
-	// This file is linked to from lots of different places.
-	// Use absolute paths to make sure that we can actually test
-	// that the file renders properly (i.e. testing using) "/index.php",
-	// and "/home/index.php" both work.
-
-	# Paste your HTML content between the EOHTML markers!	
-	$html = <<<EOHTML
-<div id="maincontent">
-	<div id="midcolumn">
-		<h1>$pageTitle</h1>
-
-		<p>Looking to learn more about the different projects involved in Callisto?  We are running a series of free
-		 webinars to help you better understand how you can use the different Eclipse projects.  Take a look below 
-		 and sign-up today.</p>
-		 <p><i>Special thanks to Adobe for contributing access to their <a href="http://www.adobe.com/products/breeze/?sdid=HCSA">Macromedia 
-		 Breeze</a> meeting service to host these webinars.</i></p>
-
-		<h2>Using the Eclipse Modeling Frameworks</h2>
-		 <a href="http://adobedev.breezecentral.com/p17835008/">Webinar Recording</a>
-		<p>
-		<ul>
-			<li><p> Presenters: Ed Merks and Richard Gronback, Eclipse Modeling Project Co-leaders </p></li>
-			<li><p>There is great potential with model-driven development techniques to reduce the complexity and 
-			effort required to develop high quality applications, while promoting a focus on domain models. The new 
-			Eclipse Modeling Project aims to unify and promote such technologies within the Eclipse community, with 
-			two important projects presented here to illustrate the potential of the approach. </p>
- 
-			<p>The Eclipse Modeling Framework (EMF) is a modeling framework and code generation facility for 
-			building tools and other applications based on a structured data model. From a model specification 
-			described in one of several supported formats, EMF provides tools and runtime support to produce a set 
-			of Java classes for the model, a set of adapter classes that enable viewing and command-based editing of 
-			the model, and a basic editor. </p>
- 
-			<p>The Graphical Modeling Framework (GMF) provides a generative component and runtime infrastructure for 
-			developing graphical editors based on EMF and the Graphical Editing Framework (GEF). GMF is therefore 
-			complementary to EMF, and also leverages several of the EMF Technology (EMFT) projects, such as OCL, 
-			Query, Validation, and Transaction. </p>
- 
-			<p>In this webinar, a domain model will be developed using EMF, resulting in a generated set of model 
-			and edit code.  A graphical editor for this domain model will also be defined and generated using GMF 
-			to illustrate how model-driven development techniques are currently being used within the context of 
-			the Eclipse Modeling Project. </p>
-		</ul>	
-		</p>
-					
-		<h2>Building Data Centric RCP Applications</h2>
-		 <a href="http://adobedev.breezecentral.com/p89156273/">Webinar Recording</a>
-		<p>
-			<ul>
-			<li><p> Presenters: John Graham, DTP PMC Leader,<br> Linda Chan, DTP PMC and BIRT Committer, <br> Jason Weathersby, BIRT PMC </p></li>
-			<li><p> Learn how to use the new Data Tools Platform (DTP) and Business Intelligence and Report Tools (BIRT) to create 
-			stand alone desktop applications that run on Eclipse RCP. The webinar will describe how to use the DTP data access capability to connect
-			to multiple data stores and then create dynamic reports using BIRT.</p></li>
-			<li>A recording of this webinar can be viewed <a href=" http://adobedev.breezecentral.com/p89156273/">here.</a>  
-			The sample code used during the webinar is located <a href="http://www.eclipse.org/downloads/download.php?file=/datatools/downloads/callisto/webinar_060506/webinar_demo.zip">here.</a></ul>	
-		</p>
-	
-		<h2>Developing and Profiling Web Services</h2>
-		 <a href="http://adobedev.breezecentral.com/p83921118/">Webinar Recording</a>
-
-		<p>
-		<ul>
-			<li><p> Presenters: Kathy Chan, WTP and Valentian Popsescu, TPTP</p></li>
-			<li><p> The Web services tool in WTP allows the user to develop and consume Web services.  It also lets 
-			the user easily monitor the SOAP traffic, test the Web services using the Web Services Explorer or 
-			using the generated sample JSPs.   Come to this webinar to learn to use the newly updated Web services 
-			tools in WTP 1.5. </p>
-
-			<p>The TPTP tools can be used to analyze the Web application execution and look for performance hot 
-			spots or memory leaks.   </p>
-
-			<p>In this webinar, the Web services tools will be used to develop a Web service from a WSDL file and to 
-			test the Web service using the Web Services Explorer.  The Web services tools will then be used to 
-			generate a Web service client proxy to talk to the Web service and invoke it using the generated sample 
-			JSP while monitoring the SOAP traffic using the TCP/IP monitor.  Afterwards, the TPTP tool will be used 
-			to start profiling the Web application and to set the profiling filters and options.  Then, various 
-			TPTP views will be used to analyze the application execution and look for performance hot spots. 
-			</p> </li>
-			<li>A recording of this webinar can be viewed <a href="http://adobedev.breezecentral.com/p83921118/">here</a></ul>	
-		</ul>	
-		</p>
+$App = new App();
+$Nav = new Nav();
+$Menu = new Menu();
+include($App->getProjectCommon()); // All on the same line to unclutter the user's desktop'
 
 
+// Begin: page-specific settings. Change these.
+  $pageTitle    = "Eclipse Webinars";
+  $pageKeywords = "";
+  $pageAuthor   = "Ian Skerrett";
 
-	</div>
-</div>
+// Place your html content in a file called content/en_pagename.php
+ob_start();
+include("content/en_" . $App->getScriptName());
+$html = ob_get_clean();
 
-	
-EOHTML;
+# Generate the web page
 
-
-	# Generate the web page
-	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
\ No newline at end of file
+$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="/callisto/callisto.css" media="screen" />');
+$App->generatePage(NULL, $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);
\ No newline at end of file