diff --git a/Makefile b/Makefile
index dc509f6b6f..63a069ab35 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ $(ENPAGES): %.html: %.xhtml fsfe.xsl navigation.en.xsl
 	filebase=`basename $$base` ; \
 	dir=`dirname $$path` ; \
 	root=`dirname $$path | perl -pe 'chop; s:([^/]+):..:g if($$_ ne ".")'` ; \
-	$(XSLTPROC) fsfe.xsl $$path $(XSLTOPTS) '$$fsfeurope='$$root '$$filebase='$$filebase > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; s/\$$//g if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \
+	$(XSLTPROC) fsfe.xsl $$path $(XSLTOPTS) '$$fsfeurope='$$root '$$filebase='$$filebase '$$path='$$path > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; s/\$$//g if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \
 	rm -f $$base.html-temp
 
 $(FRPAGES): %.html: %.xhtml fsfe.xsl navigation.fr.xsl
@@ -56,7 +56,7 @@ $(FRPAGES): %.html: %.xhtml fsfe.xsl navigation.fr.xsl
 	filebase=`basename $$base` ; \
 	dir=`dirname $$path` ; \
 	root=`dirname $$path | perl -pe 'chop; s:([^/]+):..:g if($$_ ne ".")'` ; \
-	$(XSLTPROC) fsfe.xsl $$path $(XSLTOPTS) '$$fsfeurope='$$root '$$filebase='$$filebase > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; s/\$$//g if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \
+	$(XSLTPROC) fsfe.xsl $$path $(XSLTOPTS) '$$fsfeurope='$$root '$$filebase='$$filebase '$$path='$$path > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; s/\$$//g if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \
 	rm -f $$base.html-temp
 
 $(DEPAGES): %.html: %.xhtml fsfe.xsl navigation.de.xsl
diff --git a/blue.css b/blue.css
index 45a34e0eb9..785c90501e 100644
--- a/blue.css
+++ b/blue.css
@@ -22,7 +22,7 @@ A.Extern  	{ font-size: 13px; font-weight: bold; color: #000000 }
 A.Desc	  	{ font-size: 13px; font-style: italic; color: #000000 }
 A.Warning   	{ font-size: 13px; font-weight: bold; color: #FF2222 }
 
-TD.Section  	{ font-size: 13px; font-weight: regular; color: #FFFFFF; text-decoration: none }
+TD.Section  	{ font-size: 13px; font-weight: regular; color: #000000; text-decoration: none }
 
 TD.TopTitle  	{ color: #E0E0E0; font-weight: bold; background: #5A6BA5 }
 TD.TopBody  	{ color: #1C2D67; font-weight: bold; background: #9DAEE8 }
diff --git a/gbn/index.xhtml b/gbn/index.xhtml
index 9a11fb84da..671e0660ba 100644
--- a/gbn/index.xhtml
+++ b/gbn/index.xhtml
@@ -12,7 +12,8 @@
       <center>
         [
 	English |
-	<a href="index.fr.html">Français</a>
+	<a href="index.fr.html">Français</a> |
+        <a href="index.pt.html">Português</a>
 	]
       </center>
 
diff --git a/navigation.de.xsl b/navigation.de.xsl
index 2db98faf74..6560a7b253 100644
--- a/navigation.de.xsl
+++ b/navigation.de.xsl
@@ -77,18 +77,49 @@
               <td class="TopTitle" align="center">Sections</td>
             </tr>
             <tr>
-              <td align="right"><br/>
-              <a href="{$fsfeurope}/index.html" class="T2">Home</a><br/>
-              <a href="{$fsfeurope}/contact/index.de.html"
-                    class="T2">Contact</a><br/>
-              <a href="{$fsfeurope}/background.de.html"
-                   class="T2">Hintergrund</a><br/>
-              <a href="{$fsfeurope}/mailman/index.html"
-                   class="T2">Mailing Lists</a><br/>
-              <a href="{$fsfeurope}/press/index.html"
-                   class="T2">Press section</a><br/>
-              <a href="{$fsfeurope}/gbn/index.html"
-                   class="T2">GNU Business Network</a><br/>
+              <td align="right" class="Section"><br/>
+              <xsl:choose>
+                <xsl:when test="$path='index.de.xhtml'">Home</xsl:when>
+                <xsl:otherwise>
+                  <a href="{$fsfeurope}/index.de.html" class="T2">Home</a>
+                </xsl:otherwise>
+              </xsl:choose><br/>
+              <xsl:choose>
+                <xsl:when test="$path='contact/index.de.xhtml'">Contact</xsl:when>
+                <xsl:otherwise>
+                  <a href="{$fsfeurope}/contact/index.de.html" class="T2">Contact</a>
+                </xsl:otherwise>
+              </xsl:choose><br/>
+              <xsl:choose>
+                <xsl:when test="$path='background.de.xhtml'">Hintergrund</xsl:when>
+                <xsl:otherwise>
+                  <a href="{$fsfeurope}/background.de.html" class="T2">Hintegrund</a>
+                </xsl:otherwise>
+              </xsl:choose><br/>
+              <xsl:choose>
+                <xsl:when test="$path='documents/documents.xhtml'">Documents</xsl:when>
+                <xsl:otherwise>
+                  <a href="{$fsfeurope}/documents/documents.html" class="T2">Documents</a>
+                </xsl:otherwise>
+              </xsl:choose><br/>
+              <xsl:choose>
+                <xsl:when test="$path='mailman/index.xhtml'">Mailing Lists</xsl:when>
+                <xsl:otherwise>
+                  <a href="{$fsfeurope}/mailman/index.html" class="T2">Mailing Lists</a>
+                </xsl:otherwise>
+              </xsl:choose><br/>
+              <xsl:choose>
+                <xsl:when test="$path='press/index.xhtml'">Press Section</xsl:when>
+                <xsl:otherwise>
+                  <a href="{$fsfeurope}/press/index.html" class="T2">Press Section</a>
+                </xsl:otherwise>
+              </xsl:choose><br/>
+              <xsl:choose>
+                <xsl:when test="$path='gbn/index.xhtml'">GNU Business Network</xsl:when>
+                <xsl:otherwise>
+                  <a href="{$fsfeurope}/gbn/index.html" class="T2">GNU Business Network</a>
+                </xsl:otherwise>
+              </xsl:choose><br/>
               <br/></td>
             </tr>
             <tr>
diff --git a/navigation.en.xsl b/navigation.en.xsl
index 8e86a320ec..82bf13e8a2 100644
--- a/navigation.en.xsl
+++ b/navigation.en.xsl
@@ -77,20 +77,49 @@
               <td class="TopTitle" align="center">Sections</td>
             </tr>
             <tr>
-              <td align="right"><br/>
-              <a href="{$fsfeurope}/index.html" class="T2">Home</a><br/>
-              <a href="{$fsfeurope}/contact/index.html"
-                    class="T2">Contact</a><br/>
-              <a href="{$fsfeurope}/background.html"
-                   class="T2">Background</a><br/>
-              <a href="{$fsfeurope}/documents/documents.html"
-                   class="T2">Documents</a><br/>
-              <a href="{$fsfeurope}/mailman/index.html"
-                   class="T2">Mailing Lists</a><br/>
-              <a href="{$fsfeurope}/press/index.html"
-                   class="T2">Press section</a><br/>
-              <a href="{$fsfeurope}/gbn/index.html"
-                   class="T2">GNU Business Network</a><br/>
+              <td align="right" class="Section"><br/>
+              <xsl:choose>
+                <xsl:when test="$path='index.xhtml'">Home</xsl:when>
+                <xsl:otherwise>
+                  <a href="{$fsfeurope}/index.html" class="T2">Home</a>
+                </xsl:otherwise>
+              </xsl:choose><br/>
+              <xsl:choose>
+                <xsl:when test="$path='contact/index.xhtml'">Contact</xsl:when>
+                <xsl:otherwise>
+                  <a href="{$fsfeurope}/contact/index.html" class="T2">Contact</a>
+                </xsl:otherwise>
+              </xsl:choose><br/>
+              <xsl:choose>
+                <xsl:when test="$path='background.xhtml'">Background</xsl:when>
+                <xsl:otherwise>
+                  <a href="{$fsfeurope}/background.html" class="T2">Background</a>
+                </xsl:otherwise>
+              </xsl:choose><br/>
+              <xsl:choose>
+                <xsl:when test="$path='documents/documents.xhtml'">Documents</xsl:when>
+                <xsl:otherwise>
+                  <a href="{$fsfeurope}/documents/documents.html" class="T2">Documents</a>
+                </xsl:otherwise>
+              </xsl:choose><br/>
+              <xsl:choose>
+                <xsl:when test="$path='mailman/index.xhtml'">Mailing Lists</xsl:when>
+                <xsl:otherwise>
+                  <a href="{$fsfeurope}/mailman/index.html" class="T2">Mailing Lists</a>
+                </xsl:otherwise>
+              </xsl:choose><br/>
+              <xsl:choose>
+                <xsl:when test="$path='press/index.xhtml'">Press Section</xsl:when>
+                <xsl:otherwise>
+                  <a href="{$fsfeurope}/press/index.html" class="T2">Press Section</a>
+                </xsl:otherwise>
+              </xsl:choose><br/>
+              <xsl:choose>
+                <xsl:when test="$path='gbn/index.xhtml'">GNU Business Network</xsl:when>
+                <xsl:otherwise>
+                  <a href="{$fsfeurope}/gbn/index.html" class="T2">GNU Business Network</a>
+                </xsl:otherwise>
+              </xsl:choose><br/>
               <br/></td>
             </tr>
             <tr>
diff --git a/navigation.fr.xsl b/navigation.fr.xsl
index f3a43fef10..8ef8bb9de6 100644
--- a/navigation.fr.xsl
+++ b/navigation.fr.xsl
@@ -77,20 +77,49 @@
               <td class="TopTitle" align="center">Sections</td>
             </tr>
             <tr>
-              <td align="right"><br/>
-              <a href="{$fsfeurope}/index.fr.html" class="T2">Accueil</a><br/>
-              <a href="{$fsfeurope}/contact/index.fr.html"
-                    class="T2">Contact</a><br/>
-              <a href="{$fsfeurope}/background.fr.html"
-                   class="T2">Contexte</a><br/>
-	      <a href="{$fsfeurope}/documents/documents.fr.html"
-		   class="T2">Documents</a><br/>
-              <a href="{$fsfeurope}/mailman/index.fr.html"
-                   class="T2">Listes de diffusion</a><br/>
-              <a href="{$fsfeurope}/press/index.fr.html"
-                   class="T2">Section Presse</a><br/>
-              <a href="{$fsfeurope}/gbn/index.fr.html"
-                   class="T2">GNU Business Network</a><br/>
+              <td align="right" class="Section"><br/>
+              <xsl:choose>
+                <xsl:when test="$path='index.fr.xhtml'">Accueil</xsl:when>
+                <xsl:otherwise>
+                  <a href="{$fsfeurope}/index.fr.html" class="T2">Accueil</a>
+                </xsl:otherwise>
+              </xsl:choose><br/>
+              <xsl:choose>
+                <xsl:when test="$path='contact/index.fr.xhtml'">Contact</xsl:when>
+                <xsl:otherwise>
+                  <a href="{$fsfeurope}/contact/index.fr.html" class="T2">Contact</a>
+                </xsl:otherwise>
+              </xsl:choose><br/>
+              <xsl:choose>
+                <xsl:when test="$path='background.fr.xhtml'">Contexte</xsl:when>
+                <xsl:otherwise>
+                  <a href="{$fsfeurope}/background.fr.html" class="T2">Contexte</a>
+                </xsl:otherwise>
+              </xsl:choose><br/>
+              <xsl:choose>
+                <xsl:when test="$path='documents/documents.fr.xhtml'">Documents</xsl:when>
+                <xsl:otherwise>
+                  <a href="{$fsfeurope}/documents/documents.fr.html" class="T2">Documents</a>
+                </xsl:otherwise>
+              </xsl:choose><br/>
+              <xsl:choose>
+                <xsl:when test="$path='mailman/index.fr.xhtml'">Listes de diffusion</xsl:when>
+                <xsl:otherwise>
+                  <a href="{$fsfeurope}/mailman/index.fr.html" class="T2">Listes de diffusion</a>
+                </xsl:otherwise>
+              </xsl:choose><br/>
+              <xsl:choose>
+                <xsl:when test="$path='press/index.fr.xhtml'">Section Presse</xsl:when>
+                <xsl:otherwise>
+                  <a href="{$fsfeurope}/press/index.fr.html" class="T2">Section Presse</a>
+                </xsl:otherwise>
+              </xsl:choose><br/>
+              <xsl:choose>
+                <xsl:when test="$path='gbn/index.fr.xhtml'">GNU Business Network</xsl:when>
+                <xsl:otherwise>
+                  <a href="{$fsfeurope}/gbn/index.fr.html" class="T2">GNU Business Network</a>
+                </xsl:otherwise>
+              </xsl:choose><br/>
               <br/></td>
             </tr>
             <tr>
diff --git a/navigation.pt.xsl b/navigation.pt.xsl
index 6eeabdb53a..3b27cdc08b 100644
--- a/navigation.pt.xsl
+++ b/navigation.pt.xsl
@@ -78,54 +78,48 @@
             </tr>
             <tr>
               <td align="right" class="Section"><br/>
-              <xsl:if test="$path!='index.pt.xhtml'">
-                <a href="{$fsfeurope}/index.pt.html" class="T2">Principal</a><br/>
-              </xsl:if>
-              <xsl:if test="$path='index.pt.xhtml'">
-                Principal<br/>
-              </xsl:if>
-              <xsl:if test="$path!='contact/index.pt.xhtml'">
-              <a href="{$fsfeurope}/contact/index.pt.html"
-                    class="T2">Contactos</a><br/>
-              </xsl:if>
-              <xsl:if test="$path='contact/index.pt.xhtml'">
-                Contactos<br/>
-              </xsl:if>
-              <xsl:if test="$path!='background.pt.xhtml'">
-              <a href="{$fsfeurope}/background.pt.html"
-                   class="T2">Contexto</a><br/>
-              </xsl:if>
-              <xsl:if test="$path='background.pt.xhtml'">
-                Contexto<br/>
-              </xsl:if>
-              <xsl:if test="$path!='documents/documents.pt.xhtml'">
-              <a href="{$fsfeurope}/documents/documents.pt.html"
-                   class="T2">Documentos</a><br/>
-              </xsl:if>
-              <xsl:if test="$path='documents/documents.pt.xhtml'">
-                Documentos<br/>
-              </xsl:if>
-              <xsl:if test="$path!='mailman/index.pt.xhtml'">
-              <a href="{$fsfeurope}/mailman/index.pt.html"  
-                   class="T2">Listas de Correio</a><br/>    
-              </xsl:if>
-              <xsl:if test="$path='mailman/index.pt.xhtml'">
-                Listas de Correio<br/>
-              </xsl:if>
-              <xsl:if test="$path!='press/index.pt.xhtml'">
-              <a href="{$fsfeurope}/press/index.pt.html"
-                   class="T2">Para a Imprensa</a><br/>
-              </xsl:if>
-              <xsl:if test="$path='press/index.pt.xhtml'">
-                Para a Imprensa<br/>
-              </xsl:if>
-              <xsl:if test="$path!='gbn/index.pt.xhtml'">
-              <a href="{$fsfeurope}/gbn/index.pt.html"
-                   class="T2">Rede Empresarial GNU</a><br/>
-              </xsl:if>
-              <xsl:if test="$path='gbn/index.pt.xhtml'">
-                Rede Empresarial GNU<br/>
-              </xsl:if>
+              <xsl:choose>
+                <xsl:when test="$path='index.pt.xhtml'">Principal</xsl:when>
+                <xsl:otherwise>
+                  <a href="{$fsfeurope}/index.pt.html" class="T2">Principal</a>
+                </xsl:otherwise>
+              </xsl:choose><br/>
+              <xsl:choose>
+                <xsl:when test="$path='contact/index.pt.xhtml'">Contactos</xsl:when>
+                <xsl:otherwise>
+                  <a href="{$fsfeurope}/contact/index.pt.html" class="T2">Contactos</a>
+                </xsl:otherwise>
+              </xsl:choose><br/>
+              <xsl:choose>
+                <xsl:when test="$path='background.pt.xhtml'">Contexto</xsl:when>
+                <xsl:otherwise>
+                  <a href="{$fsfeurope}/background.pt.html" class="T2">Contexto</a>
+                </xsl:otherwise>
+              </xsl:choose><br/>
+              <xsl:choose>
+                <xsl:when test="$path='documents/documents.pt.xhtml'">Documentos</xsl:when>
+                <xsl:otherwise>
+                  <a href="{$fsfeurope}/documents/documents.pt.html" class="T2">Documentos</a>
+                </xsl:otherwise>
+              </xsl:choose><br/>
+              <xsl:choose>
+                <xsl:when test="$path='mailman/index.pt.xhtml'">Listas de Correio</xsl:when>
+                <xsl:otherwise>
+                  <a href="{$fsfeurope}/mailman/index.pt.html" class="T2">Listas de Correio</a>
+                </xsl:otherwise>
+              </xsl:choose><br/>
+              <xsl:choose>
+                <xsl:when test="$path='press/index.pt.xhtml'">Para a Imprensa</xsl:when>
+                <xsl:otherwise>
+                  <a href="{$fsfeurope}/press/index.pt.html" class="T2">Para a Imprensa</a>
+                </xsl:otherwise>
+              </xsl:choose><br/>
+              <xsl:choose>
+                <xsl:when test="$path='gbn/index.pt.xhtml'">Rede Empresarial GNU</xsl:when>
+                <xsl:otherwise>
+                  <a href="{$fsfeurope}/gbn/index.pt.html" class="T2">Rede Empresarial GNU</a>
+                </xsl:otherwise>
+              </xsl:choose><br/>
               <br/></td>
             </tr>
             <tr>