Renamed Colors enum to Color, small related changes