refactored colors and naming
refactored colors and naming