added hex colors and refactored colors