Lots of cleaning, Added Colors and Stashed alert support