Fixed colours, added some stuff, you know..the usual