Colors corrected closes #60