Integrated Hyprlinkr.  Misc refactoring.