diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
deleted file mode 100644
index 3cb05dc4ca849716242dd9978f95514530cc1eb8..0000000000000000000000000000000000000000
--- a/src/site/apt/index.apt
+++ /dev/null
@@ -1,22 +0,0 @@
- -----
- ARSnova Landing Page
- -----
- ARSnova Developers
- -----
- -----
-
-ARSnova
-
- 
- Das Projekt ARSnova will neue Wege gehen, um auch in großen Veranstaltungen Feedback und Interaktion zwischen Auditorium und Lehrperson zu ermöglichen: ARS = Audience Response System.
-
-	* {{{http://en.wikipedia.org/wiki/Audience_response}ARS bei Wikipedia}}
-	
-	* {{{https://scm.thm.de/redmine/documents/16}Präsentation über ARSnova}}
-	
-	* {{{https://arsnova.eu/overlay/}Desktop-Widget}}
-	
-	* {{{http://prezi.com/bkfz1utyaiiw/arsnova/}ARSnova auf Prezi}}
-
- ARSnova ist eine coole, kostenlose und ausbaufähige Open-Source-App, die als HTML5-App auf jedem Smartphone, Tablet-PC oder Laptop läuft.
-
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
new file mode 100644
index 0000000000000000000000000000000000000000..2a20606d9650708a959ae6240d3e804cd8ddb12c
--- /dev/null
+++ b/src/site/markdown/index.md
@@ -0,0 +1,7 @@
+# Indroduction
+
+ARSnova is a modern approach to Audience Response Systems (ARS).
+It is released under the GPLv3 license, and is offered as a Software as a Service free of charge.
+Head over to [arsnova.eu](https://arsnova.eu/) to see it in action.
+
+![ARSnova](showcase.png)
diff --git a/src/site/site.xml b/src/site/site.xml
index 1ba0144cfa8306f443a63907f8f35ae6872cebd0..974d0527248c6dcc6f8b96c693254a665b403c2d 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <project name="ARSnova" xmlns="http://maven.apache.org/DECORATION/1.0.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -7,7 +7,7 @@
 	<skin>
 		<groupId>org.apache.maven.skins</groupId>
 		<artifactId>maven-fluido-skin</artifactId>
-		<version>1.5</version>
+		<version>1.6</version>
 	</skin>
 
 	<custom>
@@ -22,8 +22,6 @@
 				<projectId>arsnova</projectId>
 				<widget>stats</widget>
 			</ohloh>
-			<facebookLike />
-			<googlePlusOne />
 		</fluidoSkin>
 	</custom>
 
@@ -44,7 +42,7 @@
 			]]>
 		</head>
 		<links>
-			<item name="THM" href="http://www.thm.de/" />
+			<item name="THM" href="https://www.thm.de/" />
 		</links>
 		<menu name="Overview">
 			<item name="Introduction" href="index.html" />
@@ -52,18 +50,17 @@
 			<item name="The Team" href="team-list.html" />
 		</menu>
 		<menu name="Documentation">
-			<item name="Installation" href="https://github.com/thm-projects/arsnova-war#production-use" />
-			<item name="Development" href="https://github.com/thm-projects/arsnova-war#development" />
+			<item name="Installation" href="installation.html" />
+			<item name="Upgrading" href="upgrade.html" />
+			<item name="Development" href="development.html" />
 			<item name="Dependencies" href="dependencies.html" />
 			<item name="API Docs" href="apidocs/index.html" />
 		</menu>
 		<menu name="Further Information">
-			<item name="Gitorious" href="https://scm.thm.de/arsnova" />
+			<item name="Source Repository" href="source-repository.html" />
 			<item name="Issue Tracking" href="issue-tracking.html" />
-			<item name="Sonar" href="https://scm.thm.de/sonar/dashboard/index/de.thm.arsnova:arsnova-war" />
+			<item name="SonarQube Metrics" href="https://scm.thm.de/sonar/dashboard/index/de.thm.arsnova:arsnova-backend" />
 			<item name="Continuous Integration" href="integration.html" />
-			<item name="Source Repository" href="source-repository.html" />
-			<item name="Metrics" href="cobertura/index.html" />
 		</menu>
 	</body>
 </project>