diff --git a/_config.yml b/_config.yml
index bf29dc68f..c9e771ef5 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,10 +1,11 @@
 ### Global gh-pages pre-amble
 safe: true
 lsi: false
-pygments: true
-markdown: redcarpet
-redcarpet:
-  extensions: ["no_intra_emphasis", "fenced_code_blocks", "autolink", "tables", "with_toc_data"]
+markdown: kramdown
+kramdown:
+  input: GFM
+  auto_ids: true
+  syntax_highlighter: rouge
 
 
 ### The following properties will change on a project-by-project basis
diff --git a/index.html b/index.html
index 65e33562a..7248b8255 100644
--- a/index.html
+++ b/index.html
@@ -48,7 +48,7 @@ high-level abstractions for interacting with the store, freeing the user from in
 
 ## Features
 
-* Connection package as low-level abstraction across multiple Redis drivers/connectors ([Jedis](https://github.com/xetorthio/jedis) and [Lettuce](https://github.com/mp911de/lettuce). Support for [JRedis](https://github.com/alphazero/jredis),[SRP](https://github.com/spullara/redis-protocol) is deprecated.)
+* Connection package as low-level abstraction across multiple Redis drivers/connectors ([Jedis](https://github.com/xetorthio/jedis) and [Lettuce](https://github.com/mp911de/lettuce). Support for [JRedis](https://github.com/alphazero/jredis) and [SRP](https://github.com/spullara/redis-protocol) is deprecated.)
 * [Exception translation](http://docs.spring.io/spring-data/data-redis/docs/current/reference/html/#redis:connectors) to Spring's portable Data Access exception hierarchy for Redis driver exceptions
 * [RedisTemplate](http://docs.spring.io/spring-data/data-redis/docs/current/reference/html/#redis:template) that provides a high level abstraction for performing various Redis operations, exception translation and serialization support
 * [Pubsub](http://docs.spring.io/spring-data/data-redis/docs/current/reference/html/#pubsub) support (such as a MessageListenerContainer for message-driven POJOs)
@@ -63,11 +63,12 @@ high-level abstractions for interacting with the store, freeing the user from in
 * CDI support for repositories
 
 <span id="quick-start"></span>
+
 ## Quick Start
 
 {% include download_widget.md %}
 
-####Configure RedisTemplate....
+#### Configure RedisTemplate....
 
 ````xml
 <bean id="jedisConnFactory" 
@@ -81,7 +82,7 @@ high-level abstractions for interacting with the store, freeing the user from in
 ````
 
 
-####Inject and use RedisTemplate or any of its opsForX() instances....
+#### Inject and use RedisTemplate or any of its opsForX() instances....
 
 ````java
 public class Example {
diff --git a/js/copySnippets.js b/js/copySnippets.js
index 934708ce0..365a6f52d 100644
--- a/js/copySnippets.js
+++ b/js/copySnippets.js
@@ -8,7 +8,7 @@ $(document).ready(function() {
 
 Spring.configureCopyButtons = function() {
     if (ZeroClipboard.detectFlashSupport()) {
-        $(".highlight > pre").each(function(index) {
+        $(".highlighter-rouge > pre").each(function(index) {
                 Spring.buildCopyButton($(this), index);
             }
         );