refactoring: expand point and line definition to an array using color as category