diff --git a/docs/_includes/head.html b/docs/_includes/head.html
index f5ca45688a..f547ed12cd 100644
--- a/docs/_includes/head.html
+++ b/docs/_includes/head.html
@@ -13,6 +13,7 @@
+
diff --git a/docs/css/pmd-customstyles.css b/docs/css/pmd-customstyles.css
new file mode 100644
index 0000000000..e3bf9291f4
--- /dev/null
+++ b/docs/css/pmd-customstyles.css
@@ -0,0 +1,13 @@
+
+.panel-body {
+ padding-top: 0cm;
+}
+
+.landing-page.cat-title {
+ margin-bottom: .5cm;
+ margin-top: .5cm;
+}
+
+.landing-page.cat-description {
+ margin-bottom: .5cm;
+}
\ No newline at end of file
diff --git a/docs/index.md b/docs/index.md
index 9462c92d68..127ad04df6 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,7 +1,7 @@
---
-title: PMD Introduction
+title: PMD Documentation website
keywords: java
-tags: [getting_started]
+tags: []
permalink: index.html
toc: false
summary: >
@@ -12,88 +12,113 @@ last_updated: August 2017
author: Jeff Jensen , Andreas Dangel
---
-{% include image.html file="pmd-logo-big.png" alt="PMD Logo" %}
-
+## Welcome to PMD!
-**PMD** scans source code in Java and other languages and looks for potential problems like:
-
-* Possible bugs - empty try/catch/finally/switch statements
-* Dead code - unused local variables, parameters and private methods
-* Suboptimal code - wasteful String/StringBuffer usage
-* Overcomplicated expressions - unnecessary if statements, for loops that could be while loops
-
-**CPD**, the copy-paste-detector, finds duplicated code in many languages:
-
-* Duplicate code is often just copied and pasted. This means, the bugs are also copied and pasted. Fixing
- them means, fix all duplicated code locations.
-
-## Features
-
-{::options parse_block_html="true" /}
-
-
-### PMD
-
-Features:
-
-* Supporting 8 languages
-* Many ready-to-use built-in rules.
-* Custom rules can be written in Java
-* Custom rules can be written using XPath expression that query the AST of the sources
-* Many output formats
-* Many integrations into IDEs, build tools
-
-Supported Languages:
-
-* [Java](pmd_rules_java.html)
-* [JSP](pmd_rules_jsp.html)
-* [JavaScript](pmd_rules_ecmascript.html)
-* [Salesforce.com Apex](pmd_rules_apex.html) and [Visualforce](pmd_rules_vf.html)
-* [PLSQL](pmd_rules_plsql.html)
-* [Apache Velocity](pmd_rules_vm.html)
-* [XML](pmd_rules_xml.html) and [Maven POM](pmd_rules_pom.html)
-* [XSL](pmd_rules_xsl.html)
-
-
-### CPD
-
-Features:
-
-* Supporting 19 languages
-* Simple GUI
-* Fast
-* Many integrations
-
-Supported Languages:
-
-* Java
-* C, C++
-* C#
-* Groovy
-* PHP
-* Ruby
-* Fortran
-* JavaScript
-* PLSQL
-* Apache Velocity
-* Scala
-* Objective C
-* Matlab
-* Python
-* Go
-* Swift
-* Salesforce.com Apex and Visualforce
-
-
-
-## Download PMD {{ site.pmd.version }}
-
-Latest Version: {{ site.pmd.version }} ({{ site.pmd.date }})
-
-* [Release Notes](pmd_release_notes.html)
-* [Download](https://github.com/pmd/pmd/releases)
+First time user? Then you may be interested in our [quickstart page](TODO).
+
+
+
Quick access
+
+
+
+
+
+
+
+
+
+
+
Getting started
+
A collection of pages explaining the gist of PMD usage and ruleset making.