Fixes to make references slightly more prominent
Highlighting prefixes and highlighting in nave