Added colors and such