diff --git a/_projectCommon.php b/_projectCommon.php
index 2bc8866..8546e05 100644
--- a/_projectCommon.php
+++ b/_projectCommon.php
@@ -4,13 +4,13 @@
 # https://dev.eclipse.org/committers/
 # Optional: defaults to system theme 
 #$theme = "Lazarus";
-if (isset ($_GET["skin"]) && preg_match("/^(Blue|EclipseStandard|Industrial|Lazarus|Miasma|Modern|OldStyle|Phoenix|PhoenixTest|PlainText)$/", $_GET["skin"], $regs))
+if (isset ($_GET["skin"]) && preg_match("/^(Blue|EclipseStandard|Industrial|Lazarus|Miasma|Modern|OldStyle|Phoenix|PhoenixTest|PlainText|solstice)$/", $_GET["skin"], $regs))
 {
 	$theme = $regs[1];
 }
 else
 {
-	$theme = "Nova";
+	$theme = "solstice";
 }
 
 
@@ -32,15 +32,14 @@
 
 	$Menu->setProjectBranding($branding);
 	
-	$Nav->addCustomNav("Project Summary", "http://www.eclipse.org/projects/project_summary.php?projectid=tools.tm", "_self", 1);
-
 	$Nav->addNavSeparator("Target Management", 	"/tm");
-	$Nav->addCustomNav("About This Project", "/tm/about.php", "_self", 2);
+	$Nav->addCustomNav("About", "http://www.eclipse.org/projects/project_summary.php?projectid=tools.tm", "_self", 2);
+	$Nav->addCustomNav("Mission", "/tm/about.php", "_self", 2);
 	$Nav->addCustomNav("Team", "/tm/development/contributors.php",	"_self", 2);
 
 	$Nav->addNavSeparator("Users", "", "_self", 2);
 	$Nav->addCustomNav("Getting Started", "/tm/tutorial/index.php", "_self", 2);
-	$Nav->addCustomNav("Downloads", "http://download.eclipse.org/tm/downloads/index.php", "_self", 2);
+	$Nav->addCustomNav("Downloads", "/tm/downloads.php", "_self", 2);
 	$Nav->addCustomNav("FAQ (wiki)", "http://wiki.eclipse.org/TM_and_RSE_FAQ", "_self", 2);
 	$Nav->addCustomNav("Forum", "http://www.eclipse.org/forums/index.php/f/210/", "_self", 2);
 	$Nav->addCustomNav("Bugs", "/tm/bugs", "_self", 2);
diff --git a/downloads.php b/downloads.php
index 79a586c..50ecbce 100644
--- a/downloads.php
+++ b/downloads.php
@@ -34,12 +34,42 @@
 	<div id="midcolumn">
 		<h1>$pageTitle</h1>
 
-		The Target Management Downloads are now available on
-		<ul>
-		<li><a href="http://download.eclipse.org/tm/downloads/">The TM Download Site</a>
-		<li><a href="http://download.eclipse.org/tm/updates/3.0/">The TM 3.0 Update Site</a>
-		(or legacy: <a href="http://download.eclipse.org/tm/updates/2.0">TM 2.x update site</a>)
-		</ul>
+<p>All downloads are provided under the terms and conditions of the
+ <a href="/legal/epl/notice.php">Eclipse Foundation Software User Agreement</a>
+  unless otherwise specified.</p>
+
+<h2>TM 4.0 (Mars)</h2>
+<p>Compatible with Eclipse 3.8.2 and later. See the <a href="https://projects.eclipse.org/projects/tools.tm/reviews/4.0.0-release-review">Release Review</a>.</p>
+<ul>
+<li>Terminal <a href="http://marketplace.eclipse.org/content/tm-terminal">Marketplace</a> |
+  <a href="http://download.eclipse.org/tm/terminal/updates/4.0">p2 update site</a> |
+  <a href="/downloads/download.php?file=/tm/terminal/updates/4.0/org.eclipse.tm.terminal-4.0.0.zip">org.eclipse.tm.terminal-4.0.0.zip</a> (1.4 MiB)</li>
+<li>RSE p2 software repository: <a href="http://download.eclipse.org/tm/updates/4.0">http://download.eclipse.org/tm/updates/4.0</a>
+</ul>
+
+<h2>TM 3.7 (Luna SR2)</h2>
+<p>Compatible with Eclipse 3.8.2 and later.</p>
+<ul>
+<li>TM (RSE+Terminal) p2 software repository: <a href="http://download.eclipse.org/tm/updates/3.7">http://download.eclipse.org/tm/updates/3.7</a>
+<li>TM Zipped Repo: <a href="/downloads/download.php?file=/tm/updates/3.7/GA/org.eclipse.tm.repo.zip">org.eclipse.tm.repo.zip</a>
+</ul>
+
+<h2>Archive of Older Releases</h2>
+Older releases are found on 
+<ul>
+	<li><a href="http://download.eclipse.org/tm/downloads/">The TM Download Site</a>
+	<li><a href="http://archive.eclipse.org/tm/downloads/">The TM Archive Site</a>
+	<li>The TM Update Sites:<ul>
+	  <li>http://download.eclipse.org/tm/updates/3.6  (Luna SR1)
+	  <li>http://download.eclipse.org/tm/updates/3.5  (Kepler)
+	  <li>http://download.eclipse.org/tm/updates/3.4  (Juno)
+	  <li>http://download.eclipse.org/tm/updates/3.3  (Indigo)
+	  <li>http://download.eclipse.org/tm/updates/3.2  (Helios)
+	  <li>http://download.eclipse.org/tm/updates/3.1  (Galileo)
+      <li>http://download.eclipse.org/tm/updates/3.0  (Ganymede)
+	</ul></li>
+	<li>Legacy: <a href="http://download.eclipse.org/tm/updates/2.0">TM 2.x update site</a>)
+</ul>
 
 		<p>Older downloads have been submitted to eclipse.org via bugzilla:
 		<p/>
diff --git a/index.php b/index.php
index e332ed8..69107cf 100644
--- a/index.php
+++ b/index.php
@@ -62,7 +62,9 @@
 			Releases 
 		</h3>
 		<p>
-			Our latest full release is TM 3.4. The latest service release is TM 3.4.2. The release currently under construction is TM 3.5. Highlights and release notes for these can be found from our <a href="http://download.eclipse.org/tm/downloads">downloads page</a>. 
+			Our latest full release is TM 4.0, but only the Terminal received significant updates.
+			RSE is now in maintenance mode and remains at version 3.7 (Luna SR2 plus few bug fixes).
+			See also the <a href="/tm/downloads.php">downloads page</a>. 
 		</p>
 		<div class="homeitem">
 			<h3>
@@ -102,6 +104,14 @@
 		</div>
 	</div>
 	<div id="rightcolumn">
+
+<div class="sideitem">
+<h3>News</h3>
+<p>Jun 24, 2015: <a href="/tm/downloads.php">TM 4.0 is released</a> with Eclipse Mars!</p>
+<p>
+<p>April 25, 2014: TM Terminal has been restructured and is now on the <a href="http://marketplace.eclipse.org/content/tm-terminal">Marketplace</a>.
+</div>
+
 		<div class="sideitem">
 			<h6>
 				Getting Started