Fixed color picker
More fixes