diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
deleted file mode 100644
index c22c2aa5b353bbf26f4d94afd1a8828de85fce4f..0000000000000000000000000000000000000000
--- a/src/site/apt/index.apt
+++ /dev/null
@@ -1,23 +0,0 @@
-Check again later...
-
-	..., as this page and the whole project is still WIP. 
-
-	The first stable release will be published soon. For more informations visit: {{https://build.se.informatik.uni-kiel.de/gitlab/chw/teetime}}
-
-===
-
-[images/teetime-wo-arrows-shrinked.png] TeeTime Logo
-
-	TeeTime is a Pipes-And-Filter-Framework for Java.
-	
-	It provides various features, which will bring you to the next level of analysis programming, such like:
-		
-	 * Concurrent execution of stages
-		
-	 * Flexible connection between stages
-		
-	 * Typed ports
-		
-	 * Pre-defined stages and pipelines
-
-	 
\ No newline at end of file
diff --git a/src/site/apt/release.apt b/src/site/apt/release.apt
deleted file mode 100644
index 3bf9915e302f078a36ee0c8f78e174993a0d1954..0000000000000000000000000000000000000000
--- a/src/site/apt/release.apt
+++ /dev/null
@@ -1,9 +0,0 @@
-Release notes
-
-Version 1.0
-	
-	Will be released soon
-	
-	* First stable release
-	
-	* All fundamental functions implemented
\ No newline at end of file
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
new file mode 100644
index 0000000000000000000000000000000000000000..565d987ebdf9e444ae6ce7998ee975758a0449f8
--- /dev/null
+++ b/src/site/markdown/index.md
@@ -0,0 +1,21 @@
+###Check again later...
+
+..., as this page and the whole project is still WIP. 
+
+The first stable release will be published soon. For more informations visit: https://build.se.informatik.uni-kiel.de/gitlab/chw/teetime
+
+![Logo](images/teetime-wo-arrows-shrinked.png) TeeTime Logo
+
+TeeTime is a Pipes-And-Filter-Framework for Java.
+	
+It provides various features, which will bring you to the next level of analysis programming, such like:
+		
+- Concurrent execution of stages
+		
+- Flexible connection between stages
+		
+- Typed ports
+		
+- Pre-defined stages and pipelines
+
+	 
\ No newline at end of file
diff --git a/src/site/markdown/release.md b/src/site/markdown/release.md
new file mode 100644
index 0000000000000000000000000000000000000000..c17a8719539b1b88452278acf03e31790aa79af1
--- /dev/null
+++ b/src/site/markdown/release.md
@@ -0,0 +1,13 @@
+# Release notes
+
+Added functionalities and fixed bugs are listed chronologically on this page.
+	
+## Snapshot
+
+- Non-stable nightly release
+
+## Release 1.0 / Soon
+
+### Major enhancements
+
+- Initial release
\ No newline at end of file
diff --git a/src/site/site.xml b/src/site/site.xml
index 58a9debd6ceec2a0450404132eea37c16816ef6f..c659b2723e1e7cb8d4d112c73c496ec22512de4b 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -83,12 +83,17 @@
 				of analysis tooling.
 			</bottomDescription>
 			<pages>
-				<index project="TeeTime">
+				<index>
 				</index>
-				<wiki-home project="net.sourceforge.teetime">
+				<release>
 					<toc>sidebar</toc>
 					<tocTopMax>4</tocTopMax>
-				</wiki-home>
+					<breadcrumbs>false</breadcrumbs>
+				</release>
+				<wiki>
+					<toc>sidebar</toc>
+					<tocTopMax>4</tocTopMax>
+				</wiki>
 			</pages>
 			<!-- <slogan>Make analysis clever and faster.</slogan> -->
 			<!-- <titleTemplate>%2$s | %1$s</titleTemplate> -->