Added colors and removed some constants