Added colors and some more stuff