Merge pull request #246 from csmith/master

Remove moved classes.
Colour events.