Merge pull request #5 from meismaku/mark

slider and base reformat
fixing confict
styles for filters
Merge pull request #6 from eric-townsend/eric

type, color modularity
content population, filter debug