debugged and added new color scheme