diff --git a/about/members.hr.xhtml b/about/members.hr.xhtml
index 7348a656e3..4eb7774639 100644
--- a/about/members.hr.xhtml
+++ b/about/members.hr.xhtml
@@ -50,7 +50,7 @@
     </p>
   </body>
 
-  <timestamp>$Date: 2005/10/10 13:24:38 $ $Author: reinhard $</timestamp>
+  <timestamp>$Date$ $Author$</timestamp>
 </html>
 <!--
 Local Variables: ***
diff --git a/about/roy/roy-avatar.jpg.old b/about/roy/roy-avatar.jpg.old
new file mode 100644
index 0000000000..cf0b3169f1
Binary files /dev/null and b/about/roy/roy-avatar.jpg.old differ
diff --git a/at/at.de.xhtml b/at/at.de.xhtml
index 17066c58ff..7918a9c7bf 100644
--- a/at/at.de.xhtml
+++ b/at/at.de.xhtml
@@ -125,7 +125,7 @@
     
   </body>
 
-  <timestamp>$Date: $ $Author: $</timestamp>
+  <timestamp>$Date$ $Author$</timestamp>
 </html>
 <!--
 Local Variables: ***
diff --git a/at/at.en.xhtml b/at/at.en.xhtml
index 18e7dcdb5c..a8150a1179 100644
--- a/at/at.en.xhtml
+++ b/at/at.en.xhtml
@@ -125,7 +125,7 @@
     
   </body>
 
-  <timestamp>$Date: $ $Author: $</timestamp>
+  <timestamp>$Date$ $Author$</timestamp>
 </html>
 <!--
 Local Variables: ***
diff --git a/campaigns/android/android.en.xhtml b/campaigns/android/android.en.xhtml
index 0d8c7f9dee..83cfdd31cc 100644
--- a/campaigns/android/android.en.xhtml
+++ b/campaigns/android/android.en.xhtml
@@ -4,10 +4,6 @@
   <head>
     <title>Free Your Android! - FSFE</title>
     <link type="text/css" href="/campaigns/android/android.css" rel="stylesheet" media="screen and (min-device-width:1280px) and (min-width:1200px)" />
-    <meta name="cc-license" content="Portions of this page are 
-		modifications based on work created and shared by Google and 
-		used according to terms described in the Creative Commons 3.0 
-		Attribution License. Android is a trademark of Google Inc." />
   </head>
   <body>
     
@@ -162,6 +158,13 @@
 
   </body>
   <timestamp>$Date$ $Author$</timestamp>
+  <legal>
+    <license>http://creativecommons.org/licenses/by/3.0/</license>
+    <notice>Portions of this page are 
+		modifications based on work created and shared by Google and 
+		used according to terms described in the Creative Commons 3.0 
+		Attribution License. Android is a trademark of Google Inc.</notice>
+  </legal>
 </html>
 <!--
 Local Variables: ***
diff --git a/contribute/advocacy/advocacy.de.xhtml b/contribute/advocacy/advocacy.de.xhtml
index 48fd2574ba..515ae8b563 100644
--- a/contribute/advocacy/advocacy.de.xhtml
+++ b/contribute/advocacy/advocacy.de.xhtml
@@ -191,7 +191,7 @@
     
     <h3 id="created-with-fs">"Created with Free Software"</h3>
     
-    <a href="/contribute/advocacy/advocacy.html">
+    <a href="/contribute/advocacy/cwfs.html">
       <img src="/contribute/advocacy/cwfs/cwfs-1.0.0-original-25-degree-180x121.png" />
       <span>Mehrere Farben</span>
     </a>
diff --git a/contribute/advocacy/advocacy.el.xhtml b/contribute/advocacy/advocacy.el.xhtml
index 1788c5de13..a0eaf19d9e 100644
--- a/contribute/advocacy/advocacy.el.xhtml
+++ b/contribute/advocacy/advocacy.el.xhtml
@@ -295,7 +295,7 @@ GNU/Linux, και προσφέρει χώρο για την λίστα με τα
     
     <h3 id="created-with-fs">"Created with Free Software"</h3>
     
-    <a href="/contribute/advocacy/advocacy.html">
+    <a href="/contribute/advocacy/cwfs.html">
       <img src="/contribute/advocacy/cwfs/cwfs-1.0.0-original-25-degree-180x121.png" />
       <span>See more colors</span>
     </a>
diff --git a/contribute/advocacy/advocacy.en.xhtml b/contribute/advocacy/advocacy.en.xhtml
index 49c44f36b6..890da04cee 100644
--- a/contribute/advocacy/advocacy.en.xhtml
+++ b/contribute/advocacy/advocacy.en.xhtml
@@ -237,7 +237,7 @@
     
     <h3 id="created-with-fs">"Created with Free Software"</h3>
     
-    <a href="/contribute/advocacy/advocacy.html">
+    <a href="/contribute/advocacy/cwfs.html">
       <img src="/contribute/advocacy/cwfs/cwfs-1.0.0-original-25-degree-180x121.png" />
       <span>See more colors</span>
     </a>
diff --git a/contribute/advocacy/advocacy.fr.xhtml b/contribute/advocacy/advocacy.fr.xhtml
index f9829fb3ec..cd91ed3774 100644
--- a/contribute/advocacy/advocacy.fr.xhtml
+++ b/contribute/advocacy/advocacy.fr.xhtml
@@ -235,7 +235,7 @@ Vous aussi, vous vous sentez concerné par le <a href="/about/basics/freesoftwar
     
     <h3 id="created-with-fs">"Created with Free Software"</h3>
     
-    <a href="/contribute/advocacy/advocacy.html">
+    <a href="/contribute/advocacy/cwfs.html">
       <img src="/contribute/advocacy/cwfs/cwfs-1.0.0-original-25-degree-180x121.png" />
       <span>Voir plus de couleurs</span>
     </a>
diff --git a/contribute/advocacy/advocacy.it.xhtml b/contribute/advocacy/advocacy.it.xhtml
index 5b7aff15b4..f4fb4c6f04 100644
--- a/contribute/advocacy/advocacy.it.xhtml
+++ b/contribute/advocacy/advocacy.it.xhtml
@@ -364,7 +364,7 @@ width="88" height="15" border="0"
     
     <h3 id="created-with-fs">"Created with Free Software"</h3>
     
-    <a href="/contribute/advocacy/advocacy.html">
+    <a href="/contribute/advocacy/cwfs.html">
       <img src="/contribute/advocacy/cwfs/cwfs-1.0.0-original-25-degree-180x121.png" />
       <span>See more colors</span>
     </a>
diff --git a/contribute/advocacy/advocacy.ru.xhtml b/contribute/advocacy/advocacy.ru.xhtml
index e92ae0b699..60f8010578 100644
--- a/contribute/advocacy/advocacy.ru.xhtml
+++ b/contribute/advocacy/advocacy.ru.xhtml
@@ -168,7 +168,7 @@
     
     <h3 id="created-with-fs">"Created with Free Software"</h3>
     
-    <a href="/contribute/advocacy/advocacy.html">
+    <a href="/contribute/advocacy/cwfs.html">
       <img src="/contribute/advocacy/cwfs/cwfs-1.0.0-original-25-degree-180x121.png" />
       <span>See more colors</span>
     </a>
diff --git a/contribute/advocacy/cwfs.en.xhtml b/contribute/advocacy/cwfs.en.xhtml
index 0d2f23c721..b51f0a6e3a 100644
--- a/contribute/advocacy/cwfs.en.xhtml
+++ b/contribute/advocacy/cwfs.en.xhtml
@@ -4,8 +4,8 @@
   <head>
     <title>Created with Free Software - FSFE</title>
     <style>
-      img.cwfs-button { border:2px inset #c0c0c0; padding:20px; background-color:#c0c0c0; }
-      img.cwfs-button:hover { background-color:#a0a0a0; }
+      /*img.cwfs-button { border:2px inset #c0c0c0; padding:20px; background-color:#c0c0c0; }
+      img.cwfs-button:hover { background-color:#a0a0a0; }*/
     </style>
   </head>
 
@@ -42,12 +42,12 @@
     href="http://creativecommons.org/publicdomain/zero/1.0/">Creative Commons
     Zero 1.0 Universal license</a>. </p>
 
-    <table class="noborders">
+    <table class="noborders cwfs">
       <tr>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-original-25-degree-88x59.png" width="88" height="59" border="0" alt="Created with free software" class="cwfs-button" /></td>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-original-25-degree-120x81.png" width="120" height="81" border="0" alt="Created with free software" class="cwfs-button" /></td>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-original-25-degree-180x121.png" width="180" height="121" border="0" alt="Created with free software" class="cwfs-button" /></td>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-original-25-degree-300x201.png" width="300" height="201" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-original-25-degree-88x59.png" width="88" height="59" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-original-25-degree-120x81.png" width="120" height="81" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-original-25-degree-180x121.png" width="180" height="121" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-original-25-degree-300x201.png" width="300" height="201" border="0" alt="Created with free software" class="cwfs-button" /></td>
       </tr>
       <tr>
         <td><form><textarea rows="3" cols="28">&lt;a href="http://www.fsfe.org/freesoftware/freesoftware.html"&gt;&lt;img src="http://www.fsfe.org/contribute/advocacy/cwfs/cwfs-1.0.0-original-25-degree-88x59.png" width="88" height="59" border="0" alt="Created with free software"&gt;&lt;/a&gt;</textarea></form></td>
@@ -57,12 +57,12 @@
       </tr>
     </table>
 
-    <table class="noborders">
+    <table class="noborders cwfs">
       <tr>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-gray-75-percent-25-degree-88x59.png" width="88" height="59" border="0" alt="Created with free software" class="cwfs-button" /></td>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-gray-75-percent-25-degree-120x81.png" width="120" height="81" border="0" alt="Created with free software" class="cwfs-button" /></td>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-gray-75-percent-25-degree-180x121.png" width="180" height="121" border="0" alt="Created with free software" class="cwfs-button" /></td>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-gray-75-percent-25-degree-300x201.png" width="300" height="201" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-gray-75-percent-25-degree-88x59.png" width="88" height="59" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-gray-75-percent-25-degree-120x81.png" width="120" height="81" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-gray-75-percent-25-degree-180x121.png" width="180" height="121" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-gray-75-percent-25-degree-300x201.png" width="300" height="201" border="0" alt="Created with free software" class="cwfs-button" /></td>
       </tr>
       <tr>
         <td><form><textarea rows="3" cols="28">&lt;a href="http://www.fsfe.org/freesoftware/freesoftware.html"&gt;&lt;img src="http://www.fsfe.org/contribute/advocacy/cwfs/cwfs-1.0.0-gray-75-percent-25-degree-88x59.png" width="88" height="59" border="0" alt="Created with free software"&gt;&lt;/a&gt;</textarea></form></td>
@@ -72,12 +72,12 @@
       </tr>
     </table>
 
-    <table class="noborders">
+    <table class="noborders cwfs">
       <tr>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-white-25-degree-88x59.png" width="88" height="59" border="0" alt="Created with free software" class="cwfs-button" /></td>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-white-25-degree-120x81.png" width="120" height="81" border="0" alt="Created with free software" class="cwfs-button" /></td>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-white-25-degree-180x121.png" width="180" height="121" border="0" alt="Created with free software" class="cwfs-button" /></td>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-white-25-degree-300x201.png" width="300" height="201" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-white-25-degree-88x59.png" width="88" height="59" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-white-25-degree-120x81.png" width="120" height="81" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-white-25-degree-180x121.png" width="180" height="121" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-white-25-degree-300x201.png" width="300" height="201" border="0" alt="Created with free software" class="cwfs-button" /></td>
       </tr>
       <tr>
         <td><form><textarea rows="3" cols="28">&lt;a href="http://www.fsfe.org/freesoftware/freesoftware.html"&gt;&lt;img src="http://www.fsfe.org/contribute/advocacy/cwfs/cwfs-1.0.0-white-25-degree-88x59.png" width="88" height="59" border="0" alt="Created with free software"&gt;&lt;/a&gt;</textarea></form></td>
@@ -87,12 +87,12 @@
       </tr>
     </table>
 
-    <table class="noborders">
+    <table class="noborders cwfs">
       <tr>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-black-25-degree-88x59.png" width="88" height="59" border="0" alt="Created with free software" class="cwfs-button" /></td>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-black-25-degree-120x81.png" width="120" height="81" border="0" alt="Created with free software" class="cwfs-button" /></td>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-black-25-degree-180x121.png" width="180" height="121" border="0" alt="Created with free software" class="cwfs-button" /></td>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-black-25-degree-300x201.png" width="300" height="201" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-black-25-degree-88x59.png" width="88" height="59" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-black-25-degree-120x81.png" width="120" height="81" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-black-25-degree-180x121.png" width="180" height="121" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-black-25-degree-300x201.png" width="300" height="201" border="0" alt="Created with free software" class="cwfs-button" /></td>
       </tr>
       <tr>
         <td><form><textarea rows="3" cols="28">&lt;a href="http://www.fsfe.org/freesoftware/freesoftware.html"&gt;&lt;img src="http://www.fsfe.org/contribute/advocacy/cwfs/cwfs-1.0.0-black-25-degree-88x59.png" width="88" height="59" border="0" alt="Created with free software"&gt;&lt;/a&gt;</textarea></form></td>
@@ -102,12 +102,12 @@
       </tr>
     </table>
 
-    <table class="noborders">
+    <table class="noborders cwfs">
       <tr>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-original-0-degree-88x28.png" width="88" height="28" border="0" alt="Created with free software" class="cwfs-button" /></td>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-original-0-degree-120x38.png" width="120" height="38" border="0" alt="Created with free software" class="cwfs-button" /></td>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-original-0-degree-180x57.png" width="180" height="57" border="0" alt="Created with free software" class="cwfs-button" /></td>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-original-0-degree-300x95.png" width="300" height="95" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-original-0-degree-88x28.png" width="88" height="28" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-original-0-degree-120x38.png" width="120" height="38" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-original-0-degree-180x57.png" width="180" height="57" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-original-0-degree-300x95.png" width="300" height="95" border="0" alt="Created with free software" class="cwfs-button" /></td>
       </tr>
       <tr>
         <td><form><textarea rows="3" cols="28">&lt;a href="http://www.fsfe.org/freesoftware/freesoftware.html"&gt;&lt;img src="http://www.fsfe.org/contribute/advocacy/cwfs/cwfs-1.0.0-original-0-degree-88x28.png" width="88" height="28" border="0" alt="Created with free software"&gt;&lt;/a&gt;</textarea></form></td>
@@ -117,12 +117,12 @@
       </tr>
     </table>
 
-    <table class="noborders">
+    <table class="noborders cwfs">
       <tr>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-gray-75-percent-0-degree-88x28.png" width="88" height="28" border="0" alt="Created with free software" class="cwfs-button" /></td>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-gray-75-percent-0-degree-120x38.png" width="120" height="38" border="0" alt="Created with free software" class="cwfs-button" /></td>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-gray-75-percent-0-degree-180x57.png" width="180" height="57" border="0" alt="Created with free software" class="cwfs-button" /></td>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-gray-75-percent-0-degree-300x95.png" width="300" height="95" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-gray-75-percent-0-degree-88x28.png" width="88" height="28" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-gray-75-percent-0-degree-120x38.png" width="120" height="38" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-gray-75-percent-0-degree-180x57.png" width="180" height="57" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-gray-75-percent-0-degree-300x95.png" width="300" height="95" border="0" alt="Created with free software" class="cwfs-button" /></td>
       </tr>
       <tr>
         <td><form><textarea rows="3" cols="28">&lt;a href="http://www.fsfe.org/freesoftware/freesoftware.html"&gt;&lt;img src="http://www.fsfe.org/contribute/advocacy/cwfs/cwfs-1.0.0-gray-75-percent-0-degree-88x28.png" width="88" height="28" border="0" alt="Created with free software"&gt;&lt;/a&gt;</textarea></form></td>
@@ -132,12 +132,12 @@
       </tr>
     </table>
 
-    <table class="noborders">
+    <table class="noborders cwfs">
       <tr>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-white-0-degree-88x28.png" width="88" height="28" border="0" alt="Created with free software" class="cwfs-button" /></td>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-white-0-degree-120x38.png" width="120" height="38" border="0" alt="Created with free software" class="cwfs-button" /></td>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-white-0-degree-180x57.png" width="180" height="57" border="0" alt="Created with free software" class="cwfs-button" /></td>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-white-0-degree-300x95.png" width="300" height="95" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-white-0-degree-88x28.png" width="88" height="28" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-white-0-degree-120x38.png" width="120" height="38" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-white-0-degree-180x57.png" width="180" height="57" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-white-0-degree-300x95.png" width="300" height="95" border="0" alt="Created with free software" class="cwfs-button" /></td>
       </tr>
       <tr>
         <td><form><textarea rows="3" cols="28">&lt;a href="http://www.fsfe.org/freesoftware/freesoftware.html"&gt;&lt;img src="http://www.fsfe.org/contribute/advocacy/cwfs/cwfs-1.0.0-white-0-degree-88x28.png" width="88" height="28" border="0" alt="Created with free software"&gt;&lt;/a&gt;</textarea></form></td>
@@ -147,12 +147,12 @@
       </tr>
     </table>
 
-    <table class="noborders">
+    <table class="noborders cwfs">
       <tr>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-black-0-degree-88x28.png" width="88" height="28" border="0" alt="Created with free software" class="cwfs-button" /></td>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-black-0-degree-120x38.png" width="120" height="38" border="0" alt="Created with free software" class="cwfs-button" /></td>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-black-0-degree-180x57.png" width="180" height="57" border="0" alt="Created with free software" class="cwfs-button" /></td>
-        <td align="center"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-black-0-degree-300x95.png" width="300" height="95" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-black-0-degree-88x28.png" width="88" height="28" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-black-0-degree-120x38.png" width="120" height="38" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-black-0-degree-180x57.png" width="180" height="57" border="0" alt="Created with free software" class="cwfs-button" /></td>
+        <td align="center" valign="bottom"><img src="/contribute/advocacy/cwfs/cwfs-1.0.0-black-0-degree-300x95.png" width="300" height="95" border="0" alt="Created with free software" class="cwfs-button" /></td>
       </tr>
       <tr>
         <td><form><textarea rows="3" cols="28">&lt;a href="http://www.fsfe.org/freesoftware/freesoftware.html"&gt;&lt;img src="http://www.fsfe.org/contribute/advocacy/cwfs/cwfs-1.0.0-black-0-degree-88x28.png" width="88" height="28" border="0" alt="Created with free software"&gt;&lt;/a&gt;</textarea></form></td>
diff --git a/contribute/contribute.en.xhtml b/contribute/contribute.en.xhtml
index a1323887b7..a5b07618b4 100644
--- a/contribute/contribute.en.xhtml
+++ b/contribute/contribute.en.xhtml
@@ -3,6 +3,8 @@
 <html>
   <head>
     <title>Contribute - FSFE</title>
+<meta content="How to support FSFE - Join, Volunteer, become a designer, translator, editor, intern or web developer.    " name="description" />
+<meta content="contribute fellowship membership join webmaster donate local meeting promote free software open source software fsfe designer translator editor team campaigns intern internship mailing lists" name="keywords" />
   </head>
   <body>
     <h1>Contribute</h1>
diff --git a/contribute/web/web.en.xhtml b/contribute/web/web.en.xhtml
index aebc301370..26b7425c37 100644
--- a/contribute/web/web.en.xhtml
+++ b/contribute/web/web.en.xhtml
@@ -428,18 +428,33 @@ enable-auto-props = yes
     </p>
     
     
-    <h2 id="Creative">Use Creative Commons licensed media</h2>
+    <h2>Use custom licensed media</h2>
     
     <p>
       If you use images or other media which which has been licensed using a 
-      Creative Commons license, you can make sure that the proper licensing
-      information is displayed by adding meta tags to the head section of the
-      web page which look like this:
+      Creative Commons license or another license, you can make sure that the 
+      proper licensing information is displayed by adding these at the end of
+      the document before &#60;/html&#62;. Here are three examples:
     </p>
     
     <pre class="file">
-&lt;meta name="cc-license" content="Image depicting Stephen Fry, © 2009 Vivan Jayant, used under a Creative Commons Attribution 2.0 Generic license" /&gt;
-&lt;meta name="cc-license" content="Image depicting Peckham Library, © 2009 Ellen Forsyth, used under a Creative Commons Attribution-NonCommercial-ShareAlike 2.0 Generic license" /&gt;
+
+&#60;legal type="cc-license"&#62;
+  &#60;license&#62;https://creativecommons.org/licenses/by-sa/3.0/&#60;/license&#62;
+  &#60;notice&#62;This work is published under the Creative Commons BY-SA 3.0 Unported license by John Doe&#60;/notice&#62;
+&#60;/legal&#62;
+
+
+&#60;legal&#62;
+  &#60;license&#62;http://www.gnu.org/licenses/fdl-1.3.txt&#60;/license&#62;
+  &#60;notice&#62;This page is published under the GNU Free Documentation License 1.3 or later&#60;/notice&#62;
+&#60;/legal&#62;
+
+&#60;legal&#62;
+  &#60;notice&#62;This work is published undere the CC-BY-SA 3.0 Unported license or the &#60;a href="http://artlibre.org/"&#62;Licence Art Libre 1.3&#60;/a&#62; at your option, etc.&#60;/notice&#62;
+&#60;/legal&#62;
+
+
     </pre>
     
     <h2 id="Fetch">Fetch tagged news and events, implement a country page</h2>
diff --git a/fsfe.xsl b/fsfe.xsl
index 53dadda168..8b0f94e087 100644
--- a/fsfe.xsl
+++ b/fsfe.xsl
@@ -164,12 +164,8 @@
       </xsl:element>
     </xsl:if>
     
-    
-    <!-- copy original <h1> -->
-    <xsl:copy>
-      <xsl:apply-templates select="node()"/>
-    </xsl:copy>
-    
+    <!-- auto generate ID for headings if doesn't already exist -->
+    <xsl:call-template name="generate-id" />
     
     <!-- Apply news page rules -->
     <xsl:if test="string(/buildinfo/document/@newsdate) and
@@ -253,7 +249,43 @@
     <!-- End Apply article rules -->
          
   </xsl:template>
-  <!-- End modifications to H1 -->  
+  <!-- End modifications to H1 --> 
+  
+  <!-- Modify H2 -->
+  <xsl:template match="h2">
+    <!-- auto generate ID for headings if doesn't already exist -->
+    <xsl:call-template name="generate-id" />
+  </xsl:template>
+  
+  <!-- Modify H3 -->
+  <xsl:template match="h3">
+    <!-- auto generate ID for headings if doesn't already exist -->
+    <xsl:call-template name="generate-id" />
+  </xsl:template>
+  
+  <!-- Modify H4 -->
+  <xsl:template match="h4">
+    <!-- auto generate ID for headings if doesn't already exist -->
+    <xsl:call-template name="generate-id" />
+  </xsl:template>
+  
+  <!-- Modify H4 -->
+  <xsl:template match="h4">
+    <!-- auto generate ID for headings if doesn't already exist -->
+    <xsl:call-template name="generate-id" />
+  </xsl:template>
+  
+  <!-- Modify H5 -->
+  <xsl:template match="h5">
+    <!-- auto generate ID for headings if doesn't already exist -->
+    <xsl:call-template name="generate-id" />
+  </xsl:template>
+  
+  <!-- Modify H6 -->
+  <xsl:template match="h6">
+    <!-- auto generate ID for headings if doesn't already exist -->
+    <xsl:call-template name="generate-id" />
+  </xsl:template>
 
   <!-- HTML body -->
   <xsl:template match="body">
@@ -397,7 +429,7 @@
             <xsl:attribute name="class">planet</xsl:attribute>
             <xsl:element name="a">
               <xsl:attribute name="href">http://planet.fsfe.org/</xsl:attribute>
-              <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'planet/blogs'" /></xsl:call-template>
+              <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'planet/blogs'" /></xsl:call-template> 
             </xsl:element>
             <!-- causes validation errors, needs li to pass validator?
             <xsl:element name="ul">
diff --git a/look/generic.css b/look/generic.css
index 9086152bc4..78e9a2fa25 100644
--- a/look/generic.css
+++ b/look/generic.css
@@ -510,6 +510,7 @@ h3 {
   padding: 0.5em 0.5em 0 0.5em;
   margin: 0;
   border-top: 1px solid rgb(220,220,220);
+  color: #666;
 }
 
 .postit {  /* compatibility */
@@ -1458,7 +1459,9 @@ margin: 0 15px 0 0;
     padding: 0;
 }
 
-#legal a { color: #5D5D5D; }
+#legal a {
+    color: #5D5D5D;
+}
 
 /*for consistency, it looks like .people img */
 img.author-avatar {
@@ -1902,3 +1905,18 @@ div.map {
     color: red; 
 }
 
+/* ------------------------------------------------------------------------- */
+/* Created with Free Software buttons                                        */
+/* ------------------------------------------------------------------------- */
+
+img.cwfs-button { 
+  border:none; 
+  padding:2px; 
+  background-color:#c0c0c0; 
+}
+img.cwfs-button:hover { 
+  background-color:#a0a0a0; 
+}
+.cwfs textarea {
+  width: 94%;
+} 
diff --git a/look/input.css b/look/input.css
index b1f9f28943..aa68b5be1c 100644
--- a/look/input.css
+++ b/look/input.css
@@ -35,7 +35,8 @@ form.expanded input[type=email],
 form.expanded input[type=url],
 form.expanded input[type=submit],
 form.expanded textarea {
-  width: 100%;
+  /*width: 100%;*/
+  width: 94%;
 }
 
 input[type="image"] {
diff --git a/projects/fellowship/leaflet-fellowship-FSA.de.0.pdf b/projects/fellowship/leaflet-fellowship-FSA.de.0.pdf
index 1a67df504a..ceed23e79d 100644
Binary files a/projects/fellowship/leaflet-fellowship-FSA.de.0.pdf and b/projects/fellowship/leaflet-fellowship-FSA.de.0.pdf differ
diff --git a/projects/fellowship/leaflet-fellowship-FSA.de.G.pdf b/projects/fellowship/leaflet-fellowship-FSA.de.G.pdf
index f1fa88bf8b..af259ab341 100644
Binary files a/projects/fellowship/leaflet-fellowship-FSA.de.G.pdf and b/projects/fellowship/leaflet-fellowship-FSA.de.G.pdf differ
diff --git a/projects/ftf/network.en.xhtml b/projects/ftf/network.en.xhtml
index 0383f9caa7..7781d9e587 100644
--- a/projects/ftf/network.en.xhtml
+++ b/projects/ftf/network.en.xhtml
@@ -2,7 +2,10 @@
 
 <html>
   <head>
-    <title>European Legal Network - FSFE Legal</title>
+    	<title>European Legal Network - FSFE Legal</title>
+	<meta content="Information about the largest legal support structure for Free Software in the world." name="description" />
+	<meta content="FSFE free software open source ELN European Legal Network licensing GPL copyleft violation fiduciary lawyers law legal experts best practice information Free Software licensing." name="keywords" />
+
     <link rel="stylesheet" media="all" href="/style/grid.css" type="text/css" />
     <link rel="stylesheet" media="all" href="ftf.css" type="text/css" />
   </head>
diff --git a/projects/os/minimalisticstandards.de.xhtml b/projects/os/minimalisticstandards.de.xhtml
index 95aa88215b..30f35e634b 100644
--- a/projects/os/minimalisticstandards.de.xhtml
+++ b/projects/os/minimalisticstandards.de.xhtml
@@ -231,4 +231,8 @@
     <license>https://creativecommons.org/licenses/by-sa/3.0/</license>
     <notice>Neben der Standardlizenz der Webseite steht dieser Artikel unter der Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) </notice>
   </legal>
+<legal type="cc-license">
+ <license>https://creativecommons.org/licenses/by-sa/3.0/</license><notice>Neben der Standardlizenz der Webseite steht dieser Artikel unter der Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)</notice>
+</legal>
+
 </html>
diff --git a/projects/swpat/swpat.en.xhtml b/projects/swpat/swpat.en.xhtml
index 8e95434e0f..82c17b1869 100644
--- a/projects/swpat/swpat.en.xhtml
+++ b/projects/swpat/swpat.en.xhtml
@@ -3,6 +3,8 @@
 <html>
   <head>
     <title>FSFE - Software Patents in Europe</title>
+    <meta content="Information about software patents - a problem for companies, developers and users." name="description" />
+    <meta content="computer implemented inventions software patent law copyright ideas computer program compatibility and interoperability companies software developers users non-free Free Software legal uncertainty costs pay smartphones" />
   </head>
 
   <body>
diff --git a/tools/build.pl b/tools/build.pl
index 749e06db8c..c52124da2b 100755
--- a/tools/build.pl
+++ b/tools/build.pl
@@ -342,9 +342,9 @@ sub process {
       $srcfocus = "$1";
       $root->setAttribute("original", $countries{$1});
   }
-
+  
   $root->setAttribute("filename", "/$file");
-
+  
   #
   # Set the directory name attribute
   #
@@ -397,7 +397,7 @@ sub process {
     # And once for every language!
     #
     while (my ($lang, undef) = each %languages) {
-      $root->setAttribute("language", $lang);
+    	$root->setAttribute("language", $lang);
 
       #
       # This finds the source file to use. If we can't find a translation
@@ -430,283 +430,282 @@ sub process {
           }
     	  }
 
-      if ( (stat("$opts{o}/$dir/$file.$lang.html"))[9] >
+        if ( (stat("$opts{o}/$dir/$file.$lang.html"))[9] >
              (stat($source))[9] && $opts{u} && ! -f "$opts{i}/$file.xsl" ) {
-	next;
-      }
+           next;
+        }
 
-      #
-      # Here begins automated magic for those pages which we need to
-      # assemble other sets of informations for first (automatically
-      # updated pages).
-      #
-      if (-f "$opts{i}/$file.xsl") {
-	#
-	# Settle down please, children. First we remove all previous
-	# document leftovers.
-	#
-	foreach ($root->getElementsByTagName("document")) {
-	  $root->removeChild($_);
-	}
-	$root->appendChild($document);
+        #
+        # Here begins automated magic for those pages which we need to
+        # assemble other sets of informations for first (automatically
+        # updated pages).
+        #
+      	if (-f "$opts{i}/$file.xsl") {
+          #
+          # Settle down please, children. First we remove all previous
+          # document leftovers.
+          #
+          foreach ($root->getElementsByTagName("document")) {
+	          $root->removeChild($_);
+          }
+          $root->appendChild($document);
 
-	# Create the <timestamp> tag automatically for these documents
-	my $timestamp = $dom->createElement("timestamp");
-	$timestamp->appendText("\$"."Date: ".$current_time." \$ \$"."Author: automatic \$");
-	$document->appendChild($timestamp);
+          # Create the <timestamp> tag automatically for these documents
+          my $timestamp = $dom->createElement("timestamp");
+          $timestamp->appendText("\$"."Date: ".$current_time." \$ \$"."Author: automatic \$");
+          $document->appendChild($timestamp);
 
-	#
-	# Get the list of sources and create the files hash. The files
-	# hash contains the base name for each file we want to use, and
-	# then the language for it as a value. It prefers a file in the
-	# language we're building into, but will accept an English file as
-	# a substitute.
-	#
-	#     "Learn all that is learnable and return that information
-	#      to the Creator."
-	#
-	open(IN, '<', "$opts{i}/$file.sources");
-	my @auto_sources = <IN>;
-	close IN;
-	my %files;
-	foreach (@auto_sources) {
-	  if (/(.*):[a-z,]*global/ || /(.*):[a-z,]*$dir/) {
-	    foreach my $f (glob("$1*")) {
-	      if ($f =~ /(.*)\.([a-z][a-z])\.xml$/) {
-		if (!$files{$1}) {
-		  $files{$1} = $2;
-		} elsif ($2 eq $lang) {
-		  $files{$1} = $2;
-		} elsif (($2 eq "en") &&
-			   ($files{$1} ne $lang)) {
-		  $files{$1} = $2;
-		}
-	      }
-	    }
-	  }
-	}
+          #
+          # Get the list of sources and create the files hash. The files
+          # hash contains the base name for each file we want to use, and
+          # then the language for it as a value. It prefers a file in the
+          # language we're building into, but will accept an English file as
+          # a substitute.
+          #
+          #     "Learn all that is learnable and return that information
+          #      to the Creator."
+          #
+          open(IN, '<', "$opts{i}/$file.sources");
+          my @auto_sources = <IN>;
+          close IN;
+          my %files;
+          foreach (@auto_sources) {
+            if (/(.*):[a-z,]*global/ || /(.*):[a-z,]*$dir/) {
+              foreach my $f (glob("$1*")) {
+                 if ($f =~ /(.*)\.([a-z][a-z])\.xml$/) {
+                    if (!$files{$1}) {
+                      $files{$1} = $2;
+                    } elsif ($2 eq $lang) {
+                      $files{$1} = $2;
+                    } elsif (($2 eq "en") &&
+                             ($files{$1} ne $lang)) {
+                      $files{$1} = $2;
+                    }
+                 }
+              }
+            }
+          }
 
-	#
-	# With that information, we load the source document and create
-	# a new element in it, called <set>, which will hold the combined
-	# knowledge of all the sets in the source files.
-	#
-	my $sourcedoc = $parser->parse_file($source);
-	$sourcedoc->documentElement->setAttribute("date", $current_date);
-	$sourcedoc->documentElement->setAttribute("lang", $lang);
-	my $auto_data = $sourcedoc->createElement("set");
+          #
+          # With that information, we load the source document and create
+          # a new element in it, called <set>, which will hold the combined
+          # knowledge of all the sets in the source files.
+          #
+          my $sourcedoc = $parser->parse_file($source);
+          $sourcedoc->documentElement->setAttribute("date", $current_date);
+          $sourcedoc->documentElement->setAttribute("lang", $lang);
+          my $auto_data = $sourcedoc->createElement("set");
 
-	while (my ($base, $l) = each %files) {
-	  if (($dir eq "global") && ($l ne $lang)) {
-	    lock(*TRANSLATIONS);
-	    print TRANSLATIONS "$lang $base.$lang.xml $base.$l.xml\n";
-	    unlock(*TRANSLATIONS);
-	  }
-	  print STDERR "Loading $base.$l.xml\n" if $opts{d};
-	  my $source_data = $parser->parse_file("$base.$l.xml");
-	  foreach ($source_data->documentElement->childNodes) {
-	    my $c = $_->cloneNode(1);
-	    # add the filename to nodes (news, events, …) so that we can use it as an identifier (e.g. for RSS)
-	    if (ref($c) eq "XML::LibXML::Element") {
-	      $base =~ /.*[\/_]([^\/_]*$)/;
-	      $c->setAttribute( "filename", $1 );
-	    }
-	    $auto_data->appendChild($c);
-	  }
-	}
-	$sourcedoc->documentElement->appendChild($auto_data);
+          while (my ($base, $l) = each %files) {
+              if (($dir eq "global") && ($l ne $lang)) {
+	              lock(*TRANSLATIONS);
+                print TRANSLATIONS "$lang $base.$lang.xml $base.$l.xml\n";
+      		      unlock(*TRANSLATIONS);
+              }
+              print STDERR "Loading $base.$l.xml\n" if $opts{d};
+              my $source_data = $parser->parse_file("$base.$l.xml");
+              foreach ($source_data->documentElement->childNodes) {
+                 my $c = $_->cloneNode(1);
+                 # add the filename to nodes (news, events, …) so that we can use it as an identifier (e.g. for RSS)
+                 if (ref($c) eq "XML::LibXML::Element") {
+                   $base =~ /.*[\/_]([^\/_]*$)/;
+                   $c->setAttribute( "filename", $1 );
+                 }
+                 $auto_data->appendChild($c);
+              }
+          }
+          $sourcedoc->documentElement->appendChild($auto_data);
+          
+          #
+          # Get the appropriate textset for this language. If one can't be
+          # found, use the English. (I hope this never happens)
+          #
+          my $textlang = $lang;
+          unless (-f $opts{i}."/tools/texts-content-$textlang.xml") {
+              $textlang = "en";
+          }
+          
+          my $textdoc = $sourcedoc->createElement("textset-content");
+          $auto_data->appendChild($textdoc);
+          clone_document($textdoc, $opts{i}."/tools/texts-content-$textlang.xml");
+          
+          # Get also backup texts from the English file
+          my $textdocbak = $sourcedoc->createElement("textset-content-backup");
+          $auto_data->appendChild($textdocbak);
+          clone_document($textdocbak, $opts{i}."/tools/texts-content-en.xml");
+          
+          # TODO: optimise getting texts-content-xx.xml and texts-content-en.xml,
+          # since it does not depend on the xsl file being treated, we should do it only once!
+          
+          #
+          # Transform the document using the XSL file and then push the
+          # result into the <document> element of the document we're building.
+          #
+          my $style_doc = $parser->parse_file("$opts{i}/$file.xsl");
+          my $stylesheet = $xslt_parser->parse_stylesheet($style_doc);
+          my $results = $stylesheet->transform($sourcedoc);
+
+          foreach ($results->documentElement->childNodes) {
+            my $c = $_->cloneNode(1);
+            $document->appendChild($c);
+          }
+
+          #
+          # Now, while we're just at it, we create the RSS feeds if we want any
+          #
+	        if (-f "$opts{i}/$file.rss.xsl") {
+            my $style_doc = $parser->parse_file("$opts{i}/$file.rss.xsl");
+	          my $stylesheet = $xslt_parser->parse_stylesheet($style_doc);
+	          my $results = $stylesheet->transform($sourcedoc);
+	          $stylesheet->output_file($results, "$opts{o}/$dir/$file.$lang.rss")
+    	      unless $opts{n};
+          }
+
+    		  #
+          # and possibly the corresponding iCal (ics) file
+          #
+  	      if (-f "$opts{i}/$file.ics.xsl") {
+            my $style_doc = $parser->parse_file("$opts{i}/$file.ics.xsl");
+			      my $stylesheet = $xslt_parser->parse_stylesheet($style_doc);
+			      my $results = $stylesheet->transform($sourcedoc);
+			      $stylesheet->output_file($results, "$opts{o}/$dir/$file.$lang.ics")
+			      unless $opts{n};
+          }
+          
+          } else {
+            #
+            # If this wasn't an automatically updating document, we simply
+            # clone the contents of the source file into the document.
+            #
+      	    clone_document($document, $source);
+          }
+
+          #
+          # Find out if this translation is to be regarded as outdated or not.
+          # A translation is deemed outdated if it is more than 2 hours older
+          # than the original. This makes sure a translation committed together
+          # with the original (but maybe a second earlier) isn't marked outdated.
+          #
+          my $originalsource = "$file.".$root->getAttribute("original").".xhtml";
+	        if (( stat("$opts{i}/$originalsource"))[9] > (stat($source))[9] + 7200
+	              and not $cant_be_outdated{$file} ) {
+	          $root->setAttribute("outdated", "yes");
+		        if ($dir eq "global") {
+			        lock(*TRANSLATIONS);
+		          print TRANSLATIONS "$lang $source $originalsource\n";
+			        unlock(*TRANSLATIONS);
+		        }
+			} else {
+				$root->setAttribute("outdated", "no");
+			}
 
 	#
 	# Get the appropriate textset for this language. If one can't be
 	# found, use the English. (I hope this never happens)
 	#
 	my $textlang = $lang;
-	unless (-f $opts{i}."/tools/texts-content-$textlang.xml") {
-	  $textlang = "en";
+	unless (-f $opts{i}."/tools/texts-$textlang.xml") {
+	    $textlang = "en";
 	}
 
-	my $textdoc = $sourcedoc->createElement("textset-content");
-	$auto_data->appendChild($textdoc);
-	clone_document($textdoc, $opts{i}."/tools/texts-content-$textlang.xml");
+	my $textdoc = $dom->createElement("textset");
+	$root->appendChild($textdoc);
+	clone_document($textdoc, $opts{i}."/tools/texts-$textlang.xml");
+	
+	#
+	# Read the fundraising text, if it exists.
+	#
+	if (-f $opts{i}."/fundraising.$lang.xml") {
+	    my $fundraisingdoc = $dom->createElement("fundraising");
+	    $root->appendChild($fundraisingdoc);
+	    clone_document($fundraisingdoc, $opts{i}."/fundraising.$lang.xml");
+	} elsif (-f $opts{i}."/fundraising.en.xml") {
+	    my $fundraisingdoc = $dom->createElement("fundraising");
+	    $root->appendChild($fundraisingdoc);
+	    clone_document($fundraisingdoc, $opts{i}."/fundraising.en.xml");
+        }
 
-	# Get also backup texts from the English file
-	my $textdocbak = $sourcedoc->createElement("textset-content-backup");
-	$auto_data->appendChild($textdocbak);
-	clone_document($textdocbak, $opts{i}."/tools/texts-content-en.xml");
-
-	# TODO: optimise getting texts-content-xx.xml and texts-content-en.xml,
-	# since it does not depend on the xsl file being treated, we should do it only once!
 
 	#
-	# Transform the document using the XSL file and then push the
-	# result into the <document> element of the document we're building.
+	# And then we do the same thing for the menues. But first we take the
+	# global menu here, then we add any information that is specific to
+	# the focus.
 	#
-	my $style_doc = $parser->parse_file("$opts{i}/$file.xsl");
-	my $stylesheet = $xslt_parser->parse_stylesheet($style_doc);
-	my $results = $stylesheet->transform($sourcedoc);
-
-	foreach ($results->documentElement->childNodes) {
-	  my $c = $_->cloneNode(1);
-	  $document->appendChild($c);
+	foreach ($root->getElementsByTagName("menuset")) {
+	    $root->removeChild($_);
 	}
 
-	#
-	# Now, while we're just at it, we create the RSS feeds if we want any
-	#
-	if (-f "$opts{i}/$file.rss.xsl") {
-	  my $style_doc = $parser->parse_file("$opts{i}/$file.rss.xsl");
-	  my $stylesheet = $xslt_parser->parse_stylesheet($style_doc);
-	  my $results = $stylesheet->transform($sourcedoc);
-	  $stylesheet->output_file($results, "$opts{o}/$dir/$file.$lang.rss")
-	    unless $opts{n};
-	}
-
-	#
-	# and possibly the corresponding iCal (ics) file
-	#
-	if (-f "$opts{i}/$file.ics.xsl") {
-	  my $style_doc = $parser->parse_file("$opts{i}/$file.ics.xsl");
-	  my $stylesheet = $xslt_parser->parse_stylesheet($style_doc);
-	  my $results = $stylesheet->transform($sourcedoc);
-	  $stylesheet->output_file($results, "$opts{o}/$dir/$file.$lang.ics")
-	    unless $opts{n};
-	}
-
-      } else {
-	#
-	# If this wasn't an automatically updating document, we simply
-	# clone the contents of the source file into the document.
-	#
-	clone_document($document, $source);
-      }
-
-      #
-      # Find out if this translation is to be regarded as outdated or not.
-      # A translation is deemed outdated if it is more than 2 hours older
-      # than the original. This makes sure a translation committed together
-      # with the original (but maybe a second earlier) isn't marked outdated.
-      #
-      my $originalsource = "$file.".$root->getAttribute("original").".xhtml";
-      if (( stat("$opts{i}/$originalsource"))[9] > (stat($source))[9] + 7200
-	    and not $cant_be_outdated{$file} ) {
-	$root->setAttribute("outdated", "yes");
-	if ($dir eq "global") {
-	  lock(*TRANSLATIONS);
-	  print TRANSLATIONS "$lang $source $originalsource\n";
-	  unlock(*TRANSLATIONS);
-	}
-      } else {
-	$root->setAttribute("outdated", "no");
-      }
-
-      #
-      # Get the appropriate textset for this language. If one can't be
-      # found, use the English. (I hope this never happens)
-      #
-      my $textlang = $lang;
-      unless (-f $opts{i}."/tools/texts-$textlang.xml") {
-	$textlang = "en";
-      }
-
-      my $textdoc = $dom->createElement("textset");
-      $root->appendChild($textdoc);
-      clone_document($textdoc, $opts{i}."/tools/texts-$textlang.xml");
-
-
-      #
-      # Read the fundraising text, if it exists.
-      #
-      if (-f $opts{i}."/fundraising.$lang.xml") {
-	my $fundraisingdoc = $dom->createElement("fundraising");
-	$root->appendChild($fundraisingdoc);
-	clone_document($fundraisingdoc, $opts{i}."/fundraising.$lang.xml");
-      } elsif (-f $opts{i}."/fundraising.en.xml") {
-	my $fundraisingdoc = $dom->createElement("fundraising");
-	$root->appendChild($fundraisingdoc);
-	clone_document($fundraisingdoc, $opts{i}."/fundraising.en.xml");
-      }
-
-
-      #
-      # And then we do the same thing for the menues. But first we take the
-      # global menu here, then we add any information that is specific to
-      # the focus.
-      #
-      foreach ($root->getElementsByTagName("menuset")) {
-	$root->removeChild($_);
-      }
-
-      my %menu;
-      foreach ('global', $dir) {
-	if (-f $opts{i}."/tools/menu-$_.xml") {
-	  my $menudoc = $parser->parse_file($opts{i}."/tools/menu-$_.xml");
-	  foreach my $n ($menudoc->documentElement->getElementsByTagName("menu")) {
-	    $menu{$n->getAttribute("id")} = $n;
-	  }
-	}
-      }
-      my $menuroot = $dom->createElement("menuset");
-      while (my ($id, $n) = each %menu) {
-	my $m = $n->cloneNode(1);
-	$menuroot->appendChild($m);
-      }
-      $root->appendChild($menuroot);
-
-      #
-      # Do the actual transformation.
-      #
-      my $results = $global_stylesheet->transform($dom);
-
-      #
-      # In post-processing, we replace links pointing back to ourselves
-      # so that they point to the correct language.
-      #
-      foreach ($results->documentElement->getElementsByTagName("a")) {
-	my $href = $_->getAttribute("href");
-	if ($href =~ /^http:\/\/www.fsfe.org/) {
-	  if ($_->textContent != "Our global work") {
-	    $href =~ s/http:\/\/www.fsfe.org//;
-	  }
-	}
-	if (($href !~ /^http/) && ($href !~ /^#/)) {
-	  # Save possible anchor and remove it from URL
-	  my $anchor = $href;
-	  if (!($anchor =~ s/.*#/#/)) {
-	    $anchor = "";
-	  }
-	  $href =~ s/#.*//;
-	  # proces URL
-	  if (($href =~ /\.html$/) && ($href !~ /\.[a-z][a-z]\.html$/)) {
-	    $href =~ s/\.html$/\.$lang.html/;
-	  } elsif (($href =~ /\.rss$/) && ($href !~ /\.[a-z][a-z]\.rss$/)) {
-	    $href =~ s/\.rss$/\.$lang.rss/;
-	  } elsif (($href =~ /\.ics$/) && ($href !~ /\.[a-z][a-z]\.ics$/)) {
-	    $href =~ s/\.ics$/\.$lang.ics/;
-	  } else {
-	    if (-d $opts{i}."/$href") {
-	      $href =~ s/\/?$/\/index.$lang.html/;
-	    } elsif ($href =~ /\/\w+$/) {
-	      $href .= ".$lang.html";
+	my %menu;
+	foreach ('global', $dir) {
+	    if (-f $opts{i}."/tools/menu-$_.xml") {
+		my $menudoc = $parser->parse_file($opts{i}."/tools/menu-$_.xml");
+		foreach my $n ($menudoc->documentElement->getElementsByTagName("menu")) {
+		    $menu{$n->getAttribute("id")} = $n;
+		}
 	    }
-	  }
-	  # replace anchor
-	  $href .= $anchor;
-	  # For pages running on an external server, use full URL
-	  if ($document->getAttribute("external")) {
-	    $href = "http://www.fsfe.org$href";
-	  }
-	  $_->setAttribute("href", $href);
 	}
-      }
+	my $menuroot = $dom->createElement("menuset");
+	while (my ($id, $n) = each %menu) {
+            my $m = $n->cloneNode(1);
+	    $menuroot->appendChild($m);
+	}
+	$root->appendChild($menuroot);
 
-      print "Writing: $opts{o}/$dir/$file.$lang.html\n" if $opts{d};
+        #
+        # Do the actual transformation.
+        #
+        my $results = $global_stylesheet->transform($dom);
 
-      $global_stylesheet->output_file($results, "$opts{o}/$dir/$file.$lang.html")
-	unless $opts{n};
-      # Add foo.html.xx link which is used by Apache's MultiViews option when
-      # a user enters foo.html as URL.
-      link("$opts{o}/$dir/$file.$lang.html", "$opts{o}/$dir/$file.html.$lang")
-	unless $opts{n};
+        #
+        # In post-processing, we replace links pointing back to ourselves
+        # so that they point to the correct language.
+        #
+        foreach ($results->documentElement->getElementsByTagName("a")) {
+          my $href = $_->getAttribute("href");
+          if ($href =~ /^http:\/\/www.fsfe.org/) {
+            if ($_->textContent != "Our global work") {
+              $href =~ s/http:\/\/www.fsfe.org//;
+            }
+          }
+          if (($href !~ /^http/) && ($href !~ /^#/)) {
+	    # Save possible anchor and remove it from URL
+	    my $anchor = $href;
+	    if (!($anchor =~ s/.*#/#/)) {
+	      $anchor = "";
+	    }
+	    $href =~ s/#.*//;
+	    # process URL
+	    if (($href =~ /\.html$/) && ($href !~ /\.[a-z][a-z]\.html$/)) {
+              $href =~ s/\.html$/\.$lang.html/;
+            } elsif (($href =~ /\.rss$/) && ($href !~ /\.[a-z][a-z]\.rss$/)) {
+              $href =~ s/\.rss$/\.$lang.rss/;
+            } elsif (($href =~ /\.ics$/) && ($href !~ /\.[a-z][a-z]\.ics$/)) {
+              $href =~ s/\.ics$/\.$lang.ics/;
+            } else {
+              if (-d $opts{i}."/$href") {
+                $href =~ s/\/?$/\/index.$lang.html/;
+              } elsif ($href =~ /\/\w+$/) {
+                $href .= ".$lang.html";
+              }
+            }
+	    # replace anchor
+	    $href .= $anchor;
+            # For pages running on an external server, use full URL
+            if ($document->getAttribute("external")) {
+              $href = "http://www.fsfe.org$href";
+            }
+            $_->setAttribute("href", $href);
+          }
+        }
+
+	print "Writing: $opts{o}/$dir/$file.$lang.html\n" if $opts{d};
+
+	$global_stylesheet->output_file($results, "$opts{o}/$dir/$file.$lang.html")
+		unless $opts{n};
+        # Add foo.html.xx link which is used by Apache's MultiViews option when
+        # a user enters foo.html as URL.
+        link("$opts{o}/$dir/$file.$lang.html", "$opts{o}/$dir/$file.html.$lang")
+		unless $opts{n};
     }
   }
   print STDERR "\n" unless $opts{q};
@@ -719,16 +718,16 @@ print STDERR "Fixing index links\n" unless $opts{q};
 
 while (my ($path, undef) = each %countries) {
   my @dirs = File::Find::Rule->directory()
-    ->in($opts{o}."/$path");
+                             ->in($opts{o}."/$path");
   foreach (@dirs) {
     my $base = basename($_);
     while (my ($lang, undef) = each %languages) {
       if (-f "$_/$base.$lang.html" &&
-	    ! -f "$_/index.$lang.html") {
+          ! -f "$_/index.$lang.html") {
         link("$_/$base.$lang.html", "$_/index.$lang.html")
-	  unless $opts{n};
+		unless $opts{n};
         link("$_/$base.html.$lang", "$_/index.html.$lang")
-	  unless $opts{n};
+		unless $opts{n};
       }
     }
   }
@@ -741,7 +740,7 @@ while (my ($path, undef) = each %countries) {
 #
 print STDERR "Copying misc files\n" unless $opts{q};
 foreach (grep(!/\.sources$/, grep(!/\.xsl$/, grep(!/\.xml$/, grep(!/\.xhtml$/,
-								  @files))))) {
+          @files))))) {
   while (my ($dir, undef) = each %countries) {
     if (-f "$opts{i}/$_" && !$opts{n}) {
       link("$opts{i}/$_", "$opts{o}/$dir/$_");
@@ -754,38 +753,38 @@ foreach (grep(!/\.sources$/, grep(!/\.xsl$/, grep(!/\.xml$/, grep(!/\.xhtml$/,
 # the XML node.
 #
 sub clone_document {
-  my ($doc, $source) = @_;
-  my $root = $doc->parentNode;
-
-  print "Source: $source\n" if $opts{d};
-
-  foreach ($root->getElementsByTagName($doc->nodeName)) {
-    $root->removeChild($_);
-  }
-  $root->appendChild($doc);
-
-  my $parser = XML::LibXML->new('encoding'=>'utf-8');
-  $parser->load_ext_dtd(0);
-  $parser->recover(1);
-
-  my $sourcedoc = $parser->parse_file($source);
-  foreach ($sourcedoc->documentElement->childNodes) {
-    $_->unbindNode();
-    my $n = $_->cloneNode(1);
-    $doc->appendChild($n);
-  }
-  if ($sourcedoc->documentElement->getAttribute("external")) {
-    $doc->setAttribute("external", "yes");
-  }
-  if ($sourcedoc->documentElement->getAttribute("newsdate")) {
-    # necessary for xhtml news files
-    $doc->setAttribute("newsdate", $sourcedoc->documentElement->getAttribute("newsdate"));
-  }
-  if ($sourcedoc->documentElement->getAttribute("type")) {
-    # necessary to differentiate news and newsletter pages
-    # TODO: find a way to copy all such attributes!
-    $doc->setAttribute("type", $sourcedoc->documentElement->getAttribute("type"));
-  }
+    my ($doc, $source) = @_;
+    my $root = $doc->parentNode;
+    
+    print "Source: $source\n" if $opts{d};
+    
+    foreach ($root->getElementsByTagName($doc->nodeName)) {
+    	$root->removeChild($_);
+    }
+    $root->appendChild($doc);
+    
+    my $parser = XML::LibXML->new('encoding'=>'utf-8');
+    $parser->load_ext_dtd(0);
+    $parser->recover(1);
+    
+    my $sourcedoc = $parser->parse_file($source);
+    foreach ($sourcedoc->documentElement->childNodes) {
+      $_->unbindNode();
+	    my $n = $_->cloneNode(1);
+	    $doc->appendChild($n);
+    }
+    if ($sourcedoc->documentElement->getAttribute("external")) {
+      $doc->setAttribute("external", "yes");
+    }
+    if ($sourcedoc->documentElement->getAttribute("newsdate")) {
+      # necessary for xhtml news files
+      $doc->setAttribute("newsdate", $sourcedoc->documentElement->getAttribute("newsdate"));
+    }
+    if ($sourcedoc->documentElement->getAttribute("type")) {
+      # necessary to differentiate news and newsletter pages
+      # TODO: find a way to copy all such attributes!
+      $doc->setAttribute("type", $sourcedoc->documentElement->getAttribute("type"));
+    }
 }
 
 #
diff --git a/tools/build2.pl b/tools/build2.pl
index 2231a25ab2..597dffa76c 100755
--- a/tools/build2.pl
+++ b/tools/build2.pl
@@ -320,8 +320,8 @@ sub process {
   my ($file, $langs) = @_;
   
 #  if (not $file eq "donate/thankgnus") {
-#    return;
-#  }
+ #   return;
+  #}
   
   print "$file\n";
 
diff --git a/tools/texts-en.xml b/tools/texts-en.xml
index 0fc8a5bc88..7e9e9acc7c 100644
--- a/tools/texts-en.xml
+++ b/tools/texts-en.xml
@@ -24,7 +24,6 @@
       href="http://www.fsfla.org/">Latin America</a>.
   </text>
   <text id="creative-commons-license">Creative Commons license</text>
-  <text id="creative-commons-license">Creative Commons license</text>
   <text id="outdated">
     <strong>Warning: </strong>
     This page may be out of date with the original. Please use
@@ -55,8 +54,8 @@
   <text id="language">Language</text>
 
  <!-- Article metadata -->
- <text id="author">by</text>
- <text id="published">Published on</text>
+ <text id="author">Author</text>
+ <text id="published">Published</text>
  <text id="download">Download</text>
  
   <!-- Conjunctions -->
@@ -73,9 +72,9 @@
   <text id="fsfe/lists">Mailing Lists</text>
   <text id="fsfe/press">Press</text>
   <text id="fsfe/thankgnus">Donors</text>
-  <text id="fellowship/fellowship">Fellowship</text>
+  <text id="fellowship/fellowship">Join</text>
   <text id="fellowship/card">Card</text>
-  <text id="fellowship/communicate">Communicate</text>
+  <text id="fellowship/communicate">Contact</text>
   <text id="fellowship/contact">Contact</text>
   <text id="planet/planet">Planet</text>
   <text id="planet/blogs">Blogs</text>
diff --git a/tools/xsltsl/countries.xsl b/tools/xsltsl/countries.xsl
index 69858ae29f..3be4b87bce 100644
--- a/tools/xsltsl/countries.xsl
+++ b/tools/xsltsl/countries.xsl
@@ -13,7 +13,7 @@
         <!-- parameter 'team' is your country code -->
         
         <xsl:variable name="teamcomma"><xsl:value-of select="$team" />,</xsl:variable>
-		<xsl:variable name="commateam">, <xsl:value-of select="$team" /></xsl:variable>
+        <xsl:variable name="commateam">, <xsl:value-of select="$team" /></xsl:variable>
         
         <xsl:element name="ul">
             <xsl:attribute name="class">people</xsl:attribute>
diff --git a/tools/xsltsl/static-elements.xsl b/tools/xsltsl/static-elements.xsl
index 6a0de8d115..919cb087b0 100644
--- a/tools/xsltsl/static-elements.xsl
+++ b/tools/xsltsl/static-elements.xsl
@@ -65,4 +65,35 @@
     </xsl:element>
   </xsl:template>
 
+  <!-- auto generate ID for headings if doesn't already exist -->
+  <xsl:template name="generate-id">
+    <xsl:copy>
+	<xsl:choose>
+		<xsl:when test="not(@id)">
+			
+			<!-- replace spaces with dashes -->
+			<xsl:variable name="formattedTitle1" select="translate(node(),' ','-')"/>
+			
+			<!-- convert uppercase to lowercase using translate -->
+			<xsl:variable name="smallcase" select="'abcdefghijklmnopqrstuvwxyz'" />
+			<xsl:variable name="uppercase" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'" />
+
+			<xsl:variable name="formattedTitle2" select="translate($formattedTitle1, $uppercase, $smallcase)" />
+			
+			<xsl:attribute name="id">
+				<xsl:value-of select="$formattedTitle2" />
+			</xsl:attribute>
+		</xsl:when>
+		<xsl:otherwise>
+			<xsl:attribute name="id">
+				<xsl:value-of select="@id" />
+			</xsl:attribute>	
+		</xsl:otherwise>
+	</xsl:choose>
+     
+	<xsl:apply-templates select="node()"/>
+	
+    </xsl:copy>
+  </xsl:template>
+
 </xsl:stylesheet>
