diff --git a/Preferences/Merlin Folding.tmPreferences b/Preferences/Merlin Folding.tmPreferences
index 108c73b..f188895 100644
--- a/Preferences/Merlin Folding.tmPreferences	
+++ b/Preferences/Merlin Folding.tmPreferences	
@@ -11,7 +11,7 @@
 		<key>foldingStartMarker</key>
 		<string>\b(?i:DUM|DO|IF|MAC|LUP)\b</string>
 		<key>foldingStopMarker</key>
-		<string>\b(?i:DEND|FIN)\b|&lt;&lt;&lt;|--\^</string>
+		<string>\b(?i:DEND|FIN|EOM)\b|&lt;&lt;&lt;|--\^</string>
 	</dict>
 	<key>uuid</key>
 	<string>9DDC3C1F-C4A9-4888-BFBA-1CFF7448AC47</string>
diff --git a/Syntaxes/Merlin.tmLanguage b/Syntaxes/Merlin.tmLanguage
index ae8ae45..47cab55 100644
--- a/Syntaxes/Merlin.tmLanguage
+++ b/Syntaxes/Merlin.tmLanguage
@@ -6,8 +6,6 @@
 	<array>
 		<string>S</string>
 	</array>
-	<key>isDisabled</key>
-	<false/>
 	<key>name</key>
 	<string>Merlin</string>
 	<key>patterns</key>
@@ -63,10 +61,8 @@
 			<string>string.quoted.double</string>
 		</dict>
 		<dict>
-			<key>begin</key>
-			<string>'</string>
-			<key>end</key>
-			<string>'</string>
+			<key>match</key>
+			<string>'.*'</string>
 			<key>name</key>
 			<string>string.quoted.single</string>
 		</dict>
@@ -361,7 +357,7 @@
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>\b(?i:MAC)\b|&lt;&lt;&lt;</string>
+			<string>\b(?i:MAC|EOM)\b|&lt;&lt;&lt;</string>
 			<key>name</key>
 			<string>keyword.directive.macro</string>
 		</dict>