diff --git a/docs/source/simplesamlphp-install.xml b/docs/source/simplesamlphp-install.xml
index 574cfc40211b02476b0b8987173379bd86071534..b833fd10c769807089d844f7cae6a7430a22c824 100644
--- a/docs/source/simplesamlphp-install.xml
+++ b/docs/source/simplesamlphp-install.xml
@@ -7,7 +7,7 @@
   <articleinfo>
     <date>2007-08-30</date>
 
-    <pubdate>Wed Dec 19 12:03:53 2007</pubdate>
+    <pubdate>Fri Feb  1 11:02:46 2008</pubdate>
 
     <author>
       <firstname>Andreas Ă…kre</firstname>
@@ -18,189 +18,10 @@
     </author>
   </articleinfo>
 
-  <section>
-    <title>The history of simpleSAMLphp</title>
-
-    <para>simpleSAMLphp is an iteration of what was earlier referred to as
-    lightbulb (<ulink
-    url="https://opensso.dev.java.net/public/extensions/">Sun OpenSSO
-    Extensions</ulink>), written by <ulink
-    url="http://blogs.sun.com/superpat/">Pat Patterson, Sun</ulink>. There are
-    not much code left from lightbulb, but credits go to Pat for introducing a
-    new way of thinking when it comes to implementing federation protocols in
-    a simple and elegant way.</para>
-
-    <para>The simpleSAMLphp project is currently led by <ulink
-    url="http://claimid.com/erlang">Andreas Ă…kre Solberg</ulink>, <ulink
-    url="http://uninett.no">UNINETT</ulink>.</para>
-
-    <para>The product is used to bridge AAI protocols in the GÉANT project,
-    <ulink url="http://geant2.net">http://geant2.net</ulink>.</para>
-
-    <para>We have received a bunch of external contributions.</para>
-
-    <section>
-      <title>Contributors</title>
-
-      <para>Thank you very much for your contributions to
-      simpleSAMLphp:</para>
-
-      <itemizedlist>
-        <listitem>
-          <para>Lukas Hammerle, SWITCH, Switzerland</para>
-        </listitem>
-
-        <listitem>
-          <para>Stefan Winter, Restena, Luxemborg</para>
-        </listitem>
-      </itemizedlist>
-    </section>
-  </section>
-
-  <section>
-    <title>Changelog</title>
-
-    <para>Here is changes between simpleSAML versions. Look here if you are
-    upgrading, to see if there are any changes to the config format.</para>
-
-    <section>
-      <title>Version 0.5</title>
-
-      <para>Released 2007-10-15. Revision 28.</para>
-
-      <warning>
-        <para>Both <filename>config.php</filename> and metadata format is
-        changed. Look at the templates to understand the new format.</para>
-      </warning>
-
-      <itemizedlist>
-        <listitem>
-          <para>Documentation is updated!</para>
-        </listitem>
-
-        <listitem>
-          <para>Metadata files have been more tidy. Removed unused entries.
-          Look at the new templates on how to change your existing
-          metadata.</para>
-        </listitem>
-
-        <listitem>
-          <para>Support for sending metadata on mail to Feide. Automatically
-          detecting if you have configured Feide as the default IdP.</para>
-        </listitem>
-
-        <listitem>
-          <para>Improved SAML 2.0 Metadata generation</para>
-        </listitem>
-
-        <listitem>
-          <para>Added support for Shibboleth 1.3 IdP functionality (beta,
-          contact me if any problems)</para>
-        </listitem>
-
-        <listitem>
-          <para>Added RADIUS authentication backend</para>
-        </listitem>
-
-        <listitem>
-          <para>Added support for HTTP-Redirect debugging when enable
-          <literal>debug=true</literal></para>
-        </listitem>
-
-        <listitem>
-          <para>SAML 2.0 SP example now contains a logout page.</para>
-        </listitem>
-
-        <listitem>
-          <para>Added new authentication backend with support for multiple
-          LDAP based on which organization the user selects.</para>
-        </listitem>
-
-        <listitem>
-          <para>Added SAML 2.0 Discovery Service</para>
-        </listitem>
-
-        <listitem>
-          <para>Initial proof of concept implementation of "User consent on
-          attribute release"</para>
-        </listitem>
-
-        <listitem>
-          <para>Fixed some minor bugs.</para>
-        </listitem>
-      </itemizedlist>
-    </section>
-
-    <section>
-      <title>Version 0.4</title>
-
-      <para>Released 2007-09-14. Revision X.</para>
-
-      <itemizedlist>
-        <listitem>
-          <para>Improved documentation</para>
-        </listitem>
-
-        <listitem>
-          <para>Authentication plugin API. Only LDAP authenticaiton plugin is
-          included, but it is now easier to implement your own plugin.</para>
-        </listitem>
-
-        <listitem>
-          <para>Added support for SAML 2.0 IdP to work with Google Apps for
-          Education. Tested.</para>
-        </listitem>
-
-        <listitem>
-          <para>Initial implementation of SAML 2.0 Single Log-Out
-          functionality both for SP and IdP. Seems to work, but not yet
-          well-tested.</para>
-        </listitem>
-
-        <listitem>
-          <para>Added support for bridging SAML 2.0 to SAML 2.0.</para>
-        </listitem>
-
-        <listitem>
-          <para>Added some time skew offset to the NotBefore timestamp on the
-          assertion, to allow some time skew between the SP and IdP.</para>
-        </listitem>
-
-        <listitem>
-          <para>Fixed Browser/POST page to automaticly submit, and have fall
-          back functionality for user agents with no javascript
-          support.</para>
-        </listitem>
-
-        <listitem>
-          <para>Fixed some bug with warning traversing Shibboleth 1.3
-          Assertions.</para>
-        </listitem>
-
-        <listitem>
-          <para>Fixed tabindex on the login page of the LDAP authentication
-          module to allow you to tab from username, to password and then to
-          submit.</para>
-        </listitem>
-
-        <listitem>
-          <para>Fixed bug on autodiscovering hostname in multihost
-          environments.</para>
-        </listitem>
-
-        <listitem>
-          <para>Cleaned out some debug messages, and added a debug option in
-          the configuration file. This debug option let's you turn on the
-          possibility of showing all SAML messages to users in the web
-          browser, and manually submit them.</para>
-        </listitem>
-
-        <listitem>
-          <para>Several minor bugfixes.</para>
-        </listitem>
-      </itemizedlist>
-    </section>
-  </section>
+  <warning>
+    <para>This version of this document is work in progress. We are currently
+    working on updating the document to </para>
+  </warning>
 
   <section>
     <title>News about simpleSAMLphp</title>
@@ -306,6 +127,12 @@ cp -r metadata-templates/*.php metadata/
 	'baseurlpath'			=&gt; 'simplesaml/',</programlisting>
   </section>
 
+  <section>
+    <title>simpleSAMLphp configuration: config.php</title>
+
+    <para>placeholder. will add more text.</para>
+  </section>
+
   <section>
     <title>The simpleSAMLphp installation webpage</title>
 
diff --git a/docs/source/simplesamlphp-sp.xml b/docs/source/simplesamlphp-sp.xml
index 28539c3fe4a54030cc3aef159b4936165bb4462f..3dd7f7db6f9afe3e81c8397128caae9c26e5275d 100644
--- a/docs/source/simplesamlphp-sp.xml
+++ b/docs/source/simplesamlphp-sp.xml
@@ -7,7 +7,7 @@
   <articleinfo>
     <date>2007-10-15</date>
 
-    <pubdate>Wed Dec 19 12:04:13 2007</pubdate>
+    <pubdate>Fri Feb  1 08:44:40 2008</pubdate>
 
     <author>
       <firstname>Andreas Ă…kre</firstname>
diff --git a/templates/default/en/error.php b/templates/default/en/error.php
index 4aea13acb4df3b19c796d97e0a88b7348c8851eb..8829f17ee86409e4d1abc3c1ab626b4085c663b9 100644
--- a/templates/default/en/error.php
+++ b/templates/default/en/error.php
@@ -1,5 +1,6 @@
 <?php 
 	$this->data['header'] = 'simpleSAMLphp error';
+	$this->data['icon'] = 'bomb_l.png';
 	$this->includeAtTemplateBase('includes/header.php'); 
 ?>
 
diff --git a/templates/default/en/frontpage.php b/templates/default/en/frontpage.php
index f3a424d69a7c814bb5c0218010b258ba127cc2e8..a4279a02ec0ec0f402579a88ff691b6032586e45 100644
--- a/templates/default/en/frontpage.php
+++ b/templates/default/en/frontpage.php
@@ -1,4 +1,7 @@
-<?php $this->includeAtTemplateBase('includes/header.php'); ?>
+<?php 
+	$this->data['icon'] = 'compass_l.png';
+	$this->includeAtTemplateBase('includes/header.php'); 
+?>
 
 	<div id="content">
 
diff --git a/templates/default/en/httpredirect-debug.php b/templates/default/en/httpredirect-debug.php
index fdff69ac31d2fde0d21cba0b1b1748103c46300f..c06111a8bd4c7282aa5421d4b480a4673e12060f 100644
--- a/templates/default/en/httpredirect-debug.php
+++ b/templates/default/en/httpredirect-debug.php
@@ -1,5 +1,7 @@
-<?php $this->includeAtTemplateBase('includes/header.php'); ?>
-
+<?php 
+	$this->data['icon'] = 'debug.png';
+	$this->includeAtTemplateBase('includes/header.php'); 
+?>
 
 	<div id="content">
 	
diff --git a/templates/default/en/post-debug.php b/templates/default/en/post-debug.php
index ed4e269ac1f99b7b8d9170ab3ac03ed0599a1ccb..f5d0bf309f0c0559a6a1514639ba7daa7e3dacc0 100644
--- a/templates/default/en/post-debug.php
+++ b/templates/default/en/post-debug.php
@@ -1,4 +1,7 @@
-<?php $this->includeAtTemplateBase('includes/header.php'); ?>
+<?php 
+	$this->data['icon'] = 'debug.png';
+	$this->includeAtTemplateBase('includes/header.php'); 
+?>