Got colour-coding of events working properly. Fixes #10