Try new website
diff --git a/new/_projectCommon.php b/new/_projectCommon.php
new file mode 100644
index 0000000..cc741dc
--- /dev/null
+++ b/new/_projectCommon.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright (c) 2014-2017, 2018 Eclipse Foundation.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * Contributors:
+ *   Christopher Guindon (Eclipse Foundation) - Initial implementation
+ *   Eric Poirier (Eclipse Foundation)
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+require_once ($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php");
+
+$Nav  = new Nav();
+
+// Set the theme for your project's web pages.
+// See the Committer Tools "Phoenix" secion in the How Do I? for list of themes
+// https://dev.eclipse.org/committers/
+$theme = NULL;
+
+// Define your project-wide Nav bars here.
+// Format is Link text, link URL (can be http://www.someothersite.com/), target
+// (_self, _blank).
+$Nav->addNavSeparator("Solstice", "/eclipse.org-common/themes/solstice/docs/");
+$Nav->addCustomNav("Documentation", "/eclipse.org-common/themes/solstice/docs/", "_self", NULL);
+$Nav->addCustomNav("Source code", "http://git.eclipse.org/c/www.eclipse.org/eclipse.org-common.git/tree/themes/solstice/", "_self", NULL);
+$Nav->addCustomNav("Using Phoenix", "http://wiki.eclipse.org/Using_Phoenix", "_self", NULL);
diff --git a/new/index.php b/new/index.php
new file mode 100644
index 0000000..6fdd1f0
--- /dev/null
+++ b/new/index.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * Copyright (c) 2014-2017, 2018 Eclipse Foundation.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * Contributors:
+ * Christopher Guindon (Eclipse Foundation) - Initial implementation
+ * Eric Poirier (Eclipse Foundation)
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+require_once ($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
+
+$App = new App();
+$Theme = $App->getThemeClass();
+
+// Shared variables/configs for all pages of your website.
+require_once ('_projectCommon.php');
+
+// Begin: page-specific settings. Change these.
+$pageTitle = "Eclipse Paho";
+$Theme->setPageAuthor('Ian Craggs');
+$Theme->setPageKeywords('Add maximal 20 keywords and separate them from each other by a comma en a space.');
+$Theme->setPageTitle($pageTitle);
+$Theme->setLayout($acceptable_layouts[0]);
+
+//if (isset($Nav)) {
+//  $Theme->setNav($Nav);
+//}
+
+// Initialize custom solstice $variables.
+$variables = array();
+
+// Add classes to <body>. (String)
+$variables['body_classes'] = '';
+
+// Insert custom HTML in the breadcrumb region. (String)
+$variables['breadcrumbs_html'] = "";
+
+// Hide the breadcrumbs. (Bool)
+$variables['hide_breadcrumbs'] = FALSE;
+
+// Insert HTML before the left nav. (String)
+$variables['leftnav_html'] = '';
+
+// Update the main container class (String)
+$variables['main_container_classes'] = 'container';
+
+// Insert HTML after opening the main content container, before the left sidebar. (String)
+//if ($Theme->hasCookieConsent()) {
+$variables['main_container_html'] = '';
+//}
+
+// Insert header navigation for project websites.
+// Bug 436108 - https://bugs.eclipse.org/bugs/show_bug.cgi?id=436108
+$links = array();
+$links[] = array(
+  'icon' => 'fa-download', // Required
+  'url' => 'index.php?page=downloads.php', // Required
+  'title' => 'Download', // Required
+  // 'target' => '_blank', // Optional
+  'text' => 'Eclipse Paho Components' // Optional
+);
+
+$links[] = array(
+  'icon' => 'fa-users', // Required
+  'url' => '/users/', // Required
+  'title' => 'Geting Involved', // Required
+  // 'target' => '_blank', // Optional
+  'text' => 'CVS, Workspace Setup, Wiki, Committers' // Optional
+);
+
+$links[] = array(
+  'icon' => 'fa-book', // Required
+  'url' => 'http://help.eclipse.org/luna/index.jsp', // Required
+  'title' => 'Documentation', // Required
+  // 'target' => '_blank', // Optional
+  'text' => 'Tutorials, Examples, Videos, Online Reference' // Optional
+);
+
+$links[] = array(
+  'icon' => 'fa-support', // Required
+  'url' => '/forums/', // Required
+  'title' => 'Support', // Required
+  // 'target' => '_blank', // Optional
+  'text' => 'Bug Tracker, Newsgroup Professional Support' // Optional
+);
+
+$variables['header_nav'] = array(
+  'links' => $links, // Required
+  'logo' => array( // Required
+    'src' => '/paho/images/paho_logo_400.png', // Required
+    'alt' => 'The Eclipse Paho Project', // Optional
+    'url' => 'http://www.eclipse.org' // Optional
+    // 'target' => '_blank' // Optional
+  )
+);
+
+
+// CFA Link - Big orange button in header
+$variables['btn_cfa'] = array(
+  'hide' => FALSE, // Optional - Hide the CFA button.
+  'html' => '', // Optional - Replace CFA html and insert custom HTML.
+  'class' => 'btn btn-huge btn-warning', // Optional - Replace class on CFA link.
+  'href' => '//www.eclipse.org/downloads/', // Optional - Replace href on CFA link.
+  'text' => '<i class="fa fa-download"></i> Download' // Optional - Replace text of CFA link.
+);
+
+// Set Solstice theme variables. (Array)
+$App->setThemeVariables($variables);
+
+$page = $_GET['page'];
+if ($page === null) {
+  $page = $App->getScriptName();
+}
+
+// Place your html content in a file called content/en_pagename.php
+ob_start();
+include ("paho/en_" . $page);
+$html = ob_get_clean();
+$Theme->setHtml($html);
+
+// Insert extra html before closing </head> tag.
+// $App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css"
+// href="style.css" media="screen" />');
+
+// Insert script/html before closing </body> tag.
+// $App->AddExtraJSFooter('<script type="text/javascript"
+// src="script.min.js"></script>');
+
+// Generate the web page
+$Theme->generatePage();
+
+?>
\ No newline at end of file
diff --git a/new/paho b/new/paho
new file mode 160000
index 0000000..4b6722b
--- /dev/null
+++ b/new/paho
@@ -0,0 +1 @@
+Subproject commit 4b6722b9ec102cb840bcf64d28e986ad1d10e220