diff --git a/output/_pagefind/index/en_08db982.pf_index b/output/_pagefind/index/en_08db982.pf_index
deleted file mode 100644
index 04b4af8..0000000
--- a/output/_pagefind/index/en_08db982.pf_index
+++ /dev/null
Binary files differ
diff --git a/output/_pagefind/index/en_2b22274.pf_index b/output/_pagefind/index/en_2b22274.pf_index
deleted file mode 100644
index c946c8c..0000000
--- a/output/_pagefind/index/en_2b22274.pf_index
+++ /dev/null
Binary files differ
diff --git a/output/_pagefind/index/en_2b67d04.pf_index b/output/_pagefind/index/en_2b67d04.pf_index
new file mode 100644
index 0000000..9071c11
--- /dev/null
+++ b/output/_pagefind/index/en_2b67d04.pf_index
Binary files differ
diff --git a/output/_pagefind/index/en_2ff1835.pf_index b/output/_pagefind/index/en_2ff1835.pf_index
new file mode 100644
index 0000000..f6167b9
--- /dev/null
+++ b/output/_pagefind/index/en_2ff1835.pf_index
Binary files differ
diff --git a/output/_pagefind/index/en_31e83f9.pf_index b/output/_pagefind/index/en_31e83f9.pf_index
deleted file mode 100644
index 20c4fcb..0000000
--- a/output/_pagefind/index/en_31e83f9.pf_index
+++ /dev/null
Binary files differ
diff --git a/output/_pagefind/index/en_33867b6.pf_index b/output/_pagefind/index/en_33867b6.pf_index
deleted file mode 100644
index 2abc824..0000000
--- a/output/_pagefind/index/en_33867b6.pf_index
+++ /dev/null
Binary files differ
diff --git a/output/_pagefind/index/en_36143cf.pf_index b/output/_pagefind/index/en_36143cf.pf_index
new file mode 100644
index 0000000..2ad1fa2
--- /dev/null
+++ b/output/_pagefind/index/en_36143cf.pf_index
Binary files differ
diff --git a/output/_pagefind/index/en_3891d24.pf_index b/output/_pagefind/index/en_3891d24.pf_index
new file mode 100644
index 0000000..57918d4
--- /dev/null
+++ b/output/_pagefind/index/en_3891d24.pf_index
Binary files differ
diff --git a/output/_pagefind/index/en_3cbb5d9.pf_index b/output/_pagefind/index/en_3cbb5d9.pf_index
deleted file mode 100644
index a109a8d..0000000
--- a/output/_pagefind/index/en_3cbb5d9.pf_index
+++ /dev/null
Binary files differ
diff --git a/output/_pagefind/index/en_4897f33.pf_index b/output/_pagefind/index/en_4897f33.pf_index
deleted file mode 100644
index 478cafc..0000000
--- a/output/_pagefind/index/en_4897f33.pf_index
+++ /dev/null
Binary files differ
diff --git a/output/_pagefind/index/en_4910f15.pf_index b/output/_pagefind/index/en_4910f15.pf_index
deleted file mode 100644
index f4190c9..0000000
--- a/output/_pagefind/index/en_4910f15.pf_index
+++ /dev/null
Binary files differ
diff --git a/output/_pagefind/index/en_4a23e88.pf_index b/output/_pagefind/index/en_4a23e88.pf_index
new file mode 100644
index 0000000..ede9a96
--- /dev/null
+++ b/output/_pagefind/index/en_4a23e88.pf_index
Binary files differ
diff --git a/output/_pagefind/index/en_531f74b.pf_index b/output/_pagefind/index/en_531f74b.pf_index
new file mode 100644
index 0000000..30dfa18
--- /dev/null
+++ b/output/_pagefind/index/en_531f74b.pf_index
Binary files differ
diff --git a/output/_pagefind/index/en_5a8169b.pf_index b/output/_pagefind/index/en_5a8169b.pf_index
deleted file mode 100644
index 6104e4d..0000000
--- a/output/_pagefind/index/en_5a8169b.pf_index
+++ /dev/null
Binary files differ
diff --git a/output/_pagefind/index/en_5ce29b8.pf_index b/output/_pagefind/index/en_5ce29b8.pf_index
new file mode 100644
index 0000000..a5e2b37
--- /dev/null
+++ b/output/_pagefind/index/en_5ce29b8.pf_index
Binary files differ
diff --git a/output/_pagefind/index/en_6635e81.pf_index b/output/_pagefind/index/en_6635e81.pf_index
new file mode 100644
index 0000000..085c767
--- /dev/null
+++ b/output/_pagefind/index/en_6635e81.pf_index
Binary files differ
diff --git a/output/_pagefind/index/en_6711785.pf_index b/output/_pagefind/index/en_6711785.pf_index
new file mode 100644
index 0000000..6c67ea0
--- /dev/null
+++ b/output/_pagefind/index/en_6711785.pf_index
Binary files differ
diff --git a/output/_pagefind/index/en_6ab981a.pf_index b/output/_pagefind/index/en_6ab981a.pf_index
deleted file mode 100644
index 2f13995..0000000
--- a/output/_pagefind/index/en_6ab981a.pf_index
+++ /dev/null
Binary files differ
diff --git a/output/_pagefind/index/en_6ed314e.pf_index b/output/_pagefind/index/en_6ed314e.pf_index
new file mode 100644
index 0000000..ab7f455
--- /dev/null
+++ b/output/_pagefind/index/en_6ed314e.pf_index
Binary files differ
diff --git a/output/_pagefind/index/en_74bd6aa.pf_index b/output/_pagefind/index/en_74bd6aa.pf_index
deleted file mode 100644
index 5f1f6dc..0000000
--- a/output/_pagefind/index/en_74bd6aa.pf_index
+++ /dev/null
Binary files differ
diff --git a/output/_pagefind/index/en_7a5f29c.pf_index b/output/_pagefind/index/en_7a5f29c.pf_index
deleted file mode 100644
index b183a50..0000000
--- a/output/_pagefind/index/en_7a5f29c.pf_index
+++ /dev/null
Binary files differ
diff --git a/output/_pagefind/index/en_8f2a78f.pf_index b/output/_pagefind/index/en_8f2a78f.pf_index
new file mode 100644
index 0000000..080e1e9
--- /dev/null
+++ b/output/_pagefind/index/en_8f2a78f.pf_index
Binary files differ
diff --git a/output/_pagefind/index/en_9c21288.pf_index b/output/_pagefind/index/en_9c21288.pf_index
new file mode 100644
index 0000000..0d7665f
--- /dev/null
+++ b/output/_pagefind/index/en_9c21288.pf_index
Binary files differ
diff --git a/output/_pagefind/index/en_a3b2996.pf_index b/output/_pagefind/index/en_a3b2996.pf_index
new file mode 100644
index 0000000..3a4d233
--- /dev/null
+++ b/output/_pagefind/index/en_a3b2996.pf_index
Binary files differ
diff --git a/output/_pagefind/index/en_a696e20.pf_index b/output/_pagefind/index/en_a696e20.pf_index
new file mode 100644
index 0000000..e4b64a6
--- /dev/null
+++ b/output/_pagefind/index/en_a696e20.pf_index
Binary files differ
diff --git a/output/_pagefind/index/en_aaf1532.pf_index b/output/_pagefind/index/en_aaf1532.pf_index
new file mode 100644
index 0000000..c7c163a
--- /dev/null
+++ b/output/_pagefind/index/en_aaf1532.pf_index
Binary files differ
diff --git a/output/_pagefind/index/en_b087d79.pf_index b/output/_pagefind/index/en_b087d79.pf_index
new file mode 100644
index 0000000..216a128
--- /dev/null
+++ b/output/_pagefind/index/en_b087d79.pf_index
Binary files differ
diff --git a/output/_pagefind/index/en_bd1174b.pf_index b/output/_pagefind/index/en_bd1174b.pf_index
deleted file mode 100644
index 5329a72..0000000
--- a/output/_pagefind/index/en_bd1174b.pf_index
+++ /dev/null
Binary files differ
diff --git a/output/_pagefind/index/en_cd2c98e.pf_index b/output/_pagefind/index/en_cd2c98e.pf_index
deleted file mode 100644
index 97a7c7b..0000000
--- a/output/_pagefind/index/en_cd2c98e.pf_index
+++ /dev/null
Binary files differ
diff --git a/output/_pagefind/index/en_dbd176b.pf_index b/output/_pagefind/index/en_dbd176b.pf_index
deleted file mode 100644
index a9a8efa..0000000
--- a/output/_pagefind/index/en_dbd176b.pf_index
+++ /dev/null
Binary files differ
diff --git a/output/_pagefind/index/en_dd7b4eb.pf_index b/output/_pagefind/index/en_dd7b4eb.pf_index
deleted file mode 100644
index f8d9805..0000000
--- a/output/_pagefind/index/en_dd7b4eb.pf_index
+++ /dev/null
Binary files differ
diff --git a/output/_pagefind/index/en_e3ce107.pf_index b/output/_pagefind/index/en_e3ce107.pf_index
deleted file mode 100644
index 2b169c6..0000000
--- a/output/_pagefind/index/en_e3ce107.pf_index
+++ /dev/null
Binary files differ
diff --git a/output/_pagefind/index/en_e6148dd.pf_index b/output/_pagefind/index/en_e6148dd.pf_index
deleted file mode 100644
index 77f8cee..0000000
--- a/output/_pagefind/index/en_e6148dd.pf_index
+++ /dev/null
Binary files differ
diff --git a/output/_pagefind/index/en_e7e0dc7.pf_index b/output/_pagefind/index/en_e7e0dc7.pf_index
new file mode 100644
index 0000000..2af6818
--- /dev/null
+++ b/output/_pagefind/index/en_e7e0dc7.pf_index
Binary files differ
diff --git a/output/_pagefind/index/en_fb72abf.pf_index b/output/_pagefind/index/en_fb72abf.pf_index
new file mode 100644
index 0000000..9fe9040
--- /dev/null
+++ b/output/_pagefind/index/en_fb72abf.pf_index
Binary files differ
diff --git a/output/_pagefind/index/en_fd1c746.pf_index b/output/_pagefind/index/en_fd1c746.pf_index
deleted file mode 100644
index eae754c..0000000
--- a/output/_pagefind/index/en_fd1c746.pf_index
+++ /dev/null
Binary files differ
diff --git a/output/_pagefind/pagefind-entry.json b/output/_pagefind/pagefind-entry.json
index 42a3783..a201492 100644
--- a/output/_pagefind/pagefind-entry.json
+++ b/output/_pagefind/pagefind-entry.json
@@ -1 +1 @@
-{"version":"1.0.3","languages":{"en":{"hash":"en_f5308fbdae","wasm":"en","page_count":176}}}
\ No newline at end of file
+{"version":"1.0.3","languages":{"en":{"hash":"en_5553d4d197","wasm":"en","page_count":176}}}
\ No newline at end of file
diff --git a/output/_pagefind/pagefind.en_5553d4d197.pf_meta b/output/_pagefind/pagefind.en_5553d4d197.pf_meta
new file mode 100644
index 0000000..645b787
--- /dev/null
+++ b/output/_pagefind/pagefind.en_5553d4d197.pf_meta
Binary files differ
diff --git a/output/_pagefind/pagefind.en_f5308fbdae.pf_meta b/output/_pagefind/pagefind.en_f5308fbdae.pf_meta
deleted file mode 100644
index c3b1421..0000000
--- a/output/_pagefind/pagefind.en_f5308fbdae.pf_meta
+++ /dev/null
Binary files differ
diff --git a/output/events/.htaccess b/output/events/.htaccess
index dda27cb..59111d9 100644
--- a/output/events/.htaccess
+++ b/output/events/.htaccess
@@ -8,7 +8,7 @@
 
 # test: without leading /events
 Redirect /test1.html https://communityovercode.org/?test1.html
-Redirect /test2 https://communityovercode.org/?test1
+Redirect /test1 https://communityovercode.org/?test1
 
 # test: with leading events (but no plain file)
 Redirect /events/test2.html https://communityovercode.org/?test2.html
diff --git a/output/index.html b/output/index.html
index b7344ac..376ba29 100644
--- a/output/index.html
+++ b/output/index.html
@@ -407,48 +407,48 @@
 <div class="tabbable tabs-left visible-md-inline visible-lg-inline">
 <ul class="nav nav-tabs">
 <li class="active">
-<a data-toggle="tab" href="#openoffice">OpenOffice</a>
+<a data-toggle="tab" href="#tapestry">Tapestry</a>
 </li><li>
-<a data-toggle="tab" href="#streampipes">StreamPipes</a>
+<a data-toggle="tab" href="#servicecomb">ServiceComb</a>
 </li><li>
-<a data-toggle="tab" href="#cordova">Cordova</a>
+<a data-toggle="tab" href="#comdev">Community Development</a>
 </li>
 </ul>
 </div>
 </div>
 <div class="col-md-9 col-sm-12">
 <div class="tab-content">
-<div class="tab-pane fade in active" id="openoffice">
+<div class="tab-pane fade in active" id="tapestry">
 <div class="row">
 <div class="col-sm-2">
-<img alt="Logo" class="img-responsive center-block" src="/logos/res/openoffice/default.png"/>
+<img alt="Logo" class="img-responsive center-block" src="/logos/res/tapestry/default.png"/>
 </div>
 <div class="col-sm-10">
-<h4 class="no-btm-margin" id="featured-project-openoffice"><a href="http://openoffice.apache.org/">OpenOffice</a></h4>
-<p>An open-source, office-document productivity suite</p>
-<a class="btn btn-default btn-sm" href="http://openoffice.apache.org/" role="button">Learn More...</a>
+<h4 class="no-btm-margin" id="featured-project-tapestry"><a href="http://tapestry.apache.org/">Tapestry</a></h4>
+<p>Component-based Java Web Application Framework</p>
+<a class="btn btn-default btn-sm" href="http://tapestry.apache.org/" role="button">Learn More...</a>
 </div>
 </div>
-</div><div class="tab-pane fade in" id="streampipes">
+</div><div class="tab-pane fade in" id="servicecomb">
 <div class="row">
 <div class="col-sm-2">
-<img alt="Logo" class="img-responsive center-block" src="/logos/res/streampipes/default.png"/>
+<img alt="Logo" class="img-responsive center-block" src="/logos/res/servicecomb/default.png"/>
 </div>
 <div class="col-sm-10">
-<h4 class="no-btm-margin" id="featured-project-streampipes"><a href="http://streampipes.apache.org">StreamPipes</a></h4>
-<p>a self-service Industrial IoT toolbox which enables non-technical users to connect, analyze and explore IoT data streams</p>
-<a class="btn btn-default btn-sm" href="http://streampipes.apache.org" role="button">Learn More...</a>
+<h4 class="no-btm-margin" id="featured-project-servicecomb"><a href="http://servicecomb.apache.org/">ServiceComb</a></h4>
+<p>a microservice framework that provides a set of tools and components to make development and deployment of cloud applications easier.</p>
+<a class="btn btn-default btn-sm" href="http://servicecomb.apache.org/" role="button">Learn More...</a>
 </div>
 </div>
-</div><div class="tab-pane fade in" id="cordova">
+</div><div class="tab-pane fade in" id="comdev">
 <div class="row">
 <div class="col-sm-2">
-<img alt="Logo" class="img-responsive center-block" src="/logos/res/cordova/default.png"/>
+<img alt="Logo" class="img-responsive center-block" src="/foundation/press/kit/poweredBy/Apache_PoweredBy.svg"/>
 </div>
 <div class="col-sm-10">
-<h4 class="no-btm-margin" id="featured-project-cordova"><a href="http://cordova.apache.org/">Cordova</a></h4>
-<p>Platform for building native mobile applications using HTML, CSS and JavaScript</p>
-<a class="btn btn-default btn-sm" href="http://cordova.apache.org/" role="button">Learn More...</a>
+<h4 class="no-btm-margin" id="featured-project-comdev"><a href="https://community.apache.org/">Community Development</a></h4>
+<p>Resources to help people become involved with Apache projects</p>
+<a class="btn btn-default btn-sm" href="https://community.apache.org/" role="button">Learn More...</a>
 </div>
 </div>
 </div>
@@ -467,48 +467,48 @@
 <div class="tabbable tabs-left visible-md-inline visible-lg-inline">
 <ul class="nav nav-tabs">
 <li class="active">
-<a data-toggle="tab" href="#liminal">Liminal</a>
+<a data-toggle="tab" href="#sdap">SDAP</a>
 </li><li>
-<a data-toggle="tab" href="#celeborn">Celeborn</a>
+<a data-toggle="tab" href="#pegasus">Pegasus</a>
 </li><li>
-<a data-toggle="tab" href="#resilientdb">ResilientDB</a>
+<a data-toggle="tab" href="#ponymail">Pony Mail</a>
 </li>
 </ul>
 </div>
 </div>
 <div class="col-md-9 col-sm-12">
 <div class="tab-content">
-<div class="tab-pane fade in active" id="liminal">
+<div class="tab-pane fade in active" id="sdap">
 <div class="row">
 <div class="col-sm-2">
 <img alt="Logo" class="img-responsive center-block" src="/logos/res/incubator/default.png"/>
 </div>
 <div class="col-sm-10">
-<h4 class="no-btm-margin" id="incubating-project-liminal"><a href="http://liminal.incubator.apache.org/">Liminal</a></h4>
-<p>Apache Liminal is an end-to-end platform for data engineers and scientists, allowing them to build, train and deploy machine learning models in a robust and agile way.</p>
-<a class="btn btn-default btn-sm" href="http://liminal.incubator.apache.org/" role="button">Learn More...</a>
+<h4 class="no-btm-margin" id="incubating-project-sdap"><a href="http://sdap.incubator.apache.org/">SDAP</a></h4>
+<p>SDAP is an integrated data analytic center for Big Science problems.</p>
+<a class="btn btn-default btn-sm" href="http://sdap.incubator.apache.org/" role="button">Learn More...</a>
 </div>
 </div>
-</div><div class="tab-pane fade in" id="celeborn">
+</div><div class="tab-pane fade in" id="pegasus">
 <div class="row">
 <div class="col-sm-2">
-<img alt="Logo" class="img-responsive center-block" src="/logos/res/celeborn/default.png"/>
+<img alt="Logo" class="img-responsive center-block" src="/logos/res/pegasus/default.png"/>
 </div>
 <div class="col-sm-10">
-<h4 class="no-btm-margin" id="incubating-project-celeborn"><a href="http://celeborn.incubator.apache.org/">Celeborn</a></h4>
-<p>Celeborn is an intermediate data service for big data computing engines to boost performance, stability, and flexibility.</p>
-<a class="btn btn-default btn-sm" href="http://celeborn.incubator.apache.org/" role="button">Learn More...</a>
+<h4 class="no-btm-margin" id="incubating-project-pegasus"><a href="http://pegasus.incubator.apache.org/">Pegasus</a></h4>
+<p>Pegasus is a distributed key-value storage system which is designed to be simple, horizontally scalable, strongly consistent and high-performance.</p>
+<a class="btn btn-default btn-sm" href="http://pegasus.incubator.apache.org/" role="button">Learn More...</a>
 </div>
 </div>
-</div><div class="tab-pane fade in" id="resilientdb">
+</div><div class="tab-pane fade in" id="ponymail">
 <div class="row">
 <div class="col-sm-2">
-<img alt="Logo" class="img-responsive center-block" src="/logos/res/incubator/default.png"/>
+<img alt="Logo" class="img-responsive center-block" src="/logos/res/ponymail/default.png"/>
 </div>
 <div class="col-sm-10">
-<h4 class="no-btm-margin" id="incubating-project-resilientdb"><a href="http://resilientdb.incubator.apache.org/">ResilientDB</a></h4>
-<p>ResilientDB is a distributed blockchain framework that is open-source, lightweight, modular, and highly performant.</p>
-<a class="btn btn-default btn-sm" href="http://resilientdb.incubator.apache.org/" role="button">Learn More...</a>
+<h4 class="no-btm-margin" id="incubating-project-ponymail"><a href="http://ponymail.incubator.apache.org/">Pony Mail</a></h4>
+<p>Pony Mail is a mail-archiving, archive viewing, and interaction service, that can be integrated with many email platforms.</p>
+<a class="btn btn-default btn-sm" href="http://ponymail.incubator.apache.org/" role="button">Learn More...</a>
 </div>
 </div>
 </div>