Finish THA Hooks

Completed support for the Theme Hook Alliance Hooks, along with some
additional tweaks