From 36918b0d9351a7e80d09e46fc2da63a999251446 Mon Sep 17 00:00:00 2001
From: paul <paul@fsfe.org>
Date: Mon, 30 Jun 2014 00:18:27 +0000
Subject: [PATCH] split up several xsl files, externalised rule only used in
 supporter

svn path=/branches/test/; revision=28670
---
 build/xslt/TEMPLATE.xsl             |   14 +
 build/xslt/body_scripts.xsl         |   28 +
 build/xslt/footer_legal.xsl         |   24 +
 build/xslt/footer_sitenav.xsl       |  297 +++++++
 build/xslt/footer_sourcelink.xsl    |   80 ++
 build/xslt/fsfe_body.xsl            | 1170 +--------------------------
 build/xslt/fsfe_document.xsl        |    6 +
 build/xslt/fsfe_followupsection.xsl |   76 ++
 build/xslt/fsfe_mainsection.xsl     |  242 ++++++
 build/xslt/fsfe_nolocal.xsl         |    6 +
 build/xslt/fsfe_pageclass.xsl       |   23 +
 build/xslt/fsfe_pageheader.xsl      |  235 ++++++
 build/xslt/notifications.xsl        |  155 ++++
 build/xslt/translation_list.xsl     |   45 ++
 fsfe.xsl                            |   14 -
 support/default.xsl                 |   13 +
 16 files changed, 1254 insertions(+), 1174 deletions(-)
 create mode 100644 build/xslt/TEMPLATE.xsl
 create mode 100644 build/xslt/body_scripts.xsl
 create mode 100644 build/xslt/footer_legal.xsl
 create mode 100644 build/xslt/footer_sitenav.xsl
 create mode 100644 build/xslt/footer_sourcelink.xsl
 create mode 100644 build/xslt/fsfe_followupsection.xsl
 create mode 100644 build/xslt/fsfe_mainsection.xsl
 create mode 100644 build/xslt/fsfe_pageclass.xsl
 create mode 100644 build/xslt/fsfe_pageheader.xsl
 create mode 100644 build/xslt/notifications.xsl
 create mode 100644 build/xslt/translation_list.xsl
 create mode 100644 support/default.xsl

diff --git a/build/xslt/TEMPLATE.xsl b/build/xslt/TEMPLATE.xsl
new file mode 100644
index 0000000000..58d4503742
--- /dev/null
+++ b/build/xslt/TEMPLATE.xsl
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
+
+  <!--
+  To externalise xsl code to a new file, copy this template,
+  copy the new content to it, and replace the according section
+  in the originating file with an include like this:
+
+  <xsl:include href="template.xsl" />
+  -->
+
+</xsl:stylesheet>
diff --git a/build/xslt/body_scripts.xsl b/build/xslt/body_scripts.xsl
new file mode 100644
index 0000000000..3ebb65d650
--- /dev/null
+++ b/build/xslt/body_scripts.xsl
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
+
+  <!-- Piwik -->
+  <script type="text/javascript">
+  //enable piwik on plain text page only
+  pkBaseURL = "http://piwik.fsfe.org/";
+  if ("http:" == document.location.protocol) {
+    document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+  }
+  </script>
+  <script type="text/javascript">
+  try {
+  var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 4);
+  piwikTracker.trackPageView();
+  piwikTracker.enableLinkTracking();
+  } catch( err ) {}
+  </script>
+  <!-- End Piwik Tracking Code -->
+
+  <script src="/scripts/bootstrap-3.0.3.min.js"></script>
+  <script src="/scripts/master.js"></script>
+  <script src="/scripts/placeholder.js"></script>
+  <script src="/scripts/highlight.pack.js"></script>
+
+</xsl:stylesheet>
diff --git a/build/xslt/footer_legal.xsl b/build/xslt/footer_legal.xsl
new file mode 100644
index 0000000000..5e7c7c82a9
--- /dev/null
+++ b/build/xslt/footer_legal.xsl
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
+
+  <xsl:element name="section">
+    <xsl:attribute name="id">legal-info</xsl:attribute>
+
+    <p>Copyright © 2001-2014 <a href="/"><xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'fsfeurope'" /></xsl:call-template></a>.</p>
+    <ul>
+      <li><a href="/contact/contact.html"> <xsl:call-template
+            name="fsfe-gettext"><xsl:with-param name="id"
+              select="'contact-us'" /></xsl:call-template></a></li>
+      <li><a href="/about/legal/imprint.html"> <xsl:call-template
+            name="fsfe-gettext"><xsl:with-param name="id"
+              select="'imprint'" /></xsl:call-template> </a> /
+        <a href="/about/legal/imprint.html#id-privacy-policy" class="privacy-policy"> <xsl:call-template
+            name="fsfe-gettext"><xsl:with-param name="id"
+              select="'privacy-policy'" /></xsl:call-template> </a> </li>
+    </ul>
+    <p><xsl:call-template name="fsfe-gettext"><xsl:with-param name="id"
+          select="'permission'" /></xsl:call-template></p>
+  </xsl:element>
+</xsl:stylesheet>
diff --git a/build/xslt/footer_sitenav.xsl b/build/xslt/footer_sitenav.xsl
new file mode 100644
index 0000000000..9628e48834
--- /dev/null
+++ b/build/xslt/footer_sitenav.xsl
@@ -0,0 +1,297 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
+
+  <xsl:element name="nav">
+    <xsl:attribute name="id">full-menu</xsl:attribute>
+
+    <xsl:element name="a">
+      <xsl:attribute name="href">#top</xsl:attribute>
+      <xsl:attribute name="id">direct-to-top</xsl:attribute>
+      <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'go-top'" /></xsl:call-template>
+      <!--FIXME translate that-->
+    </xsl:element>
+
+    <xsl:element name="ul">
+      <xsl:attribute name="id">full-menu-list</xsl:attribute>
+      <!-- FSFE portal menu -->
+      <xsl:element name="li">
+        <xsl:attribute name="class">fsfe</xsl:attribute>
+        <xsl:element name="a">
+          <xsl:attribute name="href">/</xsl:attribute>
+            <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'fsfeurope'" /></xsl:call-template>
+        </xsl:element>
+
+        <xsl:element name="ul">
+          <xsl:variable name="menu"><xsl:value-of select="@id" /></xsl:variable>
+                  <xsl:for-each select="/buildinfo/menuset/menu[@parent='fsfe']">
+                    <!--<xsl:sort select="@id"/>-->
+                    <xsl:sort select="@priority" />
+                    <xsl:variable name="id"><xsl:value-of select="@id" /></xsl:variable>
+                    <xsl:element name="li">
+                      <xsl:choose>
+                        <xsl:when test="not(string(.))">
+                          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
+                        </xsl:when>
+                        <xsl:when test=". = concat(/buildinfo/@filename ,'.html')">
+                          <xsl:element name="span">
+                          <xsl:attribute name="id">selected</xsl:attribute>
+                            <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
+                          </xsl:element>
+                        </xsl:when>
+                        <xsl:otherwise>
+                          <xsl:element name="a">
+                            <xsl:attribute name="href"><xsl:value-of select="." /></xsl:attribute>
+                            <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
+                          </xsl:element>
+                        </xsl:otherwise>
+                      </xsl:choose>
+                    </xsl:element> <!-- /li -->
+                  </xsl:for-each>
+        </xsl:element>
+        <!--/ul-->
+      </xsl:element>
+      <!--/li-->
+
+      <!-- Support portal menu item -->
+      <xsl:element name="li">
+        <xsl:attribute name="class">support</xsl:attribute>
+        <xsl:element name="a">
+          <xsl:attribute name="href">/donate/donate.html#ref-fullmenu</xsl:attribute>
+          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'support/donate'" /></xsl:call-template>
+        </xsl:element>
+
+        <xsl:element name="ul">
+          <xsl:variable name="menu"><xsl:value-of select="@id" /></xsl:variable>
+          <xsl:for-each select="/buildinfo/menuset/menu[@parent='support']">
+            <!--<xsl:sort select="@id"/>-->
+            <xsl:sort select="@priority" />
+            <xsl:variable name="id"><xsl:value-of select="@id" /></xsl:variable>
+            <xsl:element name="li">
+              <xsl:choose>
+                <xsl:when test="not(string(.))">
+                  <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
+                </xsl:when>
+                <xsl:when test=". = concat(/buildinfo/@filename ,'.html')">
+                  <xsl:element name="span">
+                  <xsl:attribute name="id">selected</xsl:attribute>
+                    <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
+                  </xsl:element>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:element name="a">
+                    <xsl:attribute name="href"><xsl:value-of select="." /></xsl:attribute>
+                    <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
+                  </xsl:element>
+                </xsl:otherwise>
+              </xsl:choose>
+            </xsl:element> <!-- /li -->
+          </xsl:for-each>
+        </xsl:element>
+        <!--/ul-->
+
+        <!-- Fellowship portal menu -->
+        <xsl:element name="ul">
+          <xsl:attribute name="class">fellowship</xsl:attribute>
+          <xsl:element name="li">
+            <xsl:attribute name="class">fellowship</xsl:attribute>
+            <xsl:element name="a">
+              <xsl:attribute name="href">/fellowship/</xsl:attribute>
+              <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'fellowship/fellowship'" /></xsl:call-template>
+            </xsl:element>
+            <xsl:element name="ul">
+              <xsl:variable name="menu"><xsl:value-of select="@id" /></xsl:variable>
+              <xsl:for-each select="/buildinfo/menuset/menu[@parent='fellowship']">
+                <!--<xsl:sort select="@id"/>-->
+                <xsl:sort select="@priority" />
+                <xsl:variable name="id"><xsl:value-of select="@id" /></xsl:variable>
+                <xsl:element name="li">
+                  <xsl:choose>
+                    <xsl:when test="not(string(.))">
+                      <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
+                    </xsl:when>
+                    <xsl:when test=". = concat(/buildinfo/@filename ,'.html')">
+                      <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
+                    </xsl:when>
+                    <xsl:otherwise>
+                      <xsl:element name="a">
+                        <xsl:attribute name="href"><xsl:value-of select="." /></xsl:attribute>
+                        <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
+                      </xsl:element>
+                    </xsl:otherwise>
+                  </xsl:choose>
+                </xsl:element> <!-- /li -->
+              </xsl:for-each>
+            </xsl:element><!-- end ul -->
+          </xsl:element>
+        </xsl:element>
+      </xsl:element> <!-- /li -->
+
+      <!-- campaigns -->
+      <xsl:element name="li">
+        <xsl:attribute name="class">campaigns</xsl:attribute>
+        <xsl:element name="a">
+          <xsl:attribute name="href">/campaigns/campaigns.html</xsl:attribute>
+          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'fsfe/campaigns'" /></xsl:call-template>
+        </xsl:element>
+
+        <xsl:element name="ul">
+          <xsl:variable name="menu"><xsl:value-of select="@id" /></xsl:variable>
+                  <xsl:for-each select="/buildinfo/menuset/menu[@parent='campaigns']">
+                    <!--<xsl:sort select="@id"/>-->
+                    <xsl:sort select="@priority" />
+                    <xsl:variable name="id"><xsl:value-of select="@id" /></xsl:variable>
+                    <xsl:element name="li">
+                      <xsl:choose>
+                        <xsl:when test="not(string(.))">
+                          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
+                        </xsl:when>
+                        <xsl:when test=". = concat(/buildinfo/@filename ,'.html')">
+                          <xsl:element name="span">
+                          <xsl:attribute name="id">selected</xsl:attribute>
+                            <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
+                          </xsl:element>
+                        </xsl:when>
+                        <xsl:otherwise>
+                          <xsl:element name="a">
+                            <xsl:attribute name="href"><xsl:value-of select="." /></xsl:attribute>
+                            <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
+                          </xsl:element>
+                        </xsl:otherwise>
+                      </xsl:choose>
+                    </xsl:element> <!-- /li -->
+                  </xsl:for-each>
+        </xsl:element>
+        <!--/ul-->
+      </xsl:element> <!-- /li -->
+
+      <!-- Planet portal menu -->
+      <xsl:element name="li">
+        <xsl:attribute name="class">planet</xsl:attribute>
+        <xsl:element name="a">
+            <xsl:attribute name="href">/news/</xsl:attribute>
+            <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'news/news'" /></xsl:call-template>
+        </xsl:element>
+        <!-- causes validation errors, needs li to pass validator?
+        <xsl:element name="ul">
+        </xsl:element>-->
+
+        <xsl:element name="ul">
+          <xsl:variable name="menu"><xsl:value-of select="@id" /></xsl:variable>
+                  <xsl:for-each select="/buildinfo/menuset/menu[@parent='news']">
+                    <!--<xsl:sort select="@id"/>-->
+                    <xsl:sort select="@priority" />
+                    <xsl:variable name="id"><xsl:value-of select="@id" /></xsl:variable>
+                    <xsl:element name="li">
+                      <xsl:choose>
+                        <xsl:when test="not(string(.))">
+                          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
+                        </xsl:when>
+                        <xsl:when test=". = concat(/buildinfo/@filename ,'.html')">
+                          <xsl:element name="span">
+                          <xsl:attribute name="id">selected</xsl:attribute>
+                            <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
+                          </xsl:element>
+                        </xsl:when>
+                        <xsl:otherwise>
+                          <xsl:element name="a">
+                            <xsl:attribute name="href"><xsl:value-of select="." /></xsl:attribute>
+                            <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
+                          </xsl:element>
+                        </xsl:otherwise>
+                      </xsl:choose>
+                    </xsl:element> <!-- /li -->
+                  </xsl:for-each>
+        </xsl:element>
+        <!--/ul-->
+      </xsl:element>
+
+      <!-- Legal team portal menu -->
+      <xsl:element name="li">
+        <xsl:attribute name="class">ftf</xsl:attribute>
+        <xsl:element name="a">
+            <xsl:attribute name="href">/legal/</xsl:attribute>
+            <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'ftf/legal'" /></xsl:call-template>
+        </xsl:element>
+        <!-- causes validation errors, needs li to pass validator?
+        <xsl:element name="ul">
+        </xsl:element>-->
+
+        <xsl:element name="ul">
+          <xsl:variable name="menu"><xsl:value-of select="@id" /></xsl:variable>
+                  <xsl:for-each select="/buildinfo/menuset/menu[@parent='ftf']">
+                    <!--<xsl:sort select="@id"/>-->
+                    <xsl:sort select="@priority" />
+                    <xsl:variable name="id"><xsl:value-of select="@id" /></xsl:variable>
+                    <xsl:element name="li">
+                      <xsl:choose>
+                        <xsl:when test="not(string(.))">
+                          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
+                        </xsl:when>
+                        <xsl:when test=". = concat(/buildinfo/@filename ,'.html')">
+                          <xsl:element name="span">
+                          <xsl:attribute name="id">selected</xsl:attribute>
+                            <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
+                          </xsl:element>
+                        </xsl:when>
+                        <xsl:otherwise>
+                          <xsl:element name="a">
+                            <xsl:attribute name="href"><xsl:value-of select="." /></xsl:attribute>
+                            <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
+                          </xsl:element>
+                        </xsl:otherwise>
+                      </xsl:choose>
+                    </xsl:element> <!-- /li -->
+                  </xsl:for-each>
+        </xsl:element>
+        <!--/ul-->
+      </xsl:element>
+
+      <!-- free software section portal menu -->
+      <xsl:element name="li">
+        <xsl:attribute name="class">fs</xsl:attribute>
+        <xsl:element name="a">
+            <xsl:attribute name="href">/freesoftware/</xsl:attribute>
+            <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'fs/fs'" /></xsl:call-template>
+        </xsl:element>
+        <!-- causes validation errors, needs li to pass validator?
+        <xsl:element name="ul">
+        </xsl:element>-->
+
+        <xsl:element name="ul">
+          <xsl:variable name="menu"><xsl:value-of select="@id" /></xsl:variable>
+                  <xsl:for-each select="/buildinfo/menuset/menu[@parent='fs']">
+                    <!--<xsl:sort select="@id"/>-->
+                    <xsl:sort select="@priority" />
+                    <xsl:variable name="id"><xsl:value-of select="@id" /></xsl:variable>
+                    <xsl:element name="li">
+                      <xsl:choose>
+                        <xsl:when test="not(string(.))">
+                          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
+                        </xsl:when>
+                        <xsl:when test=". = concat(/buildinfo/@filename ,'.html')">
+                          <xsl:element name="span">
+                          <xsl:attribute name="id">selected</xsl:attribute>
+                            <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
+                          </xsl:element>
+                        </xsl:when>
+                        <xsl:otherwise>
+                          <xsl:element name="a">
+                            <xsl:attribute name="href"><xsl:value-of select="." /></xsl:attribute>
+                            <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
+                          </xsl:element>
+                        </xsl:otherwise>
+                      </xsl:choose>
+                    </xsl:element> <!-- /li -->
+                  </xsl:for-each>
+        </xsl:element>
+        <!--/ul-->
+      </xsl:element>
+
+    </xsl:element>
+    <!--/ul#menu-list-->
+  </xsl:element>
+  <!--/nav#full-menu-->
+
+</xsl:stylesheet>
diff --git a/build/xslt/footer_sourcelink.xsl b/build/xslt/footer_sourcelink.xsl
new file mode 100644
index 0000000000..e776236e47
--- /dev/null
+++ b/build/xslt/footer_sourcelink.xsl
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
+
+  <xsl:element name="section">
+    <xsl:attribute name="id">source</xsl:attribute>
+
+    <!-- "Last changed" magic -->
+    <p>
+      <xsl:variable name="timestamp">
+        <xsl:value-of select="/buildinfo/document/timestamp"/>
+      </xsl:variable>
+          <!-- FIXME: over time, all pages should have the timestamp -->
+          <!--        tags, so this conditional could be removed     -->
+      <xsl:if test="string-length($timestamp) &gt; 0">
+        <xsl:variable name="Date">
+          <xsl:value-of select="substring-before(substring-after($timestamp, 'Date: '), ' $')"/>
+        </xsl:variable>
+        <xsl:variable name="Author">
+          <xsl:value-of select="substring-before(substring-after($timestamp, 'Author: '), ' $')"/>
+        </xsl:variable>
+        <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'lastchanged'" /></xsl:call-template>
+        <xsl:value-of select="translate ($Date, '/', '-')"/>
+        (<xsl:value-of select="$Author"/>)
+      </xsl:if>
+    </p>
+
+    <ul>
+      <li>
+        <!-- Link to the XHTML source -->
+        <xsl:element name="a">
+          <xsl:attribute name="href">
+            <xsl:text>/source</xsl:text>
+            <xsl:value-of select="/buildinfo/@filename"/>
+            <xsl:text>.</xsl:text>
+            <xsl:value-of select="/buildinfo/document/@language"/>
+            <xsl:text>.xhtml</xsl:text>
+          </xsl:attribute>
+          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'source'" /></xsl:call-template>
+        </xsl:element>
+      </li>
+      <li>
+          <a href="/contribute/web/"><xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'contribute-web'" /></xsl:call-template></a>
+      </li>
+    </ul>
+
+    <p>
+      <a href="/contribute/translators/">
+        <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'translate'" /></xsl:call-template>
+      </a>
+      <!-- Insert the appropriate translation notice -->
+      <xsl:if test="/buildinfo/document/@language!=/buildinfo/@original">
+        <xsl:element name="br"></xsl:element>
+        <xsl:choose>
+          <xsl:when test="/buildinfo/document/translator">
+            <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'translator1a'" /></xsl:call-template>
+            <xsl:value-of select="/buildinfo/document/translator"/>
+            <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'translator1b'" /></xsl:call-template>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'translator2'" /></xsl:call-template>
+          </xsl:otherwise>
+        </xsl:choose>
+        <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'translator3a'" /></xsl:call-template>
+        <xsl:element name="a">
+          <xsl:attribute name="href">
+            <xsl:value-of select="/buildinfo/@filename"/>
+            <xsl:text>.en.html</xsl:text>
+          </xsl:attribute>
+          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'translator3b'" /></xsl:call-template>
+        </xsl:element>
+        <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'translator3c'" /></xsl:call-template>
+      </xsl:if>
+    </p>
+
+  </xsl:element>
+  <!--/section#source-->
+
+</xsl:stylesheet>
diff --git a/build/xslt/fsfe_body.xsl b/build/xslt/fsfe_body.xsl
index 9d10abb9ce..189ebd1a88 100644
--- a/build/xslt/fsfe_body.xsl
+++ b/build/xslt/fsfe_body.xsl
@@ -8,23 +8,7 @@
   <xsl:template name="fsfe-body">
     <body>
 
-      <!--Apply appopriate styles for the whole page -->
-      <xsl:if test="/buildinfo/document/body/@class">
-        <xsl:attribute name="class">
-          <xsl:value-of select="/buildinfo/document/body/@class" /> 
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:if test="/buildinfo/document/body/@id">
-        <xsl:attribute name="id"><xsl:value-of select="/buildinfo/document/body/@id" /></xsl:attribute>
-      </xsl:if>
-      <xsl:if test="string(/buildinfo/document/@newsdate) and count(/buildinfo/document/@type) = 0">
-        <xsl:attribute name="class">
-          <xsl:value-of select="/buildinfo/document/body/@class" /> press release</xsl:attribute>
-      </xsl:if>
-      <xsl:if test="string(/buildinfo/document/@newsdate) and /buildinfo/document/@type = 'newsletter'">
-        <xsl:attribute name="class">
-          <xsl:value-of select="/buildinfo/document/body/@class" /> newsletter article</xsl:attribute>
-      </xsl:if>
+      <xsl:include href="fsfe_pageclass.xsl" />
 
       <!-- For pages used on external web servers, use absolute URLs -->
       <xsl:variable name="urlprefix"><xsl:if test="/buildinfo/document/@external">https://fsfe.org</xsl:if></xsl:variable>
@@ -32,671 +16,10 @@
       <!-- First of all, a comment to make clear this is generated -->
       <xsl:comment>This file was generated by an XSLT script. Please do not edit.</xsl:comment>
       
-      <xsl:element name="div">
-        <xsl:attribute name="id">translations</xsl:attribute>
-        <xsl:attribute name="class">alert</xsl:attribute>
-
-        <xsl:element name="a">
-          <xsl:attribute name="class">close</xsl:attribute>
-          <xsl:attribute name="data-toggle">collapse</xsl:attribute>
-          <xsl:attribute name="data-target">#translations</xsl:attribute>
-          <xsl:attribute name="href">#</xsl:attribute>
-          ×
-        </xsl:element>
-
-        <xsl:element name="a">
-          <xsl:attribute name="class">contribute-translation</xsl:attribute>
-          <xsl:attribute name="href">/contribute/translators/</xsl:attribute>
-          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'translate'" /></xsl:call-template>
-        </xsl:element>
-
-        <xsl:element name="ul">
-          <xsl:for-each select="/buildinfo/trlist/tr">
-            <xsl:sort select="@id" />
-            <xsl:choose>
-              <xsl:when test="@id=/buildinfo/@language">
-                <xsl:element name="li">
-                  <xsl:value-of select="." disable-output-escaping="yes"/>
-                </xsl:element>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:element name="li">
-                  <xsl:element name="a">
-                    <xsl:attribute name="href"><xsl:value-of select="/buildinfo/@filename"/>.<xsl:value-of select="@id"/>.html</xsl:attribute>
-                    <xsl:value-of select="." disable-output-escaping="yes"/>
-                  </xsl:element>
-                </xsl:element>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:for-each>
-        </xsl:element>
-        <!--/ul-->
-        
-      </xsl:element>
-      <!--/div#translations-->
-
-
-      <xsl:element name="header">
-        <xsl:attribute name="id">top</xsl:attribute>
-
-        <xsl:element name="nav">
-          <xsl:attribute name="id">menu</xsl:attribute>
-          <xsl:attribute name="role">navigation</xsl:attribute>
-          
-          <xsl:element name="div">
-            <xsl:attribute name="id">direct-links</xsl:attribute>
-
-            <xsl:element name="span">
-              <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'go-to'" /></xsl:call-template>
-            </xsl:element>
-
-            <xsl:element name="a">
-              <xsl:attribute name="href">#menu-list</xsl:attribute>
-              <xsl:attribute name="id">direct-to-menu-list</xsl:attribute>
-              <xsl:attribute name="data-toggle">collapse</xsl:attribute>
-              <xsl:attribute name="data-target">#menu-list</xsl:attribute>
-              <xsl:element name="i">
-                <xsl:attribute name="class">fa fa-bars fa-lg</xsl:attribute>
-              </xsl:element>
-              <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'menu'" /></xsl:call-template>
-            </xsl:element>
-
-            <xsl:element name="a">
-              <xsl:attribute name="href">#content</xsl:attribute>
-              <xsl:attribute name="id">direct-to-content</xsl:attribute>
-              <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'content'" /></xsl:call-template>
-            </xsl:element>
-            
-            <xsl:element name="a">
-              <xsl:attribute name="href">#full-menu</xsl:attribute>
-              <xsl:attribute name="id">direct-to-full-menu</xsl:attribute>
-              <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'sitemap'" /></xsl:call-template>
-            </xsl:element>
-
-            <xsl:element name="a">
-              <xsl:attribute name="href">#source</xsl:attribute>
-              <xsl:attribute name="id">direct-to-source</xsl:attribute>
-              <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'page-info'" /></xsl:call-template>
-            </xsl:element>
-
-            <xsl:element name="a">
-              <xsl:attribute name="href">#translations</xsl:attribute>
-              <xsl:attribute name="id">direct-to-translations</xsl:attribute>
-              <xsl:attribute name="data-toggle">collapse</xsl:attribute>
-              <xsl:attribute name="data-target">#translations</xsl:attribute>
-              <xsl:element name="i">
-                <xsl:attribute name="class">fa fa-globe fa-lg</xsl:attribute>
-              </xsl:element>
-              <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'change-lang'" /></xsl:call-template>
-            </xsl:element>
-
-            <xsl:element name="a">
-              <xsl:attribute name="href">/</xsl:attribute>
-              <xsl:attribute name="id">direct-to-home</xsl:attribute>
-              <xsl:element name="i">
-                <xsl:attribute name="class">fa fa-home fa-lg</xsl:attribute>
-              </xsl:element>
-              <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'fsfeurope'" /></xsl:call-template>
-            </xsl:element>
-
-          </xsl:element>
-          <!--/div#direct-links-->
-
-          <xsl:element name="ul">
-            <xsl:attribute name="id">menu-list</xsl:attribute>
-            <xsl:element name="li">
-              <xsl:element name="a">
-                <xsl:attribute name="href">/about/about.html</xsl:attribute>
-                <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'fsfe/about'" /></xsl:call-template>
-              </xsl:element>
-            </xsl:element>
-            <xsl:element name="li">
-              <xsl:element name="a">
-                <xsl:attribute name="href">/projects/work.html</xsl:attribute>
-                <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'fsfe/projects'" /></xsl:call-template>
-              </xsl:element>
-            </xsl:element>
-            <xsl:element name="li">
-              <xsl:element name="a">
-                <xsl:attribute name="href">/campaigns/campaigns.html</xsl:attribute>
-                <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'fsfe/campaigns'" /></xsl:call-template>
-              </xsl:element>
-            </xsl:element>
-            <xsl:element name="li">
-              <xsl:element name="a">
-                <xsl:attribute name="href">/contribute/contribute.html</xsl:attribute>
-                <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'fsfe/help'" /></xsl:call-template>
-              </xsl:element>
-            </xsl:element>
-            <xsl:element name="li">
-              <xsl:element name="a">
-                <xsl:attribute name="href">/press/press.html</xsl:attribute>
-                <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'fsfe/press'" /></xsl:call-template>
-              </xsl:element>
-            </xsl:element>
-          </xsl:element>
-          <!--/ul#menu-list-->
-
-          <xsl:element name="div">
-            <xsl:attribute name="id">search</xsl:attribute>
-
-              <xsl:element name="form">
-                <xsl:attribute name="method">get</xsl:attribute>
-                <xsl:attribute name="action">http://fsfe.yacy.de/yacysearch.html</xsl:attribute>
-
-                <xsl:element name="input">
-                  <xsl:attribute name="type">hidden</xsl:attribute>
-                  <xsl:attribute name="name">verify</xsl:attribute>
-                  <xsl:attribute name="value">true</xsl:attribute>
-                </xsl:element>
-
-                <xsl:element name="input">
-                  <xsl:attribute name="type">hidden</xsl:attribute>
-                  <xsl:attribute name="name">maximumRecords</xsl:attribute>
-                  <xsl:attribute name="value">10</xsl:attribute>
-                </xsl:element>
-
-                <xsl:element name="input">
-                  <xsl:attribute name="type">hidden</xsl:attribute>
-                  <xsl:attribute name="name">meanCount</xsl:attribute>
-                  <xsl:attribute name="value">5</xsl:attribute>
-                </xsl:element>
-
-                <xsl:element name="input">
-                  <xsl:attribute name="type">hidden</xsl:attribute>
-                  <xsl:attribute name="name">resource</xsl:attribute>
-                  <xsl:attribute name="value">local</xsl:attribute>
-                </xsl:element>
-
-                <xsl:element name="input">
-                  <xsl:attribute name="type">hidden</xsl:attribute>
-                  <xsl:attribute name="name">prefermaskfilter</xsl:attribute>
-                  <xsl:attribute name="value">.*.<xsl:value-of select="/buildinfo/@language"/>.html</xsl:attribute>
-                </xsl:element>
-
-                <xsl:element name="input">
-                  <xsl:attribute name="type">hidden</xsl:attribute>
-                  <xsl:attribute name="name">prefermaskfilter</xsl:attribute>
-                  <xsl:attribute name="value">.*</xsl:attribute>
-                </xsl:element>
-
-                <xsl:element name="input">
-                  <xsl:attribute name="type">hidden</xsl:attribute>
-                  <xsl:attribute name="name">display</xsl:attribute>
-                  <xsl:attribute name="value">2</xsl:attribute>
-                </xsl:element>
-
-                <xsl:element name="input">
-                  <xsl:attribute name="type">hidden</xsl:attribute>
-                  <xsl:attribute name="name">nav</xsl:attribute>
-                  <xsl:attribute name="value">hosts</xsl:attribute>
-                </xsl:element>
-
-                <xsl:element name="p">
-                  <xsl:element name="input">
-                    <xsl:attribute name="type">image</xsl:attribute>
-                    <xsl:attribute name="src">/graphics/icons/search-button.png</xsl:attribute>
-                    <xsl:attribute name="alt">
-                      <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'search'" /></xsl:call-template>
-                    </xsl:attribute>
-                  </xsl:element>
-
-                  <xsl:element name="input">
-                    <xsl:attribute name="type">text</xsl:attribute>
-                    <xsl:attribute name="name">query</xsl:attribute>
-                    <xsl:attribute name="placeholder">
-                      <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'search'" /></xsl:call-template>
-                    </xsl:attribute>
-                  </xsl:element>
-
-                  <!--
-                  <xsl:element name="input">
-                    <xsl:attribute name="type">submit</xsl:attribute>
-                    <xsl:attribute name="name">search</xsl:attribute>
-                    <xsl:attribute name="value">
-                      <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'submit'" /></xsl:call-template>
-                    </xsl:attribute>
-                  </xsl:element>
-                  -->
-                </xsl:element>
-
-              </xsl:element>
-              <!--/form-->
-          </xsl:element>
-          <!--/div#search-->
-          
-
-        </xsl:element>
-        <!--/nav#menu-->
-
-
-        <xsl:element name="div">
-          <xsl:attribute name="id">masthead</xsl:attribute>
-
-          <xsl:element name="div">
-            <xsl:attribute name="id">link-home</xsl:attribute>
-            <xsl:element name="a">
-              <xsl:attribute name="href">
-                  <xsl:value-of select="$urlprefix"/>
-              </xsl:attribute>
-              <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'rootpage'" /></xsl:call-template>
-            </xsl:element>
-          </xsl:element>
-          <!--/div#link-home-->
-
-          <xsl:element name="div">
-            <xsl:attribute name="id">logo</xsl:attribute>
-            <xsl:element name="span">
-                  <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'fsfeurope'" /></xsl:call-template>
-              </xsl:element>
-          </xsl:element>
-          <!--/div#logo-->
-
-          <xsl:element name="div">
-            <xsl:attribute name="id">motto</xsl:attribute>
-            <xsl:element name="span"><xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'motto-fsfs'" /></xsl:call-template></xsl:element>
-            <!-- TODO different motto content depending on planet (use 'motto-planet'), wiki (use 'motto-wiki'), or fsfe dot org, page, so we may have to change this to another way-->
-          </xsl:element>
-          <!--/div#motto-->
-
-        </xsl:element>
-        <!--/div#masthead-->
-
-      </xsl:element>
-      <!--/header#top-->
-
-
-
-
-      <xsl:element name="div">
-        <xsl:attribute name="id">notifications</xsl:attribute>
-
-        <!-- Service notice (for downtime, upgrades, etc. enable this)
-        <div id="service-notice">
-          <div class="close">
-            <a title="dismiss this notification">×</a>
-          </div>
-
-          <div class="text">
-            <h1>Site currently under development</h1>
-
-            <p>
-              If you want to help out, <a
-              href="/contribute/web/web.en.html">consider joining the
-              web team</a>.
-            </p>
-          </div>
-        </div>-->
-
-        <!-- Outdated note -->
-        <xsl:if test="/buildinfo/@outdated='yes'">
-          <xsl:element name="div">
-        <xsl:attribute name="class">alert warning red</xsl:attribute>
-            <xsl:element name="a">
-              <xsl:attribute name="class">close</xsl:attribute>
-              <xsl:attribute name="data-dismiss">alert</xsl:attribute>
-              <xsl:attribute name="href">#</xsl:attribute>
-              <xsl:attribute name="aria-hidden">true</xsl:attribute>
-              ×
-            </xsl:element>
-              <xsl:element name="p">
-        <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'outdated-1'" /></xsl:call-template>
-              <xsl:element name="a">
-                <xsl:attribute name="href">
-                  <xsl:value-of select="/buildinfo/@filename"/>
-                  <xsl:text>.en.html</xsl:text>
-                </xsl:attribute>
-                <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'translator3b'" /></xsl:call-template>
-              </xsl:element>.
-        <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'outdated-2'" /></xsl:call-template>
-          </xsl:element>
-          </xsl:element>
-        </xsl:if>
-  
-        <!-- Missing translation note -->
-        <xsl:if test="/buildinfo/@language!=/buildinfo/document/@language">
-          <xsl:element name="div">
-        <xsl:attribute name="class">alert warning red</xsl:attribute>
-            <xsl:element name="a">
-              <xsl:attribute name="class">close</xsl:attribute>
-              <xsl:attribute name="data-dismiss">alert</xsl:attribute>
-              <xsl:attribute name="href">#</xsl:attribute>
-              <xsl:attribute name="aria-hidden">true</xsl:attribute>
-              ×
-            </xsl:element>
-              <xsl:element name="p">
-        <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'notranslation'" /></xsl:call-template>
-          </xsl:element>
-          </xsl:element>
-        </xsl:if>
-  
-        <!-- Info box -->
-        <xsl:element name="div"> 
-          <xsl:attribute name="id">infobox</xsl:attribute>
-          <!-- Add under construction message -->
-          <xsl:if test = "/buildinfo/document/head/meta[@name='under-construction' and @content='true']">
-            <xsl:element name="div">
-              <xsl:attribute name="class">alert warning yellow</xsl:attribute>
-            <xsl:element name="a">
-              <xsl:attribute name="class">close</xsl:attribute>
-              <xsl:attribute name="data-dismiss">alert</xsl:attribute>
-              <xsl:attribute name="href">#</xsl:attribute>
-              <xsl:attribute name="aria-hidden">true</xsl:attribute>
-              ×
-            </xsl:element>
-              <xsl:element name="p">
-              <xsl:call-template name="fsfe-gettext">
-                <xsl:with-param name="id" select="'under-construction'" />
-              </xsl:call-template>
-            </xsl:element>
-          </xsl:element>
-          </xsl:if>
-          <!-- Add project completed message -->
-          <xsl:if test = "/buildinfo/document/head/meta[@name='project-complete' and @content='true']">
-            <xsl:element name="div">
-              <xsl:attribute name="class">alert warning green</xsl:attribute>
-            <xsl:element name="a">
-              <xsl:attribute name="class">close</xsl:attribute>
-              <xsl:attribute name="data-dismiss">alert</xsl:attribute>
-              <xsl:attribute name="href">#</xsl:attribute>
-              <xsl:attribute name="aria-hidden">true</xsl:attribute>
-              ×
-            </xsl:element>
-              <xsl:element name="p">
-              <xsl:call-template name="fsfe-gettext">
-                <xsl:with-param name="id" select="'project-complete'" />
-              </xsl:call-template>
-            </xsl:element>
-          </xsl:element>
-          </xsl:if>
-        </xsl:element>
-        
-        <!-- Fundraising box
-          <xsl:element name="div">
-        <xsl:attribute name="id">fundraising</xsl:attribute>
-          <xsl:element name="h2">
-            <xsl:apply-templates select="/buildinfo/fundraising/call1/node()"/>
-          </xsl:element>
-          <xsl:element name="div">
-            <xsl:attribute name="class">button</xsl:attribute>
-            <xsl:apply-templates select="/buildinfo/fundraising/call2/node()"/>
-          </xsl:element>
-          <xsl:element name="div">
-            <xsl:attribute name="class">button</xsl:attribute>
-            <xsl:apply-templates select="/buildinfo/fundraising/call3/node()"/>
-          </xsl:element>
-          <xsl:element name="img">
-            <xsl:attribute name="src">/graphics/wreath.png</xsl:attribute>
-            <xsl:attribute name="alt">wreath</xsl:attribute>
-            <xsl:attribute name="class">right</xsl:attribute>
-          </xsl:element>
-          <xsl:element name="p">
-            <xsl:attribute name="class">call4</xsl:attribute>
-            <xsl:apply-templates select="/buildinfo/fundraising/call4/node()"/>
-          </xsl:element>
-          disabling the progress bar
-          <xsl:if test="/buildinfo/fundraising/current">
-            <xsl:element name="div">
-              <xsl:attribute name="class">percentbox</xsl:attribute>
-              <xsl:element name="div">
-            <xsl:attribute name="class">percentbar</xsl:attribute>
-            <xsl:attribute name="style">width: 45.9%</xsl:attribute>
-              </xsl:element>
-            </xsl:element>
-            <xsl:element name="p">
-              <xsl:attribute name="class">current</xsl:attribute>
-              <xsl:apply-templates select="/buildinfo/fundraising/current/node()"/>
-              <xsl:text>€ 45 860</xsl:text>
-            </xsl:element>
-            <xsl:element name="p">
-              <xsl:attribute name="class">target</xsl:attribute>
-              <xsl:text>€ 100 000</xsl:text>
-            </xsl:element>
-          </xsl:if> c
-        </xsl:element>-->
-        <!-- End Fundraising box -->
-
-      </xsl:element>
-      <!--/div#notifications-->
-
-      <xsl:element name="section">
-        <xsl:attribute name="id">main</xsl:attribute>
-        <xsl:attribute name="role">main</xsl:attribute>
-
-        <xsl:element name="article">
-          <xsl:attribute name="id">content</xsl:attribute>
-          <xsl:if test="/buildinfo/document/body/@microformats">
-            <xsl:attribute name="class"><xsl:value-of select="/buildinfo/document/body/@microformats" /></xsl:attribute>
-          </xsl:if>
-
-
-
-
-          <!-- Here goes the actual content of the <body> node of the input file -->
-          <xsl:apply-templates select="body | /buildinfo/document/event/body | /buildinfo/document/news/body" />
-
-    
-        </xsl:element>
-        <!--/article#content-->
-
-        <xsl:if test = "/buildinfo/document/sidebar or /buildinfo/document/@newsdate">
-          <xsl:element name="aside">
-            <xsl:attribute name="id">sidebar</xsl:attribute>
-
-            <xsl:if test="string(/buildinfo/document/@newsdate) and /buildinfo/document/@type = 'newsletter'">
-              <xsl:element name="h3">
-                <xsl:call-template name="fsfe-gettext">
-                  <xsl:with-param name="id" select="'receive-newsletter'" />
-                </xsl:call-template>
-              </xsl:element>
-              <xsl:call-template name="subscribe-nl" />
-              <ul>
-                <li><a href="/news/newsletter.html">
-                  <xsl:call-template name="fsfe-gettext">
-                      <xsl:with-param name="id" select="'news/nl'" />
-                  </xsl:call-template>
-                </a></li>
-                <li><a href="/events/events.html">
-                  <xsl:call-template name="fsfe-gettext">
-                      <xsl:with-param name="id" select="'news/events'" />
-                  </xsl:call-template>
-                </a></li>
-              </ul>
-            </xsl:if>
-            
-            <xsl:if test="string(/buildinfo/document/@newsdate) and count(/buildinfo/document/@type) = 0">
-                <h3>
-                  <xsl:call-template name="fsfe-gettext">
-                      <xsl:with-param name="id" select="'fsfe/press'" />
-                  </xsl:call-template>
-                </h3>
-                <ul>
-                  <li>
-                    <a href="/press/press.html">
-                      <xsl:call-template name="fsfe-gettext">
-                          <xsl:with-param name="id" select="'news/press'" />
-                      </xsl:call-template>
-                    </a>
-                  </li>
-                  <li>
-                    <a href="/news/news.html">
-                      <xsl:call-template name="fsfe-gettext">
-                          <xsl:with-param name="id" select="'news/news'" />
-                      </xsl:call-template>
-                    </a>
-                  </li>
-                  <li>
-                    <a href="/about/basics/freesoftware.html">
-                      <xsl:call-template name="fsfe-gettext">
-                        <xsl:with-param name="id" select="'fs/basics'" />
-                      </xsl:call-template>
-                    </a>
-                  </li>
-                </ul>
-              </xsl:if>
-
-            <xsl:apply-templates select="/buildinfo/document/sidebar/node()" />
-            
-            <xsl:if test="string(/buildinfo/document/@newsdate)">
-                <p>
-                  <a href="/donate/index.html" class="small-donate">
-                    <xsl:call-template name="fsfe-gettext">
-                      <xsl:with-param name="id" select="'donate'" />
-                    </xsl:call-template>
-                  </a>
-                </p>
-            </xsl:if>
-            <!--xsl:if test = "/buildinfo/document/sidebar/@news">
-              <xsl:element name="h4">
-                <xsl:call-template name="fsfe-gettext">
-                  <xsl:with-param name="id" select="'related-news'" />
-                </xsl:call-template>
-              </xsl:element>
-              <fetch-news />
-              -->
-              <!--FIXME-->
-              <!--ul class="placeholder"><li>
-                  <span class="dt-published">11 June 2013</span><a href="/news/2013/news-20130611-01.en.html">Filing taxes without non-free software: Slovak company appeals fines</a>
-              </li></ul-->
-            <!--/xsl:if-->
-
-            <xsl:choose>
-              <xsl:when test = "/buildinfo/document/sidebar/@promo = 'our-work'">
-                <xsl:element name="h3">
-                  <xsl:attribute name="class">promo</xsl:attribute>
-                  <xsl:call-template name="fsfe-gettext">
-                    <xsl:with-param name="id" select="'our-work'" />
-                  </xsl:call-template>
-                </xsl:element>
-                <xsl:call-template name="fsfe-gettext">
-                  <xsl:with-param name="id" select="'our-work-intro'" />
-                </xsl:call-template>
-                <xsl:element name="a"> 
-                  <xsl:attribute name="href">/work.html</xsl:attribute>
-                  <xsl:attribute name="class">learn-more</xsl:attribute>
-                  <xsl:call-template name="fsfe-gettext">
-                    <xsl:with-param name="id" select="'learn-more'" />
-                  </xsl:call-template>
-                </xsl:element>
-              </xsl:when>
-              <xsl:when test = "/buildinfo/document/sidebar/@promo = 'about-fsfe'">
-                <xsl:element name="h3">
-                  <xsl:attribute name="class">promo</xsl:attribute>
-                  <xsl:call-template name="fsfe-gettext">
-                    <xsl:with-param name="id" select="'about-fsfe'" />
-                  </xsl:call-template>
-                </xsl:element>
-                <xsl:call-template name="fsfe-gettext">
-                  <xsl:with-param name="id" select="'about-fsfe-intro'" />
-                </xsl:call-template>
-                <xsl:element name="a"> 
-                  <xsl:attribute name="href">/about/about.html</xsl:attribute>
-                  <xsl:attribute name="class">learn-more</xsl:attribute>
-                  <xsl:call-template name="fsfe-gettext">
-                    <xsl:with-param name="id" select="'learn-more'" />
-                  </xsl:call-template>
-                </xsl:element>
-              </xsl:when>
-              <xsl:when test = "/buildinfo/document/sidebar/@promo = 'donate'">
-                <xsl:element name="h3">
-                  <xsl:attribute name="class">promo</xsl:attribute>
-                  <xsl:call-template name="fsfe-gettext">
-                    <xsl:with-param name="id" select="'donate'" />
-                  </xsl:call-template>
-                </xsl:element>
-                <xsl:call-template name="fsfe-gettext">
-                  <xsl:with-param name="id" select="'donate-paragraph'" />
-                </xsl:call-template>
-                <xsl:element name="a"> 
-                  <xsl:attribute name="href">/donate/donate.html#ref-sidebar</xsl:attribute>
-                  <xsl:attribute name="class">learn-more big-donate</xsl:attribute>
-                  <xsl:call-template name="fsfe-gettext">
-                    <xsl:with-param name="id" select="'donate'" />
-                  </xsl:call-template>
-                </xsl:element>
-              </xsl:when>
-              <xsl:when test = "/buildinfo/document/sidebar/@promo = 'no'">
-              </xsl:when>
-              <!--otherwise display about-fsfe-->
-              <xsl:otherwise>
-                <xsl:element name="h3">
-                  <xsl:attribute name="class">promo</xsl:attribute>
-                  <xsl:call-template name="fsfe-gettext">
-                    <xsl:with-param name="id" select="'about-fsfe'" />
-                  </xsl:call-template>
-                </xsl:element>
-                <xsl:call-template name="fsfe-gettext">
-                  <xsl:with-param name="id" select="'about-fsfe-intro'" />
-                </xsl:call-template>
-                <xsl:element name="a"> 
-                  <xsl:attribute name="href">/about/about.html</xsl:attribute>
-                  <xsl:attribute name="class">learn-more</xsl:attribute>
-                  <xsl:call-template name="fsfe-gettext">
-                    <xsl:with-param name="id" select="'learn-more'" />
-                  </xsl:call-template>
-                </xsl:element>
-              </xsl:otherwise>
-            </xsl:choose>
-
-          </xsl:element>
-          <!--/aside#sidebar-->
-        </xsl:if>
-
-        <xsl:if test = "/buildinfo/document/legal">
-          <xsl:element name="footer">
-    
-            <xsl:attribute name="class">copyright notice creativecommons</xsl:attribute>
-            <xsl:choose> 
-              <xsl:when test = "/buildinfo/document/legal/license">      
-                <xsl:element name="a">
-                  <xsl:attribute name="href">
-                    <xsl:value-of select="/buildinfo/document/legal/license"/>
-                  </xsl:attribute>
-                  <xsl:attribute name="rel">license</xsl:attribute>
-                    <xsl:if test ="/buildinfo/document/legal/@type='cc-license'">
-                    </xsl:if>
-                    <xsl:value-of select="/buildinfo/document/legal/notice"/>
-                </xsl:element>
-              </xsl:when>
-              
-              <xsl:otherwise>
-                <xsl:element name="span">
-                  <xsl:value-of select="/buildinfo/document/legal/notice"/>
-                </xsl:element>
-              </xsl:otherwise>
-            </xsl:choose>
-            
-          </xsl:element>
-          <!--/footer-->
-        </xsl:if>
-
-        <!--Depreciated: it's here only for "backward compatibility"  cc license way-->
-        <xsl:if test = "string(/buildinfo/document/head/meta[@name='cc-license']/@content)">
-          <xsl:element name="footer">
-
-            <xsl:element name="div">    
-              <xsl:attribute name="id">cc-licenses</xsl:attribute>
-              
-              <xsl:element name="p">
-                <xsl:element name="img">
-                <xsl:attribute name="src">/graphics/cc-logo.png</xsl:attribute>
-                <xsl:attribute name="alt">Creative Commons logo</xsl:attribute>
-                </xsl:element> <!-- </img> -->
-                <xsl:for-each select="/buildinfo/document/head/meta[@name='cc-license']">
-                  <xsl:value-of select="@content"/> • 
-                </xsl:for-each>
-                <!--<xsl:value-of select="/buildinfo/document/head/meta[@name='cc-license-1']/@content" /> • -->
-              </xsl:element> <!-- </p> -->
-              
-            </xsl:element> <!-- </div> -->
-            <!-- End cc licenses -->
-
-          </xsl:element>
-          <!--/footer-->
-        </xsl:if>
-
-      </xsl:element>
-      <!--/section#main-->
+      <xsl:include href="translation_list.xsl" />
+      <xsl:include href="fsfe_pageheader.xsl" />
+      <xsl:include href="notifications.xsl" />
+      <xsl:include href="fsfe_mainsection.xsl" />
 
       <!--TODO nice to have a breadcrumb navigation: xsl:element name="nav">
         <xsl:attribute name="id">breadcrumbs</xsl:attribute>
@@ -707,466 +30,15 @@
       </xsl:element-->
       <!--/nav#breadcrumbs-->
 
-      <xsl:element name="section">
-        <xsl:attribute name="id">followup</xsl:attribute>
-           <!--
-           TODO Okay, so the idea here is to be able to display different "followup" boxes. I would suggest doing it like this:
-            - the xml page shold be able to say that it wants to show a
-                specific boxe and would contain e.g.
-                <followup>subscribe-newsletter</followup> so the page would show
-                the following box. 
-            - if the xml page does not contain any <followup> variable, then we should be able to set a default followup box on our own.
-
-              This has the advantage that depending on priorities, we can show
-              a box in all our pages at the bottom. For instance, when we are
-              in the middle of our yearly fundraising, we could set the default
-              to a "fundraising" box.
-
-           For now, this is just a placeholder, so all pages show the
-           "Subscribe to newsletter" box. Below that, some examples of boxes we
-           should make.
-           -->
-        <xsl:choose>
-          <xsl:when test="/buildinfo/document/followup = 'subscribe-nl'">
-            <xsl:attribute name="class">subscribe-nl</xsl:attribute>
-            <xsl:element name="h2"><xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'subscribe-newsletter'" /></xsl:call-template></xsl:element>
-            <xsl:call-template name="subscribe-nl" />
-          </xsl:when>
-          <xsl:when test="/buildinfo/document/followup = 'support'">
-            <xsl:attribute name="class">support</xsl:attribute>
-            <xsl:element name="h2"><xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'show-support'" /></xsl:call-template></xsl:element>
-            <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'show-support-paragraph'" /></xsl:call-template>
-            <xsl:element name="a">
-              <xsl:attribute name="href">/support/?followupbox</xsl:attribute>
-              <xsl:attribute name="class">btn</xsl:attribute>
-              <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'support-fsfe'" /></xsl:call-template>
-            </xsl:element>
-          </xsl:when>
-          <xsl:when test="/buildinfo/document/followup = 'donate'">
-            <xsl:attribute name="class">donate</xsl:attribute>
-            <xsl:element name="h2">
-              <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'donate'" /></xsl:call-template>
-            </xsl:element>
-            <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'donate-paragraph'" /></xsl:call-template>
-            <xsl:element name="a">
-              <xsl:attribute name="href">/donate/donate.html#ref-followupbox</xsl:attribute>
-              <xsl:attribute name="class">btn</xsl:attribute>
-              <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'donate'" /></xsl:call-template>
-            </xsl:element>
-          </xsl:when>
-          <xsl:when test="/buildinfo/document/followup = 'join'">
-            <xsl:attribute name="class">join</xsl:attribute>
-            <xsl:element name="h2">
-              <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'join-fellowship'" /></xsl:call-template>
-            </xsl:element>
-            <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'join-paragraph'" /></xsl:call-template>
-            <xsl:element name="a">
-              <xsl:attribute name="href">/fellowship/join.html#ref-followupbox</xsl:attribute>
-              <xsl:attribute name="class">btn</xsl:attribute>
-              <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'join'" /></xsl:call-template>
-            </xsl:element>
-          </xsl:when>
-          <xsl:when test="/buildinfo/document/followup = 'no'">
-            <xsl:attribute name="class">hide</xsl:attribute>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:attribute name="class">subscribe-nl</xsl:attribute>
-            <xsl:element name="h2"><xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'subscribe-newsletter'" /></xsl:call-template></xsl:element>
-            <xsl:call-template name="subscribe-nl" />
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:element>
-      <!--/section#followup-->
+      <xsl:include href="fsfe_followupsection.xsl" />
 
       <xsl:element name="footer">
         <xsl:attribute name="id">bottom</xsl:attribute>
 
-        <xsl:element name="nav">
-          <xsl:attribute name="id">full-menu</xsl:attribute>
-
-          <xsl:element name="a">
-            <xsl:attribute name="href">#top</xsl:attribute>
-            <xsl:attribute name="id">direct-to-top</xsl:attribute>
-            <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'go-top'" /></xsl:call-template>
-            <!--FIXME translate that-->
-          </xsl:element>
-
-          <xsl:element name="ul">
-            <xsl:attribute name="id">full-menu-list</xsl:attribute>
-            <!-- FSFE portal menu -->
-            <xsl:element name="li">
-              <xsl:attribute name="class">fsfe</xsl:attribute>
-              <xsl:element name="a">
-                <xsl:attribute name="href">/</xsl:attribute>
-                  <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'fsfeurope'" /></xsl:call-template>
-              </xsl:element>
-
-              <xsl:element name="ul">
-                <xsl:variable name="menu"><xsl:value-of select="@id" /></xsl:variable>
-                        <xsl:for-each select="/buildinfo/menuset/menu[@parent='fsfe']">
-                          <!--<xsl:sort select="@id"/>-->
-                          <xsl:sort select="@priority" />
-                          <xsl:variable name="id"><xsl:value-of select="@id" /></xsl:variable>
-                          <xsl:element name="li">
-                            <xsl:choose>
-                              <xsl:when test="not(string(.))">
-                                <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
-                              </xsl:when>
-                              <xsl:when test=". = concat(/buildinfo/@filename ,'.html')">
-                                <xsl:element name="span">
-                                <xsl:attribute name="id">selected</xsl:attribute>
-                                  <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
-                                </xsl:element>
-                              </xsl:when>
-                              <xsl:otherwise>
-                                <xsl:element name="a">
-                                  <xsl:attribute name="href"><xsl:value-of select="." /></xsl:attribute>
-                                  <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
-                                </xsl:element>
-                              </xsl:otherwise>
-                            </xsl:choose>
-                          </xsl:element> <!-- /li -->
-                        </xsl:for-each>
-              </xsl:element>
-              <!--/ul-->
-            </xsl:element>
-            <!--/li-->
-                
-            <!-- Support portal menu item -->
-            <xsl:element name="li">
-              <xsl:attribute name="class">support</xsl:attribute>
-              <xsl:element name="a">
-                <xsl:attribute name="href">/donate/donate.html#ref-fullmenu</xsl:attribute>
-                <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'support/donate'" /></xsl:call-template> 
-              </xsl:element>
-
-              <xsl:element name="ul">
-                <xsl:variable name="menu"><xsl:value-of select="@id" /></xsl:variable>
-                <xsl:for-each select="/buildinfo/menuset/menu[@parent='support']">
-                  <!--<xsl:sort select="@id"/>-->
-                  <xsl:sort select="@priority" />
-                  <xsl:variable name="id"><xsl:value-of select="@id" /></xsl:variable>
-                  <xsl:element name="li">
-                    <xsl:choose>
-                      <xsl:when test="not(string(.))">
-                        <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
-                      </xsl:when>
-                      <xsl:when test=". = concat(/buildinfo/@filename ,'.html')">
-                        <xsl:element name="span">
-                        <xsl:attribute name="id">selected</xsl:attribute>
-                          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
-                        </xsl:element>
-                      </xsl:when>
-                      <xsl:otherwise>
-                        <xsl:element name="a">
-                          <xsl:attribute name="href"><xsl:value-of select="." /></xsl:attribute>
-                          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
-                        </xsl:element>
-                      </xsl:otherwise>
-                    </xsl:choose>
-                  </xsl:element> <!-- /li -->
-                </xsl:for-each>
-              </xsl:element>
-              <!--/ul-->
-
-              <!-- Fellowship portal menu -->
-              <xsl:element name="ul">
-                <xsl:attribute name="class">fellowship</xsl:attribute>
-                <xsl:element name="li">
-                  <xsl:attribute name="class">fellowship</xsl:attribute>
-                  <xsl:element name="a">
-                    <xsl:attribute name="href">/fellowship/</xsl:attribute>
-                    <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'fellowship/fellowship'" /></xsl:call-template>
-                  </xsl:element>
-                  <xsl:element name="ul">
-                    <xsl:variable name="menu"><xsl:value-of select="@id" /></xsl:variable>
-                    <xsl:for-each select="/buildinfo/menuset/menu[@parent='fellowship']">
-                      <!--<xsl:sort select="@id"/>-->
-                      <xsl:sort select="@priority" />
-                      <xsl:variable name="id"><xsl:value-of select="@id" /></xsl:variable>
-                      <xsl:element name="li">
-                        <xsl:choose>
-                          <xsl:when test="not(string(.))">
-                            <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
-                          </xsl:when>
-                          <xsl:when test=". = concat(/buildinfo/@filename ,'.html')">
-                            <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
-                          </xsl:when>
-                          <xsl:otherwise>
-                            <xsl:element name="a">
-                              <xsl:attribute name="href"><xsl:value-of select="." /></xsl:attribute>
-                              <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
-                            </xsl:element>
-                          </xsl:otherwise>
-                        </xsl:choose>
-                      </xsl:element> <!-- /li -->
-                    </xsl:for-each>
-                  </xsl:element><!-- end ul -->          
-                </xsl:element>
-              </xsl:element>
-            </xsl:element> <!-- /li -->
-
-            <!-- campaigns -->
-            <xsl:element name="li">
-              <xsl:attribute name="class">campaigns</xsl:attribute>
-              <xsl:element name="a">
-                <xsl:attribute name="href">/campaigns/campaigns.html</xsl:attribute>
-                <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'fsfe/campaigns'" /></xsl:call-template> 
-              </xsl:element>
-
-              <xsl:element name="ul">
-                <xsl:variable name="menu"><xsl:value-of select="@id" /></xsl:variable>
-                        <xsl:for-each select="/buildinfo/menuset/menu[@parent='campaigns']">
-                          <!--<xsl:sort select="@id"/>-->
-                          <xsl:sort select="@priority" />
-                          <xsl:variable name="id"><xsl:value-of select="@id" /></xsl:variable>
-                          <xsl:element name="li">
-                            <xsl:choose>
-                              <xsl:when test="not(string(.))">
-                                <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
-                              </xsl:when>
-                              <xsl:when test=". = concat(/buildinfo/@filename ,'.html')">
-                                <xsl:element name="span">
-                                <xsl:attribute name="id">selected</xsl:attribute>
-                                  <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
-                                </xsl:element>
-                              </xsl:when>
-                              <xsl:otherwise>
-                                <xsl:element name="a">
-                                  <xsl:attribute name="href"><xsl:value-of select="." /></xsl:attribute>
-                                  <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
-                                </xsl:element>
-                              </xsl:otherwise>
-                            </xsl:choose>
-                          </xsl:element> <!-- /li -->
-                        </xsl:for-each>
-              </xsl:element>
-              <!--/ul-->
-            </xsl:element> <!-- /li -->
-
-            <!-- Planet portal menu -->
-            <xsl:element name="li">
-              <xsl:attribute name="class">planet</xsl:attribute>
-              <xsl:element name="a">
-                  <xsl:attribute name="href">/news/</xsl:attribute>
-                  <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'news/news'" /></xsl:call-template>
-              </xsl:element>
-              <!-- causes validation errors, needs li to pass validator?
-              <xsl:element name="ul">
-              </xsl:element>-->
-
-              <xsl:element name="ul">
-                <xsl:variable name="menu"><xsl:value-of select="@id" /></xsl:variable>
-                        <xsl:for-each select="/buildinfo/menuset/menu[@parent='news']">
-                          <!--<xsl:sort select="@id"/>-->
-                          <xsl:sort select="@priority" />
-                          <xsl:variable name="id"><xsl:value-of select="@id" /></xsl:variable>
-                          <xsl:element name="li">
-                            <xsl:choose>
-                              <xsl:when test="not(string(.))">
-                                <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
-                              </xsl:when>
-                              <xsl:when test=". = concat(/buildinfo/@filename ,'.html')">
-                                <xsl:element name="span">
-                                <xsl:attribute name="id">selected</xsl:attribute>
-                                  <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
-                                </xsl:element>
-                              </xsl:when>
-                              <xsl:otherwise>
-                                <xsl:element name="a">
-                                  <xsl:attribute name="href"><xsl:value-of select="." /></xsl:attribute>
-                                  <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
-                                </xsl:element>
-                              </xsl:otherwise>
-                            </xsl:choose>
-                          </xsl:element> <!-- /li -->
-                        </xsl:for-each>
-              </xsl:element>
-              <!--/ul-->
-            </xsl:element>
-            
-            <!-- Legal team portal menu -->
-            <xsl:element name="li">
-              <xsl:attribute name="class">ftf</xsl:attribute>
-              <xsl:element name="a">
-                  <xsl:attribute name="href">/legal/</xsl:attribute>
-                  <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'ftf/legal'" /></xsl:call-template>
-              </xsl:element>
-              <!-- causes validation errors, needs li to pass validator?
-              <xsl:element name="ul">
-              </xsl:element>-->
-
-              <xsl:element name="ul">
-                <xsl:variable name="menu"><xsl:value-of select="@id" /></xsl:variable>
-                        <xsl:for-each select="/buildinfo/menuset/menu[@parent='ftf']">
-                          <!--<xsl:sort select="@id"/>-->
-                          <xsl:sort select="@priority" />
-                          <xsl:variable name="id"><xsl:value-of select="@id" /></xsl:variable>
-                          <xsl:element name="li">
-                            <xsl:choose>
-                              <xsl:when test="not(string(.))">
-                                <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
-                              </xsl:when>
-                              <xsl:when test=". = concat(/buildinfo/@filename ,'.html')">
-                                <xsl:element name="span">
-                                <xsl:attribute name="id">selected</xsl:attribute>
-                                  <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
-                                </xsl:element>
-                              </xsl:when>
-                              <xsl:otherwise>
-                                <xsl:element name="a">
-                                  <xsl:attribute name="href"><xsl:value-of select="." /></xsl:attribute>
-                                  <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
-                                </xsl:element>
-                              </xsl:otherwise>
-                            </xsl:choose>
-                          </xsl:element> <!-- /li -->
-                        </xsl:for-each>
-              </xsl:element>
-              <!--/ul-->
-            </xsl:element>
-
-            <!-- free software section portal menu -->
-            <xsl:element name="li">
-              <xsl:attribute name="class">fs</xsl:attribute>
-              <xsl:element name="a">
-                  <xsl:attribute name="href">/freesoftware/</xsl:attribute>
-                  <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'fs/fs'" /></xsl:call-template>
-              </xsl:element>
-              <!-- causes validation errors, needs li to pass validator?
-              <xsl:element name="ul">
-              </xsl:element>-->
-
-              <xsl:element name="ul">
-                <xsl:variable name="menu"><xsl:value-of select="@id" /></xsl:variable>
-                        <xsl:for-each select="/buildinfo/menuset/menu[@parent='fs']">
-                          <!--<xsl:sort select="@id"/>-->
-                          <xsl:sort select="@priority" />
-                          <xsl:variable name="id"><xsl:value-of select="@id" /></xsl:variable>
-                          <xsl:element name="li">
-                            <xsl:choose>
-                              <xsl:when test="not(string(.))">
-                                <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
-                              </xsl:when>
-                              <xsl:when test=". = concat(/buildinfo/@filename ,'.html')">
-                                <xsl:element name="span">
-                                <xsl:attribute name="id">selected</xsl:attribute>
-                                  <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
-                                </xsl:element>
-                              </xsl:when>
-                              <xsl:otherwise>
-                                <xsl:element name="a">
-                                  <xsl:attribute name="href"><xsl:value-of select="." /></xsl:attribute>
-                                  <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
-                                </xsl:element>
-                              </xsl:otherwise>
-                            </xsl:choose>
-                          </xsl:element> <!-- /li -->
-                        </xsl:for-each>
-              </xsl:element>
-              <!--/ul-->
-            </xsl:element>
-              
-          </xsl:element>
-          <!--/ul#menu-list-->
-        </xsl:element>
-        <!--/nav#full-menu-->
-
+        <xsl:include href="footer_sitenav.xsl" />
         <xsl:element name="hr" />
-
-        <xsl:element name="section">
-          <xsl:attribute name="id">source</xsl:attribute>
-
-          <!-- "Last changed" magic -->
-          <p>
-            <xsl:variable name="timestamp">
-              <xsl:value-of select="/buildinfo/document/timestamp"/>
-            </xsl:variable>
-                <!-- FIXME: over time, all pages should have the timestamp -->
-                <!--        tags, so this conditional could be removed     -->
-            <xsl:if test="string-length($timestamp) &gt; 0">
-              <xsl:variable name="Date">
-                <xsl:value-of select="substring-before(substring-after($timestamp, 'Date: '), ' $')"/>
-              </xsl:variable>
-              <xsl:variable name="Author">
-                <xsl:value-of select="substring-before(substring-after($timestamp, 'Author: '), ' $')"/>
-              </xsl:variable>
-              <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'lastchanged'" /></xsl:call-template>
-              <xsl:value-of select="translate ($Date, '/', '-')"/>
-              (<xsl:value-of select="$Author"/>)
-            </xsl:if>
-          </p>
-
-          <ul>
-            <li>
-              <!-- Link to the XHTML source -->
-              <xsl:element name="a">
-                <xsl:attribute name="href">
-                  <xsl:text>/source</xsl:text>
-                  <xsl:value-of select="/buildinfo/@filename"/>
-                  <xsl:text>.</xsl:text>
-                  <xsl:value-of select="/buildinfo/document/@language"/>
-                  <xsl:text>.xhtml</xsl:text>
-                </xsl:attribute>
-                <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'source'" /></xsl:call-template>
-              </xsl:element>
-            </li>
-            <li>
-                <a href="/contribute/web/"><xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'contribute-web'" /></xsl:call-template></a>
-            </li>
-          </ul>
-
-          <p>
-            <a href="/contribute/translators/">
-              <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'translate'" /></xsl:call-template>
-            </a>
-            <!-- Insert the appropriate translation notice -->
-            <xsl:if test="/buildinfo/document/@language!=/buildinfo/@original">
-              <xsl:element name="br"></xsl:element>
-              <xsl:choose>
-                <xsl:when test="/buildinfo/document/translator">
-                  <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'translator1a'" /></xsl:call-template>
-                  <xsl:value-of select="/buildinfo/document/translator"/>
-                  <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'translator1b'" /></xsl:call-template>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'translator2'" /></xsl:call-template>
-                </xsl:otherwise>
-              </xsl:choose>
-              <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'translator3a'" /></xsl:call-template>
-              <xsl:element name="a">
-                <xsl:attribute name="href">
-                  <xsl:value-of select="/buildinfo/@filename"/>
-                  <xsl:text>.en.html</xsl:text>
-                </xsl:attribute>
-                <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'translator3b'" /></xsl:call-template>
-              </xsl:element>
-              <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'translator3c'" /></xsl:call-template>
-            </xsl:if>
-          </p>
-      
-        </xsl:element>
-        <!--/section#source-->
-
-        <xsl:element name="section">
-          <xsl:attribute name="id">legal-info</xsl:attribute>
-
-          <p>Copyright © 2001-2014 <a href="/"><xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'fsfeurope'" /></xsl:call-template></a>.</p> 
-          <ul>
-            <li><a href="/contact/contact.html"> <xsl:call-template
-                  name="fsfe-gettext"><xsl:with-param name="id"
-                    select="'contact-us'" /></xsl:call-template></a></li>
-            <li><a href="/about/legal/imprint.html"> <xsl:call-template
-                  name="fsfe-gettext"><xsl:with-param name="id"
-                    select="'imprint'" /></xsl:call-template> </a> / 
-              <a href="/about/legal/imprint.html#id-privacy-policy" class="privacy-policy"> <xsl:call-template
-                  name="fsfe-gettext"><xsl:with-param name="id"
-                    select="'privacy-policy'" /></xsl:call-template> </a> </li>
-          </ul>
-          <p><xsl:call-template name="fsfe-gettext"><xsl:with-param name="id"
-                select="'permission'" /></xsl:call-template></p>
-        </xsl:element>
-        <!--/section#legal-info-->
+        <xsl:include href="footer_sourcelink.xsl" />
+        <xsl:include href="footer_legal.xsl" />
 
         <xsl:element name="section">
           <xsl:attribute name="id">sister-organisations</xsl:attribute>
@@ -1178,30 +50,8 @@
       </xsl:element>
       <!--/footer#bottom-->
     
+      <xsl:include href="body_scripts.xsl" />
 
-
-
-	<!-- Piwik -->
-	<script type="text/javascript">
-	//enable piwik on plain text page only
-	pkBaseURL = "http://piwik.fsfe.org/";
-	if ("http:" == document.location.protocol) {
-	  document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-	}
-	</script>
-	<script type="text/javascript">
-	try {
-	var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 4);
-	piwikTracker.trackPageView();
-	piwikTracker.enableLinkTracking();
-	} catch( err ) {}
-	</script>
-	<!-- End Piwik Tracking Code -->
-
-        <script src="/scripts/bootstrap-3.0.3.min.js"></script>
-        <script src="/scripts/master.js"></script>
-        <script src="/scripts/placeholder.js"></script>
-        <script src="/scripts/highlight.pack.js"></script>
     </body>
   </xsl:template>
 
diff --git a/build/xslt/fsfe_document.xsl b/build/xslt/fsfe_document.xsl
index 762053ae0e..81691d9acd 100644
--- a/build/xslt/fsfe_document.xsl
+++ b/build/xslt/fsfe_document.xsl
@@ -26,4 +26,10 @@
       <xsl:call-template name="fsfe-body" />
     </xsl:element>
   </xsl:template>
+
+  <!-- If no template matching <body> is found in the current page's XSL file, this one will be used -->
+  <xsl:template match="body" priority="-1">
+    <xsl:apply-templates />
+  </xsl:template>
+
 </xsl:stylesheet>
diff --git a/build/xslt/fsfe_followupsection.xsl b/build/xslt/fsfe_followupsection.xsl
new file mode 100644
index 0000000000..56f6be0017
--- /dev/null
+++ b/build/xslt/fsfe_followupsection.xsl
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
+
+  <xsl:element name="section">
+    <xsl:attribute name="id">followup</xsl:attribute>
+       <!--
+       TODO Okay, so the idea here is to be able to display different "followup" boxes. I would suggest doing it like this:
+        - the xml page shold be able to say that it wants to show a
+            specific boxe and would contain e.g.
+            <followup>subscribe-newsletter</followup> so the page would show
+            the following box. 
+        - if the xml page does not contain any <followup> variable, then we should be able to set a default followup box on our own.
+
+          This has the advantage that depending on priorities, we can show
+          a box in all our pages at the bottom. For instance, when we are
+          in the middle of our yearly fundraising, we could set the default
+          to a "fundraising" box.
+
+       For now, this is just a placeholder, so all pages show the
+       "Subscribe to newsletter" box. Below that, some examples of boxes we
+       should make.
+       -->
+    <xsl:choose>
+      <xsl:when test="/buildinfo/document/followup = 'subscribe-nl'">
+        <xsl:attribute name="class">subscribe-nl</xsl:attribute>
+        <xsl:element name="h2"><xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'subscribe-newsletter'" /></xsl:call-template></xsl:element>
+        <xsl:call-template name="subscribe-nl" />
+      </xsl:when>
+      <xsl:when test="/buildinfo/document/followup = 'support'">
+        <xsl:attribute name="class">support</xsl:attribute>
+        <xsl:element name="h2"><xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'show-support'" /></xsl:call-template></xsl:element>
+        <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'show-support-paragraph'" /></xsl:call-template>
+        <xsl:element name="a">
+          <xsl:attribute name="href">/support/?followupbox</xsl:attribute>
+          <xsl:attribute name="class">btn</xsl:attribute>
+          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'support-fsfe'" /></xsl:call-template>
+        </xsl:element>
+      </xsl:when>
+      <xsl:when test="/buildinfo/document/followup = 'donate'">
+        <xsl:attribute name="class">donate</xsl:attribute>
+        <xsl:element name="h2">
+          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'donate'" /></xsl:call-template>
+        </xsl:element>
+        <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'donate-paragraph'" /></xsl:call-template>
+        <xsl:element name="a">
+          <xsl:attribute name="href">/donate/donate.html#ref-followupbox</xsl:attribute>
+          <xsl:attribute name="class">btn</xsl:attribute>
+          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'donate'" /></xsl:call-template>
+        </xsl:element>
+      </xsl:when>
+      <xsl:when test="/buildinfo/document/followup = 'join'">
+        <xsl:attribute name="class">join</xsl:attribute>
+        <xsl:element name="h2">
+          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'join-fellowship'" /></xsl:call-template>
+        </xsl:element>
+        <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'join-paragraph'" /></xsl:call-template>
+        <xsl:element name="a">
+          <xsl:attribute name="href">/fellowship/join.html#ref-followupbox</xsl:attribute>
+          <xsl:attribute name="class">btn</xsl:attribute>
+          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'join'" /></xsl:call-template>
+        </xsl:element>
+      </xsl:when>
+      <xsl:when test="/buildinfo/document/followup = 'no'">
+        <xsl:attribute name="class">hide</xsl:attribute>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:attribute name="class">subscribe-nl</xsl:attribute>
+        <xsl:element name="h2"><xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'subscribe-newsletter'" /></xsl:call-template></xsl:element>
+        <xsl:call-template name="subscribe-nl" />
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:element>
+  <!--/section#followup-->
+</xsl:stylesheet>
diff --git a/build/xslt/fsfe_mainsection.xsl b/build/xslt/fsfe_mainsection.xsl
new file mode 100644
index 0000000000..e117188a02
--- /dev/null
+++ b/build/xslt/fsfe_mainsection.xsl
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
+
+  <xsl:element name="section">
+    <xsl:attribute name="id">main</xsl:attribute>
+    <xsl:attribute name="role">main</xsl:attribute>
+
+    <xsl:element name="article">
+      <xsl:attribute name="id">content</xsl:attribute>
+      <xsl:if test="/buildinfo/document/body/@microformats">
+        <xsl:attribute name="class"><xsl:value-of select="/buildinfo/document/body/@microformats" /></xsl:attribute>
+      </xsl:if>
+
+      <!-- Here goes the actual content of the <body> node of the input file -->
+      <xsl:apply-templates select="body | /buildinfo/document/event/body | /buildinfo/document/news/body" />
+
+
+    </xsl:element>
+    <!--/article#content-->
+
+    <xsl:if test = "/buildinfo/document/sidebar or /buildinfo/document/@newsdate">
+      <xsl:element name="aside">
+        <xsl:attribute name="id">sidebar</xsl:attribute>
+
+        <xsl:if test="string(/buildinfo/document/@newsdate) and /buildinfo/document/@type = 'newsletter'">
+          <xsl:element name="h3">
+            <xsl:call-template name="fsfe-gettext">
+              <xsl:with-param name="id" select="'receive-newsletter'" />
+            </xsl:call-template>
+          </xsl:element>
+          <xsl:call-template name="subscribe-nl" />
+          <ul>
+            <li><a href="/news/newsletter.html">
+              <xsl:call-template name="fsfe-gettext">
+                  <xsl:with-param name="id" select="'news/nl'" />
+              </xsl:call-template>
+            </a></li>
+            <li><a href="/events/events.html">
+              <xsl:call-template name="fsfe-gettext">
+                  <xsl:with-param name="id" select="'news/events'" />
+              </xsl:call-template>
+            </a></li>
+          </ul>
+        </xsl:if>
+
+        <xsl:if test="string(/buildinfo/document/@newsdate) and count(/buildinfo/document/@type) = 0">
+            <h3>
+              <xsl:call-template name="fsfe-gettext">
+                  <xsl:with-param name="id" select="'fsfe/press'" />
+              </xsl:call-template>
+            </h3>
+            <ul>
+              <li>
+                <a href="/press/press.html">
+                  <xsl:call-template name="fsfe-gettext">
+                      <xsl:with-param name="id" select="'news/press'" />
+                  </xsl:call-template>
+                </a>
+              </li>
+              <li>
+                <a href="/news/news.html">
+                  <xsl:call-template name="fsfe-gettext">
+                      <xsl:with-param name="id" select="'news/news'" />
+                  </xsl:call-template>
+                </a>
+              </li>
+              <li>
+                <a href="/about/basics/freesoftware.html">
+                  <xsl:call-template name="fsfe-gettext">
+                    <xsl:with-param name="id" select="'fs/basics'" />
+                  </xsl:call-template>
+                </a>
+              </li>
+            </ul>
+          </xsl:if>
+
+        <xsl:apply-templates select="/buildinfo/document/sidebar/node()" />
+
+        <xsl:if test="string(/buildinfo/document/@newsdate)">
+            <p>
+              <a href="/donate/index.html" class="small-donate">
+                <xsl:call-template name="fsfe-gettext">
+                  <xsl:with-param name="id" select="'donate'" />
+                </xsl:call-template>
+              </a>
+            </p>
+        </xsl:if>
+        <!--xsl:if test = "/buildinfo/document/sidebar/@news">
+          <xsl:element name="h4">
+            <xsl:call-template name="fsfe-gettext">
+              <xsl:with-param name="id" select="'related-news'" />
+            </xsl:call-template>
+          </xsl:element>
+          <fetch-news />
+          -->
+          <!--FIXME-->
+          <!--ul class="placeholder"><li>
+              <span class="dt-published">11 June 2013</span><a href="/news/2013/news-20130611-01.en.html">Filing taxes without non-free software: Slovak company appeals fines</a>
+          </li></ul-->
+        <!--/xsl:if-->
+
+        <xsl:choose>
+          <xsl:when test = "/buildinfo/document/sidebar/@promo = 'our-work'">
+            <xsl:element name="h3">
+              <xsl:attribute name="class">promo</xsl:attribute>
+              <xsl:call-template name="fsfe-gettext">
+                <xsl:with-param name="id" select="'our-work'" />
+              </xsl:call-template>
+            </xsl:element>
+            <xsl:call-template name="fsfe-gettext">
+              <xsl:with-param name="id" select="'our-work-intro'" />
+            </xsl:call-template>
+            <xsl:element name="a">
+              <xsl:attribute name="href">/work.html</xsl:attribute>
+              <xsl:attribute name="class">learn-more</xsl:attribute>
+              <xsl:call-template name="fsfe-gettext">
+                <xsl:with-param name="id" select="'learn-more'" />
+              </xsl:call-template>
+            </xsl:element>
+          </xsl:when>
+          <xsl:when test = "/buildinfo/document/sidebar/@promo = 'about-fsfe'">
+            <xsl:element name="h3">
+              <xsl:attribute name="class">promo</xsl:attribute>
+              <xsl:call-template name="fsfe-gettext">
+                <xsl:with-param name="id" select="'about-fsfe'" />
+              </xsl:call-template>
+            </xsl:element>
+            <xsl:call-template name="fsfe-gettext">
+              <xsl:with-param name="id" select="'about-fsfe-intro'" />
+            </xsl:call-template>
+            <xsl:element name="a">
+              <xsl:attribute name="href">/about/about.html</xsl:attribute>
+              <xsl:attribute name="class">learn-more</xsl:attribute>
+              <xsl:call-template name="fsfe-gettext">
+                <xsl:with-param name="id" select="'learn-more'" />
+              </xsl:call-template>
+            </xsl:element>
+          </xsl:when>
+          <xsl:when test = "/buildinfo/document/sidebar/@promo = 'donate'">
+            <xsl:element name="h3">
+              <xsl:attribute name="class">promo</xsl:attribute>
+              <xsl:call-template name="fsfe-gettext">
+                <xsl:with-param name="id" select="'donate'" />
+              </xsl:call-template>
+            </xsl:element>
+            <xsl:call-template name="fsfe-gettext">
+              <xsl:with-param name="id" select="'donate-paragraph'" />
+            </xsl:call-template>
+            <xsl:element name="a">
+              <xsl:attribute name="href">/donate/donate.html#ref-sidebar</xsl:attribute>
+              <xsl:attribute name="class">learn-more big-donate</xsl:attribute>
+              <xsl:call-template name="fsfe-gettext">
+                <xsl:with-param name="id" select="'donate'" />
+              </xsl:call-template>
+            </xsl:element>
+          </xsl:when>
+          <xsl:when test = "/buildinfo/document/sidebar/@promo = 'no'">
+          </xsl:when>
+          <!--otherwise display about-fsfe-->
+          <xsl:otherwise>
+            <xsl:element name="h3">
+              <xsl:attribute name="class">promo</xsl:attribute>
+              <xsl:call-template name="fsfe-gettext">
+                <xsl:with-param name="id" select="'about-fsfe'" />
+              </xsl:call-template>
+            </xsl:element>
+            <xsl:call-template name="fsfe-gettext">
+              <xsl:with-param name="id" select="'about-fsfe-intro'" />
+            </xsl:call-template>
+            <xsl:element name="a">
+              <xsl:attribute name="href">/about/about.html</xsl:attribute>
+              <xsl:attribute name="class">learn-more</xsl:attribute>
+              <xsl:call-template name="fsfe-gettext">
+                <xsl:with-param name="id" select="'learn-more'" />
+              </xsl:call-template>
+            </xsl:element>
+          </xsl:otherwise>
+        </xsl:choose>
+
+      </xsl:element>
+      <!--/aside#sidebar-->
+    </xsl:if>
+
+    <xsl:if test = "/buildinfo/document/legal">
+      <xsl:element name="footer">
+
+        <xsl:attribute name="class">copyright notice creativecommons</xsl:attribute>
+        <xsl:choose>
+          <xsl:when test = "/buildinfo/document/legal/license">
+            <xsl:element name="a">
+              <xsl:attribute name="href">
+                <xsl:value-of select="/buildinfo/document/legal/license"/>
+              </xsl:attribute>
+              <xsl:attribute name="rel">license</xsl:attribute>
+                <xsl:if test ="/buildinfo/document/legal/@type='cc-license'">
+                </xsl:if>
+                <xsl:value-of select="/buildinfo/document/legal/notice"/>
+            </xsl:element>
+          </xsl:when>
+
+          <xsl:otherwise>
+            <xsl:element name="span">
+              <xsl:value-of select="/buildinfo/document/legal/notice"/>
+            </xsl:element>
+          </xsl:otherwise>
+        </xsl:choose>
+
+      </xsl:element>
+      <!--/footer-->
+    </xsl:if>
+
+    <!--Depreciated: it's here only for "backward compatibility"  cc license way-->
+    <xsl:if test = "string(/buildinfo/document/head/meta[@name='cc-license']/@content)">
+      <xsl:element name="footer">
+
+        <xsl:element name="div">
+          <xsl:attribute name="id">cc-licenses</xsl:attribute>
+
+          <xsl:element name="p">
+            <xsl:element name="img">
+            <xsl:attribute name="src">/graphics/cc-logo.png</xsl:attribute>
+            <xsl:attribute name="alt">Creative Commons logo</xsl:attribute>
+            </xsl:element> <!-- </img> -->
+            <xsl:for-each select="/buildinfo/document/head/meta[@name='cc-license']">
+              <xsl:value-of select="@content"/> •
+            </xsl:for-each>
+            <!--<xsl:value-of select="/buildinfo/document/head/meta[@name='cc-license-1']/@content" /> • -->
+          </xsl:element> <!-- </p> -->
+
+        </xsl:element> <!-- </div> -->
+        <!-- End cc licenses -->
+
+      </xsl:element>
+      <!--/footer-->
+    </xsl:if>
+
+  </xsl:element>
+  <!--/section#main-->
+
+</xsl:stylesheet>
diff --git a/build/xslt/fsfe_nolocal.xsl b/build/xslt/fsfe_nolocal.xsl
index 0635e5e5ba..1b0a058dc7 100644
--- a/build/xslt/fsfe_nolocal.xsl
+++ b/build/xslt/fsfe_nolocal.xsl
@@ -29,4 +29,10 @@
     </xsl:copy>
   </xsl:template>
 
+  <xsl:template match="@dt:*">
+    <xsl:attribute name="{local-name()}">
+      <xsl:value-of select="." />
+    </xsl:attribute>
+  </xsl:template>
+
 </xsl:stylesheet>
diff --git a/build/xslt/fsfe_pageclass.xsl b/build/xslt/fsfe_pageclass.xsl
new file mode 100644
index 0000000000..3707def8d9
--- /dev/null
+++ b/build/xslt/fsfe_pageclass.xsl
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
+
+  <!--Apply appopriate styles for the whole page -->
+  <xsl:if test="/buildinfo/document/body/@class">
+    <xsl:attribute name="class">
+      <xsl:value-of select="/buildinfo/document/body/@class" />
+    </xsl:attribute>
+  </xsl:if>
+  <xsl:if test="/buildinfo/document/body/@id">
+    <xsl:attribute name="id"><xsl:value-of select="/buildinfo/document/body/@id" /></xsl:attribute>
+  </xsl:if>
+  <xsl:if test="string(/buildinfo/document/@newsdate) and count(/buildinfo/document/@type) = 0">
+    <xsl:attribute name="class">
+      <xsl:value-of select="/buildinfo/document/body/@class" /> press release</xsl:attribute>
+  </xsl:if>
+  <xsl:if test="string(/buildinfo/document/@newsdate) and /buildinfo/document/@type = 'newsletter'">
+    <xsl:attribute name="class">
+      <xsl:value-of select="/buildinfo/document/body/@class" /> newsletter article</xsl:attribute>
+  </xsl:if>
+</xsl:stylesheet>
diff --git a/build/xslt/fsfe_pageheader.xsl b/build/xslt/fsfe_pageheader.xsl
new file mode 100644
index 0000000000..5a33f462bd
--- /dev/null
+++ b/build/xslt/fsfe_pageheader.xsl
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
+
+  <xsl:element name="header">
+    <xsl:attribute name="id">top</xsl:attribute>
+
+    <xsl:element name="nav">
+      <xsl:attribute name="id">menu</xsl:attribute>
+      <xsl:attribute name="role">navigation</xsl:attribute>
+
+      <xsl:element name="div">
+        <xsl:attribute name="id">direct-links</xsl:attribute>
+
+        <xsl:element name="span">
+          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'go-to'" /></xsl:call-template>
+        </xsl:element>
+
+        <xsl:element name="a">
+          <xsl:attribute name="href">#menu-list</xsl:attribute>
+          <xsl:attribute name="id">direct-to-menu-list</xsl:attribute>
+          <xsl:attribute name="data-toggle">collapse</xsl:attribute>
+          <xsl:attribute name="data-target">#menu-list</xsl:attribute>
+          <xsl:element name="i">
+            <xsl:attribute name="class">fa fa-bars fa-lg</xsl:attribute>
+          </xsl:element>
+          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'menu'" /></xsl:call-template>
+        </xsl:element>
+
+        <xsl:element name="a">
+          <xsl:attribute name="href">#content</xsl:attribute>
+          <xsl:attribute name="id">direct-to-content</xsl:attribute>
+          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'content'" /></xsl:call-template>
+        </xsl:element>
+
+        <xsl:element name="a">
+          <xsl:attribute name="href">#full-menu</xsl:attribute>
+          <xsl:attribute name="id">direct-to-full-menu</xsl:attribute>
+          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'sitemap'" /></xsl:call-template>
+        </xsl:element>
+
+        <xsl:element name="a">
+          <xsl:attribute name="href">#source</xsl:attribute>
+          <xsl:attribute name="id">direct-to-source</xsl:attribute>
+          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'page-info'" /></xsl:call-template>
+        </xsl:element>
+
+        <xsl:element name="a">
+          <xsl:attribute name="href">#translations</xsl:attribute>
+          <xsl:attribute name="id">direct-to-translations</xsl:attribute>
+          <xsl:attribute name="data-toggle">collapse</xsl:attribute>
+          <xsl:attribute name="data-target">#translations</xsl:attribute>
+          <xsl:element name="i">
+            <xsl:attribute name="class">fa fa-globe fa-lg</xsl:attribute>
+          </xsl:element>
+          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'change-lang'" /></xsl:call-template>
+        </xsl:element>
+
+        <xsl:element name="a">
+          <xsl:attribute name="href">/</xsl:attribute>
+          <xsl:attribute name="id">direct-to-home</xsl:attribute>
+          <xsl:element name="i">
+            <xsl:attribute name="class">fa fa-home fa-lg</xsl:attribute>
+          </xsl:element>
+          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'fsfeurope'" /></xsl:call-template>
+        </xsl:element>
+
+      </xsl:element>
+      <!--/div#direct-links-->
+
+      <xsl:element name="ul">
+        <xsl:attribute name="id">menu-list</xsl:attribute>
+        <xsl:element name="li">
+          <xsl:element name="a">
+            <xsl:attribute name="href">/about/about.html</xsl:attribute>
+            <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'fsfe/about'" /></xsl:call-template>
+          </xsl:element>
+        </xsl:element>
+        <xsl:element name="li">
+          <xsl:element name="a">
+            <xsl:attribute name="href">/projects/work.html</xsl:attribute>
+            <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'fsfe/projects'" /></xsl:call-template>
+          </xsl:element>
+        </xsl:element>
+        <xsl:element name="li">
+          <xsl:element name="a">
+            <xsl:attribute name="href">/campaigns/campaigns.html</xsl:attribute>
+            <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'fsfe/campaigns'" /></xsl:call-template>
+          </xsl:element>
+        </xsl:element>
+        <xsl:element name="li">
+          <xsl:element name="a">
+            <xsl:attribute name="href">/contribute/contribute.html</xsl:attribute>
+            <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'fsfe/help'" /></xsl:call-template>
+          </xsl:element>
+        </xsl:element>
+        <xsl:element name="li">
+          <xsl:element name="a">
+            <xsl:attribute name="href">/press/press.html</xsl:attribute>
+            <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'fsfe/press'" /></xsl:call-template>
+          </xsl:element>
+        </xsl:element>
+      </xsl:element>
+      <!--/ul#menu-list-->
+
+      <xsl:element name="div">
+        <xsl:attribute name="id">search</xsl:attribute>
+
+          <xsl:element name="form">
+            <xsl:attribute name="method">get</xsl:attribute>
+            <xsl:attribute name="action">http://fsfe.yacy.de/yacysearch.html</xsl:attribute>
+
+            <xsl:element name="input">
+              <xsl:attribute name="type">hidden</xsl:attribute>
+              <xsl:attribute name="name">verify</xsl:attribute>
+              <xsl:attribute name="value">true</xsl:attribute>
+            </xsl:element>
+
+            <xsl:element name="input">
+              <xsl:attribute name="type">hidden</xsl:attribute>
+              <xsl:attribute name="name">maximumRecords</xsl:attribute>
+              <xsl:attribute name="value">10</xsl:attribute>
+            </xsl:element>
+
+            <xsl:element name="input">
+              <xsl:attribute name="type">hidden</xsl:attribute>
+              <xsl:attribute name="name">meanCount</xsl:attribute>
+              <xsl:attribute name="value">5</xsl:attribute>
+            </xsl:element>
+
+            <xsl:element name="input">
+              <xsl:attribute name="type">hidden</xsl:attribute>
+              <xsl:attribute name="name">resource</xsl:attribute>
+              <xsl:attribute name="value">local</xsl:attribute>
+            </xsl:element>
+
+            <xsl:element name="input">
+              <xsl:attribute name="type">hidden</xsl:attribute>
+              <xsl:attribute name="name">prefermaskfilter</xsl:attribute>
+              <xsl:attribute name="value">.*.<xsl:value-of select="/buildinfo/@language"/>.html</xsl:attribute>
+            </xsl:element>
+
+            <xsl:element name="input">
+              <xsl:attribute name="type">hidden</xsl:attribute>
+              <xsl:attribute name="name">prefermaskfilter</xsl:attribute>
+              <xsl:attribute name="value">.*</xsl:attribute>
+            </xsl:element>
+
+            <xsl:element name="input">
+              <xsl:attribute name="type">hidden</xsl:attribute>
+              <xsl:attribute name="name">display</xsl:attribute>
+              <xsl:attribute name="value">2</xsl:attribute>
+            </xsl:element>
+
+            <xsl:element name="input">
+              <xsl:attribute name="type">hidden</xsl:attribute>
+              <xsl:attribute name="name">nav</xsl:attribute>
+              <xsl:attribute name="value">hosts</xsl:attribute>
+            </xsl:element>
+
+            <xsl:element name="p">
+              <xsl:element name="input">
+                <xsl:attribute name="type">image</xsl:attribute>
+                <xsl:attribute name="src">/graphics/icons/search-button.png</xsl:attribute>
+                <xsl:attribute name="alt">
+                  <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'search'" /></xsl:call-template>
+                </xsl:attribute>
+              </xsl:element>
+
+              <xsl:element name="input">
+                <xsl:attribute name="type">text</xsl:attribute>
+                <xsl:attribute name="name">query</xsl:attribute>
+                <xsl:attribute name="placeholder">
+                  <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'search'" /></xsl:call-template>
+                </xsl:attribute>
+              </xsl:element>
+
+              <!--
+              <xsl:element name="input">
+                <xsl:attribute name="type">submit</xsl:attribute>
+                <xsl:attribute name="name">search</xsl:attribute>
+                <xsl:attribute name="value">
+                  <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'submit'" /></xsl:call-template>
+                </xsl:attribute>
+              </xsl:element>
+              -->
+            </xsl:element>
+
+          </xsl:element>
+          <!--/form-->
+      </xsl:element>
+      <!--/div#search-->
+
+
+    </xsl:element>
+    <!--/nav#menu-->
+
+
+    <xsl:element name="div">
+      <xsl:attribute name="id">masthead</xsl:attribute>
+
+      <xsl:element name="div">
+        <xsl:attribute name="id">link-home</xsl:attribute>
+        <xsl:element name="a">
+          <xsl:attribute name="href">
+              <xsl:value-of select="$urlprefix"/>
+          </xsl:attribute>
+          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'rootpage'" /></xsl:call-template>
+        </xsl:element>
+      </xsl:element>
+      <!--/div#link-home-->
+
+      <xsl:element name="div">
+        <xsl:attribute name="id">logo</xsl:attribute>
+        <xsl:element name="span">
+              <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'fsfeurope'" /></xsl:call-template>
+          </xsl:element>
+      </xsl:element>
+      <!--/div#logo-->
+
+      <xsl:element name="div">
+        <xsl:attribute name="id">motto</xsl:attribute>
+        <xsl:element name="span"><xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'motto-fsfs'" /></xsl:call-template></xsl:element>
+        <!-- TODO different motto content depending on planet (use 'motto-planet'), wiki (use 'motto-wiki'), or fsfe dot org, page, so we may have to change this to another way-->
+      </xsl:element>
+      <!--/div#motto-->
+
+    </xsl:element>
+    <!--/div#masthead-->
+
+  </xsl:element>
+  <!--/header#top-->
+
+</xsl:stylesheet>
diff --git a/build/xslt/notifications.xsl b/build/xslt/notifications.xsl
new file mode 100644
index 0000000000..e6cebc6d01
--- /dev/null
+++ b/build/xslt/notifications.xsl
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
+
+  <xsl:element name="div">
+    <xsl:attribute name="id">notifications</xsl:attribute>
+
+    <!-- Service notice (for downtime, upgrades, etc. enable this)
+    <div id="service-notice">
+      <div class="close">
+        <a title="dismiss this notification">×</a>
+      </div>
+
+      <div class="text">
+        <h1>Site currently under development</h1>
+
+        <p>
+          If you want to help out, <a
+          href="/contribute/web/web.en.html">consider joining the
+          web team</a>.
+        </p>
+      </div>
+    </div>-->
+
+    <!-- Outdated note -->
+    <xsl:if test="/buildinfo/@outdated='yes'">
+      <xsl:element name="div">
+    <xsl:attribute name="class">alert warning red</xsl:attribute>
+        <xsl:element name="a">
+          <xsl:attribute name="class">close</xsl:attribute>
+          <xsl:attribute name="data-dismiss">alert</xsl:attribute>
+          <xsl:attribute name="href">#</xsl:attribute>
+          <xsl:attribute name="aria-hidden">true</xsl:attribute>
+          ×
+        </xsl:element>
+          <xsl:element name="p">
+    <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'outdated-1'" /></xsl:call-template>
+          <xsl:element name="a">
+            <xsl:attribute name="href">
+              <xsl:value-of select="/buildinfo/@filename"/>
+              <xsl:text>.en.html</xsl:text>
+            </xsl:attribute>
+            <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'translator3b'" /></xsl:call-template>
+          </xsl:element>.
+    <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'outdated-2'" /></xsl:call-template>
+      </xsl:element>
+      </xsl:element>
+    </xsl:if>
+
+    <!-- Missing translation note -->
+    <xsl:if test="/buildinfo/@language!=/buildinfo/document/@language">
+      <xsl:element name="div">
+    <xsl:attribute name="class">alert warning red</xsl:attribute>
+        <xsl:element name="a">
+          <xsl:attribute name="class">close</xsl:attribute>
+          <xsl:attribute name="data-dismiss">alert</xsl:attribute>
+          <xsl:attribute name="href">#</xsl:attribute>
+          <xsl:attribute name="aria-hidden">true</xsl:attribute>
+          ×
+        </xsl:element>
+          <xsl:element name="p">
+    <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'notranslation'" /></xsl:call-template>
+      </xsl:element>
+      </xsl:element>
+    </xsl:if>
+
+    <!-- Info box -->
+    <xsl:element name="div">
+      <xsl:attribute name="id">infobox</xsl:attribute>
+      <!-- Add under construction message -->
+      <xsl:if test = "/buildinfo/document/head/meta[@name='under-construction' and @content='true']">
+        <xsl:element name="div">
+          <xsl:attribute name="class">alert warning yellow</xsl:attribute>
+        <xsl:element name="a">
+          <xsl:attribute name="class">close</xsl:attribute>
+          <xsl:attribute name="data-dismiss">alert</xsl:attribute>
+          <xsl:attribute name="href">#</xsl:attribute>
+          <xsl:attribute name="aria-hidden">true</xsl:attribute>
+          ×
+        </xsl:element>
+          <xsl:element name="p">
+          <xsl:call-template name="fsfe-gettext">
+            <xsl:with-param name="id" select="'under-construction'" />
+          </xsl:call-template>
+        </xsl:element>
+      </xsl:element>
+      </xsl:if>
+      <!-- Add project completed message -->
+      <xsl:if test = "/buildinfo/document/head/meta[@name='project-complete' and @content='true']">
+        <xsl:element name="div">
+          <xsl:attribute name="class">alert warning green</xsl:attribute>
+        <xsl:element name="a">
+          <xsl:attribute name="class">close</xsl:attribute>
+          <xsl:attribute name="data-dismiss">alert</xsl:attribute>
+          <xsl:attribute name="href">#</xsl:attribute>
+          <xsl:attribute name="aria-hidden">true</xsl:attribute>
+          ×
+        </xsl:element>
+          <xsl:element name="p">
+          <xsl:call-template name="fsfe-gettext">
+            <xsl:with-param name="id" select="'project-complete'" />
+          </xsl:call-template>
+        </xsl:element>
+      </xsl:element>
+      </xsl:if>
+    </xsl:element>
+                                                                                            
+    <!-- Fundraising box
+      <xsl:element name="div">
+    <xsl:attribute name="id">fundraising</xsl:attribute>
+      <xsl:element name="h2">
+        <xsl:apply-templates select="/buildinfo/fundraising/call1/node()"/>
+      </xsl:element>
+      <xsl:element name="div">
+        <xsl:attribute name="class">button</xsl:attribute>
+        <xsl:apply-templates select="/buildinfo/fundraising/call2/node()"/>
+      </xsl:element>
+      <xsl:element name="div">
+        <xsl:attribute name="class">button</xsl:attribute>
+        <xsl:apply-templates select="/buildinfo/fundraising/call3/node()"/>
+      </xsl:element>
+      <xsl:element name="img">
+        <xsl:attribute name="src">/graphics/wreath.png</xsl:attribute>
+        <xsl:attribute name="alt">wreath</xsl:attribute>
+        <xsl:attribute name="class">right</xsl:attribute>
+      </xsl:element>
+      <xsl:element name="p">
+        <xsl:attribute name="class">call4</xsl:attribute>
+        <xsl:apply-templates select="/buildinfo/fundraising/call4/node()"/>
+      </xsl:element>
+      disabling the progress bar
+      <xsl:if test="/buildinfo/fundraising/current">
+        <xsl:element name="div">
+          <xsl:attribute name="class">percentbox</xsl:attribute>
+          <xsl:element name="div">
+        <xsl:attribute name="class">percentbar</xsl:attribute>
+        <xsl:attribute name="style">width: 45.9%</xsl:attribute>
+          </xsl:element>
+        </xsl:element>
+        <xsl:element name="p">
+          <xsl:attribute name="class">current</xsl:attribute>
+          <xsl:apply-templates select="/buildinfo/fundraising/current/node()"/>
+          <xsl:text>€ 45 860</xsl:text>
+        </xsl:element>
+        <xsl:element name="p">
+          <xsl:attribute name="class">target</xsl:attribute>
+          <xsl:text>€ 100 000</xsl:text>
+        </xsl:element>
+      </xsl:if> c
+    </xsl:element>-->
+    <!-- End Fundraising box -->
+  </xsl:element>
+
+</xsl:stylesheet>
diff --git a/build/xslt/translation_list.xsl b/build/xslt/translation_list.xsl
new file mode 100644
index 0000000000..4217c6463f
--- /dev/null
+++ b/build/xslt/translation_list.xsl
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
+
+  <xsl:element name="div">
+    <xsl:attribute name="id">translations</xsl:attribute>
+    <xsl:attribute name="class">alert</xsl:attribute>
+
+    <xsl:element name="a">
+      <xsl:attribute name="class">close</xsl:attribute>
+      <xsl:attribute name="data-toggle">collapse</xsl:attribute>
+      <xsl:attribute name="data-target">#translations</xsl:attribute>
+      <xsl:attribute name="href">#</xsl:attribute>
+      ×
+    </xsl:element>
+
+    <xsl:element name="a">
+      <xsl:attribute name="class">contribute-translation</xsl:attribute>
+      <xsl:attribute name="href">/contribute/translators/</xsl:attribute>
+      <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'translate'" /></xsl:call-template>
+    </xsl:element>
+
+    <xsl:element name="ul">
+      <xsl:for-each select="/buildinfo/trlist/tr">
+        <xsl:sort select="@id" />
+        <xsl:choose>
+          <xsl:when test="@id=/buildinfo/@language">
+            <xsl:element name="li">
+              <xsl:value-of select="." disable-output-escaping="yes"/>
+            </xsl:element>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:element name="li">
+              <xsl:element name="a">
+                <xsl:attribute name="href"><xsl:value-of select="/buildinfo/@filename"/>.<xsl:value-of select="@id"/>.html</xsl:attribute>
+                <xsl:value-of select="." disable-output-escaping="yes"/>
+              </xsl:element>
+            </xsl:element>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:for-each>
+    </xsl:element>
+  </xsl:element>
+</xsl:stylesheet>
diff --git a/fsfe.xsl b/fsfe.xsl
index c40b3b0dd8..dd8c4b6d0a 100644
--- a/fsfe.xsl
+++ b/fsfe.xsl
@@ -16,9 +16,6 @@
   <xsl:include href="build/xslt/fsfe_headings.xsl" />
   <xsl:include href="build/xslt/fsfe_localmenu.xsl" />
 
-  <xsl:include href="build/xslt/support_js.xsl" />
-  <xsl:include href="build/xslt/support_countries.xsl" />
-
   <!-- Do not copy non-HTML elements to output -->
   <xsl:include href="build/xslt/fsfe_nolocal.xsl" />
 
@@ -30,17 +27,6 @@
     <xsl:apply-templates select="@*|node()"/>
   </xsl:template>
   
-  <!-- If no template matching <body> is found in the current page's XSL file, this one will be used -->
-  <xsl:template match="body" priority="-1">
-    <xsl:apply-templates />
-  </xsl:template>
-
-  <xsl:template match="@dt:*">
-    <xsl:attribute name="{local-name()}">
-      <xsl:value-of select="." />
-    </xsl:attribute>
-  </xsl:template>
-
  <!--FIXME ↓-->
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
diff --git a/support/default.xsl b/support/default.xsl
new file mode 100644
index 0000000000..75d4a5a386
--- /dev/null
+++ b/support/default.xsl
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:dt="http://xsltsl.org/date-time"
+  exclude-result-prefixes="dt"
+  xmlns:str="http://exslt.org/strings"
+  extension-element-prefixes="str">
+
+  <xsl:import href="../fsfe.xsl" />
+
+  <xsl:include href="../build/xslt/support_js.xsl" />
+  <xsl:include href="../build/xslt/support_countries.xsl" />
+</xsl:stylesheet>