Fixed color randomization, cleaned up listeners