diff --git a/public/app/core/components/code_editor/mode-prometheus.js b/public/app/core/components/code_editor/mode-prometheus.js
index 4843b952253..182b4d65ed9 100644
--- a/public/app/core/components/code_editor/mode-prometheus.js
+++ b/public/app/core/components/code_editor/mode-prometheus.js
@@ -68,17 +68,17 @@ var PrometheusHighlightRules = function() {
       token : "label.name",
       regex : '[a-zA-Z_][a-zA-Z0-9_]*'
     }, {
-      token : "label.matching_operator",
+      token : "keyword.operator",
       regex : '=|!=|=~|!~'
     }, {
-      token : "label.value",
+      token : "text",
       regex : '"[^"]*"|\'[^\']*\''
     }, {
-      token : "label.matching_delimiter",
+      token : "punctuation.operator",
       regex : ",",
       push  : 'start-label-matcher'
     }, {
-      token : "label.matching_end",
+      token : "paren.rparen",
       regex : "}",
       next  : "start"
     } ]