diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index 08bc130e8..560de2d7a 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -1,5 +1,8 @@
 # Changelog
 
+## 15.2.1 / 2020-10-08
+- Bugfix: use string templating in language-specific theming code
+
 ## 15.2.0 / 2020-10-07
 - Allow language-specific theme styles to override default theme styles
 
diff --git a/demo/build/demo-build.js b/demo/build/demo-build.js
index 0ef9b0d86..e491a7bdd 100644
--- a/demo/build/demo-build.js
+++ b/demo/build/demo-build.js
@@ -75880,7 +75880,7 @@ function getCodeTree(_ref6) {
         _ref7$codeTagProps = _ref7.codeTagProps,
         codeTagProps = _ref7$codeTagProps === void 0 ? {
       className: language ? "language-".concat(language) : undefined,
-      style: _babel_runtime_helpers_objectSpread__WEBPACK_IMPORTED_MODULE_2___default()({}, style['code[class*="language-"]'], style['code[class*="language-${language}"]'])
+      style: _babel_runtime_helpers_objectSpread__WEBPACK_IMPORTED_MODULE_2___default()({}, style['code[class*="language-"]'], style["code[class*=\"language-".concat(language, "\"]")])
     } : _ref7$codeTagProps,
         _ref7$useInlineStyles = _ref7.useInlineStyles,
         useInlineStyles = _ref7$useInlineStyles === void 0 ? true : _ref7$useInlineStyles,
diff --git a/demo/build/diff-build.js b/demo/build/diff-build.js
index f8a297cf5..bceb354f2 100644
--- a/demo/build/diff-build.js
+++ b/demo/build/diff-build.js
@@ -75752,7 +75752,7 @@ function getCodeTree(_ref6) {
         _ref7$codeTagProps = _ref7.codeTagProps,
         codeTagProps = _ref7$codeTagProps === void 0 ? {
       className: language ? "language-".concat(language) : undefined,
-      style: _babel_runtime_helpers_objectSpread__WEBPACK_IMPORTED_MODULE_2___default()({}, style['code[class*="language-"]'], style['code[class*="language-${language}"]'])
+      style: _babel_runtime_helpers_objectSpread__WEBPACK_IMPORTED_MODULE_2___default()({}, style['code[class*="language-"]'], style["code[class*=\"language-".concat(language, "\"]")])
     } : _ref7$codeTagProps,
         _ref7$useInlineStyles = _ref7.useInlineStyles,
         useInlineStyles = _ref7$useInlineStyles === void 0 ? true : _ref7$useInlineStyles,
diff --git a/demo/build/prism-build.js b/demo/build/prism-build.js
index dec35293f..4bb500248 100644
--- a/demo/build/prism-build.js
+++ b/demo/build/prism-build.js
@@ -42755,7 +42755,7 @@ function getCodeTree(_ref6) {
         _ref7$codeTagProps = _ref7.codeTagProps,
         codeTagProps = _ref7$codeTagProps === void 0 ? {
       className: language ? "language-".concat(language) : undefined,
-      style: _babel_runtime_helpers_objectSpread__WEBPACK_IMPORTED_MODULE_2___default()({}, style['code[class*="language-"]'], style['code[class*="language-${language}"]'])
+      style: _babel_runtime_helpers_objectSpread__WEBPACK_IMPORTED_MODULE_2___default()({}, style['code[class*="language-"]'], style["code[class*=\"language-".concat(language, "\"]")])
     } : _ref7$codeTagProps,
         _ref7$useInlineStyles = _ref7.useInlineStyles,
         useInlineStyles = _ref7$useInlineStyles === void 0 ? true : _ref7$useInlineStyles,
diff --git a/demo/build/prismAsyncLight-build.js b/demo/build/prismAsyncLight-build.js
index 307defa15..5d13b683e 100644
--- a/demo/build/prismAsyncLight-build.js
+++ b/demo/build/prismAsyncLight-build.js
@@ -42751,7 +42751,7 @@ function getCodeTree(_ref6) {
         _ref7$codeTagProps = _ref7.codeTagProps,
         codeTagProps = _ref7$codeTagProps === void 0 ? {
       className: language ? "language-".concat(language) : undefined,
-      style: _babel_runtime_helpers_objectSpread__WEBPACK_IMPORTED_MODULE_2___default()({}, style['code[class*="language-"]'], style['code[class*="language-${language}"]'])
+      style: _babel_runtime_helpers_objectSpread__WEBPACK_IMPORTED_MODULE_2___default()({}, style['code[class*="language-"]'], style["code[class*=\"language-".concat(language, "\"]")])
     } : _ref7$codeTagProps,
         _ref7$useInlineStyles = _ref7.useInlineStyles,
         useInlineStyles = _ref7$useInlineStyles === void 0 ? true : _ref7$useInlineStyles,
diff --git a/demo/build/virtualized-build.js b/demo/build/virtualized-build.js
index f34970211..0c1793be2 100644
--- a/demo/build/virtualized-build.js
+++ b/demo/build/virtualized-build.js
@@ -109302,7 +109302,7 @@ function getCodeTree(_ref6) {
         _ref7$codeTagProps = _ref7.codeTagProps,
         codeTagProps = _ref7$codeTagProps === void 0 ? {
       className: language ? "language-".concat(language) : undefined,
-      style: _babel_runtime_helpers_objectSpread__WEBPACK_IMPORTED_MODULE_2___default()({}, style['code[class*="language-"]'], style['code[class*="language-${language}"]'])
+      style: _babel_runtime_helpers_objectSpread__WEBPACK_IMPORTED_MODULE_2___default()({}, style['code[class*="language-"]'], style["code[class*=\"language-".concat(language, "\"]")])
     } : _ref7$codeTagProps,
         _ref7$useInlineStyles = _ref7.useInlineStyles,
         useInlineStyles = _ref7$useInlineStyles === void 0 ? true : _ref7$useInlineStyles,
diff --git a/package.json b/package.json
index 651b4c517..0f09eed9c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-syntax-highlighter",
-  "version": "15.2.0",
+  "version": "15.2.1",
   "description": "syntax highlighting component for react with prismjs or highlightjs ast using inline styles",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",