Added colors and modified how it repaints