Pulled in changes from master
Hooks and Icons/Splashs added