diff --git a/syntaxes/liquid.tmLanguage b/syntaxes/liquid.tmLanguage
index 8acd1a6..a36b16a 100644
--- a/syntaxes/liquid.tmLanguage
+++ b/syntaxes/liquid.tmLanguage
@@ -7,9 +7,9 @@
 		<string>liquid</string>
 	</array>
 	<key>foldingStartMarker</key>
-	<string>(?x){%\s*(if|unless|for|paginate|capture|form|case|tablerow|raw|comment)[^(%})]+%}</string>
+	<string>(?x){%\s*(if|unless|for|paginate|capture|form|case|tablerow|raw|comment|schema|javascript|stylesheet)[^(%})]+%}</string>
 	<key>foldingStopMarker</key>
-	<string>(?x){%\s*(endif|endunless|endfor|endpaginate|endcapture|endform|endcase|endtablerow|endraw|endcomment)[^(%})]+%}</string>
+	<string>(?x){%\s*(endif|endunless|endfor|endpaginate|endcapture|endform|endcase|endtablerow|endraw|endcomment|endschema|endjavascript|endstylesheet)[^(%})]+%}</string>
 	<key>name</key>
 	<string>HTML (Liquid)</string>
 	<key>patterns</key>
@@ -60,6 +60,14 @@
 			<key>include</key>
 			<string>text.html.basic</string>
 		</dict>
+		<dict>
+			<key>include</key>
+			<string>source.json</string>
+		</dict>
+		<dict>
+			<key>include</key>
+			<string>source.css</string>
+		</dict>
 	</array>
 	<key>repository</key>
 	<dict>
@@ -240,7 +248,7 @@
 				</dict>
 				<dict>
 					<key>match</key>
-					<string>\b(collection|product|linklist|linklists|order|link|customer|customer_address|line_item|shop|collections|page_title|template|image|blog|blogs|cart|pages|theme|themes|variant|items|comment|forloop|settings)\b</string>
+					<string>\b(collection|product|linklist|linklists|order|link|customer|customer_address|line_item|shop|collections|page_title|template|image|blog|blogs|cart|pages|theme|themes|variant|items|comment|forloop|settings|schema|javascript|stylesheet)\b</string>
 					<key>name</key>
 					<string>support.class.liquid</string>
 				</dict>