Use zentyal server source and added highlighting