Update colors a bit and some general housekeeping