Hamon updates

Most changes are in the Hamon theme, which is a good sign.