diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index 411d54079ce51dca063511b0d896d6c25ee71ae2..c22c2aa5b353bbf26f4d94afd1a8828de85fce4f 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -1,10 +1,12 @@
-Check again later, as this page and the whole project is still WIP. 
+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
+[images/teetime-wo-arrows-shrinked.png] TeeTime Logo
 
 	TeeTime is a Pipes-And-Filter-Framework for Java.
 	
@@ -17,3 +19,5 @@ Check again later, as this page and the whole project is still WIP.
 	 * Typed ports
 		
 	 * Pre-defined stages and pipelines
+
+	 
\ No newline at end of file
diff --git a/src/site/markdown/wiki b/src/site/markdown/wiki
new file mode 160000
index 0000000000000000000000000000000000000000..8f9befe5ae087d90e752b4774676f1346f3049a6
--- /dev/null
+++ b/src/site/markdown/wiki
@@ -0,0 +1 @@
+Subproject commit 8f9befe5ae087d90e752b4774676f1346f3049a6
diff --git a/src/site/site.xml b/src/site/site.xml
index a6ea91182899960e86a70b2f617b75f74e16b278..6308e07159e9a4b8462d86854b75a089cf8be45e 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -4,40 +4,75 @@
 		<artifactId>reflow-maven-skin</artifactId>
 		<version>1.1.1</version>
 	</skin>
+
+	<bannerLeft>
+		<name>
+					<![CDATA[
+<!-- 			        	<img src="images/teetime-wo-text-smaller-scaled.png"> -->
+						TeeTime
+					]]>
+		</name>
+		<href>index.html</href>
+	</bannerLeft>
+
 	<body>
-		<menu name="Tutorial">
-			<item name="Introduction" href="https://build.se.informatik.uni-kiel.de/gitlab/chw/teetime/wikis/home" />
+
+		<breadcrumbs>
+			<item name="TeeTime" href="index.html" />
+		</breadcrumbs>
+		<menu name="Download">
+			<item name="from Maven Repository" href="dependency-info.html" />
+			<item name="from Git"
+				href="https://build.se.informatik.uni-kiel.de/gitlab/chw/teetime" />
 		</menu>
+		<links>
+			<item name="Wiki" href="https://build.se.informatik.uni-kiel.de/gitlab/chw/teetime/wikis/home" />
+		</links>
 		<menu name="Documentation">
 			<item name="JavaDoc" href="apidocs/index.html" />
 			<item name="Dependencies" href="dependencies.html" />
-		</menu>
-		<menu name="About">
-			<item name="Dependency Information" href="dependency-info.html" />
 			<item name="License" href="license.html" />
+		</menu>
+		<menu name="Get Involved">
+			<item name="SourceForge Project Site" href="https://sourceforge.net/projects/teetime/" />
+			<item name="Issue Tracking"
+				href="https://build.se.informatik.uni-kiel.de/gitlab/chw/teetime/issues" />
 			<item name="Team" href="team-list.html" />
-			<item name="FAQ" href="faq.html" />
 		</menu>
 		<!-- <menu ref="modules"/> -->
 		<!-- <menu ref="reports"/> -->
 	</body>
+	<publishDate position="bottom" />
+	<version position="bottom" />
 	<custom>
 		<reflowSkin>
-			<theme>bootswatch-flatly</theme>
+			<absoluteResourceURL>http://teetime.sourceforge.net/</absoluteResourceURL>
+			<theme>default</theme>
 			<highlightJs>true</highlightJs>
 			<brand>
 				<name>
 					<![CDATA[
-			        	<img src="images/teetime-wo-text-smaller-scaled.png">
+<!-- 			        	<img src="images/teetime-wo-text-smaller-scaled.png"> -->
 						TeeTime
 					]]>
 				</name>
 				<href>index.html</href>
 			</brand>
+			<slogan>The next level Pipes-And-Filter-Framework for Java
+			</slogan>
+			<titleTemplate>%2$s | %1$s</titleTemplate>
+			<bottomNav maxSpan="9">
+				<column>Download</column>
+				<column>Wiki|Documentation</column>
+				<column>Get Involved</column>
+			</bottomNav>
+			<bottomDescription>
+				TeeTime is a Pipes-And-Filter-Framework for Java.
+				It provides a simple way
+				of analysis tooling.
+			</bottomDescription>
 			<pages>
 				<index project="TeeTime">
-					<publishDate position="right" />
-					<version position="left" />
 				</index>
 			</pages>
 			<!-- <slogan>Make analysis clever and faster.</slogan> -->