diff --git a/grammar/janet.tmLanguage b/grammar/janet.tmLanguage
index 77fb9efe..f9f036a1 100644
--- a/grammar/janet.tmLanguage
+++ b/grammar/janet.tmLanguage
@@ -55,6 +55,14 @@
 					<key>include</key>
 					<string>#readermac</string>
 				</dict>
+				<dict>
+					<key>include</key>
+					<string>#string</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#longstring</string>
+				</dict>
 				<dict>
 					<key>include</key>
 					<string>#literal</string>
@@ -83,14 +91,6 @@
 					<key>include</key>
 					<string>#symbol</string>
 				</dict>
-				<dict>
-					<key>include</key>
-					<string>#string</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#longstring</string>
-				</dict>
 			</array>
 		</dict>
 		<key>comment</key>
@@ -261,7 +261,7 @@
 			<string>(@?")</string>
 			<key>beginCaptures</key>
 			<dict>
-				<key>0</key>
+				<key>1</key>
 				<dict>
 					<key>name</key>
 					<string>punctuation.definition.string.begin.janet</string>
@@ -271,7 +271,7 @@
 			<string>(")</string>
 			<key>endCaptures</key>
 			<dict>
-				<key>0</key>
+				<key>1</key>
 				<dict>
 					<key>name</key>
 					<string>punctuation.definition.string.end.janet</string>
@@ -292,20 +292,25 @@
 		<key>longstring</key>
 		<dict>
 			<key>begin</key>
-			<string>@?(`+)</string>
+			<string>(@?)(`+)</string>
 			<key>beginCaptures</key>
 			<dict>
-				<key>0</key>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.string.begin.janet</string>
+				</dict>
+				<key>2</key>
 				<dict>
 					<key>name</key>
 					<string>punctuation.definition.string.begin.janet</string>
 				</dict>
 			</dict>
 			<key>end</key>
-			<string>\1</string>
+			<string>\2</string>
 			<key>endCaptures</key>
 			<dict>
-				<key>0</key>
+				<key>1</key>
 				<dict>
 					<key>name</key>
 					<string>punctuation.definition.string.end.janet</string>
diff --git a/grammar/tmcorelib.janet b/grammar/tmcorelib.janet
index 3255d602..b1e9d5dd 100644
--- a/grammar/tmcorelib.janet
+++ b/grammar/tmcorelib.janet
@@ -18,7 +18,7 @@
    47 "&#47;"})
 
 (defn- escape
-  "Escape special characters for HTML encoding."
+  "Escape special characters for HTML and regex encoding."
   [str]
   (def buf @"")
   (loop [byte :in str]