changed colors and moved color definitions to their own file.