diff --git a/grammars/textmate/python-markdown/scripts/grammar/tokenizer.ts b/grammars/textmate/python-markdown/scripts/grammar/tokenizer.ts
index cf5fcc4..c0990e2 100644
--- a/grammars/textmate/python-markdown/scripts/grammar/tokenizer.ts
+++ b/grammars/textmate/python-markdown/scripts/grammar/tokenizer.ts
@@ -175,8 +175,8 @@ function getEmbeddedGrammar(
   if (scope === "source.yaml") {
     return getYamlGrammar();
   }
-  if (scope === "text.tex.latex") {
-    return { name: "Test LaTeX", scopeName: scope, patterns: [] };
+  if (scope === "text.html.markdown.math") {
+    return { name: "Test Markdown Math", scopeName: scope, patterns: [] };
   }
 
   // Return a minimal grammar for every embedded language scope
diff --git a/grammars/textmate/python-markdown/src/python-markdown.tmLanguage.yml b/grammars/textmate/python-markdown/src/python-markdown.tmLanguage.yml
index fd8d017..74bad72 100644
--- a/grammars/textmate/python-markdown/src/python-markdown.tmLanguage.yml
+++ b/grammars/textmate/python-markdown/src/python-markdown.tmLanguage.yml
@@ -48,7 +48,6 @@ repository:
 
   flow:
     patterns:
-      - include: "#escape"
       - include: "#table"
       - include: "#admonition"
       - include: "#details"
@@ -377,25 +376,25 @@ repository:
   math:
     patterns:
       - name: markup.math.block.markdown
-        begin: (?:^|\G)(\$\$)
+        begin: (?:^|\G)[ \t]*(\$\$)[ \t]*$
         beginCaptures:
           1: { name: punctuation.definition.math.begin.markdown }
-        contentName: meta.embedded.block.latex
-        end: (\$\$)([ \t]*)(\r?\n|\r)?
+        contentName: meta.embedded.math.markdown
+        end: (?:^|\G)[ \t]*(\$\$)([ \t]*)(\r?\n|\r)?
         endCaptures:
           1: { name: punctuation.definition.math.end.markdown }
         patterns:
-          - include: text.tex.latex
+          - include: text.html.markdown.math
       - name: markup.math.block.markdown
-        begin: (?:^|\G)(\\\[)
+        begin: (?:^|\G)[ \t]*(\\\[)[ \t]*$
         beginCaptures:
           1: { name: punctuation.definition.math.begin.markdown }
-        contentName: meta.embedded.block.latex
-        end: (\\\])([ \t]*)(\r?\n|\r)?
+        contentName: meta.embedded.math.markdown
+        end: (?:^|\G)[ \t]*(\\\])([ \t]*)(\r?\n|\r)?
         endCaptures:
           1: { name: punctuation.definition.math.end.markdown }
         patterns:
-          - include: text.tex.latex
+          - include: text.html.markdown.math
 
   fenced_code:
     patterns:
@@ -654,25 +653,25 @@ repository:
   inline_math:
     patterns:
       - name: markup.math.inline.markdown
-        begin: (\$)(?=[^\s$])
+        begin: (?<!\\)(\$)(?![\s$])(?=(?:\\.|[^\\$\r\n])*?(?<!\s)\$)
         beginCaptures:
           1: { name: punctuation.definition.math.begin.markdown }
-        contentName: meta.embedded.inline.latex
-        end: (?<!\\)(?<![\s$])(\$)
+        contentName: meta.embedded.math.markdown
+        end: (?<!\\)(?<!\s)(\$)
         endCaptures:
           1: { name: punctuation.definition.math.end.markdown }
         patterns:
-          - include: text.tex.latex
+          - include: text.html.markdown.math
       - name: markup.math.inline.markdown
-        begin: (\\\()
+        begin: (\\\()(?=(?:\\[^)]|[^\\\r\n])*?(?<!\\)\\\))
         beginCaptures:
           1: { name: punctuation.definition.math.begin.markdown }
-        contentName: meta.embedded.inline.latex
+        contentName: meta.embedded.math.markdown
         end: (?<!\\)(\\\))
         endCaptures:
           1: { name: punctuation.definition.math.end.markdown }
         patterns:
-          - include: text.tex.latex
+          - include: text.html.markdown.math
 
   escape:
     patterns:
diff --git a/grammars/textmate/python-markdown/test/snapshots/inline_flow/emphasis.scopes.json b/grammars/textmate/python-markdown/test/snapshots/inline_flow/emphasis.scopes.json
index 862e469..b44b5fe 100644
--- a/grammars/textmate/python-markdown/test/snapshots/inline_flow/emphasis.scopes.json
+++ b/grammars/textmate/python-markdown/test/snapshots/inline_flow/emphasis.scopes.json
@@ -156,13 +156,15 @@
             "text": "\\*",
             "scopes": [
               "text.html.markdown.python",
+              "meta.paragraph.markdown",
               "constant.character.escape.markdown"
             ]
           },
           {
             "text": "Emphasis*",
             "scopes": [
-              "text.html.markdown.python"
+              "text.html.markdown.python",
+              "meta.paragraph.markdown"
             ]
           }
         ]
@@ -180,13 +182,15 @@
             "text": "\\_",
             "scopes": [
               "text.html.markdown.python",
+              "meta.paragraph.markdown",
               "constant.character.escape.markdown"
             ]
           },
           {
             "text": "Emphasis_",
             "scopes": [
-              "text.html.markdown.python"
+              "text.html.markdown.python",
+              "meta.paragraph.markdown"
             ]
           }
         ]
@@ -204,13 +208,15 @@
             "text": "\\*",
             "scopes": [
               "text.html.markdown.python",
+              "meta.paragraph.markdown",
               "constant.character.escape.markdown"
             ]
           },
           {
             "text": "*Strong**",
             "scopes": [
-              "text.html.markdown.python"
+              "text.html.markdown.python",
+              "meta.paragraph.markdown"
             ]
           }
         ]
@@ -228,13 +234,15 @@
             "text": "\\_",
             "scopes": [
               "text.html.markdown.python",
+              "meta.paragraph.markdown",
               "constant.character.escape.markdown"
             ]
           },
           {
             "text": "_Strong__",
             "scopes": [
-              "text.html.markdown.python"
+              "text.html.markdown.python",
+              "meta.paragraph.markdown"
             ]
           }
         ]
diff --git a/grammars/textmate/python-markdown/test/snapshots/inline_flow/footnote.scopes.json b/grammars/textmate/python-markdown/test/snapshots/inline_flow/footnote.scopes.json
index 8aeea8e..91f94ab 100644
--- a/grammars/textmate/python-markdown/test/snapshots/inline_flow/footnote.scopes.json
+++ b/grammars/textmate/python-markdown/test/snapshots/inline_flow/footnote.scopes.json
@@ -1347,13 +1347,15 @@
             "text": "\\[",
             "scopes": [
               "text.html.markdown.python",
+              "meta.paragraph.markdown",
               "constant.character.escape.markdown"
             ]
           },
           {
             "text": "^1]",
             "scopes": [
-              "text.html.markdown.python"
+              "text.html.markdown.python",
+              "meta.paragraph.markdown"
             ]
           }
         ]
diff --git a/grammars/textmate/python-markdown/test/snapshots/inline_flow/image.scopes.json b/grammars/textmate/python-markdown/test/snapshots/inline_flow/image.scopes.json
index 8fdc848..27c0c13 100644
--- a/grammars/textmate/python-markdown/test/snapshots/inline_flow/image.scopes.json
+++ b/grammars/textmate/python-markdown/test/snapshots/inline_flow/image.scopes.json
@@ -4528,13 +4528,62 @@
             "text": "\\!",
             "scopes": [
               "text.html.markdown.python",
+              "meta.paragraph.markdown",
               "constant.character.escape.markdown"
             ]
           },
           {
-            "text": "[text](href)",
+            "text": "[",
+            "scopes": [
+              "text.html.markdown.python",
+              "meta.paragraph.markdown",
+              "meta.link.inline.markdown",
+              "punctuation.definition.link.begin.markdown"
+            ]
+          },
+          {
+            "text": "text",
+            "scopes": [
+              "text.html.markdown.python",
+              "meta.paragraph.markdown",
+              "meta.link.inline.markdown",
+              "string.other.link.title.markdown"
+            ]
+          },
+          {
+            "text": "]",
             "scopes": [
-              "text.html.markdown.python"
+              "text.html.markdown.python",
+              "meta.paragraph.markdown",
+              "meta.link.inline.markdown",
+              "punctuation.definition.link.end.markdown"
+            ]
+          },
+          {
+            "text": "(",
+            "scopes": [
+              "text.html.markdown.python",
+              "meta.paragraph.markdown",
+              "meta.link.inline.markdown",
+              "punctuation.definition.link.begin.markdown"
+            ]
+          },
+          {
+            "text": "href",
+            "scopes": [
+              "text.html.markdown.python",
+              "meta.paragraph.markdown",
+              "meta.link.inline.markdown",
+              "markup.underline.link.markdown"
+            ]
+          },
+          {
+            "text": ")",
+            "scopes": [
+              "text.html.markdown.python",
+              "meta.paragraph.markdown",
+              "meta.link.inline.markdown",
+              "punctuation.definition.link.end.markdown"
             ]
           }
         ]
diff --git a/grammars/textmate/python-markdown/test/snapshots/inline_flow/image_reference.scopes.json b/grammars/textmate/python-markdown/test/snapshots/inline_flow/image_reference.scopes.json
index 35c7361..934a878 100644
--- a/grammars/textmate/python-markdown/test/snapshots/inline_flow/image_reference.scopes.json
+++ b/grammars/textmate/python-markdown/test/snapshots/inline_flow/image_reference.scopes.json
@@ -1545,13 +1545,62 @@
             "text": "\\!",
             "scopes": [
               "text.html.markdown.python",
+              "meta.paragraph.markdown",
               "constant.character.escape.markdown"
             ]
           },
           {
-            "text": "[Text][id]",
+            "text": "[",
+            "scopes": [
+              "text.html.markdown.python",
+              "meta.paragraph.markdown",
+              "meta.link.reference.markdown",
+              "punctuation.definition.link.begin.markdown"
+            ]
+          },
+          {
+            "text": "Text",
+            "scopes": [
+              "text.html.markdown.python",
+              "meta.paragraph.markdown",
+              "meta.link.reference.markdown",
+              "string.other.link.title.markdown"
+            ]
+          },
+          {
+            "text": "]",
             "scopes": [
-              "text.html.markdown.python"
+              "text.html.markdown.python",
+              "meta.paragraph.markdown",
+              "meta.link.reference.markdown",
+              "punctuation.definition.link.end.markdown"
+            ]
+          },
+          {
+            "text": "[",
+            "scopes": [
+              "text.html.markdown.python",
+              "meta.paragraph.markdown",
+              "meta.link.reference.markdown",
+              "punctuation.definition.link.begin.markdown"
+            ]
+          },
+          {
+            "text": "id",
+            "scopes": [
+              "text.html.markdown.python",
+              "meta.paragraph.markdown",
+              "meta.link.reference.markdown",
+              "constant.other.reference.link.markdown"
+            ]
+          },
+          {
+            "text": "]",
+            "scopes": [
+              "text.html.markdown.python",
+              "meta.paragraph.markdown",
+              "meta.link.reference.markdown",
+              "punctuation.definition.link.end.markdown"
             ]
           }
         ]
diff --git a/grammars/textmate/python-markdown/test/snapshots/inline_flow/keys.scopes.json b/grammars/textmate/python-markdown/test/snapshots/inline_flow/keys.scopes.json
index f10ee73..c6f619e 100644
--- a/grammars/textmate/python-markdown/test/snapshots/inline_flow/keys.scopes.json
+++ b/grammars/textmate/python-markdown/test/snapshots/inline_flow/keys.scopes.json
@@ -982,13 +982,15 @@
             "text": "\\+",
             "scopes": [
               "text.html.markdown.python",
+              "meta.paragraph.markdown",
               "constant.character.escape.markdown"
             ]
           },
           {
             "text": "+enter++",
             "scopes": [
-              "text.html.markdown.python"
+              "text.html.markdown.python",
+              "meta.paragraph.markdown"
             ]
           }
         ]
diff --git a/grammars/textmate/python-markdown/test/snapshots/inline_flow/link.scopes.json b/grammars/textmate/python-markdown/test/snapshots/inline_flow/link.scopes.json
index 8c061d4..a57f4f4 100644
--- a/grammars/textmate/python-markdown/test/snapshots/inline_flow/link.scopes.json
+++ b/grammars/textmate/python-markdown/test/snapshots/inline_flow/link.scopes.json
@@ -4252,13 +4252,15 @@
             "text": "\\[",
             "scopes": [
               "text.html.markdown.python",
+              "meta.paragraph.markdown",
               "constant.character.escape.markdown"
             ]
           },
           {
             "text": "text](href)",
             "scopes": [
-              "text.html.markdown.python"
+              "text.html.markdown.python",
+              "meta.paragraph.markdown"
             ]
           }
         ]
diff --git a/grammars/textmate/python-markdown/test/snapshots/inline_flow/link_reference.scopes.json b/grammars/textmate/python-markdown/test/snapshots/inline_flow/link_reference.scopes.json
index 6618e93..14a6fc0 100644
--- a/grammars/textmate/python-markdown/test/snapshots/inline_flow/link_reference.scopes.json
+++ b/grammars/textmate/python-markdown/test/snapshots/inline_flow/link_reference.scopes.json
@@ -1398,13 +1398,42 @@
             "text": "\\[",
             "scopes": [
               "text.html.markdown.python",
+              "meta.paragraph.markdown",
               "constant.character.escape.markdown"
             ]
           },
           {
-            "text": "Text][id]",
+            "text": "Text]",
+            "scopes": [
+              "text.html.markdown.python",
+              "meta.paragraph.markdown"
+            ]
+          },
+          {
+            "text": "[",
+            "scopes": [
+              "text.html.markdown.python",
+              "meta.paragraph.markdown",
+              "meta.link.reference.markdown",
+              "punctuation.definition.link.begin.markdown"
+            ]
+          },
+          {
+            "text": "id",
             "scopes": [
-              "text.html.markdown.python"
+              "text.html.markdown.python",
+              "meta.paragraph.markdown",
+              "meta.link.reference.markdown",
+              "string.other.link.title.markdown"
+            ]
+          },
+          {
+            "text": "]",
+            "scopes": [
+              "text.html.markdown.python",
+              "meta.paragraph.markdown",
+              "meta.link.reference.markdown",
+              "punctuation.definition.link.end.markdown"
             ]
           }
         ]
diff --git a/grammars/textmate/python-markdown/test/snapshots/inline_flow/math.scopes.json b/grammars/textmate/python-markdown/test/snapshots/inline_flow/math.scopes.json
index 3c06e3b..be6b0aa 100644
--- a/grammars/textmate/python-markdown/test/snapshots/inline_flow/math.scopes.json
+++ b/grammars/textmate/python-markdown/test/snapshots/inline_flow/math.scopes.json
@@ -1,8 +1,8 @@
 {
-  "marker": {
-    "accept_dollar": [
+  "dollar_valid": {
+    "accept_plain": [
       {
-        "line": "$Math$",
+        "line": "$a$",
         "tokens": [
           {
             "text": "$",
@@ -14,12 +14,12 @@
             ]
           },
           {
-            "text": "Math",
+            "text": "a",
             "scopes": [
               "text.html.markdown.python",
               "meta.paragraph.markdown",
               "markup.math.inline.markdown",
-              "meta.embedded.inline.latex"
+              "meta.embedded.math.markdown"
             ]
           },
           {
@@ -38,9 +38,9 @@
         "tokens": []
       }
     ],
-    "accept_dollar_with_parentheses": [
+    "accept_commands": [
       {
-        "line": "$(Math)$",
+        "line": "$\\alpha + \\beta$",
         "tokens": [
           {
             "text": "$",
@@ -52,12 +52,12 @@
             ]
           },
           {
-            "text": "(Math)",
+            "text": "\\alpha + \\beta",
             "scopes": [
               "text.html.markdown.python",
               "meta.paragraph.markdown",
               "markup.math.inline.markdown",
-              "meta.embedded.inline.latex"
+              "meta.embedded.math.markdown"
             ]
           },
           {
@@ -76,9 +76,9 @@
         "tokens": []
       }
     ],
-    "accept_dollar_with_escaped_dollar": [
+    "accept_parenthesized": [
       {
-        "line": "$Math \\$ Text$",
+        "line": "$(a)$",
         "tokens": [
           {
             "text": "$",
@@ -90,12 +90,12 @@
             ]
           },
           {
-            "text": "Math \\$ Text",
+            "text": "(a)",
             "scopes": [
               "text.html.markdown.python",
               "meta.paragraph.markdown",
               "markup.math.inline.markdown",
-              "meta.embedded.inline.latex"
+              "meta.embedded.math.markdown"
             ]
           },
           {
@@ -114,9 +114,9 @@
         "tokens": []
       }
     ],
-    "accept_dollar_with_closing_marker": [
+    "accept_escaped_dollar": [
       {
-        "line": "$Math $ Text$",
+        "line": "$a \\$ b$",
         "tokens": [
           {
             "text": "$",
@@ -128,12 +128,12 @@
             ]
           },
           {
-            "text": "Math $ Text",
+            "text": "a \\$ b",
             "scopes": [
               "text.html.markdown.python",
               "meta.paragraph.markdown",
               "markup.math.inline.markdown",
-              "meta.embedded.inline.latex"
+              "meta.embedded.math.markdown"
             ]
           },
           {
@@ -152,9 +152,9 @@
         "tokens": []
       }
     ],
-    "accept_dollar_with_trailing_marker": [
+    "accept_trailing_marker": [
       {
-        "line": "$Math$$",
+        "line": "$a$$",
         "tokens": [
           {
             "text": "$",
@@ -166,12 +166,12 @@
             ]
           },
           {
-            "text": "Math",
+            "text": "a",
             "scopes": [
               "text.html.markdown.python",
               "meta.paragraph.markdown",
               "markup.math.inline.markdown",
-              "meta.embedded.inline.latex"
+              "meta.embedded.math.markdown"
             ]
           },
           {
@@ -197,24 +197,42 @@
         "tokens": []
       }
     ],
-    "accept_dollar_with_leading_marker": [
+    "accept_leading_marker": [
       {
-        "line": "$$Math$",
+        "line": "$$a$",
         "tokens": [
           {
-            "text": "$$",
+            "text": "$",
             "scopes": [
               "text.html.markdown.python",
-              "markup.math.block.markdown",
+              "meta.paragraph.markdown"
+            ]
+          },
+          {
+            "text": "$",
+            "scopes": [
+              "text.html.markdown.python",
+              "meta.paragraph.markdown",
+              "markup.math.inline.markdown",
               "punctuation.definition.math.begin.markdown"
             ]
           },
           {
-            "text": "Math$",
+            "text": "a",
             "scopes": [
               "text.html.markdown.python",
-              "markup.math.block.markdown",
-              "meta.embedded.block.latex"
+              "meta.paragraph.markdown",
+              "markup.math.inline.markdown",
+              "meta.embedded.math.markdown"
+            ]
+          },
+          {
+            "text": "$",
+            "scopes": [
+              "text.html.markdown.python",
+              "meta.paragraph.markdown",
+              "markup.math.inline.markdown",
+              "punctuation.definition.math.end.markdown"
             ]
           }
         ]
@@ -224,28 +242,42 @@
         "tokens": []
       }
     ],
-    "accept_round": [
+    "accept_before_text": [
       {
-        "line": "\\(Math\\)",
+        "line": "$a$ Text",
         "tokens": [
           {
-            "text": "\\(",
+            "text": "$",
             "scopes": [
               "text.html.markdown.python",
-              "constant.character.escape.markdown"
+              "meta.paragraph.markdown",
+              "markup.math.inline.markdown",
+              "punctuation.definition.math.begin.markdown"
             ]
           },
           {
-            "text": "Math",
+            "text": "a",
             "scopes": [
-              "text.html.markdown.python"
+              "text.html.markdown.python",
+              "meta.paragraph.markdown",
+              "markup.math.inline.markdown",
+              "meta.embedded.math.markdown"
             ]
           },
           {
-            "text": "\\)",
+            "text": "$",
             "scopes": [
               "text.html.markdown.python",
-              "constant.character.escape.markdown"
+              "meta.paragraph.markdown",
+              "markup.math.inline.markdown",
+              "punctuation.definition.math.end.markdown"
+            ]
+          },
+          {
+            "text": " Text",
+            "scopes": [
+              "text.html.markdown.python",
+              "meta.paragraph.markdown"
             ]
           }
         ]
@@ -255,41 +287,42 @@
         "tokens": []
       }
     ],
-    "accept_round_with_escaped_parentheses": [
+    "accept_after_text": [
       {
-        "line": "\\(Math \\\\) Text\\)",
+        "line": "Text $a$",
         "tokens": [
           {
-            "text": "\\(",
+            "text": "Text ",
             "scopes": [
               "text.html.markdown.python",
-              "constant.character.escape.markdown"
-            ]
-          },
-          {
-            "text": "Math ",
-            "scopes": [
-              "text.html.markdown.python"
+              "meta.paragraph.markdown"
             ]
           },
           {
-            "text": "\\\\",
+            "text": "$",
             "scopes": [
               "text.html.markdown.python",
-              "constant.character.escape.markdown"
+              "meta.paragraph.markdown",
+              "markup.math.inline.markdown",
+              "punctuation.definition.math.begin.markdown"
             ]
           },
           {
-            "text": ") Text",
+            "text": "a",
             "scopes": [
-              "text.html.markdown.python"
+              "text.html.markdown.python",
+              "meta.paragraph.markdown",
+              "markup.math.inline.markdown",
+              "meta.embedded.math.markdown"
             ]
           },
           {
-            "text": "\\)",
+            "text": "$",
             "scopes": [
               "text.html.markdown.python",
-              "constant.character.escape.markdown"
+              "meta.paragraph.markdown",
+              "markup.math.inline.markdown",
+              "punctuation.definition.math.end.markdown"
             ]
           }
         ]
@@ -298,13 +331,18 @@
         "line": "",
         "tokens": []
       }
-    ]
-  },
-  "position": {
-    "accept_before_text": [
+    ],
+    "accept_inside_word": [
       {
-        "line": "$Math$ Text",
+        "line": "x$a$y",
         "tokens": [
+          {
+            "text": "x",
+            "scopes": [
+              "text.html.markdown.python",
+              "meta.paragraph.markdown"
+            ]
+          },
           {
             "text": "$",
             "scopes": [
@@ -315,12 +353,12 @@
             ]
           },
           {
-            "text": "Math",
+            "text": "a",
             "scopes": [
               "text.html.markdown.python",
               "meta.paragraph.markdown",
               "markup.math.inline.markdown",
-              "meta.embedded.inline.latex"
+              "meta.embedded.math.markdown"
             ]
           },
           {
@@ -333,7 +371,7 @@
             ]
           },
           {
-            "text": " Text",
+            "text": "y",
             "scopes": [
               "text.html.markdown.python",
               "meta.paragraph.markdown"
@@ -346,17 +384,10 @@
         "tokens": []
       }
     ],
-    "accept_after_text": [
+    "accept_before_punctuation": [
       {
-        "line": "Text $Math$",
+        "line": "$a$,",
         "tokens": [
-          {
-            "text": "Text ",
-            "scopes": [
-              "text.html.markdown.python",
-              "meta.paragraph.markdown"
-            ]
-          },
           {
             "text": "$",
             "scopes": [
@@ -367,12 +398,12 @@
             ]
           },
           {
-            "text": "Math",
+            "text": "a",
             "scopes": [
               "text.html.markdown.python",
               "meta.paragraph.markdown",
               "markup.math.inline.markdown",
-              "meta.embedded.inline.latex"
+              "meta.embedded.math.markdown"
             ]
           },
           {
@@ -383,6 +414,13 @@
               "markup.math.inline.markdown",
               "punctuation.definition.math.end.markdown"
             ]
+          },
+          {
+            "text": ",",
+            "scopes": [
+              "text.html.markdown.python",
+              "meta.paragraph.markdown"
+            ]
           }
         ]
       },
@@ -393,7 +431,7 @@
     ],
     "accept_inside_emphasis": [
       {
-        "line": "*$Math$*",
+        "line": "*$a$*",
         "tokens": [
           {
             "text": "*",
@@ -415,13 +453,13 @@
             ]
           },
           {
-            "text": "Math",
+            "text": "a",
             "scopes": [
               "text.html.markdown.python",
               "meta.paragraph.markdown",
               "markup.italic.markdown",
               "markup.math.inline.markdown",
-              "meta.embedded.inline.latex"
+              "meta.embedded.math.markdown"
             ]
           },
           {
@@ -452,7 +490,7 @@
     ],
     "accept_inside_link": [
       {
-        "line": "[$Math$](href)",
+        "line": "[$a$](href)",
         "tokens": [
           {
             "text": "[",
@@ -475,14 +513,14 @@
             ]
           },
           {
-            "text": "Math",
+            "text": "a",
             "scopes": [
               "text.html.markdown.python",
               "meta.paragraph.markdown",
               "meta.link.inline.markdown",
               "string.other.link.title.markdown",
               "markup.math.inline.markdown",
-              "meta.embedded.inline.latex"
+              "meta.embedded.math.markdown"
             ]
           },
           {
@@ -540,13 +578,13 @@
       }
     ]
   },
-  "line_ending": {
-    "accept_dollar_with_line_ending": [
+  "round_valid": {
+    "accept_plain": [
       {
-        "line": "$Math",
+        "line": "\\(a\\)",
         "tokens": [
           {
-            "text": "$",
+            "text": "\\(",
             "scopes": [
               "text.html.markdown.python",
               "meta.paragraph.markdown",
@@ -555,30 +593,54 @@
             ]
           },
           {
-            "text": "Math",
+            "text": "a",
+            "scopes": [
+              "text.html.markdown.python",
+              "meta.paragraph.markdown",
+              "markup.math.inline.markdown",
+              "meta.embedded.math.markdown"
+            ]
+          },
+          {
+            "text": "\\)",
             "scopes": [
               "text.html.markdown.python",
               "meta.paragraph.markdown",
               "markup.math.inline.markdown",
-              "meta.embedded.inline.latex"
+              "punctuation.definition.math.end.markdown"
             ]
           }
         ]
       },
       {
-        "line": "Text$",
+        "line": "",
+        "tokens": []
+      }
+    ],
+    "accept_commands": [
+      {
+        "line": "\\(\\begin{matrix} a & b \\\\ c & d \\end{matrix}\\)",
         "tokens": [
           {
-            "text": "Text",
+            "text": "\\(",
             "scopes": [
               "text.html.markdown.python",
               "meta.paragraph.markdown",
               "markup.math.inline.markdown",
-              "meta.embedded.inline.latex"
+              "punctuation.definition.math.begin.markdown"
             ]
           },
           {
-            "text": "$",
+            "text": "\\begin{matrix} a & b \\\\ c & d \\end{matrix}",
+            "scopes": [
+              "text.html.markdown.python",
+              "meta.paragraph.markdown",
+              "markup.math.inline.markdown",
+              "meta.embedded.math.markdown"
+            ]
+          },
+          {
+            "text": "\\)",
             "scopes": [
               "text.html.markdown.python",
               "meta.paragraph.markdown",
@@ -593,33 +655,26 @@
         "tokens": []
       }
     ],
-    "accept_round_with_line_ending": [
+    "accept_escaped_closer": [
       {
-        "line": "\\(Math",
+        "line": "\\(a \\\\) b\\)",
         "tokens": [
           {
             "text": "\\(",
             "scopes": [
               "text.html.markdown.python",
-              "constant.character.escape.markdown"
+              "meta.paragraph.markdown",
+              "markup.math.inline.markdown",
+              "punctuation.definition.math.begin.markdown"
             ]
           },
           {
-            "text": "Math",
-            "scopes": [
-              "text.html.markdown.python"
-            ]
-          }
-        ]
-      },
-      {
-        "line": "Text\\)",
-        "tokens": [
-          {
-            "text": "Text",
+            "text": "a \\\\) b",
             "scopes": [
               "text.html.markdown.python",
-              "meta.paragraph.markdown"
+              "meta.paragraph.markdown",
+              "markup.math.inline.markdown",
+              "meta.embedded.math.markdown"
             ]
           },
           {
@@ -627,7 +682,8 @@
             "scopes": [
               "text.html.markdown.python",
               "meta.paragraph.markdown",
-              "constant.character.escape.markdown"
+              "markup.math.inline.markdown",
+              "punctuation.definition.math.end.markdown"
             ]
           }
         ]
@@ -638,8 +694,8 @@
       }
     ]
   },
-  "rejection": {
-    "reject_dollar_with_opening_space": [
+  "dollar_invalid": {
+    "reject_opening_space": [
       {
         "line": "$ Math$",
         "tokens": [
@@ -657,7 +713,7 @@
         "tokens": []
       }
     ],
-    "reject_dollar_with_opening_tab": [
+    "reject_opening_tab": [
       {
         "line": "$\tMath$",
         "tokens": [
@@ -675,26 +731,15 @@
         "tokens": []
       }
     ],
-    "reject_dollar_with_closing_space": [
+    "reject_closing_space": [
       {
         "line": "$Math $",
         "tokens": [
           {
-            "text": "$",
-            "scopes": [
-              "text.html.markdown.python",
-              "meta.paragraph.markdown",
-              "markup.math.inline.markdown",
-              "punctuation.definition.math.begin.markdown"
-            ]
-          },
-          {
-            "text": "Math $",
+            "text": "$Math $",
             "scopes": [
               "text.html.markdown.python",
-              "meta.paragraph.markdown",
-              "markup.math.inline.markdown",
-              "meta.embedded.inline.latex"
+              "meta.paragraph.markdown"
             ]
           }
         ]
@@ -704,26 +749,33 @@
         "tokens": []
       }
     ],
-    "reject_dollar_with_closing_tab": [
+    "reject_closing_tab": [
       {
         "line": "$Math\t$",
         "tokens": [
           {
-            "text": "$",
+            "text": "$Math\t$",
             "scopes": [
               "text.html.markdown.python",
-              "meta.paragraph.markdown",
-              "markup.math.inline.markdown",
-              "punctuation.definition.math.begin.markdown"
+              "meta.paragraph.markdown"
             ]
-          },
+          }
+        ]
+      },
+      {
+        "line": "",
+        "tokens": []
+      }
+    ],
+    "reject_unterminated": [
+      {
+        "line": "$a",
+        "tokens": [
           {
-            "text": "Math\t$",
+            "text": "$a",
             "scopes": [
               "text.html.markdown.python",
-              "meta.paragraph.markdown",
-              "markup.math.inline.markdown",
-              "meta.embedded.inline.latex"
+              "meta.paragraph.markdown"
             ]
           }
         ]
@@ -733,40 +785,41 @@
         "tokens": []
       }
     ],
-    "reject_dollar_with_closing_line_ending": [
+    "reject_escaped_opening": [
       {
-        "line": "$Math",
+        "line": "\\$a$",
         "tokens": [
           {
-            "text": "$",
+            "text": "\\$",
             "scopes": [
               "text.html.markdown.python",
               "meta.paragraph.markdown",
-              "markup.math.inline.markdown",
-              "punctuation.definition.math.begin.markdown"
+              "constant.character.escape.markdown"
             ]
           },
           {
-            "text": "Math",
+            "text": "a$",
             "scopes": [
               "text.html.markdown.python",
-              "meta.paragraph.markdown",
-              "markup.math.inline.markdown",
-              "meta.embedded.inline.latex"
+              "meta.paragraph.markdown"
             ]
           }
         ]
       },
       {
-        "line": "$",
+        "line": "",
+        "tokens": []
+      }
+    ],
+    "reject_closing_marker_as_text": [
+      {
+        "line": "$a $ b$",
         "tokens": [
           {
-            "text": "$",
+            "text": "$a $ b$",
             "scopes": [
               "text.html.markdown.python",
-              "meta.paragraph.markdown",
-              "markup.math.inline.markdown",
-              "punctuation.definition.math.end.markdown"
+              "meta.paragraph.markdown"
             ]
           }
         ]
@@ -775,27 +828,26 @@
         "line": "",
         "tokens": []
       }
-    ],
-    "reject_dollar_unterminated": [
+    ]
+  },
+  "round_invalid": {
+    "reject_unterminated": [
       {
-        "line": "$Math",
+        "line": "\\(a",
         "tokens": [
           {
-            "text": "$",
+            "text": "\\(",
             "scopes": [
               "text.html.markdown.python",
               "meta.paragraph.markdown",
-              "markup.math.inline.markdown",
-              "punctuation.definition.math.begin.markdown"
+              "constant.character.escape.markdown"
             ]
           },
           {
-            "text": "Math",
+            "text": "a",
             "scopes": [
               "text.html.markdown.python",
-              "meta.paragraph.markdown",
-              "markup.math.inline.markdown",
-              "meta.embedded.inline.latex"
+              "meta.paragraph.markdown"
             ]
           }
         ]
@@ -805,21 +857,23 @@
         "tokens": []
       }
     ],
-    "reject_dollar_with_escaped_opening": [
+    "reject_blank_line": [
       {
-        "line": "\\$Math$",
+        "line": "\\(a",
         "tokens": [
           {
-            "text": "\\$",
+            "text": "\\(",
             "scopes": [
               "text.html.markdown.python",
+              "meta.paragraph.markdown",
               "constant.character.escape.markdown"
             ]
           },
           {
-            "text": "Math$",
+            "text": "a",
             "scopes": [
-              "text.html.markdown.python"
+              "text.html.markdown.python",
+              "meta.paragraph.markdown"
             ]
           }
         ]
@@ -827,23 +881,23 @@
       {
         "line": "",
         "tokens": []
-      }
-    ],
-    "reject_round_unterminated": [
+      },
       {
-        "line": "\\(Math",
+        "line": "b\\)",
         "tokens": [
           {
-            "text": "\\(",
+            "text": "b",
             "scopes": [
               "text.html.markdown.python",
-              "constant.character.escape.markdown"
+              "meta.paragraph.markdown"
             ]
           },
           {
-            "text": "Math",
+            "text": "\\)",
             "scopes": [
-              "text.html.markdown.python"
+              "text.html.markdown.python",
+              "meta.paragraph.markdown",
+              "constant.character.escape.markdown"
             ]
           }
         ]
@@ -853,7 +907,7 @@
         "tokens": []
       }
     ],
-    "reject_square_block_math": [
+    "reject_inline_square_form": [
       {
         "line": "\\[Math\\]",
         "tokens": [
@@ -861,19 +915,22 @@
             "text": "\\[",
             "scopes": [
               "text.html.markdown.python",
+              "meta.paragraph.markdown",
               "constant.character.escape.markdown"
             ]
           },
           {
             "text": "Math",
             "scopes": [
-              "text.html.markdown.python"
+              "text.html.markdown.python",
+              "meta.paragraph.markdown"
             ]
           },
           {
             "text": "\\]",
             "scopes": [
               "text.html.markdown.python",
+              "meta.paragraph.markdown",
               "constant.character.escape.markdown"
             ]
           }
diff --git a/grammars/textmate/python-markdown/test/snapshots/inline_flow/smart_symbol.scopes.json b/grammars/textmate/python-markdown/test/snapshots/inline_flow/smart_symbol.scopes.json
index 2f4fd1e..4c83109 100644
--- a/grammars/textmate/python-markdown/test/snapshots/inline_flow/smart_symbol.scopes.json
+++ b/grammars/textmate/python-markdown/test/snapshots/inline_flow/smart_symbol.scopes.json
@@ -533,13 +533,15 @@
             "text": "\\(",
             "scopes": [
               "text.html.markdown.python",
+              "meta.paragraph.markdown",
               "constant.character.escape.markdown"
             ]
           },
           {
             "text": "c)",
             "scopes": [
-              "text.html.markdown.python"
+              "text.html.markdown.python",
+              "meta.paragraph.markdown"
             ]
           }
         ]
diff --git a/grammars/textmate/python-markdown/test/specs/inline_flow/math.md b/grammars/textmate/python-markdown/test/specs/inline_flow/math.md
index 44b6c5c..e074377 100644
--- a/grammars/textmate/python-markdown/test/specs/inline_flow/math.md
+++ b/grammars/textmate/python-markdown/test/specs/inline_flow/math.md
@@ -1,147 +1,158 @@
-## marker
+## dollar_valid
 
-### accept_dollar
+### accept_plain
 
 ``` md
-$Math$
+$a$
 ```
 
-### accept_dollar_with_parentheses
+### accept_commands
 
 ``` md
-$(Math)$
+$\alpha + \beta$
 ```
 
-### accept_dollar_with_escaped_dollar
+### accept_parenthesized
 
 ``` md
-$Math \$ Text$
+$(a)$
 ```
 
-### accept_dollar_with_closing_marker
+### accept_escaped_dollar
 
 ``` md
-$Math $ Text$
+$a \$ b$
 ```
 
-### accept_dollar_with_trailing_marker
+### accept_trailing_marker
 
 ``` md
-$Math$$
+$a$$
 ```
 
-### accept_dollar_with_leading_marker
+### accept_leading_marker
 
 ``` md
-$$Math$
+$$a$
 ```
 
-### accept_round
+### accept_before_text
 
 ``` md
-\(Math\)
+$a$ Text
 ```
 
-### accept_round_with_escaped_parentheses
+### accept_after_text
 
 ``` md
-\(Math \\) Text\)
+Text $a$
 ```
 
-## position
-
-### accept_before_text
+### accept_inside_word
 
 ``` md
-$Math$ Text
+x$a$y
 ```
 
-### accept_after_text
+### accept_before_punctuation
 
 ``` md
-Text $Math$
+$a$,
 ```
 
 ### accept_inside_emphasis
 
 ``` md
-*$Math$*
+*$a$*
 ```
 
 ### accept_inside_link
 
 ``` md
-[$Math$](href)
+[$a$](href)
 ```
 
-## line_ending
+## round_valid
 
-### accept_dollar_with_line_ending
+### accept_plain
 
 ``` md
-$Math
-Text$
+\(a\)
 ```
 
-### accept_round_with_line_ending
+### accept_commands
 
 ``` md
-\(Math
-Text\)
+\(\begin{matrix} a & b \\ c & d \end{matrix}\)
 ```
 
-## rejection
+### accept_escaped_closer
+
+``` md
+\(a \\) b\)
+```
 
-### reject_dollar_with_opening_space
+## dollar_invalid
+
+### reject_opening_space
 
 ``` md
 $ Math$
 ```
 
-### reject_dollar_with_opening_tab
+### reject_opening_tab
 
 ``` md
 $	Math$
 ```
 
-### reject_dollar_with_closing_space
+### reject_closing_space
 
 ``` md
 $Math $
 ```
 
-### reject_dollar_with_closing_tab
+### reject_closing_tab
 
 ``` md
 $Math	$
 ```
 
-### reject_dollar_with_closing_line_ending
+### reject_unterminated
 
 ``` md
-$Math
-$
+$a
 ```
 
-### reject_dollar_unterminated
+### reject_escaped_opening
 
 ``` md
-$Math
+\$a$
 ```
 
-### reject_dollar_with_escaped_opening
+### reject_closing_marker_as_text
 
 ``` md
-\$Math$
+$a $ b$
 ```
 
-### reject_round_unterminated
+## round_invalid
+
+### reject_unterminated
 
 ``` md
-\(Math
+\(a
+```
+
+### reject_blank_line
+
+``` md
+\(a
+
+b\)
 ```
 
-### reject_square_block_math
+### reject_inline_square_form
 
 ``` md
 \[Math\]
diff --git a/integrations/code/syntaxes/python-markdown.tmLanguage.json b/integrations/code/syntaxes/python-markdown.tmLanguage.json
index 21e50e8..4a62335 100644
--- a/integrations/code/syntaxes/python-markdown.tmLanguage.json
+++ b/integrations/code/syntaxes/python-markdown.tmLanguage.json
@@ -45,9 +45,6 @@
     },
     "flow": {
       "patterns": [
-        {
-          "include": "#escape"
-        },
         {
           "include": "#table"
         },
@@ -821,14 +818,14 @@
       "patterns": [
         {
           "name": "markup.math.block.markdown",
-          "begin": "(?:^|\\G)(\\$\\$)",
+          "begin": "(?:^|\\G)[ \\t]*(\\$\\$)[ \\t]*$",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.math.begin.markdown"
             }
           },
-          "contentName": "meta.embedded.block.latex",
-          "end": "(\\$\\$)([ \\t]*)(\\r?\\n|\\r)?",
+          "contentName": "meta.embedded.math.markdown",
+          "end": "(?:^|\\G)[ \\t]*(\\$\\$)([ \\t]*)(\\r?\\n|\\r)?",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.math.end.markdown"
@@ -836,20 +833,20 @@
           },
           "patterns": [
             {
-              "include": "text.tex.latex"
+              "include": "text.html.markdown.math"
             }
           ]
         },
         {
           "name": "markup.math.block.markdown",
-          "begin": "(?:^|\\G)(\\\\\\[)",
+          "begin": "(?:^|\\G)[ \\t]*(\\\\\\[)[ \\t]*$",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.math.begin.markdown"
             }
           },
-          "contentName": "meta.embedded.block.latex",
-          "end": "(\\\\\\])([ \\t]*)(\\r?\\n|\\r)?",
+          "contentName": "meta.embedded.math.markdown",
+          "end": "(?:^|\\G)[ \\t]*(\\\\\\])([ \\t]*)(\\r?\\n|\\r)?",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.math.end.markdown"
@@ -857,7 +854,7 @@
           },
           "patterns": [
             {
-              "include": "text.tex.latex"
+              "include": "text.html.markdown.math"
             }
           ]
         }
@@ -10512,14 +10509,14 @@
       "patterns": [
         {
           "name": "markup.math.inline.markdown",
-          "begin": "(\\$)(?=[^\\s$])",
+          "begin": "(?<!\\\\)(\\$)(?![\\s$])(?=(?:\\\\.|[^\\\\$\\r\\n])*?(?<!\\s)\\$)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.math.begin.markdown"
             }
           },
-          "contentName": "meta.embedded.inline.latex",
-          "end": "(?<!\\\\)(?<![\\s$])(\\$)",
+          "contentName": "meta.embedded.math.markdown",
+          "end": "(?<!\\\\)(?<!\\s)(\\$)",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.math.end.markdown"
@@ -10527,19 +10524,19 @@
           },
           "patterns": [
             {
-              "include": "text.tex.latex"
+              "include": "text.html.markdown.math"
             }
           ]
         },
         {
           "name": "markup.math.inline.markdown",
-          "begin": "(\\\\\\()",
+          "begin": "(\\\\\\()(?=(?:\\\\[^)]|[^\\\\\\r\\n])*?(?<!\\\\)\\\\\\))",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.math.begin.markdown"
             }
           },
-          "contentName": "meta.embedded.inline.latex",
+          "contentName": "meta.embedded.math.markdown",
           "end": "(?<!\\\\)(\\\\\\))",
           "endCaptures": {
             "1": {
@@ -10548,7 +10545,7 @@
           },
           "patterns": [
             {
-              "include": "text.tex.latex"
+              "include": "text.html.markdown.math"
             }
           ]
         }