Fix layer-color support