Use page type for addModule
Make regexes consistent: fixes #233
Merge pull request #1064 from mc10/regex

Completely update regexes