Index: autotests/input/highlight.lgt
===================================================================
--- /dev/null
+++ autotests/input/highlight.lgt
@@ -0,0 +1,448 @@
+/* 
+   Highlighting test case for Logtalk
+
+   Copied from the Logtalk distribution by the Logtalk copright holder
+   and contributed using the Apache License 2.0
+*/
+
+:- encoding(Encoding).	% this is a single-line comment
+
+/*
+this is
+a block
+comment
+*/
+
+
+:- if(Goal).
+	% conditional
+:- elif(Goal).
+	% compilation
+:- else.
+	% directives
+:- endif.
+
+
+:- initialization(Goal).
+:- op(Precedence, Associativity, Operator).
+:- ensure_loaded(File).
+:- include(File).
+:- set_prolog_flag(Flag, Value).
+:- set_logtalk_flag(Flag, Value).
+
+
+:- object(prototype,
+	implements(protocol),
+	imports(category),
+	extends(parent)).
+
+	:- info([
+		version is 1.43,
+		author is 'Paulo Moura',
+		date is 2018/08/03,
+		comment is 'Sample prototype for testing syntax coloring.'
+	]).
+
+	:- built_in.
+	:- threaded.
+	:- dynamic.
+	:- initialization(some_goal(X, Y)).
+
+	:- alias(set, [member/2 as set_member/2]).
+	:- alias(words, [singular//0 as peculiar//0]).
+
+	:- uses(list, [append/3, member/2]).
+	:- uses(queues, [new/1 as new_queue/1]).
+
+	:- use_module(module).
+	:- use_module(module, [append/3, member/2]).
+
+	:- multifile(zzz/1).
+	:- multifile(module:zzz/1).
+	:- multifile(object::zzz/1).
+
+	:- coinductive(comember/1).
+
+	:- use_module(module, [xxx/1, yyy/2, zzz/3]).
+	:- export(bbb/3).
+	:- reexport(cccc/4).
+
+	:- public(aaa/2).
+	:- meta_predicate(aaa(::, *)).
+	:- discontiguous(aaa/2).
+	:- mode(aaa(+callable, ?integer), zero_or_one).
+	:- info(position/2, [
+		comment is 'Predicate brief description.',
+		arguments is ['Arg1'-'Arg1 description', 'Arg2'-'Arg2 description']
+	]).
+
+	:- public(nt//2).
+	:- meta_non_terminal(nt(1, *)).
+
+	:- protected(bbb/2).
+	:- synchronized(bbb/2).
+	:- mode(bbb(+integer, -float), one).
+	:- info(bbb/2, [
+		comment is 'Predicate brief description.',
+		argnames is ['Arg1', 'Arg2']
+	]).
+
+	:- private(ccc/2).
+	:- dynamic(ccc/2).
+	:- mode(ccc(@atom, ?atom, ++list, --ground), one_or_more).
+	:- info(ccc/2, [
+		comment is 'Predicate brief description.',
+		argnames is ['Arg1', 'Arg2']
+	]).
+
+	enumerating_entities(Object, Protocol, Category) :-
+		current_category(Category),
+		current_object(Object),
+		current_protocol(Protocol).
+
+	enumerating_properties :-
+		category_property(Category, Property),
+		object_property(Object, Property),
+		protocol_property(Protocol, Property).
+
+	creating_entities(Object, Protocol, Category) :-
+		create_category(Category, Relations, Directives, Clauses),
+		create_object(Object, Relations, Directives, Clauses),
+		create_protocol(Protocol, Relations, Directives).
+
+	abolishing_entities(Object, Protocol, Category) :-
+		abolish_category(Category),
+		abolish_object(Object),
+		abolish_protocol(Protocol).
+
+	entity_relations :-
+		extends_object(Prototype, Parent, Scope),
+		extends_protocol(Protocol1, Protocol2, Scope),
+		extends_category(Category1, Category2, Scope),
+		implements_protocol(Object, Protocol, Scope),
+		imports_category(Object, Category, Scope),
+		instantiates_class(Instance, Class, Scope),
+		specializes_class(Class, Superclass, Scope),
+		complements_object(Category, Object),
+		conforms_to_protocol(ObjOrCtg, Protocol, Scope).
+
+	event_handling :-
+		abolish_events(Event, Object, Message, Sender, Monitor),
+		current_event(Event, Object, Message, Sender, Monitor),
+		define_events(Event, Object, Message, Sender, Monitor).
+
+	multi_threading :-
+		threaded(Goals),
+		threaded_call(Goal),
+		threaded_once(Goal),
+		threaded_ignore(Goal),
+		threaded_exit(Goal),
+		threaded_peek(Goal),
+		threaded_wait(Notification),
+		threaded_notify(Notification).
+
+	engines :-
+		threaded_engine(Engine),
+		threaded_engine_create(AnswerTemplate, Goal, Engine),
+		threaded_engine_destroy(Engine),
+		threaded_engine_self(Engine),
+		threaded_engine_next(Engine, Answer),
+		threaded_engine_next_reified(Engine, Answer),
+		threaded_engine_yield(Answer),
+		threaded_engine_post(Engine, Term),
+		threaded_engine_fetch(Term).
+
+	compiling_and_loading :-
+		logtalk_compile(File, Options),
+		logtalk_load(File, Options),
+		logtalk_library_path(Library, Path),
+		logtalk_load_context(Key, Value),
+		logtalk_make(Action),
+		logtalk_make,
+		logtalk_make_target_action(Target).
+
+	flags :-
+		current_logtalk_flag(Flag, Value),
+		set_logtalk_flag(Flag, Value),
+		create_logtalk_flag(Flag, Value, Options).
+
+	execution_context_methods :-
+		context(Context),
+		parameter(N, Parameter),
+		self(Self),
+		sender(Sender),
+		this(This).
+
+	reflection_methods :-
+		current_predicate(Predicate),
+		predicate_property(Predicate, Property).
+
+	database_methods :-
+		abolish(Name/Arity),
+		asserta(Clause),
+		assertz(Clause),
+		clause(Head, Body),
+		retract(Clause),
+		retractall(Head).
+
+	exception_methods :-
+		catch(Goal, Error, Catcher),
+		throw(Error),
+		instantiation_error,
+		type_error(Type, Culprit),
+		domain_error(Domain, Culprit),
+		existence_error(Thing, Culprit),
+		permission_error(Operation, Permission, Culprit),
+		representation_error(Flag),
+		evaluation_error(Exception),
+		resource_error(Resource),
+		syntax_error(Description),
+		system_error.
+
+	all_solutions_methods :-
+		bagof(Term, Goal, List),
+		bagof(Term, Var^Goal, List),
+		findall(Term, Goal, List),
+		forall(Generate, Test),
+		setof(Term, Goal, List),
+		setof(Term, Var1^Var2^Goal, List).
+
+	event_handler_methods :-
+		before(Object, Message, Sender),
+		after(Object, Message, Sender).
+
+	message_forwarding_method :-
+		forward(Message).
+
+	dcg_rules_parsing_methods :-
+		phrase(NonTerminal, Input, Rest).
+
+	term_expansion_methods :-
+		expand_term(Term, Expanded),
+		expand_goal(Goal, Expanded),
+		term_expansion(Term, Expanded),
+		goal_expansion(Goal, Expanded).
+
+	message_sending :-
+		Object::Message,
+		::Message,
+		^^Message.
+
+	calling_external_code :-
+		{goal1, goal2, goal3}.
+
+	context_switching_calls :-
+		Object<<Goal.
+
+	lambda_expressions :-
+		{X,Y,Z}/[P,Q]>>Goal.
+
+	explicitly_qualified_module_calls :-
+		Module:Goal.
+
+	if_then_else :-
+		(	If ->
+			Then
+		;	Else
+		).
+
+	numbers :-
+		X1 is 13, X2 is -13, X3 is +13,
+		Y1 is 13.13, Y2 is -13.13, Y3 is +13.13,
+		Z1 is 13.13e-23, Z2 is -13.13e-23, Z3 is +13.13e-23,
+		C1 is 0'A, C2 is 0'', C3 is 0'", C4 is 0'%,
+		C5 is 0'\n, C6 is 0'\\, C7 is 0'\', C8 is 0'\", C9 is 0'\`,
+		B1 is 0b1011101,
+		O1 is 0o1234560,
+		H1 is 0x1234567890abcDEF.
+
+	functions :-
+		A is atan(3.14) + atan2(1, 0) + acos(0.5) + asin(0.5) + sin(0.77) - cos(123.23) - tan(0.33),
+		B is sign(-12) * abs(35/78),
+		C is truncate(3.14) + round(-7.8) - ceiling(111.88),
+		D is exp(3.8) - log(123.98) / sqrt(33) * 23 ** 4 + 12345^2,
+		E is rem(3, 2) + mod(5, 3) - div(8, 4) * 2 rem 2 // 5 mod 3 - 8 div 4 + pi * e,
+		F is float_fractional_part(3.14) + float_integer_part(3.14),
+		G is float(33) + floor(99.99),
+		I is min(3,4) + max(4,5).
+
+	bitwise :-
+		A is 16 >> 2,
+		B is 16 << 2,
+		C is 10 /\ 12,
+		D is 10 \/ 12,
+		E is \ 10,
+		F is xor(13, 7).
+
+	term_unification :-
+		Term1 = Term2,
+		Term1 \= Term2,
+		unify_with_occurs_check(Term1, Term2),
+		subsumes_term(General, Specific).
+
+	term_testing :-
+		atom(Atom),
+		atomic(Atomic),
+		integer(Integer),
+		float(Float),
+		callable(Term),
+		compound(Term),
+		nonvar(Term),
+		var(Term),
+		number(Number),
+		ground(Term),
+		acyclic_term(Term).
+
+	term_comparison :-
+		compare(Order, Term1, Term2),
+		Term1 == Term2,
+		Term1 \== Term2,
+		Term1 @< Term2,
+		Term1 @=< Term2,
+		Term1 @>= Term2,
+		Term1 @> Term2.
+
+	term_creation_and_decomposition :-
+		functor(Term, Name, Arity),
+		arg(N, Term, Arg),
+		Term =.. [Functor| Args],
+		copy_term(Term, Copy),
+		numbervars(Term, Start, End),
+		term_variables(Term, Variables).
+
+	arithemtic_evaluation :-
+		X is Expression.
+
+	arithemtic_comparison :-
+		Exp1 =:= Exp2,
+		Exp1 =\= Exp2,
+		Exp1 < Exp2,
+		Exp1 =< Exp2,
+		Exp1 > Exp2,
+		Exp1 >= Exp2.
+
+	stream_selection_and_control :-
+		current_input(Stream),
+		current_output(Stream),
+		set_input(Stream),
+		set_output(Stream),
+		open(Source, Mode, Stream, Options),
+		close(Stream),
+		flush_output(Stream),
+		stream_property(Stream, Property),
+		at_end_of_stream(Stream),
+		set_stream_position(Stream, Position),
+		flush_output,
+		at_end_of_stream.
+
+	character_input_output :-
+		get_char(Char),
+		get_code(Code),
+		peek_char(Char),
+		peek_code(Code),
+		put_char(Char),
+		put_code(Code),
+		nl(Stream),
+		nl.
+
+	byte_input_output :-
+		get_byte(Byte),
+		peek_byte(Byte),
+		put_byte(Byte).
+
+	term_input_output :-
+		read(Term),
+		read_term(Stream, Term, Options),
+		write(Term),
+		write(Term),
+		write_canonical(Term),
+		write_term(Stream, Term, Options),
+		current_op(Precedence, Associativity, Operator),
+		op(Precedence, Associativity, Operator),
+		current_char_conversion(InChar, OutChar),
+		char_conversion(InChar, OutChar).
+
+	logic_and_control :-
+		\+ Goal,
+		call(Goal),
+		once(Goal),
+		ignore(Goal),
+		true,
+		fail,
+		false,
+		repeat,
+		!.
+
+	atomic_term_processing :-
+		atom_length(Atom, Length),
+		atom_chars(Atom, Chars),
+		atom_codes(Atom, Codes),
+		atom_concat(Atom1, Atom2, Atom),
+		sub_atom(Atom, Before, Length, After, SubAtom),
+		char_code(Char, Code),
+		number_chars(Number, Chars),
+		number_codes(Number, Codes).
+
+	implementation_defined_hooks :-
+		current_prolog_flag(Flag, Value),
+		set_prolog_flag(Flag, Value),
+		halt(ExitCode),
+		halt.
+
+	sorting :-
+		keysort(List, Sorted),
+		sort(List, Sorted).
+
+	number(C) --> "+", number(C).
+	number(C) --> "-", number(X), {C is -X}.
+	number(X) --> [C], {0'0 =< C, C =< 0'9, X is C - 0'0}.
+
+	escape_sequences :-
+		write('Quoted atom with a quote ('') inside.'),
+		write('Quoted atom with a backslash (\\) inside.'),
+		write('Quoted atom with control escape sequences: \a \b \r \f \t \n \v'),
+		write('Quoted atom with an octal escape sequence: \123\.'),
+		write('Quoted atom with an hexadecimal escape sequence: \x123f\.').
+
+:- end_object.
+
+
+:- object(class,
+	implements(protected::protocol),
+	imports(private::category),
+	instantiates(metaclass),
+	specializes(superclass)).
+
+:- end_object.
+
+
+:- object(parametric(Parameter, "String", 33.78),
+	implements(protocol),
+	imports(category),
+	extends(parent(Parameter))).
+
+:- end_object.
+
+
+:- category(category,
+	implements(protocol),
+	extends(other_category)).
+
+:- end_category.
+
+
+:- protocol(extended,
+	extends(minimal)).
+
+:- end_protocol.
+
+
+:- module(module, [foo/1, bar/2]).
+
+:- use_module(library).
+:- use_module(library, [baz/3]).
+
+:- reexport(library).
+:- reexport(library, [qux/4]).
+
+:- export(quux/5).
Index: data/syntax/logtalk.xml
===================================================================
--- data/syntax/logtalk.xml
+++ data/syntax/logtalk.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 
-<language name="Logtalk" version="2" kateversion="2.4" section="Sources" extensions="*.lgt;*.config" mimetype="text/x-logtalk" author="Paulo Moura (pmoura@logtalk.org)" license="Artistic License 2.0">
+<language name="Logtalk" version="3" kateversion="2.4" section="Sources" extensions="*.lgt;.logtalk" mimetype="text/x-logtalk" author="Paulo Moura (pmoura@logtalk.org)" license="Apache License 2.0">
 
 	<highlighting>
 
@@ -12,51 +12,61 @@
 				<RegExpr String = "^\s*:-" attribute = "Normal" context = "directive" />
 				<!-- Event handlers -->
 				<RegExpr String = "\b(after|before)(?=[(])" attribute = "Built-in" context = "#stay" />
+				<!-- Message forwarding handler -->
+				<RegExpr String = "\bforward(?=[(])" attribute = "Built-in" context = "#stay" />
 				<!-- Method execution context -->
-				<RegExpr String = "\b(parameter|this|se(lf|nder))(?=[(])" attribute = "Built-in" context = "#stay" />
+				<RegExpr String = "\b(context|parameter|this|se(lf|nder))(?=[(])" attribute = "Built-in" context = "#stay" />
 				<!-- Reflection -->
 				<RegExpr String = "\b(current_predicate|predicate_property)(?=[(])" attribute = "Built-in" context = "#stay" />
 				<!-- DCGs -->
-				<RegExpr String = "\b(expand_term|term_expansion|phrase)(?=[(])" attribute = "Built-in" context = "#stay" />
+				<RegExpr String = "\b(expand_(goal|term)|(goal|term)_expansion|phrase)(?=[(])" attribute = "Built-in" context = "#stay" />
 				<!-- Entity -->
 				<RegExpr String = "\b(abolish|c(reate|urrent))_(object|protocol|category)(?=[(])" attribute = "Built-in" context = "#stay" />
 				<RegExpr String = "\b(object|protocol|category)_property(?=[(])" attribute = "Built-in" context = "#stay" />
 				<!-- Entity relations -->
-				<RegExpr String = "\bextends_(object|protocol)(?=[(])" attribute = "Built-in" context = "#stay" />
-				<RegExpr String = "\bimplements_protocol(?=[(])" attribute = "Built-in" context = "#stay" />
-				<RegExpr String = "\b(instantiates|specializes)_class(?=[(])" attribute = "Built-in" context = "#stay" />
-				<RegExpr String = "\bimports_category(?=[(])" attribute = "Built-in" context = "#stay" />
+				<RegExpr String = "\bco(mplements_object|nforms_to_protocol)(?=[(])" attribute = "Built-in" context = "#stay" />
+				<RegExpr String = "\bextends_(object|protocol|category)(?=[(])" attribute = "Built-in" context = "#stay" />
+				<RegExpr String = "\bimp(lements_protocol|orts_category)(?=[(])" attribute = "Built-in" context = "#stay" />
+				<RegExpr String = "\b(instantiat|specializ)es_class(?=[(])" attribute = "Built-in" context = "#stay" />
 				<!-- Events -->
 				<RegExpr String = "\b(current_event|(abolish|define)_events)(?=[(])" attribute = "Built-in" context = "#stay" />
 				<!-- Flags -->
-				<RegExpr String = "\b(current|set)_logtalk_flag(?=[(])" attribute = "Built-in" context = "#stay" />
+				<RegExpr String = "\b(create|current|set)_logtalk_flag(?=[(])" attribute = "Built-in" context = "#stay" />
 				<!-- Compiling, loading, and library paths -->
-				<RegExpr String = "\blogtalk_(compile|l(ibrary_path|oad))(?=[(])" attribute = "Built-in" context = "#stay" />
+				<RegExpr String = "\blogtalk_(compile|l(ibrary_path|oad|oad_context)|make(_target_action)?)(?=[(])" attribute = "Built-in" context = "#stay" />
+				<RegExpr String = "\blogtalk_make\b" attribute = "Built-in" context = "#stay" />
 				<!-- Database -->
 				<RegExpr String = "\b(clause|retract(all)?)(?=[(])" attribute = "Built-in" context = "#stay" />
 				<RegExpr String = "\ba(bolish|ssert(a|z))(?=[(])" attribute = "Built-in" context = "#stay" />
 				<!-- Control -->
 				<RegExpr String = "\b(ca(ll|tch)|throw)(?=[(])" attribute = "Built-in" context = "#stay" />
-				<RegExpr String = "\b(fail|true)\b" attribute = "Built-in" context = "#stay" />
+				<RegExpr String = "\b(fa(il|lse)|true|(instantiation|system)_error)\b" attribute = "Built-in" context = "#stay" />
+				<RegExpr String = "\b(type|domain|existence|permission|representation|evaluation|resource|syntax)_error(?=[(])" attribute = "Built-in" context = "#stay" />
 				<!-- All solutions -->
 				<RegExpr String = "\b((bag|set)of|f(ind|or)all)(?=[(])" attribute = "Built-in" context = "#stay" />
+				<!-- Multi-threading predicates -->
+				<RegExpr String = "\bthreaded(_(call|once|ignore|exit|peek|wait|notify))?(?=[(])" attribute = "Built-in" context = "#stay" />
+				<!-- Engine predicates -->
+				<RegExpr String = "\bthreaded_engine(_(create|destroy|self|next|next_reified|yield|post|fetch))?(?=[(])" attribute = "Built-in" context = "#stay" />
 				<!-- Term unification -->
-				<RegExpr String = "\bunify_with_occurs_check(?=[(])" attribute = "Built-in" context = "#stay" />
+				<RegExpr String = "\b(subsumes_term|unify_with_occurs_check)(?=[(])" attribute = "Built-in" context = "#stay" />
 				<!-- Term creation and decomposition -->
-				<RegExpr String = "\b(functor|arg|copy_term)(?=[(])" attribute = "Built-in" context = "#stay" />
+				<RegExpr String = "\b(functor|arg|copy_term|numbervars|term_variables)(?=[(])" attribute = "Built-in" context = "#stay" />
 				<!-- Evaluable functors -->
-				<RegExpr String = "\b(rem|mod|abs|sign)(?=[(])" attribute = "Built-in" context = "#stay" />
+				<RegExpr String = "\b(div|rem|m(ax|in|od)|abs|sign)(?=[(])" attribute = "Built-in" context = "#stay" />
 				<RegExpr String = "\bfloat(_(integer|fractional)_part)?(?=[(])" attribute = "Built-in" context = "#stay" />
 				<RegExpr String = "\b(floor|truncate|round|ceiling)(?=[(])" attribute = "Built-in" context = "#stay" />
 				<!-- Other arithmetic functors -->
-				<RegExpr String = "\b(cos|atan|exp|log|s(in|qrt))(?=[(])" attribute = "Built-in" context = "#stay" />
+				<RegExpr String = "\b(cos|a(cos|sin|tan|tan2)|exp|log|s(in|qrt)|tan|xor)(?=[(])" attribute = "Built-in" context = "#stay" />
 				<!-- Term testing -->
-				<RegExpr String = "\b(var|atom(ic)?|integer|float|compound|n(onvar|umber))(?=[(])" attribute = "Built-in" context = "#stay" />
+				<RegExpr String = "\b(var|atom(ic)?|integer|float|c(allable|ompound)|n(onvar|umber)|ground|acyclic_term)(?=[(])" attribute = "Built-in" context = "#stay" />
+				<!-- Term comparison -->
+				<RegExpr String = "\bcompare(?=[(])" attribute = "Built-in" context = "#stay" />
 				<!-- Stream selection and control -->
-				<RegExpr String = "\b(current|set)_(in|out)put(?=[(])" attribute = "Built-in" context = "#stay" />
+				<RegExpr String = "\b(curren|se)t_(in|out)put(?=[(])" attribute = "Built-in" context = "#stay" />
 				<RegExpr String = "\b(open|close)(?=[(])" attribute = "Built-in" context = "#stay" />
 				<RegExpr String = "\bflush_output(?=[(])" attribute = "Built-in" context = "#stay" />
-				<RegExpr String = "\bflush_output\b" attribute = "Built-in" context = "#stay" />
+				<RegExpr String = "\b(at_end_of_stream|flush_output)\b" attribute = "Built-in" context = "#stay" />
 				<RegExpr String = "\b(stream_property|at_end_of_stream|set_stream_position)(?=[(])" attribute = "Built-in" context = "#stay" />
 				<!-- Character and byte input/output -->
 				<RegExpr String = "\b(nl|(get|peek|put)_(byte|c(har|ode)))(?=[(])" attribute = "Built-in" context = "#stay" />
@@ -69,11 +79,13 @@
 				<!-- Atomic term processing -->
 				<RegExpr String = "\batom_(length|c(hars|o(ncat|des)))(?=[(])" attribute = "Built-in" context = "#stay" />
 				<RegExpr String = "\b(char_code|sub_atom)(?=[(])" attribute = "Built-in" context = "#stay" />
-				<RegExpr String = "\bnumber_c(hars|odes)(?=[(])" attribute = "Built-in" context = "#stay" />
+				<RegExpr String = "\bnumber_c(har|ode)s(?=[(])" attribute = "Built-in" context = "#stay" />
 				<!-- Implementation defined hooks functions -->
-				<RegExpr String = "\b(set|current)_prolog_flag(?=[(])" attribute = "Built-in" context = "#stay" />
+				<RegExpr String = "\b(se|curren)t_prolog_flag(?=[(])" attribute = "Built-in" context = "#stay" />
 				<RegExpr String = "\bhalt\b" attribute = "Built-in" context = "#stay" />
 				<RegExpr String = "\bhalt(?=[(])" attribute = "Built-in" context = "#stay" />
+				<!-- Sorting -->
+				<RegExpr String = "\b(key)?sort(?=[(])" attribute = "Built-in" context = "#stay" />
 				<!-- Variables -->
 				<RegExpr String = "\b[A-Z_]\w*" attribute = "Variable" context = "#stay" />
 				<!-- Comments -->
@@ -83,6 +95,7 @@
 				<DetectChar char = "&quot;" attribute = "String" context = "string" />
 				<DetectChar char = "'" attribute = "String" context = "atom" />
 				<!-- Numbers -->
+				<RegExpr String = "0'\\." attribute = "Number" context = "#stay" />
 				<RegExpr String = "0'." attribute = "Number" context = "#stay" />
 				<RegExpr String = "0b[0-1]+" attribute = "Number" context = "#stay" />
 				<RegExpr String = "0o[0-7]+" attribute = "Number" context = "#stay" />
@@ -95,7 +108,7 @@
 				<DetectChar char = "{" attribute = "Operator" context = "#stay" beginRegion="external" />
 				<DetectChar char = "}" attribute = "Operator" context = "#stay" endRegion="external" />
 				<!-- Logic and control -->
-				<RegExpr String = "\bonce(?=[(])" attribute = "Built-in" context = "#stay" />
+				<RegExpr String = "\b(ignore|once)(?=[(])" attribute = "Built-in" context = "#stay" />
 				<RegExpr String = "\brepeat\b" attribute = "Built-in" context = "#stay" />
 				<!-- Bitwise functors -->
 				<Detect2Chars char = "&gt;" char1 = "&gt;" attribute = "Operator" context = "#stay" />
@@ -103,9 +116,11 @@
 				<Detect2Chars char = "/" char1 = "\" attribute = "Operator" context = "#stay" />
 				<Detect2Chars char = "\" char1 = "/" attribute = "Operator" context = "#stay" />
 				<Detect2Chars char = "\" char1 = "\" attribute = "Operator" context = "#stay" />
-				<!-- Arithemtic evaluation -->
+				<!-- Predicate aliases -->
+				<RegExpr String = "\bas\b" attribute = "Operator" context = "#stay" />
+				<!-- Arithmetic evaluation -->
 				<RegExpr String = "\bis\b" attribute = "Operator" context = "#stay" />
-				<!-- Arithemtic comparison -->
+				<!-- Arithmetic comparison -->
 				<StringDetect String = "=:=" attribute = "Operator" context = "#stay" />
 				<StringDetect String = "=\=" attribute = "Operator" context = "#stay" />
 				<DetectChar char = "&lt;" attribute = "Operator" context = "#stay" />
@@ -127,7 +142,7 @@
 				<!-- Evaluable functors -->
 				<Detect2Chars char = "/" char1 = "/" attribute = "Operator" context = "#stay" />
 				<AnyChar String = "+-*/" attribute = "Operator" context = "#stay" />
-				<RegExpr String = "\b(mod|rem)\b" attribute = "Operator" context = "#stay" />
+				<RegExpr String = "\b(e|pi|div|mod|rem)\b" attribute = "Operator" context = "#stay" />
 				<!-- Other arithemtic functors -->
 				<Detect2Chars char = "*" char1 = "*" attribute = "Operator" context = "#stay" />
 				<!-- DCG rules -->
@@ -139,30 +154,57 @@
 				<Detect2Chars char = "\" char1 = "+" attribute = "Operator" context = "#stay" />
 				<!-- Mode operators -->
 				<AnyChar String = "?@" attribute = "Operator" context = "#stay" />
+				<!-- Category predicate direct call operator -->
+				<AnyChar String = ":" attribute = "Operator" context = "#stay" />
 				<!-- Clause operator -->
 				<Detect2Chars char = ":" char1 = "-"  firstNonSpace = "false" attribute = "Normal" context = "#stay" />
+				<!-- Existential quantifier -->
+				<AnyChar String = "^" attribute = "Operator" context = "#stay" />
 				<!-- Atoms -->
 				<RegExpr String = "\b[a-z]\w*" attribute = "Normal" context = "#stay" />
 			</context>
 
 			<context name = "directive" attribute = "Directive" lineEndContext = "#stay" >
+				<!-- Conditional compilation directives -->
+				<RegExpr String = "\bif(?=[(])" attribute = "Directive" context = "#pop" beginRegion = "CC" />
+				<RegExpr String = "\bendif[.]" attribute = "Directive" context = "#pop" endRegion = "CC" />
+				<RegExpr String = "\belif(?=[(])" attribute = "Directive" context = "#pop"/>
+				<RegExpr String = "\belse[.]" attribute = "Directive" context = "#pop" />
 				<!-- Entity directives -->
-				<RegExpr String = "\b(category|object|protocol)(?=[(])" attribute = "Directive" context = "entityrelations" beginRegion = "Entity"/>
+				<RegExpr String = "\b(category|object|protocol)(?=[(])" attribute = "Directive" context = "entityrelations" beginRegion = "Entity" />
 				<RegExpr String = "\bend_(category|object|protocol)[.]" attribute = "Directive" context = "#pop" endRegion = "Entity" />
 				<RegExpr String = "\bmodule(?=[(])" attribute = "Directive" context = "#pop"/>
  				<!-- Predicate scope directives -->
 				<RegExpr String = "\bp(ublic|r(otected|ivate))(?=[(])" attribute = "Directive" context = "#pop" />
 				<!-- Other directives -->
-				<RegExpr String = "\be(ncoding|xport)(?=[(])" attribute = "Directive" context = "#pop" />
-			   	<RegExpr String = "\bin(fo|itialization)(?=[(])" attribute = "Directive" context = "#pop" />
-				<RegExpr String = "\bdynamic[.]" attribute = "Directive" context = "#pop" />
-				<RegExpr String = "\b(alias|d(ynamic|iscontiguous)|meta_predicate|m(etapredicate|ode|ultifile))(?=[(])" attribute = "Directive" context = "#pop" />
+				<RegExpr String = "\be(n(coding|sure_loaded)|xport)(?=[(])" attribute = "Directive" context = "#pop" />
+				<RegExpr String = "\bin(clude|itialization|fo)(?=[(])" attribute = "Directive" context = "#pop" />
+				<RegExpr String = "\b(built_in|dynamic|synchronized|threaded)[.]" attribute = "Directive" context = "#pop" />
+				<RegExpr String = "\b(alias|d(ynamic|iscontiguous)|m(eta_(non_terminal|predicate)|ode|ultifile)|s(et_(logtalk|prolog)_flag|ynchronized))(?=[(])" attribute = "Directive" context = "#pop" />
 				<RegExpr String = "\bop(?=[(])" attribute = "Directive" context = "#pop" />
-				<RegExpr String = "\b(calls|use(s|_module))(?=[(])" attribute = "Directive" context = "#pop" />
+				<RegExpr String = "\b(c(alls|oinductive)|reexport|use(s|_module))(?=[(])" attribute = "Directive" context = "#pop" />
 			</context>
 
 			<context name = "entityrelations" attribute = "Normal" lineEndContext = "#stay" >
-				<RegExpr String = "\b(extends|i(nstantiates|mp(lements|orts))|specializes)(?=[(])" attribute = "Directive" context = "#stay" />
+				<RegExpr String = "\b(complements|extends|i(nstantiates|mp(lements|orts))|specializes)(?=[(])" attribute = "Directive" context = "#stay" />
+				<!-- Variables -->
+				<RegExpr String = "\b[A-Z_]\w*" attribute = "Variable" context = "#stay" />
+				<!-- Comments -->
+				<DetectChar char = "%" attribute = "Comment" context = "single line comment" />
+				<Detect2Chars char = "/" char1 = "*" attribute = "Comment" context = "multiline comment" beginRegion = "Comment" />
+				<!-- Strings and quoted atoms -->
+				<DetectChar char = "&quot;" attribute = "String" context = "string" />
+				<DetectChar char = "'" attribute = "String" context = "atom" />
+				<!-- Numbers -->
+				<RegExpr String = "0'\\." attribute = "Number" context = "#stay" />
+				<RegExpr String = "0'." attribute = "Number" context = "#stay" />
+				<RegExpr String = "0b[0-1]+" attribute = "Number" context = "#stay" />
+				<RegExpr String = "0o[0-7]+" attribute = "Number" context = "#stay" />
+				<RegExpr String = "0x[0-9a-fA-F]+" attribute = "Number" context = "#stay" />
+				<RegExpr String = "\d+(\.\d+)?([eE]([-+])?\d+)?" attribute = "Number" context = "#stay" />
+				<!-- Scope operator -->
+				<Detect2Chars char = ":" char1 = ":" attribute = "Operator" context = "#stay" />
+				<!-- End of entity-opening directive -->
 				<Detect2Chars attribute = "Normal" context = "normal" char = ")" char1 = "." />
 			</context>
 
@@ -185,7 +227,7 @@
 		<itemDatas>
 			<itemData name = "Normal" defStyleNum = "dsNormal" />
 			<itemData name = "Directive" defStyleNum = "dsKeyword" />
-			<itemData name = "Built-in" defStyleNum = "dsKeyword" />
+			<itemData name = "Built-in" defStyleNum = "dsFunction" />
 			<itemData name = "Operator" defStyleNum = "dsDataType" />
 			<itemData name = "Comment" defStyleNum = "dsComment" />
 			<itemData name = "Number" defStyleNum = "dsDecVal" />