added colors and fixed groups