Fixed colors a bit more