Clean Up and New Color Functionality