Changed colors and order