fixing confict
styles for filters
Merge pull request #6 from eric-townsend/eric

type, color modularity