Added and refactured colors