revamp line and fill color handling