diff --git a/content/2020/december/_index.md b/content/2020/december/_index.md
index 7d24bd60c9f8b05257d481532adbdd8317c0d5e0..6ef4fb582b13214b21c83837b740f8bbf30c55ec 100644
--- a/content/2020/december/_index.md
+++ b/content/2020/december/_index.md
@@ -22,7 +22,7 @@ Join us for the launch of Open Research Webinars on Tuesday, December 15, 2020 a
Through a selection of state-of-the-art project presentations and demonstrations, this new series of webinars introduces software research projects that help shape the future of open source software and the IT industry. Co-organized by OW2 and the Eclipse Foundation, the webinars will focus on international partners leveraging open source in European publicly-funded collaborative research and innovation programs.
### Presentations
-[](http://smartclide.eu) [](https://www.reachout-project.eu/)
+[](http://smartclide.eu) [](https://www.reachout-project.eu/)
{{</ events/registration >}}
{{</ grid/section-container >}}
@@ -36,30 +36,8 @@ Through a selection of state-of-the-art project presentations and demonstrations
{{< events/agenda event="december" year="2020" >}}
{{</ grid/section-container >}}
-{{< grid/section-container id="organizing-committee" class="featured-section-row featured-section-row-lighter-bg text-center" isMarkdown="true">}}
-## Co-organized by:
-{{</ grid/section-container >}}
-
-{{< grid/section-container id="organizing-orgs" class="featured-section-row featured-section-row-lighter-bg text-center">}}
-{{< grid/div class="row" isMarkdown="false">}}
-
-{{< grid/div class="col-md-8 padding-bottom-20" isMarkdown="true">}}
-
- [](http://eclipse.org/research)
-{{</ grid/div >}}
-
-{{< grid/div class="col-md-8 padding-bottom-20" isMarkdown="true">}}
-
-{{</ grid/div >}}
-
-
-{{< grid/div class="col-md-8 padding-bottom-20" isMarkdown="true">}}
-
- [](https://www.ow2.org/)
-{{</ grid/div >}}
-
-{{</ grid/div >}}
-{{</ grid/section-container >}}
+{{< co-organizers >}}
+{{< past_events >}}
{{< bootstrap/modal id="eclipsefdn-modal-event-session" >}}
\ No newline at end of file
diff --git a/content/2020/december/images/reachout.png b/content/2020/december/images/reachout.png
new file mode 100644
index 0000000000000000000000000000000000000000..c22cfbfe256ab894caef280792868b84aab3cfd9
Binary files /dev/null and b/content/2020/december/images/reachout.png differ
diff --git a/content/2020/december/images/smartclide.png b/content/2020/december/images/smartclide.png
new file mode 100644
index 0000000000000000000000000000000000000000..32189a9a804218713d60d99cbc51614bf4f3a669
Binary files /dev/null and b/content/2020/december/images/smartclide.png differ
diff --git a/content/2021/june/_index.md b/content/2021/june/_index.md
index 14be2c080dd68c42b350f8fd5a0d3fcce0ded099..3810e86147f327d878acffbdfb52d2822738bce4 100644
--- a/content/2021/june/_index.md
+++ b/content/2021/june/_index.md
@@ -22,7 +22,7 @@ Join us for our next Open Research Webinars on Tuesday, June 1, 2021 at 16:00 CE
Through a selection of state-of-the-art project presentations and demonstrations, this new series of webinars introduces software research projects that help shape the future of open source software and the IT industry. Co-organized by OW2 and the Eclipse Foundation, the webinars will focus on international partners leveraging open source in European publicly-funded collaborative research and innovation programs.
### Presentations
-[](https://www.eclipse.org/basyx) [](https://www.fasten-project.eu/)
+[](https://www.eclipse.org/basyx) [](https://www.fasten-project.eu/)
{{</ events/registration >}}
{{</ grid/section-container >}}
@@ -35,30 +35,7 @@ Through a selection of state-of-the-art project presentations and demonstrations
{{< events/agenda event="june" year="2021" >}}
{{</ grid/section-container >}}
-{{< grid/section-container id="organizing-committee" class="featured-section-row featured-section-row-lighter-bg text-center" isMarkdown="true">}}
-
-## Co-organized by:
-{{</ grid/section-container >}}
-
-{{< grid/section-container id="organizing-orgs" class="featured-section-row featured-section-row-lighter-bg text-center">}}
-{{< grid/div class="row" isMarkdown="false">}}
-
-{{< grid/div class="col-md-8 padding-bottom-20" isMarkdown="true">}}
-
- [](http://eclipse.org/research)
-{{</ grid/div >}}
-
-{{< grid/div class="col-md-8 padding-bottom-20" isMarkdown="true">}}
-
-{{</ grid/div >}}
-
-
-{{< grid/div class="col-md-8 padding-bottom-20" isMarkdown="true">}}
-
- [](https://www.ow2.org/)
-{{</ grid/div >}}
-
-{{</ grid/div >}}
-{{</ grid/section-container >}}
+{{< co-organizers >}}
+{{< past_events >}}
{{< bootstrap/modal id="eclipsefdn-modal-event-session" >}}
\ No newline at end of file
diff --git a/content/2021/june/images/basyx.png b/content/2021/june/images/basyx.png
index 452a94976539531d6ae8aa696dc953a3e38ec46d..222f06f623d2bd69801820eb98de9687924e568c 100644
Binary files a/content/2021/june/images/basyx.png and b/content/2021/june/images/basyx.png differ
diff --git a/content/2021/june/images/fasten.png b/content/2021/june/images/fasten.png
new file mode 100644
index 0000000000000000000000000000000000000000..808eb19ae5b3ed7211989c1df9aeafcc11a8f34b
Binary files /dev/null and b/content/2021/june/images/fasten.png differ
diff --git a/content/2021/june/images/ow2.png b/content/2021/june/images/ow2.png
deleted file mode 100644
index 5931ccb17d69d6db374d5177c9b53143697c8941..0000000000000000000000000000000000000000
Binary files a/content/2021/june/images/ow2.png and /dev/null differ
diff --git a/content/2021/march/_index.md b/content/2021/march/_index.md
index 196e223865aa041f6af55b8ee2a54a77c3e1a47a..4e4ff3fc0f64f9ed6ea7f2f0fc7455b5c3050b71 100644
--- a/content/2021/march/_index.md
+++ b/content/2021/march/_index.md
@@ -22,7 +22,7 @@ Join us for our next Open Research Webinars on Thursday, March 4, 2021 at 16:00
Through a selection of state-of-the-art project presentations and demonstrations, this new series of webinars introduces software research projects that help shape the future of open source software and the IT industry. Co-organized by OW2 and the Eclipse Foundation, the webinars will focus on international partners leveraging open source in European publicly-funded collaborative research and innovation programs.
### Presentations
-[](https://www.decoder-project.eu) [](https://www.pdp4e-project.eu/)
+[](https://www.decoder-project.eu) [](https://www.pdp4e-project.eu/)
{{</ events/registration >}}
{{</ grid/section-container >}}
@@ -35,30 +35,8 @@ Through a selection of state-of-the-art project presentations and demonstrations
{{< events/agenda event="march" year="2021" >}}
{{</ grid/section-container >}}
-{{< grid/section-container id="organizing-committee" class="featured-section-row featured-section-row-lighter-bg text-center" isMarkdown="true">}}
-## Co-organized by:
-{{</ grid/section-container >}}
-
-{{< grid/section-container id="organizing-orgs" class="featured-section-row featured-section-row-lighter-bg text-center">}}
-{{< grid/div class="row" isMarkdown="false">}}
-
-{{< grid/div class="col-md-8 padding-bottom-20" isMarkdown="true">}}
-
- [](http://eclipse.org/research)
-{{</ grid/div >}}
-
-{{< grid/div class="col-md-8 padding-bottom-20" isMarkdown="true">}}
-
-{{</ grid/div >}}
-
-
-{{< grid/div class="col-md-8 padding-bottom-20" isMarkdown="true">}}
-
- [](https://www.ow2.org/)
-{{</ grid/div >}}
-
-{{</ grid/div >}}
-{{</ grid/section-container >}}
+{{< co-organizers >}}
+{{< past_events >}}
{{< bootstrap/modal id="eclipsefdn-modal-event-session" >}}
\ No newline at end of file
diff --git a/content/2021/march/images/decoder.png b/content/2021/march/images/decoder.png
new file mode 100644
index 0000000000000000000000000000000000000000..3337978655e22cbfcb31affd9c8d36e68bd20b45
Binary files /dev/null and b/content/2021/march/images/decoder.png differ
diff --git a/content/2021/march/images/eclipse_logo.png b/content/2021/march/images/eclipse_logo.png
deleted file mode 100644
index d496f41d06fba5155ac4c55257dd271c214dbb36..0000000000000000000000000000000000000000
Binary files a/content/2021/march/images/eclipse_logo.png and /dev/null differ
diff --git a/content/2021/march/images/ow2.png b/content/2021/march/images/ow2.png
deleted file mode 100644
index 5931ccb17d69d6db374d5177c9b53143697c8941..0000000000000000000000000000000000000000
Binary files a/content/2021/march/images/ow2.png and /dev/null differ
diff --git a/content/2021/march/images/pdp4e.png b/content/2021/march/images/pdp4e.png
new file mode 100644
index 0000000000000000000000000000000000000000..905856e62c6b19819a15912357276e87316371c2
Binary files /dev/null and b/content/2021/march/images/pdp4e.png differ
diff --git a/content/2021/september/_index.md b/content/2021/september/_index.md
index ce189b0cbe8885a45f5c9d2d875974fb678ddef6..a77cbeda203f3763cd9ba4d0a797a04bbb04a720 100644
--- a/content/2021/september/_index.md
+++ b/content/2021/september/_index.md
@@ -35,30 +35,7 @@ Through a selection of state-of-the-art project presentations and demonstrations
{{< events/agenda event="september" year="2021" >}}
{{</ grid/section-container >}}
-{{< grid/section-container id="organizing-committee" class="featured-section-row featured-section-row-lighter-bg text-center" isMarkdown="true">}}
-
-## Co-organized by:
-{{</ grid/section-container >}}
-
-{{< grid/section-container id="organizing-orgs" class="featured-section-row featured-section-row-lighter-bg text-center">}}
-{{< grid/div class="row" isMarkdown="false">}}
-
-{{< grid/div class="col-md-8 padding-bottom-20" isMarkdown="true">}}
-
- [](http://eclipse.org/research)
-{{</ grid/div >}}
-
-{{< grid/div class="col-md-8 padding-bottom-20" isMarkdown="true">}}
-
-{{</ grid/div >}}
-
-
-{{< grid/div class="col-md-8 padding-bottom-20" isMarkdown="true">}}
-
- [](https://www.ow2.org/)
-{{</ grid/div >}}
-
-{{</ grid/div >}}
-{{</ grid/section-container >}}
+{{< co-organizers >}}
+{{< past_events >}}
{{< bootstrap/modal id="eclipsefdn-modal-event-session" >}}
\ No newline at end of file
diff --git a/content/2021/september/images/activeeon.png b/content/2021/september/images/activeeon.png
index 04665c68786dbe92631b8566e423454ad8239842..8ce57de52cf09a0181d96b72659a9d69118d2a14 100644
Binary files a/content/2021/september/images/activeeon.png and b/content/2021/september/images/activeeon.png differ
diff --git a/content/2021/september/images/capra.png b/content/2021/september/images/capra.png
index b6f176ebaea9db09ae194a367fdf7842fe639282..a8815aba75b23ae49453b20ab910461d1097e372 100644
Binary files a/content/2021/september/images/capra.png and b/content/2021/september/images/capra.png differ
diff --git a/content/2021/september/images/eclipse_logo.png b/content/2021/september/images/eclipse_logo.png
deleted file mode 100644
index d496f41d06fba5155ac4c55257dd271c214dbb36..0000000000000000000000000000000000000000
Binary files a/content/2021/september/images/eclipse_logo.png and /dev/null differ
diff --git a/content/2021/september/images/ow2.png b/content/2021/september/images/ow2.png
deleted file mode 100644
index 5931ccb17d69d6db374d5177c9b53143697c8941..0000000000000000000000000000000000000000
Binary files a/content/2021/september/images/ow2.png and /dev/null differ
diff --git a/content/_index.md b/content/_index.md
index 2022f5d51cf17929b7763783214374fc9a8deb67..6ffdde940a770d9bda377e80efee7422cae26827 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -19,18 +19,28 @@ Through a selection of state-of-the-art project presentations and demonstrations
{{</ grid/section-container >}}
{{</ grid/section-container >}}
-{{< active-events >}}
+{{< grid/section-container id="about" class="featured-section-row featured-section-row-lighter-bg" >}}
+{{< grid/section-container class="featured-section-row text-center">}}
+
+<h2>Upcoming Event:</h2>
+<h1 align="center">January 18, 2022</h1>
+
+{{</ grid/section-container >}}
+{{</ grid/section-container >}}
+
{{< grid/section-container id="about" class="featured-section-row featured-section-row-lighter-bg" >}}
{{< grid/section-container class="featured-section-row text-center">}}
<h2>Presented projects<h2>
-<a href="2021/june"><img src="2021/june/images/basyx.png" width="200" alt="BaSyx"></a>
-<a href="2021/june"><img src="2021/june/images/fasten-squared-aligned.png" width="200" alt="FASTEN"></a>
-<a href="2021/march"><img src="2021/march/images/decoder-squared-aligned.png" width="200" alt="DECODER"></a>
-<a href="2021/march"><img src="2021/march/images/pdp4e-squared-aligned.png" width="200" alt="PDP4E"></a>
-<a href="2020/december"><img src="2020/december/images/smartclide-squared-aligned.png" width="200" alt="SmartCLIDE"></a>
-<a href="2020/december"><img src="2020/december/images/reachout-squared-aligned.png" width="200" alt="ReachOut!"></a>
+<a href="2021/september"><img src="2021/september/images/activeeon.png" width="100" alt="ActiveEon"></a>
+<a href="2021/june"><img src="2021/june/images/basyx.png" width="100" alt="BaSyx"></a>
+<a href="2021/september"><img src="2021/september/images/capra.png" width="100" alt="capra"></a>
+<a href="2021/march"><img src="2021/march/images/decoder.png" width="100" alt="DECODER"></a>
+<a href="2021/june"><img src="2021/june/images/fasten.png" width="100" alt="FASTEN"></a>
+<a href="2021/march"><img src="2021/march/images/pdp4e.png" width="100" alt="PDP4E"></a>
+<a href="2020/december"><img src="2020/december/images/reachout.png" width="100" alt="ReachOut!"></a>
+<a href="2020/december"><img src="2020/december/images/smartclide.png" width="100" alt="SmartCLIDE"></a>
{{</ grid/section-container >}}
{{</ grid/section-container >}}
diff --git a/content/2020/december/images/eclipse_logo.png b/content/images/logo/eclipse_logo.png
similarity index 100%
rename from content/2020/december/images/eclipse_logo.png
rename to content/images/logo/eclipse_logo.png
diff --git a/content/images/logo/ow2.png b/content/images/logo/ow2.png
index 837f616ce3f4dc35922a7b00fbabbad3ede7ef99..5931ccb17d69d6db374d5177c9b53143697c8941 100644
Binary files a/content/images/logo/ow2.png and b/content/images/logo/ow2.png differ
diff --git a/layouts/shortcodes/co-organizers.html b/layouts/shortcodes/co-organizers.html
new file mode 100644
index 0000000000000000000000000000000000000000..43a22c0c71831ccc782afb7d2e8d9c05edf9944e
--- /dev/null
+++ b/layouts/shortcodes/co-organizers.html
@@ -0,0 +1,18 @@
+{{$currLang:=.Page.Lang }}
+{{$langBase:=index .Site.Data $currLang}}
+<section class="container">
+<div class="featured-section-row featured-section-row-lighter-bg text-center">
+ <h1>Co-organized by</h1>
+ <div class="row">
+ <div class="col-md-8 padding-bottom-20">
+ <a href="https://eclipse.org/research"><img src="/images/logo/eclipse_logo.png" width="200" alt="Research@Eclipse"></a>
+ </div>
+ <div class="col-md-8 padding-bottom-20">
+
+ </div>
+ <div class="col-md-8 padding-bottom-20">
+ <a href="https://www.ow2.org/"><img src="/images/logo/ow2.png" width="200" alt="OW2"></a>
+ </div>
+ </div>
+</div>
+</section>
\ No newline at end of file
diff --git a/resources-backup/activeeon.png b/resources-backup/activeeon.png
new file mode 100644
index 0000000000000000000000000000000000000000..04665c68786dbe92631b8566e423454ad8239842
Binary files /dev/null and b/resources-backup/activeeon.png differ
diff --git a/content/2021/june/images/basyx-squared-aligned.png b/resources-backup/basyx-squared-aligned.png
similarity index 100%
rename from content/2021/june/images/basyx-squared-aligned.png
rename to resources-backup/basyx-squared-aligned.png
diff --git a/resources-backup/basyx.png b/resources-backup/basyx.png
new file mode 100644
index 0000000000000000000000000000000000000000..452a94976539531d6ae8aa696dc953a3e38ec46d
Binary files /dev/null and b/resources-backup/basyx.png differ
diff --git a/resources-backup/capra.png b/resources-backup/capra.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6f176ebaea9db09ae194a367fdf7842fe639282
Binary files /dev/null and b/resources-backup/capra.png differ
diff --git a/content/2021/march/images/decoder-squared-aligned.png b/resources-backup/decoder-squared-aligned.png
similarity index 100%
rename from content/2021/march/images/decoder-squared-aligned.png
rename to resources-backup/decoder-squared-aligned.png
diff --git a/content/2021/march/images/decoder_logo.png b/resources-backup/decoder_logo.png
similarity index 100%
rename from content/2021/march/images/decoder_logo.png
rename to resources-backup/decoder_logo.png
diff --git a/content/2021/june/images/eclipse_logo.png b/resources-backup/eclipse_logo.png
similarity index 100%
rename from content/2021/june/images/eclipse_logo.png
rename to resources-backup/eclipse_logo.png
diff --git a/content/2021/june/images/fabos-squared-aligned.png b/resources-backup/fabos-squared-aligned.png
similarity index 100%
rename from content/2021/june/images/fabos-squared-aligned.png
rename to resources-backup/fabos-squared-aligned.png
diff --git a/content/2021/june/images/fasten-squared-aligned.png b/resources-backup/fasten-squared-aligned.png
similarity index 100%
rename from content/2021/june/images/fasten-squared-aligned.png
rename to resources-backup/fasten-squared-aligned.png
diff --git a/content/2020/december/images/ow2.png b/resources-backup/ow2.png
similarity index 100%
rename from content/2020/december/images/ow2.png
rename to resources-backup/ow2.png
diff --git a/content/2021/september/images/panorama-capra.png b/resources-backup/panorama-capra.png
similarity index 100%
rename from content/2021/september/images/panorama-capra.png
rename to resources-backup/panorama-capra.png
diff --git a/content/2021/september/images/panorama.png b/resources-backup/panorama.png
similarity index 100%
rename from content/2021/september/images/panorama.png
rename to resources-backup/panorama.png
diff --git a/content/2021/march/images/pdp4e-squared-aligned.png b/resources-backup/pdp4e-squared-aligned.png
similarity index 100%
rename from content/2021/march/images/pdp4e-squared-aligned.png
rename to resources-backup/pdp4e-squared-aligned.png
diff --git a/content/2020/december/images/reachout-squared-aligned.png b/resources-backup/reachout-squared-aligned.png
similarity index 100%
rename from content/2020/december/images/reachout-squared-aligned.png
rename to resources-backup/reachout-squared-aligned.png
diff --git a/content/2020/december/images/smartclide-squared-aligned.png b/resources-backup/smartclide-squared-aligned.png
similarity index 100%
rename from content/2020/december/images/smartclide-squared-aligned.png
rename to resources-backup/smartclide-squared-aligned.png