Fixed color-theme issues