diff --git a/content/demo/10_center b/content/demo/10_center
index 9a5b940..c27935e 100644
--- a/content/demo/10_center
+++ b/content/demo/10_center
@@ -3,8 +3,9 @@
 	<p>With the new release, we proudly present an online demonstration
 	of the webinterface of a CryptoBox. At the moment the server is quite
 	slow, but at least you will get a feeling of how the CryptoBox works.</p>
-	<p>Note that some irregularities may occur, as we also use this for
-	review. If you notice strange behaviour don't hesitate to inform us, as we are sometimes blind for the obvious.</p>
+
+	<p>If you notice any strange behaviour then please do not hesitate to tell
+	it to us, as we are sometimes blind even for the most obvious problems ...</p>
 	<p>Try: <a href="http://demo.cryptobox.org">http://demo.cryptobox.org</a>.</p>
 	<p>The necessary access credentials for restricted parts of the demo are:</p>
 	<ul>
diff --git a/content/details/10_content b/content/details/10_content
index e062a32..a5d3236 100644
--- a/content/details/10_content
+++ b/content/details/10_content
@@ -21,10 +21,10 @@
 
 <div class="content">
 	<h2>Encryption</h2>
-	<p>The encrypted disk partitions are <!-- TODO: add luks link --> LUKS
-	volumes. In case of emergency you can access your data directly with every
-	modern linux system	or via <!-- TODO: check link --><a
-	href="http://freeotfe.org/">FreeOTFE</a> (for windows).</p>
+	<p>The encrypted disk partitions are <a href="http://luks.endorphin.org/">LUKS</a>
+	volumes. This makes it possible (if that would be necessary) to access your
+	data directly with every modern linux system or via
+	<a href="http://freeotfe.org/">FreeOTFE</a> (for windows).</p>
 	<p>Select your favourite encryption algorithm from all ciphers supported
 	by the linux kernel. Currently the default is
 	<i>aes-cbc-essiv:sha256</i> (AES in CBC mode with ESSIV based on SHA256).</p>
diff --git a/content/download/05_left b/content/download/05_left
index c225049..2e6f313 100644
--- a/content/download/05_left
+++ b/content/download/05_left
@@ -1,10 +1,10 @@
 <div class="left">
 	<div class="leftcontent">
 		<h2>Latest releases</h2>
-		<p>CryptoBox-Server: <a
-			href="http://codecoop.org/frs/?group_id=60&amp;release_id=61">0.3.2</a></p>
 		<p>CryptoBox-CD: <a
-			href="http://codecoop.org/frs/?group_id=60&amp;release_id=33">0.2.1</a></p>
+			href="%(current-cd-url)s">%(current-cd-version)s</a></p>
+		<p>CryptoBox-Server: <a
+			href="%(current-server-url)s">%(current-server-version)s</a></p>
 	</div>
 </div>
 
diff --git a/content/download/10_center b/content/download/10_center
index 6154389..cd3b619 100644
--- a/content/download/10_center
+++ b/content/download/10_center
@@ -1,16 +1,18 @@
+<div class="content">
+	<h2>CryptoBox-CD</h2>
+	<p>Get the latest <i>CryptoBox-CD</i> image and burn the bootable live-CD.</p>
+	<p><a href="%(current-cd-url)s">Download it now!</a></p>
+	<p>We would like to thank <a href="http://codecoop.org">codecoop.org</a> for
+	providing the necessary bandwidth.</p>
+	<p>Alternatively you can buy a live-CD at <a href="http://www.opensoft.nl/cdshop/product_info.php/manufacturers_id/28/products_id/71">OpenSoft.nl</a>
+	for 5.95 european bugs. Note: this is an unpaid advertisement link.
+	So if you ask us kindly, we might send you a CD for a better price. ;)</p>
+</div>
+
 <div class="content">
 	<h2>CryptoBox-Server</h2>
 	<p>Install the <i>CryptoBox-Server</i> package in your favourite linux system.</p>
-	<p><a href="http://codecoop.org/frs/?group_id=60&amp;release_id=61">Download it now!</a></p>
-	<!-- if this is necessary then it should be on a seperate page
-		<p>Download the <a href="http://codecoop.org/frs/?group_id=60">
-		latest cryptobox-server.deb</a> to oyur system and install it with
-		the following command:<br />
-		<tt>dpkg -i cryptobox-server_0.3.2-1_i386.deb</tt>
-		(Replace the filename with the one you downloaded.)</p>
-		<p>A modern actual system should meet most of the dependencies, but
-		you probably have to install some missing packages.</p>
-	-->
+	<p><a href="%(current-server-url)s">Download it now!</a></p>
 	<p>If you are a Debian/Ubuntu/... Linux user, then we strongly recommend to use
 		the <i>cryptobox-server</i> package of our (inofficial) <a
 		href="http://systemausfall.org/toolforge/debian/">debian package repository</a>
@@ -19,17 +21,6 @@
 		href="http://devel.cryptobox.org/wiki/RepositoryNotes">Read more ...</a></p>
 </div>
 
-<div class="content">
-	<h2>CryptoBox-CD</h2>
-	<p>Get the latest <i>CryptoBox-CD</i> image and burn the bootable live-CD.</p>
-	<p><a href="http://codecoop.org/frs/?group_id=60&amp;release_id=33">Download it now!</a></p>
-	<p>We would like to thank <a href="http://codecoop.org">codecoop.org</a> for
-	providing the necessary bandwidth.</p>
-	<p>Alternatively you can buy a live-CD at <a href="http://www.opensoft.nl/cdshop/product_info.php/manufacturers_id/28/products_id/71">OpenSoft.nl</a>
-	for 5.95 european bugs. Note: this is an unpaid advertisement link.
-	So if you ask us kindly, we might send you a CD for a better price. ;)</p>
-</div>
-
 <div class="content">
 	<h2>License</h2>
 	<p>The code of the CryptoBox-Server and the CryptoBox-CD is licensed under the
diff --git a/content/index/05_left b/content/index/05_left
index dcab94b..4023a25 100644
--- a/content/index/05_left
+++ b/content/index/05_left
@@ -8,11 +8,11 @@
 	</div>
 	
 	<div class="leftcontent">
-		<h2>Future release plans</h2>
-		<p>CryptoBox-Server:</p>
-		<ul><li>v0.4 <span class="date">04/15/02007</span></li></ul>
+		<h2>Planned major releases:</h2>
 		<p>CryptoBox-CD:</p>
-		<ul><li>v0.3.2 <span class="date">02/15/02007</span></li></ul>
+		<ul><li>v0.3.x <span class="date">02/15/02007</span></li></ul>
+		<p>CryptoBox-Server:</p>
+		<ul><li>v0.4 <span class="date">06/01/02007</span></li></ul>
 		<p>Read the <a href="http://devel.cryptobox.org/roadmap">development roadmap</a>
 			for more details.</p>
 	</div>
@@ -20,7 +20,7 @@
 	<div class="leftcontent">
 		<h2>License</h2>
 		<p>All code is licensed under the <a href="http://www.fsf.org/licensing/licenses/gpl.html">GPL</a>.</p>
-		<p>The documentation and this website are licensed under a <a href="http://creativecommons.org/licenses/by-sa/2.5/">Creative Commons License</a>.</p>
+		<p>The documentation, the graphics and this website are licensed under a <a href="http://creativecommons.org/licenses/by-sa/2.5/">Creative Commons License</a>.</p>
 	</div>
 </div>
 
diff --git a/content/index/10_center b/content/index/10_center
index d27a50f..a7b256a 100644
--- a/content/index/10_center
+++ b/content/index/10_center
@@ -1,3 +1,22 @@
+<div class="content">
+	<h2>NEWS: <a href="http://codecoop.org/frs/?group_id=60&amp;release_id=62">CryptoBox-Server v0.3.3 released</a></h2>
+	<p class="date">10/02/02007</p>
+	<p>This release fixes some small bugs:</p>
+	<ul>
+		<li>group membership of the webserver</li>
+		<li>disc usage statistics</li>
+	</ul>
+	<p>Additionally the following features were added:</p>
+	<ul>
+		<li>embedded help</li>
+		<li>improved network plugin</li>
+		<li>...</li>
+	</ul>
+	<p>The Slovenian and German translations are complete.</p>
+	<p>This release is planned to be the base for the next live-cd, which will be
+	   published within the next week.</p>
+</div>
+
 <div class="content">
 	<h2>NEWS: <a href="http://codecoop.org/frs/?group_id=60&amp;release_id=61">CryptoBox-Server v0.3.2 released</a></h2>
 	<p class="date">08/01/02007</p>
@@ -6,7 +25,7 @@
 		<li>fixed bug causing lack of permissions</li>
 		<li>fixed bug in Plugin manager (breaks interface)</li>
 		<li>fixed setting committing delay of Plugin manager</li>
-	</p>
+	</ul>
 </div>
 
 <div class="content">
diff --git a/placeholder/current-cd-url b/placeholder/current-cd-url
new file mode 100644
index 0000000..d4514ec
--- /dev/null
+++ b/placeholder/current-cd-url
@@ -0,0 +1 @@
+http://codecoop.org/frs/?group_id=60&release_id=33
diff --git a/placeholder/current-cd-version b/placeholder/current-cd-version
new file mode 100644
index 0000000..0c62199
--- /dev/null
+++ b/placeholder/current-cd-version
@@ -0,0 +1 @@
+0.2.1
diff --git a/placeholder/current-server-url b/placeholder/current-server-url
new file mode 100644
index 0000000..aed6579
--- /dev/null
+++ b/placeholder/current-server-url
@@ -0,0 +1 @@
+http://codecoop.org/frs/?group_id=60&release_id=62
diff --git a/placeholder/current-server-version b/placeholder/current-server-version
new file mode 100644
index 0000000..1c09c74
--- /dev/null
+++ b/placeholder/current-server-version
@@ -0,0 +1 @@
+0.3.3