Skeleton CheConf 18 mini-site
diff --git a/checonf17/faq.html b/checonf17/faq.html
deleted file mode 100644
index f4c0726..0000000
--- a/checonf17/faq.html
+++ /dev/null
@@ -1,121 +0,0 @@
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <meta name="description" content="CheConf 2016 is the first annual Eclipse Che users’ conference. This one day virtual conference will offer insight into how cloud workspaces simplify the way you develop software.">
-  <title>CheConf 2016 | FAQ</title>
-
-  <!-- Favicons etc. -->
-  <link rel="icon" href="https://www.eclipse.org/che/images/ico/favicon.ico">
-  <link rel="icon" sizes="16x16 32x32 64x64" href="https://www.eclipse.org/che/images/ico/16x16.png">
-  <link rel="apple-touch-icon" sizes="57x57" href="https://www.eclipse.org/che/images/ico/57x57.png">
-  <link rel="apple-touch-icon" sizes="60x60" href="https://www.eclipse.org/che/images/ico/60x60.png">
-  <link rel="apple-touch-icon" sizes="72x72" href="https://www.eclipse.org/che/images/ico/72x72.png">
-  <link rel="apple-touch-icon" sizes="76x76" href="https://www.eclipse.org/che/images/ico/76x76.png">
-  <link rel="apple-touch-icon" sizes="114x114" href="https://www.eclipse.org/che/images/ico/114x114.png">
-  <link rel="apple-touch-icon" sizes="120x120" href="https://www.eclipse.org/che/images/ico/120x120.png">
-  <link rel="apple-touch-icon" sizes="144x144" href="https://www.eclipse.org/che/images/ico/144x144.png">
-  <link rel="apple-touch-icon" sizes="152x152" href="https://www.eclipse.org/che/images/ico/152x152.png">
-  <link rel="apple-touch-icon" sizes="180x180" href="https://www.eclipse.org/che/images/ico/180x180.png">
-  <link rel="icon" type="image/png" href="https://www.eclipse.org/che/images/ico/196x196.png" sizes="196x196">
-  <link rel="icon" type="image/png" href="https://www.eclipse.org/che/images/ico/192x192.png" sizes="192x192">
-  <link rel="icon" type="image/png" href="https://www.eclipse.org/che/images/ico/144x144.png" sizes="144x144">
-  <link rel="icon" type="image/png" href="https://www.eclipse.org/che/images/ico/96x96.png" sizes="96x96">
-  <link rel="icon" type="image/png" href="https://www.eclipse.org/che/images/ico/72x72.png" sizes="72x72">
-  <link rel="icon" type="image/png" href="https://www.eclipse.org/che/images/ico/48x48.png" sizes="48x48">
-  <link rel="icon" type="image/png" href="https://www.eclipse.org/che/images/ico/36x36.png" sizes="36x36">
-  <link rel="icon" type="image/png" href="https://www.eclipse.org/che/images/ico/32x32.png" sizes="32x32">
-  <link rel="icon" type="image/png" href="https://www.eclipse.org/che/images/ico/16x16.png" sizes="16x16">
-  <link rel="manifest" href="https://www.eclipse.org/che/images/ico/manifest.json">
-  <meta name="msapplication-TileColor" content="#ffffff">
-  <meta name="msapplication-TileImage" content="https://www.eclipse.org/che/images/ico/144x144.png">
-  <meta name="theme-color" content="#ffffff">
-
-  <!-- Always force latest IE rendering engine or request Chrome Frame -->
-  <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
-
-  <!-- Stylesheets -->
-  <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
-  <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-T8Gy5hrqNKT+hzMclPo118YTQO6cYprQmhrYwIiQ/3axmI1hQomh7Ud2hPOy8SP1" crossorigin="anonymous">  <link href="https://fonts.googleapis.com/css?family=Roboto:300,500" rel="stylesheet" type="text/css">
-  <link rel="stylesheet" href="styles.css">
-
-  <!-- Tracking Snippets -->
-</head>
-<body class="speakers">
-  <header class="solid">
-    <a href="index.html" class="logo"><img src="images/logo-16checonf.png" alt="CheConf16"></a>
-
-    <nav class="navbar navbar-default">
-      <div class="container-fluid">
-        <div class="navbar-header">
-          <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#top-menu" aria-expanded="false">
-            <i class="fa fa-bars"></i> Menu
-          </button>
-        </div>
-
-        <div class="collapse navbar-collapse" id="top-menu">
-          <ul class="nav navbar-nav">
-            <li><a href="index.html">Home</a></li>
-            <li><a href="sessions.html">Sessions</a></li>
-            <li><a href="speakers.html">Speakers</a></li>
-            <li><a href="faq.html">FAQ</a></li>
-            <li><a href="sessions.html">Watch</a></li>
-        </div>
-      </div><!--/.container-fluid-->
-    </nav><!-- /nav -->
-  </header>
-
-
-  <div class="content-area container">
-    <h1 class="text-center">FAQ</h1>
-
-    <div class="padding-side list-faq">
-      <h3>What is CheConf?</h3>
-      <p>CheConf is the Eclipse Che users’ conference. 2016 was the first year of the event and it was held on Tuesday, November 15th, 2016. CheConf 2016 was a virtual conference: with hundreds of thousands of Eclipse Che users around the world, we wanted to make sure that anyone, anywhere can experience this event. The sessions can be viewed on the <a href="sessions.html">sessions page</a>.</p>
-
-      <h3>How does a virtual user conference work?</h3>
-      <p>CheConf will work much like a regular conference. We have a set agenda and speakers, with sessions that you can attend from your computer. A conference agenda with links to each session will be sent out days before the event. On the day of the conference, you simply click on the session you want to attend, and you will be connected. There will be an opportunity for you to live chat and ask questions with other virtual conference attendees. You will also be able to live chat with the Che team.</p>
-
-      <h3>How many sessions can I attend?</h3>
-      <p>As many as you like. We want you to experience CheConf your way. The first keynote session begins at 11:00AM EST. You can attend as many sessions as you like. You can stay connected all day, or you can pop in and out of the sessions you want to attend. <a href="sessions.html">View Sessions.</a></p>
-
-      <h3>How can I get involved?</h3>
-      <p>Eclipse Che is an open source project. Open source projects need the power of the community to succeed. Being a Che user and advocate, and sharing experiences with your peers is the best way to help keep Che growing. We love when people write blogs, tweet and make contribution to the Che project. <a href="https://eclipse.org/che/" target="_blank">About Eclipse Che</a></p> </div>
-
-
-    <div class="text-center">
-         <a class="share" target="_blank" href="Watching%20#CheConf2016%20sessions%20-%20presos%20from%20@eclipse_che%2C%20@docker%2C%20@rhdevelopers%2C%20@SamsungIoT%2C%20@bitnami%2C%20@zend%2C%20@eclipsesource%20&%20@SerliFr">
-      <i class="fa fa-twitter"></i>
-        <br>
-        <span>
-          <strong>Spread the Word</strong><br>
-          #CheConf2016
-        </span>
-      </a>
-    </div>
-  </div><!-- /.content-area -->
-    
-
-  <footer>
-    <a href="#" class="logo"><img src="images/logo-16checonf.png" alt="CheConf16"></a>
-    <h4>
-      Eclipse Che Virtual User Conference<br>
-      Tuesday, November 15, 2016
-    </h4>
-
-    <nav>
-      <ul>
-        <li><a href="index.html">Home</a></li>
-        <li><a href="sessions.html">Sessions</a></li>
-        <li><a href="speakers.html">Speakers</a></li>
-        <li><a href="faq.html">FAQ</a></li>
-        <li><a href="sessions.html">Watch</a></li>
-      </ul>
-    </nav>
-
-    <p><small>Copyright &copy; Eclipse Foundation 2016</small></p>
-  </footer>
-  
-
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>  
-  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
-</body>
\ No newline at end of file
diff --git a/checonf17/images/logo-docker.png b/checonf17/images/logo-docker.png
deleted file mode 100755
index 0ca95a8..0000000
--- a/checonf17/images/logo-docker.png
+++ /dev/null
Binary files differ
diff --git a/checonf17/images/shutterstock_321052313.jpg b/checonf17/images/shutterstock_321052313.jpg
deleted file mode 100755
index 32f83e3..0000000
--- a/checonf17/images/shutterstock_321052313.jpg
+++ /dev/null
Binary files differ
diff --git a/checonf17/_htaccess b/checonf18/_htaccess
similarity index 100%
rename from checonf17/_htaccess
rename to checonf18/_htaccess
diff --git a/checonf17/cfp.html b/checonf18/cfp.html
similarity index 64%
rename from checonf17/cfp.html
rename to checonf18/cfp.html
index f02a3ef..196173f 100644
--- a/checonf17/cfp.html
+++ b/checonf18/cfp.html
@@ -42,7 +42,7 @@
 </head>
 <body class="speakers">
   <header class="solid">
-    <a href="index.html" class="logo"><img src="images/logo-16checonf.png" alt="CheConf18"></a>
+    <a href="index.html" class="logo"><img src="images/checonf18_page_header.png" alt="CheConf18"></a>
 
     <nav class="navbar navbar-default">
       <div class="container-fluid">
@@ -55,11 +55,12 @@
         <div class="collapse navbar-collapse" id="top-menu">
           <ul class="nav navbar-nav">
             <li><a href="index.html">Home</a></li>
-            <!--
-            <li><a href="sessions.html">Sessions</a></li>
-            <li><a href="speakers.html">Speakers</a></li>
-            <li><a href="faq.html">FAQ</a></li>
-            <li><a href="sessions.html">Watch</a></li>
+          <li><a href="cfp.html">Call for Speakers</a></li>
+          <li><a href="faq.html">FAQ</a></li>
+          <!--
+          <li><a href="sessions.html">Sessions</a></li>
+          <li><a href="speakers.html">Speakers</a></li>
+          <li><a href="sessions.html">Watch</a></li>
           -->
         </div>
       </div><!--/.container-fluid-->
@@ -68,34 +69,35 @@
 
 
   <div class="content-area container">
-    <h1 class="text-center">Call for Speakers</h1>
-    <p>CheConf brings together the Eclipse Che community, its user and surrounding ecosystem for a day long virtual conference covering topics that affect cloud development and containerization. This year the focus is on using Che in teams and extending Che drive growth in developer communities.</p>
-    <center><a href="sessions.html" class="btn">Submit a Session Proposal</a></center>
-    
+    <div class="padding-side list-faq">
+      <h1 class="text-center">Call for Speakers</h1>
+      <p>CheConf brings together the Eclipse Che community, its user and surrounding ecosystem for a day long virtual conference covering topics that affect cloud development and containerization. This year the focus is on using Che in teams and extending Che to drive growth in cloud development.</p>
+      <center><a href="https://docs.google.com/forms/d/e/1FAIpQLSdgwQ3XAsfJyq5Afl6R3FflJxDPrjPeN4w8CL6c-boIGs_pyQ/viewform?usp=sf_link" class="btn" target="_blank">Submit a Session Proposal</a></center>
+    </div>
     <div class="padding-side list-faq">
       <h3>Submitting a Session</h3>
-      <p>The key to getting a session accepted is the abstract - ensure that it's clear who your audience should be, why they should attend and what you'll cover. The abstract should be a maximum of 250 words and advertise your session - it's your chance to really "sell" the value of attending your session. You can even include links to slides you'll present if you have them.</p>
-      <p>Align your proposal to one of the CheConf 2018 topic areas:</p>
+      <p>The key to getting a session accepted is the abstract - be clear on what you'll cover and why it will benefit attendees. The abstract is your chance to really "sell" the value of attending your session.</p>
+      <p>We will be notifying everyone who submits a session regarding acceptance in January, 2018.</p>
+      <p><strong>CheConf 2018 topic areas:</strong></p>
       <ul>
         <li>Eclipse Che use cases for teams.</li>
         <li>Extending and customizing Eclipse Che.</li>
-        <li>Eclipse Che as part of a developer team workflow.</li>
-        <li>LSP-compliant language servers.</li>
-        <li>Keycloak and user authentication.</li>
+        <li>Language Server Protocol (LSP) and language servers.</li>
+        <li>Using Eclipse Che in the Kubernetes ecosystem.</li>
+        <li>Cool technology for cloud development.</li>
       </ul>
 
       <h3>Session Types</h3>
       <p>There are three types of sessions at CheConf:</p>
         <ul>
-          <li><strong>Mini-talks (15 minutes)</strong>: Short talks that quickly highlight an area of Eclipse Che or of the ecosystem, especially tips and tricks. Alternatively a quick demo of a Che-built solution is also appreciated. Regardless, due to their short time mini-talks should be all nutrition with no filler!</li>
-          <li><strong>Standard talks (45 minutes)</strong>: For standard talks we are looking for sessions that will outline successful use cases with best practices and technical details, highlight new technology areas and provide an introduction into how to get the most from them, or discuss the details of related technologies in the cloud development ecosystem.</li>
-          <li><strong>Tutorials (75 minutes)</strong>: Tutorials are the fun part of any CheConf - they're where developers show each other how to build something with or for Che. Tutorials walk through writing, building and deploying the code necessary to explain the technology.</li>
+          <li><strong>Lightning-talks (15 minutes)</strong>: Short talks that quickly highlight an area of Eclipse Che or of the ecosystem, especially tips and tricks. Alternatively a quick demo of a Che-built solution is also appreciated.</li>
+          <li><strong>Presentations (45 minutes)</strong>: For standard talks we are looking for sessions that will outline successful use cases with best practices and technical details, highlight new technology areas, or discuss the details of related technologies in the cloud development ecosystem.</li>
+          <li><strong>Tutorials (75 minutes)</strong>: Tutorials are the fun part of any CheConf - they're where developers walk through writing, building and deploying the code necessary to explain the technology.</li>
         </ul>
-
     </div>
 
-
-
+<center><a href="https://docs.google.com/forms/d/e/1FAIpQLSdgwQ3XAsfJyq5Afl6R3FflJxDPrjPeN4w8CL6c-boIGs_pyQ/viewform?usp=sf_link" class="btn" target="_blank">Submit a Session Proposal</a></center>
+    
     <!-- NEEDS UPDATED TWEET TEXT
     <div class="text-center">
          <a class="share" target="_blank" href="Watching%20#CheConf2016%20sessions%20-%20presos%20from%20@eclipse_che%2C%20@docker%2C%20@rhdevelopers%2C%20@SamsungIoT%2C%20@bitnami%2C%20@zend%2C%20@eclipsesource%20&%20@SerliFr">
@@ -113,7 +115,7 @@
     
 
   <footer>
-    <a href="#" class="logo"><img src="images/logo-16checonf.png" alt="CheConf18"></a>
+    <a href="index.html" class="logo"><img src="images/checonf18_page_header.png" alt="CheConf18"></a>
     <h4>
       Eclipse Che Virtual User Conference<br>
       Thursday, February 15, 2018
@@ -121,18 +123,24 @@
 
     <nav>
       <ul>
-        <li><a href="index.html">Home</a></li>
-        <li><a href="sessions.html">Sessions</a></li>
-        <li><a href="speakers.html">Speakers</a></li>
-        <li><a href="faq.html">FAQ</a></li>
-        <li><a href="sessions.html">Watch</a></li>
+        <li><a style="color: fdb940" href="index.html">Home</a></li>
+        <li><a style="color: fdb940" href="cfp.html">Call for Speakers</a></li>
+      <!--
+        <li><a style="color: fdb940" href="sessions.html">Sessions</a></li>
+        <li><a style="color: fdb940" href="speakers.html">Speakers</a></li>
+      -->
+        <li><a style="color: fdb940" href="faq.html">FAQ</a></li>
+        <!--<li><a style="color: fdb940" href="sessions.html">Watch</a></li>-->
       </ul>
     </nav>
 
+        <a target="_blank" href="https://visitor.r20.constantcontact.com/d.jsp?llr=7kv7dn9ab&p=oi&m=1127869207900&sit=dqf8xmplb&f=ab2389bc-9888-4ff7-978e-f922c1210d52" class="btn">Register for CheConf</a>
+
+
     <p><small>Copyright &copy; Eclipse Foundation 2017</small></p>
   </footer>
   
 
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>  
   <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
-</body>
\ No newline at end of file
+</body> 
\ No newline at end of file
diff --git a/checonf17/cfp.html b/checonf18/faq.html
similarity index 62%
copy from checonf17/cfp.html
copy to checonf18/faq.html
index f02a3ef..33cfd1e 100644
--- a/checonf17/cfp.html
+++ b/checonf18/faq.html
@@ -2,7 +2,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta name="description" content="CheConf is a virtual conference for Eclipse Che users. This one day virtual conference will offer insight into how cloud workspaces simplify the way you develop software.">
-  <title>CheConf 2018 | Call for Speakers</title>
+  <title>CheConf 2018 | FAQ</title>
 
   <!-- Favicons etc. -->
   <link rel="icon" href="https://www.eclipse.org/che/images/ico/favicon.ico">
@@ -42,7 +42,7 @@
 </head>
 <body class="speakers">
   <header class="solid">
-    <a href="index.html" class="logo"><img src="images/logo-16checonf.png" alt="CheConf18"></a>
+    <a href="index.html" class="logo"><img src="images/checonf18_page_header.png" alt="CheConf18"></a>
 
     <nav class="navbar navbar-default">
       <div class="container-fluid">
@@ -55,11 +55,12 @@
         <div class="collapse navbar-collapse" id="top-menu">
           <ul class="nav navbar-nav">
             <li><a href="index.html">Home</a></li>
-            <!--
-            <li><a href="sessions.html">Sessions</a></li>
-            <li><a href="speakers.html">Speakers</a></li>
-            <li><a href="faq.html">FAQ</a></li>
-            <li><a href="sessions.html">Watch</a></li>
+          <li><a href="cfp.html">Call for Speakers</a></li>
+          <li><a href="faq.html">FAQ</a></li>
+          <!--
+          <li><a href="sessions.html">Sessions</a></li>
+          <li><a href="speakers.html">Speakers</a></li>
+          <li><a href="sessions.html">Watch</a></li>
           -->
         </div>
       </div><!--/.container-fluid-->
@@ -68,52 +69,41 @@
 
 
   <div class="content-area container">
-    <h1 class="text-center">Call for Speakers</h1>
-    <p>CheConf brings together the Eclipse Che community, its user and surrounding ecosystem for a day long virtual conference covering topics that affect cloud development and containerization. This year the focus is on using Che in teams and extending Che drive growth in developer communities.</p>
-    <center><a href="sessions.html" class="btn">Submit a Session Proposal</a></center>
-    
+    <h1 class="text-center">FAQ</h1>
+
     <div class="padding-side list-faq">
-      <h3>Submitting a Session</h3>
-      <p>The key to getting a session accepted is the abstract - ensure that it's clear who your audience should be, why they should attend and what you'll cover. The abstract should be a maximum of 250 words and advertise your session - it's your chance to really "sell" the value of attending your session. You can even include links to slides you'll present if you have them.</p>
-      <p>Align your proposal to one of the CheConf 2018 topic areas:</p>
-      <ul>
-        <li>Eclipse Che use cases for teams.</li>
-        <li>Extending and customizing Eclipse Che.</li>
-        <li>Eclipse Che as part of a developer team workflow.</li>
-        <li>LSP-compliant language servers.</li>
-        <li>Keycloak and user authentication.</li>
-      </ul>
+      <h3>What is CheConf?</h3>
+      <p>CheConf is a virtual conference covering topics related to Eclipse Che and cloud development. We started CheConf in 2016 because with hundreds of thousands of Eclipse Che users around the world, we wanted to make sure that anyone, anywhere can experience this event.</p>
 
-      <h3>Session Types</h3>
-      <p>There are three types of sessions at CheConf:</p>
-        <ul>
-          <li><strong>Mini-talks (15 minutes)</strong>: Short talks that quickly highlight an area of Eclipse Che or of the ecosystem, especially tips and tricks. Alternatively a quick demo of a Che-built solution is also appreciated. Regardless, due to their short time mini-talks should be all nutrition with no filler!</li>
-          <li><strong>Standard talks (45 minutes)</strong>: For standard talks we are looking for sessions that will outline successful use cases with best practices and technical details, highlight new technology areas and provide an introduction into how to get the most from them, or discuss the details of related technologies in the cloud development ecosystem.</li>
-          <li><strong>Tutorials (75 minutes)</strong>: Tutorials are the fun part of any CheConf - they're where developers show each other how to build something with or for Che. Tutorials walk through writing, building and deploying the code necessary to explain the technology.</li>
-        </ul>
+      <h3>How does a virtual user conference work?</h3>
+      <p>CheConf works much like a regular conference - we have a set agenda and speakers, with sessions that you can attend from your computer. A conference agenda with links to each session will be sent out before the event. On the day of the conference, you simply click on the session you want to attend, and you will be connected to the live stream. There will be an opportunity for you to live chat and ask questions with the Che maintainers and other virtual conference attendees. After the event is over the sessions will be posted to YouTube for repeat viewing!</p>
 
+      <h3>How many sessions can I attend?</h3>
+      <p>As many as you like. We want you to experience CheConf your way. You can stay connected all day, or you can pop in and out of the sessions you want to attend. <!--<a href="sessions.html">View Sessions.</a>--></p>
+
+      <h3>How can I get involved?</h3>
+      <p>We're always looking for sessions and speakers - with this being a virtual conference we're hoping to have an international group of speakers. Please feel free to <strong><a href="cfp.html">submit a session proposal</a></strong>. Of course Eclipse Che is an open source project so it needs the power of the community to succeed. Being a Che user and advocate and sharing experiences with your peers is the best way to help keep Che growing. We love when people write blogs, tweet and make contribution to the Che project.</p>
+      <h3><a href="https://eclipse.org/che/" target="_blank">About Eclipse Che</a></h3>
     </div>
 
 
-
-    <!-- NEEDS UPDATED TWEET TEXT
+    <!--
     <div class="text-center">
          <a class="share" target="_blank" href="Watching%20#CheConf2016%20sessions%20-%20presos%20from%20@eclipse_che%2C%20@docker%2C%20@rhdevelopers%2C%20@SamsungIoT%2C%20@bitnami%2C%20@zend%2C%20@eclipsesource%20&%20@SerliFr">
       <i class="fa fa-twitter"></i>
         <br>
         <span>
           <strong>Spread the Word</strong><br>
-          #CheConf2018
+          #CheConf2016
         </span>
       </a>
     </div>
-      -->
+  -->
   </div><!-- /.content-area -->
-
     
 
   <footer>
-    <a href="#" class="logo"><img src="images/logo-16checonf.png" alt="CheConf18"></a>
+    <a href="index.html" class="logo"><img src="images/checonf18_page_header.png" alt="CheConf18"></a>
     <h4>
       Eclipse Che Virtual User Conference<br>
       Thursday, February 15, 2018
@@ -121,14 +111,20 @@
 
     <nav>
       <ul>
-        <li><a href="index.html">Home</a></li>
-        <li><a href="sessions.html">Sessions</a></li>
-        <li><a href="speakers.html">Speakers</a></li>
-        <li><a href="faq.html">FAQ</a></li>
-        <li><a href="sessions.html">Watch</a></li>
+        <li><a style="color: fdb940" href="index.html">Home</a></li>
+        <li><a style="color: fdb940" href="cfp.html">Call for Speakers</a></li>
+      <!--
+        <li><a style="color: fdb940" href="sessions.html">Sessions</a></li>
+        <li><a style="color: fdb940" href="speakers.html">Speakers</a></li>
+      -->
+        <li><a style="color: fdb940" href="faq.html">FAQ</a></li>
+        <!--<li><a style="color: fdb940" href="sessions.html">Watch</a></li>-->
       </ul>
     </nav>
 
+        <a target="_blank" href="https://visitor.r20.constantcontact.com/d.jsp?llr=7kv7dn9ab&p=oi&m=1127869207900&sit=dqf8xmplb&f=ab2389bc-9888-4ff7-978e-f922c1210d52" class="btn">Register for CheConf</a>
+
+
     <p><small>Copyright &copy; Eclipse Foundation 2017</small></p>
   </footer>
   
diff --git a/checonf18/images/checonf18_page_header.png b/checonf18/images/checonf18_page_header.png
new file mode 100644
index 0000000..295b44f
--- /dev/null
+++ b/checonf18/images/checonf18_page_header.png
Binary files differ
diff --git a/checonf18/images/checonf2018_emailheader_600x150.png b/checonf18/images/checonf2018_emailheader_600x150.png
new file mode 100644
index 0000000..cbabe57
--- /dev/null
+++ b/checonf18/images/checonf2018_emailheader_600x150.png
Binary files differ
diff --git a/checonf18/images/checonf2018_socialpostimage.png b/checonf18/images/checonf2018_socialpostimage.png
new file mode 100644
index 0000000..6403b12
--- /dev/null
+++ b/checonf18/images/checonf2018_socialpostimage.png
Binary files differ
diff --git a/checonf17/images/edwin-andrade-153753-copy.jpg b/checonf18/images/edwin-andrade-153753-copy.jpg
similarity index 100%
rename from checonf17/images/edwin-andrade-153753-copy.jpg
rename to checonf18/images/edwin-andrade-153753-copy.jpg
Binary files differ
diff --git a/checonf17/images/icon-edu.png b/checonf18/images/icon-edu.png
similarity index 100%
rename from checonf17/images/icon-edu.png
rename to checonf18/images/icon-edu.png
Binary files differ
diff --git a/checonf17/images/icon-extend.png b/checonf18/images/icon-extend.png
similarity index 100%
rename from checonf17/images/icon-extend.png
rename to checonf18/images/icon-extend.png
Binary files differ
diff --git a/checonf17/images/icon-insight.png b/checonf18/images/icon-insight.png
similarity index 100%
rename from checonf17/images/icon-insight.png
rename to checonf18/images/icon-insight.png
Binary files differ
diff --git a/checonf17/images/logo-16checonf.png b/checonf18/images/logo-16checonf.png
similarity index 100%
rename from checonf17/images/logo-16checonf.png
rename to checonf18/images/logo-16checonf.png
Binary files differ
diff --git a/checonf17/images/logo-che.png b/checonf18/images/logo-che.png
similarity index 100%
rename from checonf17/images/logo-che.png
rename to checonf18/images/logo-che.png
Binary files differ
diff --git a/checonf17/images/logo-eclipsesource.png b/checonf18/images/logo-eclipsesource.png
similarity index 100%
rename from checonf17/images/logo-eclipsesource.png
rename to checonf18/images/logo-eclipsesource.png
Binary files differ
diff --git a/checonf17/images/logo-redhat.png b/checonf18/images/logo-redhat.png
similarity index 100%
rename from checonf17/images/logo-redhat.png
rename to checonf18/images/logo-redhat.png
Binary files differ
diff --git a/checonf18/images/logo-sap@2x.png b/checonf18/images/logo-sap@2x.png
new file mode 100644
index 0000000..907224e
--- /dev/null
+++ b/checonf18/images/logo-sap@2x.png
Binary files differ
diff --git a/checonf18/images/logo-software-ag@2x.png b/checonf18/images/logo-software-ag@2x.png
new file mode 100644
index 0000000..164a5f2
--- /dev/null
+++ b/checonf18/images/logo-software-ag@2x.png
Binary files differ
diff --git a/checonf17/images/logos/bitnami.png b/checonf18/images/logos/bitnami.png
similarity index 100%
rename from checonf17/images/logos/bitnami.png
rename to checonf18/images/logos/bitnami.png
Binary files differ
diff --git a/checonf17/images/logos/codenvy.png b/checonf18/images/logos/codenvy.png
similarity index 100%
rename from checonf17/images/logos/codenvy.png
rename to checonf18/images/logos/codenvy.png
Binary files differ
diff --git a/checonf17/images/logos/docker.png b/checonf18/images/logos/docker.png
similarity index 100%
rename from checonf17/images/logos/docker.png
rename to checonf18/images/logos/docker.png
Binary files differ
diff --git a/checonf17/images/logos/eclipsesource.png b/checonf18/images/logos/eclipsesource.png
similarity index 100%
rename from checonf17/images/logos/eclipsesource.png
rename to checonf18/images/logos/eclipsesource.png
Binary files differ
diff --git a/checonf17/images/logos/logo-samsung.png b/checonf18/images/logos/logo-samsung.png
similarity index 100%
rename from checonf17/images/logos/logo-samsung.png
rename to checonf18/images/logos/logo-samsung.png
Binary files differ
diff --git a/checonf17/images/logos/redhat.png b/checonf18/images/logos/redhat.png
similarity index 100%
rename from checonf17/images/logos/redhat.png
rename to checonf18/images/logos/redhat.png
Binary files differ
diff --git a/checonf17/images/logos/serli.png b/checonf18/images/logos/serli.png
similarity index 100%
rename from checonf17/images/logos/serli.png
rename to checonf18/images/logos/serli.png
Binary files differ
diff --git a/checonf17/images/logos/sourcegraph.png b/checonf18/images/logos/sourcegraph.png
similarity index 100%
rename from checonf17/images/logos/sourcegraph.png
rename to checonf18/images/logos/sourcegraph.png
Binary files differ
diff --git a/checonf17/images/logos/vJUG-logo.jpg b/checonf18/images/logos/vJUG-logo.jpg
similarity index 100%
rename from checonf17/images/logos/vJUG-logo.jpg
rename to checonf18/images/logos/vJUG-logo.jpg
Binary files differ
diff --git a/checonf17/images/logos/vJUG-logo.png b/checonf18/images/logos/vJUG-logo.png
similarity index 100%
rename from checonf17/images/logos/vJUG-logo.png
rename to checonf18/images/logos/vJUG-logo.png
Binary files differ
diff --git a/checonf17/images/logos/zend.png b/checonf18/images/logos/zend.png
similarity index 100%
rename from checonf17/images/logos/zend.png
rename to checonf18/images/logos/zend.png
Binary files differ
diff --git a/checonf17/images/speakers/brad.png b/checonf18/images/speakers/brad.png
similarity index 100%
rename from checonf17/images/speakers/brad.png
rename to checonf18/images/speakers/brad.png
Binary files differ
diff --git a/checonf17/images/speakers/dan.png b/checonf18/images/speakers/dan.png
similarity index 100%
rename from checonf17/images/speakers/dan.png
rename to checonf18/images/speakers/dan.png
Binary files differ
diff --git a/checonf17/images/speakers/florent.png b/checonf18/images/speakers/florent.png
similarity index 100%
rename from checonf17/images/speakers/florent.png
rename to checonf18/images/speakers/florent.png
Binary files differ
diff --git a/checonf17/images/speakers/jonas.png b/checonf18/images/speakers/jonas.png
similarity index 100%
rename from checonf17/images/speakers/jonas.png
rename to checonf18/images/speakers/jonas.png
Binary files differ
diff --git a/checonf17/images/speakers/kaloyan.png b/checonf18/images/speakers/kaloyan.png
similarity index 100%
rename from checonf17/images/speakers/kaloyan.png
rename to checonf18/images/speakers/kaloyan.png
Binary files differ
diff --git a/checonf17/images/speakers/mario.png b/checonf18/images/speakers/mario.png
similarity index 100%
rename from checonf17/images/speakers/mario.png
rename to checonf18/images/speakers/mario.png
Binary files differ
diff --git a/checonf17/images/speakers/martin.png b/checonf18/images/speakers/martin.png
similarity index 100%
rename from checonf17/images/speakers/martin.png
rename to checonf18/images/speakers/martin.png
Binary files differ
diff --git a/checonf17/images/speakers/patrick.png b/checonf18/images/speakers/patrick.png
similarity index 100%
rename from checonf17/images/speakers/patrick.png
rename to checonf18/images/speakers/patrick.png
Binary files differ
diff --git a/checonf17/images/speakers/quinn.png b/checonf18/images/speakers/quinn.png
similarity index 100%
rename from checonf17/images/speakers/quinn.png
rename to checonf18/images/speakers/quinn.png
Binary files differ
diff --git a/checonf17/images/speakers/rick.png b/checonf18/images/speakers/rick.png
similarity index 100%
rename from checonf17/images/speakers/rick.png
rename to checonf18/images/speakers/rick.png
Binary files differ
diff --git a/checonf17/images/speakers/stevan.png b/checonf18/images/speakers/stevan.png
similarity index 100%
rename from checonf17/images/speakers/stevan.png
rename to checonf18/images/speakers/stevan.png
Binary files differ
diff --git a/checonf17/images/speakers/sun.png b/checonf18/images/speakers/sun.png
similarity index 100%
rename from checonf17/images/speakers/sun.png
rename to checonf18/images/speakers/sun.png
Binary files differ
diff --git a/checonf17/images/speakers/tyler.png b/checonf18/images/speakers/tyler.png
similarity index 100%
rename from checonf17/images/speakers/tyler.png
rename to checonf18/images/speakers/tyler.png
Binary files differ
diff --git a/checonf17/images/speakers/user.png b/checonf18/images/speakers/user.png
similarity index 100%
rename from checonf17/images/speakers/user.png
rename to checonf18/images/speakers/user.png
Binary files differ
diff --git a/checonf17/index.html b/checonf18/index.html
similarity index 65%
rename from checonf17/index.html
rename to checonf18/index.html
index a8253ed..5fdcb6a 100644
--- a/checonf17/index.html
+++ b/checonf18/index.html
@@ -1,8 +1,8 @@
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <meta name="description" content="CheConf 2016 is the first annual Eclipse Che users’ conference. This one day virtual conference will offer insight into how cloud workspaces simplify the way you develop software.">
-  <title>CheConf 2017 | Eclipse Che Users' Conference | December, 2017</title>
+  <meta name="description" content="CheConf is a virtual conference for Eclipse Che users. This one day virtual conference will offer insight into how cloud workspaces simplify the way you develop software.">
+  <title>CheConf 2018 Virtual Conference</title>
 
   <!-- Favicons etc. -->
   <link rel="icon" href="https://www.eclipse.org/che/images/ico/favicon.ico">
@@ -41,9 +41,15 @@
 
   <!-- Tracking Snippets -->
 </head>
+
+<!-- Begin Constant Contact Active Forms -->
+<script> var _ctct_m = "99df2f138027260c4781ca10659f5638"; </script>
+<script id="signupScript" src="//static.ctctcdn.com/js/signup-form-widget/current/signup-form-widget.min.js" async defer></script>
+<!-- End Constant Contact Active Forms -->
+
 <body class="index">
   <header class="overlay">
-    <a href="index.html" class="logo"><img src="images/logo-16checonf.png" alt="CheConf16"></a>
+    <a href="index.html" class="logo"><img src="images/checonf18_page_header.png" alt="CheConf18"></a>
 
     <nav class="navbar navbar-default">
       <div class="navbar-header">
@@ -53,47 +59,62 @@
       </div>
 
       <div class="collapse navbar-collapse" id="top-menu">
-        <ul class="nav navbar-nav">
-          <li><a href="index.html">Home</a></li>
+          <ul class="nav navbar-nav">
+            <li><a href="index.html">Home</a></li>
           <li><a href="cfp.html">Call for Speakers</a></li>
+          <li><a href="faq.html">FAQ</a></li>
           <!--
           <li><a href="sessions.html">Sessions</a></li>
           <li><a href="speakers.html">Speakers</a></li>
-          <li><a href="faq.html">FAQ</a></li>
           <li><a href="sessions.html">Watch</a></li>
-        -->
-      </div>
+          -->
+        </div>
     </nav><!-- /nav -->
 
     <h1>The cloud workspace virtual event.</h1>
-    <h2>Get ready for CheConf 2017!</h4>
-    <a href="sessions.html" class="btn">Register for CheConf</a>
+    <h2>CheConf 2018 is coming February 15, 2018!</h4>
+    <a target="_blank" href="https://visitor.r20.constantcontact.com/d.jsp?llr=7kv7dn9ab&p=oi&m=1127869207900&sit=dqf8xmplb&f=ab2389bc-9888-4ff7-978e-f922c1210d52" class="btn">Register for CheConf</a>
   </header>
 
 
   <div class="content-area container text-center">
-    <h2>The second annual Eclipse Che users’ conference.</h2>
-    <h4 class="padding-side">This one day virtual conference brings insights into how containerized developer workspaces simplify the way individuals, teams and organizations develop software.</h4>
-    <!--
-    <ul class="set-of-8">
-      <li><img src="images/logo-redhat.png" alt=""></li>
-      <li><img src="images/logo-codenvy.png" alt=""></li>
-      <li><img src="images/logo-bitnami.png" alt=""></li>
-      <li><img src="images/logo-docker.png" alt=""></li>
-      <li><img src="images/logos/logo-samsung.png" alt=""></li>
-      <li><img src="images/logos/sourcegraph.png" alt=""></li>
-      <li><img src="images/logo-eclipsesource.png" alt=""></li>
-      <li><img src="images/logo-serli.png" alt=""></li>
-      <li><img src="images/logos/vJUG-logo.png" alt=""></li>
-    </ul>
-    -->
-    <!--<h3><a href="sessions.html">Watch the Recorded Sessions</a></h3>-->
+    <h2>Our second Eclipse Che user and developer conference.</h2>
+    <h3 class="padding-side">This one day virtual conference brings insights into how cloud developer workspaces are changing how applications are created, and how companies are building cloud-native developer tools.</h3>
 
     <div class="sep"></div>
 
+    <ul class="set-of-8">
+      <li><img src="images/logo-redhat.png" alt=""></li>
+      <li><img src="images/logo-software-ag@2x.png" alt=""></li>
+      <li><img src="images/logo-eclipsesource.png" alt=""></li>
+      <li><img src="images/logo-sap@2x.png" alt=""></li>
+    <!--
+      <li><img src="images/logo-docker.png" alt=""></li>
+      <li><img src="images/logos/logo-samsung.png" alt=""></li>
+      <li><img src="images/logos/sourcegraph.png" alt=""></li>
+      <li><img src="images/logo-serli.png" alt=""></li>
+      <li><img src="images/logos/vJUG-logo.png" alt=""></li>
+    -->
+    </ul>
+    <!--<h3><a href="sessions.html">Watch the Recorded Sessions</a></h3>-->
+  </div>
+  
+  <div class="content-area container">
+    <div class="padding-side list-faq">
     <h2>See the future of cloud-native development.</h2>
-    <h4 class="padding-side">Attend this one day virtual conference to hear contributors and maintainers from across the Eclipse Che and cloud IDE ecosystem discuss how containerized developer workspaces can drive better development workflows, team productivity and release frequency. You'll learn how going cloud-native simplifies setup and sharing of developer workspaces as well as how to build custom plugins and language servers.</h4>
-    <ul class="set-of-3">
+    <h4>Attend this one day virtual conference to hear contributors and maintainers from across the Eclipse Che and cloud development ecosystem discuss how containerized developer workspaces can drive better development workflows, team productivity and release frequency.</h4>
+    <h4><strong>Topics areas for 2018 will include:</strong></h4>
+      <ul>
+        <li>Eclipse Che use cases for teams.</li>
+        <li>Extending and customizing Eclipse Che.</li>
+        <li>Language Server Protocol (LSP) and language servers.</li>
+        <li>Using Eclipse Che in the Kubernetes ecosystem.</li>
+        <li>Cool technology for cloud development.</li>
+      </ul>
+
+    <div class="sep"></div>
+    
+    <ul class="set-of-3 text-center">
       <li>
         <img src="images/icon-insight.png" alt="">
         <h4>
@@ -104,21 +125,22 @@
       <li>
         <img src="images/icon-edu.png" alt="">
         <h4>
-          <strong>Educate</strong><br>
-          CheConf17 is your chance to go deep into Che with live tutorials and sessions on how to use and extend Che and how to build out a language server.
+          <strong>Education</strong><br>
+          CheConf is your chance to go deep with live tutorials and sessions on how to use and extend Che and make the most of the language server protocol.
         </h4>
       </li>
       <li>
         <img src="images/icon-extend.png" alt="">
         <h4>
-          <strong>Extend</strong><br>
-          Organizations around the world are extending Che to drive their own developer ecosystems. Learn their approaches and hear their successes.
+          <strong>Extension</strong><br>
+          Organizations around the world are extending Che to drive their own developer ecosystems. Learn their approaches and hear about their successes.
         </h4>
       </li>
     </ul>
 
     <div class="sep"></div>
 
+<!--
     <a class="share" target="_blank" href="I'll%20be%20at%20#CheConf2017%20to%20hear%20about%20the%20future%20of%20#CloudDevelopment.">
       <i class="fa fa-twitter"></i>
       <br>
@@ -127,32 +149,39 @@
         #CheConf2017
       </span>
     </a>
+-->
+    </div>
+
   </div><!-- /.content-area -->
     
 
   <footer>
-    <a href="#" class="logo"><img src="images/logo-16checonf.png" alt="CheConf16"></a>
+    <a href="#" class="logo"><img src="images/checonf18_page_header.png" alt="CheConf18"></a>
     <h4>
       Eclipse Che Virtual User Conference<br>
-      December, 2017
+      Thursday, February 15, 2018
     </h4>
-<!--
+
     <nav>
       <ul>
-        <li><a href="index.html">Home</a></li>
-        <li><a href="sessions.html">Sessions</a></li>
-        <li><a href="speakers.html">Speakers</a></li>
-        <li><a href="faq.html">FAQ</a></li>
-        <li><a href="sessions.html">Watch</a></li>
+        <li><a style="color: fdb940" href="index.html">Home</a></li>
+        <li><a style="color: fdb940" href="cfp.html">Call for Speakers</a></li>
+      <!--
+        <li><a style="color: fdb940" href="sessions.html">Sessions</a></li>
+        <li><a style="color: fdb940" href="speakers.html">Speakers</a></li>
+      -->
+        <li><a style="color: fdb940" href="faq.html">FAQ</a></li>
+        <!--<li><a style="color: fdb940" href="sessions.html">Watch</a></li>-->
       </ul>
     </nav>
--->
-    <p><small>Copyright &copy; Eclipse Foundation 2017</small></p>
-    <p><small>Che is a trademark of the Eclipse Foundation and is used with permission</small></p>
-    <div class="sep"></div>
-    <p><small>Header image by <a href="https://unsplash.com/@theunsteady5">Edwin Andrade</a></small></p>
-  </footer>
 
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
+        <a target="_blank" href="https://visitor.r20.constantcontact.com/d.jsp?llr=7kv7dn9ab&p=oi&m=1127869207900&sit=dqf8xmplb&f=ab2389bc-9888-4ff7-978e-f922c1210d52" class="btn">Register for CheConf</a>
+
+
+    <p><small>Copyright &copy; Eclipse Foundation 2017</small></p>
+  </footer>
+  
+
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>  
   <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
 </body>
\ No newline at end of file
diff --git a/checonf17/register.html b/checonf18/register.html
similarity index 100%
rename from checonf17/register.html
rename to checonf18/register.html
diff --git a/checonf17/sessions.html b/checonf18/sessions.html
similarity index 100%
rename from checonf17/sessions.html
rename to checonf18/sessions.html
diff --git a/checonf17/speakers.html b/checonf18/speakers.html
similarity index 100%
rename from checonf17/speakers.html
rename to checonf18/speakers.html
diff --git a/checonf17/styles.css b/checonf18/styles.css
similarity index 98%
rename from checonf17/styles.css
rename to checonf18/styles.css
index d599094..42272e6 100644
--- a/checonf17/styles.css
+++ b/checonf18/styles.css
@@ -10,7 +10,7 @@
 small {font-size: 12px;}
 strong {font-weight: 500;}
 
-.btn {display: inline-block; min-width: 164px; height: 38px; margin-top: 20px; padding: 0 20px; border-radius: 4px; border: none; background-color: #fdb940; color: #fff; font-size: 16px; font-weight: 500; line-height: 38px;}
+.btn {display: inline-block; min-width: 164px; height: 38px; margin-top: 20px; padding: 0 20px; border-radius: 4px; border: none; background-color: #fdb940; color: #333; font-size: 16px; font-weight: 500; line-height: 38px;}
 .btn:hover {color: #fff; background-color: #fca70e;}
 
 a {transition: all .3s ease;}
diff --git a/checonf17/success.html b/checonf18/success.html
similarity index 100%
rename from checonf17/success.html
rename to checonf18/success.html