Subtree marge formage
Sorry, I had to fold formage in
Inline escapeRegex
Handle includes better
A bit of order in scripts
Simplify rendering