Adding color handling and fill button functionality