Fix escaping of swatches