Mod Highlighters

Issue #375. Also type check in weakness highlighter
Make it not so shieldy
Merge pull request #387 from vita10gy/mod_highlighters

Mod Highlighters