Donut  colors and Dashboard
Conflict removed