Removed COLOR namespace
Removed COLOR namespace and added in static colors