Some refactoring, starting to put fill and stroke colors into RenderM. A bit less wrong.
progress -- fill and stroke color now sort of work