diff --git a/tools/hept_pygments/hept_pygments/__init__.py b/tools/hept_pygments/hept_pygments/__init__.py
index 6ef48f5..ec20bbd 100644
--- a/tools/hept_pygments/hept_pygments/__init__.py
+++ b/tools/hept_pygments/hept_pygments/__init__.py
@@ -13,13 +13,14 @@ class HeptagonLexer(RegexLexer):
             (r'open', Keyword.Namespace),
             (r'returns|let|tel|automaton|state|until|unless|if|then|else|end',
              Keyword),
+            (r'map|fold|mapfold', Keyword),
             (r'when|merge|fby|do', Keyword),
             (r'present', Keyword.Reserved),
             (r'int|bool', Keyword.Type),
             (r'pre|\-\>|\+|\-|\/|=|&|not|\*|<=|>=|\^', Operator),
             (r'\d+', Number.Integer),
             (r' |\t', Whitespace),
-            (r'\(|\)|;|\||:|,|\]|\[|\.', Punctuation),
+            (r'\(|\)|;|\||:|,|\]|\[|\.|<|>', Punctuation),
             (r'true|false', Literal),
             (r'[A-Z]\w*', String.Symbol),
             (r'\w+', Name)
@@ -39,6 +40,7 @@ class MLSLexer(RegexLexer):
             (r'open', Keyword.Namespace),
             (r'returns|let|tel|if|then|else|end',
              Keyword),
+            (r'map|fold|mapfold', Keyword),
             (r'when|merge|fby|do', Keyword),
             (r'present', Keyword.Reserved),
             (r'int|bool', Keyword.Type),