diff --git a/syntaxes/Shell (for Markdown).sublime-syntax b/syntaxes/Shell (for Markdown).sublime-syntax
index 74443cd4..23190627 100644
--- a/syntaxes/Shell (for Markdown).sublime-syntax	
+++ b/syntaxes/Shell (for Markdown).sublime-syntax	
@@ -2,24 +2,25 @@
 ---
 name: Interactive Unix Shell
 scope: source.shell.interactive.markdown
+version: 2
 hidden: true
 
+extends: Packages/ShellScript/Shell-Unix-Generic.sublime-syntax
+
 contexts:
+  prototype:
+    - meta_prepend: true
+    # continuation lines begin with `> `
+    - match: ^>(?=\s)
+      scope: comment.other.shell
+
   main:
     - match: ^(?=\$\s)
       push: shell-interactive
-    - include: shell-statements
+    - include: statements
 
   shell-interactive:
     - match: ^\$(?=\s)
       scope: comment.other.shell
-      push: shell-statements
-      with_prototype:
-        # continuation lines begin with `> `
-        - match: ^>(?=\s)
-          scope: comment.other.shell
-        - match: ^
-          pop: true
-
-  shell-statements:
-    - include: scope:source.shell
+      embed: statements
+      escape: (?<![^\\]\\)(?<![\\]{3})\n
diff --git a/tests/syntax_test_markdown.md b/tests/syntax_test_markdown.md
index c46d285d..e53d8b9c 100644
--- a/tests/syntax_test_markdown.md
+++ b/tests/syntax_test_markdown.md
@@ -1934,13 +1934,13 @@ unclosed_paren = (
 
 ```shell
 function foo () {
-| <- markup.raw.code-fence.shell.markdown-gfm source.shell.interactive.markdown meta.function.shell storage.type
+| <- markup.raw.code-fence.shell.markdown-gfm source.shell.interactive.markdown meta.function.shell keyword.declaration.function.shell 
 }
-| <- markup.raw.code-fence.shell.markdown-gfm source.shell.interactive.markdown meta.function.shell punctuation.section
+| <- markup.raw.code-fence.shell.markdown-gfm source.shell.interactive.markdown meta.function.shell meta.compound.shell punctuation.section.compound.end.shell
 
 $ ls ~
 | <- markup.raw.code-fence.shell.markdown-gfm source.shell.interactive comment.other.shell
-| ^^ meta.function-call.shell variable.function.shell
+| ^^ meta.function-call.identifier.shell variable.function.shell
 |   ^^ meta.function-call.arguments.shell
 
 output.txt