diff --git a/lib/gollum/frontend/public/gollum/livepreview/css/highlightjs/github.css b/lib/gollum/frontend/public/gollum/livepreview/css/highlightjs/github.css
index c9ac50e0..ea7cde82 100644
--- a/lib/gollum/frontend/public/gollum/livepreview/css/highlightjs/github.css
+++ b/lib/gollum/frontend/public/gollum/livepreview/css/highlightjs/github.css
@@ -4,126 +4,120 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
 
 */
 
-code {
-  display: block; padding: 0.5em;
-  color: #000;
-  background: #f8f8ff
-}
-
-code .comment,
-code .template_comment,
-code .diff .header,
-code .javadoc {
+pre .comment,
+pre .template_comment,
+pre .diff .header,
+pre .javadoc {
   color: #998;
   font-style: italic
 }
 
-code .keyword,
-code .css .rule .keyword,
-code .winutils,
-code .javascript .title,
-code .lisp .title,
-code .subst {
+pre .keyword,
+pre .css .rule .keyword,
+pre .winutils,
+pre .javascript .title,
+pre .lisp .title,
+pre .subst {
   color: #000;
   font-weight: bold
 }
 
-code .number,
-code .hexcolor {
+pre .number,
+pre .hexcolor {
   color: #40a070
 }
 
-code .string,
-code .tag .value,
-code .phpdoc,
-code .tex .formula {
+pre .string,
+pre .tag .value,
+pre .phpdoc,
+pre .tex .formula {
   color: #d14
 }
 
-code .title,
-code .id {
+pre .title,
+pre .id {
   color: #900;
   font-weight: bold
 }
 
-code .javascript .title,
-code .lisp .title,
-code .subst {
+pre .javascript .title,
+pre .lisp .title,
+pre .subst {
   font-weight: normal
 }
 
-code .class .title,
-code .haskell .label,
-code .tex .command {
+pre .class .title,
+pre .haskell .label,
+pre .tex .command {
   color: #458;
   font-weight: bold
 }
 
-code .tag,
-code .tag .title,
-code .rules .property,
-code .django .tag .keyword {
+pre .tag,
+pre .tag .title,
+pre .rules .property,
+pre .django .tag .keyword {
   color: #000080;
   font-weight: normal
 }
 
-code .attribute,
-code .variable,
-code .instancevar,
-code .lisp .body {
+pre .attribute,
+pre .variable,
+pre .instancevar,
+pre .lisp .body {
   color: #008080
 }
 
-code .regexp {
+pre .regexp {
   color: #009926
 }
 
-code .class {
+pre .class {
   color: #458;
   font-weight: bold
 }
 
-code .symbol,
-code .ruby .symbol .string,
-code .ruby .symbol .keyword,
-code .ruby .symbol .keymethods,
-code .lisp .keyword,
-code .tex .special,
-code .input_number {
+pre .symbol,
+pre .ruby .symbol .string,
+pre .ruby .symbol .keyword,
+pre .ruby .symbol .keymethods,
+pre .lisp .keyword,
+pre .tex .special,
+pre .input_number {
   color: #990073
 }
 
-code .builtin,
-code .built_in,
-code .lisp .title {
+pre .builtin,
+pre .built_in,
+pre .lisp .title {
   color: #0086b3
 }
 
-code .preprocessor,
-code .pi,
-code .doctype,
-code .shebang,
-code .cdata {
+pre .preprocessor,
+pre .pi,
+pre .doctype,
+pre .shebang,
+pre .cdata {
   color: #999;
   font-weight: bold
 }
 
-code .deletion {
+pre .deletion {
   background: #fdd
 }
 
-code .addition {
+pre .addition {
   background: #dfd
 }
 
-code .diff .change {
+pre .diff .change {
   background: #0086b3
 }
 
-code .chunk {
+pre .chunk {
   color: #aaa
 }
 
-code .tex .formula {
+pre .tex .formula {
   opacity: 0.5;
 }
diff --git a/lib/gollum/frontend/public/gollum/livepreview/index.html b/lib/gollum/frontend/public/gollum/livepreview/index.html
index 54e37181..756a87b4 100644
--- a/lib/gollum/frontend/public/gollum/livepreview/index.html
+++ b/lib/gollum/frontend/public/gollum/livepreview/index.html
@@ -207,22 +207,27 @@ var makePreviewHtml = function () {
   previewSet(text);
 
   // highlight code blocks.
-  var codeElements = preview.getElementsByTagName("code");
+  var codeElements = preview.getElementsByTagName("pre");
   var codeElementsLength = codeElements.length;
 
   if (codeElementsLength > 0) {
     for (var idx = 0; idx < codeElementsLength; idx++) {
       var element = codeElements[idx];
       var codeHTML = element.innerHTML;
-      var txt = element.innerHTML.split(/\b/);
-      // the syntax for code highlighting means all code, even one line, contains newlines.
-      if (txt.length > 0 && codeHTML.match(/\n/)) {
-        if ($.inArray(txt[0], languages) === -1) {
-          continue;
-        }
 
-        element.className = txt[0] + " highlight";
-        element.innerHTML = codeHTML.substring(txt[0].length);
+       // Only use pre tags marked containing code.
+      if (codeHTML[0] !== "`")
+       continue;
+
+      var txt = codeHTML.split(/\b/);
+      // the syntax for code highlighting means all code, even one line, contains newlines.
+      if (txt.length > 1 && codeHTML.match(/\n/)) {
+        // txt[0] = "`"; txt[1] = "ruby"
+        if ($.inArray(txt[1], languages) === -1) continue;
+
+        element.className = txt[1] + " highlight";
+        // length + 1 for the marker character.
+        element.innerHTML = codeHTML.substring(txt[1].length+1).trim();
         hljs.highlightBlock(element, "  ");
       } else {
         element.className = "nohighlight";
diff --git a/lib/gollum/frontend/public/gollum/livepreview/js/pagedown/Markdown.Converter.js b/lib/gollum/frontend/public/gollum/livepreview/js/pagedown/Markdown.Converter.js
index 12f1c86b..1867ff7e 100644
--- a/lib/gollum/frontend/public/gollum/livepreview/js/pagedown/Markdown.Converter.js
+++ b/lib/gollum/frontend/public/gollum/livepreview/js/pagedown/Markdown.Converter.js
@@ -1020,7 +1020,7 @@ else
 
         function _DoCodeSpansGollum(text) {
             //
-            // Same as _DoCode except code is wrapped in pre for proper multiline.
+            // Gollum wraps code in one pre. Use ` to mark code pre.
             // All regex set to use 'm' multiline option.
             //
             text = text.replace(/(^|[^\\])(`+)([^\r]*?[^`])\2(?!`)/gm,
@@ -1030,7 +1030,7 @@ else
                     c = c.replace(/[ \t]*$/gm, ""); // trailing whitespace
                     c = _EncodeCode(c);
                     c = c.replace(/:\/\//gm, "~P"); // to prevent auto-linking. Not necessary in code *blocks*, but in code spans. Will be converted back after the auto-linker runs.
-                    return m1 + "<pre><code>" + c + "</code></pre>";
+                    return m1 + "<pre>`" + c + "</pre>";
                 }
             );