Some changes with the colors and stuff