Fixed markup issues rendering with jekyll 3.1.3
diff --git a/_posts/2014/2014-11-05-wicket-6.18.0-released.md b/_posts/2014/2014-11-05-wicket-6.18.0-released.md
index 25e0378..ad91cd3 100644
--- a/_posts/2014/2014-11-05-wicket-6.18.0-released.md
+++ b/_posts/2014/2014-11-05-wicket-6.18.0-released.md
@@ -106,7 +106,7 @@
 * [WICKET-5710](https://issues.apache.org/jira/browse/WICKET-5710) - StringValidator should set 'minlength' attribute to input and textarea
 * [WICKET-5715](https://issues.apache.org/jira/browse/WICKET-5715) - Allow setting 'async' attribute on reference <script> elements
 * [WICKET-5718](https://issues.apache.org/jira/browse/WICKET-5718) - Upgrade Atmosphere to 2.2.2
-* [WICKET-5725](https://issues.apache.org/jira/browse/WICKET-5725) - Add NumberTextField(String,Class<T>) constructor
+* [WICKET-5725](https://issues.apache.org/jira/browse/WICKET-5725) - Add `NumberTextField(String,Class<T>)` constructor
 * [WICKET-5729](https://issues.apache.org/jira/browse/WICKET-5729) - Avoid using input names that conflict with JavaScript DOM API method and attribute names
 * [WICKET-5735](https://issues.apache.org/jira/browse/WICKET-5735) - Propagate fileSizeMax attribute to org.apache.commons.fileupload.FileUploadBase
 * [WICKET-5740](https://issues.apache.org/jira/browse/WICKET-5740) - Provide a way to adapt the lock timeout based on the page class/id
diff --git a/_posts/2014/2014-11-05-wicket-7.0.0-M4-released.md b/_posts/2014/2014-11-05-wicket-7.0.0-M4-released.md
index e4e525b..356420a 100644
--- a/_posts/2014/2014-11-05-wicket-7.0.0-M4-released.md
+++ b/_posts/2014/2014-11-05-wicket-7.0.0-M4-released.md
@@ -134,9 +134,9 @@
 * [WICKET-5708](https://issues.apache.org/jira/browse/WICKET-5708) - Making FormComponent.convertInput() public
 * [WICKET-5710](https://issues.apache.org/jira/browse/WICKET-5710) - StringValidator should set 'minlength' attribute to input and textarea
 * [WICKET-5713](https://issues.apache.org/jira/browse/WICKET-5713) - Move /wicket.properties to /META-INF/wicket/xyz.properties
-* [WICKET-5715](https://issues.apache.org/jira/browse/WICKET-5715) - Allow setting 'async' attribute on reference <script> elements
+* [WICKET-5715](https://issues.apache.org/jira/browse/WICKET-5715) - Allow setting 'async' attribute on reference ``<script>` elements
 * [WICKET-5718](https://issues.apache.org/jira/browse/WICKET-5718) - Upgrade Atmosphere to 2.2.2
-* [WICKET-5725](https://issues.apache.org/jira/browse/WICKET-5725) - Add NumberTextField(String,Class<T>) constructor
+* [WICKET-5725](https://issues.apache.org/jira/browse/WICKET-5725) - Add `NumberTextField(String,Class<T>)` constructor
 * [WICKET-5729](https://issues.apache.org/jira/browse/WICKET-5729) - Avoid using input names that conflict with JavaScript DOM API method and attribute names
 * [WICKET-5735](https://issues.apache.org/jira/browse/WICKET-5735) - Propagate fileSizeMax attribute to org.apache.commons.fileupload.FileUploadBase
 * [WICKET-5737](https://issues.apache.org/jira/browse/WICKET-5737) - Log a warning when WebSocketResponse#sendError() is used
diff --git a/_posts/2015/2015-06-14-wicket-6.20.0-released.md b/_posts/2015/2015-06-14-wicket-6.20.0-released.md
index a06b986..9725d6f 100644
--- a/_posts/2015/2015-06-14-wicket-6.20.0-released.md
+++ b/_posts/2015/2015-06-14-wicket-6.20.0-released.md
@@ -84,7 +84,7 @@
 
 #### Improvement
 
-* [WICKET-5754] - (String)ResourceModel's defaultValue could be an IModel<String>
+* [WICKET-5754] - (String)ResourceModel's defaultValue could be an `IModel<String>`
 * [WICKET-5823] - DefaultAuthenticationStrategy should be modified to reduce copy/paste while extending it's functionality
 * [WICKET-5832] - Do not fail at CDI's ConversationPropagator when running in non-http thread
 * [WICKET-5840] - WicketTester doesn't support #clickLink() for ExternalLink component
diff --git a/_posts/2015/2015-11-16-wicket-6.21.0-released.md b/_posts/2015/2015-11-16-wicket-6.21.0-released.md
index de95012..d380ea0 100644
--- a/_posts/2015/2015-11-16-wicket-6.21.0-released.md
+++ b/_posts/2015/2015-11-16-wicket-6.21.0-released.md
@@ -84,7 +84,7 @@
 * [WICKET-5955] - error from WebPage ## reportMissingHead
 * [WICKET-5974] - Change AjaxPagingNavigator##onAjaxEvent() to only consider parent components that have setOutputMarkupId(true)
 * [WICKET-5976] - Improve the documentation of FeedbackMessages first(int level)
-* [WICKET-5986] - NumberTextField<N> should use Models for minimum, maximum and step
+* [WICKET-5986] - `NumberTextField<N>` should use Models for minimum, maximum and step
 
 #### Task
 
diff --git a/_posts/2016/2016-03-02-cve-2015-7520.md b/_posts/2016/2016-03-02-cve-2015-7520.md
index d117dc4..e0afcbb 100644
--- a/_posts/2016/2016-03-02-cve-2015-7520.md
+++ b/_posts/2016/2016-03-02-cve-2015-7520.md
@@ -14,7 +14,7 @@
 Description:
 
 It is possible for JavaScript statements to break out of a RadioGroup's 
-and CheckBoxMultipleChoice's "value" attribute of &lt;input&gt; elements
+and CheckBoxMultipleChoice's "value" attribute of `<input>` elements
 
 This might pose a security threat if the written JavaScript contains user provided data.
 
diff --git a/content/atom.xml b/content/atom.xml
index 51ac905..0047005 100644
--- a/content/atom.xml
+++ b/content/atom.xml
@@ -3,7 +3,7 @@
     <title>Apache Wicket</title>
     <link href="http://wicket.apache.org/atom.xml" rel="self"/>
     <link href="http://wicket.apache.org/"/>
-    <updated>2016-03-02T15:59:59+01:00</updated>
+    <updated>2016-05-05T14:29:26+02:00</updated>
     <id>http://wicket.apache.org/</id>
     <author>
         <name>Apache Wicket</name>
@@ -243,8 +243,8 @@
 update any other dependencies on Wicket projects to the same version):&lt;/p&gt;
 
 &lt;dependency&gt;
-    &lt;groupid&gt;org.apache.wicket&lt;/groupid&gt;
-    &lt;artifactid&gt;wicket-core&lt;/artifactid&gt;
+    &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
+    &lt;artifactId&gt;wicket-core&lt;/artifactId&gt;
     &lt;version&gt;7.2.0&lt;/version&gt;
 &lt;/dependency&gt;
 
@@ -485,7 +485,7 @@
   &lt;li&gt;[WICKET-5955] - error from WebPage ## reportMissingHead&lt;/li&gt;
   &lt;li&gt;[WICKET-5974] - Change AjaxPagingNavigator##onAjaxEvent() to only consider parent components that have setOutputMarkupId(true)&lt;/li&gt;
   &lt;li&gt;[WICKET-5976] - Improve the documentation of FeedbackMessages first(int level)&lt;/li&gt;
-  &lt;li&gt;[WICKET-5986] - NumberTextField&lt;n&gt; should use Models for minimum, maximum and step&lt;/n&gt;&lt;/li&gt;
+  &lt;li&gt;[WICKET-5986] - &lt;code class=&quot;highlighter-rouge&quot;&gt;NumberTextField&amp;lt;N&amp;gt;&lt;/code&gt; should use Models for minimum, maximum and step&lt;/li&gt;
 &lt;/ul&gt;
 
 &lt;h4 id=&quot;task&quot;&gt;Task&lt;/h4&gt;
@@ -553,8 +553,8 @@
 update any other dependencies on Wicket projects to the same version):&lt;/p&gt;
 
 &lt;dependency&gt;
-    &lt;groupid&gt;org.apache.wicket&lt;/groupid&gt;
-    &lt;artifactid&gt;wicket-core&lt;/artifactid&gt;
+    &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
+    &lt;artifactId&gt;wicket-core&lt;/artifactId&gt;
     &lt;version&gt;7.1.0&lt;/version&gt;
 &lt;/dependency&gt;
 
diff --git a/content/news/2014/11/05/wicket-6.18.0-released.html b/content/news/2014/11/05/wicket-6.18.0-released.html
index 02b7719..b1a1359 100644
--- a/content/news/2014/11/05/wicket-6.18.0-released.html
+++ b/content/news/2014/11/05/wicket-6.18.0-released.html
@@ -133,7 +133,7 @@
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5710">WICKET-5710</a> - StringValidator should set ‘minlength’ attribute to input and textarea</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5715">WICKET-5715</a> - Allow setting ‘async’ attribute on reference <script> elements</script></li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5718">WICKET-5718</a> - Upgrade Atmosphere to 2.2.2</li>
-  <li><a href="https://issues.apache.org/jira/browse/WICKET-5725">WICKET-5725</a> - Add NumberTextField(String,Class<t>) constructor</t></li>
+  <li><a href="https://issues.apache.org/jira/browse/WICKET-5725">WICKET-5725</a> - Add <code class="highlighter-rouge">NumberTextField(String,Class&lt;T&gt;)</code> constructor</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5729">WICKET-5729</a> - Avoid using input names that conflict with JavaScript DOM API method and attribute names</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5735">WICKET-5735</a> - Propagate fileSizeMax attribute to org.apache.commons.fileupload.FileUploadBase</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5740">WICKET-5740</a> - Provide a way to adapt the lock timeout based on the page class/id</li>
diff --git a/content/news/2014/11/05/wicket-7.0.0-M4-released.html b/content/news/2014/11/05/wicket-7.0.0-M4-released.html
index 542b8fc..4b90d3b 100644
--- a/content/news/2014/11/05/wicket-7.0.0-M4-released.html
+++ b/content/news/2014/11/05/wicket-7.0.0-M4-released.html
@@ -154,9 +154,9 @@
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5708">WICKET-5708</a> - Making FormComponent.convertInput() public</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5710">WICKET-5710</a> - StringValidator should set ‘minlength’ attribute to input and textarea</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5713">WICKET-5713</a> - Move /wicket.properties to /META-INF/wicket/xyz.properties</li>
-  <li><a href="https://issues.apache.org/jira/browse/WICKET-5715">WICKET-5715</a> - Allow setting ‘async’ attribute on reference <script> elements</script></li>
+  <li><a href="https://issues.apache.org/jira/browse/WICKET-5715">WICKET-5715</a> - Allow setting ‘async’ attribute on reference ``<script>` elements</script></li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5718">WICKET-5718</a> - Upgrade Atmosphere to 2.2.2</li>
-  <li><a href="https://issues.apache.org/jira/browse/WICKET-5725">WICKET-5725</a> - Add NumberTextField(String,Class<t>) constructor</t></li>
+  <li><a href="https://issues.apache.org/jira/browse/WICKET-5725">WICKET-5725</a> - Add <code class="highlighter-rouge">NumberTextField(String,Class&lt;T&gt;)</code> constructor</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5729">WICKET-5729</a> - Avoid using input names that conflict with JavaScript DOM API method and attribute names</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5735">WICKET-5735</a> - Propagate fileSizeMax attribute to org.apache.commons.fileupload.FileUploadBase</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5737">WICKET-5737</a> - Log a warning when WebSocketResponse#sendError() is used</li>
diff --git a/content/news/2015/06/14/wicket-6.20.0-released.html b/content/news/2015/06/14/wicket-6.20.0-released.html
index e4dfbe1..20daa86 100644
--- a/content/news/2015/06/14/wicket-6.20.0-released.html
+++ b/content/news/2015/06/14/wicket-6.20.0-released.html
@@ -118,7 +118,7 @@
 </ul>
 <h4 id="improvement">Improvement</h4>
 <ul>
-  <li>[WICKET-5754] - (String)ResourceModel’s defaultValue could be an IModel<string></string></li>
+  <li>[WICKET-5754] - (String)ResourceModel’s defaultValue could be an <code class="highlighter-rouge">IModel&lt;String&gt;</code></li>
   <li>[WICKET-5823] - DefaultAuthenticationStrategy should be modified to reduce copy/paste while extending it’s functionality</li>
   <li>[WICKET-5832] - Do not fail at CDI’s ConversationPropagator when running in non-http thread</li>
   <li>[WICKET-5840] - WicketTester doesn’t support #clickLink() for ExternalLink component</li>
diff --git a/content/news/2015/10/25/wicket-7.1.0-released.html b/content/news/2015/10/25/wicket-7.1.0-released.html
index ed033f7..22f2c6f 100644
--- a/content/news/2015/10/25/wicket-7.1.0-released.html
+++ b/content/news/2015/10/25/wicket-7.1.0-released.html
@@ -74,8 +74,8 @@
 <p>With Apache Maven update your dependency to (and don’t forget to
 update any other dependencies on Wicket projects to the same version):</p>
 <dependency>
-    <groupid>org.apache.wicket</groupid>
-    <artifactid>wicket-core</artifactid>
+    <groupId>org.apache.wicket</groupId>
+    <artifactId>wicket-core</artifactId>
     <version>7.1.0</version>
 </dependency>
 <p>Or download and build the distribution yourself, or use our
diff --git a/content/news/2015/11/16/wicket-6.21.0-released.html b/content/news/2015/11/16/wicket-6.21.0-released.html
index 28a6e87..a87c37d 100644
--- a/content/news/2015/11/16/wicket-6.21.0-released.html
+++ b/content/news/2015/11/16/wicket-6.21.0-released.html
@@ -114,7 +114,7 @@
   <li>[WICKET-5955] - error from WebPage ## reportMissingHead</li>
   <li>[WICKET-5974] - Change AjaxPagingNavigator##onAjaxEvent() to only consider parent components that have setOutputMarkupId(true)</li>
   <li>[WICKET-5976] - Improve the documentation of FeedbackMessages first(int level)</li>
-  <li>[WICKET-5986] - NumberTextField<n> should use Models for minimum, maximum and step</n></li>
+  <li>[WICKET-5986] - <code class="highlighter-rouge">NumberTextField&lt;N&gt;</code> should use Models for minimum, maximum and step</li>
 </ul>
 <h4 id="task">Task</h4>
 <ul>
diff --git a/content/news/2016/01/20/wicket-7.2.0-released.html b/content/news/2016/01/20/wicket-7.2.0-released.html
index 596ab44..a526d7e 100644
--- a/content/news/2016/01/20/wicket-7.2.0-released.html
+++ b/content/news/2016/01/20/wicket-7.2.0-released.html
@@ -68,8 +68,8 @@
 <p>With Apache Maven update your dependency to (and don’t forget to
 update any other dependencies on Wicket projects to the same version):</p>
 <dependency>
-    <groupid>org.apache.wicket</groupid>
-    <artifactid>wicket-core</artifactid>
+    <groupId>org.apache.wicket</groupId>
+    <artifactId>wicket-core</artifactId>
     <version>7.2.0</version>
 </dependency>
 <p>Or download and build the distribution yourself, or use our
diff --git a/content/news/2016/03/02/cve-2015-7520.html b/content/news/2016/03/02/cve-2015-7520.html
index 5dfb908..07b043f 100644
--- a/content/news/2016/03/02/cve-2015-7520.html
+++ b/content/news/2016/03/02/cve-2015-7520.html
@@ -58,7 +58,7 @@
 Apache Wicket 1.5.x, 6.x and 7.x</p>
 <p>Description:</p>
 <p>It is possible for JavaScript statements to break out of a RadioGroup’s 
-and CheckBoxMultipleChoice’s “value” attribute of &lt;input&gt; elements</p>
+and CheckBoxMultipleChoice’s “value” attribute of <code class="highlighter-rouge">&lt;input&gt;</code> elements</p>
 <p>This might pose a security threat if the written JavaScript contains user provided data.</p>
 <h2 id="the-application-developers-are-recommended-to-upgrade-to">The application developers are recommended to upgrade to:</h2>
 <ul>
diff --git a/content/news/index.html b/content/news/index.html
index e659b14..f792cc4 100644
--- a/content/news/index.html
+++ b/content/news/index.html
@@ -72,7 +72,7 @@
   <article>
 	<h3 id="/news/2016/02/19/wicket-1.5.15-released.html">Wicket 1.5.15 released</h3>
     <small>19 Feb 2016</small>
-	<p>This is the fifteenth maintenance release of the Wicket 1.5.x series. This release brings over 2 bug fixes. CHANGELOG for 1.5.15: Bug [WICKET-6037] - ModalWindow vulnerable to Javascript injection through title model Escape the generated markup for attribute names and values in CheckBoxMultipleChoice and RadioChoice To use in Maven: &lt;dependency&gt;...
+	<p>This is the fifteenth maintenance release of the Wicket 1.5.x series. This release brings over 2 bug fixes. CHANGELOG for 1.5.15: Bug [WICKET-6037] - ModalWindow vulnerable to Javascript injection through title model Escape the generated markup for attribute names and values in CheckBoxMultipleChoice and RadioChoice To use in Maven: {%...
 	<a href="/news/2016/02/19/wicket-1.5.15-released.html">more</a></p>
 </article>
   <article>
@@ -135,12 +135,12 @@
   Git tag
   Changelog
   To use in Maven:
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
-    &lt;artifactId&gt;wicket-core&lt;/artifactId&gt;
-    &lt;version&gt;1.5.13&lt;/version&gt;
-&lt;/dependency&gt;
-  Download the full distribution (including sources)
+{% highlight xml %}
+    org.apache.wicket
+    wicket-core
+    1.5.13
+{% endhighlight %}
+* Download the full distribution (including sources)
 	<a href="/news/2015/02/13/wicket-1.5.13-released.html">more</a></p>
 </article>
     <article>
@@ -191,12 +191,12 @@
   Git tag
   Changelog
   To use in Maven:
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
-    &lt;artifactId&gt;wicket-core&lt;/artifactId&gt;
-    &lt;version&gt;1.5.12&lt;/version&gt;
-&lt;/dependency&gt;
-  Download the full distribution (including sources)
+{% highlight xml %}
+    org.apache.wicket
+    wicket-core
+    1.5.12
+{% endhighlight %}
+* Download the full distribution (including sources)
 	<a href="/news/2014/09/15/wicket-1.5.12-released.html">more</a></p>
 </article>
       <article>
@@ -254,12 +254,12 @@
   Git tag
   Changelog
   To use in Maven:
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
-    &lt;artifactId&gt;wicket-core&lt;/artifactId&gt;
-    &lt;version&gt;1.5.11&lt;/version&gt;
-&lt;/dependency&gt;
-  Download the full distribution (including source)
+{% highlight xml %}
+    org.apache.wicket
+    wicket-core
+    1.5.11
+{% endhighlight %}
+* Download the full distribution (including source)
 	<a href="/news/2014/02/06/wicket-1.5.11-released.html">more</a></p>
 </article>
       <article>
@@ -269,12 +269,12 @@
 Read CVE-2013-2055 for more information.
   Git tag
   To use in Maven:
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
-    &lt;artifactId&gt;wicket&lt;/artifactId&gt;
-    &lt;version&gt;1.4.23&lt;/version&gt;
-&lt;/dependency&gt;
-  Download the full distribution (including source)
+{% highlight xml %}
+    org.apache.wicket
+    wicket
+    1.4.23
+{% endhighlight %}
+* Download the full distribution (including source)
 	<a href="/news/2014/02/06/wicket-1.4.23-released.html">more</a></p>
 </article>
       <article>
@@ -349,12 +349,12 @@
   Git tag
   Changelog
   To use in Maven:
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
-    &lt;artifactId&gt;wicket-core&lt;/artifactId&gt;
-    &lt;version&gt;1.5.10&lt;/version&gt;
-&lt;/dependency&gt;
-  Download the full distribution (including source)
+{% highlight xml %}
+    org.apache.wicket
+    wicket-core
+    1.5.10
+{% endhighlight %}
+* Download the full distribution (including source)
 	<a href="/news/2013/02/26/wicket-1.5.10-released.html">more</a></p>
 </article>
         <article>
@@ -393,12 +393,12 @@
   Git tag
   Changelog
   To use in Maven:
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
-    &lt;artifactId&gt;wicket-core&lt;/artifactId&gt;
-    &lt;version&gt;1.5.9&lt;/version&gt;
-&lt;/dependency&gt;
-  Download the full distribution (including source)
+{% highlight xml %}
+    org.apache.wicket
+    wicket-core
+    1.5.9
+{% endhighlight %}
+* Download the full distribution (including source)
 	<a href="/news/2012/11/09/wicket-1.5.9-released.html">more</a></p>
 </article>
           <article>
@@ -434,7 +434,7 @@
           <article>
 	<h3 id="/news/2012/09/05/wicket-1.4.21-released.html">Wicket 1.4.21 released</h3>
     <small>05 Sep 2012</small>
-	<p>This is 21st release of the Wicket 1.4.x series. This is also the last release of the 1.4.x series, rounding up the remaining bugfixes. No further releases will happen in this branch. Git tag Changelog To use in Maven: &lt;dependency&gt; &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt; &lt;artifactId&gt;wicket&lt;/artifactId&gt; &lt;version&gt;1.4.21&lt;/version&gt; &lt;/dependency&gt; Download the full distribution (including source)...
+	<p>This is 21st release of the Wicket 1.4.x series. This is also the last release of the 1.4.x series, rounding up the remaining bugfixes. No further releases will happen in this branch. Git tag Changelog To use in Maven: {% highlight xml %} org.apache.wicket wicket 1.4.21 {% endhighlight %} *...
 	<a href="/news/2012/09/05/wicket-1.4.21-released.html">more</a></p>
 </article>
           <article>
@@ -444,12 +444,12 @@
   Git tag
   Changelog
   To use in Maven:
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
-    &lt;artifactId&gt;wicket-core&lt;/artifactId&gt;
-    &lt;version&gt;1.5.8&lt;/version&gt;
-&lt;/dependency&gt;
-  Download the full distribution (including source)
+{% highlight xml %}
+    org.apache.wicket
+    wicket-core
+    1.5.8
+{% endhighlight %}
+* Download the full distribution (including source)
 	<a href="/news/2012/08/24/wicket-1.5.8-released.html">more</a></p>
 </article>
           <article>
@@ -471,12 +471,12 @@
   Git tag
   Changelog
   To use in Maven:
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
-    &lt;artifactId&gt;wicket-core&lt;/artifactId&gt;
-    &lt;version&gt;1.5.7&lt;/version&gt;
-&lt;/dependency&gt;
-  Download the full distribution (including source)
+{% highlight xml %}
+    org.apache.wicket
+    wicket-core
+    1.5.7
+{% endhighlight %}
+* Download the full distribution (including source)
 	<a href="/news/2012/06/04/wicket-1.5.7-released.html">more</a></p>
 </article>
           <article>
@@ -492,12 +492,12 @@
   Git tag
   Changelog
   To use in Maven:
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
-    &lt;artifactId&gt;wicket-core&lt;/artifactId&gt;
-    &lt;version&gt;1.5.6&lt;/version&gt;
-&lt;/dependency&gt;
-  Download the full distribution (including source)
+{% highlight xml %}
+    org.apache.wicket
+    wicket-core
+    1.5.6
+{% endhighlight %}
+* Download the full distribution (including source)
 	<a href="/news/2012/05/07/wicket-1.5.6-released.html">more</a></p>
 </article>
           <article>
@@ -525,12 +525,12 @@
   Git tag
   Changelog
   To use in Maven:
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
-    &lt;artifactId&gt;wicket-core&lt;/artifactId&gt;
-    &lt;version&gt;1.5.5&lt;/version&gt;
-&lt;/dependency&gt;
-  Download the full distribution (including source)
+{% highlight xml %}
+    org.apache.wicket
+    wicket-core
+    1.5.5
+{% endhighlight %}
+* Download the full distribution (including source)
 	<a href="/news/2012/03/12/wicket-1.5.5-released.html">more</a></p>
 </article>
           <article>
@@ -540,12 +540,12 @@
   Subversion tag
   Changelog
   To use in Maven:
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
-    &lt;artifactId&gt;wicket&lt;/artifactId&gt;
-    &lt;version&gt;1.4.20&lt;/version&gt;
-&lt;/dependency&gt;
-  Download the full distribution (including source)
+{% highlight xml %}
+    org.apache.wicket
+    wicket
+    1.4.20
+{% endhighlight %}
+* Download the full distribution (including source)
 	<a href="/news/2012/03/12/wicket-1.4.20-released.html">more</a></p>
 </article>
           <article>
@@ -555,12 +555,12 @@
   Git tag
   Changelog
   To use in Maven:
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
-    &lt;artifactId&gt;wicket-core&lt;/artifactId&gt;
-    &lt;version&gt;1.5.4&lt;/version&gt;
-&lt;/dependency&gt;
-  Download the full distribution (including source)
+{% highlight xml %}
+    org.apache.wicket
+    wicket-core
+    1.5.4
+{% endhighlight %}
+* Download the full distribution (including source)
 	<a href="/news/2012/01/23/wicket-1.5.4-released.html">more</a></p>
 </article>
           <div class="l-first"></div>
@@ -575,12 +575,12 @@
   Subversion tag
   Changelog
   To use in Maven:
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
-    &lt;artifactId&gt;wicket-core&lt;/artifactId&gt;
-    &lt;version&gt;1.5.3&lt;/version&gt;
-&lt;/dependency&gt;
-  Download the full distribution (including source)
+{% highlight xml %}
+    org.apache.wicket
+    wicket-core
+    1.5.3
+{% endhighlight %}
+* Download the full distribution (including source)
 	<a href="/news/2011/11/14/wicket-1.5.3-released.html">more</a></p>
 </article>
             <article>
@@ -589,13 +589,13 @@
 	<p>This is the second maintenance release of the Wicket 1.5.x series. This release brings over 25 bug fixes and 5 improvements.
   Subversion tag
   Changelog
-  To use in Maven:
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
-    &lt;artifactId&gt;wicket-core&lt;/artifactId&gt;
-    &lt;version&gt;1.5.2&lt;/version&gt;
-&lt;/dependency&gt;
-  Download the full distribution (including source)
+  To use in Maven: 
+{% highlight xml %}
+    org.apache.wicket
+    wicket-core
+    1.5.2
+{% endhighlight %}
+* Download the full distribution (including source)
 	<a href="/news/2011/10/24/wicket-1.5.2-released.html">more</a></p>
 </article>
             <article>
@@ -604,13 +604,13 @@
 	<p>This is nineteenth release of the Wicket 1.4.x series. This is primarily a minor bugfix release on the 1.4.x (stable) branch.
   Subversion tag
   Changelog
-  To use in Maven:
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
-    &lt;artifactId&gt;wicket&lt;/artifactId&gt;
-    &lt;version&gt;1.4.19&lt;/version&gt;
-&lt;/dependency&gt;
-  Download the full distribution (including source)
+  To use in Maven: 
+{% highlight xml %}
+    org.apache.wicket
+    wicket
+    1.4.19
+{% endhighlight %}
+* Download the full distribution (including source)
 	<a href="/news/2011/10/17/wicket-1.4.19-released.html">more</a></p>
 </article>
             <article>
@@ -619,13 +619,13 @@
 	<p>This is the first maintenance release of the Wicket 1.5.x series. This release brings over 40 bug fixes and 15 improvements.
   Subversion tag
   Changelog
-  To use in Maven:
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
-    &lt;artifactId&gt;wicket-core&lt;/artifactId&gt;
-    &lt;version&gt;1.5.1&lt;/version&gt;
-&lt;/dependency&gt;
-  Download the full distribution (including source)
+  To use in Maven: 
+{% highlight xml %}
+    org.apache.wicket
+    wicket-core
+    1.5.1
+{% endhighlight %}
+* Download the full distribution (including source)
 	<a href="/news/2011/09/29/wicket-1.5.1-released.html">more</a></p>
 </article>
             <article>
@@ -652,13 +652,13 @@
 	<p>This is eightteenth release of the Wicket 1.4.x series. This is primarily a minor bugfix release on the 1.4.x (stable) branch.
   Subversion tag
   Changelog
-  To use in Maven:
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
-    &lt;artifactId&gt;wicket&lt;/artifactId&gt;
-    &lt;version&gt;1.4.18&lt;/version&gt;
-&lt;/dependency&gt;
-  Download the full distribution (including source)
+  To use in Maven: 
+{% highlight xml %}
+    org.apache.wicket
+    wicket
+    1.4.18
+{% endhighlight %}
+* Download the full distribution (including source)
 	<a href="/news/2011/08/09/wicket-1.4.18-released.html">more</a></p>
 </article>
             <article>
@@ -695,13 +695,13 @@
 	<p>This is seventeenth release of the Wicket 1.4.x series. This is primarily a minor bugfix release on the 1.4.x (stable) branch.
   Subversion tag
   Changelog
-  To use in Maven:
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
-    &lt;artifactId&gt;wicket&lt;/artifactId&gt;
-    &lt;version&gt;1.4.17&lt;/version&gt;
-&lt;/dependency&gt;
-  Download the full distribution (including source)
+  To use in Maven: 
+{% highlight xml %}
+    org.apache.wicket
+    wicket
+    1.4.17
+{% endhighlight %}
+* Download the full distribution (including source)
 	<a href="/news/2011/04/02/wicket-1.4.17-released.html">more</a></p>
 </article>
             <article>
@@ -722,13 +722,13 @@
 	<p>This is sixteenth release of the Wicket 1.4.x series. This is primarily a minor bugfix release on the 1.4.x (stable) branch.
   Subversion tag
   Changelog
-  To use in Maven:
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
-    &lt;artifactId&gt;wicket&lt;/artifactId&gt;
-    &lt;version&gt;1.4.16&lt;/version&gt;
-&lt;/dependency&gt;
-  Download the full distribution (including source)
+  To use in Maven: 
+{% highlight xml %}
+    org.apache.wicket
+    wicket
+    1.4.16
+{% endhighlight %}
+* Download the full distribution (including source)
 	<a href="/news/2011/02/25/wicket-1.4.16-released.html">more</a></p>
 </article>
             <article>
@@ -748,13 +748,13 @@
 	<p>This is fifteenth release of the Wicket 1.4.x series. This is primarily a minor bugfix release on the 1.4.x (stable) branch.
   Subversion tag
   Changelog
-  To use in Maven:
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
-    &lt;artifactId&gt;wicket&lt;/artifactId&gt;
-    &lt;version&gt;1.4.15&lt;/version&gt;
-&lt;/dependency&gt;
-  Download the full distribution (including source)
+  To use in Maven: 
+{% highlight xml %}
+    org.apache.wicket
+    wicket
+    1.4.15
+{% endhighlight %}
+* Download the full distribution (including source)
 	<a href="/news/2010/12/24/wicket-1.4.15-released.html">more</a></p>
 </article>
               <article>
@@ -763,13 +763,13 @@
 	<p>This is fourteenth release of the Wicket 1.4.x series. This is primarily a minor bugfix release on the 1.4.x (stable) branch.
   Subversion tag
   Changelog
-  To use in Maven:
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
-    &lt;artifactId&gt;wicket&lt;/artifactId&gt;
-    &lt;version&gt;1.4.14&lt;/version&gt;
-&lt;/dependency&gt;
-  Download the full distribution (including source)
+  To use in Maven: 
+{% highlight xml %}
+    org.apache.wicket
+    wicket
+    1.4.14
+{% endhighlight %}
+* Download the full distribution (including source)
 	<a href="/news/2010/11/29/wicket-1.4.14-released.html">more</a></p>
 </article>
               <article>
@@ -784,13 +784,13 @@
 	<p>This is another milestone release from trunk (in-development branch).  This release includes several enhancments and fixes, which can be seen in the changelog (linked below).
   Subversion tag
   Changelog
-  To use in Maven:
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
-    &lt;artifactId&gt;wicket&lt;/artifactId&gt;
-    &lt;version&gt;1.5-M3&lt;/version&gt;
-&lt;/dependency&gt;
-  Download the full distribution (including source)
+  To use in Maven: 
+{% highlight xml %}
+    org.apache.wicket
+    wicket
+    1.5-M3
+{% endhighlight %}
+* Download the full distribution (including source)
 	<a href="/news/2010/11/05/wicket-1.5-M3-released.html">more</a></p>
 </article>
               <article>
@@ -799,13 +799,13 @@
 	<p>This is thirteenth release of the Wicket 1.4.x series. This is primarily a minor bugfix release on the 1.4.x (stable) branch.
   Subversion tag
   Changelog
-  To use in Maven:
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
-    &lt;artifactId&gt;wicket&lt;/artifactId&gt;
-    &lt;version&gt;1.4.13&lt;/version&gt;
-&lt;/dependency&gt;
-  Download the full distribution (including source)
+  To use in Maven: 
+{% highlight xml %}
+    org.apache.wicket
+    wicket
+    1.4.13
+{% endhighlight %}
+* Download the full distribution (including source)
 	<a href="/news/2010/11/01/wicket-1.4.13-released.html">more</a></p>
 </article>
               <article>
@@ -817,16 +817,7 @@
               <article>
 	<h3 id="/news/2010/09/17/wicket.1.4.12-released.html">Wicket 1.4.12 released</h3>
     <small>17 Sep 2010</small>
-	<p>This is the twelfth maintenance release of the 1.4.x series. This release brings a fix to a critical bug which prevented ajax form submits in FireFox.
-  Subversion tag
-  Changelog
-  To use in Maven:
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
-    &lt;artifactId&gt;wicket&lt;/artifactId&gt;
-    &lt;version&gt;1.4.12&lt;/version&gt;
-&lt;/dependency&gt;
-  Download the full distribution (including source)
+	<p>This is the twelfth maintenance release of the 1.4.x series. This release brings a fix to a critical bug which prevented ajax form submits in FireFox. Subversion tag Changelog To use in Maven: {% highlight xml %} org.apache.wicket wicket 1.4.12 {% endhighlight %} * Download the full distribution (including source)...
 	<a href="/news/2010/09/17/wicket.1.4.12-released.html">more</a></p>
 </article>
               <article>
@@ -836,13 +827,13 @@
 fifty bug fixes and improvements.
   Subversion tag
   Changelog
-  To use in Maven:
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
-    &lt;artifactId&gt;wicket&lt;/artifactId&gt;
-    &lt;version&gt;1.4.11&lt;/version&gt;
-&lt;/dependency&gt;
-  Download the full distribution (including source)
+  To use in Maven: 
+{% highlight xml %}
+    org.apache.wicket
+    wicket
+    1.4.11
+{% endhighlight %}
+* Download the full distribution (including source)
 	<a href="/news/2010/09/09/wicket-1.4.11-released.html">more</a></p>
 </article>
               <article>
@@ -872,7 +863,7 @@
               <article>
 	<h3 id="/news/2010/05/24/wicket-1.4.9-released.html">Wicket 1.4.9 released</h3>
     <small>24 May 2010</small>
-	<p>This is the ninth maintenance release of the 1.4.x series and brings over fifteen bug fixes and improvements. Subversion tag Changelog To use in Maven: &lt;dependency&gt; &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt; &lt;artifactId&gt;wicket&lt;/artifactId&gt; &lt;version&gt;1.4.9&lt;/version&gt; &lt;/dependency&gt; Download the full distribution (including source) It is worth noting that WICKET-2846 will be reverted in the next release because...
+	<p>This is the ninth maintenance release of the 1.4.x series and brings over fifteen bug fixes and improvements. Subversion tag Changelog To use in Maven: {% highlight xml %} org.apache.wicket wicket 1.4.9 {% endhighlight %} * Download the full distribution (including source) It is worth noting that WICKET-2846 will be...
 	<a href="/news/2010/05/24/wicket-1.4.9-released.html">more</a></p>
 </article>
               <article>
@@ -883,19 +874,19 @@
 20 bug fixes and improvements.
   SVN tag
   Using Maven:
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
-    &lt;artifactId&gt;wicket&lt;/artifactId&gt;
-    &lt;version&gt;1.4.8&lt;/version&gt;
-&lt;/dependency&gt;
-  Download
-  Change log
+{% highlight xml %}
+    org.apache.wicket
+    wicket
+    1.4.8
+{% endhighlight %}
+* Download
+* Change log
 	<a href="/news/2010/05/03/wicket-1.4.8-released.html">more</a></p>
 </article>
               <article>
 	<h3 id="/news/2010/03/05/wicket-1.4.7-released.html">Wicket 1.4.7 released</h3>
     <small>05 Mar 2010</small>
-	<p>The Apache Wicket project is proud to announce the seventh maintenance release of Apache Wicket 1.4. This releases brings over 30 improvements and bug fixes. Download Apache Wicket 1.4.7 You can download the release here: http://www.apache.org/dyn/closer.cgi/wicket/1.4.7 Or use this in your Maven pom’s to upgrade to the new version: &lt;dependency&gt;...
+	<p>The Apache Wicket project is proud to announce the seventh maintenance release of Apache Wicket 1.4. This releases brings over 30 improvements and bug fixes. Download Apache Wicket 1.4.7 You can download the release here: http://www.apache.org/dyn/closer.cgi/wicket/1.4.7 Or use this in your Maven pom’s to upgrade to the new version: {%...
 	<a href="/news/2010/03/05/wicket-1.4.7-released.html">more</a></p>
 </article>
               <article>
@@ -918,25 +909,25 @@
                 <article>
 	<h3 id="/news/2009/12/13/wicket-1.4.4-released.html">Wicket 1.4.4 released</h3>
     <small>13 Dec 2009</small>
-	<p>The Apache Wicket project is proud to announce the fourth maintenance release of Apache Wicket 1.4. Download Apache Wicket 1.4.4 You can download the release here: http://www.apache.org/dyn/closer.cgi/wicket/1.4.4 Or use this in your Maven pom’s to upgrade to the new version: &lt;dependency&gt; &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt; &lt;artifactId&gt;wicket&lt;/artifactId&gt; &lt;version&gt;1.4.4&lt;/version&gt; &lt;/dependency&gt; Changes A complete list of...
+	<p>The Apache Wicket project is proud to announce the fourth maintenance release of Apache Wicket 1.4. Download Apache Wicket 1.4.4 You can download the release here: http://www.apache.org/dyn/closer.cgi/wicket/1.4.4 Or use this in your Maven pom’s to upgrade to the new version: {% highlight xml %} org.apache.wicket wicket 1.4.4 {% endhighlight %}...
 	<a href="/news/2009/12/13/wicket-1.4.4-released.html">more</a></p>
 </article>
                 <article>
 	<h3 id="/news/2009/10/24/wicket-1.4.3-released.html">Wicket 1.4.3 released</h3>
     <small>24 Oct 2009</small>
-	<p>The Apache Wicket project is proud to announce the third maintenance release of Apache Wicket 1.4. Download Apache Wicket 1.4.3 You can download the release here: http://www.apache.org/dyn/closer.cgi/wicket/1.4.3 Or use this in your Maven pom’s to upgrade to the new version: &lt;dependency&gt; &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt; &lt;artifactId&gt;wicket&lt;/artifactId&gt; &lt;version&gt;1.4.3&lt;/version&gt; &lt;/dependency&gt; Changes A complete list of...
+	<p>The Apache Wicket project is proud to announce the third maintenance release of Apache Wicket 1.4. Download Apache Wicket 1.4.3 You can download the release here: http://www.apache.org/dyn/closer.cgi/wicket/1.4.3 Or use this in your Maven pom’s to upgrade to the new version: {% highlight xml %} org.apache.wicket wicket 1.4.3 {% endhighlight %}...
 	<a href="/news/2009/10/24/wicket-1.4.3-released.html">more</a></p>
 </article>
                 <article>
 	<h3 id="/news/2009/10/12/wicket-1.4.2-released.html">Wicket 1.4.2 released</h3>
     <small>12 Oct 2009</small>
-	<p>The Apache Wicket project is proud to announce the second maintenance release of Apache Wicket 1.4. Download Apache Wicket 1.4.2 You can download the release here: http://www.apache.org/dyn/closer.cgi/wicket/1.4.2 Or use this in your Maven pom’s to upgrade to the new version: &lt;dependency&gt; &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt; &lt;artifactId&gt;wicket&lt;/artifactId&gt; &lt;version&gt;1.4.2&lt;/version&gt; &lt;/dependency&gt; Changes A complete list of...
+	<p>The Apache Wicket project is proud to announce the second maintenance release of Apache Wicket 1.4. Download Apache Wicket 1.4.2 You can download the release here: http://www.apache.org/dyn/closer.cgi/wicket/1.4.2 Or use this in your Maven pom’s to upgrade to the new version: {% highlight xml %} org.apache.wicket wicket 1.4.2 {% endhighlight %}...
 	<a href="/news/2009/10/12/wicket-1.4.2-released.html">more</a></p>
 </article>
                 <article>
 	<h3 id="/news/2009/08/21/wicket-1.4.1-released.html">Wicket 1.4.1 released</h3>
     <small>21 Aug 2009</small>
-	<p>The Apache Wicket project is proud to announce the first maintenance release of Apache Wicket 1.4. Download Apache Wicket 1.4 You can download the release here: http://www.apache.org/dyn/closer.cgi/wicket/1.4.1 Or use this in your Maven pom’s to upgrade to the new version: &lt;dependency&gt; &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt; &lt;artifactId&gt;wicket&lt;/artifactId&gt; &lt;version&gt;1.4.1&lt;/version&gt; &lt;/dependency&gt; Changes The most notable change...
+	<p>The Apache Wicket project is proud to announce the first maintenance release of Apache Wicket 1.4. Download Apache Wicket 1.4 You can download the release here: http://www.apache.org/dyn/closer.cgi/wicket/1.4.1 Or use this in your Maven pom’s to upgrade to the new version: {% highlight xml %} org.apache.wicket wicket 1.4.1 {% endhighlight %}...
 	<a href="/news/2009/08/21/wicket-1.4.1-released.html">more</a></p>
 </article>
                 <article>
diff --git a/news/index.md b/news/index.md
index c91f679..1614581 100644
--- a/news/index.md
+++ b/news/index.md
@@ -17,7 +17,7 @@
 	<h3 id="{{ site.baseurl }}{{post.url}}">{{post.title}}</h3>
     <small>{{post.date | date_to_string}}</small>
 	<p>{{ post.content | markdownify | strip_html | truncatewords:50 }}
-	<a href="{{ site.baseurl }}{{post.url}}">more</a></li></p>
+	<a href="{{ site.baseurl }}{{post.url}}">more</a></p>
 </article>
     {% endfor %}
 {% endfor %}