Color class added. Color management refactored for Shapes