Updated colors and scaling