diff --git a/boilerplate.en.xhtml b/boilerplate.en.xhtml
index 08fbc3cafa..822ab9136a 100644
--- a/boilerplate.en.xhtml
+++ b/boilerplate.en.xhtml
@@ -16,7 +16,19 @@
     </p>
   </body>
 
-  <!--Please update the tags, discussion link (here you need to replace XXX with the number of the discussion link) and the image url + alt text -->  
+  <!--
+    Please update the tags, discussion link (here you need to replace XXX with the number of the discussion link)
+    and the image url + alt text. Some tags have special meanings:
+  
+    key "front-page" ............................... The article will be on the front-page
+    key "highlight" ................................ The article will be in the highlight section on the front-page
+    key "press" ...... should be at 1st position ... The article will be on the press page, if it is also on the front-page
+                                                     and the highlight tag is used, this will define the border color
+    key "news" ....... should be at 1st position ... if the highlight tag is used, this will define the border color
+    key "community" .. should be at 1st position ... if the highlight tag is used, this will define the border color
+    key "podcast" .... should be at 1st position ... if the highlight tag is used, this will define the border color
+    key "newsletter" . should be at 1st position ... if the highlight tag is used, this will define the border color
+  -->  
 <!--
 <tags>
 	 <tag key="front-page"/>
diff --git a/build/xslt/tags.xsl b/build/xslt/tags.xsl
index bc4ae5c3b7..dc7912afef 100644
--- a/build/xslt/tags.xsl
+++ b/build/xslt/tags.xsl
@@ -8,7 +8,7 @@
   <xsl:template match="tags">
     <xsl:element name="ul">
       <xsl:attribute name="class">tags</xsl:attribute>
-      <xsl:for-each select="tag[not(@key='front-page') and not(@key='press')]">
+      <xsl:for-each select="tag[not(@key='front-page') and not(@key='press') and not(@key='highlights')]">
         <xsl:element name="li">
           <xsl:element name="a">
             <xsl:attribute name="href">
diff --git a/global/data/modules/banner-subscribe-box.de.xml b/global/data/modules/banner-subscribe-box.de.xml
new file mode 100644
index 0000000000..ab89e6f16d
--- /dev/null
+++ b/global/data/modules/banner-subscribe-box.de.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<data>
+  <version>1</version>
+
+  <module>
+    <div class="banner-subscribe-box">
+      <p>
+        Unseren Experten informieren Sie zu aktuellen Neuigkeiten,
+        Veranstaltungen, Aktivitäten und wie Sie dazu beitragen können.
+        <span style="font-size:0.8em">(Unsere&#160;<a href="/about/legal/imprint.html#id-privacy-policy"><span style="color:white; text-decoration: underline;">Datenschutzrichtlinie</span></a>)</span>
+      </p>
+
+      <form class="form" method="post" action="https://my.fsfe.org/subscribe">
+        <input type="hidden" name="language" value="de"/>
+        <input type="input" style="display: none !important" name="password" tabindex="-1" autocomplete="off"/>
+        <div class="form-group">
+          <input type="text" class="form-control" name="name" placeholder="Ihr Name" required="required"/>
+        </div>
+        <div class="form-group">
+          <input type="email" class="form-control" name="email1" placeholder="Ihre E-Mail-Adresse" required="required"/>
+        </div>
+        <fsfe-cd-referrer-input/>
+        <input type="hidden" name="wants_info" value="yes"/>
+        <input type="hidden" name="wants_newsletter_info" value="yes"/>
+        <input type="hidden" name="category" value="i"/>
+        <button class="btn btn-default" type="submit">Auf dem Laufenden bleiben</button>
+      </form>
+    </div>
+  </module>
+</data>
diff --git a/global/data/modules/banner-subscribe-box.el.xml b/global/data/modules/banner-subscribe-box.el.xml
new file mode 100644
index 0000000000..e75c8aec16
--- /dev/null
+++ b/global/data/modules/banner-subscribe-box.el.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<data>
+  <version>1</version>
+
+  <module>
+    <div class="banner-subscribe-box">
+      <p>
+        Εγγραφείτε στις ενημερώσεις μας μέσω ηλεκτρονικού ταχυδρομείου. Οι ειδικοί μας σας ενημερώνουν για τα τρέχοντα νέα, γεγονότα, δράσεις και πως να συνεισφέρετε. <span style="font-size:0.8em">(Η&#160;<a href="/about/legal/imprint.html#id-privacy-policy"><span style="color:white; text-decoration: underline;">Πολιτική&#160;ιδιωτικότητας</span></a>)</span>
+      </p>
+
+      <form class="form" method="post" action="https://my.fsfe.org/subscribe">
+        <input type="hidden" name="language" value="el"/>
+        <input type="input" style="display: none !important" name="password" tabindex="-1" autocomplete="off"/>
+        <div class="form-group">
+          <input type="text" class="form-control" name="name" placeholder="Το όνομα σου" required="required"/>
+        </div>
+        <div class="form-group">
+          <input type="email" class="form-control" name="email1" placeholder="Το email σου" required="required"/>
+        </div>
+        <fsfe-cd-referrer-input/>
+        <input type="hidden" name="wants_info" value="yes"/>
+        <input type="hidden" name="wants_newsletter_info" value="yes"/>
+        <input type="hidden" name="category" value="i"/>
+        <button class="btn btn-default" type="submit">Να ενημερώνομαι</button>
+      </form>
+    </div>
+  </module>
+</data>
diff --git a/global/data/modules/banner-subscribe-box.en.xml b/global/data/modules/banner-subscribe-box.en.xml
new file mode 100644
index 0000000000..6e8cefa084
--- /dev/null
+++ b/global/data/modules/banner-subscribe-box.en.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<data>
+  <version>1</version>
+
+  <module>
+    <div class="banner-subscribe-box">
+      <p>
+        Subscribe to our email updates. Our experts inform you about current
+        news, events, activities, and how you can contribute. <span style="font-size:0.8em">(Our&#160;<a href="/about/legal/imprint.html#id-privacy-policy"><span style="color:white; text-decoration: underline;">Privacy&#160;Policy</span></a>)</span>
+      </p>
+
+      <form class="form" method="post" action="https://my.fsfe.org/subscribe">
+        <input type="hidden" name="language" value="en"/>
+        <input type="input" style="display: none !important" name="password" tabindex="-1" autocomplete="off"/>
+        <div class="form-group">
+          <input type="text" class="form-control" name="name" placeholder="Your name" required="required"/>
+        </div>
+        <div class="form-group">
+          <input type="email" class="form-control" name="email1" placeholder="Your email address" required="required"/>
+        </div>
+        <fsfe-cd-referrer-input/>
+        <input type="hidden" name="wants_info" value="yes"/>
+        <input type="hidden" name="wants_newsletter_info" value="yes"/>
+        <input type="hidden" name="category" value="i"/>
+        <button class="btn btn-default" type="submit">Stay informed</button>
+      </form>
+    </div>
+  </module>
+</data>
diff --git a/global/data/modules/banner-subscribe-box.es.xml b/global/data/modules/banner-subscribe-box.es.xml
new file mode 100644
index 0000000000..2a5550482a
--- /dev/null
+++ b/global/data/modules/banner-subscribe-box.es.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<data>
+  <version>1</version>
+
+  <module>
+    <div class="banner-subscribe-box">
+      <p>
+        Suscríbete a nuestras actualizaciones por email. Nuestros expertos te informan sobre las noticias de actualidad, eventos, actividades y cómo puedes contribuir. <span style="font-size:0.8em">(Nuestra&#160;<a href="/about/legal/imprint.html#id-privacy-policy"><span style="color:white; text-decoration: underline;">Política&#160;de Privacidad</span></a>)</span>
+      </p>
+
+      <form class="form" method="post" action="https://my.fsfe.org/subscribe">
+        <input type="hidden" name="language" value="es"/>
+        <input type="input" style="display: none !important" name="password" tabindex="-1" autocomplete="off"/>
+        <div class="form-group">
+          <input type="text" class="form-control" name="name" placeholder="Tu Nombre" required="required"/>
+        </div>
+        <div class="form-group">
+          <input type="email" class="form-control" name="email1" placeholder="Tu correo electrónico" required="required"/>
+        </div>
+        <fsfe-cd-referrer-input/>
+        <input type="hidden" name="wants_info" value="yes"/>
+        <input type="hidden" name="wants_newsletter_info" value="yes"/>
+        <input type="hidden" name="category" value="i"/>
+        <button class="btn btn-default" type="submit">Mantente informado</button>
+      </form>
+    </div>
+  </module>
+</data>
diff --git a/global/data/modules/banner-subscribe-box.fr.xml b/global/data/modules/banner-subscribe-box.fr.xml
new file mode 100644
index 0000000000..57a8a6b365
--- /dev/null
+++ b/global/data/modules/banner-subscribe-box.fr.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<data>
+  <version>1</version>
+
+  <module>
+    <div class="banner-subscribe-box">
+      <p>
+        Recevez nos informations par email. Nos experts vous informent sur les
+        dernières actualités, événements, activités, et comment vous pouvez y contribuer.
+        <span style="font-size:0.8em">(Notre&#160;<a href="/about/legal/imprint.html#id-privacy-policy"><span style="color:white; text-decoration: underline;">Politique de &#160;confidentialité</span></a>)</span>
+      </p>
+
+      <form class="form" method="post" action="https://my.fsfe.org/subscribe">
+        <input type="hidden" name="language" value="fr"/>
+        <input type="input" style="display: none !important" name="password" tabindex="-1" autocomplete="off"/>
+        <div class="form-group">
+          <input type="text" class="form-control" name="name" placeholder="Votre nom" required="required"/>
+        </div>
+        <div class="form-group">
+          <input type="email" class="form-control" name="email1" placeholder="Votre adresse mail" required="required"/>
+        </div>
+        <fsfe-cd-referrer-input/>
+        <input type="hidden" name="wants_info" value="yes"/>
+        <input type="hidden" name="wants_newsletter_info" value="yes"/>
+        <input type="hidden" name="category" value="i"/>
+        <button class="btn btn-default" type="submit">Informez-vous</button>
+      </form>
+    </div>
+  </module>
+</data>
diff --git a/global/data/modules/banner-subscribe-box.it.xml b/global/data/modules/banner-subscribe-box.it.xml
new file mode 100644
index 0000000000..d7c4e6206e
--- /dev/null
+++ b/global/data/modules/banner-subscribe-box.it.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<data>
+  <version>1</version>
+
+  <module>
+    <div class="banner-subscribe-box">
+      <p>
+        Iscriviti ai nostri aggiornamenti per email. I nostri esperti ti
+        informeranno sulle notizie più recenti, gli eventi, le attività e su come partecipare <span style="font-size:0.8em">(la nostra <a href="/about/legal/imprint.html#id-privacy-policy"><span style="color:white; text-decoration: underline;">Privacy Policy</span></a>)</span>.
+      </p>
+
+      <form class="form" method="post" action="https://my.fsfe.org/subscribe">
+        <input type="hidden" name="language" value="it"/>
+        <input type="input" style="display: none !important" name="password" tabindex="-1" autocomplete="off"/>
+        <div class="form-group">
+          <input type="text" class="form-control" name="name" placeholder="Il tuo nome" required="required"/>
+        </div>
+        <div class="form-group">
+          <input type="email" class="form-control" name="email1" placeholder="Il tuo indirizzo email" required="required"/>
+        </div>
+        <fsfe-cd-referrer-input/>
+        <input type="hidden" name="wants_info" value="yes"/>
+        <input type="hidden" name="wants_newsletter_info" value="yes"/>
+        <input type="hidden" name="category" value="i"/>
+        <button class="btn btn-default" type="submit">Voglio rimanere informato</button>
+      </form>
+    </div>
+  </module>
+</data>
diff --git a/global/data/modules/banner-subscribe-box.nl.xml b/global/data/modules/banner-subscribe-box.nl.xml
new file mode 100644
index 0000000000..8b67a18f58
--- /dev/null
+++ b/global/data/modules/banner-subscribe-box.nl.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<data>
+  <version>1</version>
+
+  <module>
+    <div class="banner-subscribe-box">
+      <p>
+        Abonneer u op onze e-mailupdates. Onze experts informeren u over het laatste nieuws, evenementen, activiteiten en hoe u kunt bijdragen. <span style="font-size:0.8em">(Ons&#160;<a href="/about/legal/imprint.html#id-privacy-policy"><span style="color:white; text-decoration: underline;">privacbeleid</span></a>)</span>
+      </p>
+
+      <form class="form" method="post" action="https://my.fsfe.org/subscribe">
+        <input type="hidden" name="language" value="nl"/>
+        <input type="input" style="display: none !important" name="password" tabindex="-1" autocomplete="off"/>
+        <div class="form-group">
+          <input type="text" class="form-control" name="name" placeholder="Uw naam" required="required"/>
+        </div>
+        <div class="form-group">
+          <input type="email" class="form-control" name="email1" placeholder="Uw e-mailadres" required="required"/>
+        </div>
+        <fsfe-cd-referrer-input/>
+        <input type="hidden" name="wants_info" value="yes"/>
+        <input type="hidden" name="wants_newsletter_info" value="yes"/>
+        <input type="hidden" name="category" value="i"/>
+        <button class="btn btn-default" type="submit">Blijf op de hoogte</button>
+      </form>
+    </div>
+  </module>
+</data>
diff --git a/global/data/modules/banner-subscribe-box.pt.xml b/global/data/modules/banner-subscribe-box.pt.xml
new file mode 100644
index 0000000000..135fdbc963
--- /dev/null
+++ b/global/data/modules/banner-subscribe-box.pt.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<data>
+  <version>1</version>
+
+  <module>
+    <div class="banner-subscribe-box">
+      <p>
+        Subscreva às nossas actualizações por e-mail. Os nossos peritos mantém-no
+        informado sobre as novidades, eventos, actividades e como pode contribuir.
+        <span style="font-size:0.8em">(A nossa&#160;<a href="/about/legal/imprint.html#id-privacy-policy"><span style="color:white; text-decoration: underline;">Política de&#160;Privacidade</span></a>)</span>
+      </p>
+
+      <form class="form" method="post" action="https://my.fsfe.org/subscribe">
+        <input type="hidden" name="language" value="pt"/>
+        <input type="input" style="display: none !important" name="password" tabindex="-1" autocomplete="off"/>
+        <div class="form-group">
+          <input type="text" class="form-control" name="name" placeholder="O seu nome" required="required"/>
+        </div>
+        <div class="form-group">
+          <input type="email" class="form-control" name="email1" placeholder="O seu endereço de email" required="required"/>
+        </div>
+        <fsfe-cd-referrer-input/>
+        <input type="hidden" name="wants_info" value="yes"/>
+        <input type="hidden" name="wants_newsletter_info" value="yes"/>
+        <input type="hidden" name="category" value="i"/>
+        <button class="btn btn-default" type="submit">Mantenha-me informado(a)</button>
+      </form>
+    </div>
+  </module>
+</data>
diff --git a/index.cs.xhtml b/index.cs.xhtml
index f34b0403e0..d6f293b199 100644
--- a/index.cs.xhtml
+++ b/index.cs.xhtml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <html>
-  <version>2</version>
+  <version>3</version>
 
   <head>
     <title>FSFE - Free Software Foundation Europe</title>
@@ -22,16 +22,31 @@
       </p>
     </div>
 
-    <h2>
-      Naše zprávy
-      <a class="learn-more" href="/news/index.html">Dozvědět se více...</a>
-    </h2>
-
-    <div class="news">
-      <dynamic-content-news/>
+    <div class="press">
+      <dynamic-content-highlights />
     </div>
 
-    <module id="banner-subscribe"/>
+    <div class="three-columns">
+      <div class="column news">
+        <h2>
+          Naše zprávy<br />
+          <a class="learn-more" href="/news/index.html">Dozvědět se více...</a>
+        </h2>
+        <dynamic-content-news />
+      </div>
+      <div class="column subscribe">
+        <module id="banner-subscribe-box" />
+      </div>
+      <div class="column events">
+        <h2>
+          Události<br />
+          <a class="learn-more" href="/events/events.html">Zobrazit všechny události...</a>
+        </h2>
+        <dynamic-content-events />
+      </div>
+    </div>
+
+    <!-- module id="banner-subscribe" //-->
 
     <h2>
       Naše komunita
@@ -44,8 +59,6 @@
 
     <module id="banner-become-supporter"/>
 
-    <h2>Jak nás můžete podpořit</h2>
-
     <div class="next-steps">
       <div class="column">
         <h3>Informační materiál</h3>
@@ -57,14 +70,6 @@
         </p>
       </div>
 
-      <div class="column events">
-        <h3>Události</h3>
-        <dynamic-content-events/>
-        <p>
-          <a class="learn-more" href="/events/events.html">Zobrazit všechny události...</a>
-        </p>
-      </div>
-
       <div class="column">
         <h3>Zboží</h3>
         <a href="/order/index.html">
diff --git a/index.de.xhtml b/index.de.xhtml
index c0de151fdb..e5e6d6f95c 100644
--- a/index.de.xhtml
+++ b/index.de.xhtml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <html>
-  <version>2</version>
+  <version>3</version>
 
   <head>
     <title>FSFE - Free Software Foundation Europe</title>
@@ -26,16 +26,31 @@
       </p>
     </div>
 
-    <h2>
-      Neuigkeiten
-      <a class="learn-more" href="/news/index.html">Mehr davon...</a>
-    </h2>
-
-    <div class="news">
-      <dynamic-content-news/>
+    <div class="press">
+      <dynamic-content-highlights />
     </div>
 
-    <module id="banner-subscribe"/>
+    <div class="three-columns">
+      <div class="column news">
+        <h2>
+          Neueste Nachrichten<br />
+          <a class="learn-more" href="/news/index.html">Alle Nachrichten...</a>
+        </h2>
+        <dynamic-content-news />
+      </div>
+      <div class="column subscribe">
+        <module id="banner-subscribe-box" />
+      </div>
+      <div class="column events">
+        <h2>
+          Anstehende Veranstaltungen<br />
+          <a class="learn-more" href="/events/events.html">Alle Veranstaltungen...</a>
+        </h2>
+        <dynamic-content-events />
+      </div>
+    </div>
+
+    <!-- module id="banner-subscribe" //-->
 
     <h2>
       Unsere Gemeinschaft
@@ -48,8 +63,6 @@
 
     <module id="banner-become-supporter"/>
 
-    <h2>Ihre nächsten Schritte</h2>
-
     <div class="next-steps">
       <div class="column">
         <h3>Informationsmaterial</h3>
@@ -61,14 +74,6 @@
         </p>
       </div>
 
-      <div class="column events">
-        <h3>Veranstaltungen</h3>
-        <dynamic-content-events/>
-        <p>
-          <a class="learn-more" href="/events/events.html">Alle Veranstaltungen...</a>
-        </p>
-      </div>
-
       <div class="column">
         <h3>Fanartikel</h3>
         <a href="/order/index.html">
diff --git a/index.el.xhtml b/index.el.xhtml
index 54d8b55865..4e7042c01b 100644
--- a/index.el.xhtml
+++ b/index.el.xhtml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <html>
-  <version>2</version>
+  <version>3</version>
 
   <head>
     <title>FSFE - Free Software Foundation Europe</title>
@@ -25,16 +25,31 @@
       </p>
     </div>
 
-    <h2>
-      Τα τελευταία μας νέα
-      <a class="learn-more" href="/news/index.html">Ανάγνωση περισσότερων...</a>
-    </h2>
-
-    <div class="news">
-      <dynamic-content-news/>
+    <div class="press">
+      <dynamic-content-highlights />
     </div>
 
-    <module id="banner-subscribe"/>
+    <div class="three-columns">
+      <div class="column news">
+        <h2>
+          Πρόσφατα νέα<br />
+          <a class="learn-more" href="/news/index.html">Ανάγνωση περισσότερων...</a>
+        </h2>
+        <dynamic-content-news />
+      </div>
+      <div class="column subscribe">
+        <module id="banner-subscribe-box" />
+      </div>
+      <div class="column events">
+        <h2>
+          Εκδηλώσεις<br />
+          <a class="learn-more" href="/events/events.html">Δείτε όλες τις εκδηλώσεις...</a>
+        </h2>
+        <dynamic-content-events />
+      </div>
+    </div>
+
+    <!-- module id="banner-subscribe" //-->
 
     <h2>
       Η κοινότητα μας
@@ -47,8 +62,6 @@
 
     <module id="banner-become-supporter"/>
 
-    <h2>Τα επόμενα σας βήματα</h2>
-
     <div class="next-steps">
       <div class="column">
         <h3>Πληροφοριακό υλικό</h3>
@@ -60,14 +73,6 @@
         </p>
       </div>
 
-      <div class="column events">
-        <h3>Εκδηλώσεις</h3>
-        <dynamic-content-events/>
-        <p>
-          <a class="learn-more" href="/events/events.html">Δείτε όλες τις εκδηλώσεις...</a>
-        </p>
-      </div>
-
       <div class="column">
         <h3>Εμπορεύματα</h3>
         <a href="/order/index.html">
diff --git a/index.en.xhtml b/index.en.xhtml
index 09a79d1d00..623b2f5515 100644
--- a/index.en.xhtml
+++ b/index.en.xhtml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <html>
-  <version>2</version>
+  <version>3</version>
 
   <head>
     <title>FSFE - Free Software Foundation Europe</title>
@@ -24,16 +24,31 @@
       </p>
     </div>
 
-    <h2>
-      Our Latest News
-      <a class="learn-more" href="/news/index.html">Read more...</a>
-    </h2>
-
-    <div class="news">
-      <dynamic-content-news />
+    <div class="press">
+      <dynamic-content-highlights />
     </div>
 
-    <module id="banner-subscribe" />
+    <div class="three-columns">
+      <div class="column news">
+        <h2>
+          Recent News<br />
+          <a class="learn-more" href="/news/index.html">See all news...</a>
+        </h2>
+        <dynamic-content-news />
+      </div>
+      <div class="column subscribe">
+        <module id="banner-subscribe-box" />
+      </div>
+      <div class="column events">
+        <h2>
+          Upcoming Events<br />
+          <a class="learn-more" href="/events/events.html">See all events...</a>
+        </h2>
+        <dynamic-content-events />
+      </div>
+    </div>
+
+    <!-- module id="banner-subscribe" //-->
 
     <h2>
       Our Community
@@ -46,8 +61,6 @@
 
     <module id="banner-become-supporter" />
 
-    <h2>Your Next Steps</h2>
-
     <div class="next-steps">
       <div class="column">
         <h3>Information material</h3>
@@ -61,14 +74,6 @@
         </p>
       </div>
 
-      <div class="column events">
-        <h3>Events</h3>
-        <dynamic-content-events />
-        <p>
-          <a class="learn-more" href="/events/events.html">See all events...</a>
-        </p>
-      </div>
-
       <div class="column">
         <h3>Merchandise</h3>
         <a href="/order/index.html">
diff --git a/index.es.xhtml b/index.es.xhtml
index 52acb029cd..06fefc3623 100644
--- a/index.es.xhtml
+++ b/index.es.xhtml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <html>
-  <version>2</version>
+  <version>3</version>
 
   <head>
     <title>FSFE - Free Software Foundation Europe</title>
@@ -21,16 +21,31 @@
       </p>
     </div>
 
-    <h2>
-      Nuestras últimas noticias
-      <a class="learn-more" href="/news/index.html">Leer más...</a>
-    </h2>
-
-    <div class="news">
-      <dynamic-content-news/>
+    <div class="press">
+      <dynamic-content-highlights />
     </div>
 
-    <module id="banner-subscribe"/>
+    <div class="three-columns">
+      <div class="column news">
+        <h2>
+          Últimas noticias<br />
+          <a class="learn-more" href="/news/index.html">Ver todos los eventos...</a>
+        </h2>
+        <dynamic-content-news />
+      </div>
+      <div class="column subscribe">
+        <module id="banner-subscribe-box" />
+      </div>
+      <div class="column events">
+        <h2>
+          Próximos eventos<br />
+          <a class="learn-more" href="/events/events.html">Ver todos los eventos...</a>
+        </h2>
+        <dynamic-content-events />
+      </div>
+    </div>
+
+    <!-- module id="banner-subscribe" //-->
 
     <h2>
       Nuestra comunidad
@@ -43,8 +58,6 @@
 
     <module id="banner-become-supporter"/>
 
-    <h2>Tus próximos pasos</h2>
-
     <div class="next-steps">
       <div class="column">
         <h3>Material informativo</h3>
@@ -56,14 +69,6 @@
         </p>
       </div>
 
-      <div class="column events">
-        <h3>Eventos</h3>
-        <dynamic-content-events/>
-        <p>
-          <a class="learn-more" href="/events/events.html">Ver todos los eventos...</a>
-        </p>
-      </div>
-
       <div class="column">
         <h3>Material promocional</h3>
         <a href="/order/index.html">
diff --git a/index.fr.xhtml b/index.fr.xhtml
index 9299f825ad..c7de6eab19 100644
--- a/index.fr.xhtml
+++ b/index.fr.xhtml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <html>
-  <version>2</version>
+  <version>3</version>
 
   <head>
     <title>FSFE - Free Software Foundation Europe</title>
@@ -25,16 +25,31 @@
       </p>
     </div>
 
-    <h2>
-      Nos dernières nouvelles
-      <a class="learn-more" href="/news/index.html">Voir plus...</a>
-    </h2>
-
-    <div class="news">
-      <dynamic-content-news/>
+    <div class="press">
+      <dynamic-content-highlights />
     </div>
 
-    <module id="banner-subscribe"/>
+    <div class="three-columns">
+      <div class="column news">
+        <h2>
+          Nos dernières nouvelles<br />
+          <a class="learn-more" href="/news/index.html">Voir plus...</a>
+        </h2>
+        <dynamic-content-news />
+      </div>
+      <div class="column subscribe">
+        <module id="banner-subscribe-box" />
+      </div>
+      <div class="column events">
+        <h2>
+          Événements<br />
+          <a class="learn-more" href="/events/events.html">Voir tous les événements...</a>
+        </h2>
+        <dynamic-content-events />
+      </div>
+    </div>
+
+    <!-- module id="banner-subscribe" //-->
 
     <h2>
       Notre communauté
@@ -47,8 +62,6 @@
 
     <module id="banner-become-supporter"/>
 
-    <h2>Vos prochaines étapes</h2>
-
     <div class="next-steps">
       <div class="column">
         <h3>Matériel d'information</h3>
@@ -60,14 +73,6 @@
         </p>
       </div>
 
-      <div class="column events">
-        <h3>Événements</h3>
-        <dynamic-content-events/>
-        <p>
-          <a class="learn-more" href="/events/events.html">Voir tous les événements...</a>
-        </p>
-      </div>
-
       <div class="column">
         <h3>Produits</h3>
         <a href="/order/index.html">
diff --git a/index.it.xhtml b/index.it.xhtml
index e4c9351245..b2421f8719 100644
--- a/index.it.xhtml
+++ b/index.it.xhtml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <html>
-  <version>2</version>
+  <version>3</version>
 
   <head>
     <title>FSFE - Free Software Foundation Europe</title>
@@ -25,16 +25,31 @@
       </p>
     </div>
 
-    <h2>
-      Le nostre ultime notizie
-      <a class="learn-more" href="/news/index.html">Leggi tutto...</a>
-    </h2>
-
-    <div class="news">
-      <dynamic-content-news/>
+    <div class="press">
+      <dynamic-content-highlights />
     </div>
 
-    <module id="banner-subscribe"/>
+    <div class="three-columns">
+      <div class="column news">
+        <h2>
+          Ultime notizie<br />
+          <a class="learn-more" href="/news/index.html">Tutte le notizie...</a>
+        </h2>
+        <dynamic-content-news />
+      </div>
+      <div class="column subscribe">
+        <module id="banner-subscribe-box" />
+      </div>
+      <div class="column events">
+        <h2>
+          Prossimi eventi<br />
+          <a class="learn-more" href="/events/events.html">Vedi tutti gli eventi...</a>
+        </h2>
+        <dynamic-content-events />
+      </div>
+    </div>
+
+    <!-- module id="banner-subscribe" //-->
 
     <h2>
       La nostra comunità
@@ -47,8 +62,6 @@
 
     <module id="banner-become-supporter"/>
 
-    <h2>Passi successivi</h2>
-
     <div class="next-steps">
       <div class="column">
         <h3>Materiale informativo</h3>
@@ -60,14 +73,6 @@
         </p>
       </div>
 
-      <div class="column events">
-        <h3>Eventi</h3>
-        <dynamic-content-events/>
-        <p>
-          <a class="learn-more" href="/events/events.html">Vedi tutti gli eventi...</a>
-        </p>
-      </div>
-
       <div class="column">
         <h3>Prodotti</h3>
         <a href="/order/index.html">
diff --git a/index.nl.xhtml b/index.nl.xhtml
index 8ef12511fc..797bbf2afd 100644
--- a/index.nl.xhtml
+++ b/index.nl.xhtml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <html>
-  <version>2</version>
+  <version>3</version>
 
   <head>
     <title>FSFE - Free Software Foundation Europe</title>
@@ -21,16 +21,31 @@
       </p>
     </div>
 
-    <h2>
-      Ons laatste nieuws
-      <a class="learn-more" href="/news/index.html">Nieuwsoverzicht</a>
-    </h2>
-
-    <div class="news">
-      <dynamic-content-news/>
+    <div class="press">
+      <dynamic-content-highlights />
     </div>
 
-    <module id="banner-subscribe"/>
+    <div class="three-columns">
+      <div class="column news">
+        <h2>
+          Ons laatste nieuws<br />
+          <a class="learn-more" href="/news/index.html">Nieuwsoverzicht...</a>
+        </h2>
+        <dynamic-content-news />
+      </div>
+      <div class="column subscribe">
+        <module id="banner-subscribe-box" />
+      </div>
+      <div class="column events">
+        <h2>
+          Evenementen<br />
+          <a class="learn-more" href="/events/events.html">Alle evenementen...</a>
+        </h2>
+        <dynamic-content-events />
+      </div>
+    </div>
+
+    <!-- module id="banner-subscribe" //-->
 
     <h2>
       Onze Gemeenschap
@@ -56,14 +71,6 @@
         </p>
       </div>
 
-      <div class="column events">
-        <h3>Evenementen</h3>
-        <dynamic-content-events/>
-        <p>
-          <a class="learn-more" href="/events/events.html">Alle evenementen...</a>
-        </p>
-      </div>
-
       <div class="column">
         <h3>Fan-artikelen</h3>
         <a href="/order/index.html">
diff --git a/index.pt.xhtml b/index.pt.xhtml
index 45ad78d795..8111aa10a3 100644
--- a/index.pt.xhtml
+++ b/index.pt.xhtml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <html>
-  <version>2</version>
+  <version>3</version>
 
   <head>
     <title>FSFE - Free Software Foundation Europe</title>
@@ -25,16 +25,31 @@
       </p>
     </div>
 
-    <h2>
-      As nossas ultimas notícias
-      <a class="learn-more" href="/news/index.html">Leia mais...</a>
-    </h2>
-
-    <div class="news">
-      <dynamic-content-news/>
+    <div class="press">
+      <dynamic-content-highlights />
     </div>
 
-    <module id="banner-subscribe"/>
+    <div class="three-columns">
+      <div class="column news">
+        <h2>
+          As nossas ultimas notícias<br />
+          <a class="learn-more" href="/news/index.html">Leia mais...</a>
+        </h2>
+        <dynamic-content-news />
+      </div>
+      <div class="column subscribe">
+        <module id="banner-subscribe-box" />
+      </div>
+      <div class="column events">
+        <h2>
+          Eventos<br />
+          <a class="learn-more" href="/events/events.html">Veja todos os eventos...</a>
+        </h2>
+        <dynamic-content-events />
+      </div>
+    </div>
+
+    <!-- module id="banner-subscribe" //-->
 
     <h2>
       A nossa comunidade
@@ -47,8 +62,6 @@
 
     <module id="banner-become-supporter"/>
 
-    <h2>Próximos passos</h2>
-
     <div class="next-steps">
       <div class="column">
         <h3>Material informativo</h3>
@@ -60,14 +73,6 @@
         </p>
       </div>
 
-      <div class="column events">
-        <h3>Eventos</h3>
-        <dynamic-content-events/>
-        <p>
-          <a class="learn-more" href="/events/events.html">Veja todos os eventos...</a>
-        </p>
-      </div>
-
       <div class="column">
         <h3>Material promocional</h3>
         <a href="/order/index.html">
diff --git a/index.tr.xhtml b/index.tr.xhtml
index 838f57048e..6721307a53 100644
--- a/index.tr.xhtml
+++ b/index.tr.xhtml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <html>
-  <version>2</version>
+  <version>3</version>
 
   <head>
     <title>FSFE - Free Software Foundation Europe</title>
@@ -25,16 +25,31 @@
       </p>
     </div>
 
-    <h2>
-      En Son Haberlerimiz
-      <a class="learn-more" href="/news/index.html">Daha fazla okuyun...</a>
-    </h2>
-
-    <div class="news">
-      <dynamic-content-news/>
+    <div class="press">
+      <dynamic-content-highlights />
     </div>
 
-    <module id="banner-subscribe"/>
+    <div class="three-columns">
+      <div class="column news">
+        <h2>
+          En Son Haberlerimiz<br />
+          <a class="learn-more" href="/news/index.html">Daha fazla okuyun...</a>
+        </h2>
+        <dynamic-content-news />
+      </div>
+      <div class="column subscribe">
+        <module id="banner-subscribe-box" />
+      </div>
+      <div class="column events">
+        <h2>
+          Etkinlikler<br />
+          <a class="learn-more" href="/events/events.html">Tüm etkinlikleri gör...</a>
+        </h2>
+        <dynamic-content-events />
+      </div>
+    </div>
+
+    <!-- module id="banner-subscribe" //-->
 
     <h2>
       Topluluğumuz
@@ -47,8 +62,6 @@
 
     <module id="banner-become-supporter"/>
 
-    <h2>Sonraki Adımların</h2>
-
     <div class="next-steps">
       <div class="column">
         <h3>Bilgilendirme materyali</h3>
@@ -60,14 +73,6 @@
         </p>
       </div>
 
-      <div class="column events">
-        <h3>Etkinlikler</h3>
-        <dynamic-content-events/>
-        <p>
-          <a class="learn-more" href="/events/events.html">Tüm etkinlikleri gör...</a>
-        </p>
-      </div>
-
       <div class="column">
         <h3>Mağaza</h3>
         <a href="/order/index.html">
diff --git a/index.uk.xhtml b/index.uk.xhtml
index 38aa926282..f7055e092d 100644
--- a/index.uk.xhtml
+++ b/index.uk.xhtml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <html>
-  <version>2</version>
+  <version>3</version>
 
   <head>
     <title>FSFE - Free Software Foundation Europe</title>
@@ -24,16 +24,31 @@
       </p>
     </div>
 
-    <h2>
-      Наші останні новини
-      <a class="learn-more" href="/news/index.html">Читати більше...</a>
-    </h2>
-
-    <div class="news">
-      <dynamic-content-news />
+    <div class="press">
+      <dynamic-content-highlights />
     </div>
 
-    <module id="banner-subscribe" />
+    <div class="three-columns">
+      <div class="column news">
+        <h2>
+          Наші останні новини<br />
+          <a class="learn-more" href="/news/index.html">Читати більше...</a>
+        </h2>
+        <dynamic-content-news />
+      </div>
+      <div class="column subscribe">
+        <module id="banner-subscribe-box" />
+      </div>
+      <div class="column events">
+        <h2>
+          Події<br />
+          <a class="learn-more" href="/events/events.html">Подивитися всі події...</a>
+        </h2>
+        <dynamic-content-events />
+      </div>
+    </div>
+
+    <!-- module id="banner-subscribe" //-->
 
     <h2>
       Наша спільнота
@@ -46,8 +61,6 @@
 
     <module id="banner-become-supporter" />
 
-    <h2>Ваші наступні кроки</h2>
-
     <div class="next-steps">
       <div class="column">
         <h3>Information material</h3>
@@ -61,14 +74,6 @@
         </p>
       </div>
 
-      <div class="column events">
-        <h3>Події</h3>
-        <dynamic-content-events />
-        <p>
-          <a class="learn-more" href="/events/events.html">Подивитися всі події...</a>
-        </p>
-      </div>
-
       <div class="column">
         <h3>Товари</h3>
         <a href="/order/index.html">
diff --git a/index.xsl b/index.xsl
index 2fe6f582c8..ca310fdbaf 100644
--- a/index.xsl
+++ b/index.xsl
@@ -8,9 +8,10 @@
   <!-- Dynamic list of news items                                           -->
   <!-- ==================================================================== -->
 
-  <xsl:template match="dynamic-content-news">
+  <xsl:template match="dynamic-content-highlights">
     <xsl:for-each select="/buildinfo/document/set/news[
-        translate(@date, '-', '') &lt;= translate(/buildinfo/@date, '-', '')
+        translate(@date, '-', '') &lt;= translate(/buildinfo/@date, '-', '') and
+        tags/tag/@key = 'highlights'
       ]">
       <xsl:sort select="@date" order="descending"/>
       <xsl:if test="position() &lt;= 3">
@@ -21,7 +22,7 @@
 
             <!-- Image (with or without link) -->
             <xsl:element name="div">
-              <xsl:attribute name="class">image</xsl:attribute>
+              <xsl:attribute name="class">image <xsl:value-of select="tags/tag[1]/@key"/></xsl:attribute>
               <xsl:call-template name="news-image"/>
             </xsl:element><!-- div/image -->
 
@@ -32,12 +33,11 @@
               <xsl:element name="h3">
                 <xsl:call-template name="news-title"/>
               </xsl:element><!-- h3 -->
-
               <!-- Date -->
               <xsl:element name="p">
-                <xsl:attribute name="class">date</xsl:attribute>
-                <xsl:call-template name="news-date"/>
-              </xsl:element><!-- p/date -->
+                <xsl:attribute name="class">tag</xsl:attribute>
+                <xsl:value-of select="tags/tag[1]"/>
+              </xsl:element><!-- p/tag -->
 
               <!-- Teaser -->
               <xsl:call-template name="news-teaser"/>
@@ -50,6 +50,32 @@
     </xsl:for-each>
   </xsl:template>
 
+  <xsl:template match="dynamic-content-news">
+    <xsl:for-each select="/buildinfo/document/set/news[
+        translate(@date, '-', '') &lt;= translate(/buildinfo/@date, '-', '')
+      ]">
+      <xsl:sort select="@date" order="descending"/>
+      <xsl:if test="position() &lt;= 3">
+        <xsl:element name="div">
+          <xsl:element name="p">
+            <xsl:attribute name="class">text</xsl:attribute>
+            <xsl:element name="a">
+              <xsl:attribute name="href"><xsl:value-of select="link"/></xsl:attribute>
+              <xsl:value-of select="title"/>
+
+              <xsl:value-of select="news-teaser"/>
+            </xsl:element>
+            <xsl:element name="br"/>
+            <xsl:element name="span">
+              <xsl:attribute name="class">date</xsl:attribute>
+              <xsl:value-of select="@date"/>
+            </xsl:element>
+          </xsl:element>
+        </xsl:element>
+      </xsl:if>
+    </xsl:for-each>
+  </xsl:template>
+
 
   <!-- ==================================================================== -->
   <!-- Dynamic list of testimonial quotes                                   -->
@@ -116,17 +142,21 @@
       ]">
       <xsl:sort select="@start"/>
       <xsl:if test="position() &lt;= 3">
+        <xsl:element name="div">
+          <xsl:attribute name="class">text</xsl:attribute>
+            <!-- Description -->
+            <xsl:element name="p">
+              <xsl:value-of select="title"/>
+              <xsl:element name="br"/>
+              <!-- Date -->
+              <xsl:element name="span">
+                <xsl:attribute name="class">date</xsl:attribute>
+                <xsl:call-template name="event-date"/>
+              </xsl:element><!-- p/date -->
 
-        <!-- Date -->
-        <xsl:element name="p">
-          <xsl:attribute name="class">date</xsl:attribute>
-          <xsl:call-template name="event-date"/>
-        </xsl:element><!-- p/date -->
+            </xsl:element><!-- p -->
 
-        <!-- Description -->
-        <xsl:element name="p">
-          <xsl:value-of select="title"/>
-        </xsl:element><!-- p -->
+          </xsl:element><!-- div/text -->
 
       </xsl:if>
     </xsl:for-each>
diff --git a/look/elements/banners.less b/look/elements/banners.less
index 45a745710e..ec70f3cede 100644
--- a/look/elements/banners.less
+++ b/look/elements/banners.less
@@ -22,6 +22,7 @@
 // Banner asking to subscribe to news updates
 // ----------------------------------------------------------------------------
 
+.banner-subscribe-box,
 .banner-subscribe {
     .banner();
     color: white;
diff --git a/look/pages/frontpage.less b/look/pages/frontpage.less
index 6c4fd0ff66..f9aefedcf6 100644
--- a/look/pages/frontpage.less
+++ b/look/pages/frontpage.less
@@ -75,11 +75,51 @@ body.frontpage {
         }
     }
 
+    // ------------------------------------------------------------------------
+    // Display 2 equal columns side-by-side on larger screens (used 3 times)
+    // ------------------------------------------------------------------------
+
+    .two-columns {
+        .make-row;
+
+        .column {
+            .make-xs-column(12);
+            .make-md-column(6);
+
+            // We maintain our own margins, so suppress the bottom margin
+            // inside the grid.
+            p:last-child {
+                margin-bottom: 0;
+            }
+
+            // If the three boxes are stacked vertically, create some gap
+            // between them as well as some extra gap between the heading and
+            // the first box.
+            @media (max-width: @screen-sm-max) {
+                margin-top: 10px;
+                margin-bottom: 10px;
+
+                &:last-child {
+                    margin-bottom: 0;
+                }
+            }
+            .banner-subscribe {
+                form {
+                    .form-group {
+                        input {
+                            padding: 5px;
+                        }
+                    }    
+                }
+            }
+        }
+    }
+
     // ------------------------------------------------------------------------
     // News section
     // ------------------------------------------------------------------------
 
-    .news {
+    .press {
         .three-columns;
 
         // Show the image to the left on tablet-sized screens, to the top
@@ -110,7 +150,23 @@ body.frontpage {
                 }
             }
         }
-
+        // colorful borders depending on the category of an article
+         
+        .community img {
+            border: 5px solid #d0f400;
+        }
+        .news img {
+            border: 5px solid #6eb53d;
+        }
+        .press img {
+            border: 5px solid #00c1eb;
+        }
+        .podcast img {
+            border: 5px solid #1f80bb;
+        }
+        .newsletter img {
+            border: 5px solid #202e79;
+        }
         // Keep everything except the image in a block and put it where it
         // belongs.
         .text {
@@ -122,8 +178,12 @@ body.frontpage {
             h3 {
                 margin-top: 0;
             }
-
-            .date {
+        }
+   }
+    .press, .news, .events {
+        .text {
+            .date,
+            .tag {
                 .text-muted;
                 .small;
             }
@@ -187,7 +247,7 @@ body.frontpage {
     // ------------------------------------------------------------------------
 
     .next-steps {
-        .three-columns;
+        .two-columns;
         .text-center;
 
         h3 {
diff --git a/news/2024/news-20240307-01.en.xhtml b/news/2024/news-20240307-01.en.xhtml
index 1fbda6f47f..f4f7e949fc 100644
--- a/news/2024/news-20240307-01.en.xhtml
+++ b/news/2024/news-20240307-01.en.xhtml
@@ -151,11 +151,12 @@ control over your devices!</p>
 </body>
 
 <tags>
-  <tag key="front-page"/>
+  <tag key="press">Press Release</tag>
   <tag key="deviceneutrality">Device Neutrality</tag>
   <tag key="policy">European Public Policy</tag>
   <tag key="european-union">European Union</tag>
-  <tag key="press"/>
+  <tag key="front-page"/>
+  <tag key="highlights"/>
  </tags>
 
 <discussion href="https://community.fsfe.org/t/1136" />  
diff --git a/news/2024/news-20240307-01.es.xhtml b/news/2024/news-20240307-01.es.xhtml
index 19e94652fc..0f64220f5b 100644
--- a/news/2024/news-20240307-01.es.xhtml
+++ b/news/2024/news-20240307-01.es.xhtml
@@ -180,12 +180,13 @@ el control sobre sus dispositivos.
 </body>
 
 <tags>
-  <tag key="front-page"/>
+  <tag key="press">Nota de prensa</tag>
   <tag key="deviceneutrality">Device Neutrality</tag>
   <tag key="policy">Política Pública Europea</tag>
   <tag key="european-union">European Union</tag>
-  <tag key="press" />
- </tags>
+  <tag key="front-page"/>
+  <tag key="highlights"/>
+</tags>
 
 <discussion href="https://community.fsfe.org/t/1136" />  
 <image url="https://pics.fsfe.org/uploads/medium/a1/05/58622b1832738c71e85a538cb518.jpeg"
diff --git a/news/2024/news-20240312-01.en.xhtml b/news/2024/news-20240312-01.en.xhtml
index 06b0d0235b..f44c4e0f52 100644
--- a/news/2024/news-20240312-01.en.xhtml
+++ b/news/2024/news-20240312-01.en.xhtml
@@ -68,11 +68,13 @@ Consultant.</p>
 </body>
 
 <tags>
-  <tag key="front-page"/>
+  <tag key="news">News</tag>
   <tag key="policy">European Public Policy</tag>
   <tag key="european-union">European Union</tag>
+  <tag key="front-page"/>
   <tag key="press"/>
- </tags>
+  <tag key="highlights"/>
+</tags>
 
 <discussion href="https://community.fsfe.org/t/1140" />  
 <image url="https://pics.fsfe.org/uploads/medium/0188f091d8cec72a54695659d554d4e1.jpg"
diff --git a/news/2024/news-20240321-01.en.xhtml b/news/2024/news-20240321-01.en.xhtml
index 3262a5ea53..a94f739dcf 100644
--- a/news/2024/news-20240321-01.en.xhtml
+++ b/news/2024/news-20240321-01.en.xhtml
@@ -152,11 +152,13 @@ you!
 </body>
 
 <tags>
-  <tag key="front-page"/>
+  <tag key="news">News</tag>
   <tag key="elections">EU Elections</tag>
   <tag key="european-union">European Union</tag>
   <tag key="pmpc">"Public Money? Public Code!"</tag>
+  <tag key="front-page"/>
   <tag key="press" />
+  <tag key="highlights"/>
  </tags>
 
 <discussion href="https://community.fsfe.org/t/1146" />  
diff --git a/news/2024/news-20240321-01.fr.xhtml b/news/2024/news-20240321-01.fr.xhtml
index a903accf66..5d7c9d7990 100644
--- a/news/2024/news-20240321-01.fr.xhtml
+++ b/news/2024/news-20240321-01.fr.xhtml
@@ -163,11 +163,13 @@ Envisagez de soutenir la FSFE et de faire un don. Merci !
 </body>
 
 <tags>
-  <tag key="front-page"/>
+  <tag key="news">News</tag>
   <tag key="elections">Élections UE</tag>
   <tag key="european-union">Union Européenne</tag>
   <tag key="pmpc">"Argent public ? Code public !"</tag>
+  <tag key="front-page"/>
   <tag key="press" />
+  <tag key="highlights"/>
  </tags>
 
 <discussion href="https://community.fsfe.org/t/1146" />  
diff --git a/news/2024/news-20240515-01.en.xhtml b/news/2024/news-20240515-01.en.xhtml
index b8f9afa668..5f10501f41 100644
--- a/news/2024/news-20240515-01.en.xhtml
+++ b/news/2024/news-20240515-01.en.xhtml
@@ -110,6 +110,8 @@ in different languages, and to encourage others to do so!
 </body>
 
 <tags>
+	<tag key="news" />
+	<tag key="highlights" />
 	<tag key="front-page"/>
 	<tag key="ada-zangemann">Ada and Zangemann</tag>
 	<tag key="community">Community</tag>
diff --git a/news/2024/news-20240515-01.es.xhtml b/news/2024/news-20240515-01.es.xhtml
index 6e9f270911..924909c9f0 100644
--- a/news/2024/news-20240515-01.es.xhtml
+++ b/news/2024/news-20240515-01.es.xhtml
@@ -116,6 +116,8 @@ instituto parisino.</blockquote>
 </body>
 
 <tags>
+	<tag key="news" />
+	<tag key="highlights" />
 	<tag key="front-page"/>
 	<tag key="ada-zangemann">Ada y Zangemann</tag>
 	<tag key="community">Comunidad</tag>
diff --git a/news/2024/news-20240515-01.it.xhtml b/news/2024/news-20240515-01.it.xhtml
index 05843bbe98..e36dd6f72d 100644
--- a/news/2024/news-20240515-01.it.xhtml
+++ b/news/2024/news-20240515-01.it.xhtml
@@ -114,6 +114,8 @@ liceo parigino</blockquote>
 </body>
 
 <tags>
+	<tag key="news" />
+	<tag key="highlights" />
 	<tag key="front-page"/>
 	<tag key="ada-zangemann">Ada e Zangemann</tag>
 	<tag key="community">Comunità</tag>
diff --git a/news/nl/nl-202405.en.xhtml b/news/nl/nl-202405.en.xhtml
index c28008c54a..1cdee1884a 100644
--- a/news/nl/nl-202405.en.xhtml
+++ b/news/nl/nl-202405.en.xhtml
@@ -204,9 +204,10 @@ Ana
     <tag key="dk">Denmark</tag>
     <tag key="berlin">Berlin</tag>
     <tag key="event">Event</tag>
+    <tag key="highlights"/>
 </tags>
 
 <image url="https://pics.fsfe.org/uploads/medium/59/e3/2040157ead41b5d9cc3ffb33ce33.png"
 		alt="Picture collage showing an YH4F illustration, the Ada &amp; Zangemann book with the French award and an image of the LLW registration desk with the LLW logo"/>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/news/nl/nl-202405.es.xhtml b/news/nl/nl-202405.es.xhtml
index 391fbe4eda..204618eeec 100644
--- a/news/nl/nl-202405.es.xhtml
+++ b/news/nl/nl-202405.es.xhtml
@@ -205,8 +205,8 @@ Ana
 
 
 <tags>
-    <tag key="front-page"/>
     <tag key="newsletter">Boletín</tag>
+    <tag key="front-page"/>
     <tag key="llw">Legal Licensing Workshop</tag>
     <tag key="licensing">Licencias</tag>
     <tag key="legal">Legal</tag>
@@ -216,9 +216,10 @@ Ana
     <tag key="dk">Dinamarca</tag>
     <tag key="berlin">Berlin</tag>
     <tag key="event">Evento</tag>
+    <tag key="highlights"/>
 </tags>
 
 <image url="https://pics.fsfe.org/uploads/medium/59/e3/2040157ead41b5d9cc3ffb33ce33.png"
 		alt="Composición de fotos mostrando ilustraciones del YH4F, el libro de Ada &amp; Zangemann con un premio francés y la mesa de registro del LLW con su logotipo"/>
 
-</html>
\ No newline at end of file
+</html>