diff --git a/_config.yml b/_config.yml
index f265c9e..b87b574 100644
--- a/_config.yml
+++ b/_config.yml
@@ -45,15 +45,8 @@ permalink:              /:title/
 # --------------------
 markdown:               redcarpet
 
-kramdown:
-    input: GFM
-    extensions:
-        - autolink
-        - footnotes
-        - smart
-
 redcarpet:
-    extensions:         ['autolink', 'smart', 'hard_wrap', 'with_toc_data']
+    extensions:         ['no_intra_emphasis', 'autolink', 'tables', 'smart', 'hard_wrap', 'fenced_code_blocks', 'strikethrough', 'highlight', 'quote', 'footnotes', 'with_toc_data', 'space_after_headers', 'superscript', 'lax_spacing']
 
 
 # Generator
diff --git a/_src/_assets/styles/bigchain/_code.scss b/_src/_assets/styles/bigchain/_code.scss
index 9d8f8c9..ee1b825 100644
--- a/_src/_assets/styles/bigchain/_code.scss
+++ b/_src/_assets/styles/bigchain/_code.scss
@@ -9,6 +9,7 @@ pre,
 samp {
     font-family: $font-family-monospace;
     font-size: .75rem;
+    hyphens: none;
 }
 
 // Inline code
@@ -46,19 +47,22 @@ pre {
     background-color: $pre-bg;
     border-radius: $border-radius;
 
+    // make 'em scrollable
+    overflow: scroll;
+    -webkit-overflow-scrolling: touch;
+    max-height: $pre-scrollable-max-height;
+
     // Account for some code outputs that place code tags in pre tags
     code {
         padding: 0;
         font-size: inherit;
         color: inherit;
-        white-space: pre-wrap;
+        white-space: pre;
+        overflow-wrap: normal;
+        word-wrap: normal;
+        word-break: normal;
+        overflow: auto;
         background-color: transparent;
         border-radius: 0;
     }
 }
-
-// Enable scrollable blocks of code
-.pre-scrollable {
-    max-height: $pre-scrollable-max-height;
-    overflow-y: scroll;
-}
diff --git a/_src/styleguide.md b/_src/styleguide.md
index 84060bd..ff8a3b2 100644
--- a/_src/styleguide.md
+++ b/_src/styleguide.md
@@ -248,11 +248,23 @@ Logo can be used with a base class and modifier classes for size & color:
 <div class="alert alert-danger"><strong class="alert__title">Lucas ipsum</strong> Lucas ipsum dolor sit amet kenobi ubese yaka weequay aka trioculus</div>
 
 ```html
-<div class="alert alert-success"><strong class="alert__title">Lucas ipsum</strong>Lucas ipsum dolor sit amet kenobi ubese yaka weequay aka trioculus</div>
+<div class="alert alert-success">
+    <strong class="alert__title">Lucas ipsum</strong>
+    Lucas ipsum dolor sit amet kenobi ubese yaka weequay aka trioculus
+</div>
 
-<div class="alert alert-info"><strong class="alert__title">Lucas ipsum</strong>Lucas ipsum dolor sit amet kenobi ubese yaka weequay aka trioculus</div>
+<div class="alert alert-info">
+    <strong class="alert__title">Lucas ipsum</strong>
+    Lucas ipsum dolor sit amet kenobi ubese yaka weequay aka trioculus
+</div>
 
-<div class="alert alert-warning"><strong class="alert__title">Lucas ipsum</strong>Lucas ipsum dolor sit amet kenobi ubese yaka weequay aka trioculus</div>
+<div class="alert alert-warning">
+    <strong class="alert__title">Lucas ipsum</strong>
+    Lucas ipsum dolor sit amet kenobi ubese yaka weequay aka trioculus
+</div>
 
-<div class="alert alert-danger"><strong class="alert__title">Lucas ipsum</strong>Lucas ipsum dolor sit amet kenobi ubese yaka weequay aka trioculus</div>
+<div class="alert alert-danger">
+    <strong class="alert__title">Lucas ipsum</strong>
+    Lucas ipsum dolor sit amet kenobi ubese yaka weequay aka trioculus
+</div>
 ```