Fixes for fill color, when a base colour is set