Fixed color changing bug. Holy shit that took way longer than it should have
merge conflict