diff --git a/i2p2www/lexers.py b/i2p2www/lexers.py
index cc967d4f..9e1220fb 100644
--- a/i2p2www/lexers.py
+++ b/i2p2www/lexers.py
@@ -17,10 +17,11 @@ class DataSpecLexer(RegexLexer):
             (r'(\s*)([A-Z]{2,})', bygroups(Text, Name.Constant)),
             (r'(\s*)([\[\]])', bygroups(Text, Punctuation)),
             (r'(\s*)(\$\w+)', bygroups(Text, Name.Tag)),
+            (r'(\s*)(0x[0-9a-f]+)', bygroups(Text, Number.Hex)),
             (r'(\s*)([0-9]+)(\+)?', bygroups(Text, Number, Punctuation)),
             (r'(-)([0-9]+)', bygroups(Punctuation, Number)),
-            (r'(\s*)(->|<=|>=|\*)', bygroups(Text, Operator)),
-            (r'(\s*)([\w()-=\'<>]+)', bygroups(Text, Comment)),
+            (r'(\s*)(->|<=|>=|\*|\^)', bygroups(Text, Operator)),
+            (r'(\s*)([\w()-=\'<>?]+)', bygroups(Text, Comment)),
         ],
         'boundary': [
             (r'-{3,}\+$', Text, '#pop'),