diff --git a/grammars/latex.cson b/grammars/latex.cson
index 3d6c533..4acc0e5 100644
--- a/grammars/latex.cson
+++ b/grammars/latex.cson
@@ -1436,7 +1436,7 @@
         'name': 'variable.parameter.function.latex'
       '5':
         'name': 'punctuation.definition.arguments.end.latex'
-    'contentName': 'string.other.math.block.environment.latex'
+    'contentName': 'markup.other.math.block.environment.latex'
     'end': '''(?x)
               (?:\\s*)
               ((\\\\)end)
@@ -1471,7 +1471,7 @@
         'name': 'variable.parameter.function.latex'
       '8':
         'name': 'punctuation.definition.arguments.end.latex'
-    'contentName': 'string.other.math.block.environment.latex'
+    'contentName': 'markup.other.math.block.environment.latex'
     'end': '(?:\\s*)((\\\\)end)(\\{)(\\4)(\\})'
     'name': 'meta.function.environment.math.latex'
     'patterns': [
@@ -1499,7 +1499,7 @@
         'name': 'variable.parameter.latex'
       '8':
         'name': 'punctuation.definition.arguments.optional.end.latex'
-    'contentName': 'string.other.math.block.environment.latex'
+    'contentName': 'markup.other.math.block.environment.latex'
     'end': '(?:\\s*)((\\\\)end)(\\{)(\\4)(\\})'
     'name': 'meta.function.environment.math.latex'
     'patterns': [
@@ -1521,7 +1521,7 @@
         'name': 'invalid.deprecated.environment.eqnarray.latex'
       '5':
         'name': 'punctuation.definition.arguments.end.latex'
-    'contentName': 'string.other.math.block.environment.latex'
+    'contentName': 'markup.other.math.block.environment.latex'
     'end': '(?:\\s*)((\\\\)end)(\\{)(\\4)(\\})'
     'name': 'meta.function.environment.math.latex'
     'patterns': [
@@ -2010,12 +2010,12 @@
     'begin': '\\\\\\('
     'beginCaptures':
       '0':
-        'name': 'punctuation.definition.string.begin.latex'
+        'name': 'punctuation.definition.markup.begin.latex'
     'end': '\\\\\\)'
     'endCaptures':
       '0':
         'name': 'punctuation.definition.string.end.latex'
-    'name': 'string.other.math.latex'
+    'name': 'markup.other.math.inline.latex'
     'patterns': [
       {
         'include': '$base'
@@ -2026,12 +2026,12 @@
     'begin': '\\\\\\['
     'beginCaptures':
       '0':
-        'name': 'punctuation.definition.string.begin.latex'
+        'name': 'punctuation.definition.markup.begin.latex'
     'end': '\\\\\\]'
     'endCaptures':
       '0':
         'name': 'punctuation.definition.string.end.latex'
-    'name': 'string.other.math.latex'
+    'name': 'markup.other.math.display.latex'
     'patterns': [
       {
         'include': '$base'
diff --git a/grammars/tex.cson b/grammars/tex.cson
index 30db355..52ea4dc 100644
--- a/grammars/tex.cson
+++ b/grammars/tex.cson
@@ -94,12 +94,12 @@
     'begin': '\\$\\$'
     'beginCaptures':
       '0':
-        'name': 'punctuation.definition.string.begin.tex'
+        'name': 'punctuation.definition.markup.begin.tex'
     'end': '\\$\\$'
     'endCaptures':
       '0':
-        'name': 'punctuation.definition.string.end.tex'
-    'name': 'string.other.math.block.tex'
+        'name': 'punctuation.definition.markup.end.tex'
+    'name': 'markup.other.math.display.tex'
     'patterns': [
       {
         'include': '#math'
@@ -117,12 +117,12 @@
     'begin': '\\$'
     'beginCaptures':
       '0':
-        'name': 'punctuation.definition.string.begin.tex'
+        'name': 'punctuation.definition.markup.begin.tex'
     'end': '\\$'
     'endCaptures':
       '0':
-        'name': 'punctuation.definition.string.end.tex'
-    'name': 'string.other.math.tex'
+        'name': 'punctuation.definition.markup.end.tex'
+    'name': 'markup.other.math.inline.tex'
     'patterns': [
       {
         'match': '\\\\\\$'
diff --git a/snippets/language-latex.cson b/snippets/language-latex.cson
index e463941..9e509b2 100644
--- a/snippets/language-latex.cson
+++ b/snippets/language-latex.cson
@@ -68,7 +68,7 @@
     'body': '$$1$$0'
 
 # math, taken from  https://github.com/SublimeText/LaTeXTools/blob/master/LaTeX%20math.sublime-completions
-'.text.tex.latex .string.other.math':
+'.text.tex.latex .markup.other.math':
   'math italic':
     'prefix': 'it'
     'body': '\\\\mathit{$1}$0'