diff --git a/about/codeofconduct.xsl b/about/codeofconduct.xsl
index 1ecb92ab2f..ecab773825 100644
--- a/about/codeofconduct.xsl
+++ b/about/codeofconduct.xsl
@@ -1,14 +1,10 @@
 <?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">
-  
-  <xsl:import href="../build/xslt/people.xsl" />
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
-  
+  <xsl:import href="../build/xslt/people.xsl" />
+
   <xsl:template match="care-team-list">
     <xsl:copy-of select="document('codeofconduct-careteam.en.xml')"/>
   </xsl:template>
-
 </xsl:stylesheet>
diff --git a/about/graphics/sponsoring/sponsoring.xsl b/about/graphics/sponsoring/sponsoring.xsl
index 7558ca2684..a00e6ae392 100644
--- a/about/graphics/sponsoring/sponsoring.xsl
+++ b/about/graphics/sponsoring/sponsoring.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../../../fsfe.xsl" />
@@ -26,7 +26,7 @@
             <xsl:attribute name="src"><xsl:value-of select="$year" />/<xsl:value-of select="@type" /><xsl:value-of select="$year" />_w_medium.png</xsl:attribute>
           </xsl:element>
           <!-- white background -->
-          <xsl:element name="p"><xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'background/white'" /></xsl:call-template>: 
+          <xsl:element name="p"><xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'background/white'" /></xsl:call-template>:
             <xsl:text>[</xsl:text>
             <xsl:element name="a">
               <xsl:attribute name="href"><xsl:value-of select="$year" />/<xsl:value-of select="@type" /><xsl:value-of select="$year" />_w_huge.png</xsl:attribute>
@@ -53,7 +53,7 @@
             <xsl:text>]</xsl:text>
           </xsl:element>
           <!-- transparent background -->
-          <xsl:element name="p"><xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'background/transparent'" /></xsl:call-template>: 
+          <xsl:element name="p"><xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'background/transparent'" /></xsl:call-template>:
             <xsl:text>[</xsl:text>
             <xsl:element name="a">
               <xsl:attribute name="href"><xsl:value-of select="$year" />/<xsl:value-of select="@type" /><xsl:value-of select="$year" />_t_huge.png</xsl:attribute>
diff --git a/about/localteams.xsl b/about/localteams.xsl
index 73b90167a7..48e80e3730 100644
--- a/about/localteams.xsl
+++ b/about/localteams.xsl
@@ -1,15 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-  <xsl:import href="../build/xslt/people.xsl" />
   <xsl:import href="../fsfe.xsl" />
-
-  <!--
-    For documentation on tagging (e.g. display a people list), take a
-    look at the documentation under
-      /tools/xsltsl/documentation-tagging.txt
-  -->
+  <xsl:import href="../build/xslt/people.xsl" />
 
   <!-- Fill dynamic content -->
 
diff --git a/about/team.xsl b/about/team.xsl
index 883f10e8fb..3e8d059367 100644
--- a/about/team.xsl
+++ b/about/team.xsl
@@ -1,17 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-  <xsl:import href="../build/xslt/people.xsl" />
   <xsl:import href="../fsfe.xsl" />
-
-  <!--
-    For documentation on tagging (e.g. display a people list), take a
-    look at the documentation under
-      /tools/xsltsl/documentation-tagging.txt
-  -->
+  <xsl:import href="../build/xslt/people.xsl" />
 
   <!-- Fill dynamic content -->
+
   <!-- All people with council tag -->
   <xsl:template match="council-members">
     <xsl:call-template name="country-people-list">
diff --git a/activities/education/education.xsl b/activities/education/education.xsl
index c35cd16151..c3953381a7 100644
--- a/activities/education/education.xsl
+++ b/activities/education/education.xsl
@@ -1,25 +1,22 @@
 <?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">
-  
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../../fsfe.xsl" />
-  
+
   <!--define dynamic list of country news items-->
     <xsl:template match="country-news">
         <xsl:call-template name="fetch-news">
             <xsl:with-param name="nb-items" select="3" />
         </xsl:call-template>
     </xsl:template>
-    
+
     <!--define dynamic list of country event items-->
     <xsl:template match="country-events">
         <!-- Current events -->
         <xsl:call-template name="fetch-events">
             <xsl:with-param name="wanted-time" select="'present'" />
         </xsl:call-template>
-        
+
         <!-- Future events -->
         <xsl:call-template name="fetch-events">
             <xsl:with-param name="wanted-time" select="'future'" />
diff --git a/activities/ftf/avm-gpl-violation.xsl b/activities/ftf/avm-gpl-violation.xsl
index 7b7d78c009..2c649541d5 100644
--- a/activities/ftf/avm-gpl-violation.xsl
+++ b/activities/ftf/avm-gpl-violation.xsl
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../../tags/default.xsl" />
   <xsl:import href="../../fsfe.xsl" />
-  
-  <!-- In /html/body node, append dynamic content -->
+  <xsl:import href="../../tags/default.xsl" />
+
   <xsl:template match="tagged-docs">
     <xsl:call-template name="tagged-news" />
   </xsl:template>
diff --git a/activities/os/os.xsl b/activities/os/os.xsl
index 53508b1f48..0d594e8699 100644
--- a/activities/os/os.xsl
+++ b/activities/os/os.xsl
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  
   <xsl:import href="../../fsfe.xsl" />
-  
+
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
       <xsl:with-param name="nb-items" select="5"/>
     </xsl:call-template>
   </xsl:template>
-  
+
   <!-- How to show a link -->
   <xsl:template match="/buildinfo/document/set/news/link">
     <xsl:element name="a">
@@ -21,5 +20,5 @@
       <xsl:text>]</xsl:text>
     </xsl:element>
   </xsl:template>
-  
+
 </xsl:stylesheet>
diff --git a/activities/procurement/procurement.xsl b/activities/procurement/procurement.xsl
index 9927af7cff..931bc92ecc 100644
--- a/activities/procurement/procurement.xsl
+++ b/activities/procurement/procurement.xsl
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  
   <xsl:import href="../../fsfe.xsl" />
-  
+
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
       <xsl:with-param name="nb-items" select="15"/>
     </xsl:call-template>
   </xsl:template>
-  
+
   <!-- How to show a link -->
   <xsl:template match="/buildinfo/document/set/news/link">
     <xsl:element name="a">
@@ -21,5 +20,5 @@
       <xsl:text>]</xsl:text>
     </xsl:element>
   </xsl:template>
-  
+
 </xsl:stylesheet>
diff --git a/activities/radiodirective/radiodirective.xsl b/activities/radiodirective/radiodirective.xsl
index 96167d388d..76d01a51dc 100644
--- a/activities/radiodirective/radiodirective.xsl
+++ b/activities/radiodirective/radiodirective.xsl
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  
   <xsl:import href="../../fsfe.xsl" />
-  
+
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
       <xsl:with-param name="nb-items" select="5"/>
       <xsl:with-param name="sidebar" select="'yes'"/>
     </xsl:call-template>
   </xsl:template>
-  
+
 </xsl:stylesheet>
diff --git a/activities/radiodirective/statement.xsl b/activities/radiodirective/statement.xsl
index 1dc660ac74..4e4732b091 100644
--- a/activities/radiodirective/statement.xsl
+++ b/activities/radiodirective/statement.xsl
@@ -6,5 +6,5 @@
   <xsl:template match="sigtable">
     <xsl:copy-of select="document('sigtable.en.xml')"/>
   </xsl:template>
-  
+
 </xsl:stylesheet>
diff --git a/activities/routers/routers.xsl b/activities/routers/routers.xsl
index 9927af7cff..931bc92ecc 100644
--- a/activities/routers/routers.xsl
+++ b/activities/routers/routers.xsl
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  
   <xsl:import href="../../fsfe.xsl" />
-  
+
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
       <xsl:with-param name="nb-items" select="15"/>
     </xsl:call-template>
   </xsl:template>
-  
+
   <!-- How to show a link -->
   <xsl:template match="/buildinfo/document/set/news/link">
     <xsl:element name="a">
@@ -21,5 +20,5 @@
       <xsl:text>]</xsl:text>
     </xsl:element>
   </xsl:template>
-  
+
 </xsl:stylesheet>
diff --git a/activities/wipo/wipo.xsl b/activities/wipo/wipo.xsl
index 33bc360f5a..06a40ad23d 100644
--- a/activities/wipo/wipo.xsl
+++ b/activities/wipo/wipo.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../../fsfe.xsl" />
diff --git a/activities/wipo/wiwo.xsl b/activities/wipo/wiwo.xsl
index 596ac0fae8..cb44477c16 100644
--- a/activities/wipo/wiwo.xsl
+++ b/activities/wipo/wiwo.xsl
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<xsl:stylesheet version="1.0"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<?xml version="1.0" encoding="UTF-8"?>
 
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../../fsfe.xsl" />
 
   <xsl:template match="signatories">
diff --git a/associates/associates.xsl b/associates/associates.xsl
index 9d99f6e365..40dc5dc361 100644
--- a/associates/associates.xsl
+++ b/associates/associates.xsl
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<xsl:stylesheet version="1.0"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<?xml version="1.0" encoding="UTF-8"?>
 
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
 
   <xsl:template match="associates">
@@ -17,6 +15,6 @@
       <xsl:apply-templates select="description/node()" />
     </xsl:for-each>
   </xsl:template>
-  
+
 </xsl:stylesheet>
 
diff --git a/at/at.xsl b/at/at.xsl
index f4a2a6a9af..fe3fbf043a 100644
--- a/at/at.xsl
+++ b/at/at.xsl
@@ -1,23 +1,11 @@
 <?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">
-  
-  <xsl:import href="../build/xslt/people.xsl" />
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
+  <xsl:import href="../build/xslt/people.xsl" />
 
-  <!-- To localise this page to a new country, copy this file and change the following:
-  
-    # <xsl:variable name="country-code">de</xsl:variable> -> change xx to your country code
-    
-    For more information, take a look at the documentation at
-        http://fsfe.org/contribute/web/tagging.html
-    
-  -->
-  
   <xsl:variable name="country-code">at</xsl:variable>
-  
+
   <!--display labels-->
 
   <!--translated word "news"-->
@@ -54,14 +42,14 @@
       <xsl:with-param name="id" select="'team'" />
     </xsl:call-template>
   </xsl:template>
-  
+
   <!--define contact information-->
-  
+
   <xsl:template match="contact-details">
     <xsl:for-each select="/buildinfo/document/set/contact">
 
     <xsl:if test="@id = 'DE'">
-  
+
   <!-- Email -->
     <xsl:if test="email != ''">
       <xsl:element name="p">
@@ -76,12 +64,12 @@
         </xsl:element>
       </xsl:element>
     </xsl:if>
-  
+
   <!-- Address -->
     <xsl:if test="address != ''">
      <xsl:apply-templates select="address"/>
     </xsl:if>
-  
+
   <!-- Phone -->
     <xsl:if test="phone != ''">
       <xsl:element name="p">
@@ -102,28 +90,28 @@
     </xsl:if>
     </xsl:for-each>
   </xsl:template>
-  
+
   <!--define dynamic list of country news items-->
     <xsl:template match="country-news">
         <xsl:call-template name="fetch-news">
             <xsl:with-param name="nb-items" select="3" />
         </xsl:call-template>
     </xsl:template>
-    
+
     <!--define dynamic list of country event items-->
     <xsl:template match="country-events">
         <!-- Current events -->
         <xsl:call-template name="fetch-events">
             <xsl:with-param name="wanted-time" select="'present'" />
         </xsl:call-template>
-        
+
         <!-- Future events -->
         <xsl:call-template name="fetch-events">
             <xsl:with-param name="wanted-time" select="'future'" />
             <xsl:with-param name="nb-items" select="3" />
         </xsl:call-template>
     </xsl:template>
-    
+
     <!--define dynamic list of country team members-->
     <xsl:template match="country-team-list">
         <xsl:call-template name="country-people-list">
diff --git a/build/xslt/body_scripts.xsl b/build/xslt/body_scripts.xsl
index 99fa2e23ee..13b96e64d8 100644
--- a/build/xslt/body_scripts.xsl
+++ b/build/xslt/body_scripts.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
diff --git a/build/xslt/countries.xsl b/build/xslt/countries.xsl
index 593e9b69b8..dd3ca59c7a 100644
--- a/build/xslt/countries.xsl
+++ b/build/xslt/countries.xsl
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
   <!-- showing a dropdown select menu with all countries in /tools/countries.**.xml -->
@@ -8,13 +9,13 @@
     <xsl:element name="select">
       <xsl:attribute name="id">country</xsl:attribute>
       <xsl:attribute name="name">country</xsl:attribute>
-      <!-- if called with a "class" value, set it as the CSS class --> 
+      <!-- if called with a "class" value, set it as the CSS class -->
       <xsl:choose>
         <xsl:when test="$class != ''">
           <xsl:attribute name="class"><xsl:value-of select="$class" /></xsl:attribute>
         </xsl:when>
       </xsl:choose>
-      <!-- when called with the required="yes" param, add the attribute 
+      <!-- when called with the required="yes" param, add the attribute
       and an empty option -->
       <xsl:choose>
         <xsl:when test="$required = 'yes'">
@@ -35,6 +36,6 @@
       </xsl:for-each>
     </xsl:element> <!-- /select -->
   </xsl:template>
-  
+
 </xsl:stylesheet>
 
diff --git a/build/xslt/feeds.xsl b/build/xslt/feeds.xsl
index 0c746f6bc6..26c520f264 100644
--- a/build/xslt/feeds.xsl
+++ b/build/xslt/feeds.xsl
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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"
@@ -6,12 +7,12 @@
 
   <xsl:import href="gettext.xsl" />
   <xsl:import href="../../tools/xsltsl/date-time.xsl" />
-    
+
   <!-- define content type templates-->
-    
+
   <xsl:template name="news">
     <xsl:param name="sidebar" select="'no'" />
-    
+
     <xsl:variable name="title">
       <xsl:choose><xsl:when test="link != ''">
         <a href="{link}"><xsl:value-of select="title" /></a>
@@ -19,7 +20,7 @@
         <xsl:value-of select="title" />
       </xsl:otherwise></xsl:choose>
     </xsl:variable>
-    
+
     <xsl:variable name="date">
       <xsl:value-of select="substring(@date,9,2)" />
       <xsl:text> </xsl:text>
@@ -29,7 +30,7 @@
       <xsl:text> </xsl:text>
       <xsl:value-of select="substring(@date,1,4)" />
     </xsl:variable>
-    
+
     <xsl:choose>
       <xsl:when test="$sidebar = 'yes'">
         <li>
@@ -38,7 +39,7 @@
             <xsl:with-param name="title" select="title" />
           </xsl:call-template>
           <xsl:copy-of select="$title" />
-          
+
           <!-- news date -->
           <xsl:text> (</xsl:text>
           <xsl:copy-of select="$date" />
@@ -55,61 +56,61 @@
             </xsl:call-template>
             <xsl:copy-of select="$title" />
           </h3>
-          
+
           <!-- news date -->
           <p class="date"><xsl:copy-of select="$date" /></p>
-          
+
           <!-- news text -->
           <div class="text"><xsl:apply-templates select="body/node()" /></div>
         </div>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-  
+
   <!-- Show a single event -->
   <xsl:template name="event">
     <xsl:param name="header" select="''" />
     <xsl:param name="display-tags" select="'no'" />
-    
+
     <!-- Create variables -->
     <xsl:variable name="start">
       <xsl:value-of select="@start" />
     </xsl:variable>
-    
+
     <xsl:variable name="start_day">
       <xsl:value-of select="substring($start,9,2)" />
     </xsl:variable>
-    
+
     <xsl:variable name="start_month">
       <xsl:call-template name="dt:get-month-name">
         <xsl:with-param name="month"
                         select="substring($start,6,2)" />
       </xsl:call-template>
     </xsl:variable>
-    
+
     <xsl:variable name="end">
       <xsl:value-of select="@end" />
     </xsl:variable>
-    
+
     <xsl:variable name="end_day">
       <xsl:value-of select="substring($end,9,2)" />
     </xsl:variable>
-    
+
     <xsl:variable name="end_month">
       <xsl:call-template name="dt:get-month-name">
         <xsl:with-param name="month"
                         select="substring($end,6,2)" />
       </xsl:call-template>
     </xsl:variable>
-    
+
     <xsl:variable name="end_year">
       <xsl:value-of select="substring($end,1,4)" />
     </xsl:variable>
-    
+
     <xsl:variable name="link">
       <xsl:value-of select="link" />
     </xsl:variable>
-    
+
     <xsl:variable name="page">
       <xsl:value-of select="page" />
     </xsl:variable>
@@ -128,15 +129,15 @@
         </xsl:element>
       </xsl:if>
     </xsl:if>
-    
-    
+
+
     <!-- Now, the event block -->
     <xsl:element name="div">
       <xsl:attribute name="class">entry</xsl:attribute>
       <xsl:attribute name="id">
         <xsl:value-of select="@filename" />
       </xsl:attribute>
-      
+
       <!-- event title with or without link -->
       <h3>
        <xsl:call-template name="generate-id-attribute">
@@ -158,7 +159,7 @@
          </xsl:otherwise>
        </xsl:choose>
       </h3>
-     
+
       <!-- event date -->
       <xsl:choose>
         <xsl:when test="$start != $end">
@@ -168,7 +169,7 @@
             <xsl:if test="$start_month != $end_month">
               <xsl:value-of select="$start_month" />
             </xsl:if>
-            <xsl:text> to </xsl:text> 
+            <xsl:text> to </xsl:text>
             <xsl:value-of select="$end_day" />
             <xsl:text> </xsl:text>
             <xsl:value-of select="$end_month" />
@@ -186,12 +187,12 @@
           </p>
         </xsl:otherwise>
       </xsl:choose>
-      
+
       <!-- details about the event -->
       <div class="details">
         <xsl:apply-templates select="body/node()" />
       </div>
-      
+
       <!-- tags -->
       <xsl:if test="$display-tags = 'yes'">
         <ul class="archivetaglist">
@@ -202,7 +203,7 @@
       </xsl:if>
 
     </xsl:element>
-    
+
   </xsl:template>
 
 </xsl:stylesheet>
diff --git a/build/xslt/footer_legal.xsl b/build/xslt/footer_legal.xsl
index c558740b8a..6d9b47a725 100644
--- a/build/xslt/footer_legal.xsl
+++ b/build/xslt/footer_legal.xsl
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
   <xsl:template name="footer_legal">
     <xsl:element name="section">
       <xsl:attribute name="id">legal-info</xsl:attribute>
-  
+
       <p>Copyright © 2001-2020 <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="'fsfeurope'" /></xsl:call-template>
diff --git a/build/xslt/footer_sitenav.xsl b/build/xslt/footer_sitenav.xsl
index 3f65613e32..10101416e2 100644
--- a/build/xslt/footer_sitenav.xsl
+++ b/build/xslt/footer_sitenav.xsl
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
   <xsl:template name="footer_sitenav">
     <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 -->
@@ -22,7 +22,7 @@
             <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']">
@@ -53,7 +53,7 @@
           <!--/ul-->
         </xsl:element>
         <!--/li-->
-  
+
         <!-- Support portal menu item -->
         <xsl:element name="li">
           <xsl:attribute name="class">support</xsl:attribute>
@@ -61,7 +61,7 @@
             <xsl:attribute name="href">https://my.fsfe.org/support</xsl:attribute>
             <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'support/support'" /></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']">
@@ -92,7 +92,7 @@
           <!--/ul-->
 
         </xsl:element> <!-- /li -->
-  
+
         <!-- Planet portal menu -->
         <xsl:element name="li">
           <xsl:attribute name="class">planet</xsl:attribute>
@@ -103,7 +103,7 @@
           <!-- 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']">
@@ -133,7 +133,7 @@
           </xsl:element>
           <!--/ul-->
         </xsl:element>
-  
+
         <!-- Legal team portal menu -->
         <xsl:element name="li">
           <xsl:attribute name="class">ftf</xsl:attribute>
@@ -144,7 +144,7 @@
           <!-- 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']">
@@ -174,7 +174,7 @@
           </xsl:element>
           <!--/ul-->
         </xsl:element>
-  
+
       </xsl:element>
       <!--/ul#menu-list-->
     </xsl:element>
diff --git a/build/xslt/footer_sourcelink.xsl b/build/xslt/footer_sourcelink.xsl
index c3e06ac181..b48dcc5076 100644
--- a/build/xslt/footer_sourcelink.xsl
+++ b/build/xslt/footer_sourcelink.xsl
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
   <xsl:template name="footer_sourcelink">
     <xsl:element name="section">
       <xsl:attribute name="id">source</xsl:attribute>
-  
+
       <!-- "Last changed" magic -->
       <p>
         <xsl:variable name="timestamp">
@@ -25,7 +25,7 @@
           (<xsl:value-of select="$Author"/>)
         </xsl:if>
       </p>
-  
+
       <ul><li>
         <!-- Link to the XHTML source -->
         <xsl:element name="a">
@@ -46,7 +46,7 @@
           <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'contribute-web'" /></xsl:call-template>
         </xsl:element>
       </li></ul>
-  
+
       <p>
         <xsl:element name="a">
           <xsl:attribute name="href"><xsl:value-of select="$urlprefix"/>/contribute/translators/</xsl:attribute>
@@ -77,7 +77,7 @@
           <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'translator3c'" /></xsl:call-template>
         </xsl:if>
       </p>
-  
+
     </xsl:element>
     <!--/section#source-->
   </xsl:template>
diff --git a/build/xslt/fsfe_body.xsl b/build/xslt/fsfe_body.xsl
index b902a66c3c..e1f169eabd 100644
--- a/build/xslt/fsfe_body.xsl
+++ b/build/xslt/fsfe_body.xsl
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
   <xsl:include href="fsfe_pageclass.xsl" />
   <xsl:include href="translation_list.xsl" />
   <xsl:include href="fsfe_pageheader.xsl" />
@@ -22,7 +21,7 @@
 
       <!-- 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:call-template name="translation_list" />
       <xsl:call-template name="fsfe_pageheader" />
       <xsl:call-template name="notifications" />
@@ -46,7 +45,7 @@
 
       </xsl:element>
       <!--/footer#bottom-->
-    
+
       <xsl:call-template name="body_scripts" />
 
     </xsl:element>
diff --git a/build/xslt/fsfe_document.xsl b/build/xslt/fsfe_document.xsl
index 591c0ca4c9..456e2dd0ca 100644
--- a/build/xslt/fsfe_document.xsl
+++ b/build/xslt/fsfe_document.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
@@ -23,7 +23,7 @@
       <xsl:if test="/buildinfo/@language = 'ar' or /buildinfo/@language = 'fa' or /buildinfo/@language = 'he'">
         <xsl:attribute name="dir">rtl</xsl:attribute>
       </xsl:if>
-  
+
       <xsl:call-template name="page-head" />
       <xsl:call-template name="page-body" />
     </xsl:element>
diff --git a/build/xslt/fsfe_followupsection.xsl b/build/xslt/fsfe_followupsection.xsl
index 9abdff5a9a..e82d7bb7d5 100644
--- a/build/xslt/fsfe_followupsection.xsl
+++ b/build/xslt/fsfe_followupsection.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
diff --git a/build/xslt/fsfe_head.xsl b/build/xslt/fsfe_head.xsl
index a9aaba7f97..1215c98028 100644
--- a/build/xslt/fsfe_head.xsl
+++ b/build/xslt/fsfe_head.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
diff --git a/build/xslt/fsfe_headings.xsl b/build/xslt/fsfe_headings.xsl
index 91b640f477..377da6b38a 100644
--- a/build/xslt/fsfe_headings.xsl
+++ b/build/xslt/fsfe_headings.xsl
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
   <!-- Modify H1 -->
   <xsl:template match="h1">
-    
+
     <!-- Apply news page PRE-rules -->
     <xsl:if test="string(/buildinfo/document/@newsdate) and
                     (not(string(/buildinfo/document/@type)) or
                     /buildinfo/document/@type != 'newsletter' and
                     /buildinfo/document/@type != 'podcast')">
-      
+
       <!-- add link to press/press.xx.html -->
       <xsl:element name="p">
         <xsl:attribute name="id">category</xsl:attribute>
@@ -20,7 +20,7 @@
         </xsl:element>
       </xsl:element>
     </xsl:if>
-    
+
     <!-- Apply newsletter page PRE-rules -->
     <xsl:if test="string(/buildinfo/document/@newsdate) and /buildinfo/document/@type = 'newsletter'">
       <xsl:element name="p">
@@ -31,7 +31,7 @@
         </xsl:element>
       </xsl:element>
     </xsl:if>
-    
+
     <!-- Apply podcast page PRE-rules -->
     <xsl:if test="string(/buildinfo/document/@newsdate) and /buildinfo/document/@type = 'podcast'">
       <xsl:element name="p">
@@ -45,7 +45,7 @@
 
     <!-- auto generate ID for headings if it doesn't already exist -->
     <xsl:call-template name="generate-id" />
-    
+
     <!-- Apply news page rules -->
     <xsl:if test="string(/buildinfo/document/@newsdate) and
                     (not(string(/buildinfo/document/@type)) or
@@ -60,7 +60,7 @@
           <xsl:value-of select="/buildinfo/document/@newsdate" />
         </xsl:element>
       </xsl:element>
-      
+
     </xsl:if>
     <!-- End apply news page rules -->
 
@@ -76,59 +76,59 @@
     <xsl:if test = "string(/buildinfo/document/head/meta[@name='author-name-1']/@content)">
       <xsl:element name="div">
         <xsl:attribute name="id">article-metadata</xsl:attribute>
-        
+
         <xsl:if test = "string(/buildinfo/document/head/meta[@name='author-name-1']/@content)">
           <span class="written-by"><xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'author'" /></xsl:call-template>: </span>
           <xsl:choose>
             <xsl:when test="/buildinfo/document/head/meta[@name='author-link-1']">
               <xsl:variable name="author-link-1" select="/buildinfo/document/head/meta[@name='author-link-1']/@content" />
               <a  class="p-author" rel='author' href='{$author-link-1}'>
-              <xsl:value-of select="/buildinfo/document/head/meta[@name='author-name-1']/@content" /> </a> 
+              <xsl:value-of select="/buildinfo/document/head/meta[@name='author-name-1']/@content" /> </a>
             </xsl:when>
             <xsl:otherwise>
-              <xsl:value-of select="/buildinfo/document/head/meta[@name='author-name-1']/@content" /> 
+              <xsl:value-of select="/buildinfo/document/head/meta[@name='author-name-1']/@content" />
             </xsl:otherwise>
           </xsl:choose>
         </xsl:if>
-    
+
         <xsl:if test = "string(/buildinfo/document/head/meta[@name='author-name-2']/@content)">
           <xsl:choose>
             <xsl:when test="/buildinfo/document/head/meta[@name='author-link-2']">
               <xsl:variable name="author-link-2" select="/buildinfo/document/head/meta[@name='author-link-2']/@content" />
               , <a  class="p-author" rel='author' href='{$author-link-2}'>
-              <xsl:value-of select="/buildinfo/document/head/meta[@name='author-name-2']/@content" /> </a> 
+              <xsl:value-of select="/buildinfo/document/head/meta[@name='author-name-2']/@content" /> </a>
             </xsl:when>
             <xsl:otherwise>
-              , <xsl:value-of select="/buildinfo/document/head/meta[@name='author-name-2']/@content" /> 
+              , <xsl:value-of select="/buildinfo/document/head/meta[@name='author-name-2']/@content" />
             </xsl:otherwise>
           </xsl:choose>
         </xsl:if>
-        
+
         <xsl:if test = "string(/buildinfo/document/head/meta[@name='author-name-3']/@content)">
           <xsl:choose>
             <xsl:when test="/buildinfo/document/head/meta[@name='author-link-3']">
               <xsl:variable name="author-link-3" select="/buildinfo/document/head/meta[@name='author-link-3']/@content" />
               , <a class="p-author" rel='author' href='{$author-link-3}'>
-              <xsl:value-of select="/buildinfo/document/head/meta[@name='author-name-3']/@content" /> </a> 
+              <xsl:value-of select="/buildinfo/document/head/meta[@name='author-name-3']/@content" /> </a>
             </xsl:when>
             <xsl:otherwise>
-              , <xsl:value-of select="/buildinfo/document/head/meta[@name='author-name-3']/@content" /> 
+              , <xsl:value-of select="/buildinfo/document/head/meta[@name='author-name-3']/@content" />
             </xsl:otherwise>
           </xsl:choose>
         </xsl:if>
-    
+
         <span class="published-on">&#160;<xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'published'" /></xsl:call-template>: </span>
         <xsl:element name="time">
           <xsl:attribute name="class">dt-published</xsl:attribute>
           <xsl:value-of select="/buildinfo/document/head/meta[@name='publication-date']/@content" />
         </xsl:element>
-        
+
         <xsl:if test = "string(/buildinfo/document/head/meta[@name='pdf-link']/@content)">
           <span class="pdf-download">&#160;PDF: </span>
           <xsl:variable name="pdf-link" select="/buildinfo/document/head/meta[@name='pdf-link']/@content" />
           <a href='{$pdf-link}'>download</a>
         </xsl:if>
-        
+
       </xsl:element> <!-- </div> -->
     </xsl:if>
     <!-- End Apply article rules -->
@@ -140,15 +140,15 @@
 
         <xsl:if test="/buildinfo/document/author">
             <span class="written-by"><xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'writtenby'" /></xsl:call-template>&#160;</span>
-            
+
           <xsl:for-each select="/buildinfo/document/author">
               <xsl:variable name="id">
                 <xsl:value-of select="@id" />
               </xsl:variable>
 
-              <xsl:choose>    
+              <xsl:choose>
                   <xsl:when test="@id and document('../../about/people/people.en.xml')/personset/person[@id=$id]">
-                  <!-- if the author is in fsfe's people.xml then we take information from there --> 
+                  <!-- if the author is in fsfe's people.xml then we take information from there -->
                     <xsl:choose>
                       <!-- person has a link -->
                       <xsl:when test="document('../../about/people/people.en.xml')/personset/person[@id=$id]/link">
@@ -212,7 +212,7 @@
                     </xsl:choose>
                   </xsl:otherwise>
               </xsl:choose>
-              
+
               <!-- choose whether to put a comma or an "and" between authors -->
               <xsl:choose>
                 <!-- second-last author and not first author -->
@@ -232,20 +232,20 @@
                   <xsl:text> </xsl:text>
                 </xsl:otherwise>
               </xsl:choose>
-            
+
           </xsl:for-each>
     </xsl:if>
-    
+
     <!-- only show date if <date> exists (not news entries for example) -->
     <xsl:if test="/buildinfo/document/date">
-        <span class="published-on"><xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'published'" /></xsl:call-template>&#160;</span> 
+        <span class="published-on"><xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'published'" /></xsl:call-template>&#160;</span>
         <xsl:element name="time">
           <xsl:attribute name="class">dt-published</xsl:attribute>
           <xsl:value-of select="/buildinfo/document/date/original/@content" />
         </xsl:element>&#160;
         <xsl:if test="/buildinfo/document/date/revision">
                 (<span class="revision-on"><xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'revision'" /></xsl:call-template></span>
-          <xsl:for-each select="/buildinfo/document/date/revision">                
+          <xsl:for-each select="/buildinfo/document/date/revision">
             &#160;<xsl:element name="time">
               <xsl:attribute name="class">dt-updated</xsl:attribute>
               <xsl:value-of select="@content" />
@@ -253,7 +253,7 @@
           </xsl:for-each>)&#160;
         </xsl:if>
     </xsl:if>
-    
+
     <xsl:if test="/buildinfo/document/download">
         <xsl:element name="br" />
         <span class="download"><xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'download'" /></xsl:call-template>:&#160;</span>
@@ -262,44 +262,44 @@
                 <xsl:value-of select="/buildinfo/document/download/@type" />
         </xsl:element>
     </xsl:if>
-    
+
       </xsl:element>
     </xsl:if>
     <!--End Article authors, date-->
-         
+
   </xsl:template>
-  <!-- End modifications to H1 --> 
-  
+  <!-- End modifications to H1 -->
+
   <!-- Modify H2 -->
   <xsl:template match="h2">
     <!-- auto generate ID for headings if it doesn't already exist -->
     <xsl:call-template name="generate-id" />
   </xsl:template>
-  
+
   <!-- Modify H3 -->
   <xsl:template match="h3">
     <!-- auto generate ID for headings if it doesn't already exist -->
     <xsl:call-template name="generate-id" />
   </xsl:template>
-  
+
   <!-- Modify H4 -->
   <xsl:template match="h4">
     <!-- auto generate ID for headings if it doesn't already exist -->
     <xsl:call-template name="generate-id" />
   </xsl:template>
-  
+
   <!-- Modify H4 -->
   <xsl:template match="h4">
     <!-- auto generate ID for headings if it doesn't already exist -->
     <xsl:call-template name="generate-id" />
   </xsl:template>
-  
+
   <!-- Modify H5 -->
   <xsl:template match="h5">
     <!-- auto generate ID for headings if it doesn't already exist -->
     <xsl:call-template name="generate-id" />
   </xsl:template>
-  
+
   <!-- Modify H6 -->
   <xsl:template match="h6">
     <!-- auto generate ID for headings if it doesn't already exist -->
diff --git a/build/xslt/fsfe_localmenu.xsl b/build/xslt/fsfe_localmenu.xsl
index d45823d2fc..77efa08878 100644
--- a/build/xslt/fsfe_localmenu.xsl
+++ b/build/xslt/fsfe_localmenu.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
diff --git a/build/xslt/fsfe_mainsection.xsl b/build/xslt/fsfe_mainsection.xsl
index 830779bcc2..ef020b7d8e 100644
--- a/build/xslt/fsfe_mainsection.xsl
+++ b/build/xslt/fsfe_mainsection.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:include href="sharebuttons.xsl" />
diff --git a/build/xslt/fsfe_nolocal.xsl b/build/xslt/fsfe_nolocal.xsl
index 8c378e1721..985ed35a28 100644
--- a/build/xslt/fsfe_nolocal.xsl
+++ b/build/xslt/fsfe_nolocal.xsl
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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">
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
   <!-- Do not copy non-HTML elements to output -->
   <xsl:template match="timestamp|
diff --git a/build/xslt/fsfe_pageclass.xsl b/build/xslt/fsfe_pageclass.xsl
index 4411939409..b927396430 100644
--- a/build/xslt/fsfe_pageclass.xsl
+++ b/build/xslt/fsfe_pageclass.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
@@ -21,4 +21,5 @@
         <xsl:value-of select="/buildinfo/document/body/@class" /> newsletter article</xsl:attribute>
     </xsl:if>
   </xsl:template>
+
 </xsl:stylesheet>
diff --git a/build/xslt/fsfe_pageheader.xsl b/build/xslt/fsfe_pageheader.xsl
index 69d51d5a33..1ebcbeccb2 100644
--- a/build/xslt/fsfe_pageheader.xsl
+++ b/build/xslt/fsfe_pageheader.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
diff --git a/build/xslt/fsfe_sidebar.xsl b/build/xslt/fsfe_sidebar.xsl
index 0390e8d867..17f38ce4a5 100644
--- a/build/xslt/fsfe_sidebar.xsl
+++ b/build/xslt/fsfe_sidebar.xsl
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  
+
   <xsl:template name="sidebar">
     <aside id="sidebar">
       <xsl:if test="string(/buildinfo/document/@newsdate) and /buildinfo/document/@type = 'newsletter'">
@@ -32,7 +32,7 @@
             </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'" />
@@ -52,9 +52,9 @@
             </xsl:call-template></a></li>
         </ul>
       </xsl:if>
-  
+
       <xsl:apply-templates select="/buildinfo/document/sidebar/node()" />
-  
+
       <xsl:if test="string(/buildinfo/document/@newsdate)">
         <a href="https://my.fsfe.org/support" class="small-donate">
           <xsl:call-template name="fsfe-gettext">
diff --git a/build/xslt/get_localmenu_dir.xsl b/build/xslt/get_localmenu_dir.xsl
index ee3fc833d1..d0f995b5d8 100644
--- a/build/xslt/get_localmenu_dir.xsl
+++ b/build/xslt/get_localmenu_dir.xsl
@@ -13,7 +13,7 @@
   <xsl:template match="localmenu">
     <xsl:value-of select="@dir"/>
   </xsl:template>
-  
+
   <!-- Suppress output of text nodes, which would be the default -->
   <xsl:template match="text()"/>
 </xsl:stylesheet>
diff --git a/build/xslt/get_localmenu_line.xsl b/build/xslt/get_localmenu_line.xsl
index 5a3e5d682e..7e2583de72 100644
--- a/build/xslt/get_localmenu_line.xsl
+++ b/build/xslt/get_localmenu_line.xsl
@@ -29,7 +29,7 @@
     <xsl:value-of select="normalize-space(node())"/>
     <xsl:text>&lt;/localmenuitem&gt;</xsl:text>
   </xsl:template>
-  
+
   <!-- Suppress output of text nodes, which would be the default -->
   <xsl:template match="text()"/>
 </xsl:stylesheet>
diff --git a/build/xslt/get_tags.xsl b/build/xslt/get_tags.xsl
index 14fda0ae9c..d15951ed22 100644
--- a/build/xslt/get_tags.xsl
+++ b/build/xslt/get_tags.xsl
@@ -21,7 +21,7 @@
     <!-- Append a newline -->
     <xsl:text>&#xa;</xsl:text>
   </xsl:template>
-  
+
   <!-- Suppress output of text nodes, which would be the default -->
   <xsl:template match="text()"/>
 </xsl:stylesheet>
diff --git a/build/xslt/get_version.xsl b/build/xslt/get_version.xsl
index a619427ac7..86ff71cda5 100644
--- a/build/xslt/get_version.xsl
+++ b/build/xslt/get_version.xsl
@@ -13,7 +13,7 @@
   <xsl:template match="version">
     <xsl:value-of select="."/>
   </xsl:template>
-  
+
   <!-- Suppress output of text nodes, which would be the default -->
   <xsl:template match="text()"/>
 </xsl:stylesheet>
diff --git a/build/xslt/gettext.xsl b/build/xslt/gettext.xsl
index 8d5bd9d868..c98386302c 100644
--- a/build/xslt/gettext.xsl
+++ b/build/xslt/gettext.xsl
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  
+
   <!-- this template is to be called to get texts contained in "tools/texts-xx.xml" files -->
   <xsl:template name="fsfe-gettext">
     <xsl:param name="id" />
-    
+
     <xsl:choose>
       <xsl:when test="/buildinfo/textset/text[@id=$id]">
         <xsl:apply-templates select="/buildinfo/textset/text[@id=$id]/node()" />
@@ -14,9 +14,9 @@
         <xsl:apply-templates select="/buildinfo/textsetbackup/text[@id=$id]/node()" />
       </xsl:otherwise>
     </xsl:choose>
-    
+
   </xsl:template>
-  
+
   <!-- this template is to be called to get texts contained in "tools/texts-content-xx.xml" files -->
   <xsl:template name="gettext">
     <xsl:param name="id" />
diff --git a/build/xslt/notifications.xsl b/build/xslt/notifications.xsl
index f11a7d377a..c13f8ea82e 100644
--- a/build/xslt/notifications.xsl
+++ b/build/xslt/notifications.xsl
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
   <xsl:template name="notifications">
     <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
@@ -22,7 +22,7 @@
           </p>
         </div>
       </div> -->
-  
+
       <!-- Outdated note -->
       <xsl:if test="/buildinfo/@outdated='yes'">
         <xsl:element name="div">
@@ -48,7 +48,7 @@
           </xsl:element>
         </xsl:element>
       </xsl:if> <!-- End Outdated note -->
-  
+
       <!-- Missing translation note -->
       <xsl:if test="/buildinfo/@language!=/buildinfo/document/@language">
         <xsl:element name="div">
@@ -65,7 +65,7 @@
           </xsl:element>
         </xsl:element>
       </xsl:if> <!-- End Missing translation note -->
-  
+
       <!-- Info box -->
       <xsl:element name="div">
         <xsl:attribute name="id">infobox</xsl:attribute>
@@ -107,7 +107,7 @@
           </xsl:element>
         </xsl:if>
       </xsl:element><!-- End Info Box -->
-                                                                                              
+
       <!-- Fundraising box
       <xsl:element name="div">
         <xsl:attribute name="id">fundraising</xsl:attribute>
diff --git a/build/xslt/people.xsl b/build/xslt/people.xsl
index 0875628402..34ab35691d 100644
--- a/build/xslt/people.xsl
+++ b/build/xslt/people.xsl
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
   <!-- displays list of people for a given country (or a given team, i.e. "main") -->
diff --git a/build/xslt/sharebuttons.xsl b/build/xslt/sharebuttons.xsl
index 548df56fc5..6737db0256 100644
--- a/build/xslt/sharebuttons.xsl
+++ b/build/xslt/sharebuttons.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet
     version="1.0"
diff --git a/build/xslt/static-elements.xsl b/build/xslt/static-elements.xsl
index 398b49f01c..56259e0aa6 100644
--- a/build/xslt/static-elements.xsl
+++ b/build/xslt/static-elements.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -9,7 +9,7 @@
                 xmlns:str='http://xsltsl.org/string'
                 exclude-result-prefixes="dt weekdays months nl str">
   <xsl:import href="../../tools/xsltsl/string.xsl" />
-  
+
   <nl:langs>
     <nl:lang value="en">English</nl:lang>
     <nl:lang value="el">Ελληνικά</nl:lang>
@@ -65,27 +65,27 @@
       <input id="submit" type="submit" value="{$submit}"/>
     </form>
   </xsl:template>
-  
+
   <!-- auto generate ID for headings if doesn't already exist -->
   <xsl:template name="generate-id">
     <xsl:copy>
       <xsl:call-template name="generate-id-attribute" />
-      
+
       <xsl:if test="@class">
           <xsl:attribute name="class">
             <xsl:value-of select="@class" />
-          </xsl:attribute>      
+          </xsl:attribute>
       </xsl:if>
-        
+
       <xsl:apply-templates select="node()"/>
-  
+
     </xsl:copy>
   </xsl:template>
-  
-  
+
+
   <xsl:template name="generate-id-attribute">
     <xsl:param name="title" select="''" />
-    
+
     <xsl:variable name="title2">
       <xsl:choose>
         <xsl:when test="normalize-space($title)=''">
@@ -96,22 +96,22 @@
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-    
+
     <xsl:choose>
       <xsl:when test="not(@id) or normalize-space($title)!=''">
         <!-- replace spaces with dashes -->
         <xsl:variable name="punctuation">.,:;!?&#160;&quot;'()[]&lt;&gt;>{}</xsl:variable>
         <xsl:variable name="formattedTitle1" select="translate(normalize-space(translate($title2,$punctuation,' ')),' ','-')"/>
-        
+
         <xsl:variable   name="accents">áàâäãéèêëíìîïóòôöõúùûüçğ</xsl:variable>
         <xsl:variable name="noaccents">aaaaaeeeeiiiiooooouuuucg</xsl:variable>
-        
+
         <xsl:variable name="formattedTitle2">
           <xsl:call-template name="str:to-lower">
             <xsl:with-param name="text" select="$formattedTitle1" />
           </xsl:call-template>
         </xsl:variable>
-        
+
         <xsl:attribute name="id">
           <xsl:value-of select="concat('id-',translate($formattedTitle2,$accents,$noaccents))" />
         </xsl:attribute>
diff --git a/build/xslt/tagging.xsl b/build/xslt/tagging.xsl
index 1686fdbcc1..12bfe694e3 100644
--- a/build/xslt/tagging.xsl
+++ b/build/xslt/tagging.xsl
@@ -1,6 +1,6 @@
 <?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">
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="feeds.xsl" />
 
   <!--display dynamic list of tagged news items-->
diff --git a/build/xslt/translation_list.xsl b/build/xslt/translation_list.xsl
index 9452374e46..d33293acc6 100644
--- a/build/xslt/translation_list.xsl
+++ b/build/xslt/translation_list.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
diff --git a/campaigns/askyourcandidates/askyourcandidates.xsl b/campaigns/askyourcandidates/askyourcandidates.xsl
index 53508b1f48..0d594e8699 100755
--- a/campaigns/askyourcandidates/askyourcandidates.xsl
+++ b/campaigns/askyourcandidates/askyourcandidates.xsl
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  
   <xsl:import href="../../fsfe.xsl" />
-  
+
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
       <xsl:with-param name="nb-items" select="5"/>
     </xsl:call-template>
   </xsl:template>
-  
+
   <!-- How to show a link -->
   <xsl:template match="/buildinfo/document/set/news/link">
     <xsl:element name="a">
@@ -21,5 +20,5 @@
       <xsl:text>]</xsl:text>
     </xsl:element>
   </xsl:template>
-  
+
 </xsl:stylesheet>
diff --git a/campaigns/finished.xsl b/campaigns/finished.xsl
index 819593816c..8f29c771c6 100644
--- a/campaigns/finished.xsl
+++ b/campaigns/finished.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
diff --git a/campaigns/ilovefs/2012/ilovefs.xsl b/campaigns/ilovefs/2012/ilovefs.xsl
index 35fa4c5335..db06ced9c0 100755
--- a/campaigns/ilovefs/2012/ilovefs.xsl
+++ b/campaigns/ilovefs/2012/ilovefs.xsl
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  
   <xsl:import href="../../../fsfe.xsl" />
-  
+
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
       <xsl:with-param name="nb-items" select="5"/>
     </xsl:call-template>
   </xsl:template>
-  
+
   <!-- How to show a link -->
   <xsl:template match="/buildinfo/document/set/news/link">
     <xsl:element name="a">
@@ -21,5 +20,5 @@
       <xsl:text>]</xsl:text>
     </xsl:element>
   </xsl:template>
-  
+
 </xsl:stylesheet>
diff --git a/campaigns/ilovefs/2012/unperfekthaus.xsl b/campaigns/ilovefs/2012/unperfekthaus.xsl
index 35fa4c5335..db06ced9c0 100755
--- a/campaigns/ilovefs/2012/unperfekthaus.xsl
+++ b/campaigns/ilovefs/2012/unperfekthaus.xsl
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  
   <xsl:import href="../../../fsfe.xsl" />
-  
+
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
       <xsl:with-param name="nb-items" select="5"/>
     </xsl:call-template>
   </xsl:template>
-  
+
   <!-- How to show a link -->
   <xsl:template match="/buildinfo/document/set/news/link">
     <xsl:element name="a">
@@ -21,5 +20,5 @@
       <xsl:text>]</xsl:text>
     </xsl:element>
   </xsl:template>
-  
+
 </xsl:stylesheet>
diff --git a/campaigns/ilovefs/2013/ilovefs.xsl b/campaigns/ilovefs/2013/ilovefs.xsl
index 35fa4c5335..db06ced9c0 100755
--- a/campaigns/ilovefs/2013/ilovefs.xsl
+++ b/campaigns/ilovefs/2013/ilovefs.xsl
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  
   <xsl:import href="../../../fsfe.xsl" />
-  
+
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
       <xsl:with-param name="nb-items" select="5"/>
     </xsl:call-template>
   </xsl:template>
-  
+
   <!-- How to show a link -->
   <xsl:template match="/buildinfo/document/set/news/link">
     <xsl:element name="a">
@@ -21,5 +20,5 @@
       <xsl:text>]</xsl:text>
     </xsl:element>
   </xsl:template>
-  
+
 </xsl:stylesheet>
diff --git a/campaigns/ilovefs/2014/ilovefs.xsl b/campaigns/ilovefs/2014/ilovefs.xsl
index 35fa4c5335..db06ced9c0 100755
--- a/campaigns/ilovefs/2014/ilovefs.xsl
+++ b/campaigns/ilovefs/2014/ilovefs.xsl
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  
   <xsl:import href="../../../fsfe.xsl" />
-  
+
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
       <xsl:with-param name="nb-items" select="5"/>
     </xsl:call-template>
   </xsl:template>
-  
+
   <!-- How to show a link -->
   <xsl:template match="/buildinfo/document/set/news/link">
     <xsl:element name="a">
@@ -21,5 +20,5 @@
       <xsl:text>]</xsl:text>
     </xsl:element>
   </xsl:template>
-  
+
 </xsl:stylesheet>
diff --git a/campaigns/ilovefs/2015/ilovefs.xsl b/campaigns/ilovefs/2015/ilovefs.xsl
index 35fa4c5335..db06ced9c0 100755
--- a/campaigns/ilovefs/2015/ilovefs.xsl
+++ b/campaigns/ilovefs/2015/ilovefs.xsl
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  
   <xsl:import href="../../../fsfe.xsl" />
-  
+
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
       <xsl:with-param name="nb-items" select="5"/>
     </xsl:call-template>
   </xsl:template>
-  
+
   <!-- How to show a link -->
   <xsl:template match="/buildinfo/document/set/news/link">
     <xsl:element name="a">
@@ -21,5 +20,5 @@
       <xsl:text>]</xsl:text>
     </xsl:element>
   </xsl:template>
-  
+
 </xsl:stylesheet>
diff --git a/campaigns/ilovefs/2016/index.xsl b/campaigns/ilovefs/2016/index.xsl
index 630ef0d7ad..17f10e16bd 100755
--- a/campaigns/ilovefs/2016/index.xsl
+++ b/campaigns/ilovefs/2016/index.xsl
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  
   <xsl:import href="../../../fsfe.xsl" />
-  
+
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
       <xsl:with-param name="nb-items" select="5"/>
@@ -11,11 +10,11 @@
   </xsl:template>
 
   <!-- This creates looping pictures in a box. All pictures are located in a directory and have numbered names (here ilovefs-gallery-thumb-NNN.jpg) -->
-  <xsl:template match="picture-box">    
+  <xsl:template match="picture-box">
     <!-- appears once when <picture-box /> is called -->
     <xsl:variable name="from"><xsl:value-of select="@from"/></xsl:variable>
     <xsl:variable name="to"><xsl:value-of select="@to"/></xsl:variable>
-    
+
     <div id="picture-box" style="height:225px;"> <!-- change to height of pictures -->
       <div id="picture-box-inner" class="logo-list quote">
         <a href="http://download.fsfe.org/campaigns/ilovefs/gallery/ilovefs-gallery-1.jpg">
@@ -29,7 +28,7 @@
         </a>
       </div> <!-- /picture-box-inner -->
     </div> <!-- /picture-box -->
-    
+
     <script type="text/javascript">
       /* &lt;![CDATA[ */
       var quotes = [
@@ -40,7 +39,7 @@
       </xsl:call-template>
       <!-- and here again the one-time content -->
       ];
-      
+
       <![CDATA[
       var index = Math.floor(Math.random()*quotes.length);
       function changeImage() {
@@ -53,12 +52,12 @@
         index = (index+1)%quotes.length;
         setTimeout("changeImage();",5000);
       }
-      
+
       changeImage();
       ]]>
-      
+
       /* ]]&gt; */
-      
+
     </script>
   </xsl:template>
 
@@ -79,5 +78,5 @@
     </xsl:if>
   </xsl:template>
   <!-- / picture-box -->
-  
+
 </xsl:stylesheet>
diff --git a/campaigns/ilovefs/2017/index.xsl b/campaigns/ilovefs/2017/index.xsl
index 94f24bfc16..7bcb202579 100755
--- a/campaigns/ilovefs/2017/index.xsl
+++ b/campaigns/ilovefs/2017/index.xsl
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  
   <xsl:import href="../../../fsfe.xsl" />
-  
+
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
       <xsl:with-param name="nb-items" select="5"/>
@@ -11,11 +10,11 @@
   </xsl:template>
 
   <!-- This creates looping pictures in a box. All pictures are located in a directory and have numbered names (here ilovefs-gallery-thumb-NNN.jpg) -->
-  <xsl:template match="picture-box">    
+  <xsl:template match="picture-box">
     <!-- appears once when <picture-box /> is called -->
     <xsl:variable name="from"><xsl:value-of select="@from"/></xsl:variable>
     <xsl:variable name="to"><xsl:value-of select="@to"/></xsl:variable>
-    
+
     <div id="picture-box" style="height:225px;"> <!-- change to height of pictures -->
       <div id="picture-box-inner" class="logo-list quote">
         <a href="https://download.fsfe.org/campaigns/ilovefs/gallery/ilovefs-gallery-1.jpg">
@@ -29,7 +28,7 @@
         </a>
       </div> <!-- /picture-box-inner -->
     </div> <!-- /picture-box -->
-    
+
     <script type="text/javascript">
       /* &lt;![CDATA[ */
       var quotes = [
@@ -40,7 +39,7 @@
       </xsl:call-template>
       <!-- and here again the one-time content -->
       ];
-      
+
       <![CDATA[
       var index = Math.floor(Math.random()*quotes.length);
       function changeImage() {
@@ -53,12 +52,12 @@
         index = (index+1)%quotes.length;
         setTimeout("changeImage();",5000);
       }
-      
+
       changeImage();
       ]]>
-      
+
       /* ]]&gt; */
-      
+
     </script>
   </xsl:template>
 
@@ -79,5 +78,5 @@
     </xsl:if>
   </xsl:template>
   <!-- / picture-box -->
-  
+
 </xsl:stylesheet>
diff --git a/campaigns/ilovefs/2018/index.xsl b/campaigns/ilovefs/2018/index.xsl
index 94f24bfc16..7bcb202579 100755
--- a/campaigns/ilovefs/2018/index.xsl
+++ b/campaigns/ilovefs/2018/index.xsl
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  
   <xsl:import href="../../../fsfe.xsl" />
-  
+
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
       <xsl:with-param name="nb-items" select="5"/>
@@ -11,11 +10,11 @@
   </xsl:template>
 
   <!-- This creates looping pictures in a box. All pictures are located in a directory and have numbered names (here ilovefs-gallery-thumb-NNN.jpg) -->
-  <xsl:template match="picture-box">    
+  <xsl:template match="picture-box">
     <!-- appears once when <picture-box /> is called -->
     <xsl:variable name="from"><xsl:value-of select="@from"/></xsl:variable>
     <xsl:variable name="to"><xsl:value-of select="@to"/></xsl:variable>
-    
+
     <div id="picture-box" style="height:225px;"> <!-- change to height of pictures -->
       <div id="picture-box-inner" class="logo-list quote">
         <a href="https://download.fsfe.org/campaigns/ilovefs/gallery/ilovefs-gallery-1.jpg">
@@ -29,7 +28,7 @@
         </a>
       </div> <!-- /picture-box-inner -->
     </div> <!-- /picture-box -->
-    
+
     <script type="text/javascript">
       /* &lt;![CDATA[ */
       var quotes = [
@@ -40,7 +39,7 @@
       </xsl:call-template>
       <!-- and here again the one-time content -->
       ];
-      
+
       <![CDATA[
       var index = Math.floor(Math.random()*quotes.length);
       function changeImage() {
@@ -53,12 +52,12 @@
         index = (index+1)%quotes.length;
         setTimeout("changeImage();",5000);
       }
-      
+
       changeImage();
       ]]>
-      
+
       /* ]]&gt; */
-      
+
     </script>
   </xsl:template>
 
@@ -79,5 +78,5 @@
     </xsl:if>
   </xsl:template>
   <!-- / picture-box -->
-  
+
 </xsl:stylesheet>
diff --git a/campaigns/ilovefs/2019/index.xsl b/campaigns/ilovefs/2019/index.xsl
index 94f24bfc16..7bcb202579 100755
--- a/campaigns/ilovefs/2019/index.xsl
+++ b/campaigns/ilovefs/2019/index.xsl
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  
   <xsl:import href="../../../fsfe.xsl" />
-  
+
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
       <xsl:with-param name="nb-items" select="5"/>
@@ -11,11 +10,11 @@
   </xsl:template>
 
   <!-- This creates looping pictures in a box. All pictures are located in a directory and have numbered names (here ilovefs-gallery-thumb-NNN.jpg) -->
-  <xsl:template match="picture-box">    
+  <xsl:template match="picture-box">
     <!-- appears once when <picture-box /> is called -->
     <xsl:variable name="from"><xsl:value-of select="@from"/></xsl:variable>
     <xsl:variable name="to"><xsl:value-of select="@to"/></xsl:variable>
-    
+
     <div id="picture-box" style="height:225px;"> <!-- change to height of pictures -->
       <div id="picture-box-inner" class="logo-list quote">
         <a href="https://download.fsfe.org/campaigns/ilovefs/gallery/ilovefs-gallery-1.jpg">
@@ -29,7 +28,7 @@
         </a>
       </div> <!-- /picture-box-inner -->
     </div> <!-- /picture-box -->
-    
+
     <script type="text/javascript">
       /* &lt;![CDATA[ */
       var quotes = [
@@ -40,7 +39,7 @@
       </xsl:call-template>
       <!-- and here again the one-time content -->
       ];
-      
+
       <![CDATA[
       var index = Math.floor(Math.random()*quotes.length);
       function changeImage() {
@@ -53,12 +52,12 @@
         index = (index+1)%quotes.length;
         setTimeout("changeImage();",5000);
       }
-      
+
       changeImage();
       ]]>
-      
+
       /* ]]&gt; */
-      
+
     </script>
   </xsl:template>
 
@@ -79,5 +78,5 @@
     </xsl:if>
   </xsl:template>
   <!-- / picture-box -->
-  
+
 </xsl:stylesheet>
diff --git a/campaigns/ilovefs/2020/index.xsl b/campaigns/ilovefs/2020/index.xsl
index 4ca6b671d8..e1e579beb9 100755
--- a/campaigns/ilovefs/2020/index.xsl
+++ b/campaigns/ilovefs/2020/index.xsl
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  
   <xsl:import href="../../../fsfe.xsl" />
-  
+
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
       <xsl:with-param name="nb-items" select="2"/>
     </xsl:call-template>
   </xsl:template>
-  
+
 </xsl:stylesheet>
diff --git a/campaigns/ilovefs/whylovefs/gallery.xsl b/campaigns/ilovefs/whylovefs/gallery.xsl
index fd9a91b2ce..882ef0106a 100644
--- a/campaigns/ilovefs/whylovefs/gallery.xsl
+++ b/campaigns/ilovefs/whylovefs/gallery.xsl
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  
   <xsl:import href="../../../fsfe.xsl" />
-  
+
 <!-- This creates a page containing images of a gallery.
 All pictures are located in a directory and have numbered names (here ilovefs-gallery-thumb-NNN.jpg)
 The generated list will start at the largest number ('to' aka 'max') and end with the smallest ('from' aka 'min) -->
-  <xsl:template match="picture-list">   
+  <xsl:template match="picture-list">
     <!-- appears once when <picture-list /> is called -->
     <!-- this template calls the loop below -->
     <xsl:variable name="from"><xsl:value-of select="@from"/></xsl:variable>
     <xsl:variable name="to"><xsl:value-of select="@to"/></xsl:variable>
-    
+
     <xsl:call-template name="picture-list">
       <xsl:with-param name="min" select="$from"/> <!-- lowest number, will linked at the very bottom-->
       <xsl:with-param name="max" select="$to"/> <!-- select maximum number of pictures which should be shown in picture list -->
@@ -23,7 +22,7 @@ The generated list will start at the largest number ('to' aka 'max') and end wit
     <xsl:param name="min"/>
     <xsl:param name="max"/>
     <xsl:if test="$max > $min">
-      
+
       <!-- left side (uneven numbers) -->
       <xsl:element name="div">
         <xsl:attribute name="class">captioned left</xsl:attribute>
@@ -37,7 +36,7 @@ The generated list will start at the largest number ('to' aka 'max') and end wit
           </xsl:element> <!-- /img -->
         </xsl:element> <!-- /a -->
       </xsl:element> <!-- /div -->
-      
+
       <!-- right side (even numbers) -->
       <xsl:element name="div">
         <xsl:attribute name="class">captioned right</xsl:attribute>
@@ -51,9 +50,9 @@ The generated list will start at the largest number ('to' aka 'max') and end wit
           </xsl:element> <!-- /img -->
         </xsl:element> <!-- /a -->
       </xsl:element> <!-- /div -->
-      
+
       <!-- initiate the next round -->
-      <xsl:call-template name="picture-list"> 
+      <xsl:call-template name="picture-list">
         <xsl:with-param name="max">
           <xsl:value-of select="$max - 2" /> <!-- count -2, because -1 is already the right side -->
         </xsl:with-param>
@@ -62,5 +61,5 @@ The generated list will start at the largest number ('to' aka 'max') and end wit
     </xsl:if>
   </xsl:template>
   <!-- / picture-list -->
-  
+
 </xsl:stylesheet>
diff --git a/campaigns/inactive.xsl b/campaigns/inactive.xsl
index 1147647dd9..cd02c5136d 100644
--- a/campaigns/inactive.xsl
+++ b/campaigns/inactive.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
diff --git a/campaigns/nledu/nledu.xsl b/campaigns/nledu/nledu.xsl
index 53508b1f48..0d594e8699 100755
--- a/campaigns/nledu/nledu.xsl
+++ b/campaigns/nledu/nledu.xsl
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  
   <xsl:import href="../../fsfe.xsl" />
-  
+
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
       <xsl:with-param name="nb-items" select="5"/>
     </xsl:call-template>
   </xsl:template>
-  
+
   <!-- How to show a link -->
   <xsl:template match="/buildinfo/document/set/news/link">
     <xsl:element name="a">
@@ -21,5 +20,5 @@
       <xsl:text>]</xsl:text>
     </xsl:element>
   </xsl:template>
-  
+
 </xsl:stylesheet>
diff --git a/campaigns/pdfreaders/buglist.xsl b/campaigns/pdfreaders/buglist.xsl
index d0fbdd7327..986f09476f 100644
--- a/campaigns/pdfreaders/buglist.xsl
+++ b/campaigns/pdfreaders/buglist.xsl
@@ -24,49 +24,49 @@
 
     </xsl:for-each>
   </xsl:template>
-  
-  
+
+
   <!-- fill in global figures -->
-  
+
   <xsl:variable name="solved">
     <xsl:value-of select="count( /buildinfo/document/set/buglist/bug[@closed != ''] )" />
   </xsl:variable>
-  
+
   <xsl:variable name="total">
     <xsl:value-of select="count( /buildinfo/document/set/buglist/bug )" />
   </xsl:variable>
-  
+
   <xsl:template match="solved">
     <xsl:value-of select="$solved" />
   </xsl:template>
-  
+
   <xsl:template match="bugs">
     <xsl:value-of select="$total" />
   </xsl:template>
-  
+
   <xsl:template match="globalpct">
     <xsl:value-of select="floor($solved div $total * 100)" />
   </xsl:template>
-  
-  
+
+
   <!-- <xsl:key name="indivs-by-name" match="/buildinfo/document/set/buglist/bug/@name" use="normalize-space(.)" />
   <xsl:key name="groups-by-name" match="/buildinfo/document/set/buglist/bug/@group" use="normalize-space(.)" /> -->
-  
+
   <!-- Fill dynamic content -->
   <xsl:template match="dynamic-content">
-    
+
     <!-- <xsl:value-of select="count( /buildinfo/document/set/buglist/bug[@closed != ''] ) " /><br/>
     <xsl:value-of select="count( /buildinfo/document/set/buglist/bug ) " /><br/>
     <xsl:value-of select="floor( count(/buildinfo/document/set/buglist/bug[@closed != '']) div count( /buildinfo/document/set/buglist/bug ) * 100)" /><br/>
     -->
-    
+
     <xsl:for-each select="/buildinfo/document/set/buglist">
       <xsl:sort select="@country"/>
-      
+
       <xsl:variable name="country">
         <xsl:value-of select="@country"/>
       </xsl:variable>
-      
+
       <!-- Heading -->
       <xsl:element name="h2">
         <xsl:attribute name="id">
@@ -77,7 +77,7 @@
         <xsl:variable name="nbinst" select="count( /buildinfo/document/set/buglist[@country=$country]/bug )" />
         (<xsl:value-of select="$nbsolved" />/<xsl:value-of select="$nbinst" /> = <xsl:value-of select="floor($nbsolved div $nbinst * 100)" />%)
       </xsl:element>
-      
+
       <!-- Table header -->
       <xsl:element name="table">
         <xsl:element name="tr">
@@ -91,7 +91,7 @@
           <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='closedby']"/></xsl:element>
           <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='comment']"/></xsl:element>
         </xsl:element>
-        
+
         <!-- Table rows -->
         <xsl:for-each select="bug">
           <xsl:element name="tr">
@@ -118,33 +118,33 @@
       </xsl:element>
 
     </xsl:for-each>
-    
+
     <!-- List of participants -->
-    <!-- 
+    <!--
     <xsl:value-of select="count(/buildinfo/document/set/buglist/bug/@group[ generate-id() = generate-id(key('groups-by-name', normalize-space(.))) ])" />
-    
+
     <xsl:element name="ul">
-      
+
       <xsl:for-each select=" /buildinfo/document/set/buglist/bug/@group[ generate-id() = generate-id(key('groups-by-name', normalize-space(.))) ] ">
         <xsl:sort select="count( /buildinfo/document/set/buglist/bug/@name = . )" data-type="number" />
-        
+
         <xsl:variable name="name" select="." />
-        
+
         <xsl:if test="position() &lt;= 5">
-          
+
           <xsl:element name="li">
             <xsl:value-of select="count( /buildinfo/document/set/buglist/bug[@group=$name] )" />
             <xsl:text>-</xsl:text>
             <xsl:value-of select="$name" />
           </xsl:element>
-          
+
         </xsl:if>
-        
+
       </xsl:for-each>
-    
+
     </xsl:element>
     -->
-    
+
   </xsl:template>
 
 </xsl:stylesheet>
diff --git a/campaigns/pdfreaders/pdfreaders.xsl b/campaigns/pdfreaders/pdfreaders.xsl
index a955fe4583..2adf8cbae3 100644
--- a/campaigns/pdfreaders/pdfreaders.xsl
+++ b/campaigns/pdfreaders/pdfreaders.xsl
@@ -2,19 +2,19 @@
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../../fsfe.xsl" />
-  
+
   <xsl:template match="number-of-businesses">
     <xsl:value-of select="count(/buildinfo/document/set/bsig/li)" />
   </xsl:template>
-  
+
   <xsl:template match="number-of-orgs">
     <xsl:value-of select="count(/buildinfo/document/set/osig/li)" />
   </xsl:template>
-  
+
   <xsl:template match="number-of-individuals">
     <xsl:value-of select="count(/buildinfo/document/set/isig/li)" />
   </xsl:template>
-  
+
   <!-- Fill dynamic content -->
   <xsl:template match="dynamic-content">
     <xsl:for-each select="/buildinfo/document/set/buglist">
diff --git a/campaigns/pdfreaders/petition.xsl b/campaigns/pdfreaders/petition.xsl
index f90ec67bbd..9f10546144 100644
--- a/campaigns/pdfreaders/petition.xsl
+++ b/campaigns/pdfreaders/petition.xsl
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<xsl:stylesheet version="1.0"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-	
-  <xsl:import href="../../build/xslt/countries.xsl" />
-	
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../../fsfe.xsl" />
+  <xsl:import href="../../build/xslt/countries.xsl" />
 
   <xsl:template match="/buildinfo/document/body/include-signatures">
       <xsl:apply-templates />
-      
+
       <h3 id="organisations">
         <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'osig'" /></xsl:call-template>
         (<xsl:value-of select="count(/buildinfo/document/set/osig/li)" />)
@@ -19,7 +16,7 @@
           <xsl:sort select="." />
         </xsl:apply-templates>
       </ul>
-      
+
       <h3 id="businesses">
       	<xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'bsig'" /></xsl:call-template>
       	(<xsl:value-of select="count(/buildinfo/document/set/bsig/li)" />)
@@ -29,7 +26,7 @@
           <xsl:sort select="." />
         </xsl:apply-templates>
       </ul>
-      
+
       <h3 id="individuals">
         <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'isig'" /></xsl:call-template>
         (<xsl:value-of select="count(/buildinfo/document/set/isig/li)" />)
@@ -41,11 +38,11 @@
       </ul>
       <xsl:apply-templates select="/buildinfo/document/text/footer/node()" />
   </xsl:template>
-  
+
   <xsl:template match="country-list">
     <xsl:call-template name="country-list" />
   </xsl:template>
-  
+
   <!-- Add a hidden field to the form to identify the language used. -->
   <xsl:template match="add-language">
     <xsl:element name="input">
diff --git a/campaigns/projects.xsl b/campaigns/projects.xsl
index 523d9722cb..53038a1535 100644
--- a/campaigns/projects.xsl
+++ b/campaigns/projects.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
diff --git a/campaigns/publiccode/bea.xsl b/campaigns/publiccode/bea.xsl
index bb06ade455..5f7f7c3dd0 100644
--- a/campaigns/publiccode/bea.xsl
+++ b/campaigns/publiccode/bea.xsl
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
   <xsl:import href="../../fsfe.xsl" />
 
   <xsl:template match="sigtable-orgs">
@@ -11,12 +10,12 @@
   <xsl:template match="sigtable">
     <xsl:copy-of select="document('sigtable.en.xml')"/>
   </xsl:template>
-  
+
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
       <xsl:with-param name="nb-items" select="5"/>
       <xsl:with-param name="sidebar" select="'yes'"/>
     </xsl:call-template>
   </xsl:template>
-  
+
 </xsl:stylesheet>
diff --git a/campaigns/publiccode/publiccode.xsl b/campaigns/publiccode/publiccode.xsl
index 96167d388d..76d01a51dc 100644
--- a/campaigns/publiccode/publiccode.xsl
+++ b/campaigns/publiccode/publiccode.xsl
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  
   <xsl:import href="../../fsfe.xsl" />
-  
+
   <xsl:template match="fetch-news">
     <xsl:call-template name="fetch-news">
       <xsl:with-param name="nb-items" select="5"/>
       <xsl:with-param name="sidebar" select="'yes'"/>
     </xsl:call-template>
   </xsl:template>
-  
+
 </xsl:stylesheet>
diff --git a/campaigns/swpat/documents.xsl b/campaigns/swpat/documents.xsl
index 33bc360f5a..06a40ad23d 100644
--- a/campaigns/swpat/documents.xsl
+++ b/campaigns/swpat/documents.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../../fsfe.xsl" />
diff --git a/campaigns/swpat/memorandum.xsl b/campaigns/swpat/memorandum.xsl
index 1f0412bf6b..f7177532f6 100644
--- a/campaigns/swpat/memorandum.xsl
+++ b/campaigns/swpat/memorandum.xsl
@@ -1,12 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<xsl:stylesheet version="1.0"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<?xml version="1.0" encoding="UTF-8"?>
 
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../../fsfe.xsl" />
 
   <xsl:template match="signatories">
-      
+
     <div class="indent">
       <b><xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'osig'" /></xsl:call-template></b>
       <ul>
diff --git a/campaigns/valentine/2011/valentine-2011.xsl b/campaigns/valentine/2011/valentine-2011.xsl
index 400af1c9d9..e61eaa2e6d 100644
--- a/campaigns/valentine/2011/valentine-2011.xsl
+++ b/campaigns/valentine/2011/valentine-2011.xsl
@@ -1,31 +1,22 @@
 <?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">
-  
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../../../fsfe.xsl" />
-  
-  <!-- 
-    For documentation on tagging (e.g. fetching news and events), take a
-    look at the documentation under
-      /tools/xsltsl/tagging-documentation.txt
-  -->
-  
+
   <!-- The top level element of the input file is "buildinfo" -->
   <xsl:template match="buildinfo">
     <xsl:apply-templates select="node()"/>
   </xsl:template>
-  
+
   <xsl:template match="identica">
     <!--<xsl:element name="div">
       <xsl:attribute name="class">entry</xsl:attribute>
       <xsl:attribute name="style">float: right;</xsl:attribute>
-      
+
       <xsl:element name="script">
         <xsl:attribute name="type">text/javascript</xsl:attribute>
         <xsl:attribute name="src">http://identi.ca/js/identica-badge.js</xsl:attribute>
-      
+
         <xsl:text>
 	          {
 	            "user":"ireallylovefs",
@@ -36,9 +27,9 @@
 	            "height":"200px"
 	          }
 	      </xsl:text>
-	      
+	
 	    </xsl:element>
 	  </xsl:element>-->
   </xsl:template>
-  
+
 </xsl:stylesheet>
diff --git a/campaigns/whyfs/whyfs.xsl b/campaigns/whyfs/whyfs.xsl
index 05559c9da1..49cb3e4e30 100644
--- a/campaigns/whyfs/whyfs.xsl
+++ b/campaigns/whyfs/whyfs.xsl
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<xsl:stylesheet version="1.0"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../../fsfe.xsl" />
 
   <xsl:template match="speakers">
diff --git a/community/tools/eventregistration.xsl b/community/tools/eventregistration.xsl
index 5d2f932ea9..6bc0374e88 100644
--- a/community/tools/eventregistration.xsl
+++ b/community/tools/eventregistration.xsl
@@ -1,7 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../../fsfe.xsl" />
   <xsl:import href="../../build/xslt/countries.xsl" />
-  
+
   <!-- Dropdown list of countries requiring a choice -->
   <!-- when copying this, remember importing the xsl, and editing the .source file -->
   <xsl:template match="country-list">
diff --git a/contribute/promotion-materials-archive.xsl b/contribute/promotion-materials-archive.xsl
index caecafbdde..89d322040d 100644
--- a/contribute/promotion-materials-archive.xsl
+++ b/contribute/promotion-materials-archive.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
@@ -8,21 +8,21 @@
     <xsl:element name="div">
       <xsl:attribute name="id">toc</xsl:attribute>
       <xsl:element name="ul">
-      
+
         <xsl:for-each select="/buildinfo/document/set/item">
           <xsl:sort select="@type" order="ascending" />
-          
+
           <!-- Load variables id, #link, type and year -->
           <xsl:variable name="id"><xsl:value-of select="@id"/></xsl:variable>
           <xsl:variable name="link" select="concat('#', $id)"/>
           <xsl:variable name="type"><xsl:value-of select="@type"/></xsl:variable>
           <xsl:variable name="year"><xsl:value-of select="@year"/></xsl:variable>
-          
+
           <xsl:element name="li">
             <xsl:text>[</xsl:text>
             <xsl:value-of select="$type"/> <!-- e.g. [dfd] -->
             <xsl:text>] </xsl:text>
-            
+
             <xsl:element name="a">
               <xsl:attribute name="href">
                 <xsl:value-of select="$link"/> <!-- #id-of-item -->
@@ -32,7 +32,7 @@
                 <xsl:value-of select="$year"/> <!-- (20xx) -->
               <xsl:text>)</xsl:text>
             </xsl:element> <!-- /a -->
-            
+
           </xsl:element> <!-- /li -->
         </xsl:for-each>
       </xsl:element> <!-- /ul -->
@@ -45,11 +45,11 @@
 
     <xsl:for-each select="/buildinfo/document/set/item [@year = $year]">
       <xsl:sort select="@order" order="ascending"/>
-      
+
       <!-- Full Item -->
       <xsl:element name="div">
         <xsl:attribute name="class">left break margin-vertical</xsl:attribute>
-        
+
         <!-- Load item variables id and year -->
         <xsl:variable name="id"><xsl:value-of select="@id"/></xsl:variable>
         <xsl:variable name="type"><xsl:value-of select="@type"/></xsl:variable>
@@ -62,7 +62,7 @@
           </xsl:element>
         </xsl:element>
         <!-- / Name -->
-        
+
         <!-- Image -->
         <xsl:for-each select="image">
           <!-- <xsl:element name="a">
@@ -72,7 +72,7 @@
             <xsl:attribute name="title">
               <xsl:value-of select="/buildinfo/document/set/info[@id=$id]/name" />
             </xsl:attribute> -->
-          
+
             <xsl:element name="img">
               <xsl:attribute name="class">left grid-30</xsl:attribute>
               <xsl:attribute name="src">
@@ -82,7 +82,7 @@
           <!-- </xsl:element> --> <!-- /a -->
         </xsl:for-each>
         <!-- /Image -->
-        
+
         <!-- Description -->
         <xsl:element name="p">
           <xsl:attribute name="class">right grid-70</xsl:attribute>
@@ -90,11 +90,11 @@
           <xsl:copy-of select="/buildinfo/document/set/info[@id=$id]/description" />
         </xsl:element>
         <!-- / Description -->
-        
+
         <!-- Details -->
         <xsl:element name="p">
           <xsl:attribute name="class">right grid-70</xsl:attribute>
-          
+
           <!-- Type -->
           <xsl:if test="/buildinfo/document/set/info[@id=$id]/type != ''">
             <xsl:element name="strong">
@@ -104,7 +104,7 @@
             <xsl:copy-of select="/buildinfo/document/set/info[@id=$id]/type" />
             <xsl:element name="br"></xsl:element>
           </xsl:if>
-          
+
           <!-- Size -->
           <xsl:if test="/buildinfo/document/set/info[@id=$id]/size != ''">
             <xsl:element name="strong">
@@ -114,7 +114,7 @@
             <xsl:copy-of select="/buildinfo/document/set/info[@id=$id]/size" />
             <xsl:element name="br"></xsl:element>
           </xsl:if>
-          
+
           <!-- Context (e.g Campaign) -->
           <xsl:if test="/buildinfo/document/set/info[@id=$id]/context != ''">
             <xsl:element name="strong">
@@ -124,7 +124,7 @@
             <xsl:copy-of select="/buildinfo/document/set/info[@id=$id]/context" />
             <xsl:element name="br"></xsl:element>
           </xsl:if>
-          
+
           <!-- Languages -->
           <xsl:if test="/buildinfo/document/set/info[@id=$id]/languages != ''">
             <xsl:element name="span">
@@ -143,7 +143,7 @@
             </xsl:element> <!-- /span -->
             <xsl:element name="br"></xsl:element>
           </xsl:if>
-          
+
           <!-- License -->
           <xsl:if test="/buildinfo/document/set/info[@id=$id]/license != ''">
             <xsl:element name="strong">
@@ -153,7 +153,7 @@
             <xsl:copy-of select="/buildinfo/document/set/info[@id=$id]/license" />
             <xsl:element name="br"></xsl:element>
           </xsl:if>
-          
+
           <!-- Author -->
           <xsl:if test="/buildinfo/document/set/info[@id=$id]/author != ''">
             <xsl:element name="strong">
@@ -163,7 +163,7 @@
             <xsl:copy-of select="/buildinfo/document/set/info[@id=$id]/author" />
             <xsl:element name="br"></xsl:element>
           </xsl:if>
-          
+
           <!-- Year -->
           <xsl:element name="strong">
             <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'stw-year'" /></xsl:call-template>
@@ -171,8 +171,8 @@
           </xsl:element>
           <xsl:value-of select="$year"/>
           <xsl:element name="br"></xsl:element>
-          
-          
+
+
           <!-- SMALLER TEXT -->
           <!-- Source -->
           <xsl:if test="/buildinfo/document/set/info[@id=$id]/source != ''">
@@ -192,7 +192,7 @@
             </xsl:element> <!-- /span -->
             <xsl:element name="br"></xsl:element>
           </xsl:if>
-          
+
           <!-- Printready -->
           <xsl:if test="/buildinfo/document/set/info[@id=$id]/printready != ''">
             <xsl:element name="span">
@@ -211,15 +211,15 @@
             </xsl:element> <!-- /span -->
             <xsl:element name="br"></xsl:element>
           </xsl:if>
-        
+
         </xsl:element>
         <!-- / Details -->
-        
+
       </xsl:element>
       <!-- / Full Item -->
-        
+
     </xsl:for-each>
-    
+
   </xsl:template>
 
 </xsl:stylesheet>
diff --git a/contribute/spreadtheword.xsl b/contribute/spreadtheword.xsl
index c359ea47ba..412cc4c0ba 100644
--- a/contribute/spreadtheword.xsl
+++ b/contribute/spreadtheword.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
@@ -10,9 +10,9 @@
 
     <xsl:for-each select="/buildinfo/document/set/item [@type = $type]">
       <xsl:sort select="@order" order="ascending"/>
-      
+
       <xsl:variable name="id"><xsl:value-of select="@id"/></xsl:variable>
-      
+
       <xsl:choose>
         <!-- item is just an introductionary text -->
         <xsl:when test="@introduction = 'yes'">
@@ -28,7 +28,7 @@
           <xsl:element name="div">
             <xsl:attribute name="class">left break margin-vertical</xsl:attribute>
             <xsl:attribute name="id"><xsl:value-of select="$id"/></xsl:attribute>
-            
+
             <xsl:variable name="year"><xsl:value-of select="@year"/></xsl:variable>
 
             <!-- Name -->
@@ -38,7 +38,7 @@
               </xsl:element>
             </xsl:element>
             <!-- / Name -->
-            
+
             <!-- Image -->
             <xsl:for-each select="image">
               <!-- <xsl:element name="a">
@@ -48,7 +48,7 @@
                 <xsl:attribute name="title">
                   <xsl:value-of select="/buildinfo/document/set/info[@id=$id]/name" />
                 </xsl:attribute> -->
-              
+
                 <xsl:element name="img">
                   <xsl:attribute name="class">left grid-30</xsl:attribute>
                   <xsl:attribute name="src">
@@ -58,7 +58,7 @@
               <!-- </xsl:element> --> <!-- /a -->
             </xsl:for-each>
             <!-- /Image -->
-            
+
             <!-- Description -->
             <xsl:element name="p">
               <xsl:attribute name="class">right grid-70</xsl:attribute>
@@ -66,7 +66,7 @@
               <xsl:copy-of select="/buildinfo/document/set/info[@id=$id]/description" />
             </xsl:element>
             <!-- / Description -->
-            
+
         <!-- Printed version -->
               <xsl:if test="/buildinfo/document/set/info[@id=$id]/printed != ''">
                 <xsl:element name="p">
@@ -85,12 +85,12 @@
                   <xsl:copy-of select="/buildinfo/document/set/info[@id=$id]/printed" /> <!-- Dynamic value of the field -->
                 </xsl:element> <!-- /p -->
                 <!--<xsl:element name="br"></xsl:element>-->
-              </xsl:if>        
-            
+              </xsl:if>
+
             <!-- Details -->
             <xsl:element name="p">
               <xsl:attribute name="class">right grid-70</xsl:attribute>
-              
+
               <!-- Type -->
               <xsl:if test="/buildinfo/document/set/info[@id=$id]/type != ''">
                 <xsl:element name="strong">
@@ -100,7 +100,7 @@
                 <xsl:value-of select="/buildinfo/document/set/info[@id=$id]/type" />
                 <xsl:element name="br"></xsl:element>
               </xsl:if>
-              
+
               <!-- Size -->
               <xsl:if test="/buildinfo/document/set/info[@id=$id]/size != ''">
                 <xsl:element name="strong">
@@ -110,7 +110,7 @@
                 <xsl:value-of select="/buildinfo/document/set/info[@id=$id]/size" />
                 <xsl:element name="br"></xsl:element>
               </xsl:if>
-              
+
               <!-- Context (e.g Campaign) -->
               <xsl:if test="/buildinfo/document/set/info[@id=$id]/context != ''">
                 <xsl:element name="strong">
@@ -120,7 +120,7 @@
                 <xsl:copy-of select="/buildinfo/document/set/info[@id=$id]/context" />
                 <xsl:element name="br"></xsl:element>
               </xsl:if>
-              
+
               <!-- Languages -->
               <xsl:if test="/buildinfo/document/set/info[@id=$id]/languages != ''">
                 <xsl:element name="span">
@@ -139,7 +139,7 @@
                 </xsl:element> <!-- /span -->
                 <xsl:element name="br"></xsl:element>
               </xsl:if>
-              
+
               <!-- License -->
               <xsl:if test="/buildinfo/document/set/info[@id=$id]/license != ''">
                 <xsl:element name="strong">
@@ -149,7 +149,7 @@
                 <xsl:copy-of select="/buildinfo/document/set/info[@id=$id]/license" />
                 <xsl:element name="br"></xsl:element>
               </xsl:if>
-              
+
               <!-- Author -->
               <xsl:if test="/buildinfo/document/set/info[@id=$id]/author != ''">
                 <xsl:element name="strong">
@@ -159,7 +159,7 @@
                 <xsl:copy-of select="/buildinfo/document/set/info[@id=$id]/author" />
                 <xsl:element name="br"></xsl:element>
               </xsl:if>
-              
+
               <!-- Year -->
               <xsl:if test="/buildinfo/document/set/info[@id=$id]/year != ''">
                 <xsl:element name="strong">
@@ -169,8 +169,8 @@
                 <xsl:value-of select="$year"/>
                 <xsl:element name="br"></xsl:element>
               </xsl:if>
-              
-              
+
+
               <!-- SMALLER TEXT -->
               <!-- Source -->
               <xsl:if test="/buildinfo/document/set/info[@id=$id]/source != ''">
@@ -190,7 +190,7 @@
                 </xsl:element> <!-- /span -->
                 <xsl:element name="br"></xsl:element>
               </xsl:if>
-              
+
               <!-- Printready -->
               <xsl:if test="/buildinfo/document/set/info[@id=$id]/printready != ''">
                 <xsl:element name="span">
@@ -209,21 +209,21 @@
                 </xsl:element> <!-- /span -->
                 <xsl:element name="br"></xsl:element>
               </xsl:if>
-            
+
             </xsl:element>
             <!-- / Details -->
-            
+
           </xsl:element>
           <!-- / Full Item -->
-        
+
         </xsl:otherwise>
-      
+
       </xsl:choose>
-      
-      
-        
+
+
+
     </xsl:for-each>
-    
+
   </xsl:template>
 
   <!-- Dropdown list of countries requiring a choice -->
diff --git a/contribute/translators/translators.xsl b/contribute/translators/translators.xsl
index e800c255c7..4fbb92a385 100644
--- a/contribute/translators/translators.xsl
+++ b/contribute/translators/translators.xsl
@@ -1,11 +1,8 @@
 <?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">
-  
-  <xsl:import href="../../build/xslt/people.xsl" />
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../../fsfe.xsl" />
+  <xsl:import href="../../build/xslt/people.xsl" />
 
   <xsl:template match="translation-coordinators-list">
     <xsl:call-template name="country-people-list">
diff --git a/de/de.xsl b/de/de.xsl
index 08817ed56f..1ac5aa7c1b 100644
--- a/de/de.xsl
+++ b/de/de.xsl
@@ -1,23 +1,11 @@
 <?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">
-  
-  <xsl:import href="../build/xslt/people.xsl" />
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
+  <xsl:import href="../build/xslt/people.xsl" />
 
-  <!-- To localise this page to a new country, copy this file and change the following:
-  
-    # <xsl:variable name="country-code">de</xsl:variable> -> change xx to your country code
-    
-    For more information, take a look at the documentation at
-        http://fsfe.org/contribute/web/tagging.html
-    
-  -->
-  
   <xsl:variable name="country-code">de</xsl:variable>
-  
+
   <!--display labels-->
 
   <!--translated word "news"-->
@@ -54,14 +42,14 @@
       <xsl:with-param name="id" select="'team'" />
     </xsl:call-template>
   </xsl:template>
-  
+
   <!--define contact information-->
-  
+
   <xsl:template match="contact-details">
     <xsl:for-each select="/buildinfo/document/set/contact">
 
     <xsl:if test="@id = 'DE'">
-  
+
   <!-- Email -->
     <xsl:if test="email != ''">
       <xsl:element name="p">
@@ -76,12 +64,12 @@
         </xsl:element>
       </xsl:element>
     </xsl:if>
-  
+
   <!-- Address -->
     <xsl:if test="address != ''">
      <xsl:apply-templates select="address"/>
     </xsl:if>
-  
+
   <!-- Phone -->
     <xsl:if test="phone != ''">
       <xsl:element name="p">
@@ -102,14 +90,14 @@
     </xsl:if>
     </xsl:for-each>
   </xsl:template>
-  
+
   <!--define dynamic list of country news items-->
     <xsl:template match="country-news">
         <xsl:call-template name="fetch-news">
             <xsl:with-param name="nb-items" select="3" />
         </xsl:call-template>
     </xsl:template>
-  
+
   <!-- EVENTS -->
   <!--display dynamic list of event items-->
   <xsl:template match="country-events">
@@ -117,7 +105,7 @@
     <xsl:call-template name="fetch-events">
       <xsl:with-param name="wanted-time" select="'present'" />
     </xsl:call-template>
-    
+
     <!-- Future events -->
     <xsl:call-template name="fetch-events">
       <xsl:with-param name="wanted-time" select="'future'" />
@@ -125,7 +113,7 @@
       <!--FIXME ↑ why is it showing one more?-->
     </xsl:call-template>
   </xsl:template> <!-- /EVENTS -->
-    
+
     <!--define dynamic list of country team members-->
     <xsl:template match="country-team-list">
         <xsl:call-template name="country-people-list">
diff --git a/default.xsl b/default.xsl
index 15d598a11f..76ac84d24a 100644
--- a/default.xsl
+++ b/default.xsl
@@ -1,10 +1,5 @@
 <?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">
- 
-  <xsl:import href="fsfe.xsl" />
-  
-</xsl:stylesheet> 
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:import href="fsfe.xsl"/>
+</xsl:stylesheet>
diff --git a/donate/thankgnus-2001.xsl b/donate/thankgnus-2001.xsl
index f95cb58520..e77c7d8073 100644
--- a/donate/thankgnus-2001.xsl
+++ b/donate/thankgnus-2001.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
diff --git a/donate/thankgnus-2002.xsl b/donate/thankgnus-2002.xsl
index f95cb58520..e77c7d8073 100644
--- a/donate/thankgnus-2002.xsl
+++ b/donate/thankgnus-2002.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
diff --git a/donate/thankgnus-2003.xsl b/donate/thankgnus-2003.xsl
index f95cb58520..e77c7d8073 100644
--- a/donate/thankgnus-2003.xsl
+++ b/donate/thankgnus-2003.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
diff --git a/donate/thankgnus-2004.xsl b/donate/thankgnus-2004.xsl
index f95cb58520..e77c7d8073 100644
--- a/donate/thankgnus-2004.xsl
+++ b/donate/thankgnus-2004.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
diff --git a/donate/thankgnus-2005.xsl b/donate/thankgnus-2005.xsl
index f95cb58520..e77c7d8073 100644
--- a/donate/thankgnus-2005.xsl
+++ b/donate/thankgnus-2005.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
diff --git a/donate/thankgnus-2006.xsl b/donate/thankgnus-2006.xsl
index f95cb58520..e77c7d8073 100644
--- a/donate/thankgnus-2006.xsl
+++ b/donate/thankgnus-2006.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
diff --git a/donate/thankgnus-2007.xsl b/donate/thankgnus-2007.xsl
index f95cb58520..e77c7d8073 100644
--- a/donate/thankgnus-2007.xsl
+++ b/donate/thankgnus-2007.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
diff --git a/donate/thankgnus-2008.xsl b/donate/thankgnus-2008.xsl
index f95cb58520..e77c7d8073 100644
--- a/donate/thankgnus-2008.xsl
+++ b/donate/thankgnus-2008.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
diff --git a/donate/thankgnus-2009.xsl b/donate/thankgnus-2009.xsl
index f95cb58520..e77c7d8073 100644
--- a/donate/thankgnus-2009.xsl
+++ b/donate/thankgnus-2009.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
diff --git a/donate/thankgnus-2010.xsl b/donate/thankgnus-2010.xsl
index 82296c219b..2058ffde7b 100644
--- a/donate/thankgnus-2010.xsl
+++ b/donate/thankgnus-2010.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
diff --git a/donate/thankgnus-2011.xsl b/donate/thankgnus-2011.xsl
index 82296c219b..2058ffde7b 100644
--- a/donate/thankgnus-2011.xsl
+++ b/donate/thankgnus-2011.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
diff --git a/donate/thankgnus-2012.xsl b/donate/thankgnus-2012.xsl
index 82296c219b..2058ffde7b 100644
--- a/donate/thankgnus-2012.xsl
+++ b/donate/thankgnus-2012.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
diff --git a/donate/thankgnus-2013.xsl b/donate/thankgnus-2013.xsl
index cd18e6d73c..9185b2aaa6 100644
--- a/donate/thankgnus-2013.xsl
+++ b/donate/thankgnus-2013.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
diff --git a/donate/thankgnus-2014.xsl b/donate/thankgnus-2014.xsl
index cd18e6d73c..9185b2aaa6 100644
--- a/donate/thankgnus-2014.xsl
+++ b/donate/thankgnus-2014.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
diff --git a/donate/thankgnus-2015.xsl b/donate/thankgnus-2015.xsl
index cd18e6d73c..9185b2aaa6 100644
--- a/donate/thankgnus-2015.xsl
+++ b/donate/thankgnus-2015.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
diff --git a/donate/thankgnus-2016.xsl b/donate/thankgnus-2016.xsl
index cd18e6d73c..9185b2aaa6 100644
--- a/donate/thankgnus-2016.xsl
+++ b/donate/thankgnus-2016.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
diff --git a/donate/thankgnus-2017.xsl b/donate/thankgnus-2017.xsl
index cd18e6d73c..9185b2aaa6 100644
--- a/donate/thankgnus-2017.xsl
+++ b/donate/thankgnus-2017.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
diff --git a/donate/thankgnus-2018.xsl b/donate/thankgnus-2018.xsl
index cd18e6d73c..9185b2aaa6 100644
--- a/donate/thankgnus-2018.xsl
+++ b/donate/thankgnus-2018.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
diff --git a/donate/thankgnus-2019.xsl b/donate/thankgnus-2019.xsl
index cd18e6d73c..9185b2aaa6 100644
--- a/donate/thankgnus-2019.xsl
+++ b/donate/thankgnus-2019.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
diff --git a/donate/thankgnus-2020.xsl b/donate/thankgnus-2020.xsl
index cd18e6d73c..9185b2aaa6 100644
--- a/donate/thankgnus-2020.xsl
+++ b/donate/thankgnus-2020.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
diff --git a/donate/thankgnus.xsl b/donate/thankgnus.xsl
index 5d5bd79c05..88dcc24607 100644
--- a/donate/thankgnus.xsl
+++ b/donate/thankgnus.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
diff --git a/drm.info/default.xsl b/drm.info/default.xsl
index 599182cc9d..f87d3e93d5 100644
--- a/drm.info/default.xsl
+++ b/drm.info/default.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="xslt/drm_info_head.xsl" /> 
-  <xsl:import href="xslt/drm_info_body.xsl" /> 
+  <xsl:import href="xslt/drm_info_head.xsl" />
+  <xsl:import href="xslt/drm_info_body.xsl" />
   <xsl:output method="html" omit-xml-declaration="yes" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
   <xsl:include href="../build/xslt/fsfe_document.xsl" />
   <xsl:include href="../build/xslt/fsfe_nolocal.xsl" />
diff --git a/drm.info/xslt/drm_info_body.xsl b/drm.info/xslt/drm_info_body.xsl
index 2bd681662f..6729480a8d 100644
--- a/drm.info/xslt/drm_info_body.xsl
+++ b/drm.info/xslt/drm_info_body.xsl
@@ -27,7 +27,7 @@
             <xsl:attribute name="class">slogan2</xsl:attribute>
              What you should know about Digital Restrictions Management
           </xsl:element>
- 
+
           <xsl:element name="a">
             <xsl:attribute name="href">http://drm.info</xsl:attribute>
             <xsl:element name="img">
@@ -94,10 +94,10 @@
         </xsl:element>
 
       </xsl:element>
-      
 
 
- 
+
+
 <!--      <xsl:call-template name="notifications" /> -->
 
       <xsl:element name="div"> <xsl:attribute name="id">body</xsl:attribute>
@@ -105,8 +105,8 @@
           <xsl:apply-templates select="body/node()" />
 <!--	</xsl:element> -->
 <!--      </xsl:element> -->
-      
-    
+
+
       <xsl:element name="div"><xsl:attribute name="class">col3</xsl:attribute>
 	<xsl:element name="h3">Powered By</xsl:element>
         <xsl:element name="ul">
@@ -121,7 +121,7 @@
              </xsl:element>
            </xsl:element>
 </xsl:element>
-        
+
 
 	 <xsl:element name="h4">In Collaboration with</xsl:element>
 	 <xsl:element name="ul">
@@ -164,21 +164,21 @@
            </xsl:element>
 	</xsl:element>	
 </xsl:element>
-<!--      <xsl:element name="hr" /> 
+<!--      <xsl:element name="hr" />
       <xsl:element name="footer">
         <xsl:attribute name="id">bottom</xsl:attribute>
- 
+
         <xsl:call-template name="footer_sitenav" />
         <xsl:element name="hr" />
         <xsl:call-template name="footer_sourcelink" />
         <xsl:call-template name="footer_legal" />
- 
+
         <xsl:element name="section">
           <xsl:attribute name="id">sister-organisations</xsl:attribute>
           <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'fsfnetwork'" /></xsl:call-template>
-        </xsl:element> --> 
-      </xsl:element> 
+        </xsl:element> -->
+      </xsl:element>
 </xsl:element>
-   
+
   </xsl:template>
 </xsl:stylesheet>
diff --git a/drm.info/xslt/drm_info_head.xsl b/drm.info/xslt/drm_info_head.xsl
index cca0a55ac4..179bdab53d 100644
--- a/drm.info/xslt/drm_info_head.xsl
+++ b/drm.info/xslt/drm_info_head.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
diff --git a/ee/ee.xsl b/ee/ee.xsl
index fc446befa6..f67f1cbe50 100644
--- a/ee/ee.xsl
+++ b/ee/ee.xsl
@@ -1,23 +1,11 @@
 <?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">
-  
-  <xsl:import href="../build/xslt/people.xsl" />
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
+  <xsl:import href="../build/xslt/people.xsl" />
 
-  <!-- To localise this page to a new country, copy this file and change the following:
-  
-    # <xsl:variable name="country-code">de</xsl:variable> -> change xx to your country code
-    
-    For more information, take a look at the documentation at
-        http://fsfe.org/contribute/web/tagging.html
-    
-  -->
-  
   <xsl:variable name="country-code">ee</xsl:variable>
-  
+
   <!--display labels-->
 
   <!--translated word "news"-->
@@ -54,14 +42,14 @@
       <xsl:with-param name="id" select="'team'" />
     </xsl:call-template>
   </xsl:template>
-  
+
   <!--define contact information-->
-  
+
   <xsl:template match="contact-details">
     <xsl:for-each select="/buildinfo/document/set/contact">
 
     <xsl:if test="@id = 'EE'">
-  
+
   <!-- Email -->
     <xsl:if test="email != ''">
       <xsl:element name="p">
@@ -76,12 +64,12 @@
         </xsl:element>
       </xsl:element>
     </xsl:if>
-  
+
   <!-- Address -->
     <xsl:if test="address != ''">
      <xsl:apply-templates select="address"/>
     </xsl:if>
-  
+
   <!-- Phone -->
     <xsl:if test="phone != ''">
       <xsl:element name="p">
@@ -102,28 +90,28 @@
     </xsl:if>
     </xsl:for-each>
   </xsl:template>
-  
+
   <!--define dynamic list of country news items-->
     <xsl:template match="country-news">
         <xsl:call-template name="fetch-news">
             <xsl:with-param name="nb-items" select="3" />
         </xsl:call-template>
     </xsl:template>
-    
+
     <!--define dynamic list of country event items-->
     <xsl:template match="country-events">
         <!-- Current events -->
         <xsl:call-template name="fetch-events">
             <xsl:with-param name="wanted-time" select="'present'" />
         </xsl:call-template>
-        
+
         <!-- Future events -->
         <xsl:call-template name="fetch-events">
             <xsl:with-param name="wanted-time" select="'future'" />
             <xsl:with-param name="nb-items" select="3" />
         </xsl:call-template>
     </xsl:template>
-    
+
     <!--define dynamic list of country team members-->
     <xsl:template match="country-team-list">
         <xsl:call-template name="country-people-list">
diff --git a/events/events.ics.xsl b/events/events.ics.xsl
index d1ca9b67c7..ecc1f24580 100644
--- a/events/events.ics.xsl
+++ b/events/events.ics.xsl
@@ -4,10 +4,10 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:str="http://exslt.org/strings"
   extension-element-prefixes="str">
-  
+
   <xsl:output method="text" encoding="UTF-8" indent="no" />
   <xsl:strip-space elements="body"/>
-  
+
   <!-- new line template -->
   <xsl:template name="nl"><xsl:text>&#13;&#10;</xsl:text></xsl:template>
 
@@ -22,11 +22,11 @@
     <xsl:variable name="end">
       <xsl:value-of select="translate (@end, '-', '')" />
     </xsl:variable>
-    
+
     <xsl:variable name="link">
       <xsl:value-of select="link" />
     </xsl:variable>
-    
+
     <xsl:variable name="page">
       <xsl:value-of select="page" />
     </xsl:variable>
@@ -44,14 +44,14 @@
     <xsl:if test="not($start = $end)">
       <xsl:text>DTEND;VALUE=DATE:</xsl:text><xsl:value-of select="$end" /><xsl:call-template name="nl" />
     </xsl:if>
-    
+
     <xsl:text>URL:</xsl:text>
     <xsl:choose>
       <xsl:when test="$page != ''"><xsl:value-of select="$page" /></xsl:when>
       <xsl:otherwise>http://fsfe.org/events/events.<xsl:value-of select="/buildinfo/@language" />.html</xsl:otherwise>
     </xsl:choose>
     <xsl:call-template name="nl" />
-    
+
     <xsl:text>DESCRIPTION:</xsl:text>
     <xsl:call-template name="ical-escape">
       <xsl:with-param name="text" select="normalize-space(body/node())" />
@@ -59,13 +59,13 @@
     <xsl:call-template name="nl" />
 
     <xsl:text>END:VEVENT</xsl:text><xsl:call-template name="nl" />
-      
+
   </xsl:template>
-  
+
   <xsl:template match="/">
     <xsl:apply-templates select="/buildinfo/document" />
   </xsl:template>
-  
+
   <xsl:template match="/buildinfo/document">
     <xsl:text>BEGIN:VCALENDAR</xsl:text><xsl:call-template name="nl" />
     <xsl:text>VERSION:2.0</xsl:text><xsl:call-template name="nl" />
@@ -79,11 +79,11 @@
       </xsl:for-each>
     <xsl:text>END:VCALENDAR</xsl:text>
   </xsl:template>
-  
-  
+
+
   <xsl:template name="ical-escape">
     <xsl:param name="text" />
-    
+
     <!-- characters to be backslashed: \;, -->
     <xsl:value-of select="str:replace(str:replace(str:replace($text,'\','\\'),',','\,'),';','\;')" />
   </xsl:template>
diff --git a/events/events.rss.xsl b/events/events.rss.xsl
index d0ec142ebf..cbc46441bc 100644
--- a/events/events.rss.xsl
+++ b/events/events.rss.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <!-- XSL stylesheet for generating RSS feeds. We use RSS 0.91 for now -->
 
diff --git a/events/events.xsl b/events/events.xsl
index 4b2e41b751..75b58ba3b6 100644
--- a/events/events.xsl
+++ b/events/events.xsl
@@ -1,36 +1,27 @@
 <?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">
-
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
-  
-  <!-- 
-      For documentation on tagging (e.g. fetching news and events), take a
-      look at the documentation under
-        /tools/xsltsl/tagging-documentation.txt
-  -->
 
   <!-- In /html/body node, append dynamic content -->
   <xsl:template match="/buildinfo/document/body/include-events">
       <!-- First, include what's in the source file -->
       <xsl:apply-templates />
-      
+
       <!-- Current events -->
       <xsl:call-template name="fetch-events">
           <xsl:with-param name="wanted-time" select="'present'" />
           <xsl:with-param name="header" select="'current'" />
           <xsl:with-param name="display-tags" select="'yes'" />
       </xsl:call-template>
-      
+
       <!-- Future events -->
       <xsl:call-template name="fetch-events">
           <xsl:with-param name="wanted-time" select="'future'" />
           <xsl:with-param name="header" select="'future'" />
           <xsl:with-param name="display-tags" select="'yes'" />
       </xsl:call-template>
-      
+
       <!-- Past events -->
       <xsl:call-template name="fetch-events">
           <xsl:with-param name="wanted-time" select="'past'" />
diff --git a/fi/fi.xsl b/fi/fi.xsl
index 0dc0cdfa92..ba54458d63 100644
--- a/fi/fi.xsl
+++ b/fi/fi.xsl
@@ -1,23 +1,11 @@
 <?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">
-  
-  <xsl:import href="../build/xslt/people.xsl" />
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
+  <xsl:import href="../build/xslt/people.xsl" />
 
-  <!-- To localise this page to a new country, copy this file and change the following:
-  
-    # <xsl:variable name="country-code">de</xsl:variable> -> change xx to your country code
-    
-    For more information, take a look at the documentation at
-        http://fsfe.org/contribute/web/tagging.html
-    
-  -->
-  
   <xsl:variable name="country-code">fi</xsl:variable>
-  
+
   <!--display labels-->
 
   <!--translated word "news"-->
@@ -54,14 +42,14 @@
       <xsl:with-param name="id" select="'team'" />
     </xsl:call-template>
   </xsl:template>
-  
+
   <!--define contact information-->
-  
+
   <xsl:template match="contact-details">
     <xsl:for-each select="/buildinfo/document/set/contact">
 
     <xsl:if test="@id = 'FI'">
-  
+
   <!-- Email -->
     <xsl:if test="email != ''">
       <xsl:element name="p">
@@ -76,12 +64,12 @@
         </xsl:element>
       </xsl:element>
     </xsl:if>
-  
+
   <!-- Address -->
     <xsl:if test="address != ''">
      <xsl:apply-templates select="address"/>
     </xsl:if>
-  
+
   <!-- Phone -->
     <xsl:if test="phone != ''">
       <xsl:element name="p">
@@ -102,28 +90,28 @@
     </xsl:if>
     </xsl:for-each>
   </xsl:template>
-  
+
   <!--define dynamic list of country news items-->
     <xsl:template match="country-news">
         <xsl:call-template name="fetch-news">
             <xsl:with-param name="nb-items" select="3" />
         </xsl:call-template>
     </xsl:template>
-    
+
     <!--define dynamic list of country event items-->
     <xsl:template match="country-events">
         <!-- Current events -->
         <xsl:call-template name="fetch-events">
             <xsl:with-param name="wanted-time" select="'present'" />
         </xsl:call-template>
-        
+
         <!-- Future events -->
         <xsl:call-template name="fetch-events">
             <xsl:with-param name="wanted-time" select="'future'" />
             <xsl:with-param name="nb-items" select="3" />
         </xsl:call-template>
     </xsl:template>
-    
+
     <!--define dynamic list of country team members-->
     <xsl:template match="country-team-list">
         <xsl:call-template name="country-people-list">
diff --git a/fr/fr.xsl b/fr/fr.xsl
index ad7334f56b..f9871641a8 100644
--- a/fr/fr.xsl
+++ b/fr/fr.xsl
@@ -1,23 +1,11 @@
 <?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">
-  
-  <xsl:import href="../build/xslt/people.xsl" />
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
+  <xsl:import href="../build/xslt/people.xsl" />
 
-  <!-- To localise this page to a new country, copy this file and change the following:
-  
-    # <xsl:variable name="country-code">de</xsl:variable> -> change xx to your country code
-    
-    For more information, take a look at the documentation at
-        http://fsfe.org/contribute/web/tagging.html
-    
-  -->
-  
   <xsl:variable name="country-code">fr</xsl:variable>
-  
+
   <!--display labels-->
 
   <!--translated word "news"-->
@@ -54,14 +42,14 @@
       <xsl:with-param name="id" select="'team'" />
     </xsl:call-template>
   </xsl:template>
-  
+
   <!--define contact information-->
-  
+
   <xsl:template match="contact-details">
     <xsl:for-each select="/buildinfo/document/set/contact">
 
     <xsl:if test="@id = 'FR'">
-  
+
   <!-- Email -->
     <xsl:if test="email != ''">
       <xsl:element name="p">
@@ -76,12 +64,12 @@
         </xsl:element>
       </xsl:element>
     </xsl:if>
-  
+
   <!-- Address -->
     <xsl:if test="address != ''">
      <xsl:apply-templates select="address"/>
     </xsl:if>
-  
+
   <!-- Phone -->
     <xsl:if test="phone != ''">
       <xsl:element name="p">
@@ -102,28 +90,28 @@
     </xsl:if>
     </xsl:for-each>
   </xsl:template>
-  
+
   <!--define dynamic list of country news items-->
     <xsl:template match="country-news">
         <xsl:call-template name="fetch-news">
             <xsl:with-param name="nb-items" select="3" />
         </xsl:call-template>
     </xsl:template>
-    
+
     <!--define dynamic list of country event items-->
     <xsl:template match="country-events">
         <!-- Current events -->
         <xsl:call-template name="fetch-events">
             <xsl:with-param name="wanted-time" select="'present'" />
         </xsl:call-template>
-        
+
         <!-- Future events -->
         <xsl:call-template name="fetch-events">
             <xsl:with-param name="wanted-time" select="'future'" />
             <xsl:with-param name="nb-items" select="2" />
         </xsl:call-template>
     </xsl:template>
-    
+
     <!--define dynamic list of country team members-->
     <xsl:template match="country-team-list">
         <xsl:call-template name="country-people-list">
diff --git a/fsfe.xsl b/fsfe.xsl
index 0312d8b5e4..9931fd2d94 100644
--- a/fsfe.xsl
+++ b/fsfe.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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"
diff --git a/it/it.xsl b/it/it.xsl
index 010de7b47f..063435c705 100644
--- a/it/it.xsl
+++ b/it/it.xsl
@@ -1,23 +1,11 @@
 <?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">
-  
-  <xsl:import href="../build/xslt/people.xsl" />
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
+  <xsl:import href="../build/xslt/people.xsl" />
 
-  <!-- To localise this page to a new country, copy this file and change the following:
-  
-    # <xsl:variable name="country-code">xx</xsl:variable> -> change xx to your country code
-    
-    For more information, take a look at the documentation under
-        /tools/xsltsl/tagging-documentation.txt
-    
-  -->
-  
   <xsl:variable name="country-code">it</xsl:variable>
-  
+
   <!--display labels-->
 
   <!--translated word "news"-->
@@ -54,14 +42,14 @@
       <xsl:with-param name="id" select="'team'" />
     </xsl:call-template>
   </xsl:template>
-  
+
   <!--define contact information-->
-  
+
   <xsl:template match="contact-details">
     <xsl:for-each select="/buildinfo/document/set/contact">
 
     <xsl:if test="@id = 'IT'">
-  
+
   <!-- Email -->
     <xsl:if test="email != ''">
       <xsl:element name="p">
@@ -76,12 +64,12 @@
         </xsl:element>
       </xsl:element>
     </xsl:if>
-  
+
   <!-- Address -->
     <xsl:if test="address != ''">
      <xsl:apply-templates select="address"/>
     </xsl:if>
-  
+
   <!-- Phone -->
     <xsl:if test="phone != ''">
       <xsl:element name="p">
@@ -102,28 +90,28 @@
     </xsl:if>
     </xsl:for-each>
   </xsl:template>
-  
+
   <!--define dynamic list of country news items-->
     <xsl:template match="country-news">
         <xsl:call-template name="fetch-news">
             <xsl:with-param name="nb-items" select="3" />
         </xsl:call-template>
     </xsl:template>
-    
+
     <!--define dynamic list of country event items-->
     <xsl:template match="country-events">
         <!-- Current events -->
         <xsl:call-template name="fetch-events">
             <xsl:with-param name="wanted-time" select="'present'" />
         </xsl:call-template>
-        
+
         <!-- Future events -->
         <xsl:call-template name="fetch-events">
             <xsl:with-param name="wanted-time" select="'future'" />
             <xsl:with-param name="nb-items" select="3" />
         </xsl:call-template>
     </xsl:template>
-    
+
     <!--define dynamic list of country team members-->
     <xsl:template match="country-team-list">
         <xsl:call-template name="country-people-list">
diff --git a/news/legal-news.xsl b/news/legal-news.xsl
index f2a4d076d6..10161a8ff8 100644
--- a/news/legal-news.xsl
+++ b/news/legal-news.xsl
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  
   <xsl:import href="../fsfe.xsl" />
-  
+
   <xsl:template match="legal-news">
     <xsl:call-template name="fetch-news"/>
   </xsl:template>
-  
+
 </xsl:stylesheet>
diff --git a/news/news.rss.xsl b/news/news.rss.xsl
index 4d993614e9..a118cb5246 100644
--- a/news/news.rss.xsl
+++ b/news/news.rss.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <!-- XSL stylesheet for generation RSS feeds.  It's currently using RSS 2.0. -->
 
@@ -73,11 +73,11 @@
   <!-- ============ -->
   <!-- Main routine -->
   <!-- ============ -->
-  
+
   <xsl:template match="/buildinfo">
     <xsl:apply-templates select="document" />
   </xsl:template>
-  
+
   <xsl:template match="/buildinfo/document">
     <!-- Language -->
     <xsl:variable name="lang">
@@ -103,13 +103,13 @@
           <height>31</height>
           <link>http://fsfe.org/news/</link>
         </image>
-        
+
         <xsl:element name="atom:link">
           <xsl:attribute name="href">http://fsfe.org/news/news.<xsl:value-of select="$lang"/>.rss</xsl:attribute>
           <xsl:attribute name="rel">self</xsl:attribute>
           <xsl:attribute name="type">application/rss+xml</xsl:attribute>
         </xsl:element>
-        
+
         <!-- News items -->
         <xsl:for-each select="/buildinfo/document/set/news[
             translate(@date, '-', '') &lt;= translate(/buildinfo/@date, '-', '')
@@ -117,15 +117,15 @@
           <xsl:sort select="@date" order="descending"/>
           <xsl:if test="position() &lt; 11">
             <xsl:element name="item">
-              
+
               <!-- guid -->
               <xsl:element name="guid">
                 <xsl:attribute name="isPermaLink">false</xsl:attribute>
                 <xsl:value-of select="@filename"/>
               </xsl:element>
-              
-              
-              
+
+
+
               <!-- Title -->
               <xsl:element name="title">
                 <xsl:value-of select="title"/>
@@ -136,7 +136,7 @@
                 <xsl:copy-of select="normalize-space(body)"/>
                 <xsl:text>Support FSFE: https://my.fsfe.org/support</xsl:text>
               </xsl:element>
-              
+
               <!-- News body -->
               <xsl:element name="content:encoded">
                 <xsl:text disable-output-escaping="yes">&lt;![CDATA[</xsl:text>
@@ -148,17 +148,17 @@
                     <xsl:copy-of select="normalize-space(body)"/>
                   </xsl:otherwise>
                 </xsl:choose>
-                
+
                 <xsl:element name="p">
                   <xsl:element name="a">
                     <xsl:attribute name="href">https://my.fsfe.org/support</xsl:attribute>
                     <xsl:text>Support FSFE</xsl:text>
                   </xsl:element>
                 </xsl:element>
-                
+
                 <xsl:text disable-output-escaping="yes">]]&gt;</xsl:text>
               </xsl:element>
-              
+
               <!-- Link -->
               <xsl:if test="link != ''">
                 <xsl:variable name="link">
@@ -192,11 +192,11 @@
       </channel>
     </rss>
   </xsl:template>
-  
+
   <!-- take care that links within <content:encoded> are not relative -->
   <xsl:template match="a">
     <xsl:element name="a">
-      
+
       <xsl:attribute name="href">
         <xsl:choose>
           <xsl:when test="substring(@href,1,1) = '/'">
@@ -208,19 +208,19 @@
           </xsl:otherwise>
         </xsl:choose>
       </xsl:attribute>
-      
+
       <xsl:value-of select="." />
-      
+
     </xsl:element>
   </xsl:template>
-  
+
   <!-- remove newsteaser from <p> -->
   <xsl:template match="p">
     <xsl:copy>
       <xsl:apply-templates select="node()" />
     </xsl:copy>
   </xsl:template>
-  
+
   <!-- as well as images -->
   <xsl:template match="img">
     <xsl:element name="img">
@@ -237,8 +237,8 @@
       </xsl:attribute>
     </xsl:element>
   </xsl:template>
-  
+
   <!-- Do not copy <body-complete> to output at all -->
   <xsl:template match="body-complete"/>
-  
+
 </xsl:stylesheet>
diff --git a/news/newsletter.xsl b/news/newsletter.xsl
index c4b09a3a9b..2eb391fad7 100644
--- a/news/newsletter.xsl
+++ b/news/newsletter.xsl
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  
   <xsl:import href="../fsfe.xsl" />
   <xsl:import href="../build/xslt/static-elements.xsl" />
 
@@ -22,17 +21,17 @@
       </p>
     </xsl:for-each>
   </xsl:template>
-  
+
   <!--translated sentence "receive-newsletter"-->
   <xsl:template match="receive-newsletter">
     <xsl:call-template name="gettext">
       <xsl:with-param name="id" select="'receive-newsletter'" />
     </xsl:call-template>
   </xsl:template>
-  
+
   <xsl:template match="subscribe-nl">
     <xsl:call-template name="subscribe-nl" />
   </xsl:template>
-  
+
 </xsl:stylesheet>
 
diff --git a/news/podcast-opus.rss.xsl b/news/podcast-opus.rss.xsl
index a0a7dd37df..e08660c0a3 100644
--- a/news/podcast-opus.rss.xsl
+++ b/news/podcast-opus.rss.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
   <xsl:import href="podcast.rss.xsl" />
+
   <xsl:output method="xml" encoding="utf-8" indent="yes" />
 
   <xsl:template match="/">
diff --git a/news/podcast.rss.xsl b/news/podcast.rss.xsl
index f79c71e692..e21d5dbf2b 100644
--- a/news/podcast.rss.xsl
+++ b/news/podcast.rss.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <!-- XSL stylesheet for generating podcast RSS feeds -->
 
diff --git a/news/podcast/default.xsl b/news/podcast/default.xsl
index 9b2ebfafa1..c2d08d6e99 100644
--- a/news/podcast/default.xsl
+++ b/news/podcast/default.xsl
@@ -1,10 +1,6 @@
 <?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">
- 
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../../fsfe.xsl" />
 
   <!-- Podcast audio player for both MP3 and OPUS -->
@@ -77,5 +73,5 @@
     </xsl:element>
 
   </xsl:template>
-  
-</xsl:stylesheet> 
+
+</xsl:stylesheet>
diff --git a/order/order.xsl b/order/order.xsl
index 7fe8790bf4..437a200b74 100644
--- a/order/order.xsl
+++ b/order/order.xsl
@@ -1,8 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../build/xslt/countries.xsl" />
   <xsl:import href="../fsfe.xsl" />
+  <xsl:import href="../build/xslt/countries.xsl" />
 
   <!-- Fill dynamic content -->
   <xsl:template match="dynamic-content">
diff --git a/order/size.xsl b/order/size.xsl
index 2d7666e1f9..04a2f82d09 100644
--- a/order/size.xsl
+++ b/order/size.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
diff --git a/pdfreaders/xslt/pdfreaders_body.xsl b/pdfreaders/xslt/pdfreaders_body.xsl
index f90eeaf6ed..ff35aa5712 100644
--- a/pdfreaders/xslt/pdfreaders_body.xsl
+++ b/pdfreaders/xslt/pdfreaders_body.xsl
@@ -80,21 +80,21 @@
         </xsl:element>
 
       </xsl:element>
- 
+
       <xsl:call-template name="notifications" />
 
       <xsl:element name="section"> <xsl:attribute name="id">main</xsl:attribute>
         <xsl:apply-templates select="body/node()" />
       </xsl:element>
- 
+
       <xsl:element name="footer">
         <xsl:attribute name="id">bottom</xsl:attribute>
- 
+
         <!-- xsl:call-template name="footer_sitenav" />
         <xsl:element name="hr" / -->
         <xsl:call-template name="footer_sourcelink" />
         <xsl:call-template name="footer_legal" />
- 
+
         <xsl:element name="section">
           <xsl:attribute name="id">sister-organisations</xsl:attribute>
           <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'fsfnetwork'" /></xsl:call-template>
diff --git a/pdfreaders/xslt/pdfreaders_head.xsl b/pdfreaders/xslt/pdfreaders_head.xsl
index f3565e71d6..2d193d44f9 100644
--- a/pdfreaders/xslt/pdfreaders_head.xsl
+++ b/pdfreaders/xslt/pdfreaders_head.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
diff --git a/pdfreaders/xslt/pdfreaders_list.xsl b/pdfreaders/xslt/pdfreaders_list.xsl
index 5061fa9182..3a32390d4c 100644
--- a/pdfreaders/xslt/pdfreaders_list.xsl
+++ b/pdfreaders/xslt/pdfreaders_list.xsl
@@ -6,23 +6,23 @@
     <xsl:element name="div"><xsl:attribute name="class">readerlist</xsl:attribute>
       <xsl:for-each select="/buildinfo/document/set/reader">
         <xsl:sort select="@priority" order="ascending" />
- 
+
         <xsl:element name="div">
           <xsl:attribute name="class">reader</xsl:attribute>
- 
+
           <xsl:element name="img">
             <xsl:attribute name="class">logo</xsl:attribute>
             <xsl:attribute name="src">logos/<xsl:value-of select="logo" /></xsl:attribute>
             <xsl:attribute name="alt"></xsl:attribute>
           </xsl:element>
- 
+
           <xsl:element name="h1">
             <xsl:element name="a"> <xsl:attribute name="class">info homepage</xsl:attribute>
               <xsl:attribute name="href"><xsl:value-of select="homepage" /></xsl:attribute>
               <xsl:value-of select="name" />
             </xsl:element>
           </xsl:element>
- 
+
           <xsl:element name="span"> <xsl:attribute name="class">label platform</xsl:attribute>
             <xsl:call-template name="fsfe-gettext">
               <xsl:with-param name="id" select="'pdfreaders-body-platforms'" />
@@ -34,11 +34,11 @@
               <xsl:value-of select="name" />
             </xsl:element>
           </xsl:for-each>
- 
+
           <xsl:element name="p"> <xsl:attribute name="class">description</xsl:attribute>
             <xsl:apply-templates select="description/node()" />
           </xsl:element>
- 
+
         </xsl:element>
       </xsl:for-each>
     </xsl:element>
diff --git a/press/press.xsl b/press/press.xsl
index 9388eb8c98..a6eaa21c84 100644
--- a/press/press.xsl
+++ b/press/press.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
diff --git a/tags/default.xsl b/tags/default.xsl
index 6e2747ee71..80f2500e69 100644
--- a/tags/default.xsl
+++ b/tags/default.xsl
@@ -1,9 +1,6 @@
 <?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">
-  
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
 
   <!--display dynamic list of news items-->
@@ -26,7 +23,7 @@
       </xsl:for-each>
     </xsl:element>
   </xsl:template>
-  
+
   <!--display dynamic list of event items-->
   <xsl:template name="tagged-events" match="tagged-events">
     <xsl:element name="ul">
diff --git a/tools/tagtool/tagsToCSV.xsl b/tools/tagtool/tagsToCSV.xsl
index 5757354020..00a9ac274e 100644
--- a/tools/tagtool/tagsToCSV.xsl
+++ b/tools/tagtool/tagsToCSV.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- create a csv file from the aggregated tags files in tags/
-	  
+	
 Usage to find duplicate tags:
 xsltproc tagsToCSV.xsl tags/.tags.en.xml |sort
 /-->
diff --git a/tools/wikicalendars.xsl b/tools/wikicalendars.xsl
index deaf0c0fa6..9874f70c6f 100644
--- a/tools/wikicalendars.xsl
+++ b/tools/wikicalendars.xsl
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
 <!-- Strings for upper/lower case translation (plain latin will suffice here) -->
diff --git a/tools/xsltsl/date-time.xsl b/tools/xsltsl/date-time.xsl
index 14bea491b3..6f720bbfbc 100644
--- a/tools/xsltsl/date-time.xsl
+++ b/tools/xsltsl/date-time.xsl
@@ -691,7 +691,7 @@
 
     <xsl:choose>
       <xsl:when test="$month = 2">
-        <xsl:choose> 
+        <xsl:choose>
           <xsl:when test="($year mod 4) = 0 and (($year mod 400) = 0
                           or ($year mod 100) != 0)">29</xsl:when>
           <xsl:otherwise>28</xsl:otherwise>
@@ -818,7 +818,7 @@
 
   <xsl:template name="dt:get-month-name">
     <xsl:param name="month"/>
-    
+
     <xsl:choose>
       <xsl:when test="$month = 1">January</xsl:when>
       <xsl:when test="$month = 2">February</xsl:when>
@@ -1087,7 +1087,7 @@
       </xsl:when>
       <xsl:when test='starts-with($monToUpper,"APR")'>
 	<xsl:value-of select='4'/>
-      </xsl:when>      
+      </xsl:when>
       <xsl:when test='starts-with($monToUpper,"MAY")'>
 	<xsl:value-of select='5'/>
       </xsl:when>
diff --git a/tools/xsltsl/string.xsl b/tools/xsltsl/string.xsl
index dd8b8712a9..05a52daec8 100644
--- a/tools/xsltsl/string.xsl
+++ b/tools/xsltsl/string.xsl
@@ -271,7 +271,7 @@
         <xsl:with-param name="text">
           <xsl:value-of select="substring($string-with-only-spaces, string-length($firstword) + 2)"/>
         </xsl:with-param>
-        <xsl:with-param name="all" select="true()"/>            
+        <xsl:with-param name="all" select="true()"/>
       </xsl:call-template>
     </xsl:param>
     <xsl:value-of select="translate($before-space-removal,' ','')"/>
@@ -568,7 +568,7 @@
       <xsl:otherwise>
         <xsl:value-of select="$text"/>
       </xsl:otherwise>
-    </xsl:choose>            
+    </xsl:choose>
   </xsl:template>
 
   <doc:template name="str:count-substring" xmlns="">
@@ -753,7 +753,7 @@
           <xsl:with-param name="position" select="$position - 1"/>
           <xsl:with-param name="chars" select="$chars"/>
         </xsl:call-template>
-        
+
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
@@ -800,7 +800,7 @@
 
     <xsl:value-of select="concat($firstpart, $chars, $secondpart)"/>
   </xsl:template>
- 
+
 
   <doc:template name="str:backward" xmlns="">
     <refpurpose>String reversal</refpurpose>
diff --git a/uk/uk.xsl b/uk/uk.xsl
index 287e301a10..ad5a4bdba5 100644
--- a/uk/uk.xsl
+++ b/uk/uk.xsl
@@ -1,23 +1,11 @@
 <?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">
-  
-  <xsl:import href="../build/xslt/people.xsl" />
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../fsfe.xsl" />
+  <xsl:import href="../build/xslt/people.xsl" />
 
-  <!-- To localise this page to a new country, copy this file and change the following:
-  
-    # <xsl:variable name="country-code">de</xsl:variable> -> change xx to your country code
-    
-    For more information, take a look at the documentation at
-        http://fsfe.org/contribute/web/tagging.html
-    
-  -->
-  
   <xsl:variable name="country-code">gb</xsl:variable>
-  
+
   <!--display labels-->
 
   <!--translated word "news"-->
@@ -54,14 +42,14 @@
       <xsl:with-param name="id" select="'team'" />
     </xsl:call-template>
   </xsl:template>
-  
+
   <!--define contact information-->
-  
+
   <xsl:template match="contact-details">
     <xsl:for-each select="/buildinfo/document/set/contact">
 
     <xsl:if test="@id = 'GB'">
-  
+
   <!-- Email -->
     <xsl:if test="email != ''">
       <xsl:element name="p">
@@ -75,12 +63,12 @@
         </xsl:element>
       </xsl:element>
     </xsl:if>
-  
+
   <!-- Address -->
     <xsl:if test="address != ''">
      <xsl:apply-templates select="address"/>
     </xsl:if>
-  
+
   <!-- Phone -->
     <xsl:if test="phone != ''">
       <xsl:element name="p">
@@ -101,28 +89,28 @@
     </xsl:if>
     </xsl:for-each>
   </xsl:template>
-  
+
   <!--define dynamic list of country news items-->
     <xsl:template match="country-news">
         <xsl:call-template name="fetch-news">
             <xsl:with-param name="nb-items" select="3" />
         </xsl:call-template>
     </xsl:template>
-    
+
     <!--define dynamic list of country event items-->
     <xsl:template match="country-events">
         <!-- Current events -->
         <xsl:call-template name="fetch-events">
             <xsl:with-param name="wanted-time" select="'present'" />
         </xsl:call-template>
-        
+
         <!-- Future events -->
         <xsl:call-template name="fetch-events">
             <xsl:with-param name="wanted-time" select="'future'" />
             <xsl:with-param name="nb-items" select="3" />
         </xsl:call-template>
     </xsl:template>
-    
+
     <!--define dynamic list of country team members-->
     <xsl:template match="country-team-list">
         <xsl:call-template name="country-people-list">