Lot's of changes

but most importantly, Colour!