Updated colors and bug fixes