Add banish, holy and threnody mappings.  Reorganize list.