Nicer hook display.
Fixed workflow overriding by theme.
Minor 1.3.6 related bug fix.
Merge pull request #1003 from cmfcmf/fixing

Minor bugs fixed