Update regexes

I have used the page types more consistently throughout the modules; there are a few that still have regex includes, but most do not. I have also simplified some of the regexes (usually the trailing bit that looked like `[something]*`, since it made no difference whether it was included or not).