Fix random bug. Add colors