diff --git a/app/assets/stylesheets/common/base/code_highlighting.scss b/app/assets/stylesheets/common/base/code_highlighting.scss
index 25c8a72f001..763d7088a21 100644
--- a/app/assets/stylesheets/common/base/code_highlighting.scss
+++ b/app/assets/stylesheets/common/base/code_highlighting.scss
@@ -11,16 +11,12 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
 }
 
 .hljs-comment,
-.hljs-template_comment,
-.diff .hljs-header,
-.hljs-javadoc {
+.hljs-doctag {
   color: dark-light-choose(#998, #bba);
   font-style: italic;
 }
 
 .hljs-keyword,
-.css .rule .hljs-keyword,
-.hljs-winutils,
 .javascript .hljs-title,
 .nginx .hljs-title,
 .hljs-subst,
@@ -31,22 +27,20 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
 }
 
 .hljs-number,
-.hljs-hexcolor,
 .ruby .hljs-constant {
   color: dark-light-choose(#099, #aff);
 }
 
 .hljs-string,
-.hljs-tag .hljs-value,
-.hljs-phpdoc,
+.hljs-tag .hljs-string,
 .tex .hljs-formula {
   color: dark-light-choose(#d14, #f99);
 }
 
 .hljs-title,
-.hljs-id,
+.hljs-name,
 .coffeescript .hljs-params,
-.scss .hljs-preprocessor {
+.scss .hljs-meta {
   color: #900;
   font-weight: bold;
 }
@@ -68,13 +62,13 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
 
 .hljs-tag,
 .hljs-tag .hljs-title,
-.hljs-rules .hljs-property,
 .django .hljs-tag .hljs-keyword {
   color: dark-light-choose(#000080, #99f);
   font-weight: normal;
 }
 
 .hljs-attribute,
+.css .hljs-keyword,
 .hljs-variable,
 .lisp .hljs-body {
   color: dark-light-choose(#008080, #0ee);
@@ -94,16 +88,12 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
 
 .hljs-built_in,
 .lisp .hljs-title,
-.clojure .hljs-built_in {
+.clojure .hljs-built_in,
+.hljs-builtin-name {
   color: #0086b3;
 }
 
-.hljs-preprocessor,
-.hljs-pragma,
-.hljs-pi,
-.hljs-doctype,
-.hljs-shebang,
-.hljs-cdata {
+.meta {
   color: #999;
   font-weight: bold;
 }
@@ -116,11 +106,7 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
   background: #dfd;
 }
 
-.diff .hljs-change {
-  background: #0086b3;
-}
-
-.hljs-chunk {
+.diff .hljs-meta {
   color: #aaa;
 }