Added class Color and fixed some classes return values.