diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/modula2.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/modula2.cpp
index 438c2f485..eceefbd25 100644
--- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/modula2.cpp
+++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/modula2.cpp
@@ -15,82 +15,85 @@ void addModula2() {
 			  { { "[%:%;%=%<%>%&%+%-%*%/%.%(%)]" }, "operator" },
 			  { { "-?%d+[%d%.eE_]*" }, "number" },
 			  { { "[%a_][%w_]*%f[(]" }, "function" },
-			  { { "[%a_][%w_]*" }, "normal" },
+			  { { "[%a_][%w_]*" }, "symbol" },
 
 		  },
 		  {
-			  { "ARRAY", "keyword" },
-			  { "BEGIN", "keyword" },
-			  { "BY", "keyword" },
-			  { "CASE", "keyword" },
-			  { "CONST", "keyword" },
-			  { "DEFINITION", "keyword" },
-			  { "DO", "keyword" },
-			  { "ELSE", "keyword" },
-			  { "ELSIF", "keyword" },
-			  { "END", "keyword" },
-			  { "EXCEPT", "keyword" },
-			  { "EXIT", "keyword" },
-			  { "EXPORT", "keyword" },
-			  { "FINALLY", "keyword" },
-			  { "FOR", "keyword" },
-			  { "FORWARD", "keyword" },
-			  { "FROM", "keyword" },
-			  { "IF", "keyword" },
-			  { "IMPLEMENTATION", "keyword" },
-			  { "IMPORT", "keyword" },
-			  { "IN", "keyword" },
-			  { "LOOP", "keyword" },
-			  { "MODULE", "keyword" },
-			  { "OF", "keyword" },
-			  { "PACKEDSET", "keyword" },
-			  { "POINTER", "keyword" },
-			  { "PROCEDURE", "keyword" },
-			  { "QUALIFIED", "keyword" },
-			  { "RECORD", "keyword" },
-			  { "REPEAT", "keyword" },
-			  { "RETRY", "keyword" },
-			  { "RETURN", "keyword" },
-			  { "SET", "keyword" },
-			  { "THEN", "keyword" },
-			  { "TO", "keyword" },
-			  { "TYPE", "keyword" },
-			  { "UNTIL", "keyword" },
-			  { "VAR", "keyword" },
-			  { "WHILE", "keyword" },
-			  { "WITH", "keyword" },
- 			  { "ABS", "function" },
-			  { "ADR", "function" },
-			  { "ASH", "function" },
-			  { "AND", "function" },
-			  { "CAP", "function" },
-			  { "DEC", "function" },
-			  { "DISPOSE", "function" },
- 			  { "DIV", "function" },
-			  { "EXCL", "function" },
-			  { "FLOAT", "function" },
-			  { "INC", "function" },
-			  { "INCL", "function" },
-			  { "HALT", "function" },
- 			  { "HIGH", "function" },
-			  { "NEW", "function" },
-			  { "MOD", "function" },
-			  { "NOT", "function" },
-			  { "ODD", "function" },
-			  { "OR", "function" },
- 			  { "PROC", "function" },
-			  { "ROUND", "function" },
-			  { "SIZE", "function" },
-			  { "TSIZE", "function" },
-			  { "BITSET", "keyword2" },
-			  { "BOOLEAN", "keyword2" },
- 			  { "CARDINAL", "keyword2" },
-			  { "CHAR", "keyword2" },
-			  { "INTEGER", "keyword2" },
-			  { "REAL", "keyword2" },
-			  { "TRUE", "literal" },
-			  { "FALSE", "literal" },
-			  { "NIL", "literal" }
+
+			  { "array", "keyword" },
+			  { "begin", "keyword" },
+			  { "by", "keyword" },
+			  { "case", "keyword" },
+			  { "const", "keyword" },
+			  { "definition", "keyword" },
+			  { "do", "keyword" },
+			  { "else", "keyword" },
+			  { "elsif", "keyword" },
+			  { "end", "keyword" },
+			  { "except", "keyword" },
+			  { "exit", "keyword" },
+			  { "export", "keyword" },
+			  { "finally", "keyword" },
+			  { "for", "keyword" },
+			  { "forward", "keyword" },
+			  { "from", "keyword" },
+			  { "if", "keyword" },
+			  { "implementation", "keyword" },
+			  { "import", "keyword" },
+			  { "in", "keyword" },
+			  { "loop", "keyword" },
+			  { "module", "keyword" },
+			  { "of", "keyword" },
+			  { "packedset", "keyword" },
+			  { "pointer", "keyword" },
+			  { "procedure", "keyword" },
+			  { "qualified", "keyword" },
+			  { "record", "keyword" },
+			  { "repeat", "keyword" },
+			  { "retry", "keyword" },
+			  { "return", "keyword" },
+			  { "set", "keyword" },
+			  { "then", "keyword" },
+			  { "to", "keyword" },
+			  { "type", "keyword" },
+			  { "until", "keyword" },
+			  { "var", "keyword" },
+			  { "while", "keyword" },
+			  { "with", "keyword" },
+			  { "abs", "function" },
+			  { "adr", "function" },
+			  { "ash", "function" },
+			  { "and", "function" },
+			  { "cap", "function" },
+			  { "dec", "function" },
+			  { "dispose", "function" },
+			  { "div", "function" },
+			  { "excl", "function" },
+			  { "float", "function" },
+			  { "inc", "function" },
+			  { "incl", "function" },
+			  { "halt", "function" },
+			  { "high", "function" },
+			  { "new", "function" },
+			  { "mod", "function" },
+			  { "not", "function" },
+			  { "odd", "function" },
+			  { "or", "function" },
+			  { "proc", "function" },
+			  { "round", "function" },
+			  { "size", "function" },
+			  { "tsize", "function" },
+			  { "bitset", "keyword2" },
+			  { "boolean", "keyword2" },
+			  { "cardinal", "keyword2" },
+			  { "char", "keyword2" },
+			  { "integer", "keyword2" },
+			  { "real", "keyword2" },
+			  { "true", "literal" },
+			  { "false", "literal" },
+			  { "nil", "literal" },
+			  { "func", "keyword" },
+
 		  },
 		  "--",
 		  {}
diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/modula2.hpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/modula2.hpp
index 1128fb606..479307228 100644
--- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/modula2.hpp
+++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/modula2.hpp
@@ -5,6 +5,6 @@ namespace EE { namespace UI { namespace Doc { namespace Language {
 
 extern void addModula2();
 
-}}}}
+}}}} // namespace EE::UI::Doc::Language
 
 #endif
diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/modula3.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/modula3.cpp
index 579286963..02e5315c6 100644
--- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/modula3.cpp
+++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/modula3.cpp
@@ -16,115 +16,65 @@ void addModula3() {
 			  { { "[%:%;%=%<%>%&%+%-%*%/%.%(%)]" }, "operator" },
 			  { { "-?%d+[%d%.eE_]*" }, "number" },
 			  { { "[%a_][%w_]*%f[(]" }, "function" },
-			  { { "[%a_][%w_]*" }, "normal" },
+			  { { "[%a_][%w_]*" }, "symbol" },
 
 		  },
 		  {
- 			  { "AND", "keyword" },
-			  { "DO", "keyword" },
-			  { "FROM", "keyword" },
-			  { "NOT", "keyword" },
-			  { "REPEAT", "keyword" },
-			  { "UNTIL", "keyword" },
- 			  { "ANY", "keyword" },
-			  { "ELSE", "keyword" },
-			  { "GENERIC", "keyword" },
-			  { "OBJECT", "keyword" },
-			  { "RETURN", "keyword" },
-			  { "UNTRACED", "keyword" },
- 			  { "ARRAY", "keyword" },
-			  { "ELSIF", "keyword" },
-			  { "IF", "keyword" },
-			  { "OF", "keyword" },
-			  { "REVEAL", "keyword" },
-			  { "VALUE", "keyword" },
- 			  { "AS", "keyword" },
-			  { "END", "keyword" },
-			  { "IMPORT", "keyword" },
-			  { "OR", "keyword" },
-			  { "ROOT", "keyword" },
-			  { "VAR", "keyword" },
- 			  { "BEGIN", "keyword" },
-			  { "EVAL", "keyword" },
-			  { "IN", "keyword" },
-			  { "OVERRIDES", "keyword" },
-			  { "SET", "keyword" },
-			  { "WHILE", "keyword" },
- 			  { "BITS", "keyword" },
-			  { "EXCEPT", "keyword" },
-			  { "INTERFACE", "keyword" },
-			  { "PROCEDURE", "keyword" },
-			  { "THEN", "keyword" },
-			  { "WITH", "keyword" },
- 			  { "BRANDED", "keyword" },
-			  { "EXCEPTION", "keyword" },
-			  { "LOCK", "keyword" },
-			  { "RAISE", "keyword" },
-			  { "TO", "keyword" },
- 			  { "BY", "keyword" },
-			  { "EXIT", "keyword" },
-			  { "LOOP", "keyword" },
-			  { "RAISES", "keyword" },
-			  { "TRY", "keyword" },
- 			  { "CASE", "keyword" },
-			  { "EXPORTS", "keyword" },
-			  { "METHODS", "keyword" },
-			  { "READONLY", "keyword" },
-			  { "TYPE", "keyword" },
- 			  { "CONST", "keyword" },
-			  { "FINALLY", "keyword" },
-			  { "MOD", "keyword" },
-			  { "RECORD", "keyword" },
-			  { "TYPECASE", "keyword" },
- 			  { "DIV", "keyword" },
-			  { "FOR", "keyword" },
-			  { "MODULE", "keyword" },
-			  { "REF", "keyword" },
-			  { "UNSAFE", "keyword" },
-			  { "ABS", "function" },
-			  { "BYTESIZE", "function" },
-			  { "EXTENDED", "function" },
-			  { "MAX", "function" },
-			  { "SUBARRAY", "function" },
-			  { "ADDRESS", "function" },
-			  { "ISTYPE", "function" },
-			  { "MIN", "function" },
-			  { "NUMBER", "function" },
-			  { "TEXT", "function" },
-			  { "ADR", "function" },
-			  { "CEILING", "function" },
-			  { "FIRST", "function" },
-			  { "LAST", "function" },
-			  { "MUTEX", "function" },
-			  { "ORD", "function" },
-			  { "ADRSIZE", "function" },
-			  { "NARROW", "function" },
-			  { "TRUNC", "function" },
-			  { "BITSIZE", "function" },
-			  { "DEC", "function" },
-			  { "FLOOR", "function" },
-			  { "NEW", "function" },
-			  { "REFANY", "function" },
-			  { "TYPECODE", "function" },
-			  { "DISPOSE", "function" },
-			  { "INC", "function" },
-			  { "LOOPHOLE", "function" },
-			  { "VAL", "function" },
- 			  { "BITSET", "keyword2" },
-			  { "BOOLEAN", "keyword2" },
- 			  { "CARDINAL", "keyword2" },
-			  { "CHAR", "keyword2" },
-			  { "INTEGER", "keyword2" },
-			  { "REAL", "keyword2" },
- 			  { "FLOAT", "keyword2" },
-			  { "LONGINT", "keyword2" },
-			  { "LONGREAL", "keyword2" },
- 			  { "BOOLEAN", "keyword2" },
-			  { "WIDECHAR", "keyword2" },
-			  { "TRUE", "literal" },
-			  { "FALSE", "literal" },
-			  { "NIL", "literal" },
-			  { "NULL", "literal" }
+
+			  { "and", "keyword" },		  { "do", "keyword" },
+			  { "from", "keyword" },	  { "not", "keyword" },
+			  { "repeat", "keyword" },	  { "until", "keyword" },
+			  { "any", "keyword" },		  { "else", "keyword" },
+			  { "generic", "keyword" },	  { "object", "keyword" },
+			  { "return", "keyword" },	  { "untraced", "keyword" },
+			  { "array", "keyword" },	  { "elsif", "keyword" },
+			  { "if", "keyword" },		  { "of", "keyword" },
+			  { "reveal", "keyword" },	  { "value", "keyword" },
+			  { "as", "keyword" },		  { "end", "keyword" },
+			  { "import", "keyword" },	  { "or", "keyword" },
+			  { "root", "keyword" },	  { "var", "keyword" },
+			  { "begin", "keyword" },	  { "eval", "keyword" },
+			  { "in", "keyword" },		  { "overrides", "keyword" },
+			  { "set", "keyword" },		  { "while", "keyword" },
+			  { "bits", "keyword" },	  { "except", "keyword" },
+			  { "interface", "keyword" }, { "procedure", "keyword" },
+			  { "then", "keyword" },	  { "with", "keyword" },
+			  { "branded", "keyword" },	  { "exception", "keyword" },
+			  { "lock", "keyword" },	  { "raise", "keyword" },
+			  { "to", "keyword" },		  { "by", "keyword" },
+			  { "exit", "keyword" },	  { "loop", "keyword" },
+			  { "raises", "keyword" },	  { "try", "keyword" },
+			  { "case", "keyword" },	  { "exports", "keyword" },
+			  { "methods", "keyword" },	  { "readonly", "keyword" },
+			  { "type", "keyword" },	  { "const", "keyword" },
+			  { "finally", "keyword" },	  { "mod", "keyword" },
+			  { "record", "keyword" },	  { "typecase", "keyword" },
+			  { "div", "keyword" },		  { "for", "keyword" },
+			  { "module", "keyword" },	  { "ref", "keyword" },
+			  { "unsafe", "keyword" },	  { "abs", "function" },
+			  { "bytesize", "function" }, { "extended", "function" },
+			  { "max", "function" },	  { "subarray", "function" },
+			  { "address", "function" },  { "istype", "function" },
+			  { "min", "function" },	  { "number", "function" },
+			  { "text", "function" },	  { "adr", "function" },
+			  { "ceiling", "function" },  { "first", "function" },
+			  { "last", "function" },	  { "mutex", "function" },
+			  { "ord", "function" },	  { "adrsize", "function" },
+			  { "narrow", "function" },	  { "trunc", "function" },
+			  { "bitsize", "function" },  { "dec", "function" },
+			  { "floor", "function" },	  { "new", "function" },
+			  { "refany", "function" },	  { "typecode", "function" },
+			  { "dispose", "function" },  { "inc", "function" },
+			  { "loophole", "function" }, { "val", "function" },
+			  { "bitset", "keyword2" },	  { "boolean", "keyword2" },
+			  { "cardinal", "keyword2" }, { "char", "keyword2" },
+			  { "integer", "keyword2" },  { "real", "keyword2" },
+			  { "float", "keyword2" },	  { "longint", "keyword2" },
+			  { "longreal", "keyword2" }, { "boolean", "keyword2" },
+			  { "widechar", "keyword2" }, { "true", "literal" },
+			  { "false", "literal" },	  { "nil", "literal" },
+			  { "null", "literal" }
+
 		  },
 		  "--",
 		  {}
diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/modula3.hpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/modula3.hpp
index e88fbdc97..95e3be92b 100644
--- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/modula3.hpp
+++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/modula3.hpp
@@ -5,6 +5,6 @@ namespace EE { namespace UI { namespace Doc { namespace Language {
 
 extern void addModula3();
 
-}}}}
+}}}} // namespace EE::UI::Doc::Language
 
 #endif