Quite a few changes. Minor tweaks for Safari, and colour work in progress. About to merge master in.