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 @@
foldingStartMarker
\b(?i:DUM|DO|IF|MAC|LUP)\b
foldingStopMarker
- \b(?i:DEND|FIN)\b|<<<|--\^
+ \b(?i:DEND|FIN|EOM)\b|<<<|--\^
uuid
9DDC3C1F-C4A9-4888-BFBA-1CFF7448AC47
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 @@
S
- isDisabled
-
name
Merlin
patterns
@@ -63,10 +61,8 @@
string.quoted.double
- begin
- '
- end
- '
+ match
+ '.*'
name
string.quoted.single
@@ -361,7 +357,7 @@
match
- \b(?i:MAC)\b|<<<
+ \b(?i:MAC|EOM)\b|<<<
name
keyword.directive.macro