diff --git a/Gemfile b/Gemfile
index 1b5ab49ea5a..5f502f1a39a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,9 @@ ruby "> 2.3.0"
 
 group :development do
   gem 'rake', '~> 10.0'
-  gem 'jekyll', '~> 3.0'
+  # 3.8.5 throws errors on unfinished liquid tags in excerpts
+  # Wait with upgrade until release https://github.com/jekyll/jekyll/pull/7382
+  gem 'jekyll', '3.8.4'
   gem 'compass', '~> 0.12'
   gem 'sass-globbing', '~> 1.0'
   gem 'stringex', '~> 1.4'
diff --git a/Gemfile.lock b/Gemfile.lock
index 051fb09fdb5..de5c2add1eb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -10,19 +10,29 @@ GEM
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.2.19)
-    ffi (1.9.18)
+    concurrent-ruby (1.1.3)
+    em-websocket (0.5.1)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
+    eventmachine (1.2.7)
+    ffi (1.9.25)
     forwardable-extended (2.6.0)
     fssm (0.2.10)
-    jekyll (3.5.2)
+    http_parser.rb (0.6.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    jekyll (3.8.4)
       addressable (~> 2.4)
       colorator (~> 1.0)
+      em-websocket (~> 0.5)
+      i18n (~> 0.7)
       jekyll-sass-converter (~> 1.0)
-      jekyll-watch (~> 1.1)
-      kramdown (~> 1.3)
+      jekyll-watch (~> 2.0)
+      kramdown (~> 1.14)
       liquid (~> 4.0)
       mercenary (~> 0.3.3)
       pathutil (~> 0.9)
-      rouge (~> 1.7)
+      rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
     jekyll-paginate (1.1.0)
     jekyll-redirect-from (0.12.1)
@@ -33,13 +43,14 @@ GEM
       jekyll (~> 3.3)
     jekyll-time-to-read (0.1.2)
       jekyll
-    jekyll-watch (1.5.0)
-      listen (~> 3.0, < 3.1)
-    kramdown (1.14.0)
-    liquid (4.0.0)
-    listen (3.0.8)
+    jekyll-watch (2.1.2)
+      listen (~> 3.0)
+    kramdown (1.17.0)
+    liquid (4.0.1)
+    listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
     mercenary (0.3.6)
     method_source (0.8.2)
     mini_portile2 (2.3.0)
@@ -64,22 +75,23 @@ GEM
       octopress-tag-helpers (~> 1.0)
     octopress-tag-helpers (1.0.8)
       jekyll (>= 2.0)
-    pathutil (0.14.0)
+    pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    public_suffix (3.0.0)
+    public_suffix (3.0.3)
     rack (1.6.9)
     rack-protection (1.5.5)
       rack
     rake (10.5.0)
-    rb-fsevent (0.10.2)
+    rb-fsevent (0.10.3)
     rb-inotify (0.9.8)
       ffi (>= 0.5.0)
     redcarpet (3.4.0)
-    rouge (1.11.1)
+    rouge (3.3.0)
+    ruby_dep (1.5.0)
     safe_yaml (1.0.4)
     sass (3.2.19)
     sass-globbing (1.1.5)
@@ -98,7 +110,7 @@ PLATFORMS
 
 DEPENDENCIES
   compass (~> 0.12)
-  jekyll (~> 3.0)
+  jekyll (= 3.8.4)
   jekyll-paginate
   jekyll-redirect-from
   jekyll-sitemap
@@ -117,4 +129,4 @@ RUBY VERSION
    ruby 2.4.1p111
 
 BUNDLED WITH
-   1.16.1
+   1.17.1
diff --git a/sass/custom/_syntax.scss b/sass/custom/_syntax.scss
index 2d100df2851..9d4c79dba1a 100644
--- a/sass/custom/_syntax.scss
+++ b/sass/custom/_syntax.scss
@@ -12,7 +12,7 @@ code.highlighter-rouge {
     padding: 0 .3em;
 }
 
-.highlight {
+pre.highlight {
   background-color: #FFF;
   border: 1px solid #CCC;
   font-family: "Courier New","DejaVu Sans Mono","Bitstream Vera Sans Mono",monospace;