diff --git a/docs/css-classes-reference.rst b/docs/css-classes-reference.rst
index 79bbbe6a97..2a7dc32caf 100644
--- a/docs/css-classes-reference.rst
+++ b/docs/css-classes-reference.rst
@@ -75,9 +75,11 @@ in mind so a better choice (for best theme support) might possibly be ``string``
 | meta                     | flags, modifiers, annotations, processing                   |
 |                          | instructions, preprocessor directives, etc                  |
 +--------------------------+-------------------------------------------------------------+
-| meta-keyword             | keyword or built-in within meta construct                   |
+| meta keyword             | a keyword inside a meta block                               |
+|                          | (note this is nested, not subscoped)                        |
 +--------------------------+-------------------------------------------------------------+
-| meta-string              | string within meta construct                                |
+| meta string              | a string inside a meta block                                |
+|                          | (note this is nested, not subscoped)                        |
 +--------------------------+-------------------------------------------------------------+
 | **Tags, attributes, configs**                                                          |
 +--------------------------+-------------------------------------------------------------+
diff --git a/src/languages/1c.js b/src/languages/1c.js
index 595aaeca58..f8ad064d00 100644
--- a/src/languages/1c.js
+++ b/src/languages/1c.js
@@ -450,7 +450,7 @@ export default function(hljs) {
     begin: '#|&', end: '$',
     keywords: {
       $pattern: UNDERSCORE_IDENT_RE,
-      'meta-keyword': KEYWORD + METAKEYWORD
+      'keyword': KEYWORD + METAKEYWORD
     },
     contains: [
       COMMENTS
diff --git a/src/languages/actionscript.js b/src/languages/actionscript.js
index db9f26f0f4..5639e2468b 100644
--- a/src/languages/actionscript.js
+++ b/src/languages/actionscript.js
@@ -121,7 +121,7 @@ export default function(hljs) {
         className: 'meta',
         beginKeywords: 'import include',
         end: /;/,
-        keywords: { 'meta-keyword': 'import include' }
+        keywords: { 'keyword': 'import include' }
       },
       {
         beginKeywords: 'function',
diff --git a/src/languages/autoit.js b/src/languages/autoit.js
index 6ef016f4a4..689a2bb53c 100644
--- a/src/languages/autoit.js
+++ b/src/languages/autoit.js
@@ -83,7 +83,7 @@ export default function(hljs) {
     begin: '#',
     end: '$',
     keywords: {
-      'meta-keyword': DIRECTIVES
+      'keyword': DIRECTIVES
     },
     contains: [
       {
@@ -93,13 +93,13 @@ export default function(hljs) {
       {
         beginKeywords: 'include',
         keywords: {
-          'meta-keyword': 'include'
+          'keyword': 'include'
         },
         end: '$',
         contains: [
           STRING,
           {
-            className: 'meta-string',
+            className: 'string',
             variants: [
               {
                 begin: '<',
diff --git a/src/languages/c.js b/src/languages/c.js
index bbb30b5bd0..455ac11106 100644
--- a/src/languages/c.js
+++ b/src/languages/c.js
@@ -82,7 +82,7 @@ export default function(hljs) {
     begin: /#\s*[a-z]+\b/,
     end: /$/,
     keywords: {
-      'meta-keyword':
+      'keyword':
         'if else elif endif define undef warning error line ' +
         'pragma _Pragma ifdef ifndef include'
     },
@@ -92,10 +92,10 @@ export default function(hljs) {
         relevance: 0
       },
       hljs.inherit(STRINGS, {
-        className: 'meta-string'
+        className: 'string'
       }),
       {
-        className: 'meta-string',
+        className: 'string',
         begin: /<.*?>/
       },
       C_LINE_COMMENT_MODE,
diff --git a/src/languages/cpp.js b/src/languages/cpp.js
index edfbf1cd51..7b9217e360 100644
--- a/src/languages/cpp.js
+++ b/src/languages/cpp.js
@@ -76,7 +76,7 @@ export default function(hljs) {
     begin: /#\s*[a-z]+\b/,
     end: /$/,
     keywords: {
-      'meta-keyword':
+      'keyword':
         'if else elif endif define undef warning error line ' +
         'pragma _Pragma ifdef ifndef include'
     },
@@ -86,10 +86,10 @@ export default function(hljs) {
         relevance: 0
       },
       hljs.inherit(STRINGS, {
-        className: 'meta-string'
+        className: 'string'
       }),
       {
-        className: 'meta-string',
+        className: 'string',
         begin: /<.*?>/
       },
       C_LINE_COMMENT_MODE,
diff --git a/src/languages/crystal.js b/src/languages/crystal.js
index 076c130eb2..138572a001 100644
--- a/src/languages/crystal.js
+++ b/src/languages/crystal.js
@@ -207,7 +207,7 @@ export default function(hljs) {
     end: '\\]',
     contains: [
       hljs.inherit(hljs.QUOTE_STRING_MODE, {
-        className: 'meta-string'
+        className: 'string'
       })
     ]
   };
diff --git a/src/languages/csharp.js b/src/languages/csharp.js
index d5aeb02817..b7b59a842b 100644
--- a/src/languages/csharp.js
+++ b/src/languages/csharp.js
@@ -329,7 +329,7 @@ export default function(hljs) {
         begin: '#',
         end: '$',
         keywords: {
-          'meta-keyword': 'if else elif endif define undef warning error line region endregion pragma checksum'
+          'keyword': 'if else elif endif define undef warning error line region endregion pragma checksum'
         }
       },
       STRING,
@@ -381,7 +381,7 @@ export default function(hljs) {
         excludeEnd: true,
         contains: [
           {
-            className: 'meta-string',
+            className: 'string',
             begin: /"/,
             end: /"/
           }
diff --git a/src/languages/dts.js b/src/languages/dts.js
index 543235fb72..662919d0da 100644
--- a/src/languages/dts.js
+++ b/src/languages/dts.js
@@ -45,7 +45,7 @@ export default function(hljs) {
     begin: '#',
     end: '$',
     keywords: {
-      'meta-keyword': 'if else elif endif define undef ifdef ifndef'
+      'keyword': 'if else elif endif define undef ifdef ifndef'
     },
     contains: [
       {
@@ -56,14 +56,14 @@ export default function(hljs) {
         beginKeywords: 'include',
         end: '$',
         keywords: {
-          'meta-keyword': 'include'
+          'keyword': 'include'
         },
         contains: [
           hljs.inherit(STRINGS, {
-            className: 'meta-string'
+            className: 'string'
           }),
           {
-            className: 'meta-string',
+            className: 'string',
             begin: '<',
             end: '>',
             illegal: '\\n'
@@ -82,7 +82,7 @@ export default function(hljs) {
   };
 
   const DTS_KEYWORD = {
-    className: 'meta-keyword',
+    className: 'keyword',
     begin: '/[a-z][a-z\\d-]*/'
   };
 
diff --git a/src/languages/gams.js b/src/languages/gams.js
index fc926c4b8f..aaab22cc4c 100644
--- a/src/languages/gams.js
+++ b/src/languages/gams.js
@@ -119,7 +119,7 @@ export default function(hljs) {
         returnBegin: true,
         contains: [
           {
-            className: 'meta-keyword',
+            className: 'keyword',
             begin: '^\\$[a-z0-9]+'
           }
         ]
diff --git a/src/languages/gauss.js b/src/languages/gauss.js
index 3099521bdd..d728b144c3 100644
--- a/src/languages/gauss.js
+++ b/src/languages/gauss.js
@@ -117,7 +117,7 @@ export default function(hljs) {
     begin: '#',
     end: '$',
     keywords: {
-      'meta-keyword': 'define definecs|10 undef ifdef ifndef iflight ifdllcall ifmac ifos2win ifunix else endif lineson linesoff srcfile srcline'
+      'keyword': 'define definecs|10 undef ifdef ifndef iflight ifdllcall ifmac ifos2win ifunix else endif lineson linesoff srcfile srcline'
     },
     contains: [
       {
@@ -128,11 +128,11 @@ export default function(hljs) {
         beginKeywords: 'include',
         end: '$',
         keywords: {
-          'meta-keyword': 'include'
+          'keyword': 'include'
         },
         contains: [
           {
-            className: 'meta-string',
+            className: 'string',
             begin: '"',
             end: '"',
             illegal: '\\n'
diff --git a/src/languages/haxe.js b/src/languages/haxe.js
index 4a4f72b4bb..6e921912bc 100644
--- a/src/languages/haxe.js
+++ b/src/languages/haxe.js
@@ -58,7 +58,7 @@ export default function(hljs) {
         begin: '#',
         end: '$',
         keywords: {
-          'meta-keyword': 'if else elseif end error'
+          'keyword': 'if else elseif end error'
         }
       },
       {
diff --git a/src/languages/hsp.js b/src/languages/hsp.js
index 68649b2ae3..62550ac9ac 100644
--- a/src/languages/hsp.js
+++ b/src/languages/hsp.js
@@ -37,11 +37,11 @@ export default function(hljs) {
         begin: '#',
         end: '$',
         keywords: {
-          'meta-keyword': 'addion cfunc cmd cmpopt comfunc const defcfunc deffunc define else endif enum epack func global if ifdef ifndef include modcfunc modfunc modinit modterm module pack packopt regcmd runtime undef usecom uselib'
+          'keyword': 'addion cfunc cmd cmpopt comfunc const defcfunc deffunc define else endif enum epack func global if ifdef ifndef include modcfunc modfunc modinit modterm module pack packopt regcmd runtime undef usecom uselib'
         },
         contains: [
           hljs.inherit(hljs.QUOTE_STRING_MODE, {
-            className: 'meta-string'
+            className: 'string'
           }),
           hljs.NUMBER_MODE,
           hljs.C_NUMBER_MODE,
diff --git a/src/languages/kotlin.js b/src/languages/kotlin.js
index c741f60662..5751bcf9ec 100644
--- a/src/languages/kotlin.js
+++ b/src/languages/kotlin.js
@@ -96,7 +96,7 @@ export default function(hljs) {
         end: /\)/,
         contains: [
           hljs.inherit(STRING, {
-            className: 'meta-string'
+            className: 'string'
           })
         ]
       }
diff --git a/src/languages/makefile.js b/src/languages/makefile.js
index 6e0d66d954..4cb1337118 100644
--- a/src/languages/makefile.js
+++ b/src/languages/makefile.js
@@ -55,7 +55,7 @@ export default function(hljs) {
     end: /$/,
     keywords: {
       $pattern: /[\.\w]+/,
-      'meta-keyword': '.PHONY'
+      'keyword': '.PHONY'
     }
   };
   /* Targets */
diff --git a/src/languages/monkey.js b/src/languages/monkey.js
index 244f69a425..a6cbebdbd0 100644
--- a/src/languages/monkey.js
+++ b/src/languages/monkey.js
@@ -68,7 +68,7 @@ export default function(hljs) {
         begin: '\\s*#',
         end: '$',
         keywords: {
-          'meta-keyword': 'if else elseif endif end then'
+          'keyword': 'if else elseif endif end then'
         }
       },
       {
diff --git a/src/languages/objectivec.js b/src/languages/objectivec.js
index 10979f6d42..b01dc4589c 100644
--- a/src/languages/objectivec.js
+++ b/src/languages/objectivec.js
@@ -209,7 +209,7 @@ export default function(hljs) {
         begin: /#\s*[a-z]+\b/,
         end: /$/,
         keywords: {
-          'meta-keyword':
+          'keyword':
             'if else elif endif define undef warning error line ' +
             'pragma ifdef ifndef include'
         },
@@ -219,10 +219,10 @@ export default function(hljs) {
             relevance: 0
           },
           hljs.inherit(hljs.QUOTE_STRING_MODE, {
-            className: 'meta-string'
+            className: 'string'
           }),
           {
-            className: 'meta-string',
+            className: 'string',
             begin: /<.*?>/,
             end: /$/,
             illegal: '\\n'
diff --git a/src/languages/openscad.js b/src/languages/openscad.js
index e03a2a6361..3678ea2a83 100644
--- a/src/languages/openscad.js
+++ b/src/languages/openscad.js
@@ -26,7 +26,7 @@ export default function(hljs) {
   const PREPRO = {
     className: 'meta',
     keywords: {
-      'meta-keyword': 'include use'
+      'keyword': 'include use'
     },
     begin: 'include|use <',
     end: '>'
diff --git a/src/languages/r.js b/src/languages/r.js
index 237d36becb..a4348678fa 100644
--- a/src/languages/r.js
+++ b/src/languages/r.js
@@ -108,7 +108,7 @@ export default function(hljs) {
               begin: /@[a-zA-Z]+/
             },
             {
-              className: 'meta-keyword',
+              className: 'keyword',
               begin: /\\[a-zA-Z]+/,
             }
           ]
diff --git a/src/languages/rust.js b/src/languages/rust.js
index 5cd3b960e3..f3cc507f9f 100644
--- a/src/languages/rust.js
+++ b/src/languages/rust.js
@@ -243,7 +243,7 @@ export default function(hljs) {
         end: '\\]',
         contains: [
           {
-            className: 'meta-string',
+            className: 'string',
             begin: /"/,
             end: /"/
           }
diff --git a/src/languages/sqf.js b/src/languages/sqf.js
index f22e6fdd22..eae3665f17 100644
--- a/src/languages/sqf.js
+++ b/src/languages/sqf.js
@@ -2463,7 +2463,7 @@ export default function(hljs) {
     begin: /#\s*[a-z]+\b/,
     end: /$/,
     keywords: {
-      'meta-keyword':
+      'keyword':
         'define undef ifdef ifndef else endif include'
     },
     contains: [
@@ -2472,10 +2472,10 @@ export default function(hljs) {
         relevance: 0
       },
       hljs.inherit(STRINGS, {
-        className: 'meta-string'
+        className: 'string'
       }),
       {
-        className: 'meta-string',
+        className: 'string',
         begin: /<[^\n>]*>/,
         end: /$/,
         illegal: '\\n'
diff --git a/src/languages/stan.js b/src/languages/stan.js
index 76b783f1f3..2e6cb4c65f 100644
--- a/src/languages/stan.js
+++ b/src/languages/stan.js
@@ -485,7 +485,7 @@ export default function(hljs) {
         {
           relevance: 0,
           keywords: {
-            'meta-keyword': 'include'
+            'keyword': 'include'
           }
         }
       ),
diff --git a/src/languages/vbnet.js b/src/languages/vbnet.js
index 80e159af26..34bfe0ca3f 100644
--- a/src/languages/vbnet.js
+++ b/src/languages/vbnet.js
@@ -125,7 +125,7 @@ export default function(hljs) {
     begin: /[\t ]*#(const|disable|else|elseif|enable|end|externalsource|if|region)\b/,
     end: /$/,
     keywords: {
-      'meta-keyword':
+      'keyword':
         'const disable else elseif enable end externalsource if region then'
     },
     contains: [ COMMENT ]
diff --git a/src/languages/verilog.js b/src/languages/verilog.js
index fa242a556b..678e1e589e 100644
--- a/src/languages/verilog.js
+++ b/src/languages/verilog.js
@@ -115,7 +115,7 @@ export default function(hljs) {
         begin: '`',
         end: '$',
         keywords: {
-          'meta-keyword':
+          'keyword':
             'define __FILE__ ' +
             '__LINE__ begin_keywords celldefine default_nettype define ' +
             'else elsif end_keywords endcelldefine endif ifdef ifndef ' +
diff --git a/src/languages/xml.js b/src/languages/xml.js
index da6cfb4be5..5f6c7e2be5 100644
--- a/src/languages/xml.js
+++ b/src/languages/xml.js
@@ -20,7 +20,7 @@ export default function(hljs) {
     begin: /\s/,
     contains: [
       {
-        className: 'meta-keyword',
+        className: 'keyword',
         begin: /#?[a-z_][a-z1-9_-]+/,
         illegal: /\n/
       }
@@ -31,10 +31,10 @@ export default function(hljs) {
     end: /\)/
   });
   const APOS_META_STRING_MODE = hljs.inherit(hljs.APOS_STRING_MODE, {
-    className: 'meta-string'
+    className: 'string'
   });
   const QUOTE_META_STRING_MODE = hljs.inherit(hljs.QUOTE_STRING_MODE, {
-    className: 'meta-string'
+    className: 'string'
   });
   const TAG_INTERNALS = {
     endsWithParent: true,
diff --git a/src/styles/arduino-light.css b/src/styles/arduino-light.css
index db0ab649a3..d50d96d5a6 100644
--- a/src/styles/arduino-light.css
+++ b/src/styles/arduino-light.css
@@ -53,7 +53,8 @@ Arduino® Light Theme - Stefania Mellai <s.mellai@arduino.cc>
   color: rgba(149,165,166,.8);
 }
 
-.hljs-meta-keyword {
+.hljs-meta .hljs-keyword {
+
   color: #728E00;
 }
 
diff --git a/src/styles/atom-one-dark-reasonable.css b/src/styles/atom-one-dark-reasonable.css
index 6a64e8a56b..a38738d96e 100644
--- a/src/styles/atom-one-dark-reasonable.css
+++ b/src/styles/atom-one-dark-reasonable.css
@@ -49,7 +49,7 @@ Original One Dark Syntax theme from https://github.com/atom/one-dark-syntax
 .hljs-literal {
   color: #56b6c2;
 }
-.hljs-string, .hljs-regexp, .hljs-addition, .hljs-attribute, .hljs-meta-string {
+.hljs-string, .hljs-regexp, .hljs-addition, .hljs-attribute, .hljs-meta .hljs-string {
   color: #98c379;
 }
 .hljs-built_in,
diff --git a/src/styles/atom-one-dark.css b/src/styles/atom-one-dark.css
index c660dff220..b8528d8798 100644
--- a/src/styles/atom-one-dark.css
+++ b/src/styles/atom-one-dark.css
@@ -51,7 +51,7 @@ hue-6-2: #e6c07b
 .hljs-regexp,
 .hljs-addition,
 .hljs-attribute,
-.hljs-meta-string {
+.hljs-meta .hljs-string {
   color: #98c379;
 }
 
diff --git a/src/styles/atom-one-light.css b/src/styles/atom-one-light.css
index b8b38ac36d..4ae2c63f84 100644
--- a/src/styles/atom-one-light.css
+++ b/src/styles/atom-one-light.css
@@ -51,7 +51,7 @@ hue-6-2: #c18401
 .hljs-regexp,
 .hljs-addition,
 .hljs-attribute,
-.hljs-meta-string {
+.hljs-meta .hljs-string {
   color: #50a14f;
 }
 
diff --git a/src/styles/default.css b/src/styles/default.css
index 9fdc8de359..20fdb8a073 100644
--- a/src/styles/default.css
+++ b/src/styles/default.css
@@ -46,7 +46,8 @@
 .hljs-keyword,
 .hljs-attribute,
 .hljs-selector-tag,
-.hljs-meta-keyword,
+.hljs-meta .hljs-keyword,
+
 .hljs-doctag,
 .hljs-name {
   font-weight: bold;
@@ -103,7 +104,7 @@
   color: #1f7199;
 }
 
-.hljs-meta-string {
+.hljs-meta .hljs-string {
   color: #4d99bf;
 }
 
diff --git a/src/styles/devibeans.css b/src/styles/devibeans.css
index 451b693045..f8a128ea78 100644
--- a/src/styles/devibeans.css
+++ b/src/styles/devibeans.css
@@ -38,7 +38,8 @@
 }
 
 .hljs-meta,
-.hljs-meta-keyword {
+.hljs-meta .hljs-keyword {
+
   color: #0087ff;
 }
 
@@ -74,7 +75,7 @@
   color: #ffd75f;
 }
 
-.hljs-meta-string,
+.hljs-meta .hljs-string,
 .hljs-string,
 .hljs-subst,
 .hljs-symbol,
diff --git a/src/styles/github.css b/src/styles/github.css
index 49eed4ddb9..552d380326 100644
--- a/src/styles/github.css
+++ b/src/styles/github.css
@@ -12,7 +12,8 @@
 
 .hljs-doctag,
 .hljs-keyword,
-.hljs-meta-keyword,
+.hljs-meta .hljs-keyword,
+
 .hljs-template-tag,
 .hljs-template-variable,
 .hljs-type {
@@ -40,7 +41,7 @@
 
 .hljs-regexp,
 .hljs-string,
-.hljs-meta-string {
+.hljs-meta .hljs-string {
   /* prettylights-syntax-string */
   color: #032f62;
 }
diff --git a/src/styles/gml.css b/src/styles/gml.css
index 3c47525a1a..6c1da22d15 100644
--- a/src/styles/gml.css
+++ b/src/styles/gml.css
@@ -60,7 +60,8 @@ GML Theme - Meseta <meseta@gmail.com>
 .hljs-title,
 .hljs-section,
 .hljs-function,
-.hljs-meta-keyword,
+.hljs-meta .hljs-keyword,
+
 .hljs-meta,
 .hljs-subst {
   color: #C0C0C0;
diff --git a/src/styles/gradient-dark.css b/src/styles/gradient-dark.css
index cb7083abdf..d9e42138c2 100644
--- a/src/styles/gradient-dark.css
+++ b/src/styles/gradient-dark.css
@@ -44,7 +44,8 @@ color:#e7e4eb;
 
 .hljs-keyword,
 .hljs-section,
-.hljs-meta-keyword,
+.hljs-meta .hljs-keyword,
+
 .hljs-symbol,
 .hljs-type
 
diff --git a/src/styles/gradient-light.css b/src/styles/gradient-light.css
index 38dd11c4dc..574534cb56 100644
--- a/src/styles/gradient-light.css
+++ b/src/styles/gradient-light.css
@@ -44,7 +44,8 @@ color:#01958B;
 
 .hljs-keyword,
 .hljs-section,
-.hljs-meta-keyword,
+.hljs-meta .hljs-keyword,
+
 .hljs-symbol,
 .hljs-type
 
diff --git a/src/styles/isbl-editor-dark.css b/src/styles/isbl-editor-dark.css
index e6a66fbe58..d3f45d2a98 100644
--- a/src/styles/isbl-editor-dark.css
+++ b/src/styles/isbl-editor-dark.css
@@ -24,7 +24,8 @@ ISBL Editor style dark color scheme (c) Dmitriy Tarasov <dimatar@gmail.com>
 .hljs-keyword,
 .hljs-attribute,
 .hljs-selector-tag,
-.hljs-meta-keyword,
+.hljs-meta .hljs-keyword,
+
 .hljs-doctag,
 .hljs-name {
   color: #f0f0f0;
@@ -93,7 +94,7 @@ ISBL Editor style dark color scheme (c) Dmitriy Tarasov <dimatar@gmail.com>
   color: #1f7199;
 }
 
-.hljs-meta-string {
+.hljs-meta .hljs-string {
   color: #4d99bf;
 }
 
diff --git a/src/styles/isbl-editor-light.css b/src/styles/isbl-editor-light.css
index 07363555cd..9a41fea024 100644
--- a/src/styles/isbl-editor-light.css
+++ b/src/styles/isbl-editor-light.css
@@ -23,7 +23,8 @@ ISBL Editor style light color schemec (c) Dmitriy Tarasov <dimatar@gmail.com>
 .hljs-keyword,
 .hljs-attribute,
 .hljs-selector-tag,
-.hljs-meta-keyword,
+.hljs-meta .hljs-keyword,
+
 .hljs-doctag,
 .hljs-name {
   color: #000000;
@@ -92,7 +93,7 @@ ISBL Editor style light color schemec (c) Dmitriy Tarasov <dimatar@gmail.com>
   color: #1f7199;
 }
 
-.hljs-meta-string {
+.hljs-meta .hljs-string {
   color: #4d99bf;
 }
 
diff --git a/src/styles/lightfair.css b/src/styles/lightfair.css
index aa90725dc3..f9df16bf06 100644
--- a/src/styles/lightfair.css
+++ b/src/styles/lightfair.css
@@ -28,7 +28,8 @@ Lightfair style (c) Tristian Kelly <tristian.kelly560@gmail.com>
 .hljs-keyword,
 .hljs-attribute,
 .hljs-selector-tag,
-.hljs-meta-keyword,
+.hljs-meta .hljs-keyword,
+
 .hljs-doctag,
 .hljs-name {
     font-weight: bold
@@ -72,7 +73,7 @@ Lightfair style (c) Tristian Kelly <tristian.kelly560@gmail.com>
     color: #25c6c6
 }
 
-.hljs-meta-string {
+.hljs-meta .hljs-string {
     color: #4d99bf
 }
 
diff --git a/src/styles/night-owl.css b/src/styles/night-owl.css
index f23fce285f..50f667c139 100644
--- a/src/styles/night-owl.css
+++ b/src/styles/night-owl.css
@@ -87,10 +87,11 @@ SOFTWARE.
 .hljs-meta {
   color: #82aaff;
 }
-.hljs-meta-keyword {
+.hljs-meta .hljs-keyword {
+
   color: #82aaff;
 }
-.hljs-meta-string {
+.hljs-meta .hljs-string {
   color: #ecc48d;
 }
 
diff --git a/src/styles/nnfx-dark.css b/src/styles/nnfx-dark.css
index e1cef36ace..f25c2434d9 100644
--- a/src/styles/nnfx-dark.css
+++ b/src/styles/nnfx-dark.css
@@ -44,7 +44,7 @@
 
 .hljs-code,
 .hljs-string,
-.hljs-meta-string,
+.hljs-meta .hljs-string,
 .hljs-number,
 .hljs-regexp,
 .hljs-link {
diff --git a/src/styles/nnfx-light.css b/src/styles/nnfx-light.css
index 705a824986..6009ca47c1 100644
--- a/src/styles/nnfx-light.css
+++ b/src/styles/nnfx-light.css
@@ -44,7 +44,7 @@
 
 .hljs-code,
 .hljs-string,
-.hljs-meta-string,
+.hljs-meta .hljs-string,
 .hljs-number,
 .hljs-regexp,
 .hljs-link {
diff --git a/src/styles/nord.css b/src/styles/nord.css
index 8ec56eeaa5..29759c4f68 100644
--- a/src/styles/nord.css
+++ b/src/styles/nord.css
@@ -165,11 +165,12 @@ Aurora
 }
 
 .hljs-meta,
-.hljs-meta-keyword {
+.hljs-meta .hljs-keyword {
+
   color: #5E81AC;
 }
 
-.hljs-meta-string {
+.hljs-meta .hljs-string {
   color: #A3BE8C;
 }
 
@@ -251,7 +252,7 @@ Aurora
   color: #88C0D0;
 }
 
-.language-cpp .hljs-meta-string {
+.language-cpp .hljs-meta .hljs-string {
   color: #8FBCBB;
 }
 
diff --git a/src/styles/purebasic.css b/src/styles/purebasic.css
index 3c7ae19ad3..796e873412 100644
--- a/src/styles/purebasic.css
+++ b/src/styles/purebasic.css
@@ -46,7 +46,8 @@ NOTE_2:	Color names provided in comments were derived using "Name that Color" on
 
 .hljs-keyword, /* --- used for PureBASIC Keywords --- */
 .hljs-class,
-.hljs-meta-keyword,
+.hljs-meta .hljs-keyword,
+
 .hljs-selector-class,
 .hljs-built_in {
 	color: #006666; /* Blue Stone (approx.) */
diff --git a/src/styles/routeros.css b/src/styles/routeros.css
index c36d825443..5bbf4ca14a 100644
--- a/src/styles/routeros.css
+++ b/src/styles/routeros.css
@@ -21,7 +21,8 @@
 
 .hljs-keyword,
 .hljs-selector-tag,
-.hljs-meta-keyword,
+.hljs-meta .hljs-keyword,
+
 .hljs-doctag,
 .hljs-name {
   font-weight: bold;
@@ -85,7 +86,7 @@
   color: #1f7199;
 }
 
-.hljs-meta-string {
+.hljs-meta .hljs-string {
   color: #4d99bf;
 }
 
diff --git a/src/styles/shades-of-purple.css b/src/styles/shades-of-purple.css
index 388618f755..025f6cdcff 100644
--- a/src/styles/shades-of-purple.css
+++ b/src/styles/shades-of-purple.css
@@ -61,7 +61,7 @@
 }
 
 .hljs-meta,
-.hljs-meta-string {
+.hljs-meta .hljs-string {
   color: #fb9e00;
 }
 
diff --git a/src/styles/stackoverflow-dark.css b/src/styles/stackoverflow-dark.css
index 0f6a21486e..d62a5073a9 100644
--- a/src/styles/stackoverflow-dark.css
+++ b/src/styles/stackoverflow-dark.css
@@ -16,7 +16,8 @@
 
 .hljs-keyword,
 .hljs-selector-tag,
-.hljs-meta-keyword,
+.hljs-meta .hljs-keyword,
+
 .hljs-doctag,
 .hljs-section,
 .hljs-selector-class,
@@ -49,7 +50,7 @@
 .hljs-template-variable,
 .hljs-link,
 .hljs-selector-attr,
-.hljs-meta-string {
+.hljs-meta .hljs-string {
   color: #b5bd68;
 }
 
diff --git a/src/styles/stackoverflow-light.css b/src/styles/stackoverflow-light.css
index b363fa6928..3698f7efcd 100644
--- a/src/styles/stackoverflow-light.css
+++ b/src/styles/stackoverflow-light.css
@@ -16,7 +16,8 @@
 
 .hljs-keyword,
 .hljs-selector-tag,
-.hljs-meta-keyword,
+.hljs-meta .hljs-keyword,
+
 .hljs-doctag,
 .hljs-section,
 .hljs-selector-class,
@@ -49,7 +50,7 @@
 .hljs-template-variable,
 .hljs-link,
 .hljs-selector-attr,
-.hljs-meta-string {
+.hljs-meta .hljs-string {
   color: #54790d;
 }
 
diff --git a/src/styles/vs2015.css b/src/styles/vs2015.css
index c34fa2a9e8..4dce1ebd40 100644
--- a/src/styles/vs2015.css
+++ b/src/styles/vs2015.css
@@ -30,7 +30,7 @@
 }
 
 .hljs-string,
-.hljs-meta-string {
+.hljs-meta .hljs-string {
   color: #D69D85;
 }
 
@@ -58,7 +58,8 @@
 }
 
 .hljs-meta,
-.hljs-meta-keyword,
+.hljs-meta .hljs-keyword,
+
 .hljs-tag {
   color: #9B9B9B;
 }
diff --git a/src/styles/xcode.css b/src/styles/xcode.css
index 113758f49f..8ab7ab5b57 100644
--- a/src/styles/xcode.css
+++ b/src/styles/xcode.css
@@ -35,7 +35,7 @@ XCode style (c) Angel Garcia <angelgarcia.mail@gmail.com>
 
 .hljs-code,
 .hljs-string,
-.hljs-meta-string {
+.hljs-meta .hljs-string {
   color: #c41a16;
 }