diff --git a/.babelrc b/.babelrc
index 25113692..f4f5fff1 100644
--- a/.babelrc
+++ b/.babelrc
@@ -19,9 +19,9 @@
     "@babel/plugin-proposal-throw-expressions",
     [
       "prismjs", {
-        "languages": ["clike", "markup"],
-        "plugins": ["line-numbers", "autoloader", "normalize-whitespace", "copy-to-clipboard", "toolbar"],
-        "theme": "twilight",
+        "languages": ["typescript", "ts", "tsx"],
+        "plugins": ["line-numbers", "match-braces", "autoloader", "normalize-whitespace", "copy-to-clipboard", "toolbar"],
+        "theme": "tomorrow",
         "css": true
       }
     ]
diff --git a/server/modules/rendering/html-codehighlighter/renderer.js b/server/modules/rendering/html-codehighlighter/renderer.js
index 0f19e63f..3be9aae5 100644
--- a/server/modules/rendering/html-codehighlighter/renderer.js
+++ b/server/modules/rendering/html-codehighlighter/renderer.js
@@ -7,8 +7,9 @@ module.exports = {
       if (codeClasses.indexOf('language-') < 0) {
         const result = hljs.highlightAuto($(elm).text())
         $(elm).addClass('language-', result.language)
+        $(elm).addClass('match-braces') // Ruslan: I don't sure if this line needed or not :)
       }
-      $(elm).parent().addClass('prismjs line-numbers')
+      $(elm).parent().addClass('prismjs line-numbers match-braces')
     })
   }
 }