added colors and removed some unneeded entries