diff --git a/_config.yml b/_config.yml
index a1dac583..1f242ab4 100644
--- a/_config.yml
+++ b/_config.yml
@@ -67,6 +67,10 @@ permalink: /:categories/:title/
 
 markdown: kramdown
 highlighter: rouge
+kramdown:
+  input: GFM
+  syntax_highlighter: rouge
+
 paginate: 10
 paginate_path: "/:num/"
 
diff --git a/_sass/_highlights.scss b/_sass/_highlights.scss
index 1650aaec..e606da49 100644
--- a/_sass/_highlights.scss
+++ b/_sass/_highlights.scss
@@ -1,10 +1,12 @@
+
 .highlighter-rouge {
   max-width: none !important;
   background-color: #F9F9F9;
-  border-top: 1px solid #ccc;
-  border-bottom: 1px solid #ccc;
   margin: 20px auto !important;
-  padding: 20px 0;
+  
+  .highlight {
+    padding: 20px 0;
+  }
 
   @media (max-width: 900px) {
     margin: 0 10px;
@@ -12,6 +14,11 @@
   }
 }
 
+div.highlighter-rouge {
+    border-top: 1px solid #ccc;
+    border-bottom: 1px solid #ccc;
+  }
+
 .highlight {
     overflow: scroll;
     line-height: 1.2;