diff --git a/content/community.md b/content/community.md
index ab945db..6e544b5 100644
--- a/content/community.md
+++ b/content/community.md
@@ -6,7 +6,7 @@
 you can have a look at the [Documentation](documentation.html) and
 [subscribe](mailto:user-subscribe@openwebbeans.apache.org)
 our [mailing list for user](mailto:user@openwebbeans.apache.org).
-If you have troubles to find the information you are looking for, you can also ask in our [IRC-Channel](#IRC).
+If you have troubles to find the information you are looking for, you can also ask in our [IRC-Channel](#irc).
 
 Furthermore, you can check our [mail-archives](#mailing-lists).
 
diff --git a/content/faq.md b/content/faq.md
index 3d10b45..08cbdcf 100644
--- a/content/faq.md
+++ b/content/faq.md
@@ -4,7 +4,7 @@
 
 
 
-  - [Does OWB differ from the CDI-2.0 specification](#Does OWB differ from the CDI-2.0 specification)
+  - [Does OWB differ from the CDI-2.0 specification](#does-owb-differ-from-the-cdi-20-specification)
   - what is the default EL version used in OWB
   - how can I provide own plugins if there is a new spec part (e.g EL-3.0) I like to support
   - How can I contribute to OpenWebBeans
diff --git a/content/openwebbeans-el.md b/content/openwebbeans-el.md
index bb74b5d..44038a2 100644
--- a/content/openwebbeans-el.md
+++ b/content/openwebbeans-el.md
@@ -4,7 +4,7 @@
 
 Described in context here: [Getting started][1]
 
-###EL 2.2 Module
+### EL 2.2 Module
 
     <dependency>
         <groupId>org.apache.openwebbeans</groupId>
diff --git a/content/openwebbeans-spi.md b/content/openwebbeans-spi.md
index ea4dcf9..1535a74 100644
--- a/content/openwebbeans-spi.md
+++ b/content/openwebbeans-spi.md
@@ -2,15 +2,14 @@
 
 # OpenWebBeans SPI
 
-##What is an SPI?
+## What is an SPI?
 
 > Service Provider Interface (SPI) is an API intended to be implemented
 > or extended by a third party. It can be used to enable framework
-> extension and  replaceable components.
-- [wikipedia][1]
+> extension and  replaceable components. - [wikipedia][1]
 
 
-##Why using a SPI in OpenWebBeans?
+## Why using a SPI in OpenWebBeans?
 First off, reading about [OpenWebBeans Core](openwebbeans-impl.html) will give you
 the overall idea about the usage of SPIs in our plugin system. 
 
diff --git a/content/owbsetup_ee.md b/content/owbsetup_ee.md
index b5756a7..834cbd2 100644
--- a/content/owbsetup_ee.md
+++ b/content/owbsetup_ee.md
@@ -77,13 +77,13 @@
   [1]: #required-parts
   [2]: #configuring-owb
   [3]: /download.html#apis-version
-  [4]: download.html#maven-dep
+  [4]: /download.html#maven-dep
   [5]: /download.html#required-version
   [6]: /download.html#required-version
   [7]: /download.html#plugins-version
   [8]: /download.html#plugins-version
   [9]: /download.html#plugins-version
   [10]: /download.html#plugins-version
-  [12]: /download.html#plugins-version
+  [11]: /download.html#plugins-version
   [13]: /download.html#plugins-version
   [14]: /samples.html
diff --git a/content/owbsetup_se.md b/content/owbsetup_se.md
index 1a45ad5..8a7c505 100644
--- a/content/owbsetup_se.md
+++ b/content/owbsetup_se.md
@@ -9,7 +9,7 @@
  3. Done! Congratulations.
 
 
-###Adding required jars to your project
+### Adding required jars to your project
 
 You can add OpenWebBeans to your project manually by adding jars or with Apache Maven. 
 How to download is explained here: [download page][1]. This is especially useful if you are not a maven user since the below links goes directly to the maven coordinates.
@@ -38,7 +38,7 @@
 After you have added the jars described above to your project accordingly 
 to the download page and added them to your projects classpath.
 
-###Bootstrapping OpenWebBeans
+### Bootstrapping OpenWebBeans
 
 For now we recommend two ways for booting up the OpenWebBeans container: 
 [**Deltaspike CdiCtrl**][4] or booting it yourself in i.e. a standard main method. 
@@ -58,7 +58,6 @@
 Going native and booting Apache OpenWebBeans yourself could however be useful if you need full control 
 to do advanced things. 
 
-    :::java
     import org.apache.deltaspike.cdise.api.CdiContainer;
     import org.apache.deltaspike.cdise.api.CdiContainerLoader;
     import org.apache.deltaspike.cdise.api.ContextControl;
@@ -86,4 +85,4 @@
   [3]: /download.html#apis-version
   [4]: https://deltaspike.apache.org/documentation.html#with-java-se
   [5]: https://deltaspike.apache.org/documentation.html#with-java-se
-  [6]: /openwebbeans/samples.html
+  [6]: /samples.html
diff --git a/theme/apache/templates/base.html b/theme/apache/templates/base.html
index e480ee3..79b3aab 100644
--- a/theme/apache/templates/base.html
+++ b/theme/apache/templates/base.html
@@ -36,6 +36,8 @@
 	{% include "styles.css" %}
     </style>
     <link href="/resources/css/main.css" rel="stylesheet">
+    <!-- highlighting -->
+    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/styles/idea.min.css">
 
 </head>
 
@@ -105,5 +107,6 @@
     <!-- Placed at the end of the document so the pages load faster -->
     <script src="/resources/js/jquery-2.1.4.min.js"></script>
     <script src="/resources/js/bootstrap.js"></script>
+    <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/highlight.min.js"></script>
 
 </body></html>