Fixed color-swap. Fixes spec:e2e