changed a few colors and switched things around