Color and Point classes changed to typedefs